OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Use CORRECTPIXELSTRETCH where needed.

Browse source
This commit is contained in:
Mari the Deer 2022-12-05 14:50:16 +01:00
commit 02dd50101e
32 changed files with 136 additions and 18 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 r660 \cu(Mon 5 Dec 14:13:47 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r660 \cu(2022-12-05 14:13:47)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r661 \cu(Mon 5 Dec 14:50:16 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r661 \cu(2022-12-05 14:50:16)\c-";

13
modeldef.ammo
View file

@ -8,6 +8,7 @@ Model "RedShell"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -59,6 +60,7 @@ Model "GoldShell"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -97,6 +99,7 @@ Model "EvisceratorShell"
PitchOffset 45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -150,6 +153,7 @@ Model "HellblazerMissiles"
PitchOffset 45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -188,6 +192,7 @@ Model "HellblazerMissileMag"
PitchOffset -45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -202,6 +207,7 @@ Model "SparkUnit"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -228,6 +234,7 @@ Model "SilverBulletAmmo"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -241,6 +248,7 @@ Model "SilverBullets"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -279,6 +287,7 @@ Model "CandyGunAmmo"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -293,6 +302,7 @@ Model "CandyGunBullets"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -333,6 +343,7 @@ Model "YnykronAmmo"
PitchOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -396,6 +407,7 @@ Model "HammerspaceEmbiggener"
PitchOffset 20
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -409,6 +421,7 @@ Model "BulkHammerspaceEmbiggener"
PitchOffset 20
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
Skin 0 "Embiggener_Tier2.png"

4
modeldef.candygun
View file

@ -7,6 +7,7 @@ Model "CandyCasing"
Scale 5 5 5
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 0.5
@ -21,6 +22,7 @@ Model "CandyMag"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
Skin 0 "CandyGun_EmptyMag.png"
FrameIndex XZW1 A 0 0
@ -39,6 +41,7 @@ Model "CandyMagProj"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 1
}
@ -52,6 +55,7 @@ Model "CandyGunProj"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

11
modeldef.collectibles
View file

@ -20,6 +20,7 @@ Model "AkariProject"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -33,6 +34,7 @@ Model "LoveSignalsCD"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -47,6 +49,7 @@ Model "NutatcoBar"
PitchOffset -60
RollOffset 90
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -61,6 +64,7 @@ Model "FrispyCorn"
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -74,6 +78,7 @@ Model "SayaBean"
ZOffset 16
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -87,6 +92,7 @@ Model "MothPlushy"
ZOffset 20
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -101,6 +107,7 @@ Model "SayasMug"
AngleOffset 90
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -115,6 +122,7 @@ Model "DemoPlush"
ZOffset 20
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -129,6 +137,7 @@ Model "KirinCummies"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -154,6 +163,7 @@ Model "KirinManga"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -167,6 +177,7 @@ Model "KirinPlush"
ZOffset 20
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

17
modeldef.dlcammo
View file

@ -8,6 +8,7 @@ Model "SMW05Ammo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -21,6 +22,7 @@ Model "SMW05Ammo2"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -34,6 +36,7 @@ Model "SMW05Ammo3"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -47,6 +50,7 @@ Model "SMW05SmallAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -60,6 +64,7 @@ Model "SMW05BigAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -74,6 +79,7 @@ Model "SheenAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -138,6 +144,7 @@ Model "QuadravolAmmo"
RollOffset -30
AngleOffset -90
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -178,6 +185,7 @@ Model "SparksterBAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -215,6 +223,7 @@ Model "SparksterRAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -253,6 +262,7 @@ Model "RayBolt"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -266,6 +276,7 @@ Model "RayBolt2"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -279,6 +290,7 @@ Model "RayBolt5"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -292,6 +304,7 @@ Model "RayAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -354,6 +367,7 @@ Model "MisterAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -368,6 +382,7 @@ Model "MisterGAmmo"
AngleOffset -90
RollOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -382,6 +397,7 @@ Model "UltimatePod"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -395,6 +411,7 @@ Model "UltimateAmmo"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

6
modeldef.eviscerator
View file

@ -7,6 +7,7 @@ Model "EvisceratorCasing"
Scale 20 20 20
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1
@ -22,10 +23,11 @@ Model "EvisceratorChunkTrail"
Model 0 "YBeam.obj"
Skin 0 "ChunkTrail.png"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
// recolors wow
@ -59,6 +61,7 @@ Model "EvisceratorChunk"
USEROTATIONCENTER
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
Rotation-Center 0 0 0.1
ZOffset 0.2
@ -81,6 +84,7 @@ Model "EvisceratorProj"
Scale 20 20 20
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

4
modeldef.explodiumgun
View file

@ -7,6 +7,7 @@ Model "ExplodiumCasing"
Scale 5 5 5
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 0.5
@ -21,6 +22,7 @@ Model "ExplodiumMag"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
Skin 0 "ExplodiumGun_EmptyMag.png"
FrameIndex XZW1 A 0 0
@ -40,6 +42,7 @@ Model "ExplodiumMagProj"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -52,6 +55,7 @@ Model "ExplodiumMagAttach"
Scale 8 8 8
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
AngleOffset 90
FrameIndex XZW1 A 0 0

4
modeldef.funstuff
View file

@ -91,6 +91,7 @@ Model "Chancebox"
ZOffset 10
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
// deploy
@ -139,10 +140,11 @@ Model "SuperFancyTrail"
Path "models/extra"
Model 0 "YBeam.obj"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
Skin 0 "FancyTrail0.png"
FrameIndex XZW1 A 0 0

1
modeldef.hammer
View file

@ -8,6 +8,7 @@ Model "HammerRadiusShockwave"
ZOffset 4
USEACTORPITCH
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

2
modeldef.hellblazer
View file

@ -6,6 +6,7 @@ Model "HellblazerMissile"
Skin 0 "HellblazerMissile.png"
Scale 25 25 25
USEACTORPITCH
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -18,6 +19,7 @@ Model "HellblazerMissile2"
Scale 25 25 25
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

19
modeldef.keys
View file

@ -8,6 +8,7 @@ Model "SWWMRedCard"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -24,6 +25,7 @@ Model "SWWMYellowCard"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -40,6 +42,7 @@ Model "SWWMBlueCard"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -56,6 +59,7 @@ Model "SWWMGreenCard"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -72,6 +76,7 @@ Model "SWWMSilverCardKDiZD"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -88,6 +93,7 @@ Model "SWWMGreenCardKDiZD"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -104,6 +110,7 @@ Model "SWWMOrangeCardKDiZD"
PitchOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
SurfaceSkin 0 1 "DoomKeyLight2.png"
FrameIndex XZW1 A 0 0
@ -120,6 +127,7 @@ Model "SWWMRedSkull"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -132,6 +140,7 @@ Model "SWWMBlueSkull"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -144,6 +153,7 @@ Model "SWWMYellowSkull"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -156,6 +166,7 @@ Model "SWWMPurpleSkull"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -169,6 +180,7 @@ Model "SWWMFakeRedSkull"
RollOffset 35
AngleOffset 244
ZOffset 5
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -181,6 +193,7 @@ Model "SWWMFakeBlueSkull"
RollOffset 35
AngleOffset 225
ZOffset 5
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -193,6 +206,7 @@ Model "SWWMFakeYellowSkull"
RollOffset 35
AngleOffset 135
ZOffset 5
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -205,6 +219,7 @@ Model "SWWMFakePurpleSkull"
RollOffset 35
AngleOffset 116
ZOffset 5
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -218,6 +233,7 @@ Model "SWWMKeyGreen"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -230,6 +246,7 @@ Model "SWWMKeyBlue"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -242,6 +259,7 @@ Model "SWWMKeyYellow"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -254,6 +272,7 @@ Model "SWWMKeyRed"
RollOffset 15
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

8
modeldef.misc
View file

@ -55,10 +55,11 @@ Model "SWWMSparkTrail"
Model 0 "YBeam.obj"
Skin 0 "ChunkTrail.png"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -73,6 +74,7 @@ Model "SWWMChip"
USEROTATIONCENTER
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
Rotation-Center 0 0 0.1
ZOffset 0.2
@ -119,7 +121,7 @@ Model "RadiusDebugSphere"
{
Path "models/extra"
Model 0 "UnitSphere.obj"
Scale 1.0 1.0 1.0
Scale 1 1 1
FrameIndex XZW1 A 0 0
}
@ -134,6 +136,7 @@ Model "DemolitionistRadiusShockwave"
ZOffset 4
USEACTORPITCH
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -147,6 +150,7 @@ Model "DemolitionistRadiusShockwaveTail"
ZOffset 4
USEACTORPITCH
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

9
modeldef.mortalrifle
View file

@ -8,6 +8,7 @@ Model "MisterCasing"
AngleOffset 90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 0.35
@ -30,6 +31,7 @@ Model "MisterGCasing"
AngleOffset 90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1.1
@ -45,6 +47,7 @@ Model "MisterMag"
AngleOffset 90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
Skin 0 "MortalMag_Empty.png"
FrameIndex XZW1 A 0 0
@ -86,10 +89,11 @@ Model "MisterRailBeam"
Model 0 "YBeam.obj"
Skin 0 "MRBolt.png"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
Skin 0 "MRBoltS.png"
@ -101,10 +105,11 @@ Model "MisterRailChildBeam"
Model 0 "YBeam.obj"
Skin 0 "MRBolt.png"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
Skin 0 "MRBoltS.png"

6
modeldef.pickups
View file

@ -106,6 +106,7 @@ Model "GrilledCheeseSandwich"
PitchOffset -45
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -207,6 +208,7 @@ Model "Omnisight"
RollOffset 30
ZOffset 16
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}
@ -221,6 +223,7 @@ Model "LampMoth"
AngleOffset -90
USEACTORPITCH
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 B 0 1
FrameIndex XZW1 C 0 2
@ -235,6 +238,7 @@ Model "LampMoth2"
AngleOffset -90
USEACTORPITCH
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 B 0 1
FrameIndex XZW1 C 0 2
@ -296,6 +300,7 @@ Model "MykradvoX2"
DONTCULLBACKFACES
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
AngleOffset 180
@ -311,6 +316,7 @@ Model "SafetyTether"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
Skin 0 "SafetyTether.png"

