nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-10 14:42:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Allow for more rotation options for zapper_nodes

Browse source
This commit is contained in:
cypress 2023-07-17 13:52:50 -04:00
parent 27066a33c7
commit 0504f1d8d1
3 changed files with 102 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/server/damage.qc
View file

@ -642,8 +642,6 @@ void(entity inflictor, entity attacker, float damage2, float mindamage, float ra
self = ent;
teddy_react();
self = oldself2;
//ent.th_die();
//bprint(PRINT_HIGH, "hello????\n");
}
else if (ent.takedamage && ent.classname != "ai_zombie_head" && ent.classname != "ai_zombie_larm" && ent.classname != "ai_zombie_rarm")
{

100
source/server/entities/traps.qc
View file

@ -290,6 +290,98 @@ void() zapper_switch =
self.classname = "zapper_switch";
};
void() set_zapper_bbox =
{
// Retrieve the distance between this zapper and the one
// it's linked to.
entity other_zapper = find(world, targetname, self.target);
float distance = abs(vlen(other_zapper.origin - self.origin));
vector bbmin;
vector bbmax;
// X Axis
if (self.angles_x) {
switch(self.angles_x) {
// Pointed 'Upward'
case 0:
bbmin = '-20 -20 -4';
bbmax_x = 20;
bbmax_y = 20;
bbmax_z = distance/2;
break;
// Pointed 'Leftward'
case 90:
bbmin_x = -distance/2;
bbmin_y = -20;
bbmin_z = -20;
bbmax = '4 20 20';
break;
// Pointed 'Downward'
case 180:
bbmin_x = -20;
bbmin_y = -20;
bbmin_z = -distance/2;
bbmax = '20 20 4';
break;
// Pointed 'Rightward'
case 270:
bbmin = '-4 20 20';
bbmax_x = distance/2;
bbmax_y = 20;
bbmax_z = 20;
break;
default:
bprint(PRINT_HIGH, "WARN: Invalid X axis rotation for zapper_node.\n");
bprint(PRINT_HIGH, " Collision box is going to be incorrect.\n");
break;
}
} else if (self.angles_z) {
// Z Axis
switch(self.angles_z) {
// Pointed 'Upward'
case 0:
bbmin = '-20 -20 -4';
bbmax_x = 20;
bbmax_y = 20;
bbmax_z = distance/2;
break;
// Pointed 'Leftward'
case 90:
bbmin_x = -20;
bbmin_y = -distance/2;
bbmin_x = -20;
bbmax = '20 4 20';
break;
// Pointed 'Downward'
case 180:
bbmin_x = -20;
bbmin_y = -20;
bbmin_z = -distance/2;
bbmax = '20 20 4';
break;
// Pointed 'Rightward'
case 270:
bbmin = '-20 -4 -20';
bbmax_x = 20;
bbmax_y = distance/2;
bbmax_x = 20;
break;
default:
bprint(PRINT_HIGH, "WARN: Invalid Z axis rotation for zapper_node.\n");
bprint(PRINT_HIGH, " Collision box is going to be incorrect.\n");
break;
}
}
if (self.angles_y) {
bprint(PRINT_HIGH, "WARN: zapper_node object with Y axis rotation.\n");
bprint(PRINT_HIGH, " Use r_showbboxes to verify zap collision.\n");
}
setsize(self, bbmin, bbmax);
}
void() zapper_node =
{
//
@ -305,14 +397,10 @@ void() zapper_node =
setorigin(self, self.origin);
setmodel(self, self.model);
makevectors(self.angles);
if (self.angles_z == 180) {
setsize (self, '-20 -20 -80', '20 20 4');
} else {
setsize (self, '-20 -20 -4', '20 20 80');
}
self.movetype = MOVETYPE_NONE;
self.think = set_zapper_bbox;
self.nextthink = time + 2;
self.classname = "zapper_node";
};

8
source/server/utilities/math.qc
View file

@ -223,4 +223,12 @@ vector(vector ang) normalizeAngles180 = {
ang_z = ang_z + 360;
*/
return ang;
};
float(float val) abs = {
if (val < 0) {
val *= -1;
}
return val;
};