OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Deprecate use of ROTATING. Fix rotation of many items.

Browse source
This commit is contained in:
Mari the Deer 2023-01-11 20:05:53 +01:00
commit 06e2e2c55c
39 changed files with 70 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/items/swwm_ammoextra.zsc
View file

@ -7,6 +7,7 @@ Class AmmoFabricator : Inventory abstract
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
meta int budget, pertype, maxunits, maxtypes, maxunitprice, txtcol;
@ -314,6 +315,7 @@ Class HammerspaceEmbiggener : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
override Inventory CreateCopy( Actor other )
{

2
zscript/items/swwm_baseammo.zsc
View file

@ -4,6 +4,7 @@ Class SWWMAmmo : Ammo
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
meta String PickupTag;
meta Class<MagAmmo> MagAmmoType;
@ -275,6 +276,7 @@ Class MagAmmo : Inventory abstract
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
meta Class<Ammo> ParentAmmo;
Ammo pamo;

1
zscript/items/swwm_basearmor.zsc
View file

@ -138,6 +138,7 @@ Class SWWMSpareArmor : Inventory abstract
Mixin SWWMUseToPickup;
Mixin SWWMOverlapPickupSound;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
meta Class<SWWMArmor> giveme;

1
zscript/items/swwm_basehealth.zsc
View file

@ -5,6 +5,7 @@ Class SWWMHealth : Inventory abstract
Mixin SWWMUseToPickup;
Mixin SWWMOverlapPickupSound;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
// can't use the Health class for whatever reason

17
zscript/items/swwm_baseitem.zsc
View file

@ -197,6 +197,7 @@ Mixin Class SWWMPickupGlow
Class SWWMItemOverlay : SWWMNonInteractiveActor
{
Default
{
RenderStyle "Add";
@ -212,7 +213,7 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
prev = target.prev;
if ( (target.pos != pos) || (target.vel != (0,0,0)) ) SetOrigin(target.pos+target.vel,true);
if ( angle != target.angle ) A_SetAngle(target.angle,SPF_INTERPOLATE);
if ( (angle != target.angle) && bINTERPOLATEANGLES ) angle = target.angle; // copy angle for rotating pickups
FloatBobPhase = target.FloatBobPhase;
bInvisible = target.bInvisible||Inventory(target).Owner;
}
@ -224,6 +225,20 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
}
Mixin Class SWWMRotatingPickup
{
Default
{
+INTERPOLATEANGLES;
}
override void Tick()
{
Super.Tick();
if ( !Owner ) angle -= (180./64.);
}
}
Mixin Class SWWMRespawn
{
override void Hide()

1
zscript/items/swwm_collectibles.zsc
View file

@ -3,6 +3,7 @@
Class SWWMCollectible : Inventory abstract
{
Mixin SWWMUseToPickup;
Mixin SWWMRotatingPickup;
meta int avail;
bool propagated;

1
zscript/items/swwm_keys.zsc
View file

@ -4,6 +4,7 @@ Class SWWMKey : Key abstract
{
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRotatingPickup;
bool propagated;

1
zscript/items/swwm_lamp.zsc
View file

@ -539,6 +539,7 @@ Class SWWMLamp : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
bool bActive, bActivated;

2
zscript/items/swwm_miscitems.zsc
View file

@ -5,6 +5,7 @@ Class Omnisight : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
override bool TryPickup( in out Actor toucher )
{
@ -74,6 +75,7 @@ Class SafetyTether : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
bool bPrimed, bFailed;
int primetim;

6
zscript/items/swwm_powerups.zsc
View file

@ -19,6 +19,7 @@ Class GrilledCheeseSandwich : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
// for falling off cliffs and others
@ -408,6 +409,7 @@ Class GhostArtifact : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
Default
@ -578,6 +580,7 @@ Class GravitySuppressor : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -809,6 +812,7 @@ Class FuckingInvinciball : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override Inventory CreateCopy( Actor other )
@ -1086,6 +1090,7 @@ Class Ragekit : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -1327,6 +1332,7 @@ Class EBarrier : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
int terrainwait;

2
zscript/items/swwm_powerups_vip.zsc
View file

@ -903,6 +903,7 @@ Class AngerySigil : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -1186,6 +1187,7 @@ Class DivineSprite : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )