rathena · aleos89 · Jan 12, 2024 · Jan 12, 2024 · Jan 12, 2024 · Jan 12, 2024
diff --git a/conf/battle/battleground.conf b/conf/battle/battleground.conf
@@ -9,25 +9,6 @@
 // assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
 //--------------------------------------------------------------
 
-// Melee damage adjustments (non skills) for Battleground maps (Note 2)
-bg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
-bg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for Battleground maps (Note 2)
-bg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for Battleground maps (Note 2)
-bg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for Battleground maps (Note 2)
-bg_misc_attack_damage_rate: 60
-
-// Flee penalty on BG grounds.
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-bg_flee_penalty: 20
-
 // Interval before updating the bg-member map mini-dots (milliseconds)
 bg_update_interval: 1000
 

diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
@@ -27,25 +27,6 @@ guild_max_castles: 0
 // Note: This was changed in renewal in favor of individual skill cooldown.
 guild_skill_relog_delay: 300000
 
-// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 60
-
-// Flee penalty on gvg grounds. Official value is 20 (Note 2)
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-gvg_flee_penalty: 20
-
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers

diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
@@ -39,14 +39,6 @@ pk_min_level: 55
 // players to let them attack each other. 0 disables said limit.
 pk_level_range: 0
 
-// For PK servers. Damage adjustment settings, these follow the same logic
-// as their WoE counterparts (see guild.conf) 
-pk_short_attack_damage_rate: 80
-pk_long_attack_damage_rate: 70
-pk_weapon_attack_damage_rate: 60
-pk_magic_attack_damage_rate: 60
-pk_misc_attack_damage_rate: 60
-
 // Display skill usage in console? (for debug only) (default: off) (Note 3)
 skill_log: off
 

diff --git a/conf/battle/player.conf b/conf/battle/player.conf
@@ -46,11 +46,6 @@ quest_skill_reset: no
 // You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
 basic_skill_check: yes
 
-// When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds)
-// That is, when you go to a map and don't move, how long before the monsters will notice you.
-// If you attack a monster, it will attack you back regardless of this setting.
-player_invincible_time: 5000
-
 // The time interval for HP to restore naturally. (in milliseconds)
 natural_healhp_interval: 6000
 

diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf
@@ -936,7 +936,11 @@
 // @reloadcashdb
 832: Cash shop database has been reloaded.
 
-//833-899 free
+// Map Zones
+833: This command is disabled on this map.
+834: Map Zone database has been reloaded.
+
+//834-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1127,9 +1131,9 @@
 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: Map: %s (Zone: %s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)

diff --git a/conf/msg_conf/map_msg_chn.conf b/conf/msg_conf/map_msg_chn.conf
@@ -871,9 +871,9 @@
 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
 1039: ------ 地圖資訊 ------
-1040: 地圖名: %s | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d
+1040: 地圖名: %s (Zone: %s) | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d | Vendings: %d
 1041: ------ 地圖旗標 ------
-1042: 城市地圖
+1042: Battle Rate Adjustments:
 1043: 可離線掛店
 1044: 不可離線掛店
 1045: 戰場 (類型 %d)

