diff options
| -rw-r--r-- | conf-tmpl/Changelog.txt | 2 | ||||
| -rw-r--r-- | conf-tmpl/battle/homunc.conf | 13 | ||||
| -rw-r--r-- | conf-tmpl/battle/pet.conf | 13 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/trade.c | 1 |
6 files changed, 18 insertions, 17 deletions
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt index a78ae35fd..6f6fbb26a 100644 --- a/conf-tmpl/Changelog.txt +++ b/conf-tmpl/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2007/01/22 + * Moved the homunculus setting from pet.conf to homunc.conf [Skotlex] 2007/01/12 * Updated the information about ip rules and DDoS protection in packet_athena.conf and commented out the line "allow: all" so 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 diff --git a/src/map/battle.c b/src/map/battle.c index 951dbcc5c..aec804b3d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3849,7 +3849,7 @@ static const struct battle_data_int { { "mob_remove_delay", &battle_config.mob_remove_delay }, { "sg_miracle_skill_min_duration", &battle_config.sg_miracle_skill_duration_min }, { "sg_miracle_skill_max_duration", &battle_config.sg_miracle_skill_duration_max }, - { "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate }, //[orn] + { "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate }, //[orn] }; int battle_set_value(char *w1, char *w2) { diff --git a/src/map/clif.c b/src/map/clif.c index f5fad25e4..355d001fd 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8292,8 +8292,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) //Homunc mimic their master's speed on each map change. [Skotlex] if (battle_config.hom_setting&0x8) status_calc_bl(&sd->hd->bl, SCB_SPEED); -// Since hom is inmune to land effects, unneeded. -// skill_unit_move(&sd->hd->bl,gettick(),1); + if (!battle_config.hom_setting&0x2) + skill_unit_move(&sd->hd->bl,gettick(),1); } if(sd->state.connect_new) { diff --git a/src/map/trade.c b/src/map/trade.c index 216692752..f6c587ddb 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -17,7 +17,6 @@ #include "intif.h" #include "atcommand.h" #include "log.h" -#include "../common/malloc.h" //Max distance from traders to enable a trade to take place. #define TRADE_DISTANCE 2 |