diff --git a/data/trophies/trophies.json b/data/trophies/trophies.json index d5973c5..d36e552 100644 --- a/data/trophies/trophies.json +++ b/data/trophies/trophies.json @@ -272,5 +272,11 @@ "description" : "Be destroyed while piloting an ATAF", "value" : "TROPHY_BRONZE", "hidden" : 1 + }, + { + "id" : "PACIFIST", + "title" : "Pacifist", + "description" : "Complete any fighter-based mission without firing", + "value" : "TROPHY_BRONZE" } ] diff --git a/src/game/trophies.c b/src/game/trophies.c index ab497b6..c2a9ac0 100644 --- a/src/game/trophies.c +++ b/src/game/trophies.c @@ -238,7 +238,7 @@ void doTrophyAlerts(void) } else if (alertTrophy) { - alertRect.x = MIN(alertRect.x + 16, -1); + alertRect.x = MIN(alertRect.x + 24, -1); if (alertRect.x > -150) { @@ -363,6 +363,7 @@ static void loadTrophyData(char *filename) t->shortDescription[MAX_NAME_LENGTH - 1] = '.'; t->shortDescription[MAX_NAME_LENGTH - 2] = '.'; t->shortDescription[MAX_NAME_LENGTH - 3] = '.'; + t->shortDescription[MAX_NAME_LENGTH - 4] = ' '; } t->stat = -1; @@ -459,6 +460,11 @@ void awardPostMissionTrophies(void) awardTrophy("SURVIVOR"); } } + + if (player->guns[0].type && player->missiles && !game->starSystem->isSol && !battle.stats[STAT_SHOTS_FIRED] && !battle.stats[STAT_MISSILES_FIRED]) + { + awardTrophy("PACIFIST"); + } } /* the player is known as "Player", so we need to check the craft they were assigned to */ diff --git a/src/game/trophies.h b/src/game/trophies.h index ee8e11d..fa06a85 100644 --- a/src/game/trophies.h +++ b/src/game/trophies.h @@ -44,4 +44,5 @@ 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;