diff --git a/conf/msg_conf/map_msg_frn.conf b/conf/msg_conf/map_msg_frn.conf
@@ -883,9 +883,9 @@
 // @mapinfo
 1038: Entrez un num�ro de la liste (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Nom de la Map: %s | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d
+1040: Nom de la Map: %s (Zone: %s) | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Battle Rate Adjustments:
 1043: Autotrade Activ�
 1044: Autotrade D�sactiv�
 1045: Battlegrounds ON (type %d)

diff --git a/conf/msg_conf/map_msg_idn.conf b/conf/msg_conf/map_msg_idn.conf
@@ -970,9 +970,9 @@
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
+1040: Map: %s (Zone: %s) | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
 1041: ------ Map Flags ------
-1042: Kota
+1042: Battle Rate Adjustments:
 1043: Autotrade diaktifkan
 1044: Autotrade dinonaktifkan
 1045: Battleground ON (tipe %d)

diff --git a/conf/msg_conf/map_msg_por.conf b/conf/msg_conf/map_msg_por.conf
@@ -1052,9 +1052,9 @@
 // @mapinfo
 1038: Digite pelo menos um n�mero v�lido da lista (uso: @mapinfo <0-3> <mapa>).
 1039: ------ Informa��o do Mapa ------
-1040: Mapa: %s | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
+1040: Mapa: %s (Zona: %s) | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
 1041: ------ Map Flags ------
-1042: Mapa de Cidade
+1042: Ajustes na taxa de dano:
 1043: Autotrade Habilitado
 1044: Autotrade Desabilitado
 1045: Battlegrounds Habilitado (tipo %d)

diff --git a/conf/msg_conf/map_msg_rus.conf b/conf/msg_conf/map_msg_rus.conf
@@ -884,9 +884,9 @@
 // @mapinfo
 1038: ������� ���� �� ���� ����� (�������������: @mapinfo <0-3> <�������>).
 1039: ------ ���������� � ������� ------
-1040: �������� �������: %s | ������: %d | ���: %d | ����: %d
+1040: �������� �������: %s (Zone: %s) | ������: %d | ���: %d | ����: %d | Vendings: %d
 1041: ------ �������� ------
-1042: �������
+1042: Battle Rate Adjustments:
 1043: Autotrade ��������
 1044: Autotrade ��������
 1045: Battlegrounds �������� (��� %d)

diff --git a/conf/msg_conf/map_msg_spn.conf b/conf/msg_conf/map_msg_spn.conf
@@ -1124,9 +1124,9 @@
 // @mapinfo
 1038: Introduce un n�mero de la lista (instrucciones: @mapinfo <0-3> <mapa>).
 1039: ------ Informaci�n del mapa ------
-1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
+1040: Mapa: %s (Zona: %s) | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
-1042: Mapa de ciudad
+1042: Ajuste Tasa de Batalla:
 1043: Autotrade activado
 1044: Autotrade desactivado
 1045: Battleground activado (tipo %d)

diff --git a/conf/msg_conf/map_msg_tha.conf b/conf/msg_conf/map_msg_tha.conf
@@ -877,9 +877,9 @@
 // @mapinfo
 1038: �ô�к��Ţ���ҧ˹���˹�觤�Ҩҡ��¡�� (�Ը���: @mapinfo <0-3> <map>).
 1039: ------ ��������´Ἱ��� ------
-1040: Ἱ���: %s | ������: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: Ἱ���: %s (Zone: %s) | ������: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Battle Rate Adjustments:
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)

diff --git a/db/import-tmpl/item_noequip.txt b/db/import-tmpl/item_noequip.txt
diff --git a/db/import-tmpl/job_noenter_map.txt b/db/import-tmpl/job_noenter_map.txt
diff --git a/db/import-tmpl/map_zones.yml b/db/import-tmpl/map_zones.yml
@@ -0,0 +1,39 @@
+# This file is a part of rAthena.
+# Copyright(C) 2024 rAthena Development Team
+# https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id Zone ID.
+# DisabledCommands: List of disabled @commands. (Default: null)
+# DisabledSkills: List of disabled skills. (Default: null)
+# DisabledItems: List of disabled items. (Default: null)
+# DisabledStatuses: List of disabled statuses. (Default: null)
+# RestrictedJobs: List of restricted jobs from entering zone. (Default: null)
+# Maps: List of maps to apply the zone to.
+# Mapflags: List of mapflags. (Default: null)
+# - Flag Mapflag name.
+# Value Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+ Type: MAP_ZONES
+ Version: 1
diff --git a/db/import-tmpl/skill_nocast_db.txt b/db/import-tmpl/skill_nocast_db.txt
diff --git a/db/import-tmpl/status_disabled.txt b/db/import-tmpl/status_disabled.txt
diff --git a/db/map_zones.yml b/db/map_zones.yml
@@ -0,0 +1,47 @@
+# This file is a part of rAthena.
+# Copyright(C) 2024 rAthena Development Team
+# https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id Zone ID.
+# DisabledCommands: List of disabled @commands. (Default: null)
+# DisabledSkills: List of disabled skills. (Default: null)
+# DisabledItems: List of disabled items. (Default: null)
+# DisabledStatuses: List of disabled statuses. (Default: null)
+# RestrictedJobs: List of restricted jobs from entering zone. (Default: null)
+# Maps: List of maps to apply the zone to.
+# Mapflags: List of mapflags. (Default: null)
+# - Flag Mapflag name.
+# Value Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+ Type: MAP_ZONES
+ Version: 1
+
+Footer:
+ Imports:
+ - Path: db/pre-re/map_zones.yml
+ Mode: Prerenewal
+ - Path: db/re/map_zones.yml
+ Mode: Renewal
+ - Path: db/import/map_zones.yml