OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tweaks to casings and dropped mags.

Browse source
This commit is contained in:
Mari the Deer 2020-08-07 00:08:13 +02:00
commit 63152988fe
9 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r459 (Thu 6 Aug 23:52:50 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r460 (Fri 7 Aug 00:08:13 CEST 2020)";

5
modeldef.candygun
View file

@ -7,9 +7,10 @@ Model "CandyCasing"
Scale 0.03 0.03 0.03
USEACTORPITCH
USEACTORROLL
ZOffset 1
FrameIndex XZW1 A 0 0
ZOffset 0.5
FrameIndex XZW1 B 0 0
}
Model "CandyMag"
@ -24,7 +25,7 @@ Model "CandyMag"
Skin 0 "CandyGun_EmptyMag.png"
FrameIndex XZW1 A 0 0
RollOffset 90
ZOffset 1
ZOffset 0.5
FrameIndex XZW1 B 0 0
RollOffset -90
FrameIndex XZW1 C 0 0

2
modeldef.eviscerator
View file

@ -9,8 +9,8 @@ Model "EvisceratorCasing"
USEACTORROLL
FrameIndex XZW1 A 0 0
ZOffset 1
PitchOffset 90
ZOffset 2
FrameIndex XZW1 B 0 0
PitchOffset -90
FrameIndex XZW1 C 0 0

5
modeldef.explodiumgun
View file

@ -7,9 +7,10 @@ Model "ExplodiumCasing"
Scale 0.03 0.03 0.03
USEACTORPITCH
USEACTORROLL
ZOffset 1
FrameIndex XZW1 A 0 0
ZOffset 0.5
FrameIndex XZW1 B 0 0
}
Model "ExplodiumMag"
@ -24,7 +25,7 @@ Model "ExplodiumMag"
Skin 0 "ExplodiumGun_EmptyMag.png"
FrameIndex XZW1 A 0 0
RollOffset 90
ZOffset 1
ZOffset 0.5
FrameIndex XZW1 B 0 0
RollOffset -90
FrameIndex XZW1 C 0 0

10
modeldef.silverbullet
View file

@ -5,12 +5,13 @@ Model "SilverBulletCasing"
Model 0 "SilverbulletCase_d.3d"
Skin 0 "SilverbulletBullet.png"
Scale 0.04 0.04 0.04
ZOffset 1
AngleOffset 90
USEACTORPITCH
USEACTORROLL
FrameIndex XZW1 A 0 0
ZOffset 1
FrameIndex XZW1 B 0 0
}
Model "SilverBulletCasing2"
{
@ -19,12 +20,13 @@ Model "SilverBulletCasing2"
Model 0 "SilverbulletCase_FCB_d.3d"
Skin 0 "SilverbulletBullet_FCB.png"
Scale 0.04 0.04 0.04
ZOffset 1
AngleOffset 90
USEACTORPITCH
USEACTORROLL
FrameIndex XZW1 A 0 0
ZOffset 1
FrameIndex XZW1 B 0 0
}
Model "SilverBulletMag"
{
@ -38,7 +40,7 @@ Model "SilverBulletMag"
FrameIndex XZW1 A 0 0
RollOffset 90
ZOffset 2
ZOffset 1.8
FrameIndex XZW1 B 0 0
RollOffset -90
FrameIndex XZW1 C 0 0
@ -55,7 +57,7 @@ Model "SilverBulletMag2"
FrameIndex XZW1 A 0 0
RollOffset 90
ZOffset 2
ZOffset 1.8
FrameIndex XZW1 B 0 0
RollOffset -90
FrameIndex XZW1 C 0 0

6
modeldef.sparkster
View file

@ -5,11 +5,15 @@ Model "SparksterMag"
Model 0 "SparksterAmmo_d.3d"
Skin 0 "SparksterAmmo.png"
Scale 0.07 0.07 0.07
ZOffset 1.6
USEACTORPITCH
USEACTORROLL
FrameIndex XZW1 A 0 0
ZOffset 1.5
FrameIndex XZW1 B 0 0
RollOffset 90
ZOffset 1.2
FrameIndex XZW1 C 0 0
}
Model "BiosparkArc"

25
zscript/swwm_danmaku.zsc
View file

@ -216,8 +216,15 @@ Class EvisceratorChunk : Actor
{
target.SpawnBlood(pos,AngleTo(target),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
if ( swwm_extraalert || !Random[Eviscerator](0,3) ) A_AlertMonsters(900);
}
else
{
let l = Spawn("ChunkImpact",pos);
l.angle = angle+180;
l.pitch = -pitch;
A_StartSound("eviscerator/hit",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
if ( swwm_extraalert || !Random[Eviscerator](0,3) ) A_AlertMonsters(900);
return -1;
}
@ -238,10 +245,20 @@ Class EvisceratorChunk : Actor
if ( victim.health-amt <= 0 )
{
// bleed if not gibbed (reduces effect spam)
if ( !victim.bNOBLOOD && !victim.bINVULNERABLE && (victim.health-amt > victim.GetGibHealth()) )
if ( victim.health-amt > victim.GetGibHealth() )
{
victim.SpawnBlood(pos,AngleTo(victim),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
if ( !victim.bNOBLOOD && !victim.bINVULNERABLE )
{
victim.SpawnBlood(pos,AngleTo(victim),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
else
{
let l = Spawn("ChunkImpact",pos);
l.angle = angle+180;
l.pitch = -pitch;
A_StartSound("eviscerator/hit",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
}
vel *= .65; // reduce velocity as it rips
return 1;

2
zscript/swwm_inventory.zsc
View file

@ -416,7 +416,7 @@ Class SWWMCasing : Actor abstract
}
Goto Spawn;
Death:
XZW1 A -1
XZW1 B -1
{
pitch = roll = 0;
angle = FRandom[Junk](0,360);

3
zscript/swwm_sparkyboi.zsc
View file

@ -1908,11 +1908,12 @@ Class SparksterMag : SWWMCasing
States
{
Death:
#### # -1
XZW1 BC -1
{
pitch = 0;
angle = FRandom[Junk](0,360);
roll = 0;
frame = RandomPick[Junk](1,2);
}
Stop;
}