diff --git a/gldefs.ammo b/gldefs.ammo index fa1f731d5..e27e93f72 100644 --- a/gldefs.ammo +++ b/gldefs.ammo @@ -168,7 +168,7 @@ PointLight GOLDSHELLLIGHT } Object GoldShell { - Frame "XZW1" { light "GOLDSHELLLIGHT" } + Frame XZW1 { light GOLDSHELLLIGHT } } PointLight SPARKUNITLIGHT @@ -180,11 +180,11 @@ PointLight SPARKUNITLIGHT } Object SparkUnit { - Frame "XZW1" { light "SPARKUNITLIGHT" } + Frame XZW1 { light SPARKUNITLIGHT } } Object SparkUnit2 { - Frame "XZW1" { light "SPARKUNITLIGHT" } + Frame XZW1 { light SPARKUNITLIGHT } } PointLight FABTIER1LIGHT @@ -217,17 +217,17 @@ PointLight FABTIER4LIGHT } Object FabricatorTier1 { - Frame "XZW1" { light "FABTIER1LIGHT" } + Frame XZW1 { light FABTIER1LIGHT } } Object FabricatorTier2 { - Frame "XZW1" { light "FABTIER2LIGHT" } + Frame XZW1 { light FABTIER2LIGHT } } Object FabricatorTier3 { - Frame "XZW1" { light "FABTIER3LIGHT" } + Frame XZW1 { light FABTIER3LIGHT } } Object FabricatorTier4 { - Frame "XZW1" { light "FABTIER4LIGHT" } + Frame XZW1 { light FABTIER4LIGHT } } diff --git a/gldefs.dlcammo b/gldefs.dlcammo index 9375d8955..5800cb276 100644 --- a/gldefs.dlcammo +++ b/gldefs.dlcammo @@ -12,15 +12,15 @@ PointLight QUADAMMOLIGHT } Object QuadravolAmmo { - Frame "XZW1" { light "QUADAMMOLIGHT" } + Frame XZW1 { light QUADAMMOLIGHT } } Object QuadravolAmmo2 { - Frame "XZW1" { light "QUADAMMOLIGHT" } + Frame XZW1 { light QUADAMMOLIGHT } } Object QuadravolAmmo3 { - Frame "XZW1" { light "QUADAMMOLIGHT" } + Frame XZW1 { light QUADAMMOLIGHT } } PointLight MISTERAMMOLIGHT @@ -32,7 +32,7 @@ PointLight MISTERAMMOLIGHT } Object MisterAmmo { - Frame "XZW1" { light "MISTERAMMOLIGHT" } + Frame XZW1 { light MISTERAMMOLIGHT } } PointLight MISTERGAMMOLIGHT @@ -44,5 +44,5 @@ PointLight MISTERGAMMOLIGHT } Object MisterGAmmo { - Frame "XZW1" { light "MISTERGAMMOLIGHT" } + Frame XZW1 { light MISTERGAMMOLIGHT } } diff --git a/gldefs.funstuff b/gldefs.funstuff index 2bc6128ef..033a89362 100644 --- a/gldefs.funstuff +++ b/gldefs.funstuff @@ -47,5 +47,5 @@ PointLight CHANCELIGHT Object Chancebox { - Frame "XZW2" { light "CHANCELIGHT" } + Frame XZW2 { light CHANCELIGHT } } diff --git a/gldefs.hellblazer b/gldefs.hellblazer index 19e0f48cd..b3d39e08a 100644 --- a/gldefs.hellblazer +++ b/gldefs.hellblazer @@ -1,32 +1,11 @@ -PointLight BLAZERLIGHT1 +PointLight BLAZERLIGHT { Color 1.0 0.8 0.3 Size 120 Attenuate 1 } -PointLight BLAZERLIGHT2 -{ - Color 0.3 1.0 0.3 - Size 120 - Attenuate 1 -} -PointLight BLAZERLIGHT3 -{ - Color 1.0 0.3 0.3 - Size 120 - Attenuate 1 -} -PointLight BLAZERLIGHT4 -{ - Color 0.8 0.3 1.0 - Size 120 - Attenuate 1 -} -Object HellblazerFlare +Object HellblazerMissile { - Frame "HFLRA" { light "BLAZERLIGHT1" } - Frame "HFLRB" { light "BLAZERLIGHT2" } - Frame "HFLRC" { light "BLAZERLIGHT3" } - Frame "HFLRD" { light "BLAZERLIGHT4" } + Frame XZW1 { light BLAZERLIGHT } } diff --git a/gldefs.mortalrifle b/gldefs.mortalrifle index 0a47c1fdf..657a9969a 100644 --- a/gldefs.mortalrifle +++ b/gldefs.mortalrifle @@ -121,7 +121,7 @@ PointLight MISTERRIFLELIGHT } Object MisterRifle { - Frame "XZW1" { light "MISTERRIFLELIGHT" } + Frame XZW1 { light MISTERRIFLELIGHT } } PointLight MISTERMAGLIGHT @@ -133,7 +133,7 @@ PointLight MISTERMAGLIGHT } Object MisterMag { - Frame "XZW1" { light "MISTERMAGLIGHT" } + Frame XZW1 { light MISTERMAGLIGHT } } PointLight MISTERGRENADELIGHT @@ -145,7 +145,7 @@ PointLight MISTERGRENADELIGHT } Object MisterGrenade { - Frame "XZW1" { light "MISTERGRENADELIGHT" } + Frame XZW1 { light MISTERGRENADELIGHT } } PointLight MISTERSUBGRENADELIGHT { @@ -156,6 +156,6 @@ PointLight MISTERSUBGRENADELIGHT } Object MisterSubGrenade { - Frame "XZW1" { light "MISTERSUBGRENADELIGHT" } + Frame XZW1 { light MISTERSUBGRENADELIGHT } } diff --git a/gldefs.pickups b/gldefs.pickups index 021fabb15..25be24273 100644 --- a/gldefs.pickups +++ b/gldefs.pickups @@ -171,7 +171,7 @@ PointLight ARMORNUGGETLIGHT } Object ArmorNuggetItem { - Frame "XZW1" { light "ARMORNUGGETLIGHT" } + Frame XZW1 { light ARMORNUGGETLIGHT } } PointLight HEALTHNUGGETLIGHT { @@ -182,7 +182,7 @@ PointLight HEALTHNUGGETLIGHT } Object HealthNuggetItem { - Frame "XZW1" { light "HEALTHNUGGETLIGHT" } + Frame XZW1 { light HEALTHNUGGETLIGHT } } PointLight GEOMHEALTHLIGHT @@ -194,11 +194,11 @@ PointLight GEOMHEALTHLIGHT } Object TetraHealthItem { - Frame "XZW1" { light "GEOMHEALTHLIGHT" } + Frame XZW1 { light GEOMHEALTHLIGHT } } Object CubeHealthItem { - Frame "XZW1" { light "GEOMHEALTHLIGHT" } + Frame XZW1 { light GEOMHEALTHLIGHT } } PointLight REFRESHERLIGHT @@ -210,7 +210,7 @@ PointLight REFRESHERLIGHT } Object RefresherItem { - Frame "XZW1" { light "REFRESHERLIGHT" } + Frame XZW1 { light REFRESHERLIGHT } } PointLight GHOSTARTILIGHT @@ -222,7 +222,7 @@ PointLight GHOSTARTILIGHT } Object GhostArtifact { - Frame "XZW1" { light "GHOSTARTILIGHT" } + Frame XZW1 { light GHOSTARTILIGHT } } PointLight GRAVITYLIGHT @@ -234,7 +234,7 @@ PointLight GRAVITYLIGHT } Object GravitySuppressor { - Frame "XZW1" { light "GRAVITYLIGHT" } + Frame XZW1 { light GRAVITYLIGHT } } PointLight INVINCIBALLLIGHT @@ -246,7 +246,7 @@ PointLight INVINCIBALLLIGHT } Object FuckingInvinciball { - Frame "XZW1" { light "INVINCIBALLLIGHT" } + Frame XZW1 { light INVINCIBALLLIGHT } } PointLight RAGELIGHT @@ -258,7 +258,7 @@ PointLight RAGELIGHT } Object Ragekit { - Frame "XZW1" { light "RAGELIGHT" } + Frame XZW1 { light RAGELIGHT } } PointLight OMNISIGHTLIGHT @@ -270,7 +270,7 @@ PointLight OMNISIGHTLIGHT } Object Omnisight { - Frame "XZW1" { light "OMNISIGHTLIGHT" } + Frame XZW1 { light OMNISIGHTLIGHT } } FlickerLight2 LAMPLIGHT @@ -284,7 +284,7 @@ FlickerLight2 LAMPLIGHT } Object CompanionLamp { - Frame "XZW1B" { light "LAMPLIGHT" } + Frame XZW1B { light LAMPLIGHT } } PointLight BARRIERLIGHT @@ -296,7 +296,7 @@ PointLight BARRIERLIGHT } Object EBarrier { - Frame "XZW1" { light "BARRIERLIGHT" } + Frame XZW1 { light BARRIERLIGHT } } FlickerLight2 MYKRADVOLIGHT1 @@ -326,12 +326,12 @@ PulseLight MYKRADVOLIGHT3 Object MykradvoX { - Frame "MKRV" { light "MYKRADVOLIGHT1" } + Frame MKRV { light MYKRADVOLIGHT1 } } Object MykradvoX2 { - Frame "XZW1A" { light "MYKRADVOLIGHT2" } - Frame "XZW1B" { light "MYKRADVOLIGHT3" } + Frame XZW1A { light MYKRADVOLIGHT2 } + Frame XZW1B { light MYKRADVOLIGHT3 } } PointLight DIVINESLIGHT @@ -343,7 +343,7 @@ PointLight DIVINESLIGHT Object DivineSpriteX { - Frame "DVSP" { light "DIVINESLIGHT" } + Frame DVSP { light DIVINESLIGHT } } PointLight DEVASLIGHT @@ -356,7 +356,7 @@ PointLight DEVASLIGHT Object AngerySigilX { - Frame "BLPS" { light "DEVASLIGHT" } + Frame BLPS { light DEVASLIGHT } } PointLight SAFETYLIGHT @@ -368,5 +368,5 @@ PointLight SAFETYLIGHT Object SafetyTether { - Frame "XZW1B" { light "SAFETYLIGHT" } + Frame XZW1B { light SAFETYLIGHT } } diff --git a/gldefs.quadravol b/gldefs.quadravol index 17543fba0..6479bcb93 100644 --- a/gldefs.quadravol +++ b/gldefs.quadravol @@ -10,7 +10,41 @@ PointLight QUADP1LIGHT Size 250 Attenuate 1 } +PointLight QUADP2LIGHT +{ + Color 1.0 0.5 0.1 + Size 300 + Attenuate 1 +} +PointLight QUADP3LIGHT +{ + Color 1.0 0.5 0.1 + Size 350 + Attenuate 1 +} +PointLight QUADPSLIGHT +{ + Color 1.0 0.5 0.1 + Size 150 + Attenuate 1 +} Object QuadProj { - Frame "QFBL" { light "QUADP1LIGHT" } + Frame QFBL { light QUADP1LIGHT } +} +Object QuadProj2 +{ + Frame QFBL { light QUADP2LIGHT } +} +Object QuadProj3 +{ + Frame QFBL { light QUADP3LIGHT } +} +Object QuadProjSub +{ + Frame QFBL { light QUADPSLIGHT } +} +Object QuadProjSub2 +{ + Frame QFBL { light QUADPSLIGHT } } diff --git a/language.version b/language.version index 5bdf4e721..eb3040230 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r549 \cu(Sat 8 Oct 02:05:14 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r549 \cu(2022-10-08 02:05:14)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r550 \cu(Sat 8 Oct 02:05:20 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r550 \cu(2022-10-08 02:05:20)\c-"; diff --git a/sprites/HFLRB0.png b/sprites/HFLRB0.png deleted file mode 100644 index abbdb1aa6..000000000 Binary files a/sprites/HFLRB0.png and /dev/null differ diff --git a/sprites/HFLRC0.png b/sprites/HFLRC0.png deleted file mode 100644 index 6f05cd327..000000000 Binary files a/sprites/HFLRC0.png and /dev/null differ diff --git a/sprites/HFLRD0.png b/sprites/HFLRD0.png deleted file mode 100644 index fa167957d..000000000 Binary files a/sprites/HFLRD0.png and /dev/null differ diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index 9fe9fbd07..ddc5f9c50 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -231,11 +231,6 @@ Class HellblazerFlare : Actor +NOINTERACTION; } - override void PostBeginPlay() - { - if ( !master ) return; - } - override void Tick() { if ( isFrozen() ) return;