OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Deprecate use of ROTATING. Fix rotation of many items.

Browse source
This commit is contained in:
Mari the Deer 2023-01-11 20:05:53 +01:00
commit 06e2e2c55c
39 changed files with 70 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r727 \cu(Mon 9 Jan 19:53:26 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r727 \cu(2023-01-09 19:53:26)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r728 \cu(Wed 11 Jan 20:05:53 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r728 \cu(2023-01-11 20:05:53)\c-";

32
modeldef/dlc1/dlcammo.txt
View file

@ -9,7 +9,6 @@ Model "SMW05Ammo"
Scale 5 5 5
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -23,7 +22,6 @@ Model "SMW05Ammo2"
Scale 5 5 5
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -37,7 +35,6 @@ Model "SMW05Ammo3"
Scale 5 5 5
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -51,7 +48,6 @@ Model "SMW05SmallAmmo"
Scale 6 6 6
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -65,7 +61,6 @@ Model "SMW05BigAmmo"
Scale 8 8 8
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -80,7 +75,6 @@ Model "SheenAmmo"
Scale 6 6 6
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -93,7 +87,6 @@ Model "SheenAmmo2"
Skin 0 "SheenBullet.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -105,7 +98,6 @@ Model "SheenAmmo3"
Skin 0 "SheenBullet.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -118,7 +110,6 @@ Model "SheenSmallAmmo"
SurfaceSkin 0 1 "SheenAmmoBand.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -129,8 +120,8 @@ Model "SheenBigAmmo"
Model 0 "SheenBullet50.iqm"
Skin 0 "SheenAmmoBox.png"
Scale 12 12 12
AngleOffset -90
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -145,7 +136,6 @@ Model "QuadravolAmmo"
ZOffset 16
RollOffset -30
AngleOffset -90
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -159,7 +149,6 @@ Model "QuadravolAmmo2"
Scale 5 5 5
ZOffset 16
AngleOffset -90
ROTATING
FrameIndex XZW1 A 0 0
}
@ -172,7 +161,6 @@ Model "QuadravolAmmo3"
Scale 5 5 5
ZOffset 16
AngleOffset -90
ROTATING
FrameIndex XZW1 A 0 0
}
@ -186,7 +174,6 @@ Model "SparksterBAmmo"
Scale 0.8 0.8 0.8
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -199,7 +186,6 @@ Model "SparksterBAmmo2"
Skin 0 "DefaultT"
Scale 0.8 0.8 0.8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -211,7 +197,6 @@ Model "SparksterBAmmo3"
Skin 0 "DefaultT"
Scale 0.8 0.8 0.8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -224,7 +209,6 @@ Model "SparksterRAmmo"
Scale 0.8 0.8 0.8
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -237,7 +221,6 @@ Model "SparksterRAmmo2"
Skin 0 "DefaultT"
Scale 0.8 0.8 0.8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -249,7 +232,6 @@ Model "SparksterRAmmo3"
Skin 0 "DefaultT"
Scale 0.8 0.8 0.8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -263,7 +245,6 @@ Model "RayBolt"
Scale 6 6 6
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -277,7 +258,6 @@ Model "RayBolt2"
Scale 6 6 6
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -291,7 +271,6 @@ Model "RayBolt5"
Scale 6 6 6
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -305,7 +284,6 @@ Model "RayAmmo"
Scale 10 10 10
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -319,7 +297,6 @@ Model "MisterRound"
Skin 0 "MortalRound.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -331,7 +308,6 @@ Model "MisterRound2"
Skin 0 "MortalRound.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -343,7 +319,6 @@ Model "MisterRound3"
Skin 0 "MortalRound.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -355,7 +330,6 @@ Model "MisterRound5"
Skin 0 "MortalRound.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -368,7 +342,6 @@ Model "MisterAmmo"
Scale 8 8 8
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -383,7 +356,6 @@ Model "MisterGAmmo"
ZOffset 16
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -398,7 +370,6 @@ Model "UltimatePod"
Scale 8 8 8
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -412,7 +383,6 @@ Model "UltimateAmmo"
Scale 10 10 10
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

3
modeldef/dlc1/hammer.txt
View file

@ -23,8 +23,7 @@ Model "ItamexHammer"
Skin 0 "CombatHammer.png"
Scale 50 50 50
ZOffset 28
AngleOffset 90
ROTATING
AngleOffset -90
FrameIndex XZW1 A 0 0
}

3
modeldef/dlc1/mortalrifle.txt
View file

@ -130,8 +130,7 @@ Model "MisterRifle"
SurfaceSkin 0 4 "MortalMag.png"
Scale 64 64 64
ZOffset 20
AngleOffset 90
ROTATING
AngleOffset -90
DONTCULLBACKFACES
FrameIndex XZW1 A 0 0

3
modeldef/dlc1/newsparkster.txt
View file

@ -8,8 +8,7 @@ Model "ModernSparkster"
Skin 0 "DefaultT"
Scale 50 50 50
ZOffset 20
AngleOffset 90
ROTATING
AngleOffset -90
FrameIndex XZW1 A 0 0
}

3
modeldef/dlc1/plasmablast.txt
View file

@ -9,8 +9,7 @@ Model "PlasmaBlast"
SurfaceSkin 0 1 "NoLED.png"
Scale 120 120 120
ZOffset 16
AngleOffset 90
ROTATING
AngleOffset -90
FrameIndex XZW1 A 0 0
}

1
modeldef/dlc1/puntzerbeta.txt
View file

@ -9,7 +9,6 @@ Model "PuntzerBeta"
Scale 10 10 10
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

1
modeldef/dlc1/puntzergamma.txt
View file

@ -9,7 +9,6 @@ Model "PuntzerGamma"
Scale 12 12 12
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

3
modeldef/dlc1/quadravol.txt
View file

@ -27,8 +27,7 @@ Model "Quadravol"
SurfaceSkin 0 2 "NoLED.png"
Scale 100 100 100
ZOffset 20
AngleOffset 90
ROTATING
AngleOffset -90
FrameIndex XZW1 A 0 0
}

1
modeldef/dlc1/rafankos.txt
View file

@ -9,7 +9,6 @@ Model "RafanKos"
Scale 15 15 15
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

1
modeldef/dlc1/raykhom.txt
View file

@ -9,7 +9,6 @@ Model "RayKhom"
Scale 15 15 15
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

3
modeldef/dlc1/sheenhmg.txt
View file

@ -71,9 +71,8 @@ Model "HeavyMahSheenGun"
SurfaceSkin 0 0 "SheenHMG.png"
SurfaceSkin 0 1 "NoLED.png"
Scale 100 100 100
AngleOffset 90
AngleOffset -90
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
}

34
modeldef/items/ammo.txt
View file

@ -7,7 +7,6 @@ Model "RedShell"
Scale 6 6 6
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -20,7 +19,6 @@ Model "RedShell2"
Skin 0 "Shell_Normal.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -32,7 +30,6 @@ Model "RedShell4"
Skin 0 "Shell_Normal.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -45,7 +42,6 @@ Model "RedShell6"
SurfaceSkin 0 1 "envmap/silverenv.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -59,7 +55,6 @@ Model "GoldShell"
Scale 6 6 6
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -72,7 +67,6 @@ Model "GoldShell2"
Skin 0 "Shell_Gold.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -84,7 +78,6 @@ Model "GoldShell4"
Skin 0 "Shell_Gold.png"
Scale 6 6 6
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -98,7 +91,6 @@ Model "EvisceratorShell"
Scale 45 45 45
PitchOffset 45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -112,7 +104,6 @@ Model "EvisceratorShell2"
SurfaceSkin 0 1 "EvisceratorClip.png"
Scale 45 45 45
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -125,7 +116,6 @@ Model "EvisceratorShell3"
SurfaceSkin 0 1 "EvisceratorClip.png"
Scale 45 45 45
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -138,7 +128,6 @@ Model "EvisceratorSixPack"
SurfaceSkin 0 1 "EvisceratorShell.png"
Scale 20 20 20
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -152,7 +141,6 @@ Model "HellblazerMissiles"
Scale 40 40 40
PitchOffset 45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -165,7 +153,6 @@ Model "HellblazerMissiles2"
Skin 0 "HellblazerMissile.png"
Scale 40 40 40
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -177,7 +164,6 @@ Model "HellblazerMissiles3"
Skin 0 "HellblazerMissile.png"
Scale 40 40 40
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -191,7 +177,6 @@ Model "HellblazerMissileMag"
Scale 40 40 40
PitchOffset -45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -206,7 +191,6 @@ Model "SparkUnit"
Scale 40 40 40
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -219,7 +203,6 @@ Model "SparkUnit2"
Skin 0 "SparksterAmmo.png"
Scale 40 40 40
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -233,7 +216,6 @@ Model "SilverBulletAmmo"
Scale 64 64 64
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -247,7 +229,6 @@ Model "SilverBullets"
Scale 12 12 12
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -260,7 +241,6 @@ Model "SilverBullets2"
Skin 0 "SilverbulletBullet.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -272,7 +252,6 @@ Model "SilverBullets3"
Skin 0 "SilverbulletBullet.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -286,7 +265,6 @@ Model "CandyGunAmmo"
Scale 15 15 15
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -301,7 +279,6 @@ Model "CandyGunBullets"
Scale 5 5 5
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -315,7 +292,6 @@ Model "CandyGunBullets2"
SurfaceSkin 0 1 "CandyCasing.png"
Scale 5 5 5
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -328,7 +304,6 @@ Model "CandyGunBullets3"
SurfaceSkin 0 1 "CandyCasing.png"
Scale 5 5 5
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -342,7 +317,6 @@ Model "YnykronAmmo"
Scale 45 45 45
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -356,7 +330,6 @@ Model "FabricatorTier1"
Skin 0 "Fabricator.png"
Scale 32 32 32
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -368,7 +341,6 @@ Model "FabricatorTier2"
Skin 0 "Fabricator_Tier2.png"
Scale 34 34 34
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -380,7 +352,6 @@ Model "FabricatorTier3"
Skin 0 "Fabricator_Tier3.png"
Scale 36 36 36
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -392,7 +363,6 @@ Model "FabricatorTier4"
Skin 0 "Fabricator_Tier4.png"
Scale 40 40 40
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -404,9 +374,9 @@ Model "HammerspaceEmbiggener"
Model 0 "Embiggener.iqm"
Skin 0 "Embiggener.png"
Scale 64 64 64
AngleOffset -90
PitchOffset 20
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -418,9 +388,9 @@ Model "BulkHammerspaceEmbiggener"
Model 0 "Embiggener.iqm"
Skin 0 "Embiggener.png"
Scale 64 64 64
AngleOffset -90
PitchOffset 20
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

18
modeldef/items/collectibles.txt
View file

