git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5142 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 8 insertions, 10 deletions

diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 27cefb839..2a7ef55f2 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -85,16 +85,14 @@ any_warp_GM_min_level: 20
 // Allow GM commands to be used when muted?
 allow_atcommand_when_mute: yes
 
-// The minimum level for GMs' to do not allow them to drop items on the ground, use the Storage, 
-// use the Vend Skill, use guild storage, or trade Items/Zeny?
-// Any GM with level UNDER this value CAN drop items/trade
+// The minimum level for a GM to be unable to distribyte items.
+// You should set this to the same level @item is set to in the atcommand.conf
 // NEVER SET THIS VALUE TO 0, or you will block drop/trade for normal players
 gm_cant_drop_min_lv: 1
 
-// The maximum level for GMs' to do not allow them to drop items on the ground, use the Storage, 
-// use the Vend Skill, use guild storage, or trade Items/Zeny?
-// Any GM with level ABOVE this value CAN drop items/trade
-gm_cant_drop_max_lv: 0
+//The trust level for your GMs. Any GMs ABOVE this level will be able to distribute items
+//ie: Use Storage/Guild Storage, Drop Items, Use Vend, Trade items. 
+gm_cant_drop_max_lv: 98
 
 // Minimum GM level to see the hp of every player? (Default: 60)
 // no/0 can be used to disable it.
diff --git a/conf-tmpl/battle/pet.conf b/conf-tmpl/battle/pet.conf
index be0009325..297ad6268 100644
--- a/conf-tmpl/battle/pet.conf
+++ b/conf-tmpl/battle/pet.conf
@@ -45,7 +45,7 @@ pet_hungry_friendly_decrease: 5
 
 // Does Pet's Attack Damage Based On Str (Note 1)
 // Note: Few pets have str above 1, enabling this can give an unfair advantage to these pets.
-pet_str: yes
+pet_str: no
 
 // Does the pet need its equipment before it does its skill? (Note 1)
 pet_equip_required: yes
@@ -64,7 +64,7 @@ pet_support_min_friendly: 900
 // Whether or not the pet's will use skills. (Note 1)
 // Note: Offensive pet skills need at least pet_attack_support or 
 // pet_damage_support to work (they trigger while the pet is attacking).
-pet_status_support: yes
+pet_status_support: no
 
 // Rate at which a pet will support it's owner in battle. (Note 2)
 // Affects pet_attack_support & pet_damage_support.
@@ -93,4 +93,4 @@ pet_max_atk2: 1000
 // Are pets disabled during Guild Wars?
 // If set to yes, pets are automatically returned to egg when entering castles during WoE times
 // and hatching is forbidden within as well.
-pet_disable_in_gvg: no
+pet_disable_in_gvg: yes