Use unfinished Sparkster Rifle model in placeholders.

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r588 \cu(Tue 25 Oct 10:55:54 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r588 \cu(2022-10-25 10:55:54)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r589 \cu(Tue 25 Oct 10:56:43 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r589 \cu(2022-10-25 10:56:43)\c-";

modeldef.dlcammo

@@ -170,11 +170,11 @@ Model "QuadravolAmmo3"
 
 Model "SparksterBAmmo"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
 	PitchOffset 30
 	ROTATING
@@ -183,37 +183,35 @@ Model "SparksterBAmmo"
 }
 Model "SparksterBAmmo2"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo2_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
-	PitchOffset 30
 	ROTATING
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterBAmmo3"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo3_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
-	PitchOffset 30
 	ROTATING
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterRAmmo"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
 	PitchOffset 30
 	ROTATING
@@ -222,26 +220,24 @@ Model "SparksterRAmmo"
 }
 Model "SparksterRAmmo2"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo2_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
-	PitchOffset 30
 	ROTATING
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterRAmmo3"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILY"
-	Scale 0.025 0.025 0.025
+	Model 0 "ModernSparksterAmmo3_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.8 0.8 0.8
 	ZOffset 16
-	PitchOffset 30
 	ROTATING
 
 	FrameIndex XZW1 A 0 0

modeldef.newsparkster

@@ -1,12 +1,12 @@
 Model "ModernSparkster"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 0 "BaseCube_d.3d"
-	Skin 0 "CHIPTILR"
-	Scale 0.05 0.05 0.05
-	ZOffset 16
-	PitchOffset 30
+	Model 0 "ModernSparksterPickup_d.3d"
+	Skin 0 "DefaultT"
+	Scale 0.4 0.4 0.4
+	ZOffset 20
+	AngleOffset 90
 	ROTATING
 
 	FrameIndex XZW1 A 0 0

models/modelnotes.txt

@@ -7,7 +7,7 @@ Weapon models:
  - Puntzer Gamma
  x Sheen HMG
  x Quadravol
- - Sparkster Rifle
+ ¼ Sparkster Rifle
  x Mortal Rifle
  - Ray-Khom
  - Rafan-Kos
@@ -23,9 +23,9 @@ Ammo models:
    x 10 Pack
    x 50 Box
  x Quadravol Ammo
- - Sparkster Ammo
-   - Kinylum Round
-   - Nokron Round
+ ½ Sparkster Ammo
+   ½ Kinylum Round
+   ½ Nokron Round
  x Mortal Rifle Ammo
    x Round
    x Mag

zscript/dlc1/swwm_ammoitems_dlc.zsc

@@ -169,6 +169,8 @@ Class SparksterBAmmo : SWWMAmmo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Accuracy 70;
+		Radius 2;
+		Height 20;
 	}
 	States
 	{
@@ -182,6 +184,7 @@ Class SparksterBAmmo2 : SparksterBAmmo
 	Default
 	{
 		Inventory.Amount 2;
+		Radius 3;
 	}
 }
 Class SparksterBAmmo3 : SparksterBAmmo
@@ -189,6 +192,7 @@ Class SparksterBAmmo3 : SparksterBAmmo
 	Default
 	{
 		Inventory.Amount 3;
+		Radius 3;
 	}
 }
 
@@ -207,6 +211,8 @@ Class SparksterRAmmo : SWWMAmmo
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Accuracy 75;
+		Radius 2;
+		Height 20;
 	}
 	States
 	{
@@ -220,6 +226,7 @@ Class SparksterRAmmo2 : SparksterRAmmo
 	Default
 	{
 		Inventory.Amount 2;
+		Radius 3;
 	}
 }
 Class SparksterRAmmo3 : SparksterRAmmo
@@ -227,6 +234,7 @@ Class SparksterRAmmo3 : SparksterRAmmo
 	Default
 	{
 		Inventory.Amount 3;
+		Radius 3;
 	}
 }
 

zscript/dlc1/swwm_blueballs.zsc

@@ -28,6 +28,8 @@ Class ModernSparkster : SWWMWeapon
 		Stamina 220000;
 		+SWWMWEAPON.NOFIRSTGIVE;
 		+WEAPON.EXPLOSIVE;
+		Radius 30;
+		Height 30;
 	}
 	States
 	{