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

Exploding weapon ability now properly sets the spell pattern for targeting

Browse Source 
- Also fix good constitution trait having no effect on disease
This commit is contained in:
Celtic Minstrel
2015-01-21 14:07:59 -05:00
parent 311a3c0702
commit 2a2e7068d0
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/boe.combat.cpp
View File

@@ -1488,7 +1488,9 @@ void load_missile() {
current_spell_range = 8; current_spell_range = 8;
if(univ.party[current_pc].items[thrown].ability == eItemAbil::DISTANCE_MISSILE) if(univ.party[current_pc].items[thrown].ability == eItemAbil::DISTANCE_MISSILE)
current_spell_range += univ.party[current_pc].items[thrown].abil_data[0]; current_spell_range += univ.party[current_pc].items[thrown].abil_data[0];
current_pat = single; if(univ.party[current_pc].items[thrown].ability == eItemAbil::EXPLODING_WEAPON)
current_pat = radius2;
else current_pat = single;
} }
else if(((bolts < 24) && (bow < 24)) || ((arrow < 24) && (crossbow < 24))) { else if(((bolts < 24) && (bow < 24)) || ((arrow < 24) && (crossbow < 24))) {
add_string_to_buf("Fire: Wrong ammunition. "); add_string_to_buf("Fire: Wrong ammunition. ");
@@ -1510,8 +1512,7 @@ void load_missile() {
current_spell_range += univ.party[current_pc].items[arrow].abil_data[0]; current_spell_range += univ.party[current_pc].items[arrow].abil_data[0];
if(univ.party[current_pc].items[arrow].ability == eItemAbil::EXPLODING_WEAPON) if(univ.party[current_pc].items[arrow].ability == eItemAbil::EXPLODING_WEAPON)
current_pat = radius2; current_pat = radius2;
else else current_pat = single;
current_pat = single;
} }
else if((bolts < 24) && (crossbow < 24)) { else if((bolts < 24) && (crossbow < 24)) {
missile_inv_slot = crossbow; missile_inv_slot = crossbow;
@@ -1522,7 +1523,9 @@ void load_missile() {
current_spell_range = 12; current_spell_range = 12;
if(univ.party[current_pc].items[bolts].ability == eItemAbil::DISTANCE_MISSILE) if(univ.party[current_pc].items[bolts].ability == eItemAbil::DISTANCE_MISSILE)
current_spell_range += univ.party[current_pc].items[bolts].abil_data[0]; current_spell_range += univ.party[current_pc].items[bolts].abil_data[0];
current_pat = single; if(univ.party[current_pc].items[bolts].ability == eItemAbil::EXPLODING_WEAPON)
current_pat = radius2;
else current_pat = single;
} }
else if(no_ammo < 24) { else if(no_ammo < 24) {
missile_inv_slot = no_ammo; missile_inv_slot = no_ammo;
@@ -1533,7 +1536,9 @@ void load_missile() {
current_spell_range = 12; current_spell_range = 12;
if(univ.party[current_pc].items[no_ammo].ability == eItemAbil::DISTANCE_MISSILE) if(univ.party[current_pc].items[no_ammo].ability == eItemAbil::DISTANCE_MISSILE)
current_spell_range += univ.party[current_pc].items[no_ammo].abil_data[0]; current_spell_range += univ.party[current_pc].items[no_ammo].abil_data[0];
current_pat = single; if(univ.party[current_pc].items[no_ammo].ability == eItemAbil::EXPLODING_WEAPON)
current_pat = radius2;
else current_pat = single;
} }
else add_string_to_buf("Fire: Equip a missile. "); else add_string_to_buf("Fire: Equip a missile. ");
} }
@@ -4429,7 +4434,7 @@ void handle_disease() {
r1 = get_ran(1,0,7); r1 = get_ran(1,0,7);
if(univ.party[i].traits[eTrait::GOOD_CONST]) if(univ.party[i].traits[eTrait::GOOD_CONST])
r1 -= 2; r1 -= 2;
if((get_ran(1,0,7) <= 0) || (univ.party[i].has_abil_equip(eItemAbil::STATUS_PROTECTION,int(eStatus::DISEASE)) < 24)) if(r1 <= 0 || univ.party[i].has_abil_equip(eItemAbil::STATUS_PROTECTION,int(eStatus::DISEASE)) < 24)
move_to_zero(univ.party[i].status[eStatus::DISEASE]); move_to_zero(univ.party[i].status[eStatus::DISEASE]);
} }
put_pc_screen(); put_pc_screen();