From 3f630c5cb6c5f5eedcda5fbe4ac65ab502a4bb73 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 4 Jun 2023 11:37:10 +0200 Subject: [PATCH] - fixed some item issues in RR. * RedneckPowderKeg was missing its Initialize function and did not clamp its movement velocity. * RedneckTikiLamp inherited from the wrong base class. --- .../static/zscript/games/duke/actors/redneckstuff/items.zs | 7 +++++++ .../static/zscript/games/duke/actors/redneckstuff/stuff.zs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/games/duke/actors/redneckstuff/items.zs b/wadsrc/static/zscript/games/duke/actors/redneckstuff/items.zs index 45662b4e0..32d6cb061 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckstuff/items.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckstuff/items.zs @@ -297,6 +297,12 @@ class RedneckPowderKeg : DukeItemBase +BREAKMIRRORS; +INFLAME; } + + override void Initialize(DukeActor spawner) + { + commonItemSetup(spawner, (0.171875, 0.171875)); + self.yint = 4; + } override void Tick() { @@ -306,6 +312,7 @@ class RedneckPowderKeg : DukeItemBase { movesprite((self.Angle.ToVector()* self.vel.X, self.vel.Z), CLIPMASK0); self.vel.X -= 1. / 16.; + if (self.vel.X < 0) self.vel.X = 0; } Super.Tick(); } diff --git a/wadsrc/static/zscript/games/duke/actors/redneckstuff/stuff.zs b/wadsrc/static/zscript/games/duke/actors/redneckstuff/stuff.zs index 2ac25cf48..c0edad686 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckstuff/stuff.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckstuff/stuff.zs @@ -80,7 +80,7 @@ class RedneckUfoBeam : DukeActor } } -class RedneckTikiLamp : DukeItemBase +class RedneckTikiLamp : DukeActor { default {