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

Handle more status effects for weapon abilities

Browse Source
This commit is contained in:
Celtic Minstrel
2015-01-12 23:18:21 -05:00
parent 6777d07c03
commit 032c276552
3 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/boe.combat.cpp
View File

@@ -672,7 +672,14 @@ void pc_attack_weapon(short who_att,short target,short hit_adj,short dam_adj,cIt
}
if((weap.ability == eItemAbil::STATUS_WEAPON) && (get_ran(1,0,1) == 1)) {
switch(eStatus(weap.abil_data[1])) {
// TODO: Handle other status types
// TODO: It should be possible to make monsters support magic resistance and invulnerability, at least.
// Maybe also poisoned weapon and invisibility.
case eStatus::MAIN: // Not a valid status
case eStatus::INVISIBLE: // Not supported by monsters
case eStatus::MAGIC_RESISTANCE: // Not supported by monsters
case eStatus::INVULNERABLE: // Not supported by monsters
case eStatus::POISONED_WEAPON: // Not supported by monsters
break;
case eStatus::POISON:
add_string_to_buf(" Blade drips venom.");
poison_monst(which_m,weap.abil_data[0] / 2);
@@ -681,6 +688,48 @@ void pc_attack_weapon(short who_att,short target,short hit_adj,short dam_adj,cIt
add_string_to_buf(" Blade drips acid.");
acid_monst(which_m,weap.abil_data[0] / 2);
break;
case eStatus::BLESS_CURSE:
add_string_to_buf(" Blade leaks a dark aura.");
curse_monst(which_m, weap.abil_data[0] / 2);
break;
case eStatus::HASTE_SLOW:
add_string_to_buf(" Blade leaks a smoky aura.");
slow_monst(which_m, weap.abil_data[0] / 2);
break;
case eStatus::WEBS:
add_string_to_buf(" Blade drips goo.");
web_monst(which_m, weap.abil_data[0] / 2);
break;
case eStatus::DISEASE:
add_string_to_buf(" Blade drips bile.");
disease_monst(which_m, weap.abil_data[0] / 2);
break;
case eStatus::DUMB:
add_string_to_buf(" Blade leaks a misty aura.");
dumbfound_monst(which_m, weap.abil_data[0] / 2);
break;
case eStatus::ASLEEP:
add_string_to_buf(" Blade emits coruscating lights.");
charm_monst(which_m, 20 + r2 + spec_dam, eStatus::ASLEEP, weap.abil_data[0] / 2);
break;
case eStatus::PARALYZED:
add_string_to_buf(" Blade emits a purple flash.");
charm_monst(which_m, 20 + r2 + spec_dam, eStatus::PARALYZED, weap.abil_data[0] / 2);
break;
case eStatus::CHARM:
add_string_to_buf(" Blade leaks a bright aura.");
// Higher penalty means more likely to resist.
charm_monst(which_m, 20 + r2 + spec_dam - weap.abil_data[0] / 2, eStatus::CHARM, 0);
break;
case eStatus::FORCECAGE:
add_string_to_buf(" Blade emits a green flash.");
charm_monst(which_m, r2 + spec_dam - weap.abil_data[0] / 2, eStatus::FORCECAGE, 0);
break;
case eStatus::MARTYRS_SHIELD:
add_string_to_buf(" Blade leaks an odd-coloured aura.");
which_m->status[eStatus::MARTYRS_SHIELD] -= weap.abil_data[0] / 2;
// TODO: Maybe clip it to 0?
break;
}
}
if((weap.ability == eItemAbil::SOULSUCKER) && (get_ran(1,0,1) == 1)) {

7
src/boe.monster.cpp
View File

@@ -1167,8 +1167,11 @@ void charm_monst(cCreature *which_m,short penalty,eStatus which_status,short amo
if(which_status == eStatus::CHARM) {
which_m->attitude = 2;
monst_spell_note(which_m->number,23);
}
else {
} else if(which_status == eStatus::FORCECAGE) {
which_m->status[eStatus::FORCECAGE] = 8;
univ.town.set_force_cage(which_m->cur_loc.x, which_m->cur_loc.y, true);
monst_spell_note(which_m->number,52);
} else {
which_m->status[which_status] = amount;
if(which_status == eStatus::ASLEEP && (amount >= 0))
monst_spell_note(which_m->number,28);

4
src/boe.text.cpp
View File

@@ -1114,6 +1114,10 @@ void monst_spell_note(m_num_t number,short which_mess) {
break;
case 51:
msg = " " + msg + " is obliterated!";
break;
case 52:
msg = " " + msg + " is trapped!";
break;
}
if(which_mess > 0)