- added Skulltag's custom F1 help screen MAPINFO option.
- Fixed: Resurrecting a player must restore all flags words, not just the first one. - Fixed: APowerWeaponLevel2::EndEffect must check PendingWeapon for WP_NOCHANGE. - added Skulltag's high jump rune as a powerup - Added Skulltag's Drain and Regeneration runes as powerups and used specific player sounds for their sound effects instead of using misc/i_pkup. (If I ever decide to implement runes it will be in a way that can use the regular powerups instead of having to define specific classes for them.) - Added Skulltag's PowerQuadDamage and PowerQuarterDamage as more customizable PowerDamage and PowerProtection. These new powerups allow free customization of the damage modification per damage type by inheriting from these classes and setting specific values. Such derived damage/protection powerups will be considered as separate powers so that for example a QuadDamage and a DoubleDamage item can be stacked which would result in 8x damage. - merged player_t::cheats and player_t::Powers into one variable. SVN r529 (trunk)
This commit is contained in:
parent
15e473f729
commit
d60a5ee1b9
17 changed files with 443 additions and 58 deletions
|
|
@ -760,6 +760,29 @@ void AInventory::AbsorbDamage (int damage, FName damageType, int &newdamage)
|
|||
}
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
//
|
||||
// AInventory :: ModifyDamage
|
||||
//
|
||||
// Allows inventory items to manipulate the amount of damage
|
||||
// inflicted. Damage is the amount of damage that would be done without manipulation,
|
||||
// and newdamage is the amount that should be done after the item has changed
|
||||
// it.
|
||||
// 'active' means it is called by the inflictor, 'passive' by the target.
|
||||
// It may seem that this is redundant and AbsorbDamage is the same. However,
|
||||
// AbsorbDamage is called only for players and also depends on other settings
|
||||
// which are undesirable for a protection artifact.
|
||||
//
|
||||
//===========================================================================
|
||||
|
||||
void AInventory::ModifyDamage (int damage, FName damageType, int &newdamage, bool passive)
|
||||
{
|
||||
if (Inventory != NULL)
|
||||
{
|
||||
Inventory->ModifyDamage (damage, damageType, newdamage, passive);
|
||||
}
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
//
|
||||
// AInventory :: AlterWeaponSprite
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue