diff --git a/language.damnums b/language.damnums new file mode 100644 index 000000000..1a88b0d7a --- /dev/null +++ b/language.damnums @@ -0,0 +1,23 @@ +[default] +// for those who want to use ye olde damnums instead of the mod's own damage numbers +DAMNUM_TYPECOLOR_LOVE = "DamCream"; +DAMNUM_TYPECOLOR_PUSH = "DamLightBlue"; +DAMNUM_TYPECOLOR_AIRRIP = "DamLightBlue"; +DAMNUM_TYPECOLOR_EXPLODIUM = "DamOrange"; +DAMNUM_TYPECOLOR_SHOT = "DamGold"; +DAMNUM_TYPECOLOR_SALT = "DamCyan"; +DAMNUM_TYPECOLOR_CONCUSSION = "DamPurple"; +DAMNUM_TYPECOLOR_CRITICALCONCUSSION = "DamPurple"; +DAMNUM_TYPECOLOR_WALLBUST = "DamDarkRed"; +DAMNUM_TYPECOLOR_SHRAPNEL = "DamBrick"; +DAMNUM_TYPECOLOR_BIOSPARK = "DamYellow"; +DAMNUM_TYPECOLOR_KINYLUM = "DamCyan"; +DAMNUM_TYPECOLOR_NOKRON = "DamRed"; +DAMNUM_TYPECOLOR_NOKOROKINYLUM = "DamPurple"; +DAMNUM_TYPECOLOR_SNIPED = "DamGold"; +DAMNUM_TYPECOLOR_JET = "DamWhite"; +DAMNUM_TYPECOLOR_DYRATIN = "DamGreen"; +DAMNUM_TYPECOLOR_CANDY = "DamCream"; +DAMNUM_TYPECOLOR_MORTAL = "DamCyan"; +DAMNUM_TYPECOLOR_YNYKRON = "DamPurple"; +DAMNUM_TYPECOLOR_YNYKRONALT = "DamPurple"; diff --git a/language.version b/language.version index 62fad6552..e10d94da4 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r631 \cu(Fri 25 Nov 20:55:19 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r631 \cu(2022-11-25 20:55:19)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r632 \cu(Fri 25 Nov 20:55:26 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r632 \cu(2022-11-25 20:55:26)\c-"; diff --git a/modeldef.ammo b/modeldef.ammo index 0fa832b42..c2a4436f2 100644 --- a/modeldef.ammo +++ b/modeldef.ammo @@ -341,9 +341,9 @@ Model "FabricatorTier1" { Path "models" - Model 0 "AmmoFabricator_d.3d" + Model 0 "AmmoFabricator.iqm" Skin 0 "Fabricator.png" - Scale 0.038 0.038 0.038 + Scale 32 32 32 ZOffset 16 ROTATING @@ -353,9 +353,9 @@ Model "FabricatorTier2" { Path "models" - Model 0 "AmmoFabricator_d.3d" + Model 0 "AmmoFabricator.iqm" Skin 0 "Fabricator_Tier2.png" - Scale 0.042 0.042 0.042 + Scale 34 34 34 ZOffset 16 ROTATING @@ -365,9 +365,9 @@ Model "FabricatorTier3" { Path "models" - Model 0 "AmmoFabricator_d.3d" + Model 0 "AmmoFabricator.iqm" Skin 0 "Fabricator_Tier3.png" - Scale 0.048 0.048 0.048 + Scale 36 36 36 ZOffset 16 ROTATING @@ -377,9 +377,9 @@ Model "FabricatorTier4" { Path "models" - Model 0 "AmmoFabricator_d.3d" + Model 0 "AmmoFabricator.iqm" Skin 0 "Fabricator_Tier4.png" - Scale 0.054 0.054 0.054 + Scale 40 40 40 ZOffset 16 ROTATING @@ -390,9 +390,9 @@ Model "HammerspaceEmbiggener" { Path "models" - Model 0 "Embiggener_d.3d" + Model 0 "Embiggener.iqm" Skin 0 "Embiggener.png" - Scale 0.03 0.03 0.03 + Scale 64 64 64 PitchOffset 20 ZOffset 16 ROTATING @@ -403,9 +403,9 @@ Model "BulkHammerspaceEmbiggener" { Path "models" - Model 0 "Embiggener_d.3d" + Model 0 "Embiggener.iqm" Skin 0 "Embiggener.png" - Scale 0.03 0.03 0.03 + Scale 64 64 64 PitchOffset 20 ZOffset 16 ROTATING diff --git a/modeldef.collectibles b/modeldef.collectibles index 8c5c143f2..2cdce7ec6 100644 --- a/modeldef.collectibles +++ b/modeldef.collectibles @@ -14,9 +14,9 @@ Model "AkariProject" { Path "models" - Model 0 "Book_d.3d" + Model 0 "Book.iqm" Skin 0 "AkariProject.png" - Scale 0.02 0.02 0.02 + Scale 60 60 60 ZOffset 16 PitchOffset 30 ROTATING @@ -27,11 +27,11 @@ Model "LoveSignalsCD" { Path "models" - Model 0 "CD_d.3d" + Model 0 "CD.iqm" Skin 0 "LoveSignals.png" - Scale 0.013 0.013 0.013 + Scale 40 40 40 ZOffset 16 - RollOffset 30 + PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 @@ -147,9 +147,9 @@ Model "KirinManga" { Path "models" - Model 0 "Book_d.3d" + Model 0 "Book.iqm" Skin 0 "KirinManga.png" - Scale 0.018 0.018 0.018 + Scale 50 50 50 ZOffset 16 PitchOffset 30 ROTATING diff --git a/modeldef.eviscerator b/modeldef.eviscerator index 0636dcf9a..d421521b6 100644 --- a/modeldef.eviscerator +++ b/modeldef.eviscerator @@ -53,11 +53,14 @@ Model "EvisceratorChunk" { Path "models" - Model 0 "Chunky_d.3d" + Model 0 "Chunky.md3" Skin 0 "Chunky.png" - Scale 0.01 0.01 0.01 + Scale 0.02 0.02 0.02 + USEROTATIONCENTER USEACTORPITCH USEACTORROLL + Rotation-Center 0 0 0.1 + ZOffset 0.2 FrameIndex XZW1 A 0 0 FrameIndex XZW1 B 0 1 @@ -67,18 +70,8 @@ Model "EvisceratorChunk" FrameIndex XZW1 F 0 5 FrameIndex XZW1 G 0 6 FrameIndex XZW1 H 0 7 - ZOffset 0.1 - FrameIndex XZW2 A 0 0 - FrameIndex XZW2 B 0 1 - FrameIndex XZW2 C 0 2 - FrameIndex XZW2 D 0 3 - FrameIndex XZW2 E 0 4 - FrameIndex XZW2 F 0 5 - FrameIndex XZW2 G 0 6 - FrameIndex XZW2 H 0 7 } - Model "EvisceratorProj" { Path "models" diff --git a/modeldef.funstuff b/modeldef.funstuff index 4bcfab07f..64eab314f 100644 --- a/modeldef.funstuff +++ b/modeldef.funstuff @@ -2,9 +2,9 @@ Model "FroggyChair" { Path "models" - Model 0 "ASmallPriceToPay_d.3d" + Model 0 "ASmallPriceToPay.iqm" Skin 0 "ASmallPriceToPay.png" - Scale 0.16 0.16 0.2 + Scale 40 40 50 AngleOffset -90 FrameIndex XZW1 A 0 0 @@ -13,9 +13,10 @@ Model "SWWMFlag" { Path "models" - Model 0 "SWWMFlag_d.3d" + Model 0 "SWWMFlag.md3" Skin 0 "SWWMFlag.png" Scale 0.5 0.5 0.5 + AngleOffset -90 DONTCULLBACKFACES FrameIndex XZW1 A 0 0 @@ -82,9 +83,10 @@ Model "SWWMFlag" Model "Chancebox" { Path "models" - Model 0 "Chancebox_d.3d" + Model 0 "Chancebox.iqm" + Animation 0 "Chancebox.iqm" Skin 0 "Chancebox.png" - Scale 0.1875 0.1875 0.1875 + Scale 24 24 24 AngleOffset -90 ZOffset 10 USEACTORPITCH @@ -113,9 +115,9 @@ Model "Chancebox" Model "ChanceboxTop" { Path "models" - Model 0 "Chancebox_Top_d.3d" + Model 0 "Chancebox_Top.iqm" Skin 0 "Chancebox.png" - Scale 0.1875 0.1875 0.1875 + Scale 24 24 24 AngleOffset -90 ZOffset 2 @@ -124,9 +126,9 @@ Model "ChanceboxTop" Model "ChanceboxSide" { Path "models" - Model 0 "Chancebox_Side_d.3d" + Model 0 "Chancebox_Side.iqm" Skin 0 "Chancebox.png" - Scale 0.1875 0.1875 0.1875 + Scale 24 24 24 AngleOffset -90 ZOffset 10 diff --git a/modeldef.keys b/modeldef.keys index 40b5bed6a..1b6b61316 100644 --- a/modeldef.keys +++ b/modeldef.keys @@ -1,9 +1,9 @@ Model "SWWMRedCard" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomRedKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -17,9 +17,9 @@ Model "SWWMRedCard" Model "SWWMYellowCard" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomYellowKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -33,9 +33,9 @@ Model "SWWMYellowCard" Model "SWWMBlueCard" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomBlueKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -49,9 +49,9 @@ Model "SWWMBlueCard" Model "SWWMGreenCard" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomGreenKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -65,9 +65,9 @@ Model "SWWMGreenCard" Model "SWWMSilverCardKDiZD" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomSilverKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -81,9 +81,9 @@ Model "SWWMSilverCardKDiZD" Model "SWWMGreenCardKDiZD" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomGreenKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -97,9 +97,9 @@ Model "SWWMGreenCardKDiZD" Model "SWWMOrangeCardKDiZD" { Path "models" - Model 0 "DoomKeycard_d.3d" + Model 0 "DoomKeycard.iqm" SurfaceSkin 0 0 "DoomOrangeKey.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 AngleOffset 90 PitchOffset 15 ZOffset 16 @@ -114,9 +114,9 @@ Model "SWWMOrangeCardKDiZD" Model "SWWMRedSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomRedSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 15 ZOffset 16 ROTATING @@ -126,9 +126,9 @@ Model "SWWMRedSkull" Model "SWWMBlueSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomBlueSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 15 ZOffset 16 ROTATING @@ -138,9 +138,9 @@ Model "SWWMBlueSkull" Model "SWWMYellowSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomYellowSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 15 ZOffset 16 ROTATING @@ -150,9 +150,9 @@ Model "SWWMYellowSkull" Model "SWWMPurpleSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomPurpleSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 15 ZOffset 16 ROTATING @@ -163,9 +163,9 @@ Model "SWWMPurpleSkull" Model "SWWMFakeRedSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomRedSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 35 AngleOffset 244 ZOffset 5 @@ -175,9 +175,9 @@ Model "SWWMFakeRedSkull" Model "SWWMFakeBlueSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomBlueSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 35 AngleOffset 225 ZOffset 5 @@ -187,9 +187,9 @@ Model "SWWMFakeBlueSkull" Model "SWWMFakeYellowSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomYellowSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 35 AngleOffset 135 ZOffset 5 @@ -199,9 +199,9 @@ Model "SWWMFakeYellowSkull" Model "SWWMFakePurpleSkull" { Path "models" - Model 0 "DoomSkullKey_d.3d" + Model 0 "DoomSkullKey.iqm" Skin 0 "DoomPurpleSkull.png" - Scale 0.035 0.035 0.035 + Scale 160 160 160 RollOffset 35 AngleOffset 116 ZOffset 5 diff --git a/modeldef.misc b/modeldef.misc index 28dd33c67..7c41a5a3f 100644 --- a/modeldef.misc +++ b/modeldef.misc @@ -68,11 +68,14 @@ Model "SWWMChip" { Path "models" - Model 0 "Chunky_d.3d" + Model 0 "Chunky.md3" Skin 0 "Chunky.png" Scale 0.02 0.02 0.02 + USEROTATIONCENTER USEACTORPITCH USEACTORROLL + Rotation-Center 0 0 0.1 + ZOffset 0.2 FrameIndex XZW1 A 0 0 FrameIndex XZW1 B 0 1 @@ -82,15 +85,6 @@ Model "SWWMChip" FrameIndex XZW1 F 0 5 FrameIndex XZW1 G 0 6 FrameIndex XZW1 H 0 7 - ZOffset 0.2 - FrameIndex XZW2 A 0 0 - FrameIndex XZW2 B 0 1 - FrameIndex XZW2 C 0 2 - FrameIndex XZW2 D 0 3 - FrameIndex XZW2 E 0 4 - FrameIndex XZW2 F 0 5 - FrameIndex XZW2 G 0 6 - FrameIndex XZW2 H 0 7 } Model "mkBloodDrop" diff --git a/modeldef.pickups b/modeldef.pickups index 4956e5c65..87a664a5e 100644 --- a/modeldef.pickups +++ b/modeldef.pickups @@ -1,9 +1,9 @@ Model "ArmorNuggetItem" { Path "models" - Model 0 "Nugget_d.3d" + Model 0 "Nugget.md3" Skin 0 "Nugget_Armor.png" - Scale 0.02 0.02 0.02 + Scale 0.05 0.05 0.05 ZOffset 16 ROTATING @@ -19,9 +19,9 @@ Model "ArmorNuggetItem" Model "HealthNuggetItem" { Path "models" - Model 0 "Nugget_d.3d" + Model 0 "Nugget.md3" Skin 0 "Nugget.png" - Scale 0.02 0.02 0.02 + Scale 0.05 0.05 0.05 ZOffset 16 ROTATING @@ -38,9 +38,9 @@ Model "HealthNuggetItem" Model "TetraHealthItem" { Path "models" - Model 0 "TetraHealth_d.3d" + Model 0 "TetraHealth.iqm" Skin 0 "TetraHealth.png" - Scale 0.03 0.03 0.03 + Scale 8 8 8 ZOffset 16 ROTATING @@ -50,9 +50,9 @@ Model "TetraHealthItem" Model "CubeHealthItem" { Path "models" - Model 0 "CubeHealth_d.3d" + Model 0 "CubeHealth.iqm" Skin 0 "CubeHealth.png" - Scale 0.025 0.025 0.025 + Scale 8 8 8 ZOffset 16 ROTATING @@ -75,9 +75,9 @@ Model "RefresherItem" Model "BlastSuitItem" { Path "models" - Model 0 "BlastSuit_d.3d" + Model 0 "BlastSuit.iqm" Skin 0 "BlastSuit.png" - Scale 0.05 0.05 0.05 + Scale 24 24 24 ZOffset 20 ROTATING @@ -266,9 +266,9 @@ Model "SWWMLamp" Model "EBarrier" { Path "models" - Model 0 "Barrier_d.3d" - SurfaceSkin 0 0 "Barrier.png" - Scale 0.05 0.05 0.05 + Model 0 "Barrier.iqm" + Skin 0 "Barrier.png" + Scale 24 24 24 ZOffset 16 ROTATING @@ -277,9 +277,9 @@ Model "EBarrier" Model "EBarrierX" { Path "models" - Model 0 "Barrier_d.3d" - SurfaceSkin 0 1 "BARRIENV" - Scale 0.05 0.05 0.05 + Model 0 "BarrierX.iqm" + Skin 0 "BARRIENV" + Scale 24 24 24 ZOffset 16 DONTCULLBACKFACES @@ -318,9 +318,9 @@ Model "AngerySigil" { Path "models" - Model 0 "DevaSigil_d.3d" + Model 0 "DevaSigil.iqm" Skin 0 "DevaSigil.png" - Scale 0.07 0.07 0.07 + Scale 18 18 18 ZOffset 20 ROTATING @@ -330,9 +330,9 @@ Model "DivineSprite" { Path "models" - Model 0 "DivineSprite_d.3d" + Model 0 "DivineSprite.iqm" Skin 0 "DivineSprite.png" - Scale 0.03 0.03 0.03 + Scale 8 8 8 ZOffset 16 ROTATING diff --git a/models/ASmallPriceToPay.iqm b/models/ASmallPriceToPay.iqm new file mode 100644 index 000000000..03333c7c3 Binary files /dev/null and b/models/ASmallPriceToPay.iqm differ diff --git a/models/ASmallPriceToPay_a.3d b/models/ASmallPriceToPay_a.3d deleted file mode 100644 index 49004bec8..000000000 Binary files a/models/ASmallPriceToPay_a.3d and /dev/null differ diff --git a/models/ASmallPriceToPay_d.3d b/models/ASmallPriceToPay_d.3d deleted file mode 100644 index 145ef8d47..000000000 Binary files a/models/ASmallPriceToPay_d.3d and /dev/null differ diff --git a/models/AmmoFabricator.iqm b/models/AmmoFabricator.iqm new file mode 100644 index 000000000..03ac65548 Binary files /dev/null and b/models/AmmoFabricator.iqm differ diff --git a/models/AmmoFabricator_a.3d b/models/AmmoFabricator_a.3d deleted file mode 100644 index 2a5c20ef7..000000000 Binary files a/models/AmmoFabricator_a.3d and /dev/null differ diff --git a/models/AmmoFabricator_d.3d b/models/AmmoFabricator_d.3d deleted file mode 100644 index 039d24b57..000000000 Binary files a/models/AmmoFabricator_d.3d and /dev/null differ diff --git a/models/Barrier.iqm b/models/Barrier.iqm new file mode 100644 index 000000000..b20a961e5 Binary files /dev/null and b/models/Barrier.iqm differ diff --git a/models/BarrierX.iqm b/models/BarrierX.iqm new file mode 100644 index 000000000..9cca68c2a Binary files /dev/null and b/models/BarrierX.iqm differ diff --git a/models/Barrier_a.3d b/models/Barrier_a.3d deleted file mode 100644 index 7316b3b0c..000000000 Binary files a/models/Barrier_a.3d and /dev/null differ diff --git a/models/Barrier_d.3d b/models/Barrier_d.3d deleted file mode 100644 index 6dbd77ea5..000000000 Binary files a/models/Barrier_d.3d and /dev/null differ diff --git a/models/BlastSuit.iqm b/models/BlastSuit.iqm new file mode 100644 index 000000000..1adb0867e Binary files /dev/null and b/models/BlastSuit.iqm differ diff --git a/models/BlastSuit_a.3d b/models/BlastSuit_a.3d deleted file mode 100644 index 7e6b455f7..000000000 Binary files a/models/BlastSuit_a.3d and /dev/null differ diff --git a/models/BlastSuit_d.3d b/models/BlastSuit_d.3d deleted file mode 100644 index f3b61fb94..000000000 Binary files a/models/BlastSuit_d.3d and /dev/null differ diff --git a/models/Book.blend b/models/Book.blend index f14c5f535..3a5c09c4b 100644 Binary files a/models/Book.blend and b/models/Book.blend differ diff --git a/models/Book.iqm b/models/Book.iqm new file mode 100644 index 000000000..3cdeca924 Binary files /dev/null and b/models/Book.iqm differ diff --git a/models/Book_a.3d b/models/Book_a.3d deleted file mode 100644 index 35fb78b1c..000000000 Binary files a/models/Book_a.3d and /dev/null differ diff --git a/models/Book_d.3d b/models/Book_d.3d deleted file mode 100644 index f6337bfeb..000000000 Binary files a/models/Book_d.3d and /dev/null differ diff --git a/models/Boolet.png b/models/Boolet.png deleted file mode 100644 index 9fbf7219b..000000000 Binary files a/models/Boolet.png and /dev/null differ diff --git a/models/Boolet_Candy.png b/models/Boolet_Candy.png deleted file mode 100644 index 73e4c69e5..000000000 Binary files a/models/Boolet_Candy.png and /dev/null differ diff --git a/models/Boolet_Explodium.png b/models/Boolet_Explodium.png deleted file mode 100644 index c783de7ef..000000000 Binary files a/models/Boolet_Explodium.png and /dev/null differ diff --git a/models/Boolet_a.3d b/models/Boolet_a.3d deleted file mode 100644 index 4ffa3f119..000000000 Binary files a/models/Boolet_a.3d and /dev/null differ diff --git a/models/Boolet_d.3d b/models/Boolet_d.3d deleted file mode 100644 index a506c66ae..000000000 Binary files a/models/Boolet_d.3d and /dev/null differ diff --git a/models/CD.blend b/models/CD.blend index 80fc4d816..dda778a71 100644 Binary files a/models/CD.blend and b/models/CD.blend differ diff --git a/models/CD.iqm b/models/CD.iqm new file mode 100644 index 000000000..32c7d7787 Binary files /dev/null and b/models/CD.iqm differ diff --git a/models/CD_a.3d b/models/CD_a.3d deleted file mode 100644 index 487712c16..000000000 Binary files a/models/CD_a.3d and /dev/null differ diff --git a/models/CD_d.3d b/models/CD_d.3d deleted file mode 100644 index 9910d53f1..000000000 Binary files a/models/CD_d.3d and /dev/null differ diff --git a/models/Chancebox.iqm b/models/Chancebox.iqm new file mode 100644 index 000000000..886192c5b Binary files /dev/null and b/models/Chancebox.iqm differ diff --git a/models/Chancebox_Side.iqm b/models/Chancebox_Side.iqm new file mode 100644 index 000000000..56f8baecf Binary files /dev/null and b/models/Chancebox_Side.iqm differ diff --git a/models/Chancebox_Side_a.3d b/models/Chancebox_Side_a.3d deleted file mode 100644 index e5aacfd97..000000000 Binary files a/models/Chancebox_Side_a.3d and /dev/null differ diff --git a/models/Chancebox_Side_d.3d b/models/Chancebox_Side_d.3d deleted file mode 100644 index 085fc0d61..000000000 Binary files a/models/Chancebox_Side_d.3d and /dev/null differ diff --git a/models/Chancebox_Top.iqm b/models/Chancebox_Top.iqm new file mode 100644 index 000000000..9236c7163 Binary files /dev/null and b/models/Chancebox_Top.iqm differ diff --git a/models/Chancebox_Top_a.3d b/models/Chancebox_Top_a.3d deleted file mode 100644 index 6f4f91b1a..000000000 Binary files a/models/Chancebox_Top_a.3d and /dev/null differ diff --git a/models/Chancebox_Top_d.3d b/models/Chancebox_Top_d.3d deleted file mode 100644 index ce1081bdf..000000000 Binary files a/models/Chancebox_Top_d.3d and /dev/null differ diff --git a/models/Chancebox_a.3d b/models/Chancebox_a.3d deleted file mode 100644 index d3de061dc..000000000 Binary files a/models/Chancebox_a.3d and /dev/null differ diff --git a/models/Chancebox_d.3d b/models/Chancebox_d.3d deleted file mode 100644 index e5dba32b6..000000000 Binary files a/models/Chancebox_d.3d and /dev/null differ diff --git a/models/Chunky.md3 b/models/Chunky.md3 new file mode 100644 index 000000000..1f56092e7 Binary files /dev/null and b/models/Chunky.md3 differ diff --git a/models/Chunky_a.3d b/models/Chunky_a.3d deleted file mode 100644 index 2778d8af2..000000000 Binary files a/models/Chunky_a.3d and /dev/null differ diff --git a/models/Chunky_d.3d b/models/Chunky_d.3d deleted file mode 100644 index 0366bc4fa..000000000 Binary files a/models/Chunky_d.3d and /dev/null differ diff --git a/models/CubeHealth.iqm b/models/CubeHealth.iqm new file mode 100644 index 000000000..dadaf9224 Binary files /dev/null and b/models/CubeHealth.iqm differ diff --git a/models/CubeHealth_a.3d b/models/CubeHealth_a.3d deleted file mode 100644 index 342944852..000000000 Binary files a/models/CubeHealth_a.3d and /dev/null differ diff --git a/models/CubeHealth_d.3d b/models/CubeHealth_d.3d deleted file mode 100644 index a952fc15d..000000000 Binary files a/models/CubeHealth_d.3d and /dev/null differ diff --git a/models/DevaSigil.blend b/models/DevaSigil.blend index 43c28e295..f026e5a67 100644 Binary files a/models/DevaSigil.blend and b/models/DevaSigil.blend differ diff --git a/models/DevaSigil.iqm b/models/DevaSigil.iqm new file mode 100644 index 000000000..2d7686fa4 Binary files /dev/null and b/models/DevaSigil.iqm differ diff --git a/models/DevaSigil_a.3d b/models/DevaSigil_a.3d deleted file mode 100644 index b675185c5..000000000 Binary files a/models/DevaSigil_a.3d and /dev/null differ diff --git a/models/DevaSigil_d.3d b/models/DevaSigil_d.3d deleted file mode 100644 index 4563648cc..000000000 Binary files a/models/DevaSigil_d.3d and /dev/null differ diff --git a/models/DivineSprite.blend b/models/DivineSprite.blend index 265a7002a..9e045dd85 100644 Binary files a/models/DivineSprite.blend and b/models/DivineSprite.blend differ diff --git a/models/DivineSprite.iqm b/models/DivineSprite.iqm new file mode 100644 index 000000000..f68d4ece4 Binary files /dev/null and b/models/DivineSprite.iqm differ diff --git a/models/DivineSprite_a.3d b/models/DivineSprite_a.3d deleted file mode 100644 index 06d4eef1b..000000000 Binary files a/models/DivineSprite_a.3d and /dev/null differ diff --git a/models/DivineSprite_d.3d b/models/DivineSprite_d.3d deleted file mode 100644 index b5c6291b2..000000000 Binary files a/models/DivineSprite_d.3d and /dev/null differ diff --git a/models/DoomKeycard.iqm b/models/DoomKeycard.iqm new file mode 100644 index 000000000..1ee21c641 Binary files /dev/null and b/models/DoomKeycard.iqm differ diff --git a/models/DoomKeycard_a.3d b/models/DoomKeycard_a.3d deleted file mode 100644 index 21333e35f..000000000 Binary files a/models/DoomKeycard_a.3d and /dev/null differ diff --git a/models/DoomKeycard_d.3d b/models/DoomKeycard_d.3d deleted file mode 100644 index 95a5ff541..000000000 Binary files a/models/DoomKeycard_d.3d and /dev/null differ diff --git a/models/DoomSkullKey.iqm b/models/DoomSkullKey.iqm new file mode 100644 index 000000000..4a1b236c6 Binary files /dev/null and b/models/DoomSkullKey.iqm differ diff --git a/models/DoomSkullKey_a.3d b/models/DoomSkullKey_a.3d deleted file mode 100644 index 77f0faaba..000000000 Binary files a/models/DoomSkullKey_a.3d and /dev/null differ diff --git a/models/DoomSkullKey_d.3d b/models/DoomSkullKey_d.3d deleted file mode 100644 index 6d0ccdbbb..000000000 Binary files a/models/DoomSkullKey_d.3d and /dev/null differ diff --git a/models/Embiggener.iqm b/models/Embiggener.iqm new file mode 100644 index 000000000..6a0ab220f Binary files /dev/null and b/models/Embiggener.iqm differ diff --git a/models/Embiggener_a.3d b/models/Embiggener_a.3d deleted file mode 100644 index 365403bfc..000000000 Binary files a/models/Embiggener_a.3d and /dev/null differ diff --git a/models/Embiggener_d.3d b/models/Embiggener_d.3d deleted file mode 100644 index af45e4330..000000000 Binary files a/models/Embiggener_d.3d and /dev/null differ diff --git a/models/Lootbox.blend b/models/Lootbox.blend index 928518ee5..f66c28774 100644 Binary files a/models/Lootbox.blend and b/models/Lootbox.blend differ diff --git a/models/Nugget.md3 b/models/Nugget.md3 new file mode 100644 index 000000000..34e9387a0 Binary files /dev/null and b/models/Nugget.md3 differ diff --git a/models/Nugget_a.3d b/models/Nugget_a.3d deleted file mode 100644 index 68e470940..000000000 Binary files a/models/Nugget_a.3d and /dev/null differ diff --git a/models/Nugget_d.3d b/models/Nugget_d.3d deleted file mode 100644 index 6bfa6fd8b..000000000 Binary files a/models/Nugget_d.3d and /dev/null differ diff --git a/models/SWWMFlag.blend b/models/SWWMFlag.blend index f525b900b..35d60bb4e 100644 Binary files a/models/SWWMFlag.blend and b/models/SWWMFlag.blend differ diff --git a/models/SWWMFlag.md3 b/models/SWWMFlag.md3 new file mode 100644 index 000000000..41f8b283c Binary files /dev/null and b/models/SWWMFlag.md3 differ diff --git a/models/SWWMFlag_a.3d b/models/SWWMFlag_a.3d deleted file mode 100644 index b551ad070..000000000 Binary files a/models/SWWMFlag_a.3d and /dev/null differ diff --git a/models/SWWMFlag_d.3d b/models/SWWMFlag_d.3d deleted file mode 100644 index 388abdd39..000000000 Binary files a/models/SWWMFlag_d.3d and /dev/null differ diff --git a/models/TetraHealth.iqm b/models/TetraHealth.iqm new file mode 100644 index 000000000..ae0d33e0d Binary files /dev/null and b/models/TetraHealth.iqm differ diff --git a/models/TetraHealth_a.3d b/models/TetraHealth_a.3d deleted file mode 100644 index ab2b60871..000000000 Binary files a/models/TetraHealth_a.3d and /dev/null differ diff --git a/models/TetraHealth_d.3d b/models/TetraHealth_d.3d deleted file mode 100644 index 560ab08b7..000000000 Binary files a/models/TetraHealth_d.3d and /dev/null differ diff --git a/zscript/swwm_common_fx.zsc b/zscript/swwm_common_fx.zsc index 725b5d7d5..b22b1b571 100644 --- a/zscript/swwm_common_fx.zsc +++ b/zscript/swwm_common_fx.zsc @@ -684,8 +684,6 @@ Class SWWMChip : SWWMNonInteractiveActor trackplane = 0; } vel = (0,0,0); - pitch = 0; - roll = 0; dead = true; SetStateLabel("Death"); break; @@ -736,7 +734,7 @@ Class SWWMChip : SWWMNonInteractiveActor } Goto Spawn; Death: - XZW2 # -1; + XZW1 # -1; Stop; } } diff --git a/zscript/weapons/swwm_danmaku_fx.zsc b/zscript/weapons/swwm_danmaku_fx.zsc index e6b735927..3bcaaa1f0 100644 --- a/zscript/weapons/swwm_danmaku_fx.zsc +++ b/zscript/weapons/swwm_danmaku_fx.zsc @@ -371,14 +371,12 @@ Class EvisceratorChunk : Actor XZW1 # 0 A_HandleBounce(); Goto Spawn; Death: - XZW2 # 0 + XZW1 # 0 { - pitch = 0; - roll = 0; bMOVEWITHSECTOR = true; A_SetTics(Random[Eviscerator](30,50)); } - XZW2 # 1 A_FadeOut(); + XZW1 # 1 A_FadeOut(); Wait; XDeath: TNT1 A 35 { invoker.justdied = true; }