From def0e317f3f38f0fde96e2c2e4bc93c0031dea3e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 28 May 2018 13:55:05 +0200 Subject: [PATCH] Added Jump Boots and removed Shielding Suit. Recalculated all the model transforms in preparation for coelckers/gzdoom#495. Corrected some small mistakes in Dual Enforcers code. --- gldefs.txt | 4 -- modeldef.chainsaw | 22 ++++--- modeldef.eightball | 19 +++--- modeldef.enforcer | 29 +++++---- modeldef.flak | 136 ++++++++++++++++++++--------------------- modeldef.ges | 27 ++++---- modeldef.impact | 13 ++-- modeldef.minigun | 14 ++--- modeldef.misc | 102 +++++++++++++------------------ modeldef.pulse | 16 ++--- modeldef.rifle | 17 ++---- modeldef.ripper | 30 ++++----- modeldef.shock | 50 +++++++-------- modeldef.transloc | 22 +++---- modeldef.warhead | 28 +++++---- models/ShieldSuit.png | Bin 34516 -> 0 bytes models/ToxSuit_a.3d | Bin 848 -> 0 bytes models/ToxSuit_d.3d | Bin 4624 -> 0 bytes readme.txt | 5 +- sndinfo.txt | 1 - textures.misc | 2 +- zscript/biorifle.zsc | 2 +- zscript/enforcer.zsc | 12 ++-- zscript/flakcannon.zsc | 4 +- zscript/powerups.zsc | 67 +++++++++++++++----- zscript/uthud.zsc | 8 +-- 26 files changed, 312 insertions(+), 318 deletions(-) delete mode 100644 models/ShieldSuit.png delete mode 100644 models/ToxSuit_a.3d delete mode 100644 models/ToxSuit_d.3d diff --git a/gldefs.txt b/gldefs.txt index ef36e1b..cc1da9c 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -530,10 +530,6 @@ HardwareShader Texture "models/JTranslator1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" } -HardwareShader Texture "models/ShieldSuit.png" -{ - Shader "shaders/glsl/AmbientGlow.fp" -} /*Brightmap Texture "models/JBigFlash1.png" { Map "brightmaps/JBigFlash1.png" diff --git a/modeldef.chainsaw b/modeldef.chainsaw index 0e40780..faf11c1 100644 --- a/modeldef.chainsaw +++ b/modeldef.chainsaw @@ -3,9 +3,9 @@ Model "UTChainsaw" Path "models" Model 1 "ChainSawPick_d.3d" Skin 1 "JChainSawPick1.png" - Offset -1.68 -4 12 - Scale -0.168 0.14 0.14 - AngleOffset 180 + Offset -10.5 -0.84 12 + Scale 0.14 0.168 0.14 + RollOffset -90 ROTATING FrameIndex CSWP A 1 0 @@ -16,9 +16,9 @@ Model "UTChainsaw" Path "models" Model 1 "ChainSawPick_d.3d" Skin 1 "JChainSawPick1.png" - Offset -1.68 -4 6 - Scale -0.168 0.14 0.14 - AngleOffset 180 + Offset -10.5 -0.84 12 + Scale 0.14 0.168 0.14 + RollOffset -90 FrameIndex CSWP B 1 0 } @@ -31,10 +31,12 @@ Model "UTChainsaw" SurfaceSkin 0 1 "Jchainsaw2.png" SurfaceSkin 0 2 "Jchainsaw3.png" SurfaceSkin 0 3 "Jchainsaw4.png" - Scale 0.2 0.16 0.18 - Offset 3.5 -12.8 -7.2 - AngleOffset 268 - PitchOffset 90 + Scale -0.24 0.12 0.24 + Offset 5.6 -14.8 -7.2 + // these adjustments are my own so it looks right, otherwise it just clips through the screen + // this kinda happens in UT too, since it was made without widescreen in mind + AngleOffset 5 + PitchOffset 10 // select FrameIndex CSWS A 0 2 diff --git a/modeldef.eightball b/modeldef.eightball index 1aa2365..279660c 100644 --- a/modeldef.eightball +++ b/modeldef.eightball @@ -3,9 +3,9 @@ Model "UTRocketAmmo" Path "models" Model 0 "RocketPackMesh_d.3d" Skin 0 "JRocketPack1.png" - Scale 0.072 -0.0864 0.072 - AngleOffset 270 - ZOffset 6 + Scale 0.072 0.0864 0.072 + RollOffset -90 + ZOffset 7 FrameIndex RPAK A 0 0 } @@ -15,8 +15,9 @@ Model "UTRocketAmmo2" Path "models" Model 0 "UTRocket_d.3d" Skin 0 "JuRocket1_.png" - Scale -0.0822 0.0685 0.07 + Scale 0.0822 0.09864 0.07 ZOffset 6 + RollOffset -90 FrameIndex RCKT A 0 0 } @@ -26,10 +27,9 @@ Model "UTRocketLauncher" Path "models" Model 1 "Eight2Pick_d.3d" Skin 1 "Eight_t.png" - Offset 0 4 12 - Scale -0.24 0.288 0.24 - PitchOffset 90 + Scale 0.24 0.24 0.288 AngleOffset 90 + ZOffset 12 ROTATING FrameIndex EBLP A 1 0 @@ -39,10 +39,9 @@ Model "UTRocketLauncher" Path "models" Model 1 "Eight2Pick_d.3d" Skin 1 "Eight_t.png" - Offset 0 4 6 - Scale -0.24 0.288 0.24 - PitchOffset 90 + Scale 0.24 0.24 0.288 AngleOffset 90 + ZOffset 6 FrameIndex EBLP B 1 0 } diff --git a/modeldef.enforcer b/modeldef.enforcer index ec1a99c..8e07c80 100644 --- a/modeldef.enforcer +++ b/modeldef.enforcer @@ -3,8 +3,7 @@ Model "EClip" Path "models" Model 0 "EClipM_d.3d" Skin 0 "JEClip.png" - Scale -0.0864 0.072 0.072 - PitchOffset 90 + Scale 0.072 0.072 0.0864 ZOffset 2.5 FrameIndex ECLP A 0 0 @@ -15,7 +14,9 @@ Model "UTCasing" Path "models" Model 0 "Shellc_d.3d" Skin 0 "Shellcase1.png" - Scale -0.014 0.014 0.0168 + Scale 0.0168 0.014 0.014 + AngleOffset 270 + RollOffset 90 ZOffset 1 USEACTORPITCH USEACTORROLL @@ -31,9 +32,8 @@ Model "Enforcer" Path "models" Model 1 "MagPick_d.3d" Skin 1 "Jautot1.png" - Scale -0.1 0.12 0.1 - PitchOffset 90 - AngleOffset 270 + Scale 0.1 0.1 0.12 + AngleOffset 90 ZOffset 12 ROTATING @@ -44,9 +44,8 @@ Model "Enforcer" Path "models" Model 1 "MagPick_d.3d" Skin 1 "Jautot1.png" - Scale -0.1 0.12 0.1 - PitchOffset 90 - AngleOffset 270 + Scale 0.1 0.1 0.12 + AngleOffset 90 ZOffset 6 FrameIndex ENFP B 1 0 @@ -57,6 +56,7 @@ Model "Enforcer" Path "models" Model 3 "Flat_d.3d" Skin 3 "EMuz1.png" + AngleOffset 90 PitchOffset 90 Scale 0.04 0.04 0.04 Offset 10.4 -25.0 -2.9 @@ -68,6 +68,7 @@ Model "Enforcer" Path "models" Model 3 "Flat_d.3d" Skin 3 "EMuz1.png" + AngleOffset 90 PitchOffset 90 Scale 0.04 0.04 0.04 Offset 1.9 -25.0 -9.3 @@ -79,6 +80,7 @@ Model "Enforcer" Path "models" Model 3 "Flat_d.3d" Skin 3 "EMuz1.png" + AngleOffset 90 PitchOffset 90 Scale 0.04 0.04 0.04 Offset -10.4 -25.0 -2.9 @@ -90,6 +92,7 @@ Model "Enforcer" Path "models" Model 3 "Flat_d.3d" Skin 3 "EMuz1.png" + AngleOffset 90 PitchOffset 90 Scale 0.04 0.04 0.04 Offset -1.9 -25.0 -9.3 @@ -105,9 +108,9 @@ Model "Enforcer" SurfaceSkin 0 1 "Jtutot2.png" SurfaceSkin 0 2 "Jtutot3.png" SurfaceSkin 0 3 "Jtutot4.png" - Scale 0.14 0.08 0.12 + Scale 0.14 -0.08 0.12 Offset 8.6 -12.8 -13.5 - PitchOffset 90 + AngleOffset 90 // Fire FrameIndex ENFF A 0 6 @@ -252,9 +255,9 @@ Model "Enforcer" SurfaceSkin 2 1 "Jtutot2.png" SurfaceSkin 2 2 "Jtutot3.png" SurfaceSkin 2 3 "Jtutot4.png" - Scale 0.14 0.08 0.12 + Scale 0.14 -0.08 0.12 Offset -8.8 -12.8 -13.5 - PitchOffset 90 + AngleOffset 90 // Fire FrameIndex 2NFF A 2 6 diff --git a/modeldef.flak b/modeldef.flak index 04a6dfd..19b578a 100644 --- a/modeldef.flak +++ b/modeldef.flak @@ -1,11 +1,10 @@ Model "FlakAmmo" { Path "models" - Model 0 "flakammom_d.3d" + Model 0 "FlakAmmoM_d.3d" Skin 0 "jfa1.png" - PitchOffset 90 - Scale 0.12 0.1 0.1 - ZOffset 4 + Scale 0.1 0.1 0.12 + ZOffset 4.5 FrameIndex FAMO A 0 0 } @@ -15,8 +14,8 @@ Model "FlakAmmo2" Path "models" Model 0 "flakslugm_d.3d" Skin 0 "jflakslugel1_.png" - PitchOffset 90 - Scale 0.048 0.04 0.04 + Scale 0.04 0.04 0.048 + AngleOffset 180 ZOffset 2 FrameIndex FSLG A 0 0 @@ -27,8 +26,9 @@ Model "FlakSlug" Path "models" Model 0 "flakslugm_d.3d" Skin 0 "jflakslugel1.png" - RollOffset 90 - Scale 0.048 0.04 0.04 + Scale 0.048 0.048 0.04 + AngleOffset 180 + PitchOffset 90 PITCHFROMMOMENTUM FrameIndex FSLG A 0 0 @@ -39,7 +39,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a00.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -53,7 +53,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a01.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -67,7 +67,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a02.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -81,7 +81,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a03.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -95,7 +95,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a04.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -109,7 +109,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a05.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -123,7 +123,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a06.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -137,7 +137,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a07.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -151,7 +151,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a08.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -165,7 +165,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a09.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -179,7 +179,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a10.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -193,7 +193,7 @@ Model "FlakChunk" Path "models" Model 0 "chunkm_d.3d" Skin 0 "chunk_a11.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -208,7 +208,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a00.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -222,7 +222,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a01.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -236,7 +236,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a02.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -250,7 +250,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a03.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -264,7 +264,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a04.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -278,7 +278,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a05.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -292,7 +292,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a06.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -306,7 +306,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a07.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -320,7 +320,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a08.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -334,7 +334,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a09.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -348,7 +348,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a10.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -362,7 +362,7 @@ Model "FlakChunk" Path "models" Model 1 "chunk2m_d.3d" Skin 1 "chunk_a11.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -377,7 +377,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a00.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -391,7 +391,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a01.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -405,7 +405,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a02.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -419,7 +419,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a03.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -433,7 +433,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a04.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -447,7 +447,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a05.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -461,7 +461,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a06.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -475,7 +475,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a07.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -489,7 +489,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a08.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -503,7 +503,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a09.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -517,7 +517,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a10.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -531,7 +531,7 @@ Model "FlakChunk" Path "models" Model 2 "chunk3m_d.3d" Skin 2 "chunk_a11.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -546,7 +546,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a00.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -560,7 +560,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a01.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -574,7 +574,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a02.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -588,7 +588,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a03.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -602,7 +602,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a04.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -616,7 +616,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a05.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -630,7 +630,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a06.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -644,7 +644,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a07.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -658,7 +658,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a08.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -672,7 +672,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a09.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -686,7 +686,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a10.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -700,7 +700,7 @@ Model "FlakChunk" Path "models" Model 3 "chunk4m_d.3d" Skin 3 "chunk_a11.png" - Scale 0.06 0.06 0.06 + Scale 0.06 0.06 0.072 ZOffset 2 USEACTORPITCH USEACTORROLL @@ -716,10 +716,8 @@ Model "FlakCannon" Model 1 "flak2pick_d.3d" Skin 1 "flak_t.png" AngleOffset 90 - PitchOffset 90 - Scale 0.14 0.168 0.14 - Offset 0 -18.9 0 - ZOffset 12 + Scale 0.14 0.14 0.168 + Offset 18.9 0 12 ROTATING FrameIndex FPCK A 1 0 @@ -730,10 +728,8 @@ Model "FlakCannon" Model 1 "flak2pick_d.3d" Skin 1 "flak_t.png" AngleOffset 90 - PitchOffset 90 - Scale 0.14 0.168 0.14 - Offset 0 -18.9 0 - ZOffset 11 + Scale 0.14 0.14 0.168 + Offset 18.9 0 12 FrameIndex FPCK B 1 0 } @@ -743,9 +739,10 @@ Model "FlakCannon" Path "models" Model 2 "Flat_d.3d" Skin 2 "Flakmuz.png" + AngleOffset 90 PitchOffset 90 Scale 0.08 0.08 0.08 - Offset 4.0 -25.0 -7.5 + Offset 7.4 -25.0 -7.5 FrameIndex FMUZ A 2 0 } @@ -759,10 +756,11 @@ Model "FlakCannon" SurfaceSkin 0 2 "flak_t3.png" SurfaceSkin 0 3 "flak_t4.png" SurfaceSkin 0 4 "flakammoledbase.png" - AngleOffset 180 - PitchOffset 90 - Scale 0.2 0.1 0.2 - Offset 5.6 -7.6 -10.4 + AngleOffset 90 + PitchOffset 180 + RollOffset 174.35 + Scale 0.28 -0.12 0.28 + Offset 8.6 -10.4 -12.8 // select FrameIndex FLKS A 0 0 diff --git a/modeldef.ges b/modeldef.ges index af5918a..a748699 100644 --- a/modeldef.ges +++ b/modeldef.ges @@ -3,8 +3,9 @@ Model "BioAmmo" Path "models" Model 0 "BioAmmoM_d.3d" Skin 0 "Jbammo1.png" - Scale -0.08 0.096 0.08 - AngleOffset 270 + Scale 0.08 0.096 0.08 + PitchOffset 180 + RollOffset 90 ZOffset 4 FrameIndex BIOA A 0 0 @@ -16,7 +17,7 @@ Model "BioGel" Model 0 "BioGelm_d.3d" Skin 0 "Jgreen.png" Scale 0.08 0.096 0.08 - RollOffset 90 + PitchOffset -90 USEACTORPITCH USEACTORROLL @@ -88,7 +89,7 @@ Model "BioSplash" Model 0 "BioGelm_d.3d" Skin 0 "Jgreen.png" Scale 0.08 0.096 0.08 - RollOffset 90 + PitchOffset -90 USEACTORPITCH USEACTORROLL @@ -160,7 +161,7 @@ Model "BioGlob" Model 0 "BioGelm_d.3d" Skin 0 "Jgreen.png" Scale 0.08 0.096 0.08 - RollOffset 90 + PitchOffset -90 USEACTORPITCH USEACTORROLL @@ -231,9 +232,8 @@ Model "BioRifle" Path "models" Model 1 "BRifle2Pick_d.3d" Skin 1 "JBRifle2.png" - Scale -0.1 0.12 0.1 - PitchOffset 90 - AngleOffset 270 + Scale 0.1 0.1 0.12 + AngleOffset 90 ZOffset 12 ROTATING @@ -244,9 +244,8 @@ Model "BioRifle" Path "models" Model 1 "BRifle2Pick_d.3d" Skin 1 "JBRifle2.png" - Scale -0.1 0.12 0.1 - PitchOffset 90 - AngleOffset 270 + Scale 0.1 0.1 0.12 + AngleOffset 90 ZOffset 10 FrameIndex BIOP B 1 0 @@ -260,9 +259,9 @@ Model "BioRifle" SurfaceSkin 0 1 "JBRifle22.png" SurfaceSkin 0 2 "JBRifle23.png" SurfaceSkin 0 3 "JBRifle24.png" - RollOffset -8.4375 - PitchOffset 94.21875 - Scale 0.125 0.06 0.125 + AngleOffset 94.21875 + RollOffset 8.4375 + Scale 0.125 -0.06 0.125 Offset 9.8 -17.6 -10.4 // select diff --git a/modeldef.impact b/modeldef.impact index fc4d106..8a80ec7 100644 --- a/modeldef.impact +++ b/modeldef.impact @@ -3,8 +3,8 @@ Model "ImpactHammer" Path "models" Model 1 "ImpPick_d.3d" Skin 1 "JImpPick1.png" - Scale -0.2 0.24 0.2 - AngleOffset 270 + Scale 0.2 0.24 0.2 + RollOffset -90 ZOffset 12 ROTATING @@ -15,8 +15,8 @@ Model "ImpactHammer" Path "models" Model 1 "ImpPick_d.3d" Skin 1 "JImpPick1.png" - Scale -0.2 0.24 0.2 - AngleOffset 270 + Scale 0.2 0.24 0.2 + RollOffset -90 ZOffset 9 FrameIndex IMPP B 1 0 @@ -30,8 +30,9 @@ Model "ImpactHammer" SurfaceSkin 0 1 "JImpactHammer2.png" SurfaceSkin 0 2 "JImpactHammer3.png" SurfaceSkin 0 3 "JImpactHammer4.png" - PitchOffset 5 - Scale 0.1 0.05 0.1 + AngleOffset 90 + RollOffset -85 + Scale 0.1 -0.05 0.1 Offset 5.8 -12.8 -7.7 // select diff --git a/modeldef.minigun b/modeldef.minigun index 7289484..fcfb3ee 100644 --- a/modeldef.minigun +++ b/modeldef.minigun @@ -5,9 +5,7 @@ Model "MiniAmmo" Model 0 "MiniAmmom_d.3d" Skin 0 "JM21.png" Offset 2 0 8 - PitchOffset 90 - AngleOffset 90 - Scale 0.12 -0.134 0.12 + Scale 0.12 0.12 0.134 FrameIndex MAMO A 0 0 } @@ -17,9 +15,8 @@ Model "Minigun" Path "models" Model 1 "MinigunPick_d.3d" Skin 1 "Mini_t.png" - Scale -0.2 0.24 0.2 - PitchOffset 90 - AngleOffset 270 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 12 ROTATING @@ -30,9 +27,8 @@ Model "Minigun" Path "models" Model 1 "MinigunPick_d.3d" Skin 1 "Mini_t.png" - Scale -0.2 0.24 0.2 - PitchOffset 90 - AngleOffset 270 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 6 FrameIndex MGNP B 1 0 diff --git a/modeldef.misc b/modeldef.misc index 3018f42..2211ebd 100644 --- a/modeldef.misc +++ b/modeldef.misc @@ -3,8 +3,7 @@ Model "UTTeleportFog" Path "models" Model 0 "Tele2_d.3d" Skin 0 "JTele2_01.png" - Scale 0.24 0.2 0.2 - PitchOffset 90 + Scale 0.2 0.2 0.24 ZOffset 10 DONTCULLBACKFACES @@ -51,9 +50,9 @@ Model "UTHealthPack" Model 0 "hbox_d.3d" SurfaceSkin 0 0 "jhbox1.png" SurfaceSkin 0 1 "FIZZHP00" - Scale -0.2 0.2 0.2 - AngleOffset 90 - ZOffset 14 + Scale 0.2 0.24 0.2 + RollOffset -90 + ZOffset 16 FrameIndex HBOX A 0 0 } @@ -65,8 +64,7 @@ Model "UTHealthBox" SurfaceSkin 0 0 "jhboxbeta1.png" SurfaceSkin 0 1 "FIZZHP10" SurfaceSkin 0 2 "FIZZHP10" - Scale -0.096 0.08 0.08 - PitchOffset 90 + Scale 0.08 0.08 0.096 ZOffset 4 FrameIndex HBOX B 0 0 @@ -78,8 +76,7 @@ Model "UTMedBox" Model 0 "MedBox_d.3d" SurfaceSkin 0 0 "JMedBox1.png" SurfaceSkin 0 1 "FIZZHP10" - Scale -0.072 0.06 0.06 - PitchOffset 90 + Scale 0.06 0.06 0.072 ZOffset 5 FrameIndex HBOX C 0 0 @@ -92,8 +89,7 @@ Model "UTHealthBonus" SurfaceSkin 0 0 "JVial0.png" SurfaceSkin 0 1 "FIZZHP20" SurfaceSkin 0 2 "FIZZHP20" - Scale -0.048 0.04 0.04 - PitchOffset 90 + Scale 0.04 0.04 0.048 ZOffset 8 DONTCULLBACKFACES @@ -105,10 +101,10 @@ Model "UTArmorBonus" Path "models" Model 0 "bossheadm_d.3d" Skin 0 "bossheadT.png" - Scale -0.072 0.072 0.06 - AngleOffset 180 - PitchOffset 110 - ZOffset 6 + Scale 0.06 0.06 0.072 + AngleOffset -90 + RollOffset 12 + ZOffset 5.5 FrameIndex XANH A 0 0 } @@ -118,8 +114,7 @@ Model "UTThighPads" Path "models" Model 0 "ThighPads_d.3d" Skin 0 "JThighPads_01.png" - Scale -0.096 0.08 0.08 - PitchOffset 90 + Scale 0.08 0.08 0.096 ZOffset 12 ROTATING @@ -131,8 +126,7 @@ Model "UTBodyArmor" Path "models" Model 0 "Armor2M_d.3d" Skin 0 "Jarmor2.png" - Scale -0.134 0.134 0.12 - PitchOffset 90 + Scale 0.12 0.12 0.134 ZOffset 12 FrameIndex UARM A 0 0 @@ -143,9 +137,8 @@ Model "UTShieldBelt" Path "models" Model 0 "ShieldBeltMeshM_d.3d" Skin 0 "AUbelt1.png" - Scale -0.12 0.1 0.1 - AngleOffset 180 - PitchOffset 90 + Scale 0.1 0.1 0.12 + AngleOffset -90 ZOffset 4 FrameIndex BELT A 0 0 @@ -156,8 +149,7 @@ Model "UDamage" Path "models" Model 0 "UDamage_d.3d" Skin 0 "GoldSkin2.png" - Scale 0.192 0.16 0.16 - PitchOffset 90 + Scale 0.16 0.16 0.192 ZOffset 24 ROTATING @@ -168,8 +160,7 @@ Model "UDamage" Path "models" Model 1 "UDamageB_d.3d" Skin 1 "Judamage1.png" - Scale 0.192 0.16 0.16 - PitchOffset 90 + Scale 0.16 0.16 0.192 ZOffset 24 ROTATING @@ -181,8 +172,8 @@ Model "UTRedSkull" Path "models" Model 0 "RelicSkull_d.3d" Skin 0 "JRelicSkull_01r.png" - Scale 0.12 0.1 0.1 - PitchOffset 90 + Scale 0.1 0.1 0.12 + AngleOffset -90 // relic of death faces to the side originally ZOffset 12 ROTATING @@ -193,8 +184,8 @@ Model "UTGoldSkull" Path "models" Model 0 "RelicSkull_d.3d" Skin 0 "JRelicSkull_01g.png" - Scale 0.12 0.1 0.1 - PitchOffset 90 + Scale 0.1 0.1 0.12 + AngleOffset -90 // relic of death faces to the side originally ZOffset 12 ROTATING @@ -205,8 +196,8 @@ Model "UTBlueSkull" Path "models" Model 0 "RelicSkull_d.3d" Skin 0 "JRelicSkull_01b.png" - Scale 0.12 0.1 0.1 - PitchOffset 90 + Scale 0.1 0.1 0.12 + AngleOffset -90 // relic of death faces to the side originally ZOffset 12 ROTATING @@ -217,8 +208,7 @@ Model "UTRedKey" Path "models" Model 0 "DomR_d.3d" Skin 0 "RedSkin2.png" - Scale 0.048 0.04 0.04 - PitchOffset 90 + Scale 0.04 0.04 0.048 ZOffset 16 ROTATING @@ -229,8 +219,7 @@ Model "UTGoldKey" Path "models" Model 0 "MercSymbol_d.3d" Skin 0 "GoldSkin2.png" - Scale 0.096 0.08 0.08 - PitchOffset 90 + Scale 0.08 0.08 0.096 ZOffset 16 ROTATING @@ -241,8 +230,7 @@ Model "UTBlueKey" Path "models" Model 0 "DomB_d.3d" Skin 0 "BlueSkin2.png" - Scale 0.048 0.04 0.04 - PitchOffset 90 + Scale 0.04 0.04 0.048 ZOffset 16 ROTATING @@ -252,10 +240,12 @@ Model "UTBlueKey" Model "UTBackpack" { Path "models" - Model 0 "Backpack2_d.3d" // cheaply edited out of SelectionMale1 (offsets weren't even readjusted) + Model 0 "Backpack2_d.3d" // cheaply edited out of SelectionMale1 (offsets weren't even readjusted, so I have to do it here) Skin 0 "bpak.png" - Offset -20 12 -16 - Scale -0.36 0.3 0.3 + Offset -15.795 13.1625 -16 // calculating the X and Y offsets was hard, but I'm glad I added the "estimated center" feature in umeshinfo now + Scale 0.36 0.3 0.3 + AngleOffset 90 + RollOffset -90 ROTATING FrameIndex BPAK A 0 0 @@ -266,8 +256,7 @@ Model "UTInvisibility" Path "models" Model 0 "invis2M_d.3d" SurfaceSkin 0 0 "jinvis.png" - Scale -0.12 0.1 0.1 - PitchOffset 90 + Scale 0.1 0.1 0.12 ZOffset 9 FrameIndex INVS A 0 0 @@ -277,8 +266,7 @@ Model "UTInvisibilityX" Path "models" Model 0 "invis2M_d.3d" SurfaceSkin 0 1 "invis00" - Scale -0.12 0.1 0.1 - PitchOffset 90 + Scale 0.1 0.1 0.12 ZOffset 9 FrameIndex INVS A 0 0 @@ -289,24 +277,21 @@ Model "UTMapRevealer" Path "models" Model 0 "TranslatorMesh_d.3d" Skin 0 "JTranslator1.png" - Scale -0.096 0.08 0.08 - PitchOffset 90 + Scale 0.08 0.08 0.096 ZOffset 4 FrameIndex TRNS A 0 0 } -Model "ShieldingSuit" +Model "UTJumpBoots" { Path "models" - Model 0 "ToxSuit_d.3d" - Skin 0 "ShieldSuit.png" - Scale -0.12 0.12 0.134 - PitchOffset 180 - ZOffset 24 - ROTATING + Model 0 "jboot_d.3d" + Skin 0 "Jlboot2.png" + Scale 0.09 0.09 0.108 + ZOffset 7 - FrameIndex SSUT A 0 0 + FrameIndex JBUT A 0 0 } Model "Searchlight" @@ -314,9 +299,8 @@ Model "Searchlight" Path "models" Model 0 "BigFlash_d.3d" Skin 0 "JBigFlash1.png" - Scale -0.084 0.084 0.07 - PitchOffset 90 - AngleOffset 180 + Scale 0.07 0.07 0.084 + AngleOffset -90 ZOffset 9 FrameIndex SLIT A 0 0 @@ -327,7 +311,7 @@ Model "UTChip" Path "models" Model 0 "ChipM_d.3d" Skin 0 "Chip1.png" - Scale -0.134 0.12 0.12 + Scale 0.12 0.12 0.134 USEACTORPITCH USEACTORROLL USEROTATIONCENTER diff --git a/modeldef.pulse b/modeldef.pulse index e21553c..42a5bbc 100644 --- a/modeldef.pulse +++ b/modeldef.pulse @@ -3,8 +3,7 @@ Model "PulseAmmo" Path "models" Model 0 "PAmmo_d.3d" Skin 0 "JPammo_01.png" - Scale -0.072 0.06 0.06 - PitchOffset 90 + Scale 0.06 0.06 0.072 ZOffset 6 FrameIndex PAMO A 0 0 @@ -15,9 +14,7 @@ Model "PulseGun" Path "models" Model 1 "PulsePickup_d.3d" Skin 1 "JPulsePickup_01.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.16 0.192 0.16 + Scale 0.16 0.16 0.192 ZOffset 12 ROTATING @@ -28,9 +25,7 @@ Model "PulseGun" Path "models" Model 1 "PulsePickup_d.3d" Skin 1 "JPulsePickup_01.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.16 0.192 0.16 + Scale 0.16 0.16 0.192 ZOffset 8 FrameIndex PGNP B 1 0 @@ -41,6 +36,7 @@ Model "PulseGun" Path "models" Model 2 "Flat_d.3d" Skin 2 "MuzzyPulse.png" + AngleOffset 90 PitchOffset 90 Scale 0.08 0.08 0.08 Offset 8.5 -25.0 -4.5 @@ -55,8 +51,8 @@ Model "PulseGun" SurfaceSkin 0 0 "AmmoLedBase.png" SurfaceSkin 0 1 "JPulseGun_02.png" SurfaceSkin 0 2 "JPulseGun_03.png" - PitchOffset 90 - Scale 0.26 0.195 0.26 + AngleOffset 90 + Scale 0.26 -0.195 0.26 Offset 0.0 -7.5 -8.0 // Select diff --git a/modeldef.rifle b/modeldef.rifle index bc55b01..22f4f8b 100644 --- a/modeldef.rifle +++ b/modeldef.rifle @@ -3,9 +3,7 @@ Model "RifleAmmo" Path "models" Model 0 "BulletBoxM_d.3d" Skin 0 "BulletBoxT.png" - Scale -0.084 0.07 0.07 - PitchOffset 90 - AngleOffset 180 + Scale 0.07 0.07 0.084 ZOffset 3 FrameIndex SBOX A 0 0 @@ -16,8 +14,7 @@ Model "RifleAmmo2" Path "models" Model 0 "RifleRoundM_d.3d" Skin 0 "RifleR1.png" - Scale -0.024 0.02 0.02 - PitchOffset 90 + Scale 0.02 0.02 0.024 ZOffset 4 FrameIndex SRND A 0 0 @@ -28,9 +25,8 @@ Model "SniperRifle" Path "models" Model 1 "RiflePick_d.3d" Skin 1 "JRifle2.png" - Scale -0.2 0.24 0.2 - PitchOffset 90 - AngleOffset 270 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 12 ROTATING @@ -41,9 +37,8 @@ Model "SniperRifle" Path "models" Model 1 "RiflePick_d.3d" Skin 1 "JRifle2.png" - Scale -0.2 0.24 0.2 - PitchOffset 90 - AngleOffset 270 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 6 FrameIndex SRFP B 1 0 diff --git a/modeldef.ripper b/modeldef.ripper index 40a17cf..22050d7 100644 --- a/modeldef.ripper +++ b/modeldef.ripper @@ -3,8 +3,7 @@ Model "RipperAmmo" Path "models" Model 0 "BladeHopperM_d.3d" Skin 0 "BladeHopperT.png" - PitchOffset 90 - Scale -0.12 0.1 0.1 + Scale 0.1 0.1 0.12 ZOffset 10 FrameIndex BHOP A 0 0 @@ -15,8 +14,8 @@ Model "Ripper2" Path "models" Model 1 "RazPick2_d.3d" Skin 1 "JRazorw.png" - Scale -0.24 0.2 0.2 - PitchOffset 90 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 12 ROTATING @@ -27,8 +26,8 @@ Model "Ripper2" Path "models" Model 1 "RazPick2_d.3d" Skin 1 "JRazorw.png" - Scale -0.24 0.2 0.2 - PitchOffset 90 + Scale 0.2 0.2 0.24 + AngleOffset 90 ZOffset 6 FrameIndex RZRP B 1 0 @@ -40,9 +39,8 @@ Model "Razor2" Model 0 "RazorBlade_d.3d" SurfaceSkin 0 0 "RazSkin.png" Offset -9.5 0 0 - Scale 0.216 0.18 0.18 - PitchOffset 90 - AngleOffset 180 + Scale 0.18 0.18 0.216 + AngleOffset 90 USEACTORPITCH USEACTORROLL @@ -55,9 +53,8 @@ Model "Razor2Trail" Model 0 "RazorBlade_d.3d" SurfaceSkin 0 1 "RazTrail.png" Offset -19 0 0 - Scale 0.432 0.18 0.18 - PitchOffset 90 - AngleOffset 180 + Scale 0.36 0.18 0.216 + AngleOffset 90 USEACTORPITCH USEACTORROLL DONTCULLBACKFACES @@ -71,9 +68,8 @@ Model "Razor2Alt" Model 0 "RazorBlade_d.3d" SurfaceSkin 0 0 "RazSkin.png" Offset -9.5 0 0 - Scale 0.216 0.18 0.18 - PitchOffset 90 - AngleOffset 180 + Scale 0.18 0.18 0.216 + AngleOffset 90 USEACTORPITCH USEACTORROLL @@ -89,9 +85,9 @@ Model "Ripper2" SurfaceSkin 0 2 "JRazor4.png" SurfaceSkin 0 3 "JRazor5.png" SurfaceSkin 0 4 "JRazor3.png" - Scale 0.16 0.08 0.16 + Scale 0.16 -0.08 0.16 Offset 7.4 -10.8 -8.9 - PitchOffset 90 + AngleOffset 90 // Select FrameIndex RZRS A 0 0 diff --git a/modeldef.shock b/modeldef.shock index a85252f..23a1cf1 100644 --- a/modeldef.shock +++ b/modeldef.shock @@ -3,8 +3,7 @@ Model "ShockAmmo" Path "models" Model 0 "ShockCoreM_d.3d" Skin 0 "JShockCore.png" - PitchOffset 90 - Scale -0.132 0.11 0.11 + Scale 0.11 0.11 0.132 ZOffset 12 FrameIndex SHOA A 0 0 @@ -15,8 +14,7 @@ Model "EnhancedShockAmmo" Path "models" Model 0 "ShockCoreM_d.3d" Skin 0 "JSShockCore.png" - PitchOffset 90 - Scale -0.132 0.11 0.11 + Scale 0.11 0.11 0.132 ZOffset 12 FrameIndex SHOA A 0 0 @@ -27,6 +25,8 @@ Model "ShockRifleWave" Path "models" Model 0 "shockrwm_d.3d" Skin 0 "shocktt1.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 FrameIndex SWAV A 0 0 FrameIndex SWAV B 0 1 @@ -37,6 +37,8 @@ Model "SuperShockRifleWave" Path "models" Model 0 "shockrwm_d.3d" Skin 0 "sshocktt1.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 FrameIndex SWAV A 0 0 FrameIndex SWAV B 0 1 @@ -47,10 +49,11 @@ Model "ShockBeamRing" Path "models" Model 0 "utringex_d.3d" Skin 0 "asaring.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL - Scale 1.2 1.0 1.0 FrameIndex SRNG A 0 0 FrameIndex SRNG B 0 1 @@ -68,10 +71,11 @@ Model "SuperShockBeamRing" Path "models" Model 0 "utringex_d.3d" Skin 0 "ASasRing.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL - Scale 1.2 1.0 1.0 FrameIndex SRNG A 0 0 FrameIndex SRNG B 0 1 @@ -89,10 +93,11 @@ Model "ShockBlastRing" Path "models" Model 0 "utringex_d.3d" Skin 0 "ppurplering.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL - Scale 1.2 1.0 1.0 FrameIndex SRNG A 0 0 FrameIndex SRNG B 0 1 @@ -110,10 +115,11 @@ Model "SuperShockBlastRing" Path "models" Model 0 "utringex_d.3d" Skin 0 "ASasRing.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL - Scale 1.2 1.0 1.0 FrameIndex SRNG A 0 0 FrameIndex SRNG B 0 1 @@ -131,9 +137,8 @@ Model "ShockRifle" Path "models" Model 1 "asmd2pick_d.3d" Skin 1 "asmd_t.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.14 0.18 0.14 + AngleOffset 90 + Scale 0.14 0.14 0.18 ZOffset 12 ROTATING @@ -144,9 +149,8 @@ Model "ShockRifle" Path "models" Model 1 "asmd2pick_d.3d" Skin 1 "asmd_t.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.14 0.18 0.14 + AngleOffset 90 + Scale 0.14 0.14 0.18 ZOffset 4 FrameIndex ASMP B 1 0 @@ -161,8 +165,8 @@ Model "ShockRifle" SurfaceSkin 0 2 "asmd_t3.png" SurfaceSkin 0 3 "asmd_t3.png" SurfaceSkin 0 4 "asmd_t4.png" - PitchOffset 90 - Scale 0.15 0.12 0.15 + AngleOffset 90 + Scale 0.15 -0.12 0.15 Offset 4.9 -16.6 -7.1 // select @@ -220,9 +224,8 @@ Model "EnhancedShockRifle" Path "models" Model 1 "asmd2pick_d.3d" Skin 1 "sasmd_t.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.14 0.18 0.14 + AngleOffset 90 + Scale 0.14 0.14 0.18 ZOffset 12 ROTATING @@ -233,9 +236,8 @@ Model "EnhancedShockRifle" Path "models" Model 1 "asmd2pick_d.3d" Skin 1 "sasmd_t.png" - AngleOffset 270 - PitchOffset 90 - Scale -0.14 0.18 0.14 + AngleOffset 90 + Scale 0.14 0.14 0.18 ZOffset 4 FrameIndex ASMP B 1 0 @@ -250,8 +252,8 @@ Model "EnhancedShockRifle" SurfaceSkin 0 2 "sasmd_t3.png" SurfaceSkin 0 3 "sasmd_t3.png" SurfaceSkin 0 4 "sasmd_t4.png" - PitchOffset 90 - Scale 0.15 0.12 0.15 + AngleOffset 90 + Scale 0.15 -0.12 0.15 Offset 4.9 -16.6 -7.1 // select diff --git a/modeldef.transloc b/modeldef.transloc index 8f7f071..4c64280 100644 --- a/modeldef.transloc +++ b/modeldef.transloc @@ -3,8 +3,7 @@ Model "TranslocatorModule" Path "models" Model 0 "Module_d.3d" Skin 0 "tloc2_.png" - Scale -0.0672 0.056 0.056 - PitchOffset 90 + Scale 0.056 0.056 0.0672 ZOffset 6 USEACTORPITCH @@ -19,9 +18,8 @@ Model "Translocator" Model 1 "Trans3loc_d.3d" SurfaceSkin 1 0 "tloc1_.png" SurfaceSkin 1 1 "tloc2_.png" - Scale -0.0552 0.046 0.046 - AngleOffset 180 - PitchOffset 90 + Scale 0.046 0.046 0.0552 + AngleOffset -90 ZOffset 12 ROTATING @@ -33,9 +31,8 @@ Model "Translocator" Model 1 "Trans3loc_d.3d" SurfaceSkin 1 0 "tloc1_.png" SurfaceSkin 1 1 "tloc2_.png" - Scale -0.0552 0.046 0.046 - AngleOffset 180 - PitchOffset 90 + Scale 0.046 0.046 0.0552 + AngleOffset -90 ZOffset 6 FrameIndex TLCP B 1 0 @@ -49,11 +46,10 @@ Model "Translocator" SurfaceSkin 0 1 "tloc2.png" SurfaceSkin 0 2 "tloc3.png" SurfaceSkin 0 3 "tloc4.png" - Scale 0.11 0.055 0.11 - Offset -17.8 -22.8 -33.2 - PitchOffset 87 - RollOffset 5 - AngleOffset 183 + Scale 0.11 -0.055 0.11 + Offset -19.8 -22.8 -33.2 + AngleOffset -94.21875 + PitchOffset 3.55555555556 // select FrameIndex TLCS A 0 18 diff --git a/modeldef.warhead b/modeldef.warhead index 40cbf14..c7e3866 100644 --- a/modeldef.warhead +++ b/modeldef.warhead @@ -3,8 +3,7 @@ Model "WarheadAmmo" Path "models" Model 0 "missile_d.3d" Skin 0 "jmissile_01_.png" - Scale -0.21 0.2 0.2 - PitchOffset 90 + Scale 0.2 0.2 0.24 ZOffset 21 FrameIndex WMIS A 0 0 @@ -15,6 +14,8 @@ Model "ShockWave" Path "models" Model 0 "shockwavem_d.3d" Skin 0 "shockt1.png" + Scale 1.2 1.0 1.0 + PitchOffset 90 FrameIndex RWAV A 0 0 FrameIndex RWAV B 0 1 @@ -25,9 +26,9 @@ Model "WarShell" Path "models" Model 0 "missile_d.3d" Skin 0 "jmissile_01.png" - Scale -0.21 0.2 0.2 + Scale 0.24 0.2 0.2 Offset -13 0 0 - AngleOffset 180 + PitchOffset -90 USEACTORPITCH USEACTORROLL @@ -38,9 +39,9 @@ Model "GuidedWarShell" Path "models" Model 0 "missile_d.3d" Skin 0 "jmissile_01.png" - Scale -0.21 0.2 0.2 + Scale 0.24 0.2 0.2 Offset -13 0 0 - AngleOffset 180 + PitchOffset -90 USEACTORPITCH USEACTORROLL @@ -52,9 +53,9 @@ Model "WarheadLauncher" Path "models" Model 1 "whpick_d.3d" Skin 1 "jwhpick1.png" - Scale -0.2 0.24 0.24 + Scale 0.2 0.24 0.2 ZOffset 12 - AngleOffset 180 + RollOffset -90 ROTATING FrameIndex RDMP A 1 0 @@ -64,8 +65,8 @@ Model "WarheadLauncher" Path "models" Model 1 "whpick_d.3d" Skin 1 "jwhpick1.png" - Scale -0.2 0.24 0.24 - AngleOffset 180 + Scale 0.2 0.24 0.2 + RollOffset -90 ZOffset 11 FrameIndex RDMP B 1 0 @@ -79,9 +80,10 @@ Model "WarheadLauncher" SurfaceSkin 0 1 "jwarhead2.png" SurfaceSkin 0 2 "jwarhead3.png" SurfaceSkin 0 3 "jwarhead4.png" - Scale 0.2 0.12 0.2 - PitchOffset 2.8125 - RollOffset 22.5 + Scale 0.2 -0.12 0.2 + AngleOffset 90 + PitchOffset 22.5 + RollOffset -87.1875 Offset 7.9 -15.6 -9.2 // select diff --git a/models/ShieldSuit.png b/models/ShieldSuit.png deleted file mode 100644 index 7cd843ce71228912a7987a8bf05149cb03743925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34516 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 N44$rjF6*2UngG6eed_=K diff --git a/models/ToxSuit_a.3d b/models/ToxSuit_a.3d deleted file mode 100644 index c1d33cbfa5bc87a4eff9bc60842786c0c9151a9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 848 zcmZQ%@L}$)zr~G=wU)0EU~p*v48|Sxf(#w?f-lb*OCw{}>&%=^Y=`(@_-^V>;Z=DX z|ATM{|NoyL{N^0*@AnnAc-Fr7{yBd})Nc@u(U1~>;oldSIj=2PB{2Vi9S;l(tu&TK z#u8FYY?76qIY8LZ+~jrQb2}awUb6B%vvSf-VS)Ntf5BM)7Po-@E$;6-vY9}*;`*$= zF#JOH5TBe~6C((VoaFtzhU5QF5N@&D#S6mw7!UEm@ZHGW@-ge)Gw(9fm4#u333~59 zm~($N69_YCtQJh?Un2>_Zic$DFg%lEjU)_5MV2#fnpws2$g+tMgp0!LxIoxG&Ya=E z`YQq;oS7i>jXm-T&%L_O93VWoUgs+a->-=JXY#y41caw8clmJUL4^ni2WNi#55j$c zc3dEQ-oWHFg9AI~%nnX5hZR=@K-f+24Ic>a5_`i3!V*%4_AxTdEIecR41$|}9QKn{d8-&x3h`r!JT@4M@7 zDfX*h!#hHMEnRW->-CowvgrmNU(PiD`10w30yz+7sMy6H%TWIjgcq~de+1zf>{q`| ztlK1)v226H@)Ku2MxHOvOFM+ TzslgNc$@iGafSu;Z$TIUis5d} diff --git a/models/ToxSuit_d.3d b/models/ToxSuit_d.3d deleted file mode 100644 index 77262b08852c08101991573ef620a81c57a1c867..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4624 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 xgS6LV8PXV}K=pBvUaC 0 ) hittype = HIT_FLOOR; diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc index 2fe71e4..5add0a3 100644 --- a/zscript/enforcer.zsc +++ b/zscript/enforcer.zsc @@ -157,15 +157,11 @@ Class Enforcer : UTWeapon replaces Pistol else Screen.DrawText(confont,Font.CR_GREEN,Screen.GetWidth()*0.01,Screen.GetHeight()*0.88,String.Format("Clip: % 2d / 20",clipcount)); } - override bool HandlePickup (Inventory item) + override bool HandlePickup( Inventory item ) { if ( item.GetClass() == GetClass() ) { - if ( item.Amount == 1 ) - { - item.bPickupGood = true; - item.SetTag("Dual Enforcers"); - } + SetTag("Dual Enforcers"); return Super.HandlePickup(item); } return false; @@ -199,7 +195,7 @@ Class Enforcer : UTWeapon replaces Pistol if ( !weap || !player ) return; if ( slave ) { - if ( invoker.slaveclipcount < 5 ) A_PlaySound("enforcer/click",CHAN_7); + if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.slaveclipcount < 5) ) A_PlaySound("enforcer/click",CHAN_7); if ( (invoker.slaveclipcount <= 0) || (weap.Ammo1.Amount <= 0) ) { invoker.slaverefire = 0; @@ -226,7 +222,7 @@ Class Enforcer : UTWeapon replaces Pistol } else { - if ( invoker.clipcount < 5 ) A_PlaySound("enforcer/click",CHAN_WEAPON); + if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.clipcount < 5) ) A_PlaySound("enforcer/click",CHAN_WEAPON); if ( (invoker.clipcount <= 0) || (weap.Ammo1.Amount <= 0) ) { A_ClearRefire(); diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc index fb23324..7f46831 100644 --- a/zscript/flakcannon.zsc +++ b/zscript/flakcannon.zsc @@ -145,8 +145,8 @@ Class FlakChunk : Actor Default { Obituary "%o was ripped to shreds by %k's Flak Cannon."; - Radius 4; - Height 4; + Radius 2; + Height 2; Speed 50; DamageFunction Random[Flak](12,18); DamageType 'Shredded'; diff --git a/zscript/powerups.zsc b/zscript/powerups.zsc index 7d81cb4..8f4048c 100644 --- a/zscript/powerups.zsc +++ b/zscript/powerups.zsc @@ -294,43 +294,78 @@ Class UTMapRevealer : MapRevealer replaces Allmap } } - -Class ShieldingSuit : PowerupGiver replaces RadSuit +Class UTJumpBoots : Inventory replaces RadSuit { Default { - Tag "Shielding Suit"; + Tag "AntiGrav Boots"; +INVENTORY.AUTOACTIVATE; +INVENTORY.ALWAYSPICKUP; - Inventory.MaxAmount 0; - Powerup.Type "PowerShieldingSuit"; - Inventory.PickupMessage "You got the Shielding Suit."; - Inventory.PickupSound "suit/pickup"; - Inventory.RespawnTics 2100; + Inventory.Amount 3; + Inventory.MaxAmount 3; + Inventory.PickupMessage "You picked up the AntiGrav boots."; + Inventory.PickupSound "boot/pickup"; + Inventory.RespawnTics 1050; + } + override bool Use( bool pickup ) + { + if ( pickup ) + { + Owner.GiveInventory("PowerJumpBoots_HighJump",1); + Owner.GiveInventory("PowerJumpBoots_IronFeet",1); + } + return false; + } + override void Tick() + { + Super.Tick(); + if ( !Owner || !Owner.player ) return; + if ( owner.player.jumptics == -1 ) + { + Amount--; + Owner.A_PlaySound("boot/jump",CHAN_BODY); + if ( Amount <= 0 ) + { + PrintPickupMessage(true,"The AntiGrav Boots have drained."); + DepleteOrDestroy(); + } + } + } + override void DetachFromOwner() + { + Super.DetachFromOwner(); + Owner.TakeInventory("PowerJumpBoots_HighJump",1); + Owner.TakeInventory("PowerJumpBoots_IronFeet",1); } States { Spawn: - SSUT A -1; + JBUT A -1; Stop; } } -Class PowerShieldingSuit : PowerIronFeet +Class PowerJumpBoots_HighJump : PowerHighJump { Default { - Powerup.Duration -60; - Powerup.Color "C0FFEE", 0.35; + Powerup.Strength 3; + Powerup.Duration int.max; + } +} +Class PowerJumpBoots_IronFeet : PowerIronFeet +{ + Default + { + Powerup.Duration int.max; + Powerup.Color "00 00 00", 0.0; } override void AbsorbDamage( int damage, Name damageType, out int newdamage ) { - if ( (damageType == 'Slime') || (damageType == 'Fire') || (damageType == 'Ice') || (damageType == 'Poison') ) - newdamage = 0; } - override void EndEffect() + override void DoEffect() { - PrintPickupMessage(true,"Air supply in the Shielding Suit has expired."); + Powerup.DoEffect(); } } diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc index 27fa896..c2bc192 100644 --- a/zscript/uthud.zsc +++ b/zscript/uthud.zsc @@ -242,12 +242,12 @@ Class UTHud : BaseStatusBar Color dollcolor = tintcolor; DamageAmplifier d; UTArmor b, a, t, s; - //UTJumpBoots j; + UTJumpBoots j; d = DamageAmplifier(CPlayer.mo.FindInventory("DamageAmplifier")); b = UTArmor(CPlayer.mo.FindInventory("UTArmorBonus")); a = UTArmor(CPlayer.mo.FindInventory("UTBodyArmor")); t = UTArmor(CPlayer.mo.FindInventory("UTThighPads")); - //b = CPlayer.mo.FindInventory("UTJumpBoots")); + j = UTJumpBoots(CPlayer.mo.FindInventory("UTJumpBoots")); s = UTArmor(CPlayer.mo.FindInventory("UTShieldBelt")); if ( d && !d.isBlinking() ) dollcolor = d.BlendColor; if ( CPlayer.GetGender() == 1 ) @@ -256,7 +256,7 @@ Class UTHud : BaseStatusBar DrawColor = dollcolor; if ( a ) UTDrawColorTex(Woman[1],1.0,a.Amount/double(a.MaxAmount)); if ( t ) UTDrawColorTex(Woman[2],1.0,t.Amount/double(t.MaxAmount)); - //if ( j ) UTDrawColorTex(Woman[3],1.0,b.Amount/double(b.MaxAmount)); + if ( j ) UTDrawColorTex(Woman[3],1.0,j.Amount/double(j.MaxAmount)); DrawColor = GoldColor; if ( s ) UTDrawColorTex(Woman[4],1.0,s.Amount/double(s.MaxAmount)); } @@ -266,7 +266,7 @@ Class UTHud : BaseStatusBar DrawColor = dollcolor; if ( a ) UTDrawColorTex(Man[1],1.0,a.Amount/double(a.MaxAmount)); if ( t ) UTDrawColorTex(Man[2],1.0,t.Amount/double(t.MaxAmount)); - //if ( j ) UTDrawColorTex(Man[3],1.0,b.Amount/double(b.MaxAmount)); + if ( j ) UTDrawColorTex(Man[3],1.0,j.Amount/double(j.MaxAmount)); DrawColor = GoldColor; if ( s ) UTDrawColorTex(Man[4],1.0,s.Amount/double(s.MaxAmount)); }