diff --git a/README.txt b/README.txt index 5dc4aac9a..f1cc8d22f 100644 --- a/README.txt +++ b/README.txt @@ -2,29 +2,27 @@ Server Clean https://www.youtube.com/@ServerClean -El canal de YouTube en español sobre desarrollo de Metin2 más avanzado que existe. +The most advanced YouTube channel on Metin2 development. -(Si tienes este producto es porque fue una compra. Si no es así, avisa al canal de Discord: caanmasu) - -Base: Marty Sama 5.8 (sin complementos, limpia) +Base: Marty Sama 5.8 with addons: offlineshop and multilanguage Changelog: https://martysama0134.com/Source_files/Changelog -En el changelog podrás hacer la comparación con las versiones anteriores. +In the changelog, you can compare with previous versions. -Versiones de software: -Motor de base datos: MariaDB 10.6 -Sistema operativo: FreeBSD 13.2 -Compilador cliente: VisualStudio 2022 v143 -Compilador servidor: gcc10 portable a clang +Software Versions: +Database engine: MariaDB 10.6 +Operating system: FreeBSD 13.2 +Client compiler: VisualStudio 2022 v143 +Server compiler: gcc12 portable to clang -Contenido de apoyo (dado en el vídeo de instalación de la 5.7): +Supporting Content: -Programas necesarios +Required Programs: Visual Studio 2022 v143 VirtualBox @@ -33,70 +31,71 @@ WinSCP PuTTY GitHub Desktop Notepad++ -ChatGPT (escritorio) +ChatGPT (desktop) PackMakerLite -Beyond Compare (opcional) -Paint.net -Everything (opcional) +Beyond Compare (optional) +paint.net +Everything -Pasos para la instalación: +Installation Steps: -- Compilar binario -- Importar máquina a FreeBSD -- Compilar server -- Preparar serverfiles: crear db, gen, compilar quest y crear symlink, personalizar locale_string.txt y translate.lua -- Compilar DumpProto -- Modificar serverinfo.py en pack del cliente -- Compilar pack -- Activar firewall +- Compile binary (src client) +- Import machine to FreeBSD +- Compile server +- Prepare server files: create db, gen, compile quest, and create symlink, customize locale_string.txt and translate.lua +- Compile DumpProto +- Modify serverinfo.py in the client pack +- Compile pack +- Activate firewall -Personalizaciones y manejo de errores: -- Virtualización activada en la BIOS -- Opción de ver archivos y carpetas ocultos y ver extensiones de archivos -- Ejecutar órdenes inocuas -- Una vez dentro de la sesión de PuTTY en WinSCP, ir a Aplicaciones y marcar Recordar contraseña... Luego marcar Iniciar sesión... -- Eliminar pause de PML -- Notepad++ como predeterminado en WinSCP y en Windows -- En Notepad++ mostrar espacios y tabulaciones -- Compilar el binario con salida al cliente -- Poner enlaces simbólicos al source, main y quest -- Filtro de búsqueda en Notepad++ -- Plugin Compare en Notepad++ -- Anclar programas y el metin2client.exe +Customizations and Error Handling: +- Virtualization enabled in BIOS +- Option to view hidden files and folders and view file extensions +- Executing dummy protocol commands +- Remove pause from PML +- Set Notepad++ as default in WinSCP and Windows +- In Notepad++, show spaces and tabs +- Compile binary with output to client +- Create symbolic links to source, main, and quest +- Search filter in Notepad++ +- Compare plugin in Notepad++ +- Pin programs and metin2client.exe -Atajos útiles: -- Ctrl+G = ir a una línea específica en Notepad++ -- Home: ir a inicio de línea. End: ir a final de línea -- Ctrl+D = duplicar línea -- Ctrl+flecha = ir al inicio/final de la palabra actual -- Ctrl+Shift+flecha = seleccionar palabra actual -- F2 = cambiar nombre de archivo -- Win+flecha = separar ventana a un costado -- Win+D = mostrar escritorio +Useful Shortcuts: +- Ctrl+G = go to a specific line in Notepad++ +- Home: go to the beginning of the line. End: go to the end of the line +- Ctrl+D = duplicate line +- Ctrl+arrow = go to the beginning/end of the current word +- Ctrl+Shift+arrow = select current word +- F2 = rename file +- Win+flecha = snap window to the side +- Win+D = show desktop -Links útiles: -Página del autor de la base: https://martysama0134.com/ -Tutoriales del autor: https://martysama0134.com/Tutorials -Changelog de la base: https://martysama0134.com/Source_files/Changelog +Useful Links: +Author's base page: https://martysama0134.com/ +Author's tutorials: https://martysama0134.com/Tutorials +Base changelog: https://martysama0134.com/Source_files/Changelog +Multilanguage system: https://martysama0134.com/Source_addons/Mali_MultiLanguage +Offlineshop system: https://martysama0134.com/Source_addons/Ikarus_Offlineshop -Foros: +Forums: https://metin2.dev/ https://metin2hub.com/ https://www.metin2.network/ https://forum.turkmmo.com/ -https://metin2zone.net/ +https://metin2leak.com/ -Link de descarga de programas: +Download Links for Programs: Visual Studio 2022: https://acortar.link/cVVN6X -VirtualBox: https://www.virtualbox.org/wiki/Downloads (directa: https://download.virtualbox.org/virtualbox/7.0.14/VirtualBox-7.0.14-161095-Win.exe) -Navicat (licencia): https://www.navicat.com/en/download/navicat-premium +VirtualBox: https://www.virtualbox.org/wiki/Downloads (direct: https://download.virtualbox.org/virtualbox/7.0.14/VirtualBox-7.0.14-161095-Win.exe) +Navicat (licence): https://www.navicat.com/en/download/navicat-premium WinSCP: https://winscp.net/download/WinSCP-6.3.1-Setup.exe -PuTTY: https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html (directa https://the.earth.li/~sgtatham/putty/latest/w64/putty-64bit-0.80-installer.msi) -GitHub Desktop: https://desktop.github.com/ (directa https://central.github.com/deployments/desktop/desktop/latest/win32) -Notepad++: https://notepad-plus-plus.org/downloads/v8.6.4/ (directa: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.6.4/npp.8.6.4.Installer.x64.exe) -ChatGPT (escritorio): https://github.com/lencx/ChatGPT (directa: https://github.com/lencx/ChatGPT/releases/download/v1.1.0/ChatGPT_1.1.0_windows_x86_64.msi) +PuTTY: https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html (direct https://the.earth.li/~sgtatham/putty/latest/w64/putty-64bit-0.80-installer.msi) +GitHub Desktop: https://desktop.github.com/ (direct https://central.github.com/deployments/desktop/desktop/latest/win32) +Notepad++: https://notepad-plus-plus.org/downloads/v8.6.4/ (direct: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.6.4/npp.8.6.4.Installer.x64.exe) +ChatGPT (desktop): https://github.com/lencx/ChatGPT (direct: https://github.com/lencx/ChatGPT/releases/download/v1.1.0/ChatGPT_1.1.0_windows_x86_64.msi) PackMakerLite: repositorio Metin2 Clean -Beyond Compare (opcional): https://www.scootersoftware.com/download -Paint.net: https://www.getpaint.net/download.html (directa: https://github.com/paintdotnet/release/releases/download/v5.0.12/paint.net.5.0.12.install.anycpu.web.zip) -Everything: https://www.voidtools.com/es-es/ (directa: https://www.voidtools.com/Everything-1.4.1.1024.x64-Setup.exe) +Beyond Compare (optional): https://www.scootersoftware.com/download +Paint.net: https://www.getpaint.net/download.html (direct: https://github.com/paintdotnet/release/releases/download/v5.0.12/paint.net.5.0.12.install.anycpu.web.zip) +Everything: https://www.voidtools.com/es-es/ (direct: https://www.voidtools.com/Everything-1.4.1.1024.x64-Setup.exe) diff --git a/client/shop/notifications_Lobo.json b/client/shop/notifications_Lobo.json deleted file mode 100644 index a8e41ef8e..000000000 --- a/client/shop/notifications_Lobo.json +++ /dev/null @@ -1 +0,0 @@ -[{"type":4,"who":"Prueba2","what":299,"format":"100000","datetime":1729705456},{"type":5,"who":"","what":19,"format":"","datetime":1729705343},{"type":1,"who":"Prueba2","what":6009,"format":"5000","datetime":1729705178},{"type":0,"who":"","what":25040,"format":"3|0","datetime":1729691800},{"type":0,"who":"","what":25040,"format":"1|0","datetime":1729691768}] \ No newline at end of file diff --git a/client/shop/notifications_Prueba2.json b/client/shop/notifications_Prueba2.json deleted file mode 100644 index 36f6d1ba9..000000000 --- a/client/shop/notifications_Prueba2.json +++ /dev/null @@ -1 +0,0 @@ -[{"type":9,"who":"","what":6009,"format":"5000","datetime":1729705216}] \ No newline at end of file diff --git a/client/shop/price_history_hash.json b/client/shop/price_history_hash.json deleted file mode 100644 index 51f94ef16..000000000 --- a/client/shop/price_history_hash.json +++ /dev/null @@ -1 +0,0 @@ -[{"key":-1084740041,"expiration":1730316728,"price":15000,"count":1,"cheque":0},{"key":-427466805,"expiration":1730316706,"price":15000,"count":1,"cheque":0}] \ No newline at end of file diff --git a/client/shop/price_history_vnum.json b/client/shop/price_history_vnum.json deleted file mode 100644 index 84bf060ce..000000000 --- a/client/shop/price_history_vnum.json +++ /dev/null @@ -1 +0,0 @@ -[{"key":19,"expiration":1730316706,"price":15000,"count":1,"cheque":0},{"key":6009,"expiration":1730316728,"price":15000,"count":1,"cheque":0},{"key":25040,"expiration":1730316859,"price":3,"count":3,"cheque":0}] \ No newline at end of file diff --git a/client/shop/search_history.json b/client/shop/search_history.json deleted file mode 100644 index 667d6d96f..000000000 --- a/client/shop/search_history.json +++ /dev/null @@ -1 +0,0 @@ -[{"count":1,"datetime":1729736839,"item_name":"espada","type":0,"subtype":0,"level_start":0,"level_end":0,"price_start":0,"price_end":0,"alchemy":0,"sash":0,"attrtype0":0,"attrvalue0":0,"attrtype1":0,"attrvalue1":0,"attrtype2":0,"attrvalue2":0,"attrtype3":0,"attrvalue3":0,"attrtype4":0,"attrvalue4":0},{"count":1,"datetime":1729736853,"item_name":"espada","type":0,"subtype":0,"level_start":0,"level_end":0,"price_start":0,"price_end":0,"alchemy":0,"sash":0,"attrtype0":0,"attrvalue0":0,"attrtype1":0,"attrvalue1":0,"attrtype2":0,"attrvalue2":0,"attrtype3":0,"attrvalue3":0,"attrtype4":0,"attrvalue4":0},{"count":1,"datetime":1729736892,"item_name":"espada","type":0,"subtype":0,"level_start":0,"level_end":0,"price_start":0,"price_end":0,"alchemy":0,"sash":0,"attrtype0":0,"attrvalue0":0,"attrtype1":0,"attrvalue1":0,"attrtype2":0,"attrvalue2":0,"attrtype3":0,"attrvalue3":0,"attrtype4":0,"attrvalue4":0}] \ No newline at end of file diff --git a/client/syserr.txt b/client/syserr.txt deleted file mode 100644 index 54c89f043..000000000 --- a/client/syserr.txt +++ /dev/null @@ -1,30 +0,0 @@ -0601 12:44:04756 :: Traceback (most recent call last): - -0601 12:44:04756 :: File "ui.py", line 1302, in CallEvent - -0601 12:44:04756 :: File "ui.py", line 166, in __call__ - -0601 12:44:04756 :: File "ui.py", line 148, in __call__ - -0601 12:44:04756 :: File "uiSystemOption.py", line 124, in __OnClickTilingModeCPUButton - -0601 12:44:04756 :: AttributeError -0601 12:44:04756 :: : -0601 12:44:04756 :: 'module' object has no attribute 'SYSTEM_OPTION_CPU_TILING_1' -0601 12:44:04756 :: - -0601 12:44:06207 :: Traceback (most recent call last): - -0601 12:44:06207 :: File "ui.py", line 1302, in CallEvent - -0601 12:44:06207 :: File "ui.py", line 166, in __call__ - -0601 12:44:06207 :: File "ui.py", line 148, in __call__ - -0601 12:44:06208 :: File "uiSystemOption.py", line 136, in __OnClickTilingApplyButton - -0601 12:44:06208 :: AttributeError -0601 12:44:06208 :: : -0601 12:44:06208 :: 'module' object has no attribute 'SYSTEM_OPTION_TILING_EXIT' -0601 12:44:06208 :: - diff --git a/open-workspace-metin2-clean-58.bat b/open-workspace-metin2-clean-58.bat index b8c46557e..226efe2a7 100644 --- a/open-workspace-metin2-clean-58.bat +++ b/open-workspace-metin2-clean-58.bat @@ -1,9 +1,9 @@ -::Este archivo es para abrir las carpetas de tu repo y ser más organizado. Ingresa tus rutas. +::This file is for opening the folders in your repo and being more organized. Enter your paths. -::Ruta absoluta +::absolute path ::set my_path = C:\Users\Metin2\Documents\GitHub\Marty-v58\ -::Ruta relativa +::relative path set my_path = . start "" "%my_path%client" diff --git a/protos/protos/item_proto.txt b/protos/protos/item_proto.txt index 6965b98e0..e1f96679d 100644 --- a/protos/protos/item_proto.txt +++ b/protos/protos/item_proto.txt @@ -6594,7 +6594,7 @@ ITEM_VNUM~RANGE ITEM_NAME(K) ITEM_TYPE SUB_TYPE SIZE ANTI_FLAG FLAG ITEM_WEAR IM 30339 ÇÒ·ÎÀ© ¹«±â ±³È¯±Ç(À¯·á) ITEM_QUEST 0 1 ANTI_STACK NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 30341 ¿­È­ÀǹÝÁö ITEM_QUEST 0 1 NONE NONE NONE NONE 0 0 0 0 0 REAL_TIME 1800 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 30342 ÇÒ·ÎÀ©16 Åõ±¸ ±³È¯±Ç ITEM_QUEST 0 1 ANTI_DROP | ANTI_GIVE | ANTI_PKDROP | ANTI_STACK | ANTI_MYSHOP | ANTI_SAFEBOX NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 -30343 ÇÒ·ÎÀ©16 Åõ±¸ ±³È¯±Ç(À¯?ITEM_QUEST 0 1 ANTI_STACK NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 +30343 ÇÒ·ÎÀ©16 Åõ±¸ ±³È¯±Ç(À¯ ITEM_QUEST 0 1 ANTI_STACK NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 30344 Á¡·ÉÀüÀÔÀå±Ç ITEM_USE USE_SPECIAL 1 ANTI_DROP | ANTI_GIVE | ANTI_MYSHOP | ANTI_SAFEBOX | ANTI_PET21 ITEM_STACKABLE NONE NONE 50000 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 100000 0 0 0 0 0 0 0 0 30500 ºÓÀº Ä®ÀÚ·ç Á¶°¢ ITEM_MATERIAL MATERIAL_LEATHER 1 NONE ITEM_STACKABLE NONE NONE 1000 50 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 30501 ±Ýºû Ä®ÀÚ·ç ¸Ó¸® ITEM_MATERIAL MATERIAL_LEATHER 1 NONE ITEM_STACKABLE NONE NONE 1000 50 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 @@ -8864,8 +8864,8 @@ ITEM_VNUM~RANGE ITEM_NAME(K) ITEM_TYPE SUB_TYPE SIZE ANTI_FLAG FLAG ITEM_WEAR IM 50294 ¿ë¹æ±âº» º¸»ó ITEM_GIFTBOX 0 1 ANTI_DROP | ANTI_GIVE ITEM_STACKABLE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 7 0 0 0 0 0 0 0 0 50296 ÆÄÇØÀÔ¹®¼­<ÇÏ> »óÀÚ ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 50297 ÆÄÇØÀÔ¹®¼­<»ó> »óÀÚ ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 -50298 ÆÄÇØ ±â¼ú ¼ö·Ã¼­<ÇÏ> »ó?ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 -50299 ÆÄÇØ ±â¼ú ¼ö·Ã¼­<»ó> »ó?ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 +50298 ÆÄÇØ ±â¼ú ¼ö·Ã¼­<ÇÏ> »ó ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 +50299 ÆÄÇØ ±â¼ú ¼ö·Ã¼­<»ó> »ó ITEM_GIFTBOX 0 1 NONE NONE NONE NONE 0 0 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 5 0 0 0 0 0 0 0 0 50300 ±â¼ú ¼ö·Ã¼­ ITEM_SKILLBOOK 0 1 NONE NONE NONE NONE 1000 1000 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 0 0 0 0 0 0 0 0 50301 ¼ÕÀÚº´¹ý¼­ ITEM_USE USE_SPECIAL 1 NONE NONE NONE NONE 1000 1000 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 0 20 0 0 0 0 0 0 0 50302 ¿ÀÀÚº´¹ý¼­ ITEM_USE USE_SPECIAL 1 NONE NONE NONE NONE 1000 1000 0 0 0 LIMIT_NONE 0 LIMIT_NONE 0 APPLY_NONE 0 APPLY_NONE 0 APPLY_NONE 0 20 30 0 0 0 0 0 0 0 diff --git a/serverfiles/main/admin_panel.py b/serverfiles/main/admin_panel.py index 63fba1f71..fb2b4a802 100644 --- a/serverfiles/main/admin_panel.py +++ b/serverfiles/main/admin_panel.py @@ -218,8 +218,8 @@ elif phase in ['888', 'symlink']: os.chdir(os.path.join(v_mt2f, v_foldername, 'share', 'bin')) delete_symlink('game') delete_symlink('db') - run_command('ln -s /home/s3ll-v5-ex/s3ll_server/Srcs/Server/game/game_symlink game') - run_command('ln -s /home/s3ll-v5-ex/s3ll_server/Srcs/Server/db/db_symlink db') + run_command('ln -s /home/source-server/Srcs/Server/game/game_symlink game') + run_command('ln -s /home/source-server/Srcs/Server/db/db_symlink db') cecho('symlink completed') elif phase in ['999', 'search']: diff --git a/serverfiles/main/gen_settings.py b/serverfiles/main/gen_settings.py index 02d2308ef..ca8024faf 100644 --- a/serverfiles/main/gen_settings.py +++ b/serverfiles/main/gen_settings.py @@ -104,7 +104,7 @@ M2CONFIG = { ("LOCALE = {}", "latin1"), ), "extra": ( - ("PROTO_FROM_DB = {:d}", True), + ("PROTO_FROM_DB = {:d}", False), ("MIRROR2DB = {:d}", False), ) }, diff --git a/serverfiles/main/srv1/share/locale/germany/locale_string.txt b/serverfiles/main/srv1/share/locale/germany/locale_string.txt index ddf32e05f..6d48354e1 100644 --- a/serverfiles/main/srv1/share/locale/germany/locale_string.txt +++ b/serverfiles/main/srv1/share/locale/germany/locale_string.txt @@ -421,7 +421,7 @@ "°°Àº Á¾·ùÀÇ À¯´ÏÅ© ¾ÆÀÌÅÛ µÎ °³¸¦ µ¿½Ã¿¡ ÀåÂøÇÒ ¼ö ¾ø½À´Ï´Ù."; "[LS;468]"; -"%s ¿¡¼­ ¼ÒÄÏ ºüÁú¶§±îÁö ³²Àº ½Ã°£ %d"; +"%s¿¡¼­ ¼ÒÄÏ ºüÁú¶§±îÁö ³²Àº ½Ã°£ %d"; "[LS;469;%s;%d]"; "À̼º°£¿¡¸¸ ÇÒ ¼ö ÀÖ½À´Ï´Ù."; @@ -1816,7 +1816,7 @@ "<±æµå> ±æµå ½ºÅ³Àº ±æµåÀü Áß¿¡¸¸ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù."; "[LS;937]"; -"<±æµå> %luÀÇ ¿ë½Å·ÂÀ» ȸº¹ÇÏ¿´½À´Ï´Ù."; +"<±æµå> %uÀÇ ¿ë½Å·ÂÀ» ȸº¹ÇÏ¿´½À´Ï´Ù."; "[LS;938;%u]"; "<±æµå> ±æµå ±Ý°í¿¡¼± ±æµåÀ常 Ãâ±ÝÇÒ ¼ö ÀÖ½À´Ï´Ù."; @@ -2291,7 +2291,7 @@ "[LS;1057;%d]"; "%s ȸÇÇ! (%d%%)"; -"[LS;1959;%s;%d]"; +"[LS;913;%s;%d]"; "You cannot exchange the won right now. Close some windows."; "[LS;1960]"; diff --git a/serverfiles/sql/manual.txt b/serverfiles/sql/manual.txt index 699358802..a8a7eebd0 100644 --- a/serverfiles/sql/manual.txt +++ b/serverfiles/sql/manual.txt @@ -1,16 +1,16 @@ #MARIA DB -#Primero ejecuta sh run.sh y después pega el contenido de este archivo en la consola +#First run sh run.sh and then paste the contents of this file into the console. -########Establecer contraseña y permisos a root +########Set password and permissions for root. -mysql -u root -UPDATE user SET password=PASSWORD('your_password') WHERE user='root'; #cambiar your_password -##### Permisos localhost -GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'your_password'; #cambiar your_password +mysql -u root -ppassword +UPDATE user SET password=PASSWORD('your_password') WHERE user='root'; #change your_password +##### localhost permissions +GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'your_password'; #change your_password ######## -##### Permisos a todos los hosts -GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'your_password'; #cambiar your_password +##### Permissions for all hosts +GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'your_password'; #change your_password # FLUSH PRIVILEGES; diff --git a/source-client/Srcs/Client/UserInterface/PythonIkarusShop.cpp b/source-client/Srcs/Client/UserInterface/PythonIkarusShop.cpp index 0aeaf2168..bcf71cff5 100644 --- a/source-client/Srcs/Client/UserInterface/PythonIkarusShop.cpp +++ b/source-client/Srcs/Client/UserInterface/PythonIkarusShop.cpp @@ -1394,7 +1394,7 @@ void CPythonIkarusShop::RenderEntities() iter->Render(); iter->BlendRender(); } - TraceError(""); + if (CPythonSystem::Instance().IsShowSalesText()) { auto& graphic = CPythonGraphic::Instance(); graphic.PushState();