diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-06 18:28:03 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-06 18:28:03 +0000 |
| commit | f52effe3297697259c889f6c0d35e58282553348 (patch) | |
| tree | c6b898f572cbbb5c5f6c5962a8b6fd264860c05a /src | |
| parent | 537b169ac3999fa1b006af075d7a0ae13e28ec56 (diff) | |
| download | hercules-f52effe3297697259c889f6c0d35e58282553348.tar.gz hercules-f52effe3297697259c889f6c0d35e58282553348.tar.bz2 hercules-f52effe3297697259c889f6c0d35e58282553348.tar.xz hercules-f52effe3297697259c889f6c0d35e58282553348.zip | |
- Removed gm_all_skill_add_abra which was doing nothing anyway.
- Updated Land Protector to block absolutely every land-based skills with the exception of Encores/Dances.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8948 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 9336adb6c..16187cc46 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -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 }, diff --git a/src/map/battle.h b/src/map/battle.h index fc6b685fb..364553ebd 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -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;
diff --git a/src/map/skill.c b/src/map/skill.c index 98a4e2dc8..8802a3678 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -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; |