openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Move Wand of Pyhrrus spell into main combat cast routine.

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-15 11:16:45 -05:00
parent 5af865368f
commit c90afdc013
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osx/boe.combat.cpp
View File

@@ -3926,15 +3926,6 @@ static void place_spell_pattern(effect_pat_type pat,location center,unsigned sho
} }
} }
} }
void handle_item_spell(location loc,short num) {
// TODO: This function is currently unused
switch(num) {
case 82: // Pyhrrus
place_spell_pattern(rad2,loc,WALL_BLADES,6);
break;
}
}
void place_spell_pattern(effect_pat_type pat,location center,short who_hit) { void place_spell_pattern(effect_pat_type pat,location center,short who_hit) {
place_spell_pattern(pat, center, FIELD_NONE, who_hit); place_spell_pattern(pat, center, FIELD_NONE, who_hit);
@@ -4436,6 +4427,9 @@ bool combat_cast_mage_spell() {
} }
break; break;
case eSpell::BLADE_AURA: // Pyhrrus effect
place_spell_pattern(rad2,univ.party[current_pc].combat_pos,WALL_BLADES,6);
break;
} }
} }

1
osx/boe.combat.h
View File

@@ -38,7 +38,6 @@ void fireball_space(location loc,short dam);
void place_spell_pattern(effect_pat_type pat,location center,short who_hit); void place_spell_pattern(effect_pat_type pat,location center,short who_hit);
void place_spell_pattern(effect_pat_type pat,location center,eFieldType type,short who_hit); void place_spell_pattern(effect_pat_type pat,location center,eFieldType type,short who_hit);
void place_spell_pattern(effect_pat_type pat,location center,eDamageType type, short dice,short who_hit); void place_spell_pattern(effect_pat_type pat,location center,eDamageType type, short dice,short who_hit);
void handle_item_spell(location loc,short num);
void modify_pattern(effect_pat_type *pat,unsigned short type); void modify_pattern(effect_pat_type *pat,unsigned short type);
void do_shockwave(location target); void do_shockwave(location target);
void radius_damage(location target,short radius, short dam, eDamageType type); void radius_damage(location target,short radius, short dam, eDamageType type);

1
osx/classes/simpletypes.h
View File

@@ -898,6 +898,7 @@ enum class eSpell {
PARALYZE_BEAM = 69, PARALYZE_BEAM = 69,
SLEEP_MASS = 70, SLEEP_MASS = 70,
RAVAGE_ENEMIES = 71, RAVAGE_ENEMIES = 71,
BLADE_AURA = 82,
// Priest spells // Priest spells
BLESS_MINOR = 100, BLESS_MINOR = 100,
HEAL_MINOR = 101, HEAL_MINOR = 101,