@ -6,7 +6,6 @@ Model "GenericCube"
Skin 0 "PerfectlyGeneric.png"
Scale 10 10 10
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -19,7 +18,6 @@ Model "AkariProject"
Scale 60 60 60
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -33,7 +31,6 @@ Model "LoveSignalsCD"
Scale 40 40 40
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -48,7 +45,6 @@ Model "NutatcoBar"
ZOffset 16
PitchOffset -60
RollOffset 90
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -63,7 +59,6 @@ Model "FrispyCorn"
ZOffset 16
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -76,8 +71,8 @@ Model "SayaBean"
Skin 0 "SayaBean.png"
Scale 6 6 6
ZOffset 16
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -90,8 +85,8 @@ Model "MothPlushy"
Skin 0 "MothPlush.png"
Scale 15 15 15
ZOffset 20
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -104,9 +99,7 @@ Model "SayasMug"
Skin 0 "SayasMug.png"
Scale 50 50 50
ZOffset 16
AngleOffset 90
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -120,8 +113,8 @@ Model "DemoPlush"
SurfaceSkin 0 1 "DemoPlush2.png"
Scale 15 15 15
ZOffset 20
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -136,7 +129,6 @@ Model "KirinCummies"
Scale 4 4 4
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -149,7 +141,6 @@ Model "MilkBreads"
Skin 0 "MilkBreads.png"
Scale 4 4 4
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -162,7 +153,6 @@ Model "KirinManga"
Scale 50 50 50
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -175,8 +165,8 @@ Model "KirinPlush"
Skin 0 "KirinPlush.png"
Scale 40 40 40
ZOffset 20
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

30
modeldef/items/keys.txt
View file

@ -4,10 +4,8 @@ Model "SWWMRedCard"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomRedKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -21,10 +19,8 @@ Model "SWWMYellowCard"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomYellowKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -38,10 +34,8 @@ Model "SWWMBlueCard"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomBlueKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -55,10 +49,8 @@ Model "SWWMGreenCard"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomGreenKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -72,10 +64,8 @@ Model "SWWMSilverCardKDiZD"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomSilverKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -89,10 +79,8 @@ Model "SWWMGreenCardKDiZD"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomGreenKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -106,10 +94,8 @@ Model "SWWMOrangeCardKDiZD"
Model 0 "DoomKeycard.iqm"
SurfaceSkin 0 0 "DoomOrangeKey.png"
Scale 160 160 160
AngleOffset 90
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
@ -124,9 +110,9 @@ Model "SWWMRedSkull"
Model 0 "DoomSkullKey.iqm"
Skin 0 "DoomRedSkull.png"
Scale 160 160 160
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -137,9 +123,9 @@ Model "SWWMBlueSkull"
Model 0 "DoomSkullKey.iqm"
Skin 0 "DoomBlueSkull.png"
Scale 160 160 160
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -150,9 +136,9 @@ Model "SWWMYellowSkull"
Model 0 "DoomSkullKey.iqm"
Skin 0 "DoomYellowSkull.png"
Scale 160 160 160
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -163,9 +149,9 @@ Model "SWWMPurpleSkull"
Model 0 "DoomSkullKey.iqm"
Skin 0 "DoomPurpleSkull.png"
Scale 160 160 160
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -230,9 +216,9 @@ Model "SWWMKeyGreen"
Model 0 "HereticGreenKey.iqm"
Skin 0 "envmap/greenenv.png"
Scale 10 10 10
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -243,9 +229,9 @@ Model "SWWMKeyBlue"
Model 0 "HereticBlueKey.iqm"
Skin 0 "envmap/bluenv.png"
Scale 10 10 10
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -256,9 +242,9 @@ Model "SWWMKeyYellow"
Model 0 "HereticYellowKey.iqm"
Skin 0 "envmap/goldenv.png"
Scale 10 10 10
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -269,9 +255,9 @@ Model "SWWMKeyRed"
Model 0 "HereticRedKey.iqm"
Skin 0 "envmap/redenv.png"
Scale 10 10 10
AngleOffset -90
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0

20
modeldef/items/pickups.txt
View file

@ -5,7 +5,6 @@ Model "ArmorNuggetItem"
Skin 0 "Nugget_Armor.png"
Scale 0.05 0.05 0.05
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
FrameIndex XZW1 B 0 1
@ -23,7 +22,6 @@ Model "HealthNuggetItem"
Skin 0 "Nugget.png"
Scale 0.05 0.05 0.05
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
FrameIndex XZW1 B 0 1
@ -42,7 +40,6 @@ Model "TetraHealthItem"
Skin 0 "TetraHealth.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -54,7 +51,6 @@ Model "CubeHealthItem"
Skin 0 "CubeHealth.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -66,8 +62,8 @@ Model "RefresherItem"
Skin 0 "Refresher.png"
Scale 10 10 10
ZOffset 16
AngleOffset -90
RollOffset 30
ROTATING
FrameIndex XZW1 A 0 0
}
@ -79,7 +75,6 @@ Model "BlastSuitItem"
Skin 0 "BlastSuit.png"
Scale 24 24 24
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
}
@ -91,7 +86,6 @@ Model "WarArmorItem"
Skin 0 "WarArmor.png"
Scale 18 18 18
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
}
@ -105,7 +99,6 @@ Model "GrilledCheeseSandwich"
Scale 10 10 10
PitchOffset -45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -118,7 +111,6 @@ Model "GhostArtifact"
Skin 0 "GhostArtifact.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -140,7 +132,6 @@ Model "GravitySuppressor"
Skin 0 "Gravity.png"
Scale 16 16 16
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -162,7 +153,6 @@ Model "FuckingInvinciball"
Skin 0 "Invinciball.png"
Scale 10 10 10
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -184,7 +174,6 @@ Model "Ragekit"
Skin 0 "Ragekit.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -207,7 +196,6 @@ Model "Omnisight"
Scale 8 8 8
RollOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -264,7 +252,6 @@ Model "SWWMLamp"
Skin 0 "Lamp_off.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -276,7 +263,6 @@ Model "EBarrier"
Skin 0 "Barrier.png"
Scale 24 24 24
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
@ -315,7 +301,6 @@ Model "SafetyTether"
Scale 5 5 5
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
@ -329,8 +314,8 @@ Model "AngerySigil"
Model 0 "DevaSigil.iqm"
Skin 0 "DevaSigil.png"
Scale 18 18 18
AngleOffset -90
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
}
@ -342,7 +327,6 @@ Model "DivineSprite"
Skin 0 "DivineSprite.png"
Scale 8 8 8
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}

2
modeldef/weapons/candygun.txt
View file

@ -96,7 +96,7 @@ Model "CandyGun"
Skin 0 "CandyGun.png"
Scale 12 12 12
ZOffset 16
ROTATING
AngleOffset 180
FrameIndex XZW1 A 0 0
Model 0 "ExplodiumGunPickupNoMag.iqm"

2
modeldef/weapons/deepimpact.txt
View file

@ -5,9 +5,7 @@ Model "DeepImpact"
Model 0 "DeepImpactPickup.iqm"
Skin 0 "DeepImpact.png"
Scale 25 25 25
AngleOffset 180
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
}

2
modeldef/weapons/eviscerator.txt
View file

@ -96,9 +96,7 @@ Model "Eviscerator"
Model 0 "EvisceratorPickup.iqm"
Skin 0 "Eviscerator.png"
Scale 24 24 24
AngleOffset 180
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
Model 0 "EvisceratorPickupExt.iqm"

3
modeldef/weapons/explodiumgun.txt
View file

@ -73,7 +73,7 @@ Model "ExplodiumGun"
Skin 0 "ExplodiumGun.png"
Scale 12 12 12
ZOffset 16
ROTATING
AngleOffset 180
FrameIndex XZW1 A 0 0
}
@ -966,7 +966,6 @@ Model "SWWMDualWeaponGiver"
Skin 0 "ExplodiumGun.png"
Scale 12 12 12
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}

4
modeldef/weapons/hellblazer.txt
View file

@ -38,9 +38,7 @@ Model "Hellblazer"
SurfaceSkin 0 6 "HellblazerMissile.png"
SurfaceSkin 0 7 "HellblazerMissile.png"
Scale 28 28 28
AngleOffset 180
ZOffset 20
ROTATING
FrameIndex XZW1 A 0 0
Model 0 "HellblazerPickup5.iqm"
@ -64,9 +62,7 @@ Model "HellblazerX"
Model 0 "HellblazerPickupX.iqm"
Skin 0 "Hellblazer.png"
Scale 28 28 28
AngleOffset 180
ZOffset 20
ROTATING
DONTCULLBACKFACES
FrameIndex XZW1 A 0 0

2
modeldef/weapons/silverbullet.txt
View file

@ -41,9 +41,7 @@ Model "SilverBullet"
SurfaceSkin 0 0 "Silverbullet.png"
SurfaceSkin 0 1 "SilverbulletAmmo.png"
Scale 64 64 64
AngleOffset 180
ZOffset 24
ROTATING
FrameIndex XZW1 A 0 0
}

2
modeldef/weapons/sparkster.txt
View file

@ -176,9 +176,7 @@ Model "Sparkster"
SurfaceSkin 0 1 "SparksterAmmo.png"
SurfaceSkin 0 2 "SparksterAmmo.png"
Scale 30 30 30
AngleOffset 180
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
Model 0 "SparksterPickupDouble.iqm"

2
modeldef/weapons/spreadgun.txt
View file

@ -36,9 +36,7 @@ Model "Spreadgun"
Model 0 "SpreadgunPickup.iqm"
Skin 0 "Spreadgun.png"
Scale 10 10 10
AngleOffset 180
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
Model 0 "SpreadgunPickupFired.iqm"

2
modeldef/weapons/wallbuster.txt
View file

@ -5,9 +5,7 @@ Model "Wallbuster"
Model 0 "WallbusterPickup.iqm"
Skin 0 "Wallbuster.png"
Scale 45 45 45
AngleOffset 180
ZOffset 28
ROTATING
FrameIndex XZW1 A 0 0
}

2
modeldef/weapons/ynykron.txt
View file

@ -300,9 +300,7 @@ Model "Ynykron"
SurfaceSkin 0 0 "Ynykron.png"
SurfaceSkin 0 1 "YnykronAmmo.png"
Scale 45 45 45
AngleOffset 180
ZOffset 24
ROTATING
FrameIndex XZW1 A 0 0
}

2
zscript/items/swwm_ammoextra.zsc
View file

