diff --git a/gldefs.txt b/gldefs.txt index 7802517..62efcd3 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -570,27 +570,27 @@ PulseLight "UTGoldKeyLight" Interval 2.0 Offset 0 16 0 } -Object "RedSkull" +Object "UTRedSkull" { - Frame "RSKU" { light "UTRedKeyLight" } + Frame "USKL" { light "UTRedKeyLight" } } -Object "BlueSkull" +Object "UTBlueSkull" { - Frame "BSKU" { light "UTBlueKeyLight" } + Frame "USKL" { light "UTBlueKeyLight" } } -Object "YellowSkull" +Object "UTGoldSkull" { - Frame "YSKU" { light "UTGoldKeyLight" } + Frame "USKL" { light "UTGoldKeyLight" } } -Object "RedCard" +Object "UTRedKey" { - Frame "RKEY" { light "UTRedKeyLight" } + Frame "UKEY" { light "UTRedKeyLight" } } -Object "BlueCard" +Object "UTBlueKey" { - Frame "BKEY" { light "UTBlueKeyLight" } + Frame "UKEY" { light "UTBlueKeyLight" } } -Object "YellowCard" +Object "UTGoldKey" { - Frame "YKEY" { light "UTGoldKeyLight" } + Frame "UKEY" { light "UTGoldKeyLight" } } diff --git a/modeldef.misc b/modeldef.misc index e3d2b29..abc79ec 100644 --- a/modeldef.misc +++ b/modeldef.misc @@ -176,7 +176,7 @@ Model "UDamage" FrameIndex UDAM B 1 0 } -Model "RedSkull" +Model "UTRedSkull" { Path "models" Model 0 "RelicSkull_d.3d" @@ -186,10 +186,9 @@ Model "RedSkull" ZOffset 12 ROTATING - FrameIndex RSKU A 0 15 - FrameIndex RSKU B 0 15 + FrameIndex USKL A 0 15 } -Model "YellowSkull" +Model "UTGoldSkull" { Path "models" Model 0 "RelicSkull_d.3d" @@ -199,10 +198,9 @@ Model "YellowSkull" ZOffset 12 ROTATING - FrameIndex YSKU A 0 15 - FrameIndex YSKU B 0 15 + FrameIndex USKL B 0 15 } -Model "BlueSkull" +Model "UTBlueSkull" { Path "models" Model 0 "RelicSkull_d.3d" @@ -212,10 +210,9 @@ Model "BlueSkull" ZOffset 12 ROTATING - FrameIndex BSKU A 0 15 - FrameIndex BSKU B 0 15 + FrameIndex USKL C 0 15 } -Model "RedCard" +Model "UTRedKey" { Path "models" Model 0 "DomR_d.3d" @@ -225,10 +222,9 @@ Model "RedCard" ZOffset 16 ROTATING - FrameIndex RKEY A 0 0 - FrameIndex RKEY B 0 0 + FrameIndex UKEY A 0 0 } -Model "YellowCard" +Model "UTGoldKey" { Path "models" Model 0 "MercSymbol_d.3d" @@ -238,10 +234,9 @@ Model "YellowCard" ZOffset 16 ROTATING - FrameIndex YKEY A 0 0 - FrameIndex YKEY B 0 0 + FrameIndex UKEY B 0 0 } -Model "BlueCard" +Model "UTBlueKey" { Path "models" Model 0 "DomB_d.3d" @@ -251,8 +246,7 @@ Model "BlueCard" ZOffset 16 ROTATING - FrameIndex BKEY A 0 0 - FrameIndex BKEY B 0 0 + FrameIndex UKEY C 0 0 } Model "UTBackpack" diff --git a/textures.misc b/textures.misc index ea6dad6..41cefcb 100644 --- a/textures.misc +++ b/textures.misc @@ -145,3 +145,9 @@ Sprite "CHIPA0",1,1{} Sprite "CHIPB0",1,1{} Sprite "CHIPC0",1,1{} Sprite "CHIPD0",1,1{} +Sprite "USKLA0",1,1{} +Sprite "USKLB0",1,1{} +Sprite "USKLC0",1,1{} +Sprite "UKEYA0",1,1{} +Sprite "UKEYB0",1,1{} +Sprite "UKEYC0",1,1{} diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc index a57fc29..5e29e51 100644 --- a/zscript/utcommon.zsc +++ b/zscript/utcommon.zsc @@ -543,6 +543,102 @@ Class UTSmoke : Actor } } +Class UTRedSkull : RedSkull replaces RedSkull +{ + Default + { + Tag "Red Skull"; + Species "RedSkull"; + Inventory.PickupMessage "You got the Red Skull."; + } + States + { + Spawn: + USKL A -1; + Stop; + } +} + +Class UTGoldSkull : YellowSkull replaces YellowSkull +{ + Default + { + Tag "Gold Skull"; + Species "YellowSkull"; + Inventory.PickupMessage "You got the Gold Skull."; + } + States + { + Spawn: + USKL B -1; + Stop; + } +} + +Class UTBlueSkull : BlueSkull replaces BlueSkull +{ + Default + { + Tag "Blue Skull"; + Species "BlueSkull"; + Inventory.PickupMessage "You got the Blue Skull."; + } + States + { + Spawn: + USKL C -1; + Stop; + } +} + +Class UTRedKey : RedCard replaces RedCard +{ + Default + { + Tag "Red Key"; + Species "RedCard"; + Inventory.PickupMessage "You got the Red Key."; + } + States + { + Spawn: + UKEY A -1; + Stop; + } +} + +Class UTGoldKey : YellowCard replaces YellowCard +{ + Default + { + Tag "Gold Key"; + Species "YellowCard"; + Inventory.PickupMessage "You got the Gold Key."; + } + States + { + Spawn: + UKEY B -1; + Stop; + } +} + +Class UTBlueKey : BlueCard replaces BlueCard +{ + Default + { + Tag "Blue Key"; + Species "BlueCard"; + Inventory.PickupMessage "You got the Blue Key."; + } + States + { + Spawn: + UKEY C -1; + Stop; + } +} + Class GenericFlash : HUDMessageBase { Color col;