X-Metin2/Marty-v58
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates & fixes

Browse Source
This commit is contained in:
metin2clean 2024-10-25 00:31:08 -05:00
parent d6630ed3b9
commit ce7ca5b6b9
14 changed files with 83 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
README.txt
View File

@ -2,29 +2,27 @@ Server Clean
https://www.youtube.com/@ServerClean 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 with addons: offlineshop and multilanguage
Base: Marty Sama 5.8 (sin complementos, limpia)
Changelog: https://martysama0134.com/Source_files/Changelog 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: Software Versions:
Motor de base datos: MariaDB 10.6 Database engine: MariaDB 10.6
Sistema operativo: FreeBSD 13.2 Operating system: FreeBSD 13.2
Compilador cliente: VisualStudio 2022 v143 Client compiler: VisualStudio 2022 v143
Compilador servidor: gcc10 portable a clang 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 Visual Studio 2022 v143
VirtualBox VirtualBox
@ -33,70 +31,71 @@ WinSCP
PuTTY PuTTY
GitHub Desktop GitHub Desktop
Notepad++ Notepad++
ChatGPT (escritorio) ChatGPT (desktop)
PackMakerLite PackMakerLite
Beyond Compare (opcional) Beyond Compare (optional)
Paint.net paint.net
Everything (opcional) Everything
Pasos para la instalación: Installation Steps:
- Compilar binario - Compile binary (src client)
- Importar máquina a FreeBSD - Import machine to FreeBSD
- Compilar server - Compile server
- Preparar serverfiles: crear db, gen, compilar quest y crear symlink, personalizar locale_string.txt y translate.lua - Prepare server files: create db, gen, compile quest, and create symlink, customize locale_string.txt and translate.lua
- Compilar DumpProto - Compile DumpProto
- Modificar serverinfo.py en pack del cliente - Modify serverinfo.py in the client pack
- Compilar pack - Compile pack
- Activar firewall - Activate firewall
Personalizaciones y manejo de errores: Customizations and Error Handling:
- Virtualización activada en la BIOS - Virtualization enabled in BIOS
- Opción de ver archivos y carpetas ocultos y ver extensiones de archivos - Option to view hidden files and folders and view file extensions
- Ejecutar órdenes inocuas - Executing dummy protocol commands
- Una vez dentro de la sesión de PuTTY en WinSCP, ir a Aplicaciones y marcar Recordar contraseña... Luego marcar Iniciar sesión... - Remove pause from PML
- Eliminar pause de PML - Set Notepad++ as default in WinSCP and Windows
- Notepad++ como predeterminado en WinSCP y en Windows - In Notepad++, show spaces and tabs
- En Notepad++ mostrar espacios y tabulaciones - Compile binary with output to client
- Compilar el binario con salida al cliente - Create symbolic links to source, main, and quest
- Poner enlaces simbólicos al source, main y quest - Search filter in Notepad++
- Filtro de búsqueda en Notepad++ - Compare plugin in Notepad++
- Plugin Compare en Notepad++ - Pin programs and metin2client.exe
- Anclar programas y el metin2client.exe
Atajos útiles: Useful Shortcuts:
- Ctrl+G = ir a una línea específica en Notepad++ - Ctrl+G = go to a specific line in Notepad++
- Home: ir a inicio de línea. End: ir a final de línea - Home: go to the beginning of the line. End: go to the end of the line
- Ctrl+D = duplicar línea - Ctrl+D = duplicate line
- Ctrl+flecha = ir al inicio/final de la palabra actual - Ctrl+arrow = go to the beginning/end of the current word
- Ctrl+Shift+flecha = seleccionar palabra actual - Ctrl+Shift+arrow = select current word
- F2 = cambiar nombre de archivo - F2 = rename file
- Win+flecha = separar ventana a un costado - Win+flecha = snap window to the side
- Win+D = mostrar escritorio - Win+D = show desktop
Links útiles: Useful Links:
Página del autor de la base: https://martysama0134.com/ Author's base page: https://martysama0134.com/
Tutoriales del autor: https://martysama0134.com/Tutorials Author's tutorials: https://martysama0134.com/Tutorials
Changelog de la base: https://martysama0134.com/Source_files/Changelog 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://metin2.dev/
https://metin2hub.com/ https://metin2hub.com/
https://www.metin2.network/ https://www.metin2.network/
https://forum.turkmmo.com/ 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 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) VirtualBox: https://www.virtualbox.org/wiki/Downloads (direct: 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 Navicat (licence): https://www.navicat.com/en/download/navicat-premium
WinSCP: https://winscp.net/download/WinSCP-6.3.1-Setup.exe 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) 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/ (directa https://central.github.com/deployments/desktop/desktop/latest/win32) 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/ (directa: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.6.4/npp.8.6.4.Installer.x64.exe) 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 (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) 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 PackMakerLite: repositorio Metin2 Clean
Beyond Compare (opcional): https://www.scootersoftware.com/download Beyond Compare (optional): 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) 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/ (directa: https://www.voidtools.com/Everything-1.4.1.1024.x64-Setup.exe) Everything: https://www.voidtools.com/es-es/ (direct: https://www.voidtools.com/Everything-1.4.1.1024.x64-Setup.exe)

