nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-22 03:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Improve Perk-A-Cola Precache Handling (Fixes Maps with Legacy perk_random)

Browse source
This commit is contained in:
MotoLegacy 2024-03-17 10:29:52 -07:00
parent 3404e9a706
commit 601fe15ee8
4 changed files with 114 additions and 656 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/server/defs/custom.qc
View file

@ -431,6 +431,16 @@ float crandom();
.string door_model_name; .string door_model_name;
//Perk and Power system //Perk and Power system
#define PERK_QUICKREVIVE_DEFAULT_MODEL "models/machines/quake_scale/quick_revive.mdl"
#define PERK_JUGGERNOG_DEFAULT_MODEL "models/machines/quake_scale/juggernog.mdl"
#define PERK_SPEEDCOLA_DEFAULT_MODEL "models/machines/quake_scale/speed_cola.mdl"
#define PERK_DOUBLETAP_DEFAULT_MODEL "models/machines/quake_scale/double_tap.mdl"
#define PERK_PHDFLOPPER_DEFAULT_MODEL "models/machines/quake_scale/flopper.mdl"
#define PERK_STAMINUP_DEFAULT_MODEL "models/machines/quake_scale/staminup.mdl"
#define PERK_DEADSHOT_DEFAULT_MODEL "models/machines/quake_scale/deadshot.mdl"
#define PERK_MULEKICK_DEFAULT_MODEL "models/machines/quake_scale/mulekick.mdl"
float isPowerOn; float isPowerOn;
.float isBuying; // naievil -- used for checking if a perk is being consumed, limits glitching .float isBuying; // naievil -- used for checking if a perk is being consumed, limits glitching
.float perks; .float perks;

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

