zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-23 17:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified shootwhip.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-23 18:25:37 +01:00
parent afe7086189
commit 9085157130
5 changed files with 115 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
source/games/duke/src/player_r.cpp
View file

@ -315,80 +315,6 @@ static void shootrpg(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atw
//
//---------------------------------------------------------------------------
static void shootwhip(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atwith)
{
auto sect = actor->sector();
double vel = 0, zvel;
int scount;
if (actor->spr.extra >= 0) actor->spr.shade = -96;
scount = 1;
if (atwith == RTILE_OWHIP)
{
vel = 300/16.;
pos.Z -= 15;
scount = 1;
}
else if (atwith == RTILE_UWHIP)
{
vel = 300/16;
pos.Z += 4;
scount = 1;
}
if (p >= 0)
{
auto aimed = aim(actor, AUTO_AIM_ANGLE);
if (aimed)
{
auto tex = TexMan.GetGameTexture(aimed->spr.spritetexture());
double dal = ((aimed->spr.scale.X * tex->GetDisplayHeight()) * 0.5) - 12;
double dist = (ps[p].GetActor()->spr.pos.XY() - aimed->spr.pos.XY()).Length();
zvel = ((aimed->spr.pos.Z - pos.Z - dal) * vel) / dist;
ang = (aimed->spr.pos.XY() - pos.XY()).Angle();
}
else
setFreeAimVelocity(vel, zvel, ps[p].Angles.getPitchWithView(), 49.);
}
else
{
double x;
int j = findplayer(actor, &x);
if (actor->spr.picnum == RTILE_VIXEN)
ang -= randomAngle(22.5 / 8);
else
ang += DAngle22_5/8 - randomAngle(22.5 / 4);
double dist = (ps[j].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Length();
zvel = ((ps[j].GetActor()->getPrevOffsetZ() - pos.Z + 3) * vel) / dist;
}
double oldzvel = zvel;
double scale = p >= 0? 0.109375 : 0.125;
while (scount > 0)
{
auto spawned = CreateActor(sect, pos, atwith, -127, DVector2(scale,scale), ang, vel, zvel, actor, 4);
if (!spawned) return;
spawned->spr.extra += (krand() & 7);
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
spawned->clipdist = 1;
ang = actor->spr.Angles.Yaw + DAngle22_5/4 - randomAngle(DAngle22_5/2);
zvel = oldzvel + 2 - krandf(4);
scount--;
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void shoot_r(DDukeActor* actor, int atwith, PClass* cls)
{
int p;
@ -426,11 +352,6 @@ void shoot_r(DDukeActor* actor, int atwith, PClass* cls)
switch (atwith)
{
case RTILE_OWHIP:
case RTILE_UWHIP:
shootwhip(actor, p, spos, sang, atwith);
return;
case RTILE_FIRELASER:
case RTILE_SHITBALL:
case RTILE_VIXENSHOT:

1
wadsrc/static/zscript.txt
View file

@ -164,6 +164,7 @@ version "4.10"
#include "zscript/games/duke/actors/dukeweapons/grower.zs"
#include "zscript/games/duke/actors/dukeweapons/tripbomb.zs"
#include "zscript/games/duke/actors/redneckenemies/vixen.zs"
#include "zscript/games/duke/world/dukebreak.zs"
#include "zscript/games/duke/world/redneckbreak.zs"

18
wadsrc/static/zscript/games/duke/actors/projectiles.zs
View file

@ -737,24 +737,6 @@ class DukeFireball : DukeProjectile // WorldTour only
//
//---------------------------------------------------------------------------
class RedneckUWhip : DukeProjectile
{
default
{
pic "UWHIP";
+FULLBRIGHT;
+INFLAME;
}
}
class RedneckOWhip : RedneckUWhip
{
default
{
pic "OWHIP";
}
}
class RedneckVixenShot : RedneckUWhip // COOLEXPLOSION1
{
default

25
wadsrc/static/zscript/games/duke/actors/redneckenemies.zs
View file

@ -442,31 +442,6 @@ class RedneckMosquito : DukeActor
}
}
class RedneckVixen : DukeActor
{
default
{
pic "VIXEN";
+INTERNAL_BADGUY;
+KILLCOUNT;
+LOOKALLAROUND;
}
override void Initialize()
{
if (self.pal == 34)
{
self.scale = (0.34375, 0.328125);
}
else
{
self.scale = (0.34375, 0.3125);
}
self.setClipDistFromTile();
}
}
// only new thing in Route 66.
class RedneckGator : DukeActor
{

114
wadsrc/static/zscript/games/duke/actors/redneckenemies/vixen.zs Normal file
View file

@ -0,0 +1,114 @@
class RedneckVixen : DukeActor
{
default
{
pic "VIXEN";
+INTERNAL_BADGUY;
+KILLCOUNT;
+LOOKALLAROUND;
}
class RedneckVixen : DukeActor
{
default
{
pic "VIXEN";
+INTERNAL_BADGUY;
+KILLCOUNT;
+LOOKALLAROUND;
}
override void Initialize()
{
if (self.pal == 34)
{
self.scale = (0.34375, 0.328125);
}
else
{
self.scale = (0.3125, 0.3125);
}
self.setClipDistFromTile();
}
}
class RedneckUWhip : DukeProjectile
{
default
{
pic "UWHIP";
+FULLBRIGHT;
+INFLAME;
}
void shootwhip(DukeActor actor, DukePlayer p, Vector3 pos, double ang) const
{
let sect = actor.sector;
double zvel;
double vel = 300 / 16;
if (actor.extra >= 0) actor.shade = -96;
if (p != null)
{
let aimed = actor.aim(self);
if (aimed)
{
double dal = ((aimed.scale.X * aimed.spriteHeight()) * 0.5);
double dist = (p.actor.pos.XY - aimed.pos.XY).Length();
zvel = ((aimed.pos.Z - pos.Z - dal) * vel) / dist;
ang = (aimed.pos.XY - pos.XY).Angle();
}
else
[vel, zvel] = Raze.setFreeAimVelocity(vel, zvel, p.getPitchWithView(), 49.);
}
else
{
let j = actor.findplayer();
if (actor is 'RedneckVixen')
ang -= frandom(0, 22.5 / 8);
else
ang += frandom(-22.5 / 8, 22.5 / 8);
double dist = (j.actor.pos.XY - actor.pos.XY).Length();
zvel = ((j.actor.opos.Z + j.actor.oviewzoffset - pos.Z + 3) * vel) / dist;
}
double oldzvel = zvel;
double scale = p? 0.109375 : 0.125;
let spawned = dlevel.SpawnActor(sect, pos, self.GetClass(), -127, (scale,scale), ang, vel, zvel, actor, STAT_PROJECTILE);
if (!spawned) return;
spawned.extra += random(0, 7);
spawned.cstat = CSTAT_SPRITE_YCENTER;
spawned.clipdist = 1;
ang = actor.Angle + frandom(-22.5 / 4, 22.5 / 4);
zvel = oldzvel + frandom(-2, 2);
}
override bool ShootThis(DukeActor actor, DukePlayer p, Vector3 pos, double ang)
{
pos.Z += 4;
shootwhip(actor, p, pos, ang);
return true;
}
}
class RedneckOWhip : RedneckUWhip
{
default
{
pic "OWHIP";
}
override bool ShootThis(DukeActor actor, DukePlayer p, Vector3 pos, double ang)
{
pos.Z -= 15;
shootwhip(actor, p, pos, ang);
return true;
}
}