@ -7,6 +7,7 @@ Class AmmoFabricator : Inventory abstract
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
meta int budget, pertype, maxunits, maxtypes, maxunitprice, txtcol;
@ -314,6 +315,7 @@ Class HammerspaceEmbiggener : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
override Inventory CreateCopy( Actor other )
{

2
zscript/items/swwm_baseammo.zsc
View file

@ -4,6 +4,7 @@ Class SWWMAmmo : Ammo
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
meta String PickupTag;
meta Class<MagAmmo> MagAmmoType;
@ -275,6 +276,7 @@ Class MagAmmo : Inventory abstract
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
meta Class<Ammo> ParentAmmo;
Ammo pamo;

1
zscript/items/swwm_basearmor.zsc
View file

@ -138,6 +138,7 @@ Class SWWMSpareArmor : Inventory abstract
Mixin SWWMUseToPickup;
Mixin SWWMOverlapPickupSound;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
meta Class<SWWMArmor> giveme;

1
zscript/items/swwm_basehealth.zsc
View file

@ -5,6 +5,7 @@ Class SWWMHealth : Inventory abstract
Mixin SWWMUseToPickup;
Mixin SWWMOverlapPickupSound;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
// can't use the Health class for whatever reason

17
zscript/items/swwm_baseitem.zsc
View file

@ -197,6 +197,7 @@ Mixin Class SWWMPickupGlow
Class SWWMItemOverlay : SWWMNonInteractiveActor
{
Default
{
RenderStyle "Add";
@ -212,7 +213,7 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
prev = target.prev;
if ( (target.pos != pos) || (target.vel != (0,0,0)) ) SetOrigin(target.pos+target.vel,true);
if ( angle != target.angle ) A_SetAngle(target.angle,SPF_INTERPOLATE);
if ( (angle != target.angle) && bINTERPOLATEANGLES ) angle = target.angle; // copy angle for rotating pickups
FloatBobPhase = target.FloatBobPhase;
bInvisible = target.bInvisible||Inventory(target).Owner;
}
@ -224,6 +225,20 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
}
}
Mixin Class SWWMRotatingPickup
{
Default
{
+INTERPOLATEANGLES;
}
override void Tick()
{
Super.Tick();
if ( !Owner ) angle -= (180./64.);
}
}
Mixin Class SWWMRespawn
{
override void Hide()

1
zscript/items/swwm_collectibles.zsc
View file

@ -3,6 +3,7 @@
Class SWWMCollectible : Inventory abstract
{
Mixin SWWMUseToPickup;
Mixin SWWMRotatingPickup;
meta int avail;
bool propagated;

1
zscript/items/swwm_keys.zsc
View file

@ -4,6 +4,7 @@ Class SWWMKey : Key abstract
{
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRotatingPickup;
bool propagated;

1
zscript/items/swwm_lamp.zsc
View file

@ -539,6 +539,7 @@ Class SWWMLamp : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
bool bActive, bActivated;

2
zscript/items/swwm_miscitems.zsc
View file

@ -5,6 +5,7 @@ Class Omnisight : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
override bool TryPickup( in out Actor toucher )
{
@ -74,6 +75,7 @@ Class SafetyTether : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
bool bPrimed, bFailed;
int primetim;

6
zscript/items/swwm_powerups.zsc
View file

@ -19,6 +19,7 @@ Class GrilledCheeseSandwich : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
// for falling off cliffs and others
@ -408,6 +409,7 @@ Class GhostArtifact : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
Default
@ -578,6 +580,7 @@ Class GravitySuppressor : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -809,6 +812,7 @@ Class FuckingInvinciball : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override Inventory CreateCopy( Actor other )
@ -1086,6 +1090,7 @@ Class Ragekit : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -1327,6 +1332,7 @@ Class EBarrier : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
int terrainwait;

2
zscript/items/swwm_powerups_vip.zsc
View file

@ -903,6 +903,7 @@ Class AngerySigil : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )
@ -1186,6 +1187,7 @@ Class DivineSprite : Inventory
Mixin SWWMOverlapPickupSound;
Mixin SWWMUseToPickup;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
Mixin SWWMPickupGlow;
override bool Use( bool pickup )

8
zscript/weapons/swwm_baseweapon.zsc
View file

@ -582,7 +582,11 @@ Class SWWMWeapon : Weapon abstract
override void Tick()
{
Super.Tick();
if ( !Owner ) return;
if ( !Owner )
{
angle -= (180./64.);
return;
}
if ( !Owner.player || (Owner.player.ReadyWeapon != self) || !(Owner.player.WeaponState&WF_WEAPONSWITCHOK) || (Owner.player.WeaponState&WF_DISABLESWITCH) )
{
tooltipsent = false;
@ -687,6 +691,7 @@ Class SWWMWeapon : Weapon abstract
+WEAPON.NOALERT;
+WEAPON.NODEATHINPUT;
+FLOATBOB;
+INTERPOLATEANGLES;
+DONTGIB;
FloatBobStrength 0.25;
}
@ -697,6 +702,7 @@ Class SWWMDualWeaponGiver : Inventory
{
Mixin SWWMOverlapPickupSound;
Mixin SWWMRespawn;
Mixin SWWMRotatingPickup;
bool bUsePickup;
SWWMWeapon giveme[2];

1
zscript/weapons/swwm_blazeit.zsc
View file

@ -7,6 +7,7 @@ Class HellblazerX : SWWMItemOverlay
{
RenderStyle "Translucent";
Alpha .5;
+INTERPOLATEANGLES;
}
States
{