Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.

Browse Source 
- Added &16 to the default of the emergency_call setting.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9000 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-10-16 19:16:16 +00:00
parent d99bf3c795
commit 9860974ef6
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/10/16 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: * Applied most of Mpeg's work on Ninja Skills. For information see:
http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt [Skotlex] http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt [Skotlex]
* When reinvoking a combo-time, the previous combo time will be terminated. * When reinvoking a combo-time, the previous combo time will be terminated.

3
conf-tmpl/Changelog.txt
View File

@ -1,5 +1,8 @@
Date Added Date Added
2006/10/16
* Added &16 to the default of the emergency_call setting (skill.conf)
[Skotlex]
2006/10/12 2006/10/12
* Added Homunculus atcommands [Playtester] * Added Homunculus atcommands [Playtester]
2006/10/11 2006/10/11

4
conf-tmpl/battle/skill.conf
View File

@ -232,8 +232,8 @@ max_heal_lv: 11
// 4: Skill is usable outside of GvG grounds // 4: Skill is usable outside of GvG grounds
// 8: Skill is usable on GvG grounds // 8: Skill is usable on GvG grounds
//16: Disable skill from "nowarpto" maps //16: Disable skill from "nowarpto" maps
// (note that by default all Castles have the nowarpto flag) // (it will work on GVG castles even if they are set to nowarpto, though)
emergency_call: 15 emergency_call: 31
// Guild Aura Skills setting (add as appropiate). // Guild Aura Skills setting (add as appropiate).
// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES) // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)

2
src/map/skill.c
View File

@ -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&(agit_flag?2:1)) ||
!(battle_config.emergency_call& !(battle_config.emergency_call&
(map[m].flag.gvg || map[m].flag.gvg_castle?8:4)) || (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); clif_skill_fail(sd,skillid,0,0);
return 1; return 1;