1
modeldef.puntzerbeta
View file

@ -8,6 +8,7 @@ Model "PuntzerBeta"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

1
modeldef.puntzergamma
View file

@ -8,6 +8,7 @@ Model "PuntzerGamma"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

1
modeldef.quadravol
View file

@ -8,6 +8,7 @@ Model "QuadravolCasing"
AngleOffset -90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1

1
modeldef.rafankos
View file

@ -8,6 +8,7 @@ Model "RafanKos"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

1
modeldef.raykhom
View file

@ -8,6 +8,7 @@ Model "RayKhom"
ZOffset 16
PitchOffset 30
ROTATING
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

1
modeldef.sheenhmg
View file

@ -54,6 +54,7 @@ Model "SheenCasing"
AngleOffset -90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 0.75

2
modeldef.silverbullet
View file

@ -8,6 +8,7 @@ Model "SilverBulletCasing"
AngleOffset 90
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1
@ -22,6 +23,7 @@ Model "SilverBulletMag"
Scale 50 50 50
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
RollOffset 90

2
modeldef.sparkster
View file

@ -7,6 +7,7 @@ Model "SparksterMag"
Scale 18 18 18
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1.5
@ -161,6 +162,7 @@ Model "BiosparkCore"
Scale 0.75 0.75 0.75
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

