diff --git a/src/g_inventory/a_weapons.cpp b/src/g_inventory/a_weapons.cpp index 2b1c78991..af9634846 100644 --- a/src/g_inventory/a_weapons.cpp +++ b/src/g_inventory/a_weapons.cpp @@ -98,6 +98,7 @@ DEFINE_FIELD(AWeapon, FOVScale) DEFINE_FIELD(AWeapon, Crosshair) DEFINE_FIELD(AWeapon, GivenAsMorphWeapon) DEFINE_FIELD(AWeapon, bAltFire) +DEFINE_FIELD(AWeapon, SlotNumber) DEFINE_FIELD_BIT(AWeapon, WeaponFlags, bDehAmmo, WIF_DEHAMMO) //=========================================================================== diff --git a/wadsrc/static/zscript/inventory/powerups.txt b/wadsrc/static/zscript/inventory/powerups.txt index f6b14a051..3861f12a8 100644 --- a/wadsrc/static/zscript/inventory/powerups.txt +++ b/wadsrc/static/zscript/inventory/powerups.txt @@ -7,6 +7,10 @@ class PowerupGiver : Inventory Name Mode; // Meaning depends on powerup - used for Invulnerability and Invisibility double Strength; // Meaning depends on powerup - currently used only by Invisibility + property prefix: Powerup; + property Strength: Strength; + property Mode: Mode; + Default { Inventory.DefMaxAmount; @@ -67,6 +71,9 @@ class Powerup : Inventory int Colormap; const SPECIALCOLORMAP_MASK = 0x00b60000; + property Strength: Strength; + property Mode: Mode; + // Note, that while this is an inventory flag, it only has meaning on an active powerup. override bool GetNoTeleportFreeze() { diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt index 4848229dc..3f7bc1975 100644 --- a/wadsrc/static/zscript/shared/player.txt +++ b/wadsrc/static/zscript/shared/player.txt @@ -38,9 +38,22 @@ class PlayerPawn : Actor native meta Name HealingRadiusType; meta Name InvulMode; - Property prefix: Player; - Property HealRadiusType: HealingradiusType; - Property InvulnerabilityMode: InvulMode; + property prefix: Player; + property HealRadiusType: HealingradiusType; + property InvulnerabilityMode: InvulMode; + property AttackZOffset: AttackZOffset; + property JumpZ: JumpZ; + property GruntSpeed: GruntSpeed; + property FallingScreamSpeed: FallingScreamMinSpeed, FallingScreamMaxSpeed; + property ViewHeight: ViewHeight; + property UseRange: UseRange; + property AirCapacity: AirCapacity; + property MaxHealth: MaxHealth; + property MugshotMaxHealth: MugshotMaxHealth; + property RunHealth: RunHealth; + property MorphWeapon: MorphWeapon; + property FlechetteType: FlechetteType; + property Portrait: Portrait; Default {