Fixed some problems.

This commit is contained in:
onpon4 2015-03-07 15:34:47 -05:00
parent 75022395cc
commit 4b3cb9c1d3
6 changed files with 18 additions and 11 deletions

View File

@ -417,16 +417,14 @@ void alien_setAI(object *alien)
void alien_setKlineAttackMethod(object *alien) void alien_setKlineAttackMethod(object *alien)
{ {
alien->maxShield -= 750; alien->maxShield -= 750;
if (alien->maxShield == 0)
alien->flags &= ~FL_CANNOTDIE;
if (alien->maxShield == 1500) if (alien->maxShield >= 1500)
{ {
setRadioMessage(FACE_KLINE, "Very good, Bainfield. Now let's get a little more serious...", 1); setRadioMessage(FACE_KLINE, "Very good, Bainfield. Now let's get a little more serious...", 1);
alien->weaponType[0] = W_SPREADSHOT; alien->weaponType[0] = W_SPREADSHOT;
alien->chance[1] = 40; alien->chance[1] = 40;
} }
else if (alien->maxShield == 750) else if (alien->maxShield >= 750)
{ {
setRadioMessage(FACE_KLINE, "Your ability to stay alive irritates me!! Try dodging some of these!!", 1); setRadioMessage(FACE_KLINE, "Your ability to stay alive irritates me!! Try dodging some of these!!", 1);
alien->weaponType[0] = W_DIRSHOCKMISSILE; alien->weaponType[0] = W_DIRSHOCKMISSILE;
@ -435,7 +433,7 @@ void alien_setKlineAttackMethod(object *alien)
alien->chance[1] = 2; alien->chance[1] = 2;
alien->flags |= FL_AIMS; alien->flags |= FL_AIMS;
} }
else if (alien->maxShield == 0) else
{ {
setRadioMessage(FACE_KLINE, "ENOUGH!! THIS ENDS NOW!!!", 1); setRadioMessage(FACE_KLINE, "ENOUGH!! THIS ENDS NOW!!!", 1);
alien->weaponType[0] = W_AIMED_SHOT; alien->weaponType[0] = W_AIMED_SHOT;
@ -443,6 +441,7 @@ void alien_setKlineAttackMethod(object *alien)
alien->flags |= FL_CANCLOAK; alien->flags |= FL_CANCLOAK;
alien->chance[0] = 100; alien->chance[0] = 100;
alien->chance[1] = 2; alien->chance[1] = 2;
alien->flags &= ~FL_CANNOTDIE;
} }
alien->shield = 750; alien->shield = 750;

View File

@ -363,7 +363,7 @@ static void alien_destroy(object *alien, object *attacker)
{ {
setRadioMessage(FACE_KLINE, "It was an honor... to have fought you...", 1); setRadioMessage(FACE_KLINE, "It was an honor... to have fought you...", 1);
alien->dx = alien->dy = 0; alien->dx = alien->dy = 0;
alien->maxShield = 1500; alien->maxShield = 2250;
alien->shield = -200; alien->shield = -200;
} }
} }

View File

@ -395,8 +395,8 @@ int mainGameLoop()
aliens[WC_KLINE].y = screen->h * 2 / 3; aliens[WC_KLINE].y = screen->h * 2 / 3;
aliens[WC_KLINE].deathCounter = -250; aliens[WC_KLINE].deathCounter = -250;
aliens[WC_KLINE].maxShield = 1500; aliens[WC_KLINE].maxShield = 2250;
aliens[WC_KLINE].shield = 500; aliens[WC_KLINE].shield = 750;
} }
for (int i = 0 ; i < MAX_ALIENS ; i++) for (int i = 0 ; i < MAX_ALIENS ; i++)

View File

@ -135,8 +135,8 @@ void getKillMessage(object *ally)
const char *getKlineInsult() const char *getKlineInsult()
{ {
static const char *insult[] = { static const char *insult[] = {
"Pathetic", "How very disappointing...", "Heroic. And stupid", "Fool", "Pathetic.", "How very disappointing...", "Heroic. And stupid.", "Fool.",
"And now you're nothing but a DEAD hero" "And now you're nothing but a DEAD hero."
}; };
if (currentGame.area != 26) if (currentGame.area != 26)

View File

@ -48,7 +48,9 @@ void loadScriptEvents()
gameEvent[i].flag = 0; gameEvent[i].flag = 0;
} }
if ((currentGame.area == 27) && (aliens[WC_KLINE].classDef == CD_KLINE)) if ((currentGame.area == MAX_MISSIONS - 1) &&
(aliens[WC_KLINE].classDef == CD_KLINE) &&
(aliens[WC_KLINE].active))
setKlineGreeting(); setKlineGreeting();
char filename[255]; char filename[255];

View File

@ -113,6 +113,12 @@ static void adjustShopPrices()
if (currentGame.minPlasmaRate >= currentGame.minPlasmaRateLimit) if (currentGame.minPlasmaRate >= currentGame.minPlasmaRateLimit)
shopItems[SHOP_PLASMA_MIN_RATE].price = 0; shopItems[SHOP_PLASMA_MIN_RATE].price = 0;
if (currentGame.maxPlasmaAmmo >= currentGame.maxPlasmaAmmoLimit)
shopItems[SHOP_PLASMA_MAX_AMMO].price = 0;
if (currentGame.maxRocketAmmo >= currentGame.maxRocketAmmoLimit)
shopItems[SHOP_ROCKET_MAX_AMMO].price = 0;
} }
static void drawShop() static void drawShop()