@@ -350,6 +350,15 @@ To start challenge mission, click on the numbered mission box and then click on
+
Trophies
+
+The Pandoran War offers an optional achievement award system, in the form of trophies. Trophies are earned through various gameplay actions, such as completing missions, defeating enemies, and racking up stats. Earned and available trophies can be viewed in the menu from the title screen, the galactic map, and the challenges menu. A notification will be shown when a trophy is unlocked, sliding in from the left-hand side of the screen. So as not to interupt the game, potentially spoiling a hard-fought mission, notifications are only shown at certain points during the game.
+
+
+
+Note that this is not an online system, and is local to the machine on which the game is saved.
+
+
Misc. gameplay details
Shuttles
@@ -398,20 +407,40 @@ To change a control, click on the box and then press the key or mouse button you
Controls be can restored to their default settings by clicking the "Restore Defaults" button.
+
Gameplay settings
+
+Some minor gameplay settings can be tweaked in the config.json save file:
+
+
+
+- friendlyFire - whether friendly fire between craft of the same side is allowed. 0, Off. 1 On. Default is 0 (off).
+ - autoSwitchPlayerTarget - whether the player's enemy targeter should automatically switch if the target goes out of a range. 0, Off. 1 On. Default is 1 (on).
+ - missileReTarget - whether missiles should select a new target if their current one is destroyed. Note that missiles will only make one attempt to do so, before automatically self-destructing. 0, Off, 1 On. Default is 0 (off).
+ - healthBars - whether or not to show health bars above fighters and other units, in game. 0, Off. 1 On. Default is 1 (on).
+
+
+
+To alter a gameplay element, update the setting and restart the game. It is not recommended that you fiddle with these settings unless you are comfortable editing such files, as it could result in the loss of data or the game not working properly.
+
+
Misc. Information
-Saved game files are stored in:
+The Pandoran War creates two save game files when run, config.json and game.save. Both files are human-readable and saved in JSON format. The files are stored in:
+
- Linux: $HOME/.local/share/tbftss
- Windows: $USERPROFILE/tbftss
-Note that as the source code for this game is freely available, these settings may have been changed. Typically on Windows $USERPROFILE is C:/Users/<userid>.
+
+Note that as the source code for this game is freely available, these settings may have been changed.
+
+
+$HOME on Linux will be /home/<userId>, where userId is your login username. Typically on Windows, $USERPROFILE is C:/Users/<userId>, where userId is your Windows login.
License
-
-See the LICENSE and README.md files that came with this game for information on the various copyrights of the source code, graphics, sound, and data. Additionally, you may visit https://github.com/stephenjsweeney/tbftss to get the source code itself, and view the files there.
+Please refer to the LICENSE and README.md files that came with this game for information on the various copyrights of the source code, graphics, sound, and data. Additionally, you may visit https://github.com/stephenjsweeney/tbftss to get the source code itself, and view the files there.
About
diff --git a/manual/logo.png b/manual/logo.png
index 0d4d40e..2cb8112 100644
Binary files a/manual/logo.png and b/manual/logo.png differ
diff --git a/manual/trophies.png b/manual/trophies.png
new file mode 100644
index 0000000..d976a66
Binary files /dev/null and b/manual/trophies.png differ
diff --git a/music/battle/track-1.mp3 b/music/battle/track-1.mp3
deleted file mode 100644
index f5aa62e..0000000
Binary files a/music/battle/track-1.mp3 and /dev/null differ
diff --git a/src/battle/ai.c b/src/battle/ai.c
index 8b46cf0..ff6e7a0 100644
--- a/src/battle/ai.c
+++ b/src/battle/ai.c
@@ -148,7 +148,7 @@ static void doFighterAI(void)
self->target = NULL;
}
- if (!self->target || self->target->systemPower <= 0)
+ if (!self->target || (self->target->systemPower <= 0 && (self->target->flags & EF_MUST_DISABLE)))
{
findTarget();
@@ -159,7 +159,7 @@ static void doFighterAI(void)
{
if (!lookForLeader())
{
- if (self->aiFlags & AIF_MOVES_TO_PLAYER && player != NULL)
+ if (self->aiFlags & AIF_MOVES_TO_PLAYER && player->alive == ALIVE_ALIVE)
{
moveToPlayer();
}
@@ -173,7 +173,7 @@ static void doFighterAI(void)
{
doWander();
}
- else if (self->aiFlags & AIF_MOVES_TO_PLAYER && player != NULL)
+ else if (self->aiFlags & AIF_MOVES_TO_PLAYER && player->alive == ALIVE_ALIVE)
{
moveToPlayer();
}
@@ -194,7 +194,8 @@ static void doFighterAI(void)
return;
}
- r = rand() % 100;
+ /* if your target is disabled, just shoot it..! */
+ r = (self->target->flags & EF_DISABLED) ? 100 : rand() % 100;
if (r <= getActionChance(AI_EVADE))
{
@@ -311,9 +312,9 @@ static void findTarget(void)
Entity *e, **candidates;
unsigned int dist, closest;
- dist = closest = (battle.isEpic || (self->aiFlags & AIF_UNLIMITED_RANGE)) ? MAX_TARGET_RANGE : 1000;
+ dist = closest = (battle.isEpic || (self->aiFlags & AIF_UNLIMITED_RANGE)) ? MAX_TARGET_RANGE : SCREEN_WIDTH;
- candidates = getAllEntsWithin(self->x - (self->w / 2) - dist, self->y - (self->h / 2) - dist, self->w + (dist * 2), self->h + (dist * 2), self);
+ candidates = getAllEntsInRadius(self->x, self->y, dist, self);
self->target = NULL;
@@ -344,18 +345,26 @@ static int canAttack(Entity *e)
return 0;
}
- if (!(e->flags & EF_AI_TARGET))
+ if (!(self->aiFlags & AIF_ASSASSIN))
{
- if (e->aiFlags & (AIF_AVOIDS_COMBAT | AIF_EVADE) || e->flags & EF_SECONDARY_TARGET)
+ if (e->flags & EF_MUST_DISABLE)
{
- return !(rand() % 5);
+ return e->systemPower > 0;
+ }
+
+ if (!(e->flags & EF_AI_TARGET))
+ {
+ if (e->aiFlags & (AIF_AVOIDS_COMBAT | AIF_EVADE) || e->flags & EF_SECONDARY_TARGET)
+ {
+ return !(rand() % 5);
+ }
+ }
+
+ /* low chance of attacking something else */
+ if ((self->aiFlags & AIF_TARGET_FOCUS) && (!(e->flags & EF_AI_TARGET)))
+ {
+ return !(rand() % 100);
}
- }
-
- /* low chance of attacking something else */
- if ((self->aiFlags & AIF_TARGET_FOCUS) && (!(e->flags & EF_AI_TARGET)))
- {
- return !(rand() % 100);
}
return 1;
@@ -370,12 +379,7 @@ static int selectWeaponForTarget(Entity *e)
{
if (e->flags & EF_MUST_DISABLE)
{
- if (e->systemPower > 0)
- {
- return selectWeapon(BT_MAG);
- }
-
- return 0;
+ return selectWeapon(BT_MAG);
}
if (e->flags & EF_NO_KILL)
@@ -482,7 +486,7 @@ static void preAttack(void)
{
fireGuns(self);
}
- else if (self->missiles && (!(self->target->flags & EF_NO_KILL)) && getDistance(self->x, self->y, self->target->x, self->target->y) >= 350)
+ else if (self->missiles && (!(self->target->flags & (EF_NO_KILL|EF_MUST_DISABLE))) && getDistance(self->x, self->y, self->target->x, self->target->y) >= 350)
{
fireMissile(self);
@@ -584,7 +588,7 @@ static int nearEnemies(void)
int i, numEnemies, x, y;
Entity *e, **candidates;
- candidates = getAllEntsWithin(self->x - 500, self->y - 500, 1000, 1000, self);
+ candidates = getAllEntsInRadius(self->x, self->y, SCREEN_WIDTH, self);
self->target = NULL;
x = y = 0;
@@ -600,7 +604,7 @@ static int nearEnemies(void)
continue;
}
- if (getDistance(e->x, e->y, self->x, self->y) < 1000)
+ if (getDistance(e->x, e->y, self->x, self->y) <= SCREEN_WIDTH)
{
x += e->x;
y += e->y;
@@ -654,7 +658,7 @@ static int nearMines(void)
int i, numMines;
Entity *e, **candidates;
- candidates = getAllEntsWithin(self->x - 500, self->y - 500, 1000, 1000, self);
+ candidates = getAllEntsInRadius(self->x, self->y, SCREEN_HEIGHT, self);
self->targetLocation.x = self->targetLocation.y = 0;
@@ -662,7 +666,7 @@ static int nearMines(void)
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
- if (e->side != self->side && e->type == ET_MINE && getDistance(e->x, e->y, self->x, self->y) < 500)
+ if (e->side != self->side && e->type == ET_MINE && getDistance(e->x, e->y, self->x, self->y) <= SCREEN_HEIGHT)
{
self->targetLocation.x += e->x;
self->targetLocation.y += e->y;
@@ -701,22 +705,18 @@ static void moveToPlayer(void)
{
int wantedAngle;
int dist = getDistance(self->x, self->y, player->x, player->y);
- float oldSpeed;
if (dist <= 250)
{
- wantedAngle = getAngle(player->x, player->y, player->x + (player->dx * 1000), player->y + (player->dy * 1000));
-
- turnToFace(wantedAngle);
-
if (player->thrust > 0.1)
{
- if (self->speed > player->speed)
+ wantedAngle = getAngle(player->x, player->y, player->x + (player->dx * 1000), player->y + (player->dy * 1000));
+
+ turnToFace(wantedAngle);
+
+ if (self->thrust > player->thrust)
{
- oldSpeed = self->speed;
- self->speed = sqrt(player->thrust);
- applyFighterThrust();
- self->speed = oldSpeed;
+ applyFighterBrakes();
}
else
{
@@ -759,6 +759,8 @@ static int nearJumpgate(void)
static void moveToJumpgate(void)
{
+ self->target = battle.jumpgate;
+
faceTarget(self->target);
applyFighterThrust();
@@ -774,7 +776,7 @@ static int nearItems(void)
closest = MAX_TARGET_RANGE;
- candidates = getAllEntsWithin(self->x - (self->w / 2) - (SCREEN_WIDTH / 4), self->y - (self->h / 2) - (SCREEN_HEIGHT / 4), SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, self);
+ candidates = getAllEntsInRadius(self->x, self->y, SCREEN_WIDTH / 2, self);
self->target = NULL;
@@ -822,7 +824,7 @@ static int nearTowableCraft(void)
dist = closest = (battle.isEpic || (self->aiFlags & AIF_UNLIMITED_RANGE)) ? MAX_TARGET_RANGE : 2000;
- candidates = getAllEntsWithin(self->x - (self->w / 2) - dist, self->y - (self->h / 2) - dist, self->w + (dist * 2), self->h + (dist * 2), self);
+ candidates = getAllEntsInRadius(self->x, self->y, dist, self);
self->target = NULL;
@@ -862,7 +864,7 @@ static int lookForPlayer(void)
{
int range = (self->aiFlags & AIF_MOVES_TO_PLAYER) ? MAX_TARGET_RANGE : 2000;
- if (player != NULL && getDistance(self->x, self->y, player->x, player->y) < range)
+ if (player->alive == ALIVE_ALIVE && getDistance(self->x, self->y, player->x, player->y) < range)
{
moveToPlayer();
return 1;
@@ -908,7 +910,6 @@ static void moveToLeader(void)
{
int wantedAngle;
int dist = getDistance(self->x, self->y, self->leader->x, self->leader->y);
- float oldSpeed;
if (dist <= ((self->leader->type != ET_CAPITAL_SHIP) ? 350 : 550))
{
@@ -918,12 +919,9 @@ static void moveToLeader(void)
turnToFace(wantedAngle);
- if (self->speed > self->leader->speed)
+ if (self->thrust > self->leader->thrust)
{
- oldSpeed = self->speed;
- self->speed = sqrt(self->leader->thrust);
- applyFighterThrust();
- self->speed = oldSpeed;
+ applyFighterBrakes();
}
else
{
diff --git a/src/battle/ai.h b/src/battle/ai.h
index 28823bb..202f8ed 100644
--- a/src/battle/ai.h
+++ b/src/battle/ai.h
@@ -36,7 +36,7 @@ extern float getAngle(int x1, int y1, int x2, int y2);
extern void applyFighterThrust(void);
extern void applyFighterBrakes(void);
extern void addHudMessage(SDL_Color c, char *format, ...);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern char *getTranslatedString(char *string);
extern Entity *spawnMine(int type);
diff --git a/src/battle/battle.c b/src/battle/battle.c
index 6e67df6..f9c43d7 100644
--- a/src/battle/battle.c
+++ b/src/battle/battle.c
@@ -110,6 +110,11 @@ static void logic(void)
doPlayerSelect();
}
}
+
+ if (battle.status != MS_IN_PROGRESS && battle.missionFinishedTimer <= -FPS * 2)
+ {
+ doTrophyAlerts();
+ }
}
doWidgets();
@@ -117,7 +122,7 @@ static void logic(void)
static void doBattle(void)
{
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
ssx = player->dx;
ssy = player->dy;
@@ -150,7 +155,7 @@ static void doBattle(void)
doPlayer();
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
doSpawners();
@@ -177,21 +182,21 @@ static void doBattle(void)
if (battle.status != MS_IN_PROGRESS)
{
battle.missionFinishedTimer--;
- }
+
+ if (battle.unwinnable && battle.missionFinishedTimer <= -FPS * 6)
+ {
+ postBattle();
- if (battle.unwinnable && battle.missionFinishedTimer <= -FPS * 6)
- {
- postBattle();
+ destroyBattle();
- destroyBattle();
-
- initGalacticMap();
+ initGalacticMap();
+ }
}
}
static void draw(void)
{
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
battle.camera.x = player->x - (SCREEN_WIDTH / 2);
battle.camera.y = player->y - (SCREEN_HEIGHT / 2);
@@ -218,7 +223,7 @@ static void draw(void)
drawHud();
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
drawMessageBox();
}
@@ -235,6 +240,11 @@ static void draw(void)
drawOptions();
break;
}
+
+ if (battle.status != MS_IN_PROGRESS && battle.status != MS_PAUSED && battle.missionFinishedTimer <= -FPS * 2)
+ {
+ drawTrophyAlert();
+ }
}
static void drawMenu(void)
@@ -373,21 +383,14 @@ static void postBattle(void)
game.stats[i] += battle.stats[i];
}
}
+
+ game.stats[STAT_EPIC_KILL_STREAK] = MAX(game.stats[STAT_EPIC_KILL_STREAK], battle.stats[STAT_EPIC_KILL_STREAK]);
updateAccuracyStats(game.stats);
-
- if (!game.currentMission->challengeData.isChallenge)
- {
- if (game.currentMission && !game.currentMission->completed)
- {
- game.currentMission->completed = (battle.status == MS_COMPLETE || !battle.numObjectivesTotal);
-
- if (game.currentMission->completed)
- {
- awardPostMissionTrophies();
- }
- }
- }
+
+ game.currentMission->completed = (battle.status == MS_COMPLETE || !battle.numObjectivesTotal);
+
+ app.saveGame = 1;
}
void destroyBattle(void)
diff --git a/src/battle/battle.h b/src/battle/battle.h
index 96bfbb6..855d871 100644
--- a/src/battle/battle.h
+++ b/src/battle/battle.h
@@ -85,7 +85,8 @@ extern void updateAccuracyStats(unsigned int *stats);
extern void clearInput(void);
extern void runScriptFunction(const char *format, ...);
extern void doSpawners(void);
-extern void awardPostMissionTrophies(void);
+extern void doTrophyAlerts(void);
+extern void drawTrophyAlert(void);
extern App app;
extern Battle battle;
diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index b080181..9fa27e1 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static void huntTarget(Bullet *b);
static void checkCollisions(Bullet *b);
static void resizeDrawList(void);
+static void selectNewTarget(Bullet *b);
static Bullet bulletDef[BT_MAX];
static Bullet **bulletsToDraw;
@@ -93,9 +94,12 @@ void doBullets(void)
{
addMissileEngineEffect(b);
- huntTarget(b);
+ if (b->life < MISSILE_LIFE - (FPS / 4))
+ {
+ huntTarget(b);
+ }
- if (b->target == player && player != NULL && player->health > 0)
+ if (b->target == player && player->alive == ALIVE_ALIVE && player->health > 0)
{
incomingMissile = 1;
}
@@ -105,11 +109,6 @@ void doBullets(void)
if (--b->life <= 0)
{
- if (player != NULL && player->alive == ALIVE_ALIVE && b->type == BT_MISSILE && b->damage > 0 && b->target == player)
- {
- battle.stats[STAT_MISSILES_EVADED]++;
- }
-
if (b == battle.bulletTail)
{
battle.bulletTail = prev;
@@ -167,7 +166,7 @@ static void checkCollisions(Bullet *b)
if (b->owner != e && e->health > 0 && collision(b->x - b->w / 2, b->y - b->h / 2, b->w, b->h, e->x - e->w / 2, e->y - e->h / 2, e->w, e->h))
{
- if (b->owner->side == e->side)
+ if (b->owner->side == e->side && !app.gameplay.friendlyFire && (!(e->flags & EF_DISABLED)) && e->type != ET_MINE)
{
b->damage = 0;
}
@@ -203,15 +202,28 @@ static void checkCollisions(Bullet *b)
battle.stats[STAT_MISSILES_STRUCK]++;
}
}
-
+
+ /* missile was targetting player, but hit something else */
+ if (b->type == BT_MISSILE && b->target == player && e != player)
+ {
+ battle.stats[STAT_MISSILES_EVADED]++;
+ }
+
/* assuming that health <= 0 will always mean killed */
if (e->health <= 0)
{
e->killedBy = b->owner;
- if (b->type == BT_MISSILE && e == player && b->target != player)
+ if (b->type == BT_MISSILE && b->target != e)
{
- awardTrophy("TEAM_PLAYER");
+ if (e == player)
+ {
+ awardTrophy("TEAM_PLAYER");
+ }
+ else if (b->owner == player && (e->aiFlags & AIF_MOVES_TO_LEADER) && (b->target->flags & EF_AI_LEADER))
+ {
+ awardTrophy("BODYGUARD");
+ }
}
}
@@ -244,22 +256,34 @@ void drawBullets(void)
static void faceTarget(Bullet *b)
{
- int dir;
- int wantedAngle = getAngle(b->x, b->y, b->target->x, b->target->y);
-
- wantedAngle %= 360;
+ int dir, wantedAngle, dist;
+
+ wantedAngle = (int)getAngle(b->x, b->y, b->target->x, b->target->y) % 360;
if (fabs(wantedAngle - b->angle) > TURN_THRESHOLD)
{
dir = (wantedAngle - b->angle + 360) % 360 > 180 ? -1 : 1;
b->angle += dir * TURN_SPEED;
+
+ dist = getDistance(b->x, b->y, b->target->x, b->target->y);
+
+ if (dist < 250)
+ {
+ dist = 250 - dist;
+
+ while (dist > 0)
+ {
+ b->angle += dir;
+
+ dist -= 50;
+ }
+ }
b->angle = mod(b->angle, 360);
-
- /* lower your speed while you're not at the correct angle */
- b->dx *= 0.38;
- b->dy *= 0.38;
+
+ b->dx *= 0.5;
+ b->dy *= 0.5;
}
}
@@ -300,10 +324,43 @@ static void huntTarget(Bullet *b)
}
else
{
- b->target = NULL;
+ selectNewTarget(b);
}
}
+static void selectNewTarget(Bullet *b)
+{
+ int i;
+ Entity *e, **candidates;
+
+ if (app.gameplay.missileReTarget)
+ {
+ b->target = NULL;
+
+ candidates = getAllEntsInRadius(b->x, b->y, SCREEN_HEIGHT, NULL);
+
+ for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
+ {
+ if (e->type == ET_FIGHTER && e->side != b->owner->side && e->health > 0)
+ {
+ b->target = e;
+
+ if (b->target == player)
+ {
+ playSound(SND_INCOMING);
+ }
+
+ return;
+ }
+ }
+ }
+
+ /* no target, just explode */
+ b->life = 0;
+ addMissileExplosion(b);
+ playBattleSound(SND_EXPLOSION_1, b->x, b->y);
+}
+
static Bullet *createBullet(int type, int x, int y, Entity *owner)
{
Bullet *b;
@@ -335,10 +392,12 @@ void fireGuns(Entity *owner)
int i;
float x, y;
float c, s;
+
+ b = NULL;
for (i = 0 ; i < MAX_FIGHTER_GUNS ; i++)
{
- if (owner->guns[i].type == owner->selectedGunType || (owner->guns[i].type != BT_NONE && owner->combinedGuns))
+ if (owner->guns[i].type != BT_NONE && (owner->guns[i].type == owner->selectedGunType || owner->combinedGuns))
{
s = sin(TO_RAIDANS(owner->angle));
c = cos(TO_RAIDANS(owner->angle));
@@ -360,7 +419,10 @@ void fireGuns(Entity *owner)
owner->reload = owner->reloadTime;
- playBattleSound(b->sound, owner->x, owner->y);
+ if (b)
+ {
+ playBattleSound(b->sound, owner->x, owner->y);
+ }
}
void fireRocket(Entity *owner)
@@ -384,8 +446,11 @@ void fireMissile(Entity *owner)
Bullet *b;
b = createBullet(BT_MISSILE, owner->x, owner->y, owner);
+
+ b->dx *= 0.5;
+ b->dy *= 0.5;
- b->life = FPS * 30;
+ b->life = MISSILE_LIFE;
owner->missiles--;
@@ -396,7 +461,7 @@ void fireMissile(Entity *owner)
playBattleSound(b->sound, owner->x, owner->y);
- if (owner->target == player)
+ if (b->target == player)
{
playSound(SND_INCOMING);
}
diff --git a/src/battle/bullets.h b/src/battle/bullets.h
index 2ea155f..a7868d7 100644
--- a/src/battle/bullets.h
+++ b/src/battle/bullets.h
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TURN_THRESHOLD 3
#define INITIAL_BULLET_DRAW_CAPACITY 32
+#define MISSILE_LIFE (FPS * 30)
+
extern SDL_Texture *getTexture(char *filename);
extern void blitRotated(SDL_Texture *texture, int x, int y, float angle);
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
@@ -39,13 +41,16 @@ extern void addMissileEngineEffect(Bullet *b);
extern float mod(float n, float x);
extern void addMissileExplosion(Bullet *b);
extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
extern void playSound(int id);
extern char *getTranslatedString(char *string);
extern void *resize(void *array, int oldSize, int newSize);
extern void awardTrophy(char *id);
extern int isOnBattleScreen(int x, int y, int w, int h);
+extern int getDistance(int x1, int y1, int x2, int y2);
+extern App app;
extern Battle battle;
extern Colors colors;
extern Entity *player;
diff --git a/src/battle/capitalShips.c b/src/battle/capitalShips.c
index 126658a..ede669d 100644
--- a/src/battle/capitalShips.c
+++ b/src/battle/capitalShips.c
@@ -33,6 +33,10 @@ static void loadCapitalShipDef(char *filename);
static void loadComponents(Entity *parent, cJSON *components);
static void loadGuns(Entity *parent, cJSON *guns);
static void loadEngines(Entity *parent, cJSON *engines);
+static void disable(void);
+static void issueEnginesDestroyedMessage(Entity *cap);
+static void issueGunsDestroyedMessage(Entity *cap);
+static void issueDamageMessage(Entity *cap);
static Entity defHead, *defTail;
@@ -93,7 +97,7 @@ void doCapitalShip(void)
battle.missionTarget = NULL;
}
- if (self->side == SIDE_ALLIES)
+ if (self->side != player->side)
{
battle.stats[STAT_CAPITAL_SHIPS_LOST]++;
@@ -105,6 +109,8 @@ void doCapitalShip(void)
runScriptFunction("CAPITAL_SHIPS_DESTROYED %d", battle.stats[STAT_CAPITAL_SHIPS_DESTROYED]);
}
+
+ runScriptFunction(self->name);
}
}
}
@@ -187,7 +193,7 @@ static int steer(void)
count = 0;
force = 0;
- candidates = getAllEntsWithin(self->x - 1000, self->y - 1000, 2000, 2000, self);
+ candidates = getAllEntsInRadius(self->x, self->y, 2000, self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
@@ -251,15 +257,42 @@ static void componentDie(void)
if (self->owner->health > 0)
{
runScriptFunction("CAP_HEALTH %s %d", self->owner->name, self->owner->health);
+
+ if (self->side == player->side)
+ {
+ issueDamageMessage(self->owner);
+ }
}
}
static void gunDie(void)
{
+ Entity *e;
+
self->alive = ALIVE_DEAD;
addSmallExplosion();
playBattleSound(SND_EXPLOSION_1 + rand() % 4, self->x, self->y);
addDebris(self->x, self->y, 3 + rand() % 4);
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ {
+ if (e != self && e->health > 0 && e->owner == self->owner && e->type == ET_COMPONENT_GUN)
+ {
+ return;
+ }
+ }
+
+ runScriptFunction("CAP_GUNS_DESTROYED %s", self->owner->name);
+
+ if (self->side == player->side)
+ {
+ issueGunsDestroyedMessage(self->owner);
+ }
+
+ if (--self->owner->systemPower == 1)
+ {
+ disable();
+ }
}
static void engineThink(void)
@@ -280,7 +313,7 @@ static void engineDie(void)
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
- if (e != self && e->owner == self->owner && e->type == ET_COMPONENT_ENGINE)
+ if (e != self && e->health > 0 && e->owner == self->owner && e->type == ET_COMPONENT_ENGINE)
{
return;
}
@@ -294,6 +327,16 @@ static void engineDie(void)
self->owner->dx = self->owner->dy = 0;
runScriptFunction("CAP_ENGINES_DESTROYED %s", self->owner->name);
+
+ if (self->side == player->side)
+ {
+ issueEnginesDestroyedMessage(self->owner);
+ }
+ }
+
+ if (--self->owner->systemPower == 1)
+ {
+ disable();
}
}
@@ -318,8 +361,10 @@ static void die(void)
}
updateObjective(self->name, TT_DESTROY);
+ updateObjective(self->groupName, TT_DESTROY);
updateCondition(self->name, TT_DESTROY);
+ updateCondition(self->groupName, TT_DESTROY);
}
static void handleDisabled(void)
@@ -334,6 +379,25 @@ static void handleDisabled(void)
}
}
+static void disable(void)
+{
+ Entity *e;
+
+ runScriptFunction("CAP_DISABLED %s", self->owner->name);
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ {
+ if (e->owner == self->owner)
+ {
+ e->systemPower = 0;
+ e->flags |= EF_DISABLED;
+ }
+ }
+
+ updateObjective(self->owner->name, TT_DISABLE);
+ updateObjective(self->owner->groupName, TT_DISABLE);
+}
+
void loadCapitalShipDefs(void)
{
char **filenames;
@@ -385,7 +449,8 @@ static void loadCapitalShipDef(char *filename)
e->shieldRechargeRate = cJSON_GetObjectItem(root, "shieldRechargeRate")->valueint;
e->texture = getTexture(cJSON_GetObjectItem(root, "texture")->valuestring);
e->speed = 1;
- e->systemPower = MAX_SYSTEM_POWER;
+ e->systemPower = 3;
+ e->flags = EF_NO_HEALTH_BAR;
e->action = think;
e->die = die;
@@ -561,16 +626,25 @@ void updateCapitalShipComponentProperties(Entity *parent, long flags)
{
Entity *e;
- flags &= ~EF_AI_LEADER;
+ if (flags != -1)
+ {
+ flags &= ~EF_AI_LEADER;
+ }
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
if (e->owner == parent)
{
+ if (flags != -1)
+ {
+ e->flags |= flags;
+ }
+
switch (e->type)
{
case ET_COMPONENT_ENGINE:
sprintf(e->name, _("%s (Engine)"), parent->name);
+ e->flags &= ~EF_AI_IGNORE;
break;
case ET_COMPONENT:
@@ -579,12 +653,15 @@ void updateCapitalShipComponentProperties(Entity *parent, long flags)
case ET_COMPONENT_GUN:
sprintf(e->name, _("%s (Gun)"), parent->name);
+ e->flags &= ~EF_AI_IGNORE;
+ if (parent->aiFlags & AIF_ASSASSIN)
+ {
+ e->aiFlags |= AIF_ASSASSIN;
+ }
break;
}
e->active = parent->active;
-
- e->flags |= flags;
}
}
}
@@ -659,10 +736,10 @@ void loadCapitalShips(cJSON *node)
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN, "Flags for '%s' (%s) replaced", e->name, e->defName);
}
-
- updateCapitalShipComponentProperties(e, flags);
}
+ updateCapitalShipComponentProperties(e, flags);
+
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG, "%s (%d / %d)", e->name, e->health, e->maxHealth);
}
@@ -678,6 +755,32 @@ void loadCapitalShips(cJSON *node)
}
}
+static void issueEnginesDestroyedMessage(Entity *cap)
+{
+ addMessageBox(cap->name, _("We've lost engines! We're a sitting duck!"), 1);
+}
+
+static void issueGunsDestroyedMessage(Entity *cap)
+{
+ addMessageBox(cap->name, _("Our guns have been shot out! We have no defences!"), 1);
+}
+
+static void issueDamageMessage(Entity *cap)
+{
+ if (cap->health == cap->maxHealth - 1)
+ {
+ addMessageBox(cap->name, _("Be advised, we're taking damage here. Please step up support."), 1);
+ }
+ else if (cap->health == cap->maxHealth / 2)
+ {
+ addMessageBox(cap->name, _("We're sustaining heavy damage! All fighters, please assist, ASAP!"), 1);
+ }
+ else if (cap->health == 1)
+ {
+ addMessageBox(cap->name, _("Mayday! Mayday! Defences are critical. We can't hold out much longer!"), 1);
+ }
+}
+
void destroyCapitalShipDefs(void)
{
Entity *e;
diff --git a/src/battle/capitalShips.h b/src/battle/capitalShips.h
index b69ad41..2f232e6 100644
--- a/src/battle/capitalShips.h
+++ b/src/battle/capitalShips.h
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TURN_SPEED 0.1
#define TURN_THRESHOLD 2
-#define AVOID_FORCE 500
-
#include "../common.h"
#include "../json/cJSON.h"
@@ -36,12 +34,10 @@ extern char *readFile(char *filename);
extern long flagsToLong(char *flags, int *add);
extern long lookup(char *name);
extern void doAI(void);
-extern float getAngle(int x1, int y1, int x2, int y2);
-extern float mod(float n, float x);
extern void applyFighterThrust(void);
extern void addLargeEngineEffect(void);
extern int getDistance(int x1, int y1, int x2, int y2);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern void addDebris(int x, int y, int amount);
extern void runScriptFunction(char *format, ...);
extern void updateObjective(char *name, int type);
@@ -52,6 +48,8 @@ extern char *getTranslatedString(char *string);
extern void addLargeExplosion(void);
extern char **toTypeArray(char *types, int *numTypes);
extern void updateCondition(char *name, int type);
+extern void addMessageBox(char *title, char *body, int important);
extern Battle battle;
+extern Entity *player;
extern Entity *self;
diff --git a/src/battle/effects.c b/src/battle/effects.c
index 8a86644..b0f0efb 100644
--- a/src/battle/effects.c
+++ b/src/battle/effects.c
@@ -648,7 +648,10 @@ static void setRandomShieldHue(Effect *e)
void destroyEffects(void)
{
- free(effectsToDraw);
+ if (effectsToDraw)
+ {
+ free(effectsToDraw);
+ }
effectsToDraw = NULL;
}
diff --git a/src/battle/entities.c b/src/battle/entities.c
index 3c0fe86..2c45a53 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static void drawEntity(Entity *e);
static void doEntity(void);
static void alignComponents(void);
-static void activateEpicFighters(int n, int side);
+static void activateEpicFighters(int side);
static void restrictToBattleArea(Entity *e);
static void drawTargetRects(Entity *e);
static void drawHealthBar(Entity *e);
@@ -67,7 +67,7 @@ void doEntities(void)
prev = &battle.entityHead;
- numAllies = numEnemies = numActiveAllies = numActiveEnemies = 0;
+ battle.hasThreats = numAllies = numEnemies = numActiveAllies = numActiveEnemies = numSpawnedEnemies = 0;
if (dev.playerImmortal)
{
@@ -178,8 +178,6 @@ void doEntities(void)
if (e == player)
{
- player = NULL;
-
battle.playerSelect = battle.isEpic;
}
@@ -198,7 +196,7 @@ void doEntities(void)
if (e->type == ET_FIGHTER || e->type == ET_CAPITAL_SHIP)
{
- if (e->side == SIDE_ALLIES)
+ if (e->side == player->side)
{
numAllies++;
@@ -220,6 +218,11 @@ void doEntities(void)
numSpawnedEnemies++;
}
}
+
+ if (e->health > 0 && !(e->flags & EF_DISABLED))
+ {
+ battle.hasThreats = 1;
+ }
}
}
@@ -231,16 +234,16 @@ void doEntities(void)
if (battle.isEpic && battle.stats[STAT_TIME] % FPS == 0)
{
- numActiveEnemies -= numSpawnedEnemies;
-
- if (numAllies > battle.epicFighterLimit)
+ if (numActiveAllies < battle.epicFighterLimit)
{
- activateEpicFighters(battle.epicFighterLimit - numActiveAllies, SIDE_ALLIES);
+ activateEpicFighters(SIDE_ALLIES);
}
+
+ numActiveEnemies -= numSpawnedEnemies;
- if (numEnemies > battle.epicFighterLimit)
+ if (numActiveEnemies < battle.epicFighterLimit)
{
- activateEpicFighters(battle.epicFighterLimit - numActiveEnemies, SIDE_NONE);
+ activateEpicFighters(SIDE_NONE);
}
}
@@ -425,14 +428,14 @@ static void drawHealthBar(Entity *e)
{
SDL_Rect r;
- if (e != player && e->type == ET_FIGHTER && e->health > 0)
+ if (app.gameplay.healthBars && !(e->flags & EF_NO_HEALTH_BAR) && e->health > 0)
{
r.x = e->x - (e->w / 2) - battle.camera.x;
r.y = e->y - e->h - battle.camera.y;
r.w = 32;
r.h = 1;
- if (e->side == SIDE_ALLIES)
+ if (e->side == player->side || e->flags & EF_FRIENDLY_HEALTH_BAR)
{
SDL_SetRenderDrawColor(app.renderer, 0, 128, 0, 255);
}
@@ -445,7 +448,7 @@ static void drawHealthBar(Entity *e)
r.w = 32 * (e->health * 1.0f / e->maxHealth);
- if (e->side == SIDE_ALLIES)
+ if (e->side == player->side || e->flags & EF_FRIENDLY_HEALTH_BAR)
{
SDL_SetRenderDrawColor(app.renderer, 0, 255, 0, 255);
}
@@ -464,7 +467,7 @@ static void drawTargetRects(Entity *e)
int size = MAX(e->w, e->h) + 16;
- if (player != NULL && e == player->target)
+ if (player->alive == ALIVE_ALIVE && e == player->target)
{
r.x = e->x - (size / 2) - battle.camera.x;
r.y = e->y - (size / 2) - battle.camera.y;
@@ -485,6 +488,17 @@ static void drawTargetRects(Entity *e)
SDL_SetRenderDrawColor(app.renderer, 0, 255, 0, 255);
SDL_RenderDrawRect(app.renderer, &r);
}
+
+ if (e == battle.messageSpeaker && e != player && battle.stats[STAT_TIME] % 40 < 20)
+ {
+ r.x = e->x - (size / 2) - battle.camera.x;
+ r.y = e->y - (size / 2) - battle.camera.y;
+ r.w = size;
+ r.h = size;
+
+ SDL_SetRenderDrawColor(app.renderer, 255, 255, 255, 255);
+ SDL_RenderDrawRect(app.renderer, &r);
+ }
}
void activateEntities(char *names)
@@ -528,8 +542,10 @@ void activateEntityGroups(char *groupNames)
{
if (strcmp(e->groupName, groupName) == 0)
{
+ SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG, "Activated %s (%s)", e->name, groupName);
+
e->active = 1;
-
+
if (e->type == ET_CAPITAL_SHIP)
{
updateCapitalShipComponentProperties(e, 0);
@@ -560,23 +576,27 @@ static void notifyNewArrivals(void)
}
}
-static void activateEpicFighters(int n, int side)
+static void activateEpicFighters(int side)
{
Entity *e;
-
- if (n > 0)
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
- for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ if (!e->active && e->type == ET_FIGHTER && !(e->flags & EF_NO_EPIC) && ((side == SIDE_ALLIES && e->side == SIDE_ALLIES) || (side != SIDE_ALLIES && e->side != SIDE_ALLIES)))
{
- if (!e->active && e->type == ET_FIGHTER && !(e->flags & EF_NO_EPIC) && ((side == SIDE_ALLIES && e->side == SIDE_ALLIES) || (side != SIDE_ALLIES && e->side != SIDE_ALLIES)))
+ e->active = 1;
+
+ /* don't spring into existence in front of the player */
+ if (isOnBattleScreen(e->x, e->y, e->w, e->h))
{
- e->active = 1;
-
- if (--n <= 0)
- {
- return;
- }
+ e->x = player->x;
+ e->y = player->y;
+
+ e->x += (rand() % 2) ? -SCREEN_WIDTH : SCREEN_WIDTH;
+ e->y += (rand() % 2) ? -SCREEN_HEIGHT : SCREEN_HEIGHT;
}
+
+ return;
}
}
}
@@ -587,7 +607,7 @@ void countNumEnemies(void)
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
- if (e->side != SIDE_ALLIES && e->type == ET_FIGHTER)
+ if (e->side != SIDE_ALLIES && (e->type == ET_FIGHTER || e->type == ET_CAPITAL_SHIP) && (!(e->flags & EF_NO_THREAT)))
{
battle.numInitialEnemies++;
}
@@ -617,6 +637,24 @@ static int drawComparator(const void *a, const void *b)
return e2->type - e1->type;
}
+void killEntity(char *name)
+{
+ Entity *e;
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ {
+ if (strcmp(e->name, name) == 0)
+ {
+ e->health = 0;
+ e->deathType = DT_INSTANT;
+
+ /* prevent objectives and conditions from firing */
+ strcpy(e->name, "");
+ strcpy(e->groupName, "");
+ }
+ }
+}
+
void destroyEntities(void)
{
Entity *e;
diff --git a/src/battle/entities.h b/src/battle/entities.h
index 67f801a..a9b99ac 100644
--- a/src/battle/entities.h
+++ b/src/battle/entities.h
@@ -35,6 +35,7 @@ extern void removeFromQuadtree(Entity *e, Quadtree *root);
extern void addToQuadtree(Entity *e, Quadtree *root);
extern void updateCapitalShipComponentProperties(Entity *parent, long flags);
extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern int isOnBattleScreen(int x, int y, int w, int h);
extern App app;
extern Battle battle;
diff --git a/src/battle/fighters.c b/src/battle/fighters.c
index 3632ff0..c5c8cb5 100644
--- a/src/battle/fighters.c
+++ b/src/battle/fighters.c
@@ -95,6 +95,11 @@ Entity *spawnFighter(char *name, int x, int y, int side)
e->action = doAI;
e->die = die;
+
+ if (game.currentMission->challengeData.isDeathMatch)
+ {
+ e->side = SDL_GetTicks();
+ }
return e;
}
@@ -231,8 +236,9 @@ void doFighter(void)
battle.stats[STAT_ENEMIES_DISABLED]++;
updateObjective(self->name, TT_DISABLE);
+ updateObjective(self->groupName, TT_DISABLE);
- if (self->side != SIDE_ALLIES)
+ if (self->side != player->side)
{
runScriptFunction("ENEMIES_DISABLED %d", battle.stats[STAT_ENEMIES_DISABLED]);
}
@@ -252,12 +258,12 @@ void doFighter(void)
if (self->alive == ALIVE_ESCAPED)
{
- if (self == player)
+ if (self == player && !game.currentMission->challengeData.isChallenge)
{
completeMission();
}
- if (self->side != SIDE_ALLIES && (!(self->flags & EF_DISABLED)))
+ if (self->side != player->side && (!(self->flags & EF_DISABLED)))
{
addHudMessage(colors.red, _("Mission target has escaped."));
battle.stats[STAT_ENEMIES_ESCAPED]++;
@@ -283,50 +289,50 @@ void doFighter(void)
if (self->alive == ALIVE_DEAD)
{
- if (player != NULL && self != player)
+ if (player->alive == ALIVE_ALIVE && self != player)
{
- if (player->alive == ALIVE_ALIVE)
+ if (self->side != player->side)
{
- if (self->side != SIDE_ALLIES)
+ if (!(self->flags & EF_NO_KILL_INC))
{
- if (!(self->flags & EF_NO_KILL_INC))
- {
- battle.stats[STAT_ENEMIES_KILLED]++;
+ battle.stats[STAT_ENEMIES_KILLED]++;
- runScriptFunction("ENEMIES_KILLED %d", battle.stats[STAT_ENEMIES_KILLED]);
+ runScriptFunction("ENEMIES_KILLED %d", battle.stats[STAT_ENEMIES_KILLED]);
+
+ SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG, "Enemies killed [%d / %d]", battle.stats[STAT_ENEMIES_KILLED], battle.numInitialEnemies);
+ }
+ }
+ else
+ {
+ if (strcmp(self->name, "Civilian") == 0)
+ {
+ battle.stats[STAT_CIVILIANS_KILLED]++;
+ if (!battle.isEpic || game.currentMission->challengeData.isChallenge)
+ {
+ addHudMessage(colors.red, _("Civilian has been killed"));
}
+
+ runScriptFunction("CIVILIANS_KILLED %d", battle.stats[STAT_CIVILIANS_KILLED]);
}
else
{
- if (strcmp(self->name, "Civilian") == 0)
+ battle.stats[STAT_ALLIES_KILLED]++;
+ if (!battle.isEpic && !game.currentMission->challengeData.isChallenge)
{
- battle.stats[STAT_CIVILIANS_KILLED]++;
- if (!battle.isEpic || game.currentMission->challengeData.isChallenge)
- {
- addHudMessage(colors.red, _("Civilian has been killed"));
- }
-
- runScriptFunction("CIVILIANS_KILLED %d", battle.stats[STAT_CIVILIANS_KILLED]);
+ addHudMessage(colors.red, _("Ally has been killed"));
}
- else
- {
- battle.stats[STAT_ALLIES_KILLED]++;
- if (!battle.isEpic || game.currentMission->challengeData.isChallenge)
- {
- addHudMessage(colors.red, _("Ally has been killed"));
- }
- runScriptFunction("ALLIES_KILLED %d", battle.stats[STAT_ALLIES_KILLED]);
- }
+ runScriptFunction("ALLIES_KILLED %d", battle.stats[STAT_ALLIES_KILLED]);
}
}
-
+
updateObjective(self->name, TT_DESTROY);
updateObjective(self->groupName, TT_DESTROY);
adjustObjectiveTargetValue(self->name, TT_ESCAPED, -1);
updateCondition(self->name, TT_DESTROY);
+ updateCondition(self->groupName, TT_DESTROY);
}
}
}
@@ -344,7 +350,7 @@ static void separate(void)
count = 0;
force = 0;
- candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self);
+ candidates = getAllEntsInRadius(self->x, self->y, self->separationRadius, self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
@@ -409,19 +415,34 @@ void damageFighter(Entity *e, int amount, long flags)
e->aiDamageTimer = FPS;
e->aiDamagePerSec += amount;
-
+
if (flags & BF_SYSTEM_DAMAGE)
{
- playBattleSound(SND_MAG_HIT, e->x, e->y);
-
- e->systemPower = MAX(0, e->systemPower - amount);
-
- e->systemHit = 255;
-
- if (e->systemPower == 0)
+ if (e->shield > 0)
{
- e->shield = e->maxShield = 0;
- e->action = NULL;
+ amount /= 2;
+
+ e->shield -= amount;
+
+ if (e->shield < 0)
+ {
+ amount = -e->shield;
+ }
+ }
+
+ if (amount >= 0)
+ {
+ e->systemPower = MAX(0, e->systemPower - amount);
+
+ e->systemHit = 255;
+
+ if (e->systemPower == 0)
+ {
+ e->shield = e->maxShield = 0;
+ e->action = NULL;
+ }
+
+ playBattleSound(SND_MAG_HIT, e->x, e->y);
}
}
else if (flags & BF_SHIELD_DAMAGE)
@@ -442,11 +463,14 @@ void damageFighter(Entity *e, int amount, long flags)
if (e->shield > 0)
{
e->shield -= amount;
-
- if (e->shield < 0)
+
+ if (e->shield <= 0)
{
+ e->armourHit = 255;
e->health += e->shield;
e->shield = 0;
+
+ playBattleSound(SND_ARMOUR_HIT, e->x, e->y);
}
}
else
@@ -462,11 +486,11 @@ void damageFighter(Entity *e, int amount, long flags)
{
e->shieldHit = 255;
- /* don't allow the shield to recharge immediately after taking a hit */
- e->shieldRecharge = e->shieldRechargeRate;
-
playBattleSound(SND_SHIELD_HIT, e->x, e->y);
}
+
+ /* don't allow the shield to recharge immediately after taking a hit */
+ e->shieldRecharge = e->shieldRechargeRate;
/*
* Sometimes run away if you take too much damage in a short space of time
@@ -541,6 +565,11 @@ static void die(void)
awardTrophy("PANDORAN");
}
}
+
+ if (self->flags & EF_DROPS_ITEMS)
+ {
+ addRandomItem(self->x, self->y);
+ }
}
static void immediateDie(void)
@@ -610,14 +639,18 @@ void retreatEnemies(void)
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
- if (e->type == ET_FIGHTER && e->side != SIDE_ALLIES)
+ if (e->type == ET_FIGHTER && e->side != player->side)
{
e->flags |= EF_RETREATING;
e->aiFlags |= AIF_AVOIDS_COMBAT;
e->aiFlags |= AIF_UNLIMITED_RANGE;
- e->aiFlags |= AIF_GOAL_JUMPGATE;
e->aiFlags &= ~AIF_MOVES_TO_LEADER;
+
+ if (!game.currentMission->challengeData.isChallenge)
+ {
+ e->aiFlags |= AIF_GOAL_JUMPGATE;
+ }
}
}
}
@@ -628,16 +661,20 @@ void retreatAllies(void)
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
- if (e->type == ET_FIGHTER && e->side == SIDE_ALLIES)
+ if (e->type == ET_FIGHTER && e->side == player->side)
{
e->flags |= EF_RETREATING;
e->aiFlags |= AIF_AVOIDS_COMBAT;
e->aiFlags |= AIF_UNLIMITED_RANGE;
- e->aiFlags |= AIF_GOAL_JUMPGATE;
e->aiFlags &= ~AIF_FOLLOWS_PLAYER;
e->aiFlags &= ~AIF_MOVES_TO_PLAYER;
e->aiFlags &= ~AIF_MOVES_TO_LEADER;
+
+ if (!game.currentMission->challengeData.isChallenge)
+ {
+ e->aiFlags |= AIF_GOAL_JUMPGATE;
+ }
}
}
}
@@ -780,14 +817,16 @@ static void loadFighterDef(char *filename)
void loadFighters(cJSON *node)
{
Entity *e;
- char **types, *name, *groupName, *type;
+ char **types, *name, *groupName, *type, *strpos;
int side, scatter, number, active;
- int i, numTypes, addFlags, addAIFlags;
+ int i, numTypes, addFlags, addAIFlags, id;
long flags, aiFlags;
float x, y;
if (node)
{
+ id = 0;
+
node = node->child;
while (node)
@@ -867,6 +906,14 @@ void loadFighters(cJSON *node)
if (name)
{
STRNCPY(e->name, name, MAX_NAME_LENGTH);
+
+ /* update 'name #?' to 'name #1', etc. */
+ strpos = strstr(e->name, "#?");
+
+ if (strpos)
+ {
+ *(++strpos) = ('0' + ++id);
+ }
}
if (groupName)
diff --git a/src/battle/fighters.h b/src/battle/fighters.h
index c263834..31e328d 100644
--- a/src/battle/fighters.h
+++ b/src/battle/fighters.h
@@ -33,7 +33,7 @@ extern void playBattleSound(int id, int x, int y);
extern void updateObjective(char *name, int type);
extern void updateCondition(char *name, int type);
extern void addHudMessage(SDL_Color c, char *format, ...);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern Entity *spawnEntity(void);
extern void adjustObjectiveTargetValue(char *name, int type, int amount);
extern void attachRope(void);
@@ -50,8 +50,8 @@ extern int getJSONValue(cJSON *node, char *name, int defValue);
extern char **toTypeArray(char *types, int *numTypes);
extern char *getJSONValueStr(cJSON *node, char *name, char *defValue);
extern void awardTrophy(char *id);
+extern void addRandomItem(int x, int y);
-extern App app;
extern Battle battle;
extern Colors colors;
extern Entity *player;
diff --git a/src/battle/hud.c b/src/battle/hud.c
index 22bf94a..c355283 100644
--- a/src/battle/hud.c
+++ b/src/battle/hud.c
@@ -138,7 +138,7 @@ void addHudMessage(SDL_Color c, char *format, ...)
void drawHud(void)
{
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
drawHealthBars();
@@ -330,7 +330,7 @@ static void drawPlayerTargeter(void)
float angle;
int x, y;
- if (player->target || battle.missionTarget || jumpgateEnabled())
+ if (player->target || battle.missionTarget || jumpgateEnabled() || battle.messageSpeaker)
{
if (player->target)
{
@@ -340,6 +340,10 @@ static void drawPlayerTargeter(void)
{
SDL_SetTextureColorMod(targetCircle, 0, 255, 0);
}
+ else if (battle.messageSpeaker)
+ {
+ SDL_SetTextureColorMod(targetCircle, 255, 255, 255);
+ }
else
{
SDL_SetTextureColorMod(targetCircle, 255, 255, 0);
@@ -389,6 +393,20 @@ static void drawPlayerTargeter(void)
blitRotated(targetPointer, x - battle.camera.x, y - battle.camera.y, angle);
}
+
+ if (battle.messageSpeaker && battle.messageSpeaker != player)
+ {
+ angle = getAngle(player->x, player->y, battle.messageSpeaker->x, battle.messageSpeaker->y);
+ x = player->x;
+ y = player->y;
+
+ x += sin(TO_RAIDANS(angle)) * 45;
+ y += -cos(TO_RAIDANS(angle)) * 45;
+
+ SDL_SetTextureColorMod(targetPointer, 255, 255, 255);
+
+ blitRotated(targetPointer, x - battle.camera.x, y - battle.camera.y, angle);
+ }
}
static void drawNumFighters(void)
@@ -428,14 +446,30 @@ static void drawObjectives(void)
blit(clock, (SCREEN_WIDTH / 2) - 50, 14, 0);
}
- if (game.currentMission->challengeData.itemLimit)
+ if (game.currentMission->challengeData.killLimit)
+ {
+ drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, "%d / %d", battle.stats[STAT_ENEMIES_KILLED_PLAYER] + battle.stats[STAT_ENEMIES_DISABLED], game.currentMission->challengeData.killLimit);
+ }
+ else if (game.currentMission->challengeData.itemLimit)
{
drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, "%d / %d", battle.stats[STAT_ITEMS_COLLECTED] + battle.stats[STAT_ITEMS_COLLECTED_PLAYER], game.currentMission->challengeData.itemLimit);
}
+ else if (game.currentMission->challengeData.playerItemLimit)
+ {
+ drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, "%d / %d", battle.stats[STAT_ITEMS_COLLECTED_PLAYER], game.currentMission->challengeData.playerItemLimit);
+ }
else if (game.currentMission->challengeData.rescueLimit)
{
drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, "%d / %d", battle.stats[STAT_CIVILIANS_RESCUED], game.currentMission->challengeData.rescueLimit);
}
+ else if (game.currentMission->challengeData.disableLimit)
+ {
+ drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, "%d / %d", battle.stats[STAT_ENEMIES_DISABLED], game.currentMission->challengeData.disableLimit);
+ }
+ else if (player->flags & EF_MUST_DISABLE)
+ {
+ drawText(SCREEN_WIDTH / 2, 35, 14, TA_CENTER, colors.white, _("System Power : %d%%"), player->systemPower);
+ }
}
}
@@ -462,7 +496,14 @@ static void drawDistancesInfo(void)
if (player->target)
{
- drawText(SCREEN_WIDTH - 15, y, 18, TA_RIGHT, colors.red, player->target->name);
+ if (player->target->flags & EF_AI_LEADER && player->target->speed > 0)
+ {
+ drawText(SCREEN_WIDTH - 15, y, 18, TA_RIGHT, colors.red, _("%s (Leader)"), player->target->name);
+ }
+ else
+ {
+ drawText(SCREEN_WIDTH - 15, y, 18, TA_RIGHT, colors.red, player->target->name);
+ }
y += 30;
@@ -490,6 +531,15 @@ static void drawDistancesInfo(void)
y += 25;
}
+
+ if (battle.messageSpeaker)
+ {
+ distance = distanceToKM(player->x, player->y, battle.messageSpeaker->x, battle.messageSpeaker->y);
+
+ drawText(SCREEN_WIDTH - 15, y, 14, TA_RIGHT, colors.white, "%s: %.2fkm", battle.messageSpeaker->name, distance);
+
+ y += 25;
+ }
}
static void drawHudMessages(void)
diff --git a/src/battle/items.c b/src/battle/items.c
index fdec377..90e1099 100644
--- a/src/battle/items.c
+++ b/src/battle/items.c
@@ -46,11 +46,11 @@ void loadItemDefs(void)
e->type = ET_ITEM;
e->active = 1;
STRNCPY(e->name, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH);
- STRNCPY(e->defName, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH);
+ STRNCPY(e->defName, cJSON_GetObjectItem(node, "defName")->valuestring, MAX_NAME_LENGTH);
e->texture = getTexture(cJSON_GetObjectItem(node, "texture")->valuestring);
-
e->health = e->maxHealth = FPS;
-
+ e->flags = EF_NO_HEALTH_BAR;
+
SDL_QueryTexture(e->texture, NULL, NULL, &e->w, &e->h);
defTail->next = e;
@@ -70,29 +70,57 @@ Entity *spawnItem(char *name)
def = getItemDef(name);
memcpy(item, def, sizeof(Entity));
-
- item->dx = rand() % 100 - rand() % 100;
- item->dx *= 0.01;
- item->dy = rand() % 100 - rand() % 100;
- item->dy *= 0.01;
+
+ item->next = NULL;
+
item->action = action;
return item;
}
-static Entity *getItemDef(char *name)
+void addRandomItem(int x, int y)
+{
+ Entity *e, *def, *item;
+
+ def = item = e = NULL;
+
+ for (e = defHead.next ; e != NULL ; e = e->next)
+ {
+ if (!def || rand() % 2)
+ {
+ def = e;
+ }
+ }
+
+ item = spawnEntity();
+
+ memcpy(item, def, sizeof(Entity));
+
+ item->next = NULL;
+
+ item->x = x;
+ item->y = y;
+ item->speed = 1;
+ item->dx = rand() % 200 - rand() % 200;
+ item->dy = rand() % 200 - rand() % 200;
+ item->dx *= 0.01;
+ item->dy *= 0.01;
+ item->action = action;
+}
+
+static Entity *getItemDef(char *defName)
{
Entity *e;
for (e = defHead.next ; e != NULL ; e = e->next)
{
- if (strcmp(e->name, name) == 0)
+ if (strcmp(e->defName, defName) == 0)
{
return e;
}
}
- printf("Error: no such item '%s'\n", name);
+ printf("Error: no such item '%s'\n", defName);
exit(1);
}
@@ -101,11 +129,11 @@ static void action(void)
Entity *e, **candidates;
int i;
- candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self);
+ candidates = getAllEntsInRadius(self->x, self->y, MAX(self->w, self->h), self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
- if ((e->flags & EF_COLLECTS_ITEMS) && collision(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, e->x - (e->w / 2), e->y - (e->h / 2), e->w, e->h))
+ if (e->alive == ALIVE_ALIVE && (e->flags & EF_COLLECTS_ITEMS) && collision(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, e->x - (e->w / 2), e->y - (e->h / 2), e->w, e->h))
{
self->health = 0;
playBattleSound(SND_GET_ITEM, self->x, self->y);
diff --git a/src/battle/items.h b/src/battle/items.h
index 5d54998..3be5f74 100644
--- a/src/battle/items.h
+++ b/src/battle/items.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern char *readFile(char *filename);
extern SDL_Texture *getTexture(char *filename);
extern Entity *spawnEntity(void);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
extern void playBattleSound(int id, int x, int y);
extern void addHudMessage(SDL_Color c, char *format, ...);
diff --git a/src/battle/jumpgate.c b/src/battle/jumpgate.c
index 706dd11..b2fd7a9 100644
--- a/src/battle/jumpgate.c
+++ b/src/battle/jumpgate.c
@@ -47,7 +47,8 @@ Entity *spawnJumpgate(int side, long flags)
jumpgate->action = think;
jumpgate->draw = draw;
jumpgate->side = side;
- jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID;
+ jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID+EF_NO_HEALTH_BAR;
+
if (flags != -1 && flags & EF_DISABLED)
{
jumpgate->flags |= EF_DISABLED;
@@ -88,6 +89,11 @@ static void addNodes(Entity *jumpgate, long flags)
node->die = nodeDie;
SDL_QueryTexture(node->texture, NULL, NULL, &node->w, &node->h);
+ if (jumpgate->side == SIDE_NONE)
+ {
+ node->flags |= EF_NO_HEALTH_BAR;
+ }
+
if (flags != -1)
{
node->flags = flags;
@@ -166,11 +172,11 @@ static void handleFleeingEntities(void)
Entity *e, **candidates;
int i;
- candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self);
+ candidates = getAllEntsInRadius(self->x, self->y, ESCAPE_DISTANCE * 2, self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
- if (e->health > 0 && e->flags & EF_RETREATING && getDistance(self->x, self->y, e->x, e->y) <= 255)
+ if (e->health > 0 && (e->flags & EF_RETREATING) && getDistance(self->x, self->y, e->x, e->y) <= ESCAPE_DISTANCE)
{
e->alive = ALIVE_ESCAPED;
diff --git a/src/battle/jumpgate.h b/src/battle/jumpgate.h
index 860c56d..cbb8b8e 100644
--- a/src/battle/jumpgate.h
+++ b/src/battle/jumpgate.h
@@ -20,15 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../common.h"
+#define ESCAPE_DISTANCE 256
+
extern SDL_Texture *getTexture(char *filename);
extern Entity *spawnEntity(void);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern int getDistance(int x1, int y1, int x2, int y2);
extern void playBattleSound(int id, int x, int y);
extern void blitRotated(SDL_Texture *texture, int x, int y, float angle);
extern char *getTranslatedString(char *string);
extern void addSmallExplosion(void);
-extern void playBattleSound(int id, int x, int y);
extern void addDebris(int x, int y, int amount);
extern void runScriptFunction(char *format, ...);
extern void updateObjective(char *name, int type);
diff --git a/src/battle/locations.c b/src/battle/locations.c
index c01d0c9..c3fa399 100644
--- a/src/battle/locations.c
+++ b/src/battle/locations.c
@@ -75,6 +75,37 @@ void activateLocations(char *locations)
}
}
+/*
+ * Literally only used when Christabel's shuttle is disabled
+ */
+void createChristabelLocation(void)
+{
+ Location *l;
+ Entity *e;
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ {
+ if (strcmp(e->name, "Christabel") == 0)
+ {
+ l = malloc(sizeof(Location));
+ memset(l, 0, sizeof(Location));
+ battle.locationTail->next = l;
+ battle.locationTail = l;
+
+ STRNCPY(l->name, "CristabelLocation", MAX_NAME_LENGTH);
+ l->x = e->x;
+ l->y = e->y;
+ l->size = 500;
+ l->active = 1;
+
+ l->x -= l->size / 2;
+ l->y -= l->size / 2;
+
+ return;
+ }
+ }
+}
+
void loadLocations(cJSON *node)
{
int active;
diff --git a/src/battle/messageBox.c b/src/battle/messageBox.c
index 29dc97d..7fbd4bf 100644
--- a/src/battle/messageBox.c
+++ b/src/battle/messageBox.c
@@ -21,25 +21,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "messageBox.h"
static void calculateMessageBoxHeight(MessageBox *msg);
+static void nextMessage(void);
static MessageBox head;
static MessageBox *tail;
+static Entity *lastWingmate;
void initMessageBox(void)
{
memset(&head, 0, sizeof(MessageBox));
tail = &head;
+
+ lastWingmate = NULL;
}
void addMessageBox(char *title, char *body, int important)
{
MessageBox *msg;
+ int isFirst;
float time;
- if (tail == &head)
- {
- playSound(SND_RADIO);
- }
+ isFirst = (tail == &head);
msg = malloc(sizeof(MessageBox));
memset(msg, 0, sizeof(MessageBox));
@@ -53,6 +55,11 @@ void addMessageBox(char *title, char *body, int important)
STRNCPY(msg->body, body, MAX_DESCRIPTION_LENGTH);
msg->time = time * FPS;
msg->important = important;
+
+ if (isFirst)
+ {
+ nextMessage();
+ }
}
void doMessageBox(void)
@@ -74,9 +81,11 @@ void doMessageBox(void)
free(msg);
msg = &head;
+ battle.messageSpeaker = NULL;
+
if (head.next)
{
- playSound(SND_RADIO);
+ nextMessage();
}
}
}
@@ -139,6 +148,43 @@ void drawMessageBox(void)
}
}
+static void nextMessage(void)
+{
+ Entity *e, *wingmate;
+ int isWingmate;
+
+ wingmate = NULL;
+
+ isWingmate = strcmp(head.next->title, "Wingmate") == 0;
+
+ playSound(SND_RADIO);
+
+ for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+ {
+ if (e->active && e != player)
+ {
+ if (strcmp(e->name, head.next->title) == 0)
+ {
+ battle.messageSpeaker = e;
+ return;
+ }
+
+ if (isWingmate && e->type == ET_FIGHTER && e->speed > 0)
+ {
+ wingmate = e;
+
+ if (rand() % 2 && e != lastWingmate)
+ {
+ battle.messageSpeaker = lastWingmate = e;
+ return;
+ }
+ }
+ }
+ }
+
+ battle.messageSpeaker = wingmate;
+}
+
void resetMessageBox(void)
{
MessageBox *messageBox;
diff --git a/src/battle/messageBox.h b/src/battle/messageBox.h
index 9a8ac86..1a0c2ac 100644
--- a/src/battle/messageBox.h
+++ b/src/battle/messageBox.h
@@ -26,4 +26,6 @@ extern void limitTextWidth(int width);
extern void playSound(int sound);
extern App app;
+extern Battle battle;
extern Colors colors;
+extern Entity *player;
diff --git a/src/battle/mine.c b/src/battle/mine.c
index 12969ab..151c6f1 100644
--- a/src/battle/mine.c
+++ b/src/battle/mine.c
@@ -49,7 +49,7 @@ Entity *spawnMine(int type)
mine->texture = (type == ET_MINE) ? mineNormal : shadowMine;
mine->action = think;
mine->die = die;
- mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE+EF_NON_SOLID;
+ mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE+EF_NON_SOLID+EF_NO_HEALTH_BAR;
if (type == ET_SHADOW_MINE)
{
@@ -99,7 +99,7 @@ static void lookForFighters(void)
Entity *e, **candidates;
int i;
- candidates = getAllEntsWithin(self->x - (self->w / 2) - DAMAGE_RANGE, self->y - (self->h / 2) - DAMAGE_RANGE, self->w + DAMAGE_RANGE, self->h + DAMAGE_RANGE, self);
+ candidates = getAllEntsInRadius(self->x, self->y, DAMAGE_RANGE, self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
@@ -124,7 +124,7 @@ static void lookForPlayer(void)
float dx, dy, norm;
int distance;
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
distance = getDistance(self->x, self->y, player->x, player->y);
@@ -196,10 +196,12 @@ static void die(void)
static void doSplashDamage(void)
{
Entity *e, **candidates;
- int i, dist;
+ int i, dist, kills;
float damage, percent;
- candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self);
+ candidates = getAllEntsInRadius(self->x, self->y, DAMAGE_RANGE, self);
+
+ kills = 0;
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
@@ -213,12 +215,17 @@ static void doSplashDamage(void)
percent /= DAMAGE_RANGE;
percent = 1 - percent;
- damage = 255;
+ damage = DAMAGE_RANGE;
damage *= percent;
if (e->type == ET_FIGHTER)
{
damageFighter(e, damage, 0);
+
+ if (self->killedBy == player && e != player && e->health <= 0)
+ {
+ kills++;
+ }
}
else if (e->type == ET_MINE)
{
@@ -231,4 +238,9 @@ static void doSplashDamage(void)
}
}
}
+
+ if (kills >= 2)
+ {
+ awardTrophy("2_BIRDS");
+ }
}
diff --git a/src/battle/mine.h b/src/battle/mine.h
index b83ba95..aeeadd8 100644
--- a/src/battle/mine.h
+++ b/src/battle/mine.h
@@ -21,18 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../common.h"
#define TRIGGER_RANGE 150
-#define DAMAGE_RANGE 255
+#define DAMAGE_RANGE 250
#define SYSTEM_POWER 50
extern Entity *spawnEntity(void);
extern SDL_Texture *getTexture(char *filename);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern int getDistance(int x1, int y1, int x2, int y2);
extern void addMineExplosion(void);
extern void damageFighter(Entity *e, int amount, long flags);
extern void playBattleSound(int id, int x, int y);
extern void updateObjective(char *name, int type);
extern void runScriptFunction(const char *format, ...);
+extern void awardTrophy(char *id);
extern Battle battle;
extern Entity *player;
diff --git a/src/battle/objectives.c b/src/battle/objectives.c
index b6ac80c..94f8371 100644
--- a/src/battle/objectives.c
+++ b/src/battle/objectives.c
@@ -82,35 +82,49 @@ void updateObjective(char *name, int type)
Objective *o;
int completed, hasHidden;
- completed = battle.numObjectivesComplete;
-
- hasHidden = 0;
-
- for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
+ if (strlen(name))
{
- if (o->active && o->status != OS_COMPLETE)
+ completed = battle.numObjectivesComplete;
+
+ hasHidden = 0;
+
+ for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
{
- if (!o->isEliminateAll && !o->isCondition && o->targetType == type && o->currentValue < o->targetValue && strcmp(o->targetName, name) == 0)
+ if (o->active && o->status != OS_COMPLETE)
{
- o->currentValue++;
-
- if (!o->hideNumbers)
+ if (!o->isEliminateAll && !o->isCondition && o->targetType == type && o->currentValue < o->targetValue && strcmp(o->targetName, name) == 0)
{
- if (o->targetValue - o->currentValue <= 10)
+ o->currentValue++;
+
+ if (!o->hideNumbers)
{
- addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ if (o->targetValue - o->currentValue <= 10)
+ {
+ addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ }
+ else if (o->currentValue % 10 == 0)
+ {
+ addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ }
}
- else if (o->currentValue % 10 == 0)
+
+ if (o->currentValue == o->targetValue)
{
- addHudMessage(colors.cyan, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ addHudMessage(colors.green, _("%s - Objective Complete!"), o->description);
+
+ runScriptFunction(o->description);
+
+ o->status = OS_COMPLETE;
+
+ runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed);
}
}
- if (o->currentValue == o->targetValue)
+ if (o->isEliminateAll && o->status != OS_COMPLETE && !battle.hasThreats)
{
addHudMessage(colors.green, _("%s - Objective Complete!"), o->description);
- runScriptFunction(o->description);
+ o->currentValue = o->targetValue;
o->status = OS_COMPLETE;
@@ -118,28 +132,17 @@ void updateObjective(char *name, int type)
}
}
- if (o->isEliminateAll && o->status != OS_COMPLETE && battle.stats[STAT_ENEMIES_KILLED] == battle.numInitialEnemies)
+ if (!o->active)
{
- addHudMessage(colors.green, _("%s - Objective Complete!"), o->description);
-
- o->currentValue = o->targetValue;
-
- o->status = OS_COMPLETE;
-
- runScriptFunction("OBJECTIVES_COMPLETE %d", ++completed);
+ hasHidden = 1;
}
}
- if (!o->active)
+ if (completed == battle.numObjectivesTotal && !hasHidden)
{
- hasHidden = 1;
+ runScriptFunction("ALL_OBJECTIVES_COMPLETE");
}
}
-
- if (completed == battle.numObjectivesTotal && !hasHidden)
- {
- runScriptFunction("ALL_OBJECTIVES_COMPLETE");
- }
}
void adjustObjectiveTargetValue(char *name, int type, int amount)
@@ -166,20 +169,23 @@ void updateCondition(char *name, int type)
{
Objective *o;
- for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
+ if (strlen(name))
{
- if (o->active && o->isCondition && o->targetType == type && o->currentValue < o->targetValue && strcmp(o->targetName, name) == 0)
+ for (o = battle.objectiveHead.next ; o != NULL ; o = o->next)
{
- o->currentValue++;
-
- if (o->currentValue == o->targetValue)
+ if (o->active && o->isCondition && o->targetType == type && o->currentValue < o->targetValue && strcmp(o->targetName, name) == 0)
{
- o->status = OS_FAILED;
- addHudMessage(colors.red, _("%s - Objective Failed!"), o->description);
- }
- else if (!o->hideNumbers)
- {
- addHudMessage(colors.red, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ o->currentValue++;
+
+ if (o->currentValue == o->targetValue)
+ {
+ o->status = OS_FAILED;
+ addHudMessage(colors.red, _("%s - Objective Failed!"), o->description);
+ }
+ else if (!o->hideNumbers)
+ {
+ addHudMessage(colors.red, "%s - %d / %d", o->description, o->currentValue, o->targetValue);
+ }
}
}
}
diff --git a/src/battle/player.c b/src/battle/player.c
index f845d43..a210789 100644
--- a/src/battle/player.c
+++ b/src/battle/player.c
@@ -35,6 +35,7 @@ static void handleMouse(void);
static void preFireMissile(void);
static void applyRestrictions(void);
static int isPriorityMissionTarget(Entity *e, int dist, int closest);
+static int targetOutOfRange(void);
static int selectedPlayerIndex;
static int availableGuns[BT_MAX];
@@ -83,10 +84,8 @@ void initPlayer(void)
battle.boostTimer = BOOST_RECHARGE_TIME;
battle.ecmTimer = ECM_RECHARGE_TIME;
-
- game.stats[STAT_EPIC_KILL_STREAK] = MAX(game.stats[STAT_EPIC_KILL_STREAK], battle.stats[STAT_EPIC_KILL_STREAK]);
-
- battle.stats[STAT_EPIC_KILL_STREAK] = 0;
+
+ player->flags |= EF_NO_HEALTH_BAR;
}
void doPlayer(void)
@@ -94,64 +93,71 @@ void doPlayer(void)
battle.boostTimer = MIN(battle.boostTimer + 1, BOOST_RECHARGE_TIME);
battle.ecmTimer = MIN(battle.ecmTimer + 1, ECM_RECHARGE_TIME);
- if (player != NULL)
+ self = player;
+
+ if (game.currentMission->challengeData.isChallenge)
{
- self = player;
+ applyRestrictions();
+ }
+
+ if (player->alive == ALIVE_ALIVE && player->systemPower > 0)
+ {
+ handleKeyboard();
+
+ handleMouse();
+
+ if (!player->target || player->target->health <= 0 || player->target->systemPower <= 0 || targetOutOfRange())
+ {
+ selectTarget();
+ }
+ }
+
+ player->angle = ((int)player->angle) % 360;
+
+ if (player->health <= 0 && battle.status == MS_IN_PROGRESS)
+ {
+ battle.stats[STAT_PLAYER_KILLED]++;
+
+ /* the player is known as "Player", so we need to check the craft they were assigned to */
+ if (strcmp(game.currentMission->craft, "ATAF") == 0)
+ {
+ awardTrophy("ATAF_DESTROYED");
+ }
if (game.currentMission->challengeData.isChallenge)
{
- applyRestrictions();
- }
-
- if (player->alive == ALIVE_ALIVE)
- {
- handleKeyboard();
-
- handleMouse();
-
- if (!player->target || player->target->health <= 0 || player->target->systemPower <= 0)
- {
- selectTarget();
- }
- }
-
- player->angle = ((int)player->angle) % 360;
-
- if (player->health <= 0 && battle.status == MS_IN_PROGRESS)
- {
- battle.stats[STAT_PLAYER_KILLED]++;
-
- /* the player is known as "Player", so we need to check the craft they were assigned to */
- if (strcmp(game.currentMission->craft, "ATAF") == 0)
- {
- awardTrophy("ATAF_DESTROYED");
- }
-
- if (game.currentMission->challengeData.isChallenge)
- {
- if (!game.currentMission->challengeData.allowPlayerDeath)
- {
- failMission();
- }
- }
- else if (!battle.isEpic)
+ if (!game.currentMission->challengeData.allowPlayerDeath)
{
failMission();
}
- else if (player->health == -FPS)
- {
- initPlayerSelect();
- }
}
-
- if (battle.status == MS_IN_PROGRESS)
+ else if (!battle.isEpic)
{
- selectMissionTarget();
+ failMission();
}
-
- if (dev.playerUnlimitedMissiles)
+ else if (player->health == -FPS)
{
- player->missiles = 999;
+ initPlayerSelect();
+ }
+ }
+
+ if (battle.status == MS_IN_PROGRESS)
+ {
+ selectMissionTarget();
+ }
+
+ if (dev.playerUnlimitedMissiles)
+ {
+ player->missiles = 999;
+ }
+
+ /* really only used in challenge mode */
+ if (player->systemPower <= 0 && battle.status == MS_IN_PROGRESS)
+ {
+ if (game.currentMission->challengeData.isChallenge)
+ {
+ addHudMessage(colors.red, _("Challenge Failed!"));
+ failMission();
}
}
@@ -161,6 +167,11 @@ void doPlayer(void)
}
}
+static int targetOutOfRange(void)
+{
+ return (app.gameplay.autoSwitchPlayerTarget && getDistance(player->x, player->y, player->target->x, player->target->y) > SCREEN_WIDTH * 2);
+}
+
static void applyRestrictions(void)
{
if (game.currentMission->challengeData.noMissiles)
@@ -255,8 +266,7 @@ static void handleKeyboard(void)
}
else
{
- player->dx *= 0.99;
- player->dy *= 0.99;
+ applyFighterBrakes();
}
}
@@ -403,6 +413,8 @@ void doPlayerSelect(void)
static void selectNewPlayer(int dir)
{
+ player = NULL;
+
do
{
selectedPlayerIndex += dir;
@@ -610,10 +622,12 @@ int playerHasGun(int type)
void loadPlayer(cJSON *node)
{
char *type;
- int side;
+ int side, addFlags;
+ long flags;
type = cJSON_GetObjectItem(node, "type")->valuestring;
side = lookup(cJSON_GetObjectItem(node, "side")->valuestring);
+ flags = -1;
player = spawnFighter(type, 0, 0, side);
player->x = BATTLE_AREA_WIDTH / 2;
@@ -624,6 +638,25 @@ void loadPlayer(cJSON *node)
player->x = (cJSON_GetObjectItem(node, "x")->valuedouble / BATTLE_AREA_CELLS) * BATTLE_AREA_WIDTH;
player->y = (cJSON_GetObjectItem(node, "y")->valuedouble / BATTLE_AREA_CELLS) * BATTLE_AREA_HEIGHT;
}
+
+ if (cJSON_GetObjectItem(node, "flags"))
+ {
+ flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring, &addFlags);
+ }
+
+ if (flags != -1)
+ {
+ if (addFlags)
+ {
+ player->flags |= flags;
+ }
+ else
+ {
+ player->flags = flags;
+
+ SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN, "Flags for Player replaced");
+ }
+ }
if (strcmp(type, "Tug") == 0)
{
diff --git a/src/battle/player.h b/src/battle/player.h
index 7f39fb5..071ff89 100644
--- a/src/battle/player.h
+++ b/src/battle/player.h
@@ -45,6 +45,7 @@ extern Entity *spawnFighter(char *name, int x, int y, int side);
extern int isAcceptControl(void);
extern void resetAcceptControls(void);
extern void awardTrophy(char *id);
+extern long flagsToLong(char *flags, int *add);
extern App app;
extern Battle battle;
diff --git a/src/battle/quadtree.c b/src/battle/quadtree.c
index 76e644d..cecb6c4 100644
--- a/src/battle/quadtree.c
+++ b/src/battle/quadtree.c
@@ -233,6 +233,11 @@ Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore)
return candidates;
}
+Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore)
+{
+ return getAllEntsWithin(x - radius / 2, y - radius / 2, radius, radius, ignore);
+}
+
static void getAllEntsWithinNode(int x, int y, int w, int h, Entity *ignore, Quadtree *root)
{
int index, i;
diff --git a/src/battle/radar.c b/src/battle/radar.c
index cd5649c..c82c964 100644
--- a/src/battle/radar.c
+++ b/src/battle/radar.c
@@ -34,7 +34,7 @@ void drawRadar(void)
{
SDL_Rect r;
Entity *e;
- int dist, inRange;
+ int dist, inRange, blink;
blit(radarTexture, SCREEN_WIDTH - 85, SCREEN_HEIGHT - 85, 1);
@@ -42,6 +42,8 @@ void drawRadar(void)
r.w = r.h = 3;
+ blink = battle.stats[STAT_TIME] % 60 < 30;
+
for (e = battle.entityHead.next ; e != NULL ; e = e->next)
{
dist = getDistance(e->x, e->y, player->x, player->y);
@@ -61,38 +63,37 @@ void drawRadar(void)
r.x--;
r.y--;
- switch (e->side)
- {
- case SIDE_ALLIES:
- SDL_SetRenderDrawColor(app.renderer, 0, 255, 0, 255);
- break;
-
- case SIDE_PIRATE:
- case SIDE_PANDORAN:
- case SIDE_REBEL:
- SDL_SetRenderDrawColor(app.renderer, 255, 0, 0, 255);
- break;
-
- case SIDE_NONE:
- SDL_SetRenderDrawColor(app.renderer, 255, 255, 255, 255);
- break;
- }
-
- if (e == player->target)
- {
- SDL_SetRenderDrawColor(app.renderer, 255, 255, 0, 255);
- }
-
- if (e == battle.missionTarget)
+ if (e->side == SIDE_NONE)
{
SDL_SetRenderDrawColor(app.renderer, 255, 255, 255, 255);
}
+ else if (e->side == player->side)
+ {
+ SDL_SetRenderDrawColor(app.renderer, 0, 255, 0, 255);
+ }
+ else
+ {
+ SDL_SetRenderDrawColor(app.renderer, 255, 0, 0, 255);
+ }
if (e->type == ET_MINE || e->type == ET_SHADOW_MINE || e->type == ET_JUMPGATE || (e->owner && e->owner->type == ET_JUMPGATE))
{
SDL_SetRenderDrawColor(app.renderer, 255, 255, 255, 255);
}
+ if (blink)
+ {
+ if (e == player->target || e == battle.missionTarget)
+ {
+ SDL_SetRenderDrawColor(app.renderer, 255, 255, 0, 255);
+ }
+
+ if (e->flags & EF_DISABLED)
+ {
+ SDL_SetRenderDrawColor(app.renderer, 0, 192, 255, 255);
+ }
+ }
+
SDL_RenderFillRect(app.renderer, &r);
}
}
diff --git a/src/battle/rope.c b/src/battle/rope.c
index 83ad9ce..2e577a2 100644
--- a/src/battle/rope.c
+++ b/src/battle/rope.c
@@ -27,7 +27,7 @@ void attachRope(void)
if ((self->flags & EF_HAS_ROPE) && self->towing == NULL)
{
- candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self);
+ candidates = getAllEntsInRadius(self->x, self->y, self->separationRadius, self);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{
diff --git a/src/battle/rope.h b/src/battle/rope.h
index 39d76ff..c8dc18e 100644
--- a/src/battle/rope.h
+++ b/src/battle/rope.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern float getAngle(int x1, int y1, int x2, int y2);
extern int getDistance(int x1, int y1, int x2, int y2);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore);
extern void addHudMessage(SDL_Color c, char *format, ...);
extern void runScriptFunction(char *format, ...);
extern char *getTranslatedString(char *string);
diff --git a/src/battle/script.c b/src/battle/script.c
index bc0e02a..a3d57b8 100644
--- a/src/battle/script.c
+++ b/src/battle/script.c
@@ -22,18 +22,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static void executeNextLine(ScriptRunner *runner);
-static cJSON *scriptJSON;
+static cJSON *scriptJSON, *rootJSON;
static ScriptRunner head;
static ScriptRunner *tail;
-void initScript(cJSON *scriptNode)
+void initScript(cJSON *root)
{
cJSON *function;
memset(&head, 0, sizeof(ScriptRunner));
tail = &head;
+
+ rootJSON = root;
- scriptJSON = scriptNode;
+ scriptJSON = cJSON_GetObjectItem(root, "script");
if (scriptJSON)
{
@@ -181,7 +183,7 @@ void runScriptTimeFunctions(void)
static void executeNextLine(ScriptRunner *runner)
{
char *line;
- char command[24];
+ char command[32];
char strParam[3][256];
int intParam[2];
@@ -253,9 +255,14 @@ static void executeNextLine(ScriptRunner *runner)
addHudMessage(colors.red, _("Mission Failed!"));
failMission();
}
+ else if (strcmp(command, "FAIL_CHALLENGE") == 0)
+ {
+ addHudMessage(colors.red, _("Challenge Failed!"));
+ failMission();
+ }
else if (strcmp(command, "END_CHALLENGE") == 0)
{
- game.currentMission->challengeData.scriptedEnd = 1;
+ battle.scriptedEnd = 1;
}
else if (strcmp(command, "RETREAT_ALLIES") == 0)
{
@@ -267,6 +274,15 @@ static void executeNextLine(ScriptRunner *runner)
battle.isEpic = 0;
retreatEnemies();
}
+ else if (strcmp(command, "CREATE_CRISTABEL_LOCATION") == 0)
+ {
+ createChristabelLocation();
+ }
+ else if (strcmp(command, "KILL_ENTITY") == 0)
+ {
+ sscanf(line, "%*s %[^\n]", strParam[0]);
+ killEntity(strParam[0]);
+ }
else
{
printf("ERROR: Unrecognised script command '%s'\n", command);
@@ -281,11 +297,11 @@ void destroyScript(void)
{
ScriptRunner *scriptRunner;
- if (scriptJSON)
+ if (rootJSON)
{
- cJSON_Delete(scriptJSON);
+ cJSON_Delete(rootJSON);
- scriptJSON = NULL;
+ rootJSON = NULL;
}
while (head.next)
diff --git a/src/battle/script.h b/src/battle/script.h
index 8b07f1d..01c5f0d 100644
--- a/src/battle/script.h
+++ b/src/battle/script.h
@@ -38,7 +38,8 @@ extern void activateNextWaypoint(void);
extern void activateJumpgate(int activate);
extern void activateSpawner(char *name, int active);
extern void completeAllObjectives(void);
+extern void createChristabelLocation(void);
+extern void killEntity(char *name);
extern Battle battle;
extern Colors colors;
-extern Game game;
diff --git a/src/battle/waypoints.c b/src/battle/waypoints.c
index 74f1c4b..11e086c 100644
--- a/src/battle/waypoints.c
+++ b/src/battle/waypoints.c
@@ -44,9 +44,8 @@ Entity *spawnWaypoint(void)
waypoint->active = 0;
waypoint->health = waypoint->maxHealth = FPS;
waypoint->texture = getTexture("gfx/entities/waypoint.png");
- waypoint->flags = EF_MISSION_TARGET;
+ waypoint->flags = EF_NO_MT_BOX+EF_MISSION_TARGET+EF_NO_HEALTH_BAR;
waypoint->action = think;
- waypoint->flags |= EF_NO_MT_BOX;
SDL_QueryTexture(waypoint->texture, NULL, NULL, &waypoint->w, &waypoint->h);
@@ -68,7 +67,7 @@ static void think(void)
{
self->aiActionTime = 0;
- if (self->health && player != NULL && getDistance(player->x, player->y, self->x, self->y) <= 128 && isCurrentObjective() && teamMatesClose())
+ if (self->health && player->alive == ALIVE_ALIVE && getDistance(player->x, player->y, self->x, self->y) <= 128 && isCurrentObjective() && teamMatesClose())
{
self->health = 0;
@@ -97,6 +96,13 @@ static int isCurrentObjective(void)
return 0;
}
+ if (game.currentMission->challengeData.isChallenge && game.currentMission->challengeData.clearWaypointEnemies && battle.numEnemies > 0)
+ {
+ addHudMessage(colors.cyan, _("Cannot activate waypoint - eliminate enemies first"));
+ self->aiActionTime = FPS;
+ return 0;
+ }
+
return 1;
}
diff --git a/src/battle/waypoints.h b/src/battle/waypoints.h
index 63862c8..00cfd14 100644
--- a/src/battle/waypoints.h
+++ b/src/battle/waypoints.h
@@ -32,3 +32,4 @@ extern Battle battle;
extern Colors colors;
extern Entity *self;
extern Entity *player;
+extern Game game;
diff --git a/src/challenges/challengeHome.c b/src/challenges/challengeHome.c
index 595bf1a..67f06b9 100644
--- a/src/challenges/challengeHome.c
+++ b/src/challenges/challengeHome.c
@@ -29,28 +29,36 @@ static void startChallengeMission(void);
static void drawMenu(void);
static void resume(void);
static void stats(void);
+static void trophies(void);
static void options(void);
-static void statsOK(void);
+static void ok(void);
static void returnFromOptions(void);
static void unlockChallenges(void);
static void quit(void);
static void updateChallengeMissionData(void);
static char *listRestrictions(void);
+static void prevPage(void);
+static void nextPage(void);
static SDL_Texture *background;
static SDL_Texture *planetTexture;
static SDL_Texture *challengeIcon;
static SDL_Texture *challengeIconHighlight;
-static int startIndex;
static Widget *start;
static PointF planet;
static int show;
+static int page;
+static float maxPages;
static char timeLimit[MAX_DESCRIPTION_LENGTH];
static char restrictions[MAX_DESCRIPTION_LENGTH];
static int hasRestrictions;
+static Widget *prev;
+static Widget *next;
void initChallengeHome(void)
{
+ Mission *m;
+
startSectionTransition();
stopMusic();
@@ -63,7 +71,7 @@ void initChallengeHome(void)
awardStatsTrophies();
- saveGame();
+ app.saveGame = 1;
app.delegate.logic = &logic;
app.delegate.draw = &draw;
@@ -78,8 +86,16 @@ void initChallengeHome(void)
planet.x = rand() % SCREEN_WIDTH;
planet.y = rand() % SCREEN_HEIGHT;
-
- startIndex = 0;
+
+ maxPages = page = 0;
+
+ for (m = game.challengeMissionHead.next ; m != NULL ; m = m->next)
+ {
+ maxPages++;
+ }
+
+ maxPages /= CHALLENGES_PER_PAGE;
+ maxPages = ceil(maxPages);
show = SHOW_CHALLENGES;
@@ -90,10 +106,20 @@ void initChallengeHome(void)
getWidget("resume", "challengesMenu")->action = resume;
getWidget("stats", "challengesMenu")->action = stats;
+ getWidget("trophies", "challengesMenu")->action = trophies;
getWidget("options", "challengesMenu")->action = options;
getWidget("quit", "challengesMenu")->action = quit;
- getWidget("ok", "stats")->action = statsOK;
+ getWidget("ok", "stats")->action = ok;
+ getWidget("ok", "trophies")->action = ok;
+
+ prev = getWidget("prev", "challenges");
+ prev->action = prevPage;
+ prev->visible = 0;
+
+ next = getWidget("next", "challenges");
+ next->action = nextPage;
+ next->visible = 1;
/* select first challenge if none chosen */
if (!game.currentMission)
@@ -107,6 +133,22 @@ void initChallengeHome(void)
playMusic("music/main/covert_operations.mp3");
}
+static void nextPage(void)
+{
+ page = MIN(page + 1, maxPages - 1);
+
+ next->visible = page < maxPages - 1;
+ prev->visible = 1;
+}
+
+static void prevPage(void)
+{
+ page = MAX(0, page - 1);
+
+ next->visible = 1;
+ prev->visible = page > 0;
+}
+
static void unlockChallenges(void)
{
Mission *m;
@@ -160,18 +202,25 @@ static void logic(void)
break;
}
- doTrophies();
+ doTrophyAlerts();
doWidgets();
+
+ doTrophies();
}
static void doChallenges(void)
{
Mission *c;
-
+ int i, startIndex, end;
+
+ i = 0;
+ startIndex = page * CHALLENGES_PER_PAGE;
+ end = startIndex + CHALLENGES_PER_PAGE;
+
for (c = game.challengeMissionHead.next ; c != NULL ; c = c->next)
{
- if (app.mouse.button[SDL_BUTTON_LEFT] && collision(app.mouse.x, app.mouse.y, 3, 3, c->rect.x, c->rect.y, c->rect.w, c->rect.h))
+ if (i >= startIndex && i < end && app.mouse.button[SDL_BUTTON_LEFT] && collision(app.mouse.x, app.mouse.y, 3, 3, c->rect.x, c->rect.y, c->rect.w, c->rect.h))
{
if (c->available)
{
@@ -186,6 +235,8 @@ static void doChallenges(void)
app.mouse.button[SDL_BUTTON_LEFT] = 0;
}
+
+ i++;
}
}
@@ -233,10 +284,10 @@ static void draw(void)
blit(planetTexture, planet.x, planet.y, 1);
drawStars();
-
- drawText(SCREEN_WIDTH / 2, 50, 30, TA_CENTER, colors.white, _("Challenges"));
-
- drawText(SCREEN_WIDTH / 2, 100, 24, TA_CENTER, colors.white, "%d / %d", game.completedChallenges, game.totalChallenges);
+
+ drawText(SCREEN_WIDTH / 2, 40, 28, TA_CENTER, colors.white, _("Challenges"));
+ drawText(SCREEN_WIDTH / 2, 83, 16, TA_CENTER, colors.lightGrey, _("Completed : %d / %d"), game.completedChallenges, game.totalChallenges);
+ drawText(SCREEN_WIDTH / 2, 110, 16, TA_CENTER, colors.lightGrey, _("Page : %d / %d"), page + 1, (int)maxPages);
drawChallenges();
@@ -253,6 +304,10 @@ static void draw(void)
case SHOW_STATS:
drawStats();
break;
+
+ case SHOW_TROPHIES:
+ drawTrophies();
+ break;
case SHOW_OPTIONS:
drawOptions();
@@ -267,20 +322,22 @@ static void drawChallenges(void)
Mission *m;
Challenge *c;
SDL_Rect r;
- int i, endIndex;
+ int i, start, end;
r.x = 135;
r.y = 165;
r.w = r.h = 96;
- endIndex = startIndex + MAX_ITEMS;
+ start = page * CHALLENGES_PER_PAGE;
+ end = start + CHALLENGES_PER_PAGE;
+
i = 0;
for (m = game.challengeMissionHead.next ; m != NULL ; m = m->next)
{
m->rect = r;
- if (i >= startIndex && i <= endIndex)
+ if (i >= start && i < end)
{
if (game.currentMission == m)
{
@@ -367,7 +424,7 @@ static void drawMenu(void)
SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE);
r.w = 400;
- r.h = 400;
+ r.h = 500;
r.x = (SCREEN_WIDTH / 2) - r.w / 2;
r.y = (SCREEN_HEIGHT / 2) - r.h / 2;
@@ -400,7 +457,16 @@ static void stats(void)
initStatsDisplay();
}
-static void statsOK(void)
+static void trophies(void)
+{
+ selectWidget("ok", "trophies");
+
+ show = SHOW_TROPHIES;
+
+ initTrophiesDisplay();
+}
+
+static void ok(void)
{
selectWidget("resume", "challengesMenu");
@@ -437,6 +503,7 @@ static void handleKeyboard(void)
case SHOW_OPTIONS:
case SHOW_STATS:
+ case SHOW_TROPHIES:
show = SHOW_MENU;
selectWidget("resume", "challengesMenu");
break;
diff --git a/src/challenges/challengeHome.h b/src/challenges/challengeHome.h
index 94e752a..741e619 100644
--- a/src/challenges/challengeHome.h
+++ b/src/challenges/challengeHome.h
@@ -20,12 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../common.h"
-#define MAX_ITEMS 14
+#define CHALLENGES_PER_PAGE 14
#define SHOW_CHALLENGES 0
#define SHOW_MENU 1
#define SHOW_OPTIONS 2
#define SHOW_STATS 3
+#define SHOW_TROPHIES 4
extern void startSectionTransition(void);
extern void endSectionTransition(void);
@@ -43,7 +44,6 @@ extern void drawText(int x, int y, int size, int align, SDL_Color c, const char
extern void drawWidgets(char *groupName);
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
extern Widget *getWidget(const char *name, const char *group);
-extern void saveGame(void);
extern void initTitle(void);
extern void initStatsDisplay(void);
extern void drawOptions(void);
@@ -60,10 +60,13 @@ extern void playMusic(char *filename);
extern char *timeToString(long millis, int showHours);
extern char *getChallengeDescription(Challenge *c);
extern void clearInput(void);
-extern void doTrophies(void);
+extern void doTrophyAlerts(void);
extern void drawTrophyAlert(void);
extern void awardStatsTrophies(void);
extern void awardChallengeTrophies(void);
+extern void initTrophiesDisplay(void);
+extern void drawTrophies(void);
+extern void doTrophies(void);
extern App app;
extern Battle battle;
diff --git a/src/challenges/challenges.c b/src/challenges/challenges.c
index 2116e81..114dbf9 100644
--- a/src/challenges/challenges.c
+++ b/src/challenges/challenges.c
@@ -59,6 +59,7 @@ void initChallenges(void)
challengeDescription[CHALLENGE_PLAYER_KILLS] = _("Take down %d enemy targets");
challengeDescription[CHALLENGE_DISABLE] = _("Disable %d or more enemy fighters");
challengeDescription[CHALLENGE_ITEMS] = _("Collect %d packages");
+ challengeDescription[CHALLENGE_PLAYER_ITEMS] = _("Collect %d packages");
challengeDescription[CHALLENGE_RESCUE] = _("Rescue %d civilians");
tail = &game.challengeMissionHead;
@@ -96,7 +97,9 @@ void loadChallenge(Mission *mission, cJSON *node)
mission->challengeData.escapeLimit = getJSONValue(node, "escapeLimit", 0);
mission->challengeData.waypointLimit = getJSONValue(node, "waypointLimit", 0);
mission->challengeData.itemLimit = getJSONValue(node, "itemLimit", 0);
+ mission->challengeData.playerItemLimit = getJSONValue(node, "playerItemLimit", 0);
mission->challengeData.rescueLimit = getJSONValue(node, "rescueLimit", 0);
+ mission->challengeData.disableLimit = getJSONValue(node, "disableLimit", 0);
/* restrictions */
mission->challengeData.noMissiles = getJSONValue(node, "noMissiles", 0);
@@ -111,6 +114,9 @@ void loadChallenge(Mission *mission, cJSON *node)
/* misc */
mission->challengeData.allowPlayerDeath = getJSONValue(node, "allowPlayerDeath", 0);
+ mission->challengeData.clearWaypointEnemies = getJSONValue(node, "clearWaypointEnemies", 0);
+ mission->challengeData.eliminateThreats = getJSONValue(node, "eliminateThreats", 0);
+ mission->challengeData.isDeathMatch = getJSONValue(node, "isDeathMatch", 0);
node = cJSON_GetObjectItem(node, "challenges");
@@ -145,7 +151,12 @@ void doChallenges(void)
{
if (challengeFinished())
{
- passed = updateChallenges();
+ passed = 0;
+
+ if (player->health > 0 || (player->health <= 0 && game.currentMission->challengeData.allowPlayerDeath))
+ {
+ passed = updateChallenges();
+ }
if (passed)
{
@@ -187,22 +198,22 @@ static int challengeFinished(void)
return 1;
}
+ if (game.currentMission->challengeData.playerItemLimit > 0 && battle.stats[STAT_ITEMS_COLLECTED_PLAYER] >= game.currentMission->challengeData.playerItemLimit)
+ {
+ return 1;
+ }
+
if (game.currentMission->challengeData.rescueLimit > 0 && (battle.stats[STAT_CIVILIANS_RESCUED] + battle.stats[STAT_CIVILIANS_KILLED]) >= game.currentMission->challengeData.rescueLimit)
{
return 1;
}
- if (game.currentMission->challengeData.scriptedEnd)
+ if (game.currentMission->challengeData.eliminateThreats && !battle.hasThreats)
{
return 1;
}
- if (player->health <= 0)
- {
- return 1;
- }
-
- return 0;
+ return (player->health <= 0 || player->alive == ALIVE_ESCAPED || battle.scriptedEnd);
}
static int updateChallenges(void)
@@ -257,6 +268,7 @@ static int updateChallenges(void)
break;
case CHALLENGE_ITEMS:
+ case CHALLENGE_PLAYER_ITEMS:
updateItemsChallenge(c);
break;
}
@@ -384,12 +396,31 @@ static void updateItemsChallenge(Challenge *c)
{
if (!c->passed)
{
- c->passed = battle.stats[STAT_ITEMS_COLLECTED] + battle.stats[STAT_ITEMS_COLLECTED_PLAYER] >= c->value;
+ if (c->type == CHALLENGE_ITEMS)
+ {
+ c->passed = battle.stats[STAT_ITEMS_COLLECTED] + battle.stats[STAT_ITEMS_COLLECTED_PLAYER] >= c->value;
+ }
+ else
+ {
+ c->passed = battle.stats[STAT_ITEMS_COLLECTED_PLAYER] >= c->value;
+ }
}
}
char *getChallengeDescription(Challenge *c)
{
+ if (c->type == CHALLENGE_TIME)
+ {
+ if (c->value <= 90)
+ {
+ return getFormattedChallengeDescription(challengeDescription[CHALLENGE_TIME], c->value);
+ }
+ else
+ {
+ return getFormattedChallengeDescription(_("Complete challenge in %s or less"), timeToString(c->value * FPS, 0));
+ }
+ }
+
return getFormattedChallengeDescription(challengeDescription[c->type], c->value);
}
@@ -461,11 +492,13 @@ static void completeChallenge(void)
game.stats[STAT_CHALLENGES_COMPLETED]++;
- retreatAllies();
-
- retreatEnemies();
-
player->flags |= EF_IMMORTAL;
+
+ retreatAllies();
+
+ retreatEnemies();
+
+ awardStatsTrophies();
}
}
@@ -477,16 +510,18 @@ static void failChallenge(void)
battle.missionFinishedTimer = FPS;
selectWidget("retry", "battleLost");
- retreatAllies();
-
- retreatEnemies();
-
player->flags |= EF_IMMORTAL;
if (alreadyPassed())
{
battle.status = MS_TIME_UP;
}
+
+ retreatAllies();
+
+ retreatEnemies();
+
+ awardStatsTrophies();
}
}
diff --git a/src/challenges/challenges.h b/src/challenges/challenges.h
index dfcb995..169073c 100644
--- a/src/challenges/challenges.h
+++ b/src/challenges/challenges.h
@@ -24,15 +24,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern Mission *loadMissionMeta(char *filename);
extern char **getFileList(char *dir, int *count);
extern void selectWidget(const char *name, const char *group);
-extern void retreatAllies(void);
-extern void retreatEnemies(void);
extern char *getTranslatedString(char *string);
extern char *getLookupName(char *prefix, long num);
extern char *timeToString(long millis, int showHours);
extern void updateAccuracyStats(unsigned int *stats);
-extern char *timeToString(long millis, int showHours);
extern int getJSONValue(cJSON *node, char *name, int defValue);
extern long lookup(char *name);
+extern void awardStatsTrophies(void);
+extern void retreatAllies(void);
+extern void retreatEnemies(void);
extern Dev dev;
extern Battle battle;
diff --git a/src/defs.h b/src/defs.h
index aa0004e..17b6908 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SCREEN_HEIGHT 720
#define MAX_KEYBOARD_KEYS 350
-#define MAX_MOUSE_BUTTONS 5
+#define MAX_MOUSE_BUTTONS 6
#define FPS 60
#define LOGIC_RATE (1000 / FPS)
@@ -104,6 +104,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define EF_NO_PLAYER_TARGET (2 << 18)
#define EF_AI_IGNORE (2 << 19)
#define EF_NON_SOLID (2 << 20)
+#define EF_NO_HEALTH_BAR (2 << 21)
+#define EF_FRIENDLY_HEALTH_BAR (2 << 22)
+#define EF_NO_THREAT (2 << 23)
+#define EF_DROPS_ITEMS (2 << 24)
#define AIF_NONE 0
#define AIF_FOLLOWS_PLAYER (2 << 0)
@@ -160,9 +164,9 @@ enum
ET_FIGHTER,
ET_ITEM,
ET_WAYPOINT,
- ET_COMPONENT,
ET_COMPONENT_GUN,
ET_COMPONENT_ENGINE,
+ ET_COMPONENT,
ET_CAPITAL_SHIP,
ET_JUMPGATE,
ET_MINE,
@@ -313,6 +317,7 @@ enum
CHALLENGE_PLAYER_KILLS,
CHALLENGE_DISABLE,
CHALLENGE_ITEMS,
+ CHALLENGE_PLAYER_ITEMS,
CHALLENGE_RESCUE,
CHALLENGE_SURVIVE,
CHALLENGE_MAX
@@ -367,5 +372,6 @@ enum
TROPHY_SILVER,
TROPHY_GOLD,
TROPHY_PLATINUM,
+ TROPHY_UNEARNED,
TROPHY_MAX
};
diff --git a/src/galaxy/galacticMap.c b/src/galaxy/galacticMap.c
index dac56d4..b54cef1 100644
--- a/src/galaxy/galacticMap.c
+++ b/src/galaxy/galacticMap.c
@@ -38,8 +38,9 @@ static void addPulses(void);
static void drawMenu(void);
static void resume(void);
static void stats(void);
+static void trophies(void);
static void options(void);
-static void statsOK(void);
+static void ok(void);
static void quit(void);
static void startMission(void);
static void returnFromOptions(void);
@@ -92,11 +93,13 @@ void initGalacticMap(void)
awardStatsTrophies();
- saveGame();
+ app.saveGame = 1;
pulseTimer = 0;
arrowPulse = 0;
+
+ selectedStarSystem = NULL;
/* clear the pulses */
destroyGalacticMap();
@@ -108,10 +111,12 @@ void initGalacticMap(void)
getWidget("resume", "galacticMap")->action = resume;
getWidget("stats", "galacticMap")->action = stats;
+ getWidget("trophies", "galacticMap")->action = trophies;
getWidget("options", "galacticMap")->action = options;
getWidget("quit", "galacticMap")->action = quit;
- getWidget("ok", "stats")->action = statsOK;
+ getWidget("ok", "stats")->action = ok;
+ getWidget("ok", "trophies")->action = ok;
getWidget("ok", "fallen")->action = fallenOK;
@@ -174,9 +179,11 @@ static void logic(void)
arrowPulse += 0.1;
- doTrophies();
-
doWidgets();
+
+ doTrophyAlerts();
+
+ doTrophies();
}
static void doStarSystems(void)
@@ -360,6 +367,10 @@ static void draw(void)
case SHOW_STATS:
drawStats();
break;
+
+ case SHOW_TROPHIES:
+ drawTrophies();
+ break;
case SHOW_OPTIONS:
drawOptions();
@@ -616,6 +627,7 @@ static void handleKeyboard(void)
case SHOW_OPTIONS:
case SHOW_STATS:
+ case SHOW_TROPHIES:
show = SHOW_MENU;
selectWidget("resume", "galacticMap");
break;
@@ -659,7 +671,7 @@ static void drawMenu(void)
SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE);
r.w = 400;
- r.h = 400;
+ r.h = 500;
r.x = (SCREEN_WIDTH / 2) - r.w / 2;
r.y = (SCREEN_HEIGHT / 2) - r.h / 2;
@@ -692,7 +704,16 @@ static void stats(void)
initStatsDisplay();
}
-static void statsOK(void)
+static void trophies(void)
+{
+ selectWidget("ok", "trophies");
+
+ show = SHOW_TROPHIES;
+
+ initTrophiesDisplay();
+}
+
+static void ok(void)
{
selectWidget("resume", "galacticMap");
diff --git a/src/galaxy/galacticMap.h b/src/galaxy/galacticMap.h
index ca97173..f4a9079 100644
--- a/src/galaxy/galacticMap.h
+++ b/src/galaxy/galacticMap.h
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SHOW_MENU 2
#define SHOW_OPTIONS 3
#define SHOW_STATS 4
+#define SHOW_TROPHIES 5
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
extern void initBattle(void);
@@ -32,7 +33,6 @@ extern void loadMission(char *filename);
extern SDL_Texture *getTexture(char *filename);
extern void startSectionTransition(void);
extern void endSectionTransition(void);
-extern void saveGame(void);
extern void blit(SDL_Texture *t, int x, int y, int centered);
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
extern void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a);
@@ -60,10 +60,13 @@ extern StarSystem *getStarSystem(char *name);
extern void showOKDialog(void (*callback)(void), const char *format, ...);
extern char *getTranslatedString(char *string);
extern void clearInput(void);
-extern void doTrophies(void);
+extern void doTrophyAlerts(void);
extern void drawTrophyAlert(void);
extern void awardCampaignTrophies(void);
extern void awardStatsTrophies(void);
+extern void initTrophiesDisplay(void);
+extern void drawTrophies(void);
+extern void doTrophies(void);
extern App app;
extern Colors colors;
diff --git a/src/galaxy/mission.c b/src/galaxy/mission.c
index ecb39c1..6ebb636 100644
--- a/src/galaxy/mission.c
+++ b/src/galaxy/mission.c
@@ -126,7 +126,7 @@ void loadMission(char *filename)
battle.unwinnable = getJSONValue(root, "unwinnable", 0);
battle.waypointAutoAdvance = getJSONValue(root, "waypointAutoAdvance", 0);
- initScript(cJSON_GetObjectItem(root, "script"));
+ initScript(root);
/* music, planet, and background loading must come last, so AUTO works properly */
@@ -201,7 +201,7 @@ void loadMission(char *filename)
static char *getAutoBackground(char *filename)
{
- int hash;
+ unsigned long hash;
if (!game.currentMission->challengeData.isChallenge)
{
@@ -217,7 +217,7 @@ static char *getAutoBackground(char *filename)
static char *getAutoPlanet(char *filename)
{
- int hash;
+ unsigned long hash;
if (!game.currentMission->challengeData.isChallenge)
{
@@ -233,7 +233,7 @@ static char *getAutoPlanet(char *filename)
static char *getAutoMusic(char *filename)
{
- int hash;
+ unsigned long hash;
if (!game.currentMission->challengeData.isChallenge)
{
@@ -241,7 +241,7 @@ static char *getAutoMusic(char *filename)
}
else
{
- hash = hashcode(filename);
+ hash = hashcode(game.currentMission->description);
}
return getMusicFilename(hash);
@@ -262,6 +262,13 @@ void completeMission(void)
retreatEnemies();
player->flags |= EF_IMMORTAL;
+
+ awardStatsTrophies();
+
+ if (!game.currentMission->challengeData.isChallenge)
+ {
+ awardPostMissionTrophies();
+ }
}
}
@@ -276,6 +283,8 @@ void failMission(void)
failIncompleteObjectives();
player->flags |= EF_IMMORTAL;
+
+ awardStatsTrophies();
}
}
diff --git a/src/galaxy/mission.h b/src/galaxy/mission.h
index 90ddc91..2329592 100644
--- a/src/galaxy/mission.h
+++ b/src/galaxy/mission.h
@@ -44,9 +44,9 @@ extern void initMissionInfo(void);
extern char *getTranslatedString(char *string);
extern void updateStarSystemMissions(void);
extern void updateChallengeMissions(void);
-extern char *getBackgroundTextureName(int n);
-extern char *getPlanetTextureName(int n);
-extern char *getMusicFilename(int n);
+extern char *getBackgroundTextureName(unsigned long n);
+extern char *getPlanetTextureName(unsigned long n);
+extern char *getMusicFilename(unsigned long n);
extern int getJSONValue(cJSON *node, char *name, int defValue);
extern char *getJSONValueStr(cJSON *node, char *name, char *defValue);
extern void addAllToQuadtree(void);
@@ -60,6 +60,8 @@ extern void loadSpawners(cJSON *node);
extern void loadChallenge(Mission *mission, cJSON *node);
extern Entity *spawnMine(int type);
extern void activateNextWaypoint(void);
+extern void awardStatsTrophies(void);
+extern void awardPostMissionTrophies(void);
extern Battle battle;
extern Dev dev;
diff --git a/src/galaxy/starSystems.c b/src/galaxy/starSystems.c
index 6afaeaa..ad8bc8a 100644
--- a/src/galaxy/starSystems.c
+++ b/src/galaxy/starSystems.c
@@ -148,7 +148,7 @@ void updateStarSystemMissions(void)
}
}
- if (strcmp(starSystem->name, "Sol") != 0)
+ if (!starSystem->isSol)
{
game.totalMissions += starSystem->totalMissions;
game.completedMissions += starSystem->completedMissions;
@@ -161,7 +161,7 @@ void updateStarSystemMissions(void)
for (mission = starSystem->missionHead.next ; mission != NULL ; mission = mission->next)
{
- mission->available = strcmp(starSystem->name, "Sol") == 0 || isMissionAvailable(mission, prev);
+ mission->available = starSystem->isSol || isMissionAvailable(mission, prev);
if (mission->available)
{
@@ -171,7 +171,7 @@ void updateStarSystemMissions(void)
prev = mission;
}
- if (strcmp(starSystem->name, "Sol") != 0)
+ if (!starSystem->isSol)
{
game.availableMissions += starSystem->availableMissions;
}
diff --git a/src/galaxy/stats.c b/src/game/stats.c
similarity index 99%
rename from src/galaxy/stats.c
rename to src/game/stats.c
index 847c689..9e6732d 100644
--- a/src/galaxy/stats.c
+++ b/src/game/stats.c
@@ -86,6 +86,7 @@ void initStatsDisplay(void)
next = getWidget("next", "stats");
next->action = nextPage;
+ next->visible = 1;
calculatePercentComplete();
@@ -102,7 +103,7 @@ static void calculatePercentComplete(void)
for (starSystem = game.starSystemHead.next ; starSystem != NULL ; starSystem = starSystem->next)
{
- if (strcmp(starSystem->name, "Sol"))
+ if (!starSystem->isSol)
{
completed += starSystem->completedMissions;
total += starSystem->totalMissions;
diff --git a/src/galaxy/stats.h b/src/game/stats.h
similarity index 100%
rename from src/galaxy/stats.h
rename to src/game/stats.h
diff --git a/src/game/title.c b/src/game/title.c
index 2cc2a11..31078c6 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -28,8 +28,9 @@ static void doFighters(void);
static void drawFighters(void);
static void campaign(void);
static void challenges(void);
+static void trophies(void);
static void stats(void);
-static void statsOK(void);
+static void ok(void);
static void options(void);
static void quit(void);
static void returnFromOptions(void);
@@ -78,11 +79,13 @@ void initTitle(void)
getWidget("campaign", "title")->action = campaign;
getWidget("challenges", "title")->action = challenges;
+ getWidget("trophies", "title")->action = trophies;
getWidget("stats", "title")->action = stats;
getWidget("options", "title")->action = options;
getWidget("quit", "title")->action = quit;
- getWidget("ok", "stats")->action = statsOK;
+ getWidget("ok", "stats")->action = ok;
+ getWidget("ok", "trophies")->action = ok;
show = SHOW_TITLE;
@@ -128,6 +131,8 @@ static void logic(void)
doEffects();
+ doTrophies();
+
doWidgets();
}
@@ -190,6 +195,10 @@ static void draw(void)
case SHOW_OPTIONS:
drawOptions();
break;
+
+ case SHOW_TROPHIES:
+ drawTrophies();
+ break;
}
}
@@ -216,16 +225,29 @@ static void handleKeyboard(void)
static void campaign(void)
{
+ destroyBattle();
+
initGalacticMap();
}
static void challenges(void)
{
+ destroyBattle();
+
game.currentMission = NULL;
initChallengeHome();
}
+static void trophies(void)
+{
+ selectWidget("ok", "trophies");
+
+ show = SHOW_TROPHIES;
+
+ initTrophiesDisplay();
+}
+
static void options(void)
{
selectWidget("ok", "options");
@@ -244,7 +266,7 @@ static void stats(void)
initStatsDisplay();
}
-static void statsOK(void)
+static void ok(void)
{
selectWidget("stats", "title");
diff --git a/src/game/title.h b/src/game/title.h
index 818165e..0a1df9e 100644
--- a/src/game/title.h
+++ b/src/game/title.h
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SHOW_TITLE 0
#define SHOW_STATS 1
#define SHOW_OPTIONS 2
+#define SHOW_TROPHIES 3
#define NUM_FIGHTERS 12
@@ -56,6 +57,9 @@ extern void selectWidget(const char *name, const char *group);
extern void drawStats(void);
extern void updateAllMissions(void);
extern void clearInput(void);
+extern void initTrophiesDisplay(void);
+extern void drawTrophies(void);
+extern void doTrophies(void);
extern App app;
extern Battle battle;
diff --git a/src/game/trophies.c b/src/game/trophies.c
index f7e93ac..c8884d1 100644
--- a/src/game/trophies.c
+++ b/src/game/trophies.c
@@ -20,15 +20,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "trophies.h"
+static void prevPage(void);
+static void nextPage(void);
static void loadTrophyData(char *filename);
static void resetAlert(void);
static void awardCraftTrophy(void);
+static void setSparkleColor(Trophy *t);
+static void nextAlert(void);
static Trophy *alertTrophy;
static SDL_Texture *trophyIcons[TROPHY_MAX];
+static SDL_Texture *sparkle;
+static SDL_Texture *alertSphere;
static SDL_Rect alertRect;
-static float alertDX;
static int alertTimer;
+static int page;
+static int awarded;
+static int total;
+static int boxWidth;
+static float sparkleAngle;
+static float maxPages;
+static Widget *prev;
+static Widget *next;
void initTrophies(void)
{
@@ -38,14 +51,164 @@ void initTrophies(void)
trophyIcons[TROPHY_SILVER] = getTexture("gfx/trophies/silver.png");
trophyIcons[TROPHY_GOLD] = getTexture("gfx/trophies/gold.png");
trophyIcons[TROPHY_PLATINUM] = getTexture("gfx/trophies/platinum.png");
+ trophyIcons[TROPHY_UNEARNED] = getTexture("gfx/trophies/unearned.png");
+ sparkle = getTexture("gfx/trophies/sparkle.png");
+ alertSphere = getTexture("gfx/trophies/alertSphere.png");
+
+ alertRect.h = 90;
+ alertRect.y = 10;
resetAlert();
}
+void initTrophiesDisplay(void)
+{
+ int w, h;
+ Trophy *t;
+
+ boxWidth = total = awarded = 0;
+
+ for (t = game.trophyHead.next ; t != NULL ; t = t->next)
+ {
+ total++;
+
+ if (t->awarded)
+ {
+ awarded++;
+
+ STRNCPY(t->awardDateStr, timeToDate(t->awardDate), MAX_NAME_LENGTH);
+ }
+
+ textSize(t->description, 18, &w, &h);
+
+ boxWidth = MAX(boxWidth, w);
+ }
+
+ boxWidth += 125;
+
+ page = 0;
+
+ maxPages = total;
+ maxPages /= TROPHIES_PER_PAGE;
+ maxPages = ceil(maxPages);
+
+ prev = getWidget("prev", "trophies");
+ prev->action = prevPage;
+ prev->visible = 0;
+
+ next = getWidget("next", "trophies");
+ next->action = nextPage;
+ next->visible = 1;
+
+ sparkleAngle = 0;
+}
+
+static void nextPage(void)
+{
+ page = MIN(page + 1, maxPages - 1);
+
+ next->visible = page < maxPages - 1;
+ prev->visible = 1;
+}
+
+static void prevPage(void)
+{
+ page = MAX(0, page - 1);
+
+ next->visible = 1;
+ prev->visible = page > 0;
+}
+
+void doTrophies(void)
+{
+ sparkleAngle += 0.25;
+ if (sparkleAngle >= 360)
+ {
+ sparkleAngle = 0;
+ }
+}
+
+void drawTrophies(void)
+{
+ Trophy *t;
+ SDL_Rect r;
+ int start, end, i, x, y;
+
+ SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_BLEND);
+ SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 128);
+ SDL_RenderFillRect(app.renderer, NULL);
+ SDL_SetRenderDrawBlendMode(app.renderer, SDL_BLENDMODE_NONE);
+
+ r.w = boxWidth;
+ r.h = 650;
+ r.x = (SCREEN_WIDTH / 2) - r.w / 2;
+ r.y = (SCREEN_HEIGHT / 2) - r.h / 2;
+
+ SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, 0);
+ SDL_RenderFillRect(app.renderer, &r);
+ SDL_SetRenderDrawColor(app.renderer, 200, 200, 200, 255);
+ SDL_RenderDrawRect(app.renderer, &r);
+
+ drawText(SCREEN_WIDTH / 2, 40, 28, TA_CENTER, colors.white, _("Trophies"));
+ drawText(SCREEN_WIDTH / 2, 83, 16, TA_CENTER, colors.lightGrey, _("Awarded : %d / %d"), awarded, total);
+ drawText(SCREEN_WIDTH / 2, 110, 16, TA_CENTER, colors.lightGrey, _("Page : %d / %d"), page + 1, (int)maxPages);
+
+ SDL_SetRenderDrawColor(app.renderer, 128, 128, 128, 255);
+ SDL_RenderDrawLine(app.renderer, r.x, 150, r.x + r.w, 150);
+
+ x = r.x + 15;
+ y = 180;
+ start = page * TROPHIES_PER_PAGE;
+ end = start + TROPHIES_PER_PAGE;
+ i = 0;
+
+ for (t = game.trophyHead.next ; t != NULL ; t = t->next)
+ {
+ if (i >= start && i < end)
+ {
+ if (t->awarded)
+ {
+ setSparkleColor(t);
+ blitRotated(sparkle, x + 32, y + 32, sparkleAngle);
+ blitRotated(sparkle, x + 32, y + 32, -sparkleAngle);
+
+ blitScaled(trophyIcons[t->value], x, y, 64, 64);
+ drawText(x + 85, y - 10, 20, TA_LEFT, colors.yellow, t->title);
+ drawText(x + 85, y + 20, 18, TA_LEFT, colors.white, t->description);
+ drawText(x + 85, y + 48, 18, TA_LEFT, colors.white, t->awardDateStr);
+ }
+ else
+ {
+ blitScaled(trophyIcons[TROPHY_UNEARNED], x, y, 64, 64);
+
+ if (!t->hidden)
+ {
+ drawText(x + 85, y - 10, 20, TA_LEFT, colors.lightGrey, t->title);
+ drawText(x + 85, y + 20, 18, TA_LEFT, colors.darkGrey, t->description);
+ drawText(x + 85, y + 48, 18, TA_LEFT, colors.darkGrey, "-");
+ }
+ else
+ {
+ drawText(x + 85, y + 20, 20, TA_LEFT, colors.darkGrey, _("[Hidden]"));
+ }
+ }
+
+ y += 120;
+ }
+
+ i++;
+ }
+
+ drawWidgets("trophies");
+}
+
void awardTrophy(char *id)
{
Trophy *t;
-
+ int numRemaining;
+
+ numRemaining = 0;
+
for (t = game.trophyHead.next ; t != NULL ; t = t->next)
{
if (!t->awarded && strcmp(t->id, id) == 0)
@@ -53,55 +216,90 @@ void awardTrophy(char *id)
t->awarded = 1;
t->awardDate = time(NULL);
t->notify = 1;
+
+ SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Awarding trophy '%s'", t->id);
+
+ app.saveGame = 1;
}
+
+ if (!t->awarded)
+ {
+ numRemaining++;
+ }
+ }
+
+ /* the Platinum will always be the last trophy to unlock */
+ if (numRemaining == 1)
+ {
+ awardTrophy("PLATINUM");
}
}
-void doTrophies(void)
+void doTrophyAlerts(void)
{
+ if (!alertTrophy)
+ {
+ nextAlert();
+ }
+ else if (alertTrophy)
+ {
+ alertRect.x = MIN(alertRect.x + 24, -1);
+
+ if (alertRect.x > -150)
+ {
+ alertTimer--;
+ }
+
+ if (alertTimer <= 0)
+ {
+ alertTrophy->notify = 0;
+ resetAlert();
+ }
+
+ /* do the sparkle rotation */
+ doTrophies();
+ }
+}
+
+static void nextAlert(void)
+{
+ int w, h;
Trophy *t;
for (t = game.trophyHead.next ; t != NULL ; t = t->next)
{
if (t->notify)
{
- if (alertTrophy != t)
+ if (!alertTrophy || t->awardDate < alertTrophy->awardDate)
{
alertTrophy = t;
- playSound(SND_TROPHY);
}
-
- alertRect.x += alertDX;
-
- if (alertRect.x > -50)
- {
- alertDX *= 0.9;
- }
-
- if (--alertTimer <= 0)
- {
- t->notify = 0;
- resetAlert();
- }
-
- return;
}
}
+
+ if (alertTrophy)
+ {
+ playSound(SND_TROPHY);
+
+ textSize(alertTrophy->title, 30, &alertRect.w, &h);
+ textSize(alertTrophy->description, 20, &w, &h);
+
+ alertRect.w = MAX(alertRect.w, w);
+ alertRect.w += 125;
+ alertRect.x = -alertRect.w;
+ }
}
static void resetAlert(void)
{
- alertRect.w = 300;
- alertRect.h = 100;
- alertRect.x = -alertRect.w;
- alertRect.y = 10;
-
- alertDX = 3;
alertTimer = FPS * 3;
+ alertTrophy = NULL;
}
void drawTrophyAlert(void)
{
+ int x, y;
+
if (alertTrophy)
{
SDL_SetRenderDrawColor(app.renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
@@ -110,17 +308,21 @@ void drawTrophyAlert(void)
SDL_SetRenderDrawColor(app.renderer, 64, 64, 64, SDL_ALPHA_OPAQUE);
SDL_RenderDrawRect(app.renderer, &alertRect);
- drawText(alertRect.x + 5, alertRect.y + 5, 30, TA_LEFT, colors.white, alertTrophy->title);
- drawText(alertRect.x + 5, alertRect.y + 45, 20, TA_LEFT, colors.white, alertTrophy->description);
+ drawText(alertRect.x + 15, alertRect.y + 5, 30, TA_LEFT, colors.white, alertTrophy->title);
+ drawText(alertRect.x + 15, alertRect.y + 45, 20, TA_LEFT, colors.white, alertTrophy->description);
+
+ setSparkleColor(alertTrophy);
+
+ x = alertRect.x + alertRect.w - 72;
+ y = alertRect.y + 20;
- blit(trophyIcons[alertTrophy->value], alertRect.x + alertRect.w - 64, alertRect.y + 10, 0);
+ blit(alertSphere, x + 24, y + 24, 1);
+ blitRotated(sparkle, x + 24, y + 24, sparkleAngle);
+ blitRotated(sparkle, x + 24, y + 24, -sparkleAngle);
+ blitScaled(trophyIcons[alertTrophy->value], x, y, 48, 48);
}
}
-void drawTrophies(void)
-{
-}
-
Trophy *getTrophy(char *id)
{
Trophy *t;
@@ -138,7 +340,6 @@ Trophy *getTrophy(char *id)
static void loadTrophyData(char *filename)
{
- /*
cJSON *root, *node;
char *text;
Trophy *t, *tail;
@@ -152,29 +353,33 @@ static void loadTrophyData(char *filename)
for (node = root->child ; node != NULL ; node = node->next)
{
- t = malloc(sizeof(Trophy));
- memset(t, 0, sizeof(Trophy));
-
- STRNCPY(t->id, cJSON_GetObjectItem(node, "id")->valuestring, MAX_NAME_LENGTH);
- STRNCPY(t->title, _(cJSON_GetObjectItem(node, "title")->valuestring), MAX_DESCRIPTION_LENGTH);
- STRNCPY(t->description, _(cJSON_GetObjectItem(node, "description")->valuestring), MAX_DESCRIPTION_LENGTH);
- t->value = lookup(cJSON_GetObjectItem(node, "value")->valuestring);
- t->hidden = getJSONValue(node, "hidden", 0);
-
- // can't use the getJSONValue here, as it could lead to false positives
- if (cJSON_GetObjectItem(node, "stat"))
+ if (cJSON_GetObjectItem(node, "id")->valuestring[0] != '_')
{
- t->stat = lookup(cJSON_GetObjectItem(node, "stat")->valuestring);
- t->statValue = cJSON_GetObjectItem(node, "statValue")->valueint;
- }
+ t = malloc(sizeof(Trophy));
+ memset(t, 0, sizeof(Trophy));
- tail->next = t;
- tail = t;
+ STRNCPY(t->id, cJSON_GetObjectItem(node, "id")->valuestring, MAX_NAME_LENGTH);
+ STRNCPY(t->title, _(cJSON_GetObjectItem(node, "title")->valuestring), MAX_DESCRIPTION_LENGTH);
+ STRNCPY(t->description, _(cJSON_GetObjectItem(node, "description")->valuestring), MAX_DESCRIPTION_LENGTH);
+ t->value = lookup(cJSON_GetObjectItem(node, "value")->valuestring);
+ t->hidden = getJSONValue(node, "hidden", 0);
+
+ t->stat = -1;
+
+ /* can't use the getJSONValue here, as it could lead to false positives */
+ if (cJSON_GetObjectItem(node, "stat"))
+ {
+ t->stat = lookup(cJSON_GetObjectItem(node, "stat")->valuestring);
+ t->statValue = cJSON_GetObjectItem(node, "statValue")->valueint;
+ }
+
+ tail->next = t;
+ tail = t;
+ }
}
cJSON_Delete(root);
free(text);
- */
}
void awardStatsTrophies(void)
@@ -183,11 +388,15 @@ void awardStatsTrophies(void)
for (t = game.trophyHead.next ; t != NULL ; t = t->next)
{
- if (!t->awarded && game.stats[t->stat] >= t->statValue)
+ if (t->stat != -1 && !t->awarded && (game.stats[t->stat] + battle.stats[t->stat]) >= t->statValue)
{
t->awarded = 1;
t->awardDate = time(NULL);
t->notify = 1;
+
+ SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Awarding trophy '%s'", t->id);
+
+ app.saveGame = 1;
}
}
}
@@ -196,13 +405,13 @@ void awardCampaignTrophies(void)
{
char trophyId[MAX_NAME_LENGTH];
char name[MAX_NAME_LENGTH];
- int completed, i, len;
+ int i, len;
StarSystem *starSystem;
-
- /* check % of missions completed */
- completed = getPercent(game.completedMissions, game.totalMissions);
- sprintf(trophyId, "CAMPAIGN_%d", completed);
- awardTrophy(trophyId);
+
+ if (game.completedMissions)
+ {
+ awardTrophy("CAMPAIGN_1");
+ }
/* check if all star system missions are completed */
for (starSystem = game.starSystemHead.next ; starSystem != NULL ; starSystem = starSystem->next)
@@ -217,6 +426,7 @@ void awardCampaignTrophies(void)
{
name[i] = toupper(starSystem->name[i]);
}
+
sprintf(trophyId, "CAMPAIGN_%s", name);
awardTrophy(trophyId);
}
@@ -228,8 +438,8 @@ void awardChallengeTrophies(void)
char trophyId[MAX_NAME_LENGTH];
int completed;
- /* check % of challenges completed */
- completed = getPercent(game.completedChallenges, game.totalChallenges);
+ /* check % of challenges completed - 25% increments*/
+ completed = (getPercent(game.completedChallenges, game.totalChallenges) / 25) * 25;
sprintf(trophyId, "CHALLENGE_%d", completed);
awardTrophy(trophyId);
}
@@ -241,6 +451,19 @@ void awardPostMissionTrophies(void)
if (game.currentMission->epic)
{
awardTrophy("EPIC");
+
+ if (battle.stats[STAT_PLAYER_KILLED] == 0)
+ {
+ awardTrophy("SURVIVOR");
+ }
+ }
+
+ /*
+ * Must be a non-challenge mission, a fighter-type (has guns and missiles), must not be Sol, and must not have fired any shots or missiles
+ */
+ if (!game.currentMission->challengeData.isChallenge && player->guns[0].type && player->missiles && strcmp(game.selectedStarSystem, "Sol") && !battle.stats[STAT_SHOTS_FIRED] && !battle.stats[STAT_MISSILES_FIRED])
+ {
+ awardTrophy("PACIFIST");
}
}
@@ -261,3 +484,25 @@ static void awardCraftTrophy(void)
awardTrophy(trophyId);
}
+
+static void setSparkleColor(Trophy *t)
+{
+ switch (t->value)
+ {
+ case TROPHY_BRONZE:
+ SDL_SetTextureColorMod(sparkle, 255, 128, 0);
+ break;
+
+ case TROPHY_SILVER:
+ SDL_SetTextureColorMod(sparkle, 192, 192, 192);
+ break;
+
+ case TROPHY_GOLD:
+ SDL_SetTextureColorMod(sparkle, 255, 255, 0);
+ break;
+
+ case TROPHY_PLATINUM:
+ SDL_SetTextureColorMod(sparkle, 0, 128, 255);
+ break;
+ }
+}
diff --git a/src/game/trophies.h b/src/game/trophies.h
index ef5b084..fa06a85 100644
--- a/src/game/trophies.h
+++ b/src/game/trophies.h
@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define TROPHIES_PER_PAGE 4
+
#include "../common.h"
#include "../json/cJSON.h"
@@ -28,11 +30,19 @@ extern char *readFile(char *filename);
extern int getJSONValue(cJSON *node, char *name, int defValue);
extern int getPercent(float current, float total);
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
-extern void blit(SDL_Texture *t, int x, int y, int center);
+extern void blit(SDL_Texture *texture, int x, int y, int centered);
+extern void blitRotated(SDL_Texture *texture, int x, int y, float angle);
+extern void blitScaled(SDL_Texture *t, int x, int y, int w, int h);
extern char *getTranslatedString(char *string);
extern SDL_Texture *getTexture(char *filename);
extern void playSound(int id);
+extern Widget *getWidget(const char *name, const char *group);
+extern void drawWidgets(char *groupName);
+extern char *timeToDate(long millis);
+extern void textSize(char *text, int size, int *w, int *h);
extern App app;
+extern Battle battle;
extern Colors colors;
+extern Entity *player;
extern Game game;
diff --git a/src/main.c b/src/main.c
index 63039e4..c3ce317 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "main.h"
-static void handleArguments(int argc, char *argv[]);
+static void handleMissionArgs(int argc, char *argv[]);
+static void handleLoggingArgs(int argc, char *argv[]);
int main(int argc, char *argv[])
{
@@ -29,11 +30,11 @@ int main(int argc, char *argv[])
long expireTextTimer;
SDL_Event event;
- SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN);
-
memset(&app, 0, sizeof(App));
memset(&dev, 0, sizeof(Dev));
+ handleLoggingArgs(argc, argv);
+
atexit(cleanup);
srand(time(NULL));
@@ -48,7 +49,12 @@ int main(int argc, char *argv[])
createScreenshotFolder();
- handleArguments(argc, argv);
+ if (fileExists(getSaveFilePath(SAVE_FILENAME)))
+ {
+ loadGame();
+ }
+
+ handleMissionArgs(argc, argv);
dev.fps = frames = td = 0;
then = SDL_GetTicks();
@@ -103,8 +109,16 @@ int main(int argc, char *argv[])
while (td >= LOGIC_RATE)
{
app.delegate.logic();
+
td -= LOGIC_RATE;
+ if (app.resetTimeDelta)
+ {
+ td = 0;
+ then = SDL_GetTicks();
+ app.resetTimeDelta = 0;
+ }
+
game.stats[STAT_TIME]++;
}
@@ -149,6 +163,13 @@ int main(int argc, char *argv[])
expireTextTimer = SDL_GetTicks() + (1000 * 10);
}
+ /* trophy unlocks might cause the game to save several times in one frame */
+ if (app.saveGame)
+ {
+ saveGame();
+ app.saveGame = 0;
+ }
+
/* always zero the mouse motion */
app.mouse.dx = app.mouse.dy = 0;
@@ -158,7 +179,34 @@ int main(int argc, char *argv[])
return 0;
}
-static void handleArguments(int argc, char *argv[])
+static void handleLoggingArgs(int argc, char *argv[])
+{
+ int i;
+
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ for (i = 1 ; i < argc ; i++)
+ {
+ if (strcmp(argv[i], "-debug") == 0)
+ {
+ dev.debug = 1;
+
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
+ }
+
+ if (strcmp(argv[i], "-warn") == 0)
+ {
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN);
+ }
+
+ if (strcmp(argv[i], "-info") == 0)
+ {
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+ }
+ }
+}
+
+static void handleMissionArgs(int argc, char *argv[])
{
int i;
int testingMission = 0;
@@ -172,29 +220,10 @@ static void handleArguments(int argc, char *argv[])
testingMission = 1;
}
- else
- {
- if (strcmp(argv[i], "-debug") == 0)
- {
- dev.debug = 1;
-
- SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
- }
-
- if (strcmp(argv[i], "-info") == 0)
- {
- SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
- }
- }
}
if (!testingMission)
{
- if (fileExists(getSaveFilePath(SAVE_FILENAME)))
- {
- loadGame();
- }
-
initTitle();
}
}
diff --git a/src/main.h b/src/main.h
index a792f1b..727f219 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,12 +45,12 @@ extern int fileExists(char *filename);
extern char *getSaveFilePath(char *filename);
extern void init18N(int argc, char *argv[]);
extern void initLookups(void);
-extern void initGame(void);
extern void doKeyDown(SDL_KeyboardEvent *event);
extern void doKeyUp(SDL_KeyboardEvent *event);
extern void createScreenshotFolder(void);
extern int isControl(int type);
extern void clearControl(int type);
+extern void saveGame(void);
App app;
Colors colors;
diff --git a/src/structs.h b/src/structs.h
index ca87ab3..c3fa52d 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -253,15 +253,19 @@ typedef struct {
int killLimit;
int lossLimit;
int itemLimit;
+ int playerItemLimit;
int escapeLimit;
int waypointLimit;
int rescueLimit;
+ int disableLimit;
int noMissiles;
int noBoost;
int noECM;
int noGuns;
- int scriptedEnd;
int allowPlayerDeath;
+ int clearWaypointEnemies;
+ int eliminateThreats;
+ int isDeathMatch;
Challenge *challenges[MAX_CHALLENGES];
} ChallengeData;
@@ -342,8 +346,11 @@ typedef struct {
int radarRange;
int numPlayerGuns;
int numObjectivesComplete, numObjectivesTotal, numConditions;
+ int scriptedEnd;
+ int hasThreats;
Entity *missionTarget;
Entity *jumpgate;
+ Entity *messageSpeaker;
SDL_Texture *background, *planetTexture;
PointF planet;
int planetWidth, planetHeight;
@@ -370,6 +377,7 @@ struct Trophy {
char id[MAX_NAME_LENGTH];
char title[MAX_DESCRIPTION_LENGTH];
char description[MAX_DESCRIPTION_LENGTH];
+ char awardDateStr[MAX_NAME_LENGTH];
int value;
int hidden;
int stat;
@@ -380,6 +388,13 @@ struct Trophy {
Trophy *next;
};
+typedef struct {
+ int friendlyFire;
+ int autoSwitchPlayerTarget;
+ int missileReTarget;
+ int healthBars;
+} Gameplay;
+
typedef struct {
StarSystem starSystemHead;
Mission challengeMissionHead;
@@ -441,7 +456,9 @@ typedef struct {
} Mouse;
typedef struct {
+ int resetTimeDelta;
char saveDir[MAX_FILENAME_LENGTH];
+ int saveGame;
int winWidth;
int winHeight;
float scaleX;
@@ -449,6 +466,7 @@ typedef struct {
int fullscreen;
int musicVolume;
int soundVolume;
+ Gameplay gameplay;
Mouse mouse;
int keyboard[MAX_KEYBOARD_KEYS];
SDL_Texture *backBuffer;
diff --git a/src/system/init.c b/src/system/init.c
index 4845b4c..347ce4e 100644
--- a/src/system/init.c
+++ b/src/system/init.c
@@ -155,7 +155,7 @@ void initGameSystem(void)
for (i = 0 ; i < numInitFuns ; i++)
{
- showLoadingStep(i, numInitFuns);
+ showLoadingStep(i + 1, numInitFuns);
initFuncs[i]();
}
@@ -216,12 +216,15 @@ static void loadConfig(void)
{
loadConfigFile(configFilename);
}
+
+ /* so that the player doesn't get confused if this is a new game */
+ saveConfig();
}
static void loadConfigFile(char *filename)
{
int i;
- cJSON *root, *controlsJSON, *node;
+ cJSON *root, *controlsJSON, *node, *gameplayJSON;
char *text;
text = readFile(filename);
@@ -257,19 +260,25 @@ static void loadConfigFile(char *filename)
node = node->next;
}
}
+
+ gameplayJSON = cJSON_GetObjectItem(root, "gameplay");
+ if (gameplayJSON)
+ {
+ app.gameplay.friendlyFire = cJSON_GetObjectItem(gameplayJSON, "friendlyFire")->valueint;
+ app.gameplay.autoSwitchPlayerTarget = cJSON_GetObjectItem(gameplayJSON, "autoSwitchPlayerTarget")->valueint;
+ app.gameplay.missileReTarget = cJSON_GetObjectItem(gameplayJSON, "missileReTarget")->valueint;
+ app.gameplay.healthBars = cJSON_GetObjectItem(gameplayJSON, "healthBars")->valueint;
+ }
cJSON_Delete(root);
free(text);
-
- /* so that the player doesn't get confused if this is a new game */
- saveConfig();
}
void saveConfig(void)
{
int i;
char *out, *configFilename;
- cJSON *root, *controlsJSON, *keysJSON, *mouseJSON;
+ cJSON *root, *controlsJSON, *keysJSON, *mouseJSON, *gameplayJSON;
configFilename = getSaveFilePath(CONFIG_FILENAME);
@@ -297,8 +306,14 @@ void saveConfig(void)
controlsJSON = cJSON_CreateObject();
cJSON_AddItemToObject(controlsJSON, "keys", keysJSON);
cJSON_AddItemToObject(controlsJSON, "mouse", mouseJSON);
-
cJSON_AddItemToObject(root, "controls", controlsJSON);
+
+ gameplayJSON = cJSON_CreateObject();
+ cJSON_AddNumberToObject(gameplayJSON, "friendlyFire", app.gameplay.friendlyFire);
+ cJSON_AddNumberToObject(gameplayJSON, "autoSwitchPlayerTarget", app.gameplay.autoSwitchPlayerTarget);
+ cJSON_AddNumberToObject(gameplayJSON, "missileReTarget", app.gameplay.missileReTarget);
+ cJSON_AddNumberToObject(gameplayJSON, "healthBars", app.gameplay.healthBars);
+ cJSON_AddItemToObject(root, "gameplay", gameplayJSON);
out = cJSON_Print(root);
diff --git a/src/system/init.h b/src/system/init.h
index 97f9767..baf6729 100644
--- a/src/system/init.h
+++ b/src/system/init.h
@@ -74,4 +74,3 @@ extern void initTrophies(void);
extern App app;
extern Colors colors;
-extern Game game;
diff --git a/src/system/load.c b/src/system/load.c
index 1e527e8..24e07be 100644
--- a/src/system/load.c
+++ b/src/system/load.c
@@ -24,6 +24,7 @@ static void loadStats(cJSON *statsJSON);
static void loadStarSystems(cJSON *starSystemsJSON);
static void loadMissions(cJSON *missionsCJSON);
static void loadChallenges(cJSON *challengesCJSON);
+static void loadTrophies(cJSON *trophiesJSON);
void loadGame(void)
{
@@ -42,6 +43,8 @@ void loadGame(void)
loadChallenges(cJSON_GetObjectItem(gameJSON, "challenges"));
loadStats(cJSON_GetObjectItem(gameJSON, "stats"));
+
+ loadTrophies(cJSON_GetObjectItem(gameJSON, "trophies"));
cJSON_Delete(root);
free(text);
@@ -70,7 +73,11 @@ static void loadMissions(cJSON *missionsJSON)
for (missionJSON = missionsJSON->child ; missionJSON != NULL ; missionJSON = missionJSON->next)
{
mission = getMission(cJSON_GetObjectItem(missionJSON, "filename")->valuestring);
- mission->completed = cJSON_GetObjectItem(missionJSON, "completed")->valueint;
+
+ if (mission)
+ {
+ mission->completed = cJSON_GetObjectItem(missionJSON, "completed")->valueint;
+ }
}
}
@@ -118,3 +125,23 @@ static void loadStats(cJSON *statsJSON)
}
}
}
+
+static void loadTrophies(cJSON *trophiesJSON)
+{
+ Trophy *t;
+ cJSON *trophyJSON;
+
+ if (trophiesJSON)
+ {
+ for (trophyJSON = trophiesJSON->child ; trophyJSON != NULL ; trophyJSON = trophyJSON->next)
+ {
+ t = getTrophy(cJSON_GetObjectItem(trophyJSON, "id")->valuestring);
+
+ if (t)
+ {
+ t->awardDate = cJSON_GetObjectItem(trophyJSON, "awardDate")->valueint;
+ t->awarded = 1;
+ }
+ }
+ }
+}
diff --git a/src/system/load.h b/src/system/load.h
index b0543fe..262578a 100644
--- a/src/system/load.h
+++ b/src/system/load.h
@@ -29,5 +29,6 @@ extern int lookup(char *lookup);
extern char *getSaveFilePath(char *filename);
extern char *getLookupName(char *prefix, long num);
extern StarSystem *getStarSystem(char *name);
+extern Trophy *getTrophy(char *id);
extern Game game;
diff --git a/src/system/lookup.c b/src/system/lookup.c
index acb27cf..da8210b 100644
--- a/src/system/lookup.c
+++ b/src/system/lookup.c
@@ -65,6 +65,11 @@ void initLookups(void)
addLookup("EF_AI_LEADER", EF_AI_LEADER);
addLookup("EF_NO_KILL_INC", EF_NO_KILL_INC);
addLookup("EF_NO_MT_BOX", EF_NO_MT_BOX);
+ addLookup("EF_FRIENDLY_HEALTH_BAR", EF_FRIENDLY_HEALTH_BAR);
+ addLookup("EF_AI_IGNORE", EF_AI_IGNORE);
+ addLookup("EF_NO_THREAT", EF_NO_THREAT);
+ addLookup("EF_NO_HEALTH_BAR", EF_NO_HEALTH_BAR);
+ addLookup("EF_DROPS_ITEMS", EF_DROPS_ITEMS);
addLookup("AIF_NONE", AIF_NONE);
addLookup("AIF_MOVES_TO_PLAYER", AIF_MOVES_TO_PLAYER);
@@ -144,6 +149,7 @@ void initLookups(void)
addLookup("CHALLENGE_PLAYER_KILLS", CHALLENGE_PLAYER_KILLS);
addLookup("CHALLENGE_DISABLE", CHALLENGE_DISABLE);
addLookup("CHALLENGE_ITEMS", CHALLENGE_ITEMS);
+ addLookup("CHALLENGE_PLAYER_ITEMS", CHALLENGE_PLAYER_ITEMS);
addLookup("CHALLENGE_RESCUE", CHALLENGE_RESCUE);
addLookup("STAT_PERCENT_COMPLETE", STAT_PERCENT_COMPLETE);
diff --git a/src/system/resources.c b/src/system/resources.c
index ba88d56..34f6b63 100644
--- a/src/system/resources.c
+++ b/src/system/resources.c
@@ -81,17 +81,17 @@ void initResources(void)
free(filenames);
}
-char *getBackgroundTextureName(int i)
+char *getBackgroundTextureName(unsigned long i)
{
return backgrounds[i % numBackgrounds];
}
-char *getPlanetTextureName(int i)
+char *getPlanetTextureName(unsigned long i)
{
return planets[i % numPlanets];
}
-char *getMusicFilename(int i)
+char *getMusicFilename(unsigned long i)
{
return musicFiles[i % numMusicFiles];
}
diff --git a/src/system/save.c b/src/system/save.c
index 3b568d2..83ce48b 100644
--- a/src/system/save.c
+++ b/src/system/save.c
@@ -24,6 +24,7 @@ static void saveStarSystems(cJSON *gameJSON);
static void saveChallenges(cJSON *gameJSON);
static cJSON *getMissionsJSON(StarSystem *starSystem);
static void saveStats(cJSON *gameJSON);
+static void saveTrophies(cJSON *gameJSON);
void saveGame(void)
{
@@ -43,6 +44,8 @@ void saveGame(void)
saveChallenges(gameJSON);
saveStats(gameJSON);
+
+ saveTrophies(gameJSON);
out = cJSON_Print(root);
@@ -61,13 +64,16 @@ static void saveStarSystems(cJSON *gameJSON)
for (starSystem = game.starSystemHead.next ; starSystem != NULL ; starSystem = starSystem->next)
{
- starSystemJSON = cJSON_CreateObject();
+ if (starSystem->totalMissions > 0)
+ {
+ starSystemJSON = cJSON_CreateObject();
- cJSON_AddStringToObject(starSystemJSON, "name", starSystem->name);
- cJSON_AddStringToObject(starSystemJSON, "side", getLookupName("SIDE_", starSystem->side));
- cJSON_AddItemToObject(starSystemJSON, "missions", getMissionsJSON(starSystem));
+ cJSON_AddStringToObject(starSystemJSON, "name", starSystem->name);
+ cJSON_AddStringToObject(starSystemJSON, "side", getLookupName("SIDE_", starSystem->side));
+ cJSON_AddItemToObject(starSystemJSON, "missions", getMissionsJSON(starSystem));
- cJSON_AddItemToArray(starSystemsJSON, starSystemJSON);
+ cJSON_AddItemToArray(starSystemsJSON, starSystemJSON);
+ }
}
cJSON_AddItemToObject(gameJSON, "starSystems", starSystemsJSON);
@@ -146,3 +152,26 @@ static void saveStats(cJSON *gameJSON)
cJSON_AddItemToObject(gameJSON, "stats", stats);
}
+
+static void saveTrophies(cJSON *gameJSON)
+{
+ Trophy *t;
+ cJSON *trophiesJSON, *trophyJSON;
+
+ trophiesJSON = cJSON_CreateArray();
+
+ for (t = game.trophyHead.next ; t != NULL ; t = t->next)
+ {
+ if (t->awarded)
+ {
+ trophyJSON = cJSON_CreateObject();
+
+ cJSON_AddStringToObject(trophyJSON, "id", t->id);
+ cJSON_AddNumberToObject(trophyJSON, "awardDate", t->awardDate);
+
+ cJSON_AddItemToArray(trophiesJSON, trophyJSON);
+ }
+ }
+
+ cJSON_AddItemToObject(gameJSON, "trophies", trophiesJSON);
+}
diff --git a/src/system/sound.c b/src/system/sound.c
index 429f628..13e0cfd 100644
--- a/src/system/sound.c
+++ b/src/system/sound.c
@@ -67,7 +67,7 @@ void playBattleSound(int id, int x, int y)
int channel;
float vol;
- if (player != NULL)
+ if (player->alive == ALIVE_ALIVE)
{
lastPlayerX = player->x;
lastPlayerY = player->y;
diff --git a/src/system/transition.c b/src/system/transition.c
index 06991b6..c9d74b2 100644
--- a/src/system/transition.c
+++ b/src/system/transition.c
@@ -43,4 +43,6 @@ void endSectionTransition(void)
{
SDL_Delay(elasped);
}
+
+ app.resetTimeDelta = 1;
}
diff --git a/src/system/transition.h b/src/system/transition.h
index c6fd9b3..9b79f94 100644
--- a/src/system/transition.h
+++ b/src/system/transition.h
@@ -24,3 +24,5 @@ extern void prepareScene(void);
extern void presentScene(void);
extern void clearInput(void);
extern void expireTexts(int all);
+
+extern App app;
diff --git a/src/system/util.c b/src/system/util.c
index 2d9f409..948570e 100644
--- a/src/system/util.c
+++ b/src/system/util.c
@@ -128,6 +128,19 @@ char *timeToString(long millis, int showHours)
return TIME;
}
+char *timeToDate(long millis)
+{
+ static char DATE[MAX_NAME_LENGTH];
+
+ struct tm *timeinfo;
+
+ timeinfo = localtime(&millis);
+
+ strftime(DATE, MAX_NAME_LENGTH, "%d %b %Y, %I:%M%p", timeinfo);
+
+ return DATE;
+}
+
char *getJSONValueStr(cJSON *node, char *name, char *defValue)
{
cJSON *child;
diff --git a/src/system/util.h b/src/system/util.h
index 667646c..1f43fb9 100644
--- a/src/system/util.h
+++ b/src/system/util.h
@@ -20,3 +20,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../common.h"
#include "../json/cJSON.h"
+#include "time.h"
diff --git a/src/system/widgets.h b/src/system/widgets.h
index e78cd21..1c1f502 100644
--- a/src/system/widgets.h
+++ b/src/system/widgets.h
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
extern char *readFile(char *filename);
extern long lookup(char *name);
-extern float mod(float n, float x);
extern void blit(SDL_Texture *texture, int x, int y, int centered);
extern SDL_Texture *getTexture(char *filename);
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
diff --git a/stats.md b/stats.md
deleted file mode 100644
index d1ce28a..0000000
--- a/stats.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Statistics
-
-* Lines of code: 16847
-* Size of source: 523K
-* Size of data: 478K
-* Size of graphics: 3.2M
-* Size of sound: 638K
-* Size of music: 53M
-
-* Number of missions: 56
-* Number of challenges: 42
-* Number of spacecraft: 46
-* Number of trophies: 41
-
-* Translatable strings: 620
diff --git a/tools/tidyHeaders.sh b/tools/tidyHeaders.sh
index 08e9114..9d2dc53 100755
--- a/tools/tidyHeaders.sh
+++ b/tools/tidyHeaders.sh
@@ -30,6 +30,7 @@ function cleanHeader($headerFile)
$func_pattern = "/(([A-Z0-9_]+)\\()/i";
$struct_pattern = "/([A-Z]+);/i";
+ $define_pattern = "/#define ([A-Z]+)/i";
$bodyFile = $headerFile;
$bodyFile[strlen($bodyFile) - 1] = 'c';
@@ -38,21 +39,37 @@ function cleanHeader($headerFile)
{
$header = file($headerFile);
$body = file_get_contents($bodyFile);
+ $lines = [];
$i = 0;
$hasChanges = false;
foreach ($header as $line)
{
- if (strstr($line, "extern") !== FALSE && strstr($line, "getTranslatedString") === FALSE)
+ if (preg_match("/extern|define/", $line) && strstr($line, "getTranslatedString") === FALSE)
{
preg_match($func_pattern, $line, $matches);
-
+
if (count($matches) == 3)
{
$extern = $matches[2];
-
- if (strstr($body, $extern) === FALSE)
+
+ if (!preg_match_all("/\b[(]?${extern}[\\(;,)\\n]/", $body))
+ {
+ if (!$hasChanges)
+ {
+ echo "$headerFile\n";
+ $hasChanges = true;
+ }
+ echo "\t- $line";
+ unset($header[$i]);
+ }
+
+ if (!in_array($line, $lines))
+ {
+ $lines[] = $line;
+ }
+ else
{
if (!$hasChanges)
{
@@ -70,6 +87,43 @@ function cleanHeader($headerFile)
{
$extern = $matches[1];
+ $externs[] = $extern;
+
+ if (!preg_match_all("/\b${extern}[\\.\\-\\)]/", $body))
+ {
+ if (!$hasChanges)
+ {
+ echo "$headerFile\n";
+ $hasChanges = true;
+ }
+ echo "\t- $line";
+ unset($header[$i]);
+ }
+
+ if (!in_array($line, $lines))
+ {
+ $lines[] = $line;
+ }
+ else
+ {
+ if (!$hasChanges)
+ {
+ echo "$headerFile\n";
+ $hasChanges = true;
+ }
+ echo "\t- $line";
+ unset($header[$i]);
+ }
+ }
+
+ preg_match($define_pattern, $line, $matches);
+
+ if (count($matches) == 2)
+ {
+ $extern = $matches[1];
+
+ $externs[] = $extern;
+
if (strstr($body, "$extern") === FALSE)
{
if (!$hasChanges)
@@ -80,6 +134,21 @@ function cleanHeader($headerFile)
echo "\t- $line";
unset($header[$i]);
}
+
+ if (!in_array($line, $lines))
+ {
+ $lines[] = $line;
+ }
+ else
+ {
+ if (!$hasChanges)
+ {
+ echo "$headerFile\n";
+ $hasChanges = true;
+ }
+ echo "\t- $line";
+ unset($header[$i]);
+ }
}
}
@@ -95,17 +164,20 @@ function cleanHeader($headerFile)
function recurseDir($dir)
{
- $files = array_diff(scandir($dir), array('..', '.'));
-
- foreach ($files as $file)
+ if ($dir != "../src/json")
{
- if (is_dir("$dir/$file"))
+ $files = array_diff(scandir($dir), array('..', '.'));
+
+ foreach ($files as $file)
{
- recurseDir("$dir/$file");
- }
- else if (strstr($file, ".h") !== FALSE)
- {
- cleanHeader("$dir/$file");
+ if (is_dir("$dir/$file"))
+ {
+ recurseDir("$dir/$file");
+ }
+ else if (strstr($file, ".h") !== FALSE)
+ {
+ cleanHeader("$dir/$file");
+ }
}
}
}
