nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-17 01:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/nzp-team/quakec

Browse source
This commit is contained in:
Steam Deck User 2022-12-28 13:11:13 -05:00
commit fb7c97be1d
6 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/server/ai/ai_core.qc
View file

@ -517,7 +517,7 @@ void(float dist) Window_Hop =
self.enemy = find_new_enemy(self); self.enemy = find_new_enemy(self);
//self.th_die(); //self.th_die();
self.th_walk(); self.th_walk();
LinkZombiesHitbox(); //LinkZombiesHitbox();
//bprint (PRINT_HIGH, "Linked hitboxes"); //bprint (PRINT_HIGH, "Linked hitboxes");
} }
} }

14
source/server/ai/crawler_core.qc
View file

@ -244,21 +244,21 @@ void(entity who) makeCrawler =
//who.th_grabledge = zombie_grabledge1; //who.th_grabledge = zombie_grabledge1;
//who.th_diewunder = die_wunder1; //who.th_diewunder = die_wunder1;
setmodel(who,"models/ai/zcbod.mdl"); setmodel(who,"models/ai/zbc#.mdl");
if(who.head.deadflag) if(who.head.deadflag)
{ {
setmodel(who.head,"models/ai/zchead.mdl"); setmodel(who.head,"models/ai/zhc^.mdl");
//updateLimb (who, 0, world); updateLimb (who, 0, world);
} }
if(who.larm.deadflag) if(who.larm.deadflag)
{ {
setmodel(who.larm,"models/ai/zclarm.mdl"); setmodel(who.larm,"models/ai/zalc(.mdl");
//updateLimb (who, 1, world); updateLimb (who, 1, world);
} }
if(who.rarm.deadflag) if(who.rarm.deadflag)
{ {
setmodel(who.rarm,"models/ai/zcrarm.mdl"); setmodel(who.rarm,"models/ai/zarc(.mdl");
//updateLimb (who, 2, world); updateLimb (who, 2, world);
} }
who.crawling = 1; who.crawling = 1;

12
source/server/ai/zombie_core.qc
View file

@ -1380,7 +1380,7 @@ void() zombieRise =
self.frame ++; self.frame ++;
self.think = zombieRise; self.think = zombieRise;
self.nextthink = time + 0.1; self.nextthink = time + 0.1;
LinkZombiesHitbox(); //LinkZombiesHitbox();
//bprint (PRINT_HIGH, "Linked hitboxes"); //bprint (PRINT_HIGH, "Linked hitboxes");
}; };
void() spawn_zombie = void() spawn_zombie =
@ -1635,9 +1635,9 @@ void(entity where) spawn_a_zombieB =
szombie.larm.deadflag = 1; szombie.larm.deadflag = 1;
szombie.rarm.deadflag = 1; szombie.rarm.deadflag = 1;
setmodel(szombie.head, "models/ai/zhead.mdl"); setmodel(szombie.head, "models/ai/zh^.mdl");
setmodel(szombie.rarm, "models/ai/zrarm.mdl"); setmodel(szombie.rarm, "models/ai/zar(.mdl");
setmodel(szombie.larm, "models/ai/zlarm.mdl"); setmodel(szombie.larm, "models/ai/zal(.mdl");
#ifndef PC #ifndef PC
updateLimb (szombie, 0, szombie.head); updateLimb (szombie, 0, szombie.head);
updateLimb (szombie, 1, szombie.larm); updateLimb (szombie, 1, szombie.larm);
@ -1647,7 +1647,7 @@ void(entity where) spawn_a_zombieB =
szombie.solid = szombie.head.solid = SOLID_CORPSE; szombie.solid = szombie.head.solid = SOLID_CORPSE;
szombie.movetype = MOVETYPE_WALK; szombie.movetype = MOVETYPE_WALK;
setmodel(szombie, "models/ai/zbod.mdl"); setmodel(szombie, "models/ai/zb#.mdl");
szombie.hop_step = 0; szombie.hop_step = 0;
szombie.gravity = 1.0; szombie.gravity = 1.0;
@ -1730,7 +1730,7 @@ void(entity where) spawn_a_zombieB =
self.th_walk(); self.th_walk();
self = old_self; self = old_self;
LinkZombiesHitbox(); //LinkZombiesHitbox();
#ifndef PC #ifndef PC
// //

