qf
/
game-source
mirror of https://git.code.sf.net/p/quake/game-source
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

defs.qc: added killed_monsters_oldcount so I can keep track of how many 

monsters were previously seen by the kill detection code in combat.qc.

combat.qc now has a while loop to determine how many kills it should update
the client with.

boss.qc has an adjustment to prevent the boss death from giving you 2 frags.

all the rest have adjustments to make killed_monsters++ on monster death,
assuming you have respawn_enabled set to 1, it will only count gibs. Otherwise
it should work normally.

This code is a little buggy, but Grievre wanted to see, so... *shrug*

Hikaru
This commit is contained in:
Timothy C. McGrath 2004-02-14 11:23:40 +00:00
parent 029ab404b5
commit 9871fa2401
16 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quake/boss.qc
View File

@ -182,6 +182,7 @@ void() boss_death9 = [$death9, boss_death10]
void() boss_death10 = [$death9, boss_death10]
{
killed_monsters++;
killed_monsters_oldcount++;
WriteByte (MSG_ALL, SVC_KILLEDMONSTER); // FIXME: reliable broadcast
SUB_UseTargets ();
remove (self);

7
quake/combat.qc
View File

@ -56,7 +56,6 @@ Killed
void(entity targ, entity attacker) Killed =
{
local entity oself;
oself = self;
self = targ;
@ -75,8 +74,10 @@ void(entity targ, entity attacker) Killed =
// bump the monster counter
if (self.flags & FL_MONSTER)
{
killed_monsters = killed_monsters + 1;
WriteByte (MSG_ALL, SVC_KILLEDMONSTER);
while (killed_monsters_oldcount < killed_monsters) {
killed_monsters_oldcount++;
WriteByte (MSG_ALL, SVC_KILLEDMONSTER);
}
}
ClientObituary(self, attacker);

1
quake/defs.qc
View File

@ -38,6 +38,7 @@ float total_monsters;
float found_secrets; // number of secrets found
float killed_monsters; // number of monsters killed
float killed_monsters_oldcount;//number of monsters killed in last sweep.
float respawn_enabled; // is respawn allowed
// spawnparms are used to encode information about clients across server

5
quake/demon.qc
View File

@ -160,10 +160,15 @@ void() demon_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib1.mdl", self.health);
killed_monsters++;
return;
}
// regular death
if (!respawn_enabled)
killed_monsters++;
demon1_die1 ();
};

4
quake/dog.qc
View File

@ -236,6 +236,7 @@ void() dog_die =
ThrowGib ("progs/gib3.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
ThrowHead ("progs/h_dog.mdl", self.health);
killed_monsters++;
return;
}
@ -243,6 +244,9 @@ void() dog_die =
sound (self, CHAN_VOICE, "dog/ddeath.wav", 1, ATTN_NORM);
self.solid = SOLID_NOT;
if (!respawn_enabled)
killed_monsters++;
if (random() > 0.5)
dog_die1 ();
else

4
quake/enforcer.qc
View File

@ -278,11 +278,15 @@ void() enf_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
// regular death
sound (self, CHAN_VOICE, "enforcer/death1.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
if (random() > 0.5)
enf_die1 ();
else

4
quake/fish.qc
View File

@ -140,10 +140,14 @@ void () f_death =
ThrowGib ("progs/gib3.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
remove (self);
return;
}
if (!respawn_enabled)
killed_monsters++;
f_death1 ();
};

5
quake/hknight.qc
View File

@ -207,11 +207,16 @@ void() hknight_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
// regular death
sound (self, CHAN_VOICE, "hknight/death1.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
if (random() > 0.5)
hknight_die1 ();
else

5
quake/knight.qc
View File

@ -220,11 +220,16 @@ void() knight_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
// regular death
sound (self, CHAN_VOICE, "knight/kdeath.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
if (random() < 0.5)
knight_die1 ();
else

6
quake/ogre.qc
View File

@ -398,11 +398,15 @@ void() ogre_die =
ThrowGib ("progs/gib3.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
sound (self, CHAN_VOICE, "ogre/ogdth.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
if (random() < 0.5)
ogre_die1 ();
else

5
quake/shalrath.qc
View File

@ -108,10 +108,15 @@ void() shalrath_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
sound (self, CHAN_VOICE, "shalrath/death.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
shal_death1 ();
self.solid = SOLID_NOT;
// insert death sounds here

5
quake/shambler.qc
View File

@ -313,11 +313,16 @@ void() sham_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
// regular death
sound (self, CHAN_VOICE, "shambler/sdeath.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
sham_death1 ();
};

5
quake/soldier.qc
View File

@ -230,11 +230,16 @@ void() army_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
return;
}
// regular death
sound (self, CHAN_VOICE, "soldier/death1.wav", 1, ATTN_NORM);
if (!respawn_enabled)
killed_monsters++;
if (random() < 0.5)
army_die1 ();
else

6
quake/tarbaby.qc
View File

@ -156,9 +156,9 @@ void() tbaby_jump6 =[ $jump6,tbaby_fly1 ] {};
void() tbaby_die1 =[ $exp, tbaby_die2 ] {
self.takedamage = DAMAGE_NO;
killed_monsters++;
};
void() tbaby_die2 =[ $exp, tbaby_run1 ]
{
void() tbaby_die2 =[ $exp, tbaby_run1 ] {
T_RadiusDamage (self, self, 120, world);
sound (self, CHAN_VOICE, "blob/death1.wav", 1, ATTN_NORM);
@ -166,7 +166,7 @@ void() tbaby_die2 =[ $exp, tbaby_run1 ]
WriteBytes (MSG_BROADCAST, SVC_TEMPENTITY, TE_TAREXPLOSION);
WriteCoordV (MSG_BROADCAST, self.origin);
BecomeExplosion ();
};

4
quake/wizard.qc
View File

@ -348,9 +348,13 @@ void() wiz_die =
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
killed_monsters++;
return;
}
if (!respawn_enabled)
killed_monsters++;
wiz_death1 ();
};

1
quake/zombie.qc
View File

@ -391,6 +391,7 @@ void() zombie_die =
ThrowGib ("progs/gib1.mdl", self.health);
ThrowGib ("progs/gib2.mdl", self.health);
ThrowGib ("progs/gib3.mdl", self.health);
killed_monsters++;
};
/*