diff --git a/language.version b/language.version index cdfcbc6c8..9e3e1b032 100644 --- a/language.version +++ b/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-"; diff --git a/modeldef.dlcammo b/modeldef.dlcammo index 033ea6fc9..6d908255c 100644 --- a/modeldef.dlcammo +++ b/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 diff --git a/modeldef.newsparkster b/modeldef.newsparkster index 2feb8cc2f..4294f9c31 100644 --- a/modeldef.newsparkster +++ b/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 diff --git a/models/ModernSparksterAmmo2_a.3d b/models/ModernSparksterAmmo2_a.3d new file mode 100644 index 000000000..36d039034 Binary files /dev/null and b/models/ModernSparksterAmmo2_a.3d differ diff --git a/models/ModernSparksterAmmo2_d.3d b/models/ModernSparksterAmmo2_d.3d new file mode 100644 index 000000000..a9a5de0b9 Binary files /dev/null and b/models/ModernSparksterAmmo2_d.3d differ diff --git a/models/ModernSparksterAmmo3_a.3d b/models/ModernSparksterAmmo3_a.3d new file mode 100644 index 000000000..0b22bb5c1 Binary files /dev/null and b/models/ModernSparksterAmmo3_a.3d differ diff --git a/models/ModernSparksterAmmo3_d.3d b/models/ModernSparksterAmmo3_d.3d new file mode 100644 index 000000000..a1f3521d5 Binary files /dev/null and b/models/ModernSparksterAmmo3_d.3d differ diff --git a/models/ModernSparksterAmmo_a.3d b/models/ModernSparksterAmmo_a.3d new file mode 100644 index 000000000..e049b0cb3 Binary files /dev/null and b/models/ModernSparksterAmmo_a.3d differ diff --git a/models/ModernSparksterAmmo_d.3d b/models/ModernSparksterAmmo_d.3d new file mode 100644 index 000000000..4e97a585f Binary files /dev/null and b/models/ModernSparksterAmmo_d.3d differ diff --git a/models/ModernSparksterPickup_a.3d b/models/ModernSparksterPickup_a.3d new file mode 100644 index 000000000..0fe488111 Binary files /dev/null and b/models/ModernSparksterPickup_a.3d differ diff --git a/models/ModernSparksterPickup_d.3d b/models/ModernSparksterPickup_d.3d new file mode 100644 index 000000000..c705585cc Binary files /dev/null and b/models/ModernSparksterPickup_d.3d differ diff --git a/models/PlasmaGlob_d.3d b/models/PlasmaGlob_d.3d index 0866ca7ae..df68c6fbf 100644 Binary files a/models/PlasmaGlob_d.3d and b/models/PlasmaGlob_d.3d differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 452e558c1..70ac844c3 100644 --- a/models/modelnotes.txt +++ b/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 diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 2829d0189..cea25402f 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/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; } } diff --git a/zscript/dlc1/swwm_blueballs.zsc b/zscript/dlc1/swwm_blueballs.zsc index bfce2ec58..1587f7c80 100644 --- a/zscript/dlc1/swwm_blueballs.zsc +++ b/zscript/dlc1/swwm_blueballs.zsc @@ -28,6 +28,8 @@ Class ModernSparkster : SWWMWeapon Stamina 220000; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.EXPLOSIVE; + Radius 30; + Height 30; } States {