@ -448,646 +448,144 @@ void() setup_perk =
// -------------------- // --------------------
// //
// Quick Revive //
void() perk_revive = // Perk_InitMachine()
// Wrapper to provide clean-up for
// Perk-A-Cola Spawn functions.
//
void(string perk_classname,
string default_model, float cost_solo,
float cost_coop, float light_spawnflag,
float purchase_limit_solo, float purchase_limit_coop,
float require_power_solo, float require_power_coop,
float drink_skin, float perk_id) Perk_InitMachine =
{ {
precache_sound ("sounds/pu/byebye.wav");
precache_model ("models/sprites/lightning.spr");
// //
// Set Default Stats for Compatibility // Set Default Stats for Compatibility
// //
// Model // Model
if (!self.model) { if (!self.model)
self.model = "models/machines/quake_scale/quick_revive.mdl"; self.model = default_model;
}
// Perk Cost (Solo) // Perk Cost (Solo)
if (!self.cost) { if (!self.cost)
self.cost = 500; self.cost = cost_solo;
}
// Perk Cost (Co-Op) // Perk Cost (Co-Op)
if (!self.cost2) { if (!self.cost2)
self.cost2 = 1500; self.cost2 = cost_coop;
}
// Player Trigger Sound // Player Trigger Sound
if (!self.oldmodel) { if (!self.oldmodel)
self.oldmodel = "sounds/machines/perk_drink.wav"; self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model // View Model
if (!self.weapon2model) { if (!self.weapon2model)
self.weapon2model = "models/machines/v_perk.mdl"; self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame // View Model Start Frame
if (!self.weapon_animduration) { if (!self.weapon_animduration)
self.weapon_animduration = 0; self.weapon_animduration = 0;
}
// View Model End Frame // View Model End Frame
if (!self.weapon2_animduration) { if (!self.weapon2_animduration)
self.weapon2_animduration = 31; self.weapon2_animduration = 31;
}
// Light Effect // Light Effect
if (!self.spawnflags) { if (!self.spawnflags)
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_CYANLIGHT; self.spawnflags = self.spawnflags | light_spawnflag;
}
// Perk Purchase Limit (Solo) // Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) { if (!self.perk_purchase_limit_solo)
self.perk_purchase_limit_solo = 3; self.perk_purchase_limit_solo = purchase_limit_solo;
}
// Perk Purchase Limit (Co-Op) // Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) { if (!self.perk_purchase_limit_coop)
self.perk_purchase_limit_coop = 1000; self.perk_purchase_limit_coop = purchase_limit_coop;
}
// Perk Requires Power (Solo) // Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) { if (!self.perk_requires_power_solo)
self.perk_requires_power_solo = -1; self.perk_requires_power_solo = require_power_solo;
}
// Perk Requires Power (Co-Op) // Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) { if (!self.perk_requires_power_coop)
self.perk_requires_power_coop = true; self.perk_requires_power_coop = require_power_coop;
// Precache if spawned naturally by the world.
if (time < 2) {
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
} }
// Set up the Perk Entity // General Machine Setup
self.solid = SOLID_TRIGGER; self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
precache_sound("sounds/weapons/papfire.wav");
precache_extra(W_BIATCH);
setorigin(self, self.origin); setorigin(self, self.origin);
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.oldorigin = self.origin; self.oldorigin = self.origin;
self.finalangle = self.angles; self.finalangle = self.angles;
self.door_model_name = self.model; self.door_model_name = self.model;
setmodel(self, self.model); self.classname = perk_classname;
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_revive";
self.touch = touch_perk; self.touch = touch_perk;
self.think = setup_perk; self.think = setup_perk;
self.nextthink = time + 0.1; self.nextthink = time + 0.1;
self.sequence = drink_skin;
self.style = perk_id;
};
// Drink Information // Quick Revive
self.sequence = 1; void() perk_revive =
self.style = P_REVIVE; {
Perk_InitMachine("perk_revive", PERK_QUICKREVIVE_DEFAULT_MODEL, 500, 1500,
PERK_SPAWNFLAG_CYANLIGHT, 3, 1000, -1, true, 1, P_REVIVE);
}; };
// PhD Flopper // PhD Flopper
void() perk_flopper = void() perk_flopper =
{ {
// Perk_InitMachine("perk_flopper", PERK_PHDFLOPPER_DEFAULT_MODEL, 2000, 2000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_YELLOWLIGHT, 1000, 1000, true, true, 6, P_FLOP);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/flopper.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 2000;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_YELLOWLIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_flopper";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 6;
self.style = P_FLOP;
}; };
// Jugger-Nog // Jugger-Nog
void() perk_juggernog = void() perk_juggernog =
{ {
// Perk_InitMachine("perk_juggernog", PERK_JUGGERNOG_DEFAULT_MODEL, 2500, 2500,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_PINKLIGHT, 1000, 1000, true, true, 2, P_JUG);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/juggernog.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 2500;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_PINKLIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_juggernog";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 2;
self.style = P_JUG;
}; };
// Stamin-Up // Stamin-Up
void() perk_staminup = void() perk_staminup =
{ {
// Perk_InitMachine("perk_staminup", PERK_STAMINUP_DEFAULT_MODEL, 2000, 2000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_YELLOWLIGHT, 1000, 1000, true, true, 5, P_STAMIN);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/staminup.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 2000;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_YELLOWLIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_staminup";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 5;
self.style = P_STAMIN;
}; };
// Speed Cola // Speed Cola
void() perk_speed = void() perk_speed =
{ {
// Perk_InitMachine("perk_speed", PERK_SPEEDCOLA_DEFAULT_MODEL, 3000, 3000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_LIMELIGHT, 1000, 1000, true, true, 3, P_SPEED);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/speed_cola.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 3000;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_LIMELIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_speed";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 3;
self.style = P_SPEED;
}; };
// Double Tap Door Beer // Double Tap Door Beer
void() perk_double = void() perk_double =
{ {
// Perk_InitMachine("perk_double", PERK_DOUBLETAP_DEFAULT_MODEL, 2000, 2000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_YELLOWLIGHT, 1000, 1000, true, true, 4, P_DOUBLE);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/double_tap.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 2000;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_YELLOWLIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_double";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 4;
self.style = P_DOUBLE;
}; };
// Deadshot Daiquiri // Deadshot Daiquiri
void() perk_deadshot = void() perk_deadshot =
{ {
// Perk_InitMachine("perk_deadshot", PERK_DEADSHOT_DEFAULT_MODEL, 2000, 2000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_YELLOWLIGHT, 1000, 1000, true, true, 7, P_DEAD);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/deadshot.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 1500;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_YELLOWLIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_deadshot";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 7;
self.style = P_DEAD;
}; };
// naievil -- older maps compatability // naievil -- older maps compatability
void() perk_dead = { perk_deadshot();} void() perk_dead = { perk_deadshot();}
@ -1095,92 +593,8 @@ void() perk_dead = { perk_deadshot();}
// Mule Kick // Mule Kick
void() perk_mule = void() perk_mule =
{ {
// Perk_InitMachine("perk_deadshot", PERK_MULEKICK_DEFAULT_MODEL, 4000, 4000,
// Set Default Stats for Compatibility PERK_SPAWNFLAG_LIMELIGHT, 1000, 1000, true, true, 8, P_MULE);
//
// Model
if (!self.model) {
self.model = "models/machines/quake_scale/mulekick.mdl";
}
// Perk Cost (Solo)
if (!self.cost) {
self.cost = 4000;
}
// Perk Cost (Co-Op)
if (!self.cost2) {
self.cost2 = self.cost;
}
// Player Trigger Sound
if (!self.oldmodel) {
self.oldmodel = "sounds/machines/perk_drink.wav";
}
// View Model
if (!self.weapon2model) {
self.weapon2model = "models/machines/v_perk.mdl";
}
// View Model Start Frame
if (!self.weapon_animduration) {
self.weapon_animduration = 0;
}
// View Model End Frame
if (!self.weapon2_animduration) {
self.weapon2_animduration = 31;
}
// Light Effect
if (!self.spawnflags) {
self.spawnflags = self.spawnflags | PERK_SPAWNFLAG_LIMELIGHT;
}
// Perk Purchase Limit (Solo)
if (!self.perk_purchase_limit_solo) {
self.perk_purchase_limit_solo = 1000;
}
// Perk Purchase Limit (Co-Op)
if (!self.perk_purchase_limit_coop) {
self.perk_purchase_limit_coop = 1000;
}
// Perk Requires Power (Solo)
if (!self.perk_requires_power_solo) {
self.perk_requires_power_solo = true;
}
// Perk Requires Power (Co-Op)
if (!self.perk_requires_power_coop) {
self.perk_requires_power_coop = true;
}
// Set up the Perk Entity
self.solid = SOLID_TRIGGER;
precache_model(self.model);
precache_model(self.weapon2model);
precache_sound(self.oldmodel);
precache_sound("sounds/machines/vend.wav");
if (self.aistatus) { precache_sound(self.aistatus); }
if (self.powerup_vo) { precache_sound(self.powerup_vo); }
setorigin(self, self.origin);
self.oldorigin = self.origin;
self.finalangle = self.angles;
self.door_model_name = self.model;
setmodel(self, self.model);
setsize(self, VEC_HULL2_MIN, VEC_HULL2_MAX);
self.classname = "perk_mule";
self.touch = touch_perk;
self.think = setup_perk;
self.nextthink = time + 0.1;
// Drink Information
self.sequence = 8;
self.style = P_MULE;
} }
// //
@ -1429,6 +843,26 @@ void() Perk_RandomDecide =
} }
}; };
void() Perk_RandomPrecaches =
{
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_QUICKREVIVE)
precache_model(PERK_QUICKREVIVE_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_JUGGERNOG)
precache_model(PERK_JUGGERNOG_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_SPEEDCOLA)
precache_model(PERK_SPEEDCOLA_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_DOUBLETAP)
precache_model(PERK_DOUBLETAP_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_PHDFLOPPER)
precache_model(PERK_PHDFLOPPER_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_STAMINUP)
precache_model(PERK_STAMINUP_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_DEADSHOT)
precache_model(PERK_DEADSHOT_DEFAULT_MODEL);
if (self.spawnflags & SPAWNFLAG_PERKRANDOM_MULEKICK)
precache_model(PERK_MULEKICK_DEFAULT_MODEL);
};
void() perk_random = void() perk_random =
{ {
// Quit out because there are no Perk-A-Cola machines for us to choose between. // Quit out because there are no Perk-A-Cola machines for us to choose between.
@ -1436,6 +870,11 @@ void() perk_random =
objerror("No available Perks to choose from!"); objerror("No available Perks to choose from!");
} }
// Perform default model precaches for
// Perk-A-Colas in our spawnflags, in the event
// they are not already in the world (legacy mode).
Perk_RandomPrecaches();
// Link this entity so that moving existing Perk-A-Cola machines // Link this entity so that moving existing Perk-A-Cola machines
// receive a viable teleport location. // receive a viable teleport location.
setorigin(self, self.origin); setorigin(self, self.origin);
@ -1443,5 +882,5 @@ void() perk_random =
// We can't transform right away, because we need to assert that // We can't transform right away, because we need to assert that
// all other entities are loaded in the world. // all other entities are loaded in the world.
self.think = Perk_RandomDecide; self.think = Perk_RandomDecide;
self.nextthink = time + 5; self.nextthink = time + 3;
}; };