2
modeldef.spreadgun
View file

@ -7,6 +7,7 @@ Model "RedShellCasing"
Scale 40 40 40
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1
@ -21,6 +22,7 @@ Model "GoldShellCasing"
Scale 40 40 40
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
ZOffset 1

4
modeldef.ynykron
View file

@ -55,6 +55,7 @@ Model "YnykronRing"
DONTCULLBACKFACES
USEACTORPITCH
USEACTORROLL
CORRECTPIXELSTRETCH
// boy this is a pain
Skin 0 "sprites/XRG4A0.png"
@ -282,10 +283,11 @@ Model "YnykronVoidSparkleTrail"
Model 0 "YBeam.obj"
Skin 0 "DarkTrail.png"
Scale 1 1 1.2
Scale 1 1 1
USEACTORPITCH
USEACTORROLL
DONTCULLBACKFACES
CORRECTPIXELSTRETCH
FrameIndex XZW1 A 0 0
}

5
zscript/dlc1/swwm_mister.zsc
View file

@ -819,6 +819,7 @@ Class MisterRifle : SWWMWeapon
b = Spawn("MisterRailBeam",sstart);
b.target = self;
b.frame = 1;
b.speed = 32;
[b.angle, b.pitch, b.scale.y] = SWWMUtility.CalcYBeam(sdir,32);
MisterRailBeam(b).mrc = mrc;
mrc.effectors.Push(b);
@ -832,6 +833,7 @@ Class MisterRifle : SWWMWeapon
b.frame = 1;
}
b.target = self;
b.speed = sdist;
[b.angle, b.pitch, b.scale.y] = SWWMUtility.CalcYBeam(sdir,sdist);
MisterRailBeam(b).mrc = mrc;
mrc.effectors.Push(b);
@ -849,6 +851,7 @@ Class MisterRifle : SWWMWeapon
b = Spawn("MisterRailBeam",sstart);
b.target = self;
b.frame = 1;
b.speed = 32;
[b.angle, b.pitch, b.scale.y] = SWWMUtility.CalcYBeam(sdir,32);
MisterRailBeam(b).mrc = mrc;
mrc.effectors.Push(b);
@ -864,6 +867,7 @@ Class MisterRifle : SWWMWeapon
}
else b = Spawn("MisterRailBeam",sstart);
b.target = self;
b.speed = sdist;
[b.angle, b.pitch, b.scale.y] = SWWMUtility.CalcYBeam(sdir,sdist);
MisterRailBeam(b).mrc = mrc;
mrc.effectors.Push(b);
@ -875,6 +879,7 @@ Class MisterRifle : SWWMWeapon
sdir /= sdist;
b = Spawn("MisterRailBeam",sstart);
b.target = self;
b.speed = sdist;
[b.angle, b.pitch, b.scale.y] = SWWMUtility.CalcYBeam(sdir,sdist);
MisterRailBeam(b).mrc = mrc;
mrc.effectors.Push(b);

