teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified transport vehicles.

Browse source
This commit is contained in:
Christoph Oelckers 2022-11-30 17:15:44 +01:00
parent f1d6e0e6bb
commit bc34746227
17 changed files with 66 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/actors.cpp
View file

@ -579,7 +579,7 @@ void operaterespawns(int low)
void detonate(DDukeActor *actor, int explosion)
{
earthquaketime = 16;
ud.earthquaketime = 16;
DukeStatIterator itj(STAT_EFFECTOR);
while (auto effector = itj.Next())
@ -1523,7 +1523,7 @@ void handle_se02(DDukeActor* actor)
{
if ((actor->temp_data[0] & 31) == 8)
{
earthquaketime = 48;
ud.earthquaketime = 48;
S_PlayActorSound(EARTHQUAKE, ps[screenpeek].GetActor());
}

25
source/games/duke/src/actors_d.cpp
View file

@ -1797,7 +1797,6 @@ DETONATEB:
void moveactors_d(void)
{
int p;
unsigned int k;
DukeStatIterator it(STAT_ACTOR);
while (auto act = it.Next())
@ -1826,28 +1825,6 @@ void moveactors_d(void)
if (isWorldTour()) flamethrowerflame(act);
continue;
case HELECOPT:
case DUKECAR:
act->spr.pos.Z += act->vel.Z;
act->temp_data[0]++;
if (act->temp_data[0] == 4) S_PlayActorSound(WAR_AMBIENCE2, act);
if (act->temp_data[0] > (26 * 8))
{
S_PlaySound(RPG_EXPLODE);
for (int j = 0; j < 32; j++)
RANDOMSCRAP(act);
earthquaketime = 16;
act->Destroy();
continue;
}
else if ((act->temp_data[0] & 3) == 0)
spawn(act, EXPLOSION2);
ssp(act, CLIPMASK0);
break;
case GREENSLIME:
case GREENSLIME + 1:
case GREENSLIME + 2:
@ -2337,7 +2314,7 @@ void moveeffectors_d(void) //STATNUM 3
break;
case SE_33_QUAKE_DEBRIS:
if (earthquaketime > 0 && (krand() & 7) == 0)
if (ud.earthquaketime > 0 && (krand() & 7) == 0)
RANDOMSCRAP(act);
break;
case SE_36_PROJ_SHOOTER:

4
source/games/duke/src/actors_r.cpp
View file

@ -1148,7 +1148,7 @@ static void rrra_specialstats()
{
S_PlaySound(215);
act->Destroy();
earthquaketime = 32;
ud.earthquaketime = 32;
SetPlayerPal(&ps[myconnectindex], PalEntry(32, 32, 32, 48));
}
}
@ -2092,7 +2092,7 @@ void moveeffectors_r(void) //STATNUM 3
break;
case SE_33_QUAKE_DEBRIS:
if (earthquaketime > 0 && (krand() & 7) == 0)
if (ud.earthquaketime > 0 && (krand() & 7) == 0)
RANDOMSCRAP(act);
break;
case SE_36_PROJ_SHOOTER:

4
source/games/duke/src/gameexec.cpp
View file

@ -1624,9 +1624,9 @@ int ParseState::parse(void)
break;
case concmd_mamaquake:
if (g_ac->spr.pal == 31)
earthquaketime = 4;
ud.earthquaketime = 4;
else if (g_ac->spr.pal == 32)
earthquaketime = 6;
ud.earthquaketime = 6;
insptr++;
break;
case concmd_garybanjo:

2
source/games/duke/src/gameloop.cpp
View file

@ -64,7 +64,7 @@ void GameInterface::Ticker()
if (playrunning())
{
if (earthquaketime > 0) earthquaketime--;
if (ud.earthquaketime > 0) ud.earthquaketime--;
ud.cameraactor = nullptr;
everyothertime++;

1
source/games/duke/src/global.cpp
View file

@ -56,7 +56,6 @@ player_struct ps[MAXPLAYERS];
//-------------------------------------------------------------------------
int lastvisinc; // weapon flash
int earthquaketime;
int global_random; // readonly - one single global per-frame random value. Ugh...
// Redneck Rampage

2
source/games/duke/src/global.h
View file

@ -72,7 +72,6 @@ extern int lastvisinc;
extern animwalltype animwall[MAXANIMWALLS];
extern int numanimwalls;
extern int numclouds;
extern int earthquaketime;
extern int global_random;
extern int mirrorcnt;
extern int numplayersprites;
@ -111,7 +110,6 @@ extern sectortype* mirrorsector[64];
extern walltype* mirrorwall[64];
extern int wupass;
extern int chickenplant;
extern int thunderon;
extern int ufospawn;
extern int ufocnt;

2
source/games/duke/src/premap.cpp
View file

@ -426,7 +426,7 @@ void resetprestat(int snum,int g)
mspos.Clear();
animates.Clear();
camsprite =nullptr;
earthquaketime = 0;
ud.earthquaketime = 0;
WindTime = 0;
WindDir = nullAngle;

6
source/games/duke/src/render.cpp
View file

@ -314,10 +314,10 @@ void displayrooms(int snum, double interpfrac, bool sceneonly)
double cz = p->GetActor()->ceilingz;
double fz = p->GetActor()->floorz;
if (earthquaketime > 0 && p->on_ground == 1)
if (ud.earthquaketime > 0 && p->on_ground == 1)
{
cpos.Z += 1 - (((earthquaketime) & 1) * 2.);
cangles.Yaw += DAngle::fromBuild((2 - ((earthquaketime) & 2)) << 2);
cpos.Z += 1 - (((ud.earthquaketime) & 1) * 2.);
cangles.Yaw += DAngle::fromBuild((2 - ((ud.earthquaketime) & 2)) << 2);
}
if (p->GetActor()->spr.pal == 1) cpos.Z -= 18;

2
source/games/duke/src/savegame.cpp
View file

@ -373,7 +373,7 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("numanimwalls", numanimwalls)
.Array("animwall", animwall, numanimwalls)
("camsprite", camsprite)
("earthquaketime", earthquaketime)
("earthquaketime", ud.earthquaketime)
("gs.freezerhurtowner", gs.freezerhurtowner)
("global_random", global_random)
("gs.impact_damage", gs.impact_damage)

3
source/games/duke/src/spawn_d.cpp
View file

@ -355,9 +355,6 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.shade = actj->spr.shade;
act->spr.pal = ps[actj->PlayerIndex()].palookup;
}
[[fallthrough]];
case DUKECAR:
case HELECOPT:
act->spr.cstat = 0;
act->spr.extra = 1;
act->vel.X = 292 / 16.;

1
source/games/duke/src/types.h
View file

@ -162,6 +162,7 @@ struct user_defs
int m_ffire, ffire, m_player_skill, multimode;
int player_skill, marker;
int chickenplant; // readonly - used to trigger some special behavior if a special item is found in a map.
int earthquaketime;
TObjPtr<DDukeActor*> cameraactor;

1
source/games/duke/src/vmexports.cpp
View file

@ -1323,6 +1323,7 @@ DEFINE_FIELD_X(DukeUserDefs, user_defs, marker);
DEFINE_FIELD_X(DukeUserDefs, user_defs, bomb_tag);
DEFINE_FIELD_X(DukeUserDefs, user_defs, cameraactor);
DEFINE_FIELD_X(DukeUserDefs, user_defs, chickenplant);
DEFINE_FIELD_X(DukeUserDefs, user_defs, earthquaketime);
DEFINE_FIELD_X(DukeUserDefs, user_defs, ufospawnsminion);
DEFINE_GLOBAL_UNSIZED(ud)

2
wadsrc/static/filter/dukelike/engine/engine.def
View file

@ -74,6 +74,8 @@ spawnclasses
4502 = DukeLetter
4361 = DukeDuck
4359 = DukeTarget
1346 = DukeHelicopter
2491 = DukeCar
1272 = DukeTrash
634 = DukeBolt1

1
wadsrc/static/zscript.txt
View file

@ -86,6 +86,7 @@ version "4.10"
#include "zscript/games/duke/actors/reactor.zs"
#include "zscript/games/duke/actors/destructibles.zs"
#include "zscript/games/duke/actors/ducktarget.zs"
#include "zscript/games/duke/actors/helicopt.zs"
#include "zscript/games/duke/actors/redneckmisc.zs"
#include "zscript/games/duke/actors/rabbitspawner.zs"

46
wadsrc/static/zscript/games/duke/actors/helicopt.zs Normal file
View file

@ -0,0 +1,46 @@
class DukeCar : DukeActor
{
default
{
extra 1;
clipdist 32;
pic "DUKECAR";
statnum STAT_ACTOR;
}
override void Initialize()
{
self.vel.X = 292 / 16.;
self.vel.Z = 360 / 256.;
self.cstat = CSTAT_SPRITE_BLOCK_ALL;
}
override void Tick()
{
self.pos.Z += self.vel.Z;
self.temp_data[0]++;
if (self.temp_data[0] == 4) self.PlayActorSound("WAR_AMBIENCE2");
if (self.temp_data[0] > (26 * 8))
{
Duke.PlaySound("RPG_EXPLODE");
for (int j = 0; j < 32; j++)
self.RANDOMSCRAP();
ud.earthquaketime = 16;
self.Destroy();
return;
}
else if ((self.temp_data[0] & 3) == 0)
self.spawn("DukeExplosion2");
self.DoMove(CLIPMASK0);
}
}
class DukeHelicopter : DukeCar
{
default
{
pic "HELECOPT";
}
}

3
wadsrc/static/zscript/games/duke/dukegame.zs
View file

@ -446,7 +446,8 @@ struct DukeUserDefs native
native readonly int respawn_monsters, respawn_items, respawn_inventory, recstat, monsters_off, brightness;
native readonly int ffire, multimode;
native readonly int player_skill, marker, chickenplant;
native int earthquaketime;
native uint8 ufospawnsminion;
native int16 bomb_tag;
native DukeActor cameraactor;