1
client/shop/notifications_Lobo.json
View File

@ -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}]

1
client/shop/notifications_Prueba2.json
View File

@ -1 +0,0 @@
[{"type":9,"who":"","what":6009,"format":"5000","datetime":1729705216}]

1
client/shop/price_history_hash.json
View File

@ -1 +0,0 @@
[{"key":-1084740041,"expiration":1730316728,"price":15000,"count":1,"cheque":0},{"key":-427466805,"expiration":1730316706,"price":15000,"count":1,"cheque":0}]

1
client/shop/price_history_vnum.json
View File

@ -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}]

1
client/shop/search_history.json
View File

@ -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}]

30
client/syserr.txt
View File

@ -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 ::

6
open-workspace-metin2-clean-58.bat
View File

@ -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\ ::set my_path = C:\Users\Metin2\Documents\GitHub\Marty-v58\
::Ruta relativa ::relative path
set my_path = . set my_path = .
start "" "%my_path%client" start "" "%my_path%client"

6
protos/protos/item_proto.txt
View File

@ -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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

4
serverfiles/main/admin_panel.py
View File

@ -218,8 +218,8 @@ elif phase in ['888', 'symlink']:
os.chdir(os.path.join(v_mt2f, v_foldername, 'share', 'bin')) os.chdir(os.path.join(v_mt2f, v_foldername, 'share', 'bin'))
delete_symlink('game') delete_symlink('game')
delete_symlink('db') delete_symlink('db')
run_command('ln -s /home/s3ll-v5-ex/s3ll_server/Srcs/Server/game/game_symlink game') run_command('ln -s /home/source-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/db/db_symlink db')
cecho('symlink completed') cecho('symlink completed')
elif phase in ['999', 'search']: elif phase in ['999', 'search']:

2
serverfiles/main/gen_settings.py
View File

@ -104,7 +104,7 @@ M2CONFIG = {
("LOCALE = {}", "latin1"), ("LOCALE = {}", "latin1"),
), ),
"extra": ( "extra": (
("PROTO_FROM_DB = {:d}", True), ("PROTO_FROM_DB = {:d}", False),
("MIRROR2DB = {:d}", False), ("MIRROR2DB = {:d}", False),
) )
}, },

6
serverfiles/main/srv1/share/locale/germany/locale_string.txt
View File

@ -421,7 +421,7 @@
"같은 종류의 유니크 아이템 두 개를 동시에 장착할 수 없습니다."; "같은 종류의 유니크 아이템 두 개를 동시에 장착할 수 없습니다.";
"[LS;468]"; "[LS;468]";
"%s 에서 소켓 빠질때까지 남은 시간 %d"; "%s에서 소켓 빠질때까지 남은 시간 %d";
"[LS;469;%s;%d]"; "[LS;469;%s;%d]";
"이성간에만 할 수 있습니다."; "이성간에만 할 수 있습니다.";
@ -1816,7 +1816,7 @@
"<길드> 길드 스킬은 길드전 중에만 사용할 수 있습니다."; "<길드> 길드 스킬은 길드전 중에만 사용할 수 있습니다.";
"[LS;937]"; "[LS;937]";
"<길드> %lu의 용신력을 회복하였습니다."; "<길드> %u의 용신력을 회복하였습니다.";
"[LS;938;%u]"; "[LS;938;%u]";
"<길드> 길드 금고에선 길드장만 출금할 수 있습니다."; "<길드> 길드 금고에선 길드장만 출금할 수 있습니다.";
@ -2291,7 +2291,7 @@
"[LS;1057;%d]"; "[LS;1057;%d]";
"%s 회피! (%d%%)"; "%s 회피! (%d%%)";
"[LS;1959;%s;%d]"; "[LS;913;%s;%d]";
"You cannot exchange the won right now. Close some windows."; "You cannot exchange the won right now. Close some windows.";
"[LS;1960]"; "[LS;1960]";

16
serverfiles/sql/manual.txt
View File

@ -1,16 +1,16 @@
#MARIA DB #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 mysql -u root -ppassword
UPDATE user SET password=PASSWORD('your_password') WHERE user='root'; #cambiar your_password UPDATE user SET password=PASSWORD('your_password') WHERE user='root'; #change your_password
##### Permisos localhost ##### localhost permissions
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'your_password'; #cambiar your_password GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'your_password'; #change your_password
######## ########
##### Permisos a todos los hosts ##### Permissions for all hosts
GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'your_password'; #cambiar your_password GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'your_password'; #change your_password
# #
FLUSH PRIVILEGES; FLUSH PRIVILEGES;

2
source-client/Srcs/Client/UserInterface/PythonIkarusShop.cpp
View File

@ -1394,7 +1394,7 @@ void CPythonIkarusShop::RenderEntities()
iter->Render(); iter->Render();
iter->BlendRender(); iter->BlendRender();
} }
TraceError("");
if (CPythonSystem::Instance().IsShowSalesText()) { if (CPythonSystem::Instance().IsShowSalesText()) {
auto& graphic = CPythonGraphic::Instance(); auto& graphic = CPythonGraphic::Instance();
graphic.PushState(); graphic.PushState();