diff --git a/bin/pack/root/serverinfo.py b/bin/pack/root/serverinfo.py index 11c64106..49e12431 100644 --- a/bin/pack/root/serverinfo.py +++ b/bin/pack/root/serverinfo.py @@ -1,5 +1,11 @@ -SERVER_NAME = "Metin2" -SERVER_IP = "127.0.0.1" +SERVER_NAME_1 = "Local server" +SERVER_NAME_2 = "Dev server" +SERVER_NAME_3 = "Homeserver" +SERVER_NAME_4 = "Raspberry Pi" +SERVER_IP_1 = "127.0.0.1" +SERVER_IP_2 = "10.11.255.203" +SERVER_IP_3 = "192.168.100.3" +SERVER_IP_4 = "192.168.100.136" CH1_NAME = "CH1" CH2_NAME = "CH2" CH3_NAME = "CH3" @@ -21,10 +27,16 @@ STATE_DICT = { } SERVER01_CHANNEL_DICT = { - 1: {"key": 11, "name": CH1_NAME, "ip": SERVER_IP, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE}, - 2: {"key": 12, "name": CH2_NAME, "ip": SERVER_IP, "tcp_port": PORT_2, "udp_port": PORT_2, "state": STATE_NONE}, - 3: {"key": 13, "name": CH3_NAME, "ip": SERVER_IP, "tcp_port": PORT_3, "udp_port": PORT_3, "state": STATE_NONE}, - 4: {"key": 14, "name": CH4_NAME, "ip": SERVER_IP, "tcp_port": PORT_4, "udp_port": PORT_4, "state": STATE_NONE}, + 1: {"key": 11, "name": CH1_NAME, "ip": SERVER_IP_1, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE}, +} +SERVER02_CHANNEL_DICT = { + 1: {"key": 21, "name": CH1_NAME, "ip": SERVER_IP_2, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE}, +} +SERVER03_CHANNEL_DICT = { + 1: {"key": 31, "name": CH1_NAME, "ip": SERVER_IP_3, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE}, +} +SERVER04_CHANNEL_DICT = { + 1: {"key": 41, "name": CH1_NAME, "ip": SERVER_IP_4, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE}, } REGION_NAME_DICT = { @@ -33,16 +45,25 @@ REGION_NAME_DICT = { REGION_AUTH_SERVER_DICT = { 0: { - 1: {"ip": SERVER_IP, "port": PORT_AUTH}, + 1: {"ip": SERVER_IP_1, "port": PORT_AUTH}, + 2: {"ip": SERVER_IP_2, "port": PORT_AUTH}, + 3: {"ip": SERVER_IP_3, "port": PORT_AUTH}, + 4: {"ip": SERVER_IP_4, "port": PORT_AUTH}, } } REGION_DICT = { 0: { - 1: {"name": SERVER_NAME, "channel": SERVER01_CHANNEL_DICT}, + 1: {"name": SERVER_NAME_1, "channel": SERVER01_CHANNEL_DICT}, + 2: {"name": SERVER_NAME_2, "channel": SERVER02_CHANNEL_DICT}, + 3: {"name": SERVER_NAME_3, "channel": SERVER03_CHANNEL_DICT}, + 4: {"name": SERVER_NAME_4, "channel": SERVER04_CHANNEL_DICT}, }, } MARKADDR_DICT = { - 10: {"ip": SERVER_IP, "tcp_port": PORT_MARK, "mark": "10.tga", "symbol_path": "10"}, + 10: {"ip": SERVER_IP_1, "tcp_port": PORT_MARK, "mark": "10.tga", "symbol_path": "10"}, + 20: {"ip": SERVER_IP_2, "tcp_port": PORT_MARK, "mark": "20.tga", "symbol_path": "20"}, + 30: {"ip": SERVER_IP_3, "tcp_port": PORT_MARK, "mark": "30.tga", "symbol_path": "30"}, + 40: {"ip": SERVER_IP_4, "tcp_port": PORT_MARK, "mark": "40.tga", "symbol_path": "40"}, } \ No newline at end of file diff --git a/src/Config/version_info.rc b/src/Config/version_info.rc index 14016f91..a576468b 100644 --- a/src/Config/version_info.rc +++ b/src/Config/version_info.rc @@ -15,8 +15,8 @@ #endif VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 3, 1, 0 -PRODUCTVERSION 0, 3, 1, 0 +FILEVERSION 0,4,0,0 +PRODUCTVERSION 0,4,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS METIN2_DEBUG FILEOS VOS__WINDOWS32 @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Old Metin2 Project" VALUE "FileDescription", METIN2_COMPONENT_DESCRIPTION - VALUE "FileVersion", "0.3.1.0" + VALUE "FileVersion", "0.4.0.0" VALUE "InternalName", METIN2_COMPONENT_INTERNALNAME - VALUE "LegalCopyright", "Copyright (C) 2024" + VALUE "LegalCopyright", "Copyright (C) 2022-2025" VALUE "OriginalFilename", METIN2_COMPONENT_FILENAME VALUE "ProductName", "Metin2Config" - VALUE "ProductVersion", "0.3.1.0" + VALUE "ProductVersion", "0.4.0.0" END END diff --git a/src/UserInterface/UserInterface.rc b/src/UserInterface/UserInterface.rc index 0c13c245..35e6eb3a 100644 --- a/src/UserInterface/UserInterface.rc +++ b/src/UserInterface/UserInterface.rc @@ -126,8 +126,8 @@ IDI_METIN2 ICON "metin2.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,1,0 - PRODUCTVERSION 0,3,1,0 + FILEVERSION 0,4,0,0 + PRODUCTVERSION 0,4,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -144,12 +144,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Old Metin2 Project" VALUE "FileDescription", "The Metin2 Client" - VALUE "FileVersion", "0.3.1.0" + VALUE "FileVersion", "0.4.0.0" VALUE "InternalName", "Metin2Client" - VALUE "LegalCopyright", "Copyright (C) 2024" + VALUE "LegalCopyright", "Copyright (C) 2022-2025" VALUE "OriginalFilename", "Metin2.exe" VALUE "ProductName", "Metin2Client" - VALUE "ProductVersion", "0.3.1.0" + VALUE "ProductVersion", "0.4.0.0" END END BLOCK "VarFileInfo"