Added simpler kill messages for Phoebe and Ursula.

This commit is contained in:
onpon4 2016-11-17 22:36:53 -05:00
parent 3987ffc9b1
commit 3c6c41ee49
2 changed files with 45 additions and 102 deletions

View File

@ -34,7 +34,39 @@ static const char *chrisKillMessage[] = {
"What's the matter, WEAPCO? Can't keep up?",
"I eat robots like you for breakfast!",
"Target destroyed!",
"Bring it on, WEAPCO!"
"Bring it on, WEAPCO!",
"I wish the guys back at home could see this!",
"How do you like that, WEAPCO?",
"Maybe you should change your name to WEEPCO!"
};
static const char *phoebeKillMessage[] = {
"I got another one!",
"Target destroyed!",
"One more for me!",
"Yes! Did you see that, Chris?",
"Hey Chris, remind me to check my kill count later!",
"Bring it on, WEAPCO!",
"Take that, WEAPCO!",
"My kill count is going up!",
"Another one bites the dust!",
"We're such a great team!",
"I got it!"
};
static const char *ursulaKillMessage[] = {
"Kicked your ass!",
"You ain't so tough!",
"I was always a better WEAPCO pilot than you!",
"Target destroyed!",
"That'll teach you!",
"Take that, you cruddy robots!",
"Is that all you've got?",
"Who else wants some?!",
"Dammit, I'm not letting you beat me, Phoebe!",
"Bring it on, you mindless drones!",
"Oh, I'm sorry, are you getting your metal asses handed to you?",
"No one messes with the Lexx family!",
"Die, damned WEAPCO drones!",
"Don't think you can get away from me!"
};
/*
@ -1731,32 +1763,34 @@ void alien_destroy(object *alien, object *attacker)
if (attacker == &player)
{
game.totalKills++;
if (((rand() % 8) == 0) && (alien-> flags & FL_WEAPCO))
if (((rand() % 16) == 0) && (alien-> flags & FL_WEAPCO))
{
r = rand() % 12;
r = rand() % 15;
setRadioMessage(FS_CHRIS, chrisKillMessage[r], 0);
}
}
else if (attacker->classDef == CD_PHOEBE)
{
game.wingMate1Kills++;
if (((rand() % 8) == 0) && (alien-> flags & FL_WEAPCO))
{
r = rand() % 11;
setRadioMessage(FS_PHOEBE, phoebeKillMessage[r], 0);
}
}
else if (attacker->classDef == CD_URSULA)
{
game.wingMate2Kills++;
if (((rand() % 8) == 0) && (alien-> flags & FL_WEAPCO))
{
r = rand() % 14;
setRadioMessage(FS_URSULA, ursulaKillMessage[r], 0);
}
}
else
{
game.totalOtherKills++;
}
if ((attacker->classDef == CD_PHOEBE) || (attacker->classDef == CD_URSULA))
{
if ((rand() % 8) == 0)
{
getKillMessage(attacker);
}
}
}
updateMissionRequirements(M_DESTROY_TARGET_TYPE, alien->classDef, 1);

View File

@ -28,22 +28,6 @@ static const char *deathMessage[6] = {
"Chriiiiiiiiiiiiiiiiiiiiiiiiiiis!!!!",
};
static const char *killMessage[10] = {
"Chalk another one up for me!",
"That'll teach you!",
"One more for me!",
"Target destroyed!",
"You ain't so tough!",
"Kicked your ass!",
"That takes me up to %d",
"Hey %s, you asleep over there?!",
"I'm catching up with you, %s!",
"Number one, baby!",
};
static const char *missFireMessage[5] = {
"I am NOT your enemy!",
"Hey! Watch it!",
@ -58,81 +42,6 @@ static const char *playerHitMessage[3] = {
"Don't fly into my missiles!",
};
void getKillMessage(object *ally)
{
char in[50], otherName[30];
int kills, difference;
bool firstPlace = false;
int faceToUse = FS_PHOEBE;
if (ally == &aliens[ALIEN_PHOEBE])
{
strcpy(otherName, "Ursula");
kills = game.wingMate1Kills;
difference = game.wingMate1Kills - game.wingMate2Kills;
if ((game.wingMate1Kills > game.wingMate2Kills) &&
(game.wingMate1Kills > game.totalKills))
firstPlace = true;
faceToUse = FS_PHOEBE;
}
else
{
strcpy(otherName, "Phoebe");
kills = game.wingMate2Kills;
difference = game.wingMate2Kills - game.wingMate1Kills;
if ((game.wingMate2Kills > game.wingMate1Kills) &&
(game.wingMate2Kills > game.totalKills))
firstPlace = true;
faceToUse = FS_URSULA;
}
int r = rand() % 10;
if (game.hasWingMate2 == 0)
r = rand() % 7;
switch(r)
{
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
strcpy(in, killMessage[rand() % 6]);
break;
case 6:
case 7:
sprintf(in, killMessage[6], kills);
break;
case 8:
if (difference > 0)
{
sprintf(in, killMessage[7], otherName);
}
else
{
sprintf(in, killMessage[8], otherName);
}
break;
case 9:
if (firstPlace)
{
strcpy(in, killMessage[9]);
}
else
{
strcpy(in, killMessage[rand() % 6]);
}
break;
}
setRadioMessage(faceToUse, in, 0);
}
const char *getKlineInsult()
{
static const char *insult[] = {