diff --git a/gldefs.ynykron b/gldefs.ynykron index 494598916..ac8b6bd52 100644 --- a/gldefs.ynykron +++ b/gldefs.ynykron @@ -4,17 +4,17 @@ HardwareShader Texture "models/Ynykron.png" Texture "masktex" "models/Ynykron_mask.png" Texture "envtex" "models/envmap/pronoenv.png" Texture "rimtex" "models/envmap/pronorim.png" - Texture "envtex2" "models/envmap/leadenv.png" - Texture "rimtex2" "models/envmap/leadrim.png" + Texture "envtex2" "models/envmap/ockoenv.png" + Texture "rimtex2" "models/envmap/ockorim.png" Texture "envtex3" "models/envmap/dekaenv.png" Texture "rimtex3" "models/envmap/dekarim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".8" - Define "RIMFACT" = ".9" + Define "ENVFACT" = ".5" + Define "RIMFACT" = ".7" Define "RIMSTEP" = "0." Define "ENV_THREELAYER" - Define "ENVFACT2" = ".8" - Define "RIMFACT2" = ".9" + Define "ENVFACT2" = ".9" + Define "RIMFACT2" = "1.1" Define "RIMSTEP2" = "0." Define "ENVFACT3" = "1.1" Define "RIMFACT3" = ".9" diff --git a/language.version b/language.version index 1de43a0d1..cf9c75334 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r648 \cu(Mon 28 Nov 21:05:29 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r648 \cu(2022-11-28 21:05:29)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r649 \cu(Mon 28 Nov 22:11:11 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r649 \cu(2022-11-28 22:11:11)\c-"; diff --git a/modeldef.candygun b/modeldef.candygun index 07724df62..bf710db98 100644 --- a/modeldef.candygun +++ b/modeldef.candygun @@ -47,9 +47,9 @@ Model "CandyGunProj" { Path "models" - Model 0 "ExplodiumGunPickup_d.3d" + Model 0 "ExplodiumGunPickup.iqm" Skin 0 "CandyGun.png" - Scale 0.03 0.03 0.03 + Scale 8 8 8 USEACTORPITCH USEACTORROLL @@ -88,15 +88,14 @@ Model "CandyGun" { Path "models" - Model 0 "ExplodiumGunPickup_d.3d" - SurfaceSkin 0 0 "CandyGun.png" - SurfaceSkin 0 1 "CandyGun.png" - Scale 0.05 0.05 0.05 + Model 0 "ExplodiumGunPickup.iqm" + Skin 0 "CandyGun.png" + Scale 12 12 12 ZOffset 16 ROTATING FrameIndex XZW1 A 0 0 - SurfaceSkin 0 1 "" + Model 0 "ExplodiumGunPickupNoMag.iqm" FrameIndex XZW1 B 0 0 } diff --git a/modeldef.deepimpact b/modeldef.deepimpact index 1449d87e0..a7c86c065 100644 --- a/modeldef.deepimpact +++ b/modeldef.deepimpact @@ -2,11 +2,11 @@ Model "DeepImpact" { Path "models" - Model 0 "DeepImpactPickup_d.3d" + Model 0 "DeepImpactPickup.iqm" Skin 0 "DeepImpact.png" - Scale 0.1 0.1 0.1 + Scale 25 25 25 AngleOffset 180 - ZOffset 16 + ZOffset 20 ROTATING FrameIndex XZW1 A 0 0 diff --git a/modeldef.eviscerator b/modeldef.eviscerator index 87d0b68b5..3972e79ce 100644 --- a/modeldef.eviscerator +++ b/modeldef.eviscerator @@ -89,9 +89,9 @@ Model "Eviscerator" { Path "models" - Model 0 "EvisceratorPickup_d.3d" + Model 0 "EvisceratorPickup.iqm" Skin 0 "Eviscerator.png" - Scale 0.09 0.09 0.09 + Scale 24 24 24 AngleOffset 180 ZOffset 20 ROTATING diff --git a/modeldef.explodiumgun b/modeldef.explodiumgun index 81076721a..720bb6954 100644 --- a/modeldef.explodiumgun +++ b/modeldef.explodiumgun @@ -65,9 +65,9 @@ Model "ExplodiumGun" { Path "models" - Model 0 "ExplodiumGunPickup_d.3d" + Model 0 "ExplodiumGunPickup.iqm" Skin 0 "ExplodiumGun.png" - Scale 0.05 0.05 0.05 + Scale 12 12 12 ZOffset 16 ROTATING diff --git a/modeldef.explodiumgun2 b/modeldef.explodiumgun2 index 261e00be3..a92a2a428 100644 --- a/modeldef.explodiumgun2 +++ b/modeldef.explodiumgun2 @@ -510,9 +510,9 @@ Model "SWWMDualWeaponGiver" { Path "models" - Model 0 "ExplodiumGunPickupDual_d.3d" + Model 0 "ExplodiumGunPickupDual.iqm" Skin 0 "ExplodiumGun.png" - Scale 0.05 0.05 0.05 + Scale 12 12 12 ZOffset 16 ROTATING diff --git a/modeldef.hammer b/modeldef.hammer index 1018f38ce..b940bb819 100644 --- a/modeldef.hammer +++ b/modeldef.hammer @@ -16,9 +16,9 @@ Model "ItamexHammer" { Path "models" - Model 0 "CombatHammerPickup_d.3d" + Model 0 "CombatHammerPickup.iqm" Skin 0 "CombatHammer.png" - Scale 0.4 0.4 0.4 + Scale 50 50 50 ZOffset 28 AngleOffset 90 ROTATING diff --git a/modeldef.hellblazer b/modeldef.hellblazer index 27dbd3eb2..e9a21d40b 100644 --- a/modeldef.hellblazer +++ b/modeldef.hellblazer @@ -26,28 +26,42 @@ Model "Hellblazer" { Path "models" - Model 0 "HellblazerPickup_d.3d" + Model 0 "HellblazerPickup6.iqm" SurfaceSkin 0 0 "Hellblazer.png" - Scale 0.11 0.11 0.11 + SurfaceSkin 0 1 "HellblazerAmmo.png" + SurfaceSkin 0 2 "HellblazerMissile.png" + SurfaceSkin 0 3 "HellblazerMissile.png" + SurfaceSkin 0 4 "HellblazerMissile.png" + SurfaceSkin 0 5 "HellblazerMissile.png" + SurfaceSkin 0 6 "HellblazerMissile.png" + SurfaceSkin 0 7 "HellblazerMissile.png" + Scale 28 28 28 AngleOffset 180 ZOffset 20 ROTATING - // Missiles - SurfaceSkin 0 2 "HellblazerAmmo.png" - SurfaceSkin 0 3 "HellblazerAmmo.png" - SurfaceSkin 0 4 "HellblazerAmmo.png" - SurfaceSkin 0 5 "HellblazerAmmo.png" FrameIndex XZW1 A 0 0 + Model 0 "HellblazerPickup5.iqm" + FrameIndex XZW1 B 0 0 + Model 0 "HellblazerPickup4.iqm" + FrameIndex XZW1 C 0 0 + Model 0 "HellblazerPickup3.iqm" + FrameIndex XZW1 D 0 0 + Model 0 "HellblazerPickup2.iqm" + FrameIndex XZW1 E 0 0 + Model 0 "HellblazerPickup1.iqm" + FrameIndex XZW1 F 0 0 + Model 0 "HellblazerPickup0.iqm" + FrameIndex XZW1 G 0 0 } Model "HellblazerX" { Path "models" - Model 0 "HellblazerPickup_d.3d" - SurfaceSkin 0 1 "Hellblazer.png" - Scale 0.11 0.11 0.11 + Model 0 "HellblazerPickupX.iqm" + Skin 0 "Hellblazer.png" + Scale 28 28 28 AngleOffset 180 ZOffset 20 ROTATING diff --git a/modeldef.mortalrifle b/modeldef.mortalrifle index f161e121b..31c5464a4 100644 --- a/modeldef.mortalrifle +++ b/modeldef.mortalrifle @@ -115,18 +115,21 @@ Model "MisterRifle" { Path "models" - Model 0 "MortalRiflePickup_d.3d" + Model 0 "MortalRiflePickup.iqm" SurfaceSkin 0 0 "MortalRifle.png" SurfaceSkin 0 1 "NoLED.png" + SurfaceSkin 0 2 "-notex-" SurfaceSkin 0 3 "MortalSight.png" SurfaceSkin 0 4 "MortalMag.png" - Scale 0.25 0.25 0.25 + Scale 64 64 64 ZOffset 20 AngleOffset 90 ROTATING DONTCULLBACKFACES FrameIndex XZW1 A 0 0 + Model 0 "MortalRiflePickupBoltLock.iqm" + FrameIndex XZW1 B 0 0 } Model "MisterRifle" diff --git a/modeldef.plasmablast b/modeldef.plasmablast index 483fcad36..59b3066df 100644 --- a/modeldef.plasmablast +++ b/modeldef.plasmablast @@ -2,10 +2,10 @@ Model "PlasmaBlast" { Path "models" - Model 0 "PlasmaBlastPickup_d.3d" + Model 0 "PlasmaBlastPickup.iqm" SurfaceSkin 0 0 "PlasmaBlast.png" SurfaceSkin 0 1 "NoLED.png" - Scale 0.08 0.08 0.08 + Scale 120 120 120 ZOffset 16 AngleOffset 90 ROTATING diff --git a/modeldef.quadravol b/modeldef.quadravol index d9e465050..1eb662315 100644 --- a/modeldef.quadravol +++ b/modeldef.quadravol @@ -18,10 +18,11 @@ Model "Quadravol" { Path "models" - Model 0 "QuadravolPickup_d.3d" + Model 0 "QuadravolPickup.iqm" SurfaceSkin 0 0 "Quadravol.png" - SurfaceSkin 0 1 "NoLED.png" - Scale 0.2 0.2 0.2 + SurfaceSkin 0 1 "Quadravol.png" + SurfaceSkin 0 2 "NoLED.png" + Scale 100 100 100 ZOffset 20 AngleOffset 90 ROTATING diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index 7deab7bf6..dd69dcf77 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -64,10 +64,10 @@ Model "HeavyMahSheenGun" { Path "models" - Model 0 "SheenHMGPickup_d.3d" + Model 0 "SheenHMGPickup.iqm" SurfaceSkin 0 0 "SheenHMG.png" SurfaceSkin 0 1 "NoLED.png" - Scale 0.16 0.16 0.16 + Scale 100 100 100 AngleOffset 90 ZOffset 20 ROTATING diff --git a/modeldef.silverbullet b/modeldef.silverbullet index 58e34a44b..7192c84e1 100644 --- a/modeldef.silverbullet +++ b/modeldef.silverbullet @@ -35,10 +35,10 @@ Model "SilverBullet" { Path "models" - Model 0 "SilverbulletPickup_d.3d" + Model 0 "SilverbulletPickup.iqm" SurfaceSkin 0 0 "Silverbullet.png" SurfaceSkin 0 1 "SilverbulletAmmo.png" - Scale 0.25 0.25 0.25 + Scale 64 64 64 AngleOffset 180 ZOffset 24 ROTATING diff --git a/modeldef.sparkster b/modeldef.sparkster index 106ecbcc8..dc61d794f 100644 --- a/modeldef.sparkster +++ b/modeldef.sparkster @@ -169,16 +169,17 @@ Model "Sparkster" { Path "models" - Model 0 "SparksterPickup_d.3d" + Model 0 "SparksterPickup.iqm" SurfaceSkin 0 0 "Sparkster.png" SurfaceSkin 0 1 "SparksterAmmo.png" - Scale 0.12 0.12 0.12 + SurfaceSkin 0 2 "SparksterAmmo.png" + Scale 30 30 30 AngleOffset 180 ZOffset 16 ROTATING FrameIndex XZW1 A 0 0 - SurfaceSkin 0 2 "SparksterAmmo.png" + Model 0 "SparksterPickupDouble.iqm" FrameIndex XZW1 B 0 0 } diff --git a/modeldef.spreadgun b/modeldef.spreadgun index 110f8c19a..40f36aa7c 100644 --- a/modeldef.spreadgun +++ b/modeldef.spreadgun @@ -31,9 +31,9 @@ Model "Spreadgun" { Path "models" - Model 0 "SpreadgunPickup_d.3d" + Model 0 "SpreadgunPickup.iqm" Skin 0 "Spreadgun.png" - Scale 0.04 0.04 0.04 + Scale 10 10 10 AngleOffset 180 ZOffset 16 ROTATING diff --git a/modeldef.wallbuster b/modeldef.wallbuster index 33d960932..1edbc8477 100644 --- a/modeldef.wallbuster +++ b/modeldef.wallbuster @@ -2,9 +2,9 @@ Model "Wallbuster" { Path "models" - Model 0 "WallbusterPickup_d.3d" + Model 0 "WallbusterPickup.iqm" Skin 0 "Wallbuster.png" - Scale 0.18 0.18 0.18 + Scale 45 45 45 AngleOffset 180 ZOffset 28 ROTATING diff --git a/modeldef.ynykron b/modeldef.ynykron index dfe04f832..c797eb16b 100644 --- a/modeldef.ynykron +++ b/modeldef.ynykron @@ -294,10 +294,10 @@ Model "Ynykron" { Path "models" - Model 0 "YnykronPickup_d.3d" + Model 0 "YnykronPickup.iqm" SurfaceSkin 0 0 "Ynykron.png" SurfaceSkin 0 1 "YnykronAmmo.png" - Scale 0.18 0.18 0.18 + Scale 45 45 45 AngleOffset 180 ZOffset 24 ROTATING diff --git a/models/CombatHammer.blend b/models/CombatHammer.blend index e5ca9a2af..aadc00234 100644 Binary files a/models/CombatHammer.blend and b/models/CombatHammer.blend differ diff --git a/models/CombatHammerPickup.iqm b/models/CombatHammerPickup.iqm new file mode 100644 index 000000000..b35d27331 Binary files /dev/null and b/models/CombatHammerPickup.iqm differ diff --git a/models/CombatHammerPickup_a.3d b/models/CombatHammerPickup_a.3d deleted file mode 100644 index 8fa7da25d..000000000 Binary files a/models/CombatHammerPickup_a.3d and /dev/null differ diff --git a/models/CombatHammerPickup_d.3d b/models/CombatHammerPickup_d.3d deleted file mode 100644 index 14980c819..000000000 Binary files a/models/CombatHammerPickup_d.3d and /dev/null differ diff --git a/models/DeepImpact.blend b/models/DeepImpact.blend index 6922c8f57..8cc3b645e 100644 Binary files a/models/DeepImpact.blend and b/models/DeepImpact.blend differ diff --git a/models/DeepImpactPickup.iqm b/models/DeepImpactPickup.iqm new file mode 100644 index 000000000..ec965f9fd Binary files /dev/null and b/models/DeepImpactPickup.iqm differ diff --git a/models/DeepImpactPickup_a.3d b/models/DeepImpactPickup_a.3d deleted file mode 100644 index 0e80cb1b6..000000000 Binary files a/models/DeepImpactPickup_a.3d and /dev/null differ diff --git a/models/DeepImpactPickup_d.3d b/models/DeepImpactPickup_d.3d deleted file mode 100644 index 5928de6ff..000000000 Binary files a/models/DeepImpactPickup_d.3d and /dev/null differ diff --git a/models/Eviscerator.blend b/models/Eviscerator.blend index bba594913..fd0f06895 100644 Binary files a/models/Eviscerator.blend and b/models/Eviscerator.blend differ diff --git a/models/EvisceratorPickup.iqm b/models/EvisceratorPickup.iqm new file mode 100644 index 000000000..2d58e5036 Binary files /dev/null and b/models/EvisceratorPickup.iqm differ diff --git a/models/EvisceratorPickup_a.3d b/models/EvisceratorPickup_a.3d deleted file mode 100644 index 67346ae6f..000000000 Binary files a/models/EvisceratorPickup_a.3d and /dev/null differ diff --git a/models/EvisceratorPickup_d.3d b/models/EvisceratorPickup_d.3d deleted file mode 100644 index 7245e3016..000000000 Binary files a/models/EvisceratorPickup_d.3d and /dev/null differ diff --git a/models/ExplodiumGun.blend b/models/ExplodiumGun.blend index f1042b87a..c0c822257 100644 Binary files a/models/ExplodiumGun.blend and b/models/ExplodiumGun.blend differ diff --git a/models/ExplodiumGunPickup.iqm b/models/ExplodiumGunPickup.iqm new file mode 100644 index 000000000..eca6c7e13 Binary files /dev/null and b/models/ExplodiumGunPickup.iqm differ diff --git a/models/ExplodiumGunPickupDual.iqm b/models/ExplodiumGunPickupDual.iqm new file mode 100644 index 000000000..2b3a6be61 Binary files /dev/null and b/models/ExplodiumGunPickupDual.iqm differ diff --git a/models/ExplodiumGunPickupDual_a.3d b/models/ExplodiumGunPickupDual_a.3d deleted file mode 100644 index a7e512b88..000000000 Binary files a/models/ExplodiumGunPickupDual_a.3d and /dev/null differ diff --git a/models/ExplodiumGunPickupDual_d.3d b/models/ExplodiumGunPickupDual_d.3d deleted file mode 100644 index 0bc243ca8..000000000 Binary files a/models/ExplodiumGunPickupDual_d.3d and /dev/null differ diff --git a/models/ExplodiumGunPickupNoMag.iqm b/models/ExplodiumGunPickupNoMag.iqm new file mode 100644 index 000000000..9c5bba6fa Binary files /dev/null and b/models/ExplodiumGunPickupNoMag.iqm differ diff --git a/models/ExplodiumGunPickup_a.3d b/models/ExplodiumGunPickup_a.3d deleted file mode 100644 index 99c68391a..000000000 Binary files a/models/ExplodiumGunPickup_a.3d and /dev/null differ diff --git a/models/ExplodiumGunPickup_d.3d b/models/ExplodiumGunPickup_d.3d deleted file mode 100644 index 83562105d..000000000 Binary files a/models/ExplodiumGunPickup_d.3d and /dev/null differ diff --git a/models/Hellblazer.blend b/models/Hellblazer.blend index 0813ace59..bfdc318e6 100644 Binary files a/models/Hellblazer.blend and b/models/Hellblazer.blend differ diff --git a/models/HellblazerPickup0.iqm b/models/HellblazerPickup0.iqm new file mode 100644 index 000000000..ec3a177b3 Binary files /dev/null and b/models/HellblazerPickup0.iqm differ diff --git a/models/HellblazerPickup1.iqm b/models/HellblazerPickup1.iqm new file mode 100644 index 000000000..4becd795a Binary files /dev/null and b/models/HellblazerPickup1.iqm differ diff --git a/models/HellblazerPickup2.iqm b/models/HellblazerPickup2.iqm new file mode 100644 index 000000000..ac4053a9b Binary files /dev/null and b/models/HellblazerPickup2.iqm differ diff --git a/models/HellblazerPickup3.iqm b/models/HellblazerPickup3.iqm new file mode 100644 index 000000000..547eed53c Binary files /dev/null and b/models/HellblazerPickup3.iqm differ diff --git a/models/HellblazerPickup4.iqm b/models/HellblazerPickup4.iqm new file mode 100644 index 000000000..2b7aa65d5 Binary files /dev/null and b/models/HellblazerPickup4.iqm differ diff --git a/models/HellblazerPickup5.iqm b/models/HellblazerPickup5.iqm new file mode 100644 index 000000000..87e3d22b8 Binary files /dev/null and b/models/HellblazerPickup5.iqm differ diff --git a/models/HellblazerPickup6.iqm b/models/HellblazerPickup6.iqm new file mode 100644 index 000000000..803d13bd0 Binary files /dev/null and b/models/HellblazerPickup6.iqm differ diff --git a/models/HellblazerPickupX.iqm b/models/HellblazerPickupX.iqm new file mode 100644 index 000000000..f8c362568 Binary files /dev/null and b/models/HellblazerPickupX.iqm differ diff --git a/models/HellblazerPickup_a.3d b/models/HellblazerPickup_a.3d deleted file mode 100644 index bec7fa07c..000000000 Binary files a/models/HellblazerPickup_a.3d and /dev/null differ diff --git a/models/HellblazerPickup_d.3d b/models/HellblazerPickup_d.3d deleted file mode 100644 index af9230c9a..000000000 Binary files a/models/HellblazerPickup_d.3d and /dev/null differ diff --git a/models/MortalRifle.blend b/models/MortalRifle.blend index 18a31c63d..8b9819c68 100644 Binary files a/models/MortalRifle.blend and b/models/MortalRifle.blend differ diff --git a/models/MortalRiflePickup.iqm b/models/MortalRiflePickup.iqm new file mode 100644 index 000000000..802766790 Binary files /dev/null and b/models/MortalRiflePickup.iqm differ diff --git a/models/MortalRiflePickupBoltLock.iqm b/models/MortalRiflePickupBoltLock.iqm new file mode 100644 index 000000000..51fa5b959 Binary files /dev/null and b/models/MortalRiflePickupBoltLock.iqm differ diff --git a/models/MortalRiflePickup_a.3d b/models/MortalRiflePickup_a.3d deleted file mode 100644 index cac41fed7..000000000 Binary files a/models/MortalRiflePickup_a.3d and /dev/null differ diff --git a/models/MortalRiflePickup_d.3d b/models/MortalRiflePickup_d.3d deleted file mode 100644 index d233b37f4..000000000 Binary files a/models/MortalRiflePickup_d.3d and /dev/null differ diff --git a/models/PlasmaBlast.blend b/models/PlasmaBlast.blend index 7299fc33a..8e15bfa08 100644 Binary files a/models/PlasmaBlast.blend and b/models/PlasmaBlast.blend differ diff --git a/models/PlasmaBlastPickup.iqm b/models/PlasmaBlastPickup.iqm new file mode 100644 index 000000000..d62f3bfb4 Binary files /dev/null and b/models/PlasmaBlastPickup.iqm differ diff --git a/models/PlasmaBlastPickup_a.3d b/models/PlasmaBlastPickup_a.3d deleted file mode 100644 index a1ed1fd94..000000000 Binary files a/models/PlasmaBlastPickup_a.3d and /dev/null differ diff --git a/models/PlasmaBlastPickup_d.3d b/models/PlasmaBlastPickup_d.3d deleted file mode 100644 index 4ec50b330..000000000 Binary files a/models/PlasmaBlastPickup_d.3d and /dev/null differ diff --git a/models/Quadravol.blend b/models/Quadravol.blend index 5c4b0178e..8a958cd87 100644 Binary files a/models/Quadravol.blend and b/models/Quadravol.blend differ diff --git a/models/QuadravolPickup.iqm b/models/QuadravolPickup.iqm new file mode 100644 index 000000000..0074e6d09 Binary files /dev/null and b/models/QuadravolPickup.iqm differ diff --git a/models/QuadravolPickup_a.3d b/models/QuadravolPickup_a.3d deleted file mode 100644 index c1ce00ebb..000000000 Binary files a/models/QuadravolPickup_a.3d and /dev/null differ diff --git a/models/QuadravolPickup_d.3d b/models/QuadravolPickup_d.3d deleted file mode 100644 index 96a4f43db..000000000 Binary files a/models/QuadravolPickup_d.3d and /dev/null differ diff --git a/models/SheenHMG.blend b/models/SheenHMG.blend index d44b66d10..804624798 100644 Binary files a/models/SheenHMG.blend and b/models/SheenHMG.blend differ diff --git a/models/SheenHMGPickup.iqm b/models/SheenHMGPickup.iqm new file mode 100644 index 000000000..ce9d73867 Binary files /dev/null and b/models/SheenHMGPickup.iqm differ diff --git a/models/SheenHMGPickup_a.3d b/models/SheenHMGPickup_a.3d deleted file mode 100644 index a71198a49..000000000 Binary files a/models/SheenHMGPickup_a.3d and /dev/null differ diff --git a/models/SheenHMGPickup_d.3d b/models/SheenHMGPickup_d.3d deleted file mode 100644 index e4fa8b8d5..000000000 Binary files a/models/SheenHMGPickup_d.3d and /dev/null differ diff --git a/models/Silverbullet.blend b/models/Silverbullet.blend index bc6fa272c..e23632527 100644 Binary files a/models/Silverbullet.blend and b/models/Silverbullet.blend differ diff --git a/models/SilverbulletPickup.iqm b/models/SilverbulletPickup.iqm new file mode 100644 index 000000000..077479096 Binary files /dev/null and b/models/SilverbulletPickup.iqm differ diff --git a/models/SilverbulletPickup_a.3d b/models/SilverbulletPickup_a.3d deleted file mode 100644 index 6d540089d..000000000 Binary files a/models/SilverbulletPickup_a.3d and /dev/null differ diff --git a/models/SilverbulletPickup_d.3d b/models/SilverbulletPickup_d.3d deleted file mode 100644 index d80d68547..000000000 Binary files a/models/SilverbulletPickup_d.3d and /dev/null differ diff --git a/models/Sparkster.blend b/models/Sparkster.blend index d5c96cabe..79fc5d4a8 100644 Binary files a/models/Sparkster.blend and b/models/Sparkster.blend differ diff --git a/models/SparksterPickup.iqm b/models/SparksterPickup.iqm new file mode 100644 index 000000000..a4c665535 Binary files /dev/null and b/models/SparksterPickup.iqm differ diff --git a/models/SparksterPickupDouble.iqm b/models/SparksterPickupDouble.iqm new file mode 100644 index 000000000..ea2bc6e37 Binary files /dev/null and b/models/SparksterPickupDouble.iqm differ diff --git a/models/SparksterPickup_a.3d b/models/SparksterPickup_a.3d deleted file mode 100644 index 4c1f79bc0..000000000 Binary files a/models/SparksterPickup_a.3d and /dev/null differ diff --git a/models/SparksterPickup_d.3d b/models/SparksterPickup_d.3d deleted file mode 100644 index f7ee6a83a..000000000 Binary files a/models/SparksterPickup_d.3d and /dev/null differ diff --git a/models/Spreadgun.blend b/models/Spreadgun.blend index 84d51c423..b5ba57ef0 100644 Binary files a/models/Spreadgun.blend and b/models/Spreadgun.blend differ diff --git a/models/SpreadgunPickup.iqm b/models/SpreadgunPickup.iqm new file mode 100644 index 000000000..c54fc0c01 Binary files /dev/null and b/models/SpreadgunPickup.iqm differ diff --git a/models/SpreadgunPickup_a.3d b/models/SpreadgunPickup_a.3d deleted file mode 100644 index cc19595d3..000000000 Binary files a/models/SpreadgunPickup_a.3d and /dev/null differ diff --git a/models/SpreadgunPickup_d.3d b/models/SpreadgunPickup_d.3d deleted file mode 100644 index 1e4d5e3c9..000000000 Binary files a/models/SpreadgunPickup_d.3d and /dev/null differ diff --git a/models/Wallbuster.blend b/models/Wallbuster.blend index 45bdd1471..e3deffbf0 100644 Binary files a/models/Wallbuster.blend and b/models/Wallbuster.blend differ diff --git a/models/WallbusterPickup.iqm b/models/WallbusterPickup.iqm new file mode 100644 index 000000000..0a49629f4 Binary files /dev/null and b/models/WallbusterPickup.iqm differ diff --git a/models/WallbusterPickup_a.3d b/models/WallbusterPickup_a.3d deleted file mode 100644 index 5781974c6..000000000 Binary files a/models/WallbusterPickup_a.3d and /dev/null differ diff --git a/models/WallbusterPickup_d.3d b/models/WallbusterPickup_d.3d deleted file mode 100644 index c0f55c07f..000000000 Binary files a/models/WallbusterPickup_d.3d and /dev/null differ diff --git a/models/Ynykron.blend b/models/Ynykron.blend index 851fdbd68..226c90f6c 100644 Binary files a/models/Ynykron.blend and b/models/Ynykron.blend differ diff --git a/models/YnykronPickup.iqm b/models/YnykronPickup.iqm new file mode 100644 index 000000000..97a07ed6b Binary files /dev/null and b/models/YnykronPickup.iqm differ diff --git a/models/YnykronPickup_a.3d b/models/YnykronPickup_a.3d deleted file mode 100644 index 417a74bfd..000000000 Binary files a/models/YnykronPickup_a.3d and /dev/null differ diff --git a/models/YnykronPickup_d.3d b/models/YnykronPickup_d.3d deleted file mode 100644 index a22ee775d..000000000 Binary files a/models/YnykronPickup_d.3d and /dev/null differ diff --git a/textures/-notex-.png b/textures/-notex-.png new file mode 100644 index 000000000..4d7beb806 Binary files /dev/null and b/textures/-notex-.png differ diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 94206cb51..e652e3b0d 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -1218,6 +1218,11 @@ Class MisterRifle : SWWMWeapon A_StartSound("mister/grenadeclose",CHAN_WEAPON,CHANF_OVERLAP); } + action void A_UpdatePickup() + { + frame = invoker.boltlock; + } + override void MarkPrecacheSounds() { Super.MarkPrecacheSounds(); @@ -1655,7 +1660,7 @@ Class MisterRifle : SWWMWeapon } Stop; Spawn: - XZW1 A -1; + XZW1 A -1 NoDelay A_UpdatePickup(); Stop; } } diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc index 41e471114..31469ad98 100644 --- a/zscript/weapons/swwm_blazeit.zsc +++ b/zscript/weapons/swwm_blazeit.zsc @@ -207,21 +207,9 @@ Class Hellblazer : SWWMWeapon action void A_UpdatePickup() { - for ( int i=0; i<6; i++ ) - { - if ( !invoker.bInitialized ) - { - // not initialized, default to 3 loaded rockets - if ( i < 3 ) A_ChangeModel("",0,"","",6+i,"models","HellblazerMissile.png",CMDL_USESURFACESKIN,-1); - else A_ChangeModel("",0,"","",6+i,"models","",CMDL_USESURFACESKIN,-1); - continue; - } - int idx = i-invoker.magpos; - if ( idx > 5 ) idx -= 6; - else if ( idx < 0 ) idx += 6; - if ( invoker.magstate[i] ) A_ChangeModel("",0,"","",6+idx,"models","",CMDL_USESURFACESKIN,-1); - else A_ChangeModel("",0,"","",6+idx,"models","HellblazerMissile.png",CMDL_USESURFACESKIN,-1); - } + // if not initialized, default to 3 loaded rockets + if ( !invoker.bInitialized ) frame = 3; + else frame = 6-invoker.clipcount; } action void A_CheckLockOn()