2
zscript/hud/swwm_hud.zsc
View file

@ -1797,7 +1797,7 @@ Class SWWMStatusBar : BaseStatusBar
{
pos = SWWMUtility.LerpVector2(t.target.prev.xy,t.target.pos.xy,FracTic);
angle = t.target.angle;
radius = t.isybeam?(t.target.scale.y*cos(t.target.pitch-90)):t.isbeam?(t.target.speed*cos(t.target.pitch)):t.target.radius;
radius = t.isybeam?(t.target.speed*cos(t.target.pitch-90)):t.isbeam?(t.target.speed*cos(t.target.pitch)):t.target.radius;
}
else
{

2
zscript/hud/swwm_hudobjects.zsc
View file

@ -275,7 +275,7 @@ Class SWWMSimpleTracker play
if ( !target ) return;
isbeam = SWWMUtility.IsBeamProj(target);
isybeam = isbeam&&SWWMUtility.IsYBeam(target);
radius = isybeam?(target.scale.y*cos(target.pitch+90)):isbeam?(target.speed*cos(target.pitch)):target.radius;
radius = isybeam?(target.speed*cos(target.pitch+90)):isbeam?(target.speed*cos(target.pitch)):target.radius;
angle = target.angle;
pos = target.pos;
isplayer = target.player;

1
zscript/items/swwm_funstuff.zsc
View file

@ -592,6 +592,7 @@ Class SuperFancySparkle : SWWMNonInteractiveActor
let t = Spawn("SuperFancyTrail",pos);
t.alpha = alpha*.5;
t.scale.x *= scale.x;
t.speed = dist;
[t.angle, t.pitch, t.scale.y] = SWWMUtility.CalcYBeam(dir,dist);
t.SetState(t.SpawnState+frame);
}

1
zscript/swwm_common_fx.zsc
View file

@ -517,6 +517,7 @@ Class SWWMSpark : SWWMNonInteractiveActor
taildir /= taillen;
let t = Spawn("SWWMSparkTrail",newpos);
t.alpha = alpha*.3;
t.speed = taillen;
[t.angle, t.pitch, t.scale.y] = SWWMUtility.CalcYBeam(taildir,taillen);
}
SetOrigin(newpos,true);

17
zscript/swwm_utility.zsc
View file

@ -1463,7 +1463,7 @@ Class SWWMUtility
if ( a is 'MisterRailBeam' ) return true;
return false;
}
// is this a YBeam type? (real pitch is pitch-90, scale.y == length)
// is this a YBeam type? (real pitch is pitch-90)
static play bool IsYBeam( Actor a )
{
if ( a is 'MisterRailBeam' ) return true;
@ -1473,17 +1473,20 @@ Class SWWMUtility
// calculate angle, pitch and yscale of YBeam based on direction vector and length
static clearscope double, double, double CalcYBeam( Vector3 dir, double dist )
{
// new code post pixelstretch bug fix, don't use yet
/*dir *= level.pixelstretch;
if ( level.pixelstretch == 1. )
{
// ez modo
double angle = atan2(dir.y,dir.x);
double pitch = asin(-dir.z)+90;
return angle, pitch, dist;
}
dir *= level.pixelstretch;
double len = dir.length();
dir /= len;
double angle = atan2(dir.y,dir.z);
double pitch = asin(-dir.z)+90;
double yscale = dist*len;
return angle, pitch, yscale;*/
double angle = atan2(dir.y,dir.x);
double pitch = asin(-dir.z)+90;
return angle, pitch, dist;
return angle, pitch, yscale;
}
static clearscope bool IdentifyingDog( Actor a )

1
zscript/weapons/swwm_danmaku_fx.zsc
View file

@ -208,6 +208,7 @@ Class EvisceratorChunk : Actor
dir /= dist;
let t = Spawn("EvisceratorChunkTrail",pos);
t.alpha = alph;
t.speed = dist;
[t.angle, t.pitch, t.scale.y] = SWWMUtility.CalcYBeam(dir,dist);
t.SetState(t.SpawnState+trailcolor);
if ( trailcolor > 0 )

1
zscript/weapons/swwm_deathlydeathcannon_fx.zsc
View file

@ -1900,6 +1900,7 @@ Class YnykronVoidSparkle : SWWMNonInteractiveActor
let t = Spawn("YnykronVoidSparkleTrail",newpos);
t.alpha = alpha*.5;
t.scale.x *= scale.x;
t.speed = len;
[t.angle, t.pitch, t.scale.y] = SWWMUtility.CalcYBeam(dir,len);
}
SetOrigin(newpos,true);