4
source/server/clientfuncs.qc
View file

@ -1,7 +1,7 @@
/* /*
server/clientfuncs.qc server/clientfuncs.qc
used to communicate between server and client Used to communicate between server and client
Copyright (C) 2021-2022 NZ:P Team Copyright (C) 2021-2022 NZ:P Team
@ -675,4 +675,4 @@ float(float weapon) Util_WeaponFiresTraceshot =
return true; return true;
return false; return false;
} }

20
source/server/main.qc
View file

@ -155,17 +155,17 @@ void() precaches =
// zombie // zombie
precache_model ("models/ai/zfull.mdl"); precache_model ("models/ai/zfull.mdl");
precache_model ("models/ai/zlarm.mdl"); precache_model ("models/ai/zal(.mdl");
precache_model ("models/ai/zrarm.mdl"); precache_model ("models/ai/zar(.mdl");
precache_model ("models/ai/zbod.mdl"); precache_model ("models/ai/zb#.mdl");
precache_model ("models/ai/zhead.mdl"); precache_model ("models/ai/zh^.mdl");
// zombie crawler // zombie crawler
precache_model ("models/ai/zcfull.mdl"); precache_model ("models/ai/zcfull.mdl");
precache_model ("models/ai/zcbod.mdl"); precache_model ("models/ai/zbc#.mdl");
precache_model ("models/ai/zclarm.mdl"); precache_model ("models/ai/zalc(.mdl");
precache_model ("models/ai/zcrarm.mdl"); precache_model ("models/ai/zarc(.mdl");
precache_model ("models/ai/zchead.mdl"); precache_model ("models/ai/zhc^.mdl");
// powerups // powerups
precache_model ("models/sprites/explosion.spr"); precache_model ("models/sprites/explosion.spr");
@ -396,7 +396,7 @@ void() RelinkZombies =
//if(OnlyOrigin) //if(OnlyOrigin)
// continue; // continue;
/*
min = ent2.bbmins + (v_right * ent2.view_ofs_x) + (v_forward * ent2.view_ofs_y) + (v_up * ent2.view_ofs_z); min = ent2.bbmins + (v_right * ent2.view_ofs_x) + (v_forward * ent2.view_ofs_y) + (v_up * ent2.view_ofs_z);
max = ent2.bbmaxs + (v_right * ent2.view_ofs_x) + (v_forward * ent2.view_ofs_y) + (v_up * ent2.view_ofs_z); max = ent2.bbmaxs + (v_right * ent2.view_ofs_x) + (v_forward * ent2.view_ofs_y) + (v_up * ent2.view_ofs_z);
@ -405,7 +405,7 @@ void() RelinkZombies =
if(min_z > max_z) { min_z += max_z; max_z = min_z - max_z; min_z -= max_z; } if(min_z > max_z) { min_z += max_z; max_z = min_z - max_z; min_z -= max_z; }
setsize(ent2,min,max); setsize(ent2,min,max);
*/
} }
} }

5
source/server/weapons/weapon_core.qc
View file

@ -726,6 +726,7 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.usedent = self; body_ent.usedent = self;
body_ent.bleedingtime = time + 2; body_ent.bleedingtime = time + 2;
updateLimb (body_ent.head.owner, 0, world);
} }
} }
@ -747,7 +748,7 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.larm.solid = SOLID_NOT; body_ent.larm.solid = SOLID_NOT;
setmodel(body_ent.larm,""); setmodel(body_ent.larm,"");
body_ent.larm.frame = 0; body_ent.larm.frame = 0;
//updateLimb (body_ent.larm.owner, 1, world); updateLimb (body_ent.larm.owner, 1, world);
} }
body_ent.larm.washit = 0; body_ent.larm.washit = 0;
@ -767,7 +768,7 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.rarm.solid = SOLID_NOT; body_ent.rarm.solid = SOLID_NOT;
setmodel(body_ent.rarm,""); setmodel(body_ent.rarm,"");
body_ent.rarm.frame = 0; body_ent.rarm.frame = 0;
//updateLimb (body_ent.rarm.owner, 2, world); updateLimb (body_ent.rarm.owner, 2, world);
} }
body_ent.rarm.washit = 0; body_ent.rarm.washit = 0;