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

- Removed gm_all_skill_add_abra which was doing nothing anyway.

Browse Source 
- Updated Land Protector to block absolutely every land-based skills with the exception of Encores/Dances.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8948 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-10-06 18:28:03 +00:00
parent f8d99d4ce6
commit 30888904c1
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ 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/06
* Updated Land Protector to block absolutely every land-based skills with
the exception of Encores/Dances. [Skotlex]
* Disabling status abnormalities will now reset a mob's target. [Skotlex]
* Mob morphing also resets their target now. [Skotlex]
* Monk combos no longer can ignore skill delay (delay skill for all their

2
conf-tmpl/Changelog.txt
View File

@ -1,5 +1,7 @@
Date Added
2006/10/06
* Removed gm_all_skill_add_abra which was doing nothing anyway. [Skotlex]
2006/10/03
* Renamed setting delay_dependon_dex to delay_dependon_agi, the delay of
skills is reduced now (when enabled) by AGI instead of DEX, which makes a

3
conf-tmpl/battle/gm.conf
View File

@ -41,9 +41,6 @@ partial_name_scan: yes
// [GM] Can use all skills? (No or mimimum GM level)
gm_all_skill: no
// [GM] Can use all abracadabra skills? (No minimum GM level)
gm_all_skill_add_abra: no
// [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
gm_all_equipment: no

1
src/map/battle.c
View File

@ -3494,7 +3494,6 @@ static const struct battle_data_short {
{ "atcommand_slave_clone_limit", &battle_config.atc_slave_clone_limit},
{ "partial_name_scan", &battle_config.partial_name_scan },
{ "gm_all_skill", &battle_config.gm_allskill },
{ "gm_all_skill_add_abra", &battle_config.gm_allskill_addabra },
{ "gm_all_equipment", &battle_config.gm_allequip },
{ "gm_skill_unconditional", &battle_config.gm_skilluncond },
{ "gm_join_chat", &battle_config.gm_join_chat },

1
src/map/battle.h
View File

@ -136,7 +136,6 @@ extern struct Battle_Config {
unsigned short atc_slave_clone_limit;
unsigned short partial_name_scan;
unsigned short gm_allskill;
unsigned short gm_allskill_addabra;
unsigned short gm_allequip;
unsigned short gm_skilluncond;
unsigned short gm_join_chat;

8
src/map/skill.c
View File

@ -9288,7 +9288,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
}
//Delete the rest of types.
case HW_GANBANTEIN:
if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
//Update: It deletes everything except songs/dances/encores.
if(!unit->group->state.song_dance)
// if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
{ //Delete Magical effects
skill_delunit(unit, 1);
return 1;
@ -9319,7 +9321,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
break;
}
if (unit->group->skill_id == SA_LANDPROTECTOR &&
skill_get_type(skillid) == BF_MAGIC)
//Update: It deletes everything except songs/dances/encores.
!(skill_get_inf2(skillid)&(UF_DANCE|UF_SONG|UF_ENSEMBLE)))
// skill_get_type(skillid) == BF_MAGIC)
{ //Magic tile won't be activated
(*alive) = 0;
return 1;