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

Fix armor level 0 (#590)

Browse Source 
Armor items with item level 0, will have a base defense value of 0 instead of 1, and display their defense value as such in the get items screen.

Fix #245
This commit is contained in:
Nat Quayle Nelson
2025-02-09 09:36:14 -06:00
committed by GitHub
parent afa0b9d7a4
commit e81cde113c
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/boe.party.cpp
View File

@@ -2341,7 +2341,10 @@ short damage_pc(cPlayer& which_pc,short how_much,eDamageType damage_type,eRace t
const cItem& item = which_pc.items[i]; const cItem& item = which_pc.items[i];
if(item.variety != eItemType::NO_ITEM && which_pc.equip[i]) { if(item.variety != eItemType::NO_ITEM && which_pc.equip[i]) {
if((*item.variety).is_armour) { if((*item.variety).is_armour) {
short defense = get_ran(1,1,item.item_level); short defense = 0;
if(item.item_level > 0){
defense = get_ran(1,1,item.item_level);
}
// bonus for magical items // bonus for magical items
if(item.bonus > 0) { if(item.bonus > 0) {

14
src/scenario/item.cpp
View File

@@ -143,11 +143,17 @@ std::string cItem::interesting_string() const {
case eItemType::HELM: case eItemType::HELM:
case eItemType::GLOVES: case eItemType::GLOVES:
case eItemType::SHIELD_2: case eItemType::SHIELD_2:
case eItemType::BOOTS: case eItemType::BOOTS:{
sout << "Blocks " << 1 + min_defense_bonus(bonus) + sgn(protection); short min_defense = 0;
sout << '-' << max(1,item_level) + max_defense_bonus(bonus) + protection; if(item_level > 0) min_defense = 1;
min_defense += (min_defense_bonus(bonus) + sgn(protection));
short max_defense = item_level + max_defense_bonus(bonus) + protection;
sout << "Blocks " << min_defense;
if(max_defense != min_defense){
sout << '-' << max(min_defense,item_level);
}
sout << " damage"; sout << " damage";
break; } break;
case eItemType::BOW: case eItemType::BOW:
case eItemType::CROSSBOW: case eItemType::CROSSBOW:
sout << "Bonus: +" << bonus << " to hit"; sout << "Bonus: +" << bonus << " to hit";