Convert all weapon pickups to IQM.

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"

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-";

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
 }
 

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

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

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
 

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
 

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

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

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"

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

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

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

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

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
 }
 

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

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

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

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;
 	}
 }

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()