diff --git a/Readme.md b/Readme.md index 4e8499e..0c90243 100644 --- a/Readme.md +++ b/Readme.md @@ -47,25 +47,20 @@ This mod requires a recent GZDoom devbuild (g3.6pre-31-gd965c9aa7 or later). - UT-like player movement physics - Visual recoil affecting aim (improved A_Swing from Soundless Mound, can be toggled) + - UT-like weapon dropping style ## In progress - General polishing, bugfixing and rebalancing - Add some more effects - Lava/Slime footstep sounds? - - Additional model optimization and cleanup (optional, not needed for 1.0) - - Trim out unused animations (this one is going to be very time-consuming) - - Re-export models using umodelextract to correct the "mangling" caused by - using umodel (inconsistent texture indices, extra texture groups) - - Fix some oddly-oriented triangles (e.g. some parts of the flak cannon, can - be easily noticed when using invisibility) - - Recenter the backpack mesh (it was a complete hack job to begin with) - UT gore system (toggleable) - - Change the way inventory items are dropped to be more UT-like (using the - freshly merged Inventory.OnDrop feature) ## Future plans + - Additional model optimization and cleanup (optional, not needed for 1.0) + - Trim out unused animations (this one is going to be very time-consuming) + - Recenter the backpack mesh (it was a complete hack job to begin with) - Add ammo counters to Pulsegun, Minigun, Flak Cannon and Rocket Launcher once scripted textures are implemented - Add player models once GZDoom gets a well deserved model animation system diff --git a/modeldef.misc b/modeldef.misc index ff3c4da..f4b9606 100644 --- a/modeldef.misc +++ b/modeldef.misc @@ -48,8 +48,9 @@ Model "UTHealthPack" { Path "models" Model 0 "hbox_d.3d" - SurfaceSkin 0 0 "jhbox1.png" - SurfaceSkin 0 1 "FIZZHP00" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "jhbox1.png" + SurfaceSkin 0 2 "FIZZHP00" Scale 0.2 0.24 0.2 RollOffset -90 ZOffset 16 @@ -61,9 +62,10 @@ Model "UTHealthBox" { Path "models" Model 0 "hboxbeta_d.3d" - SurfaceSkin 0 0 "jhboxbeta1.png" - SurfaceSkin 0 1 "FIZZHP10" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "jhboxbeta1.png" SurfaceSkin 0 2 "FIZZHP10" + SurfaceSkin 0 3 "FIZZHP10" Scale 0.08 0.08 0.096 ZOffset 4 @@ -74,8 +76,9 @@ Model "UTMedBox" { Path "models" Model 0 "MedBox_d.3d" - SurfaceSkin 0 0 "JMedBox1.png" - SurfaceSkin 0 1 "FIZZHP10" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "JMedBox1.png" + SurfaceSkin 0 2 "FIZZHP10" Scale 0.06 0.06 0.072 ZOffset 5 @@ -244,7 +247,8 @@ Model "UTInvisibility" { Path "models" Model 0 "invis2M_d.3d" - SurfaceSkin 0 0 "jinvis.png" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "jinvis.png" Scale 0.1 0.1 0.12 ZOffset 9 @@ -254,7 +258,9 @@ Model "UTInvisibilityX" { Path "models" Model 0 "invis2M_d.3d" - SurfaceSkin 0 1 "invis00" + // gzdoom doesn't handle the environment mapped flag, so I had to edit + // it into a separate texnum + SurfaceSkin 0 2 "invis00" Scale 0.1 0.1 0.12 ZOffset 9 diff --git a/modeldef.pulse b/modeldef.pulse index 6008490..830f162 100644 --- a/modeldef.pulse +++ b/modeldef.pulse @@ -87,9 +87,10 @@ Model "PulseGun" { Path "models" Model 0 "PulseGunR_d.3d" - SurfaceSkin 0 0 "AmmoLedBase.png" - SurfaceSkin 0 1 "JPulseGun_02.png" - SurfaceSkin 0 2 "JPulseGun_03.png" + // indices start at 1 for this model + SurfaceSkin 0 1 "AmmoLedBase.png" + SurfaceSkin 0 2 "JPulseGun_02.png" + SurfaceSkin 0 3 "JPulseGun_03.png" AngleOffset 90 Scale 0.26 -0.28 0.28 Offset 0.0 -7.5 -10.4 diff --git a/modeldef.ripper b/modeldef.ripper index 96b9504..3694b3d 100644 --- a/modeldef.ripper +++ b/modeldef.ripper @@ -29,7 +29,8 @@ Model "Razor2" { Path "models" Model 0 "RazorBlade_d.3d" - SurfaceSkin 0 0 "RazSkin.png" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "RazSkin.png" Offset -9.5 0 0 Scale 0.18 0.18 0.216 AngleOffset 90 @@ -42,7 +43,8 @@ Model "Razor2Trail" { Path "models" Model 0 "RazorBlade_d.3d" - SurfaceSkin 0 1 "RazTrail.png" + // indices start at 1 for this mesh + SurfaceSkin 0 2 "RazTrail.png" Offset -19 0 0 Scale 0.36 0.18 0.216 AngleOffset 90 @@ -56,7 +58,8 @@ Model "Razor2Alt" { Path "models" Model 0 "RazorBlade_d.3d" - SurfaceSkin 0 0 "RazSkin.png" + // indices start at 1 for this mesh + SurfaceSkin 0 1 "RazSkin.png" Offset -9.5 0 0 Scale 0.18 0.18 0.216 AngleOffset 90 diff --git a/modeldef.shock b/modeldef.shock index c18c72c..ddb8eef 100644 --- a/modeldef.shock +++ b/modeldef.shock @@ -165,8 +165,7 @@ Model "ShockRifle" SurfaceSkin 0 0 "asmd_t1.png" SurfaceSkin 0 1 "asmd_t2.png" SurfaceSkin 0 2 "asmd_t3.png" - SurfaceSkin 0 3 "asmd_t3.png" - SurfaceSkin 0 4 "asmd_t4.png" + SurfaceSkin 0 3 "asmd_t4.png" AngleOffset 90 RollOffset 3 // subtly hide an ugly looking part of the model Scale 0.15 -0.12 0.15 @@ -253,8 +252,7 @@ Model "EnhancedShockRifle" SurfaceSkin 0 0 "sasmd_t1.png" SurfaceSkin 0 1 "sasmd_t2.png" SurfaceSkin 0 2 "sasmd_t3.png" - SurfaceSkin 0 3 "sasmd_t3.png" - SurfaceSkin 0 4 "sasmd_t4.png" + SurfaceSkin 0 3 "sasmd_t4.png" AngleOffset 90 RollOffset 3 // subtly hide an ugly looking part of the model Scale 0.15 -0.12 0.15 diff --git a/models/ASMD2M_a.3d b/models/ASMD2M_a.3d index 7f90a04..57d41bf 100644 Binary files a/models/ASMD2M_a.3d and b/models/ASMD2M_a.3d differ diff --git a/models/ASMD2M_d.3d b/models/ASMD2M_d.3d index 24932e1..45bdf56 100644 Binary files a/models/ASMD2M_d.3d and b/models/ASMD2M_d.3d differ diff --git a/models/ASMD2pick_a.3d b/models/ASMD2pick_a.3d index fe39a1e..ae49c40 100644 Binary files a/models/ASMD2pick_a.3d and b/models/ASMD2pick_a.3d differ diff --git a/models/ASMD2pick_d.3d b/models/ASMD2pick_d.3d index c5005dc..7c0ba02 100644 Binary files a/models/ASMD2pick_d.3d and b/models/ASMD2pick_d.3d differ diff --git a/models/Armor2M_a.3d b/models/Armor2M_a.3d index ec9462b..4206692 100644 Binary files a/models/Armor2M_a.3d and b/models/Armor2M_a.3d differ diff --git a/models/Armor2M_d.3d b/models/Armor2M_d.3d index e701897..fd59a35 100644 Binary files a/models/Armor2M_d.3d and b/models/Armor2M_d.3d differ diff --git a/models/AutoML_a.3d b/models/AutoML_a.3d index 8322d5a..ed58d0d 100644 Binary files a/models/AutoML_a.3d and b/models/AutoML_a.3d differ diff --git a/models/AutoML_d.3d b/models/AutoML_d.3d index 0f43f6d..f629ddc 100644 Binary files a/models/AutoML_d.3d and b/models/AutoML_d.3d differ diff --git a/models/AutoMR_a.3d b/models/AutoMR_a.3d index 875cc6d..0fee45e 100644 Binary files a/models/AutoMR_a.3d and b/models/AutoMR_a.3d differ diff --git a/models/AutoMR_d.3d b/models/AutoMR_d.3d index 87754df..191777f 100644 Binary files a/models/AutoMR_d.3d and b/models/AutoMR_d.3d differ diff --git a/models/BRifle2Pick_a.3d b/models/BRifle2Pick_a.3d index 17df02d..64d4aa8 100644 Binary files a/models/BRifle2Pick_a.3d and b/models/BRifle2Pick_a.3d differ diff --git a/models/BRifle2Pick_d.3d b/models/BRifle2Pick_d.3d index 270620f..9e1753d 100644 Binary files a/models/BRifle2Pick_d.3d and b/models/BRifle2Pick_d.3d differ diff --git a/models/BRifle2_a.3d b/models/BRifle2_a.3d index e95a43d..3acf859 100644 Binary files a/models/BRifle2_a.3d and b/models/BRifle2_a.3d differ diff --git a/models/BRifle2_d.3d b/models/BRifle2_d.3d index 4217d84..b55473a 100644 Binary files a/models/BRifle2_d.3d and b/models/BRifle2_d.3d differ diff --git a/models/BigFlash_a.3d b/models/BigFlash_a.3d index d1d627b..41f3c72 100644 Binary files a/models/BigFlash_a.3d and b/models/BigFlash_a.3d differ diff --git a/models/BigFlash_d.3d b/models/BigFlash_d.3d index 65d92c1..abb3c4a 100644 Binary files a/models/BigFlash_d.3d and b/models/BigFlash_d.3d differ diff --git a/models/BioAmmoM_a.3d b/models/BioAmmoM_a.3d index 2e6c9c2..fdc2426 100644 Binary files a/models/BioAmmoM_a.3d and b/models/BioAmmoM_a.3d differ diff --git a/models/BioAmmoM_d.3d b/models/BioAmmoM_d.3d index 76a8b4b..f5c8099 100644 Binary files a/models/BioAmmoM_d.3d and b/models/BioAmmoM_d.3d differ diff --git a/models/BioGelm_a.3d b/models/BioGelm_a.3d index 90c2faa..447ff22 100644 Binary files a/models/BioGelm_a.3d and b/models/BioGelm_a.3d differ diff --git a/models/BioGelm_d.3d b/models/BioGelm_d.3d index 1dcb9c9..2557804 100644 Binary files a/models/BioGelm_d.3d and b/models/BioGelm_d.3d differ diff --git a/models/BladeHopperM_a.3d b/models/BladeHopperM_a.3d index ebca92f..b211780 100644 Binary files a/models/BladeHopperM_a.3d and b/models/BladeHopperM_a.3d differ diff --git a/models/BladeHopperM_d.3d b/models/BladeHopperM_d.3d index ceff6af..58bf1a9 100644 Binary files a/models/BladeHopperM_d.3d and b/models/BladeHopperM_d.3d differ diff --git a/models/BulletBoxM_a.3d b/models/BulletBoxM_a.3d index 1eeaa6b..9bf90bf 100644 Binary files a/models/BulletBoxM_a.3d and b/models/BulletBoxM_a.3d differ diff --git a/models/BulletBoxM_d.3d b/models/BulletBoxM_d.3d index 6ec243c..1418ed6 100644 Binary files a/models/BulletBoxM_d.3d and b/models/BulletBoxM_d.3d differ diff --git a/models/BulletImpact_a.3d b/models/BulletImpact_a.3d index 8cceccf..03c6955 100644 Binary files a/models/BulletImpact_a.3d and b/models/BulletImpact_a.3d differ diff --git a/models/BulletImpact_d.3d b/models/BulletImpact_d.3d index f715e6d..d4e211f 100644 Binary files a/models/BulletImpact_d.3d and b/models/BulletImpact_d.3d differ diff --git a/models/ChainSawPick_a.3d b/models/ChainSawPick_a.3d index 6f6cb5d..b76ba4c 100644 Binary files a/models/ChainSawPick_a.3d and b/models/ChainSawPick_a.3d differ diff --git a/models/ChainSawPick_d.3d b/models/ChainSawPick_d.3d index d0b0870..0a82010 100644 Binary files a/models/ChainSawPick_d.3d and b/models/ChainSawPick_d.3d differ diff --git a/models/EClipM_a.3d b/models/EClipM_a.3d index da14e6c..82a2212 100644 Binary files a/models/EClipM_a.3d and b/models/EClipM_a.3d differ diff --git a/models/EClipM_d.3d b/models/EClipM_d.3d index 410a065..2f1c17c 100644 Binary files a/models/EClipM_d.3d and b/models/EClipM_d.3d differ diff --git a/models/Eight2Pick_a.3d b/models/Eight2Pick_a.3d index 6d39f86..f85efbd 100644 Binary files a/models/Eight2Pick_a.3d and b/models/Eight2Pick_a.3d differ diff --git a/models/Eight2Pick_d.3d b/models/Eight2Pick_d.3d index 5028e2b..557051d 100644 Binary files a/models/Eight2Pick_d.3d and b/models/Eight2Pick_d.3d differ diff --git a/models/Eightm_a.3d b/models/Eightm_a.3d index 37d2201..2b0190f 100644 Binary files a/models/Eightm_a.3d and b/models/Eightm_a.3d differ diff --git a/models/Eightm_d.3d b/models/Eightm_d.3d index 6085b36..adb33ab 100644 Binary files a/models/Eightm_d.3d and b/models/Eightm_d.3d differ diff --git a/models/Flak2Pick_a.3d b/models/Flak2Pick_a.3d index d1d1c12..0733a5a 100644 Binary files a/models/Flak2Pick_a.3d and b/models/Flak2Pick_a.3d differ diff --git a/models/Flak2Pick_d.3d b/models/Flak2Pick_d.3d index f8fcf87..341c0db 100644 Binary files a/models/Flak2Pick_d.3d and b/models/Flak2Pick_d.3d differ diff --git a/models/FlakAmmoM_a.3d b/models/FlakAmmoM_a.3d index 34988b6..7312f38 100644 Binary files a/models/FlakAmmoM_a.3d and b/models/FlakAmmoM_a.3d differ diff --git a/models/FlakAmmoM_d.3d b/models/FlakAmmoM_d.3d index 184ce07..a5399b0 100644 Binary files a/models/FlakAmmoM_d.3d and b/models/FlakAmmoM_d.3d differ diff --git a/models/ImpPick_a.3d b/models/ImpPick_a.3d index 66900ae..cc0267e 100644 Binary files a/models/ImpPick_a.3d and b/models/ImpPick_a.3d differ diff --git a/models/ImpPick_d.3d b/models/ImpPick_d.3d index d910c5a..1a41cc9 100644 Binary files a/models/ImpPick_d.3d and b/models/ImpPick_d.3d differ diff --git a/models/ImpactHammer_a.3d b/models/ImpactHammer_a.3d index 0a91ba9..7b0ab1c 100644 Binary files a/models/ImpactHammer_a.3d and b/models/ImpactHammer_a.3d differ diff --git a/models/ImpactHammer_d.3d b/models/ImpactHammer_d.3d index 003b209..fabb3ae 100644 Binary files a/models/ImpactHammer_d.3d and b/models/ImpactHammer_d.3d differ diff --git a/models/MagPick_a.3d b/models/MagPick_a.3d index 7a00640..1e778e0 100644 Binary files a/models/MagPick_a.3d and b/models/MagPick_a.3d differ diff --git a/models/MagPick_d.3d b/models/MagPick_d.3d index 77c31d5..e84d224 100644 Binary files a/models/MagPick_d.3d and b/models/MagPick_d.3d differ diff --git a/models/MedBox_a.3d b/models/MedBox_a.3d index 01f734a..92c8750 100644 Binary files a/models/MedBox_a.3d and b/models/MedBox_a.3d differ diff --git a/models/MedBox_d.3d b/models/MedBox_d.3d index 806ac03..f90d027 100644 Binary files a/models/MedBox_d.3d and b/models/MedBox_d.3d differ diff --git a/models/MercSymbol_a.3d b/models/MercSymbol_a.3d index 75a78d7..a8a9725 100644 Binary files a/models/MercSymbol_a.3d and b/models/MercSymbol_a.3d differ diff --git a/models/MercSymbol_d.3d b/models/MercSymbol_d.3d index b31bf8c..10d736b 100644 Binary files a/models/MercSymbol_d.3d and b/models/MercSymbol_d.3d differ diff --git a/models/MiniAmmom_a.3d b/models/MiniAmmom_a.3d index 4b0c8fa..0b3c584 100644 Binary files a/models/MiniAmmom_a.3d and b/models/MiniAmmom_a.3d differ diff --git a/models/MiniAmmom_d.3d b/models/MiniAmmom_d.3d index fdf6bab..7668698 100644 Binary files a/models/MiniAmmom_d.3d and b/models/MiniAmmom_d.3d differ diff --git a/models/MiniTrace_d.3d b/models/MiniTrace_d.3d index a79c7d6..df58f3e 100644 Binary files a/models/MiniTrace_d.3d and b/models/MiniTrace_d.3d differ diff --git a/models/Minigun2m_a.3d b/models/Minigun2m_a.3d index 5b0e4fb..c1d1d05 100644 Binary files a/models/Minigun2m_a.3d and b/models/Minigun2m_a.3d differ diff --git a/models/Minigun2m_d.3d b/models/Minigun2m_d.3d index e0be845..e10abb1 100644 Binary files a/models/Minigun2m_d.3d and b/models/Minigun2m_d.3d differ diff --git a/models/MinigunPick_a.3d b/models/MinigunPick_a.3d index 53c79cd..3ec0fae 100644 Binary files a/models/MinigunPick_a.3d and b/models/MinigunPick_a.3d differ diff --git a/models/MinigunPick_d.3d b/models/MinigunPick_d.3d index 86074ba..3577d55 100644 Binary files a/models/MinigunPick_d.3d and b/models/MinigunPick_d.3d differ diff --git a/models/Module_a.3d b/models/Module_a.3d index 4944646..b50f1fe 100644 Binary files a/models/Module_a.3d and b/models/Module_a.3d differ diff --git a/models/Module_d.3d b/models/Module_d.3d index 8a434df..3a07247 100644 Binary files a/models/Module_d.3d and b/models/Module_d.3d differ diff --git a/models/PAmmo_a.3d b/models/PAmmo_a.3d index 98d9a4c..dc36796 100644 Binary files a/models/PAmmo_a.3d and b/models/PAmmo_a.3d differ diff --git a/models/PAmmo_d.3d b/models/PAmmo_d.3d index 415b1df..182b9a1 100644 Binary files a/models/PAmmo_d.3d and b/models/PAmmo_d.3d differ diff --git a/models/PBolt_d.3d b/models/PBolt_d.3d index f3a60f4..c5344b9 100644 Binary files a/models/PBolt_d.3d and b/models/PBolt_d.3d differ diff --git a/models/PulseGunR_a.3d b/models/PulseGunR_a.3d index da79de3..4f76113 100644 Binary files a/models/PulseGunR_a.3d and b/models/PulseGunR_a.3d differ diff --git a/models/PulseGunR_d.3d b/models/PulseGunR_d.3d index 262819d..0f6ec34 100644 Binary files a/models/PulseGunR_d.3d and b/models/PulseGunR_d.3d differ diff --git a/models/PulsePickup_a.3d b/models/PulsePickup_a.3d index 024e4f9..d85bf78 100644 Binary files a/models/PulsePickup_a.3d and b/models/PulsePickup_a.3d differ diff --git a/models/PulsePickup_d.3d b/models/PulsePickup_d.3d index 93f24cc..ffd1a4b 100644 Binary files a/models/PulsePickup_d.3d and b/models/PulsePickup_d.3d differ diff --git a/models/RazPick2_a.3d b/models/RazPick2_a.3d index 5ff367d..3deb04c 100644 Binary files a/models/RazPick2_a.3d and b/models/RazPick2_a.3d differ diff --git a/models/RazPick2_d.3d b/models/RazPick2_d.3d index a7b338e..2845c0d 100644 Binary files a/models/RazPick2_d.3d and b/models/RazPick2_d.3d differ diff --git a/models/Razor2_a.3d b/models/Razor2_a.3d index aa4a916..624b256 100644 Binary files a/models/Razor2_a.3d and b/models/Razor2_a.3d differ diff --git a/models/Razor2_d.3d b/models/Razor2_d.3d index ad0f1f7..fbb4440 100644 Binary files a/models/Razor2_d.3d and b/models/Razor2_d.3d differ diff --git a/models/RazorBlade_d.3d b/models/RazorBlade_d.3d index 3e60aa9..f29266d 100644 Binary files a/models/RazorBlade_d.3d and b/models/RazorBlade_d.3d differ diff --git a/models/Rifle2m_a.3d b/models/Rifle2m_a.3d index b12afb4..4357f9e 100644 Binary files a/models/Rifle2m_a.3d and b/models/Rifle2m_a.3d differ diff --git a/models/Rifle2m_d.3d b/models/Rifle2m_d.3d index c6f4591..8db467c 100644 Binary files a/models/Rifle2m_d.3d and b/models/Rifle2m_d.3d differ diff --git a/models/RiflePick_a.3d b/models/RiflePick_a.3d index 4c9cacd..0f8da2e 100644 Binary files a/models/RiflePick_a.3d and b/models/RiflePick_a.3d differ diff --git a/models/RiflePick_d.3d b/models/RiflePick_d.3d index 9af3219..9c40615 100644 Binary files a/models/RiflePick_d.3d and b/models/RiflePick_d.3d differ diff --git a/models/RifleRoundM_a.3d b/models/RifleRoundM_a.3d index 3af94fd..ffabbab 100644 Binary files a/models/RifleRoundM_a.3d and b/models/RifleRoundM_a.3d differ diff --git a/models/RifleRoundM_d.3d b/models/RifleRoundM_d.3d index efb9505..8034128 100644 Binary files a/models/RifleRoundM_d.3d and b/models/RifleRoundM_d.3d differ diff --git a/models/RocketPackMesh_a.3d b/models/RocketPackMesh_a.3d index 6c0ca16..764a245 100644 Binary files a/models/RocketPackMesh_a.3d and b/models/RocketPackMesh_a.3d differ diff --git a/models/RocketPackMesh_d.3d b/models/RocketPackMesh_d.3d index b0dfbce..cb227b6 100644 Binary files a/models/RocketPackMesh_d.3d and b/models/RocketPackMesh_d.3d differ diff --git a/models/SBolt_d.3d b/models/SBolt_d.3d index 88fd58f..91a7a4c 100644 Binary files a/models/SBolt_d.3d and b/models/SBolt_d.3d differ diff --git a/models/Shellc_a.3d b/models/Shellc_a.3d index 4c345ee..604addb 100644 Binary files a/models/Shellc_a.3d and b/models/Shellc_a.3d differ diff --git a/models/Shellc_d.3d b/models/Shellc_d.3d index 65b433a..bc31b99 100644 Binary files a/models/Shellc_d.3d and b/models/Shellc_d.3d differ diff --git a/models/ShieldBeltMeshM_a.3d b/models/ShieldBeltMeshM_a.3d index 72a2866..bddc744 100644 Binary files a/models/ShieldBeltMeshM_a.3d and b/models/ShieldBeltMeshM_a.3d differ diff --git a/models/ShieldBeltMeshM_d.3d b/models/ShieldBeltMeshM_d.3d index 1a75e79..3594002 100644 Binary files a/models/ShieldBeltMeshM_d.3d and b/models/ShieldBeltMeshM_d.3d differ diff --git a/models/ShockCoreM_a.3d b/models/ShockCoreM_a.3d index 075fad4..71fd33b 100644 Binary files a/models/ShockCoreM_a.3d and b/models/ShockCoreM_a.3d differ diff --git a/models/ShockCoreM_d.3d b/models/ShockCoreM_d.3d index 6d11cce..0b4fea7 100644 Binary files a/models/ShockCoreM_d.3d and b/models/ShockCoreM_d.3d differ diff --git a/models/ShockRWM_a.3d b/models/ShockRWM_a.3d index eee94c5..40a8e87 100644 Binary files a/models/ShockRWM_a.3d and b/models/ShockRWM_a.3d differ diff --git a/models/ShockRWM_d.3d b/models/ShockRWM_d.3d index bae754b..0f94d87 100644 Binary files a/models/ShockRWM_d.3d and b/models/ShockRWM_d.3d differ diff --git a/models/ShockWavem_a.3d b/models/ShockWavem_a.3d index eee94c5..40a8e87 100644 Binary files a/models/ShockWavem_a.3d and b/models/ShockWavem_a.3d differ diff --git a/models/ShockWavem_d.3d b/models/ShockWavem_d.3d index bae754b..0f94d87 100644 Binary files a/models/ShockWavem_d.3d and b/models/ShockWavem_d.3d differ diff --git a/models/Tele2_d.3d b/models/Tele2_d.3d index be54aad..9a4789c 100644 Binary files a/models/Tele2_d.3d and b/models/Tele2_d.3d differ diff --git a/models/ThighPads_a.3d b/models/ThighPads_a.3d index fff8638..3a0c962 100644 Binary files a/models/ThighPads_a.3d and b/models/ThighPads_a.3d differ diff --git a/models/ThighPads_d.3d b/models/ThighPads_d.3d index ee3dc2c..e1b637a 100644 Binary files a/models/ThighPads_d.3d and b/models/ThighPads_d.3d differ diff --git a/models/Trans3loc_a.3d b/models/Trans3loc_a.3d index 6e6065a..878fe66 100644 Binary files a/models/Trans3loc_a.3d and b/models/Trans3loc_a.3d differ diff --git a/models/Trans3loc_d.3d b/models/Trans3loc_d.3d index 08eddc0..8f02efa 100644 Binary files a/models/Trans3loc_d.3d and b/models/Trans3loc_d.3d differ diff --git a/models/TranslatorMesh_a.3d b/models/TranslatorMesh_a.3d index 92d5d8c..1e2dddc 100644 Binary files a/models/TranslatorMesh_a.3d and b/models/TranslatorMesh_a.3d differ diff --git a/models/TranslatorMesh_d.3d b/models/TranslatorMesh_d.3d index 185fbd6..b3385b7 100644 Binary files a/models/TranslatorMesh_d.3d and b/models/TranslatorMesh_d.3d differ diff --git a/models/Transloc_a.3d b/models/Transloc_a.3d index b4bddda..2cadac9 100644 Binary files a/models/Transloc_a.3d and b/models/Transloc_a.3d differ diff --git a/models/Transloc_d.3d b/models/Transloc_d.3d index c593d24..e39db70 100644 Binary files a/models/Transloc_d.3d and b/models/Transloc_d.3d differ diff --git a/models/UDamage_a.3d b/models/UDamage_a.3d index f14ef6e..b7828c0 100644 Binary files a/models/UDamage_a.3d and b/models/UDamage_a.3d differ diff --git a/models/UDamage_d.3d b/models/UDamage_d.3d index 2068cd3..ce76881 100644 Binary files a/models/UDamage_d.3d and b/models/UDamage_d.3d differ diff --git a/models/UTRingex_a.3d b/models/UTRingex_a.3d index 47dff7e..3a33b5c 100644 Binary files a/models/UTRingex_a.3d and b/models/UTRingex_a.3d differ diff --git a/models/UTRingex_d.3d b/models/UTRingex_d.3d index d3f99d2..2758dcc 100644 Binary files a/models/UTRingex_d.3d and b/models/UTRingex_d.3d differ diff --git a/models/UTRocket_a.3d b/models/UTRocket_a.3d index 769aa2b..d56597f 100644 Binary files a/models/UTRocket_a.3d and b/models/UTRocket_a.3d differ diff --git a/models/UTRocket_d.3d b/models/UTRocket_d.3d index e886159..8859c37 100644 Binary files a/models/UTRocket_d.3d and b/models/UTRocket_d.3d differ diff --git a/models/Vial_a.3d b/models/Vial_a.3d index f1487dd..29a9e08 100644 Binary files a/models/Vial_a.3d and b/models/Vial_a.3d differ diff --git a/models/Vial_d.3d b/models/Vial_d.3d index a3efcfb..36d3e80 100644 Binary files a/models/Vial_d.3d and b/models/Vial_d.3d differ diff --git a/models/WHPick_a.3d b/models/WHPick_a.3d index 481443e..baa31e0 100644 Binary files a/models/WHPick_a.3d and b/models/WHPick_a.3d differ diff --git a/models/WHPick_d.3d b/models/WHPick_d.3d index 5b51ee2..49d545b 100644 Binary files a/models/WHPick_d.3d and b/models/WHPick_d.3d differ diff --git a/models/WarHead_a.3d b/models/WarHead_a.3d index 3b46504..972a8f4 100644 Binary files a/models/WarHead_a.3d and b/models/WarHead_a.3d differ diff --git a/models/WarHead_d.3d b/models/WarHead_d.3d index 18bf4e6..4063be2 100644 Binary files a/models/WarHead_d.3d and b/models/WarHead_d.3d differ diff --git a/models/bossheadm_a.3d b/models/bossheadm_a.3d index 4c77542..59c5893 100644 Binary files a/models/bossheadm_a.3d and b/models/bossheadm_a.3d differ diff --git a/models/bossheadm_d.3d b/models/bossheadm_d.3d index fac0b99..1b9c045 100644 Binary files a/models/bossheadm_d.3d and b/models/bossheadm_d.3d differ diff --git a/models/chainsawM_a.3d b/models/chainsawM_a.3d index 763f3ab..3fa69a8 100644 Binary files a/models/chainsawM_a.3d and b/models/chainsawM_a.3d differ diff --git a/models/chainsawM_d.3d b/models/chainsawM_d.3d index a8bc823..d7fe13d 100644 Binary files a/models/chainsawM_d.3d and b/models/chainsawM_d.3d differ diff --git a/models/chunk2M_a.3d b/models/chunk2M_a.3d index 8d2687a..c2867de 100644 Binary files a/models/chunk2M_a.3d and b/models/chunk2M_a.3d differ diff --git a/models/chunk2M_d.3d b/models/chunk2M_d.3d index 7f804ff..157fc80 100644 Binary files a/models/chunk2M_d.3d and b/models/chunk2M_d.3d differ diff --git a/models/chunk3M_a.3d b/models/chunk3M_a.3d index 8d2687a..c2867de 100644 Binary files a/models/chunk3M_a.3d and b/models/chunk3M_a.3d differ diff --git a/models/chunk3M_d.3d b/models/chunk3M_d.3d index 7f804ff..157fc80 100644 Binary files a/models/chunk3M_d.3d and b/models/chunk3M_d.3d differ diff --git a/models/chunk4M_a.3d b/models/chunk4M_a.3d index 1eda858..dead706 100644 Binary files a/models/chunk4M_a.3d and b/models/chunk4M_a.3d differ diff --git a/models/chunk4M_d.3d b/models/chunk4M_d.3d index 00bfcef..d0230be 100644 Binary files a/models/chunk4M_d.3d and b/models/chunk4M_d.3d differ diff --git a/models/chunkM_a.3d b/models/chunkM_a.3d index c0a1e85..113d394 100644 Binary files a/models/chunkM_a.3d and b/models/chunkM_a.3d differ diff --git a/models/chunkM_d.3d b/models/chunkM_d.3d index 4affd81..d39f922 100644 Binary files a/models/chunkM_d.3d and b/models/chunkM_d.3d differ diff --git a/models/femalearmm_a.3d b/models/femalearmm_a.3d index 289a8f4..47c589b 100644 Binary files a/models/femalearmm_a.3d and b/models/femalearmm_a.3d differ diff --git a/models/femalearmm_d.3d b/models/femalearmm_d.3d index f0caf9d..6896f21 100644 Binary files a/models/femalearmm_d.3d and b/models/femalearmm_d.3d differ diff --git a/models/flakm_a.3d b/models/flakm_a.3d index 2168a79..ad52d9d 100644 Binary files a/models/flakm_a.3d and b/models/flakm_a.3d differ diff --git a/models/flakm_d.3d b/models/flakm_d.3d index eb7585a..9ae584f 100644 Binary files a/models/flakm_d.3d and b/models/flakm_d.3d differ diff --git a/models/flakslugm_a.3d b/models/flakslugm_a.3d index 4706b44..76f3b9a 100644 Binary files a/models/flakslugm_a.3d and b/models/flakslugm_a.3d differ diff --git a/models/flakslugm_d.3d b/models/flakslugm_d.3d index 5665861..40d749f 100644 Binary files a/models/flakslugm_d.3d and b/models/flakslugm_d.3d differ diff --git a/models/hbox_a.3d b/models/hbox_a.3d index a6298b6..cbbe5f2 100644 Binary files a/models/hbox_a.3d and b/models/hbox_a.3d differ diff --git a/models/hbox_d.3d b/models/hbox_d.3d index 13a022b..97d8211 100644 Binary files a/models/hbox_d.3d and b/models/hbox_d.3d differ diff --git a/models/hboxbeta_a.3d b/models/hboxbeta_a.3d index 9e209f7..f6d87d2 100644 Binary files a/models/hboxbeta_a.3d and b/models/hboxbeta_a.3d differ diff --git a/models/hboxbeta_d.3d b/models/hboxbeta_d.3d index 0b7eb7f..927c3b6 100644 Binary files a/models/hboxbeta_d.3d and b/models/hboxbeta_d.3d differ diff --git a/models/invis2M_a.3d b/models/invis2M_a.3d index 89871f6..b11ae52 100644 Binary files a/models/invis2M_a.3d and b/models/invis2M_a.3d differ diff --git a/models/invis2M_d.3d b/models/invis2M_d.3d index 2bea3c0..163fc07 100644 Binary files a/models/invis2M_d.3d and b/models/invis2M_d.3d differ diff --git a/models/jboot_a.3d b/models/jboot_a.3d index b7182d5..f1ca0d9 100644 Binary files a/models/jboot_a.3d and b/models/jboot_a.3d differ diff --git a/models/jboot_d.3d b/models/jboot_d.3d index 5642be6..e10a3c9 100644 Binary files a/models/jboot_d.3d and b/models/jboot_d.3d differ diff --git a/models/maletorsom_a.3d b/models/maletorsom_a.3d index d31f61f..2305d5d 100644 Binary files a/models/maletorsom_a.3d and b/models/maletorsom_a.3d differ diff --git a/models/maletorsom_d.3d b/models/maletorsom_d.3d index ecc0a8f..f8a55e6 100644 Binary files a/models/maletorsom_d.3d and b/models/maletorsom_d.3d differ diff --git a/models/missile_a.3d b/models/missile_a.3d index aa0a26e..1a4e5da 100644 Binary files a/models/missile_a.3d and b/models/missile_a.3d differ diff --git a/models/missile_d.3d b/models/missile_d.3d index 10a1c5e..75dd444 100644 Binary files a/models/missile_d.3d and b/models/missile_d.3d differ diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc index e2616d5..c33b560 100644 --- a/zscript/shockrifle.zsc +++ b/zscript/shockrifle.zsc @@ -590,8 +590,12 @@ Class SuperShockBeam : Actor } else { - t.Results.HitActor.DamageMobj(self,target,Random[ASMD](3500,5000),'joltedX',DMG_USEANGLE|DMG_THRUSTLESS,atan2(t.Results.HitVector.y,t.Results.HitVector.x)); - UTMainHandler.DoKnockback(t.Results.HitActor,t.Results.HitVector,60000); + // the actor may "cease to exist" if it dies after the call to ExplodeMissile, so guard against that + if ( t.Results.HitActor ) + { + t.Results.HitActor.DamageMobj(self,target,Random[ASMD](3500,5000),'joltedX',DMG_USEANGLE|DMG_THRUSTLESS,atan2(t.Results.HitVector.y,t.Results.HitVector.x)); + UTMainHandler.DoKnockback(t.Results.HitActor,t.Results.HitVector,60000); + } let r = Spawn("SuperShockBeamRing",pos); r.angle = atan2(t.Results.HitVector.y,t.Results.HitVector.x); r.pitch = asin(-t.Results.HitVector.z);