OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

NEVERMIND IT'S COMPLETELY FUCKING BROKEN.

Browse source
This commit is contained in:
Marisa the Magician 2021-01-24 15:32:38 +01:00
commit 7c43dafd6a
6 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Readme.md
View file

@ -58,7 +58,7 @@ This mod requires GZDoom 4.3 or later.
- Hexen compatibility - Hexen compatibility
- Fancy titlemap - Fancy titlemap
- Semi-accurate UT sound behaviour - Semi-accurate UT sound behaviour
- Hacky cameratexture ammo counters for Pulsegun, Minigun, Flak Cannon and rocket launcher - Hacky cameratexture ammo counters for Pulsegun, Minigun, Flak Cannon and rocket launcher (TEMPORARILY DISABLED DUE TO A MAJOR BUG)
## In progress ## In progress

30
zscript/ammoled.zsc
View file

@ -8,6 +8,16 @@ Class PulseGunLED : Actor
Actor base, digits[3], bar; Actor base, digits[3], bar;
transient PulseGun mygun; transient PulseGun mygun;
Default
{
+NOGRAVITY;
+NOBLOCKMAP;
+NOINTERACTION;
+DONTSPLASH;
Radius .1;
Height 0;
}
override void PostBeginPlay() override void PostBeginPlay()
{ {
SetOrigin((PULSELEDBASE+64,128,99),false); SetOrigin((PULSELEDBASE+64,128,99),false);
@ -46,6 +56,16 @@ Class FlakCannonLED : Actor
Actor base, digits[3]; Actor base, digits[3];
transient FlakCannon mygun; transient FlakCannon mygun;
Default
{
+NOGRAVITY;
+NOBLOCKMAP;
+NOINTERACTION;
+DONTSPLASH;
Radius .1;
Height 0;
}
override void PostBeginPlay() override void PostBeginPlay()
{ {
SetOrigin((FLAKLEDBASE+32,64,45),false); SetOrigin((FLAKLEDBASE+32,64,45),false);
@ -72,6 +92,16 @@ Class MinigunLED : Actor
Actor base, digits[3]; Actor base, digits[3];
transient Minigun mygun; transient Minigun mygun;
Default
{
+NOGRAVITY;
+NOBLOCKMAP;
+NOINTERACTION;
+DONTSPLASH;
Radius .1;
Height 0;
}
override void PostBeginPlay() override void PostBeginPlay()
{ {
SetOrigin((MINILEDBASE+32,32,18),false); SetOrigin((MINILEDBASE+32,32,18),false);

2
zscript/eightball.zsc
View file

@ -307,7 +307,7 @@ Class UTRocketLauncher : UTWeapon
} }
if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return;
ammoled.mygun = self; ammoled.mygun = self;
TexMan.SetCameraToTexture(ammoled,"RAmmoLed",90); //TexMan.SetCameraToTexture(ammoled,"RAmmoLed",90);
} }
override void PostBeginPlay() override void PostBeginPlay()

2
zscript/flakcannon.zsc
View file

@ -650,7 +650,7 @@ Class FlakCannon : UTWeapon
} }
if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return;
ammoled.mygun = self; ammoled.mygun = self;
TexMan.SetCameraToTexture(ammoled,"FlakALed",90); //TexMan.SetCameraToTexture(ammoled,"FlakALed",90);
} }
action void A_Loading( bool first = false ) action void A_Loading( bool first = false )

2
zscript/minigun.zsc
View file

@ -87,7 +87,7 @@ Class Minigun : UTWeapon
} }
if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return;
ammoled.mygun = self; ammoled.mygun = self;
TexMan.SetCameraToTexture(ammoled,"MiniALed",90); //TexMan.SetCameraToTexture(ammoled,"MiniALed",90);
} }
action void A_FireBullet( bool alt = false ) action void A_FireBullet( bool alt = false )

2
zscript/pulsegun.zsc
View file

@ -579,7 +579,7 @@ Class PulseGun : UTWeapon
} }
if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return; if ( !Owner || !Owner.player || (Owner != players[consoleplayer].Camera) ) return;
ammoled.mygun = self; ammoled.mygun = self;
TexMan.SetCameraToTexture(ammoled,"PAmmoLed",90); //TexMan.SetCameraToTexture(ammoled,"PAmmoLed",90);
} }
override int, int, bool, bool GetClipAmount() override int, int, bool, bool GetClipAmount()