Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour

4 files changed, 27 insertions, 0 deletions

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index 8df6ea54..59f5fceb 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -177,3 +177,15 @@ client_emblem_max_blank_percent: 100
 // kRO removed the packet and this re-enables the message.
 // Official: false.
 mvp_exp_reward_message: false
+
+// Displays the same HP value as official servers do when a character is dead.
+// (Note 1)
+// On official servers, HP are never displayed as 0, but when dead, they
+// display the value that will be shown after resurrection (50% HP for novice
+// classes, 1 HP for other classes). Athena servers, instead, show the real
+// value (0 when dead), to avoid confusion.
+// Note: this is only a visual setting, and the server will internally handle
+// it as 0 regardless of this. This means that scripts will know that the
+// character has 0 HP when dead.
+// Default: true (Official behavior)
+display_fake_hp_when_dead: false
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index 144e04ea..e834b80f 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -123,3 +123,11 @@ boarding_halter_speed: 25
 // Allow to use items when the storage is open?
 // Official: false (Default)
 storage_use_item: false
+
+// Minimum item buy price at shop
+// Default: 1
+min_item_buy_price: 1
+
+// Minimum item sell price at shop
+// Default: 0
+min_item_sell_price: 0
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index d258567a..64bba68b 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -307,6 +307,12 @@ dancing_weaponswitch_fix: true
 // 1: Traps in GvG make player stop moving right when stepping over it.
 skill_trap_type: 0
 
+// Trap Reflect
+// Whether the damage from traps must be reflected (for example by Reflect Shield or High Orc Card)?
+// true: Aegis - traps are reflected
+// false: Athena - traps are not reflected
+trap_reflect: true
+
 // Max Possible Level of Monster skills
 // Note: If your MVPs are too tough, reduce it to 10.
 mob_max_skilllvl: 100
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 58cf9446..f9cb4cad 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -89,6 +89,7 @@ map_list: (
     "008-2-7",
     "008-2-8",
     "008-2-9",
+    "008-3-0",
     "008-3-1",
     "test",
     "testbg",