1
source/server/entities/pack_a_punch.qc
View file

@ -412,7 +412,6 @@ void() perk_pap =
// Precaches // Precaches
// FIXME: Don't hardcode weapon precaches here. // FIXME: Don't hardcode weapon precaches here.
precache_extra(W_BIATCH);
precache_extra(W_SNUFF); precache_extra(W_SNUFF);
precache_model (self.model); precache_model (self.model);

10
source/server/main.qc
View file

@ -175,6 +175,7 @@ void() precaches =
precache_model ("models/sprites/sprkle.spr"); precache_model ("models/sprites/sprkle.spr");
precache_model ("models/sprites/explosion.spr"); precache_model ("models/sprites/explosion.spr");
precache_model ("models/sprites/null.spr"); precache_model ("models/sprites/null.spr");
precache_model ("models/sprites/lightning.spr");
if (cvar("waypoint_mode")) { if (cvar("waypoint_mode")) {
precache_model ("models/way/current_way.spr"); precache_model ("models/way/current_way.spr");
@ -212,6 +213,13 @@ void() precaches =
precache_model ("models/weapons/knife/v_knife.mdl"); precache_model ("models/weapons/knife/v_knife.mdl");
precache_model ("models/weapons/grenade/v_grenade.mdl"); precache_model ("models/weapons/grenade/v_grenade.mdl");
precache_model ("models/weapons/grenade/g_grenade.mdl"); precache_model ("models/weapons/grenade/g_grenade.mdl");
precache_extra (W_BIATCH);
// perk machine defaults
//precache_model (PERK_QUICKREVIVE_DEFAULT_MODEL);
//precache_model (PERK_JUGGERNOG_DEFAULT_MODEL);
//precache_model (PERK_SPEEDCOLA_DEFAULT_MODEL);
//precache_model (PERK_)
#ifdef FTE #ifdef FTE
@ -245,6 +253,7 @@ void() precaches =
precache_sound("sounds/weapons/colt/magout.wav"); precache_sound("sounds/weapons/colt/magout.wav");
precache_sound("sounds/weapons/colt/shoot.wav"); precache_sound("sounds/weapons/colt/shoot.wav");
precache_sound("sounds/weapons/colt/slide.wav"); precache_sound("sounds/weapons/colt/slide.wav");
precache_sound("sounds/weapons/papfire.wav");
// grenade // grenade
precache_sound("sounds/weapons/grenade/prime.wav"); precache_sound("sounds/weapons/grenade/prime.wav");
@ -270,6 +279,7 @@ void() precaches =
precache_sound ("sounds/pu/pickup.wav"); precache_sound ("sounds/pu/pickup.wav");
precache_sound ("sounds/pu/powerup.wav"); precache_sound ("sounds/pu/powerup.wav");
precache_sound ("sounds/pu/drop.wav"); precache_sound ("sounds/pu/drop.wav");
precache_sound ("sounds/pu/byebye.wav");
// zombie walk // zombie walk
precache_sound ("sounds/zombie/w0.wav"); precache_sound ("sounds/zombie/w0.wav");