diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | conf-tmpl/Changelog.txt | 3 | ||||
| -rw-r--r-- | conf-tmpl/battle/skill.conf | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 40dfaa69f..35f39cafa 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/10/16
+ * Emergency call &16 (disable skill from nowarpto maps) will now NOT block
+ Emergency Call if that map is also a gvg-castle map. Makes it safe to turn
+ on this option to prevent usage from special maps (like Lhz3) without
+ crippling the skill during WoE. [Skotlex]
* Applied most of Mpeg's work on Ninja Skills. For information see:
http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt [Skotlex]
* When reinvoking a combo-time, the previous combo time will be terminated.
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt index 571b8adaa..0c4b2e4b1 100644 --- a/conf-tmpl/Changelog.txt +++ b/conf-tmpl/Changelog.txt @@ -1,5 +1,8 @@ Date Added
+2006/10/16
+ * Added &16 to the default of the emergency_call setting (skill.conf)
+ [Skotlex]
2006/10/12
* Added Homunculus atcommands [Playtester]
2006/10/11
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf index dc164d5b9..a90338ca2 100644 --- a/conf-tmpl/battle/skill.conf +++ b/conf-tmpl/battle/skill.conf @@ -232,8 +232,8 @@ max_heal_lv: 11 // 4: Skill is usable outside of GvG grounds
// 8: Skill is usable on GvG grounds
//16: Disable skill from "nowarpto" maps
-// (note that by default all Castles have the nowarpto flag)
-emergency_call: 15
+// (it will work on GVG castles even if they are set to nowarpto, though)
+emergency_call: 31
// Guild Aura Skills setting (add as appropiate).
// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
diff --git a/src/map/skill.c b/src/map/skill.c index 5e1a87606..6a4993ec8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -907,7 +907,7 @@ int skillnotok (int skillid, struct map_session_data *sd) !(battle_config.emergency_call&(agit_flag?2:1)) || !(battle_config.emergency_call& (map[m].flag.gvg || map[m].flag.gvg_castle?8:4)) || - (battle_config.emergency_call&16 && map[m].flag.nowarpto) + (battle_config.emergency_call&16 && map[m].flag.nowarpto && !map[m].flag.gvg_castle) ) { clif_skill_fail(sd,skillid,0,0); return 1; |