zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-25 21:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed buggy ArmorFactor behavior when set to a value other than 1.0

Browse source
This commit is contained in:
Blue Shadow 2019-08-02 15:10:06 +03:00
parent 5870cb7ea1
commit 479a992a3e
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
wadsrc/static/zscript/actors/inventory/armor.zs
View file

@ -40,6 +40,23 @@ class Armor : Inventory
Inventory.PickupSound "misc/armor_pkup"; Inventory.PickupSound "misc/armor_pkup";
+INVENTORY.ISARMOR +INVENTORY.ISARMOR
} }
int GetSaveAmount ()
{
if (self is 'BasicArmorBonus')
{
let armor = BasicArmorBonus(self);
return !armor.bIgnoreSkill ? int(armor.SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor)) : armor.SaveAmount;
}
if (self is 'BasicArmorPickup')
{
let armor = BasicArmorPickup(self);
return !armor.bIgnoreSkill ? int(armor.SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor)) : armor.SaveAmount;
}
return 0;
}
} }
//=========================================================================== //===========================================================================
@ -132,19 +149,6 @@ class BasicArmor : Armor
// You shouldn't be picking up BasicArmor anyway. // You shouldn't be picking up BasicArmor anyway.
return true; return true;
} }
if (!item.bIgnoreSkill)
{
if (item is "BasicArmorBonus")
{
let armor = BasicArmorBonus(item);
armor.SaveAmount = int(armor.SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor));
}
else if (item is "BasicArmorPickup")
{
let armor = BasicArmorPickup(item);
armor.SaveAmount = int(armor.SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor));
}
}
return false; return false;
} }
@ -263,12 +267,6 @@ class BasicArmorBonus : Armor
override Inventory CreateCopy (Actor other) override Inventory CreateCopy (Actor other)
{ {
let copy = BasicArmorBonus(Super.CreateCopy (other)); let copy = BasicArmorBonus(Super.CreateCopy (other));
if (!bIgnoreSkill)
{
SaveAmount = int(SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor));
}
copy.SavePercent = SavePercent; copy.SavePercent = SavePercent;
copy.SaveAmount = SaveAmount; copy.SaveAmount = SaveAmount;
copy.MaxSaveAmount = MaxSaveAmount; copy.MaxSaveAmount = MaxSaveAmount;
@ -309,7 +307,7 @@ class BasicArmorBonus : Armor
result = true; result = true;
} }
int saveAmount = min(SaveAmount, MaxSaveAmount); int saveAmount = min(GetSaveAmount(), MaxSaveAmount);
if (saveAmount <= 0) if (saveAmount <= 0)
{ // If it can't give you anything, it's as good as used. { // If it can't give you anything, it's as good as used.
@ -383,12 +381,6 @@ class BasicArmorPickup : Armor
override Inventory CreateCopy (Actor other) override Inventory CreateCopy (Actor other)
{ {
let copy = BasicArmorPickup(Super.CreateCopy (other)); let copy = BasicArmorPickup(Super.CreateCopy (other));
if (!bIgnoreSkill)
{
SaveAmount = int(SaveAmount * G_SkillPropertyFloat(SKILLP_ArmorFactor));
}
copy.SavePercent = SavePercent; copy.SavePercent = SavePercent;
copy.SaveAmount = SaveAmount; copy.SaveAmount = SaveAmount;
copy.MaxAbsorb = MaxAbsorb; copy.MaxAbsorb = MaxAbsorb;
@ -410,6 +402,7 @@ class BasicArmorPickup : Armor
override bool Use (bool pickup) override bool Use (bool pickup)
{ {
int SaveAmount = GetSaveAmount();
let armor = BasicArmor(Owner.FindInventory("BasicArmor")); let armor = BasicArmor(Owner.FindInventory("BasicArmor"));
// This should really never happen but let's be prepared for a broken inventory. // This should really never happen but let's be prepared for a broken inventory.