nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-25 21:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Fix Mystery Box causing Soft_Restart issues

Browse source
This commit is contained in:
cypress 2023-08-26 20:57:13 -04:00
parent 6122e48a94
commit 2a94f8daf9
2 changed files with 92 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/server/entities/machines.qc
View file

@ -1097,12 +1097,16 @@ void() power_switch =
// MBOX_FreeEnt(ent)
// Marks an MBOX entity as able to be used.
//
inline void(entity ent) MBOX_FreeEnt =
void(entity ent) MBOX_FreeEnt =
{
setmodel(ent, "");
ent.classname = "freeMboxEntity";
ent.touch = SUB_Null;
ent.think = SUB_Null;
#ifdef FTE
ent.alpha = 1;
#endif
};
//
@ -1321,6 +1325,10 @@ void() findboxspot =
setmodel(g,"models/machines/mglow$.mdl");
setorigin(g,newspot.origin);
g.angles = newspot.angles;
#ifdef FTE
g.alpha = 0.5;
#endif
}
// Remove teddy
@ -1431,6 +1439,10 @@ void() finish_mbox_setup =
setmodel(g,"models/machines/mglow$.mdl");
setorigin(g,self.origin);
g.angles = self.angles;
#ifdef FTE
g.alpha = 0.5;
#endif
}
}

97
source/server/utilities/game_restart.qc
View file

@ -32,6 +32,11 @@ void() func_door_nzp;
void(entity e) Light_None;
void() setup_perk;
void() touch_perk;
void(entity ent) MBOX_FreeEnt;
entity() MBOX_GetFreeEnt;
void() mystery_touch;
#define MBOX_SPAWNFLAG_NOLIGHT 2
//
// GameRestart_CleanPowerUps()
@ -158,6 +163,78 @@ void() GameRestart_ResetPerkaColas =
GameRestart_TurnPerkOff("perk_mule"); // Mule Kick
}
//
// GameRestart_ResetMysteryBox
// Clean-Up the Mystery Box.
//
void() GameRestart_ResetMysteryBox =
{
// Check if there is a Mystery Box in the map
entity mystery_box = find(world, classname, "mystery");
if (mystery_box != world) {
mystery_box.boxstatus = 0;
mystery_box.frame = 0;
mystery_box.spins = 0;
if (mystery_box.goaldummy != world)
mystery_box.goaldummy.frame = 0;
if (mystery_box.boxweapon)
MBOX_FreeEnt(mystery_box.boxweapon);
// If the Mystery Box is not in its original
// location.
if (mystery_box.origin != boxOrigin) {
mystery_box.model = "models/props/teddy.mdl";
mystery_box.frame = 2;
mystery_box.classname = "mystery_box_tp_spot";
mystery_box.touch = SUB_Null;
mystery_box.angles_y -= 90;
if (mystery_box.goaldummy != world)
MBOX_FreeEnt(mystery_box.goaldummy);
// This isn't the normal spawn position
if (mystery_box.origin != boxOrigin) {
// Find the original spot
entity original_box = find(world, classname, "mystery_box_tp_spot");
while (original_box != world) {
if (original_box.origin == boxOrigin)
break;
original_box = find(original_box, classname, "mystery_box_tp_spot");
}
// Spawn the Box Glow if permitted
if (!(mystery_box.spawnflags & MBOX_SPAWNFLAG_NOLIGHT)) {
entity light = MBOX_GetFreeEnt();
light.classname = "mystery_glow";
original_box.goaldummy = light;
setmodel(light, "models/machines/mglow$.mdl");
setorigin(light, original_box.origin);
light.angles = original_box.angles;
#ifdef FTE
light.alpha = 0.5;
#endif
}
original_box.touch = mystery_touch;
original_box.solid = SOLID_TRIGGER;
original_box.classname = "mystery";
setorigin(original_box, original_box.origin);
setmodel(original_box, "models/machines/mystery.mdl");
setsize (original_box, VEC_HULL2_MIN, VEC_HULL2_MAX);
}
Light_None(mystery_box);
setmodel(mystery_box, mystery_box.model);
}
}
}
//moto -- put this here because it keeps soft_restart somewhat clean..
void(entity door) reclose_door = {
entity oldself;
@ -176,7 +253,7 @@ void(entity door) reclose_door = {
}
void() Soft_Restart = {
entity who, oldself, doors, box, endgame;
entity who, oldself, doors, endgame;
self = find(world,classname,"player");
oldself = self;
@ -208,6 +285,7 @@ void() Soft_Restart = {
GameRestart_CleanWallSummons(); // Delete residual wall weapon spawns from our last game.
GameRestart_RepairBarricades(); // Make sure all barricades are fully repaired.
GameRestart_ResetPerkaColas(); // Turn all of the Perk-a-Cola lights off, reset states.
GameRestart_ResetMysteryBox(); // Clean up the Mystery Box, delete floating weapon, etc.
//close doors
doors = findfloat(world, isopen, 1);
@ -217,23 +295,6 @@ void() Soft_Restart = {
doors = findfloat(world, isopen, 1);
}
//revert mystery box
box = find(world, classname, "mystery");
if (box) {
box.boxstatus = 0;
box.frame = 0;
box.goaldummy.frame = 0;
boxCount = 0;
box.origin = boxOrigin;
//self = box;
if (box.boxweapon)
remove(box.boxweapon);
//mystery_box();
//self = oldself;
}
//reset buyable ending
endgame = find(world, classname, "func_ending");
if (endgame) {