- Moved the homunculus setting from pet.conf to homunc.conf

- Fixed homuncs not triggering land spells if they are spawned on top of them and hom_setting&0x2 is not set to make them bypass them.


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

2 files changed, 13 insertions, 13 deletions

diff --git a/conf-tmpl/battle/homunc.conf b/conf-tmpl/battle/homunc.conf
index 773d37471..dca92526b 100644
--- a/conf-tmpl/battle/homunc.conf
+++ b/conf-tmpl/battle/homunc.conf
@@ -27,6 +27,19 @@
 // features.
 //--------------------------------------------------------------
 
+// Homunculus setting [Note 4]
+// (placed here since homuncs are more or less like pet mobs)
+// Activates various homunc-related 'quirks' that makes them behave unlike
+//  normal characters.
+// 0x001: They can't be targetted by support skills (except for their master)
+// 0x002: They are inmune to land skills.
+// 0x004: Mobs will always go after them instead of players until attacked.
+// 0x008: They copy their master's speed on spawn/map-change
+// 0x010: They display luk/3+1 instead of their actual critical in the
+//        stat window (by default they don't crit)
+// 0x020: Their Min-Matk is always the same as their max
+hom_setting: 0xFFFF
+
 // The rate a homunculus will get friendly by feeding it. (Note 2)
 homunculus_friendly_rate: 100
 
diff --git a/conf-tmpl/battle/pet.conf b/conf-tmpl/battle/pet.conf
index 3372fbe57..1f2366e00 100644
--- a/conf-tmpl/battle/pet.conf
+++ b/conf-tmpl/battle/pet.conf
@@ -29,19 +29,6 @@
 // features.
 //--------------------------------------------------------------
 
-// Homunculus setting [Note 4]
-// (placed here since homuncs are more or less like pet mobs)
-// Activates various homunc-related 'quirks' that makes them behave unlike
-//  normal characters.
-// 0x001: They can't be targetted by support skills (except for their master)
-// 0x002: They are inmune to land skills.
-// 0x004: Mobs will always go after them instead of players until attacked.
-// 0x008: They copy their master's speed on spawn/map-change
-// 0x010: They display luk/3+1 instead of their actual critical in the
-//        stat window (by default they don't crit)
-// 0x020: Their Min-Matk is always the same as their max
-hom_setting: 0xFFFF
-
 // Rate for catching pets (Note 2)
 pet_catch_rate: 100