walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed campaign % trophies: redundant.

This commit is contained in:
Steve 2016-05-03 08:08:21 +01:00
parent af83eb8cf7
commit f2ade94073
2 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
data/trophies/trophies.json
View File

@ -7,58 +7,10 @@
}, },
{ {
"id" : "CAMPAIGN_1", "id" : "CAMPAIGN_1",
"title" : "2nd Lieutenant", "title" : "Gentle start",
"description" : "Complete a campaign mission", "description" : "Complete a campaign mission",
"value" : "TROPHY_BRONZE" "value" : "TROPHY_BRONZE"
}, },
{
"id" : "_CAMPAIGN_10",
"title" : "1st Lieutenant",
"description" : "Complete 10%% of all missions",
"value" : "TROPHY_BRONZE"
},
{
"id" : "_CAMPAIGN_20",
"title" : "Lieutenant Commander",
"description" : "Complete 20%% of all missions",
"value" : "TROPHY_BRONZE"
},
{
"id" : "_CAMPAIGN_40",
"title" : "Commander",
"description" : "Complete 40%% of all missions",
"value" : "TROPHY_BRONZE"
},
{
"id" : "_CAMPAIGN_50",
"title" : "Captain",
"description" : "Complete 50%% of all missions",
"value" : "TROPHY_SILVER"
},
{
"id" : "_CAMPAIGN_60",
"title" : "Commodore",
"description" : "Complete 60%% of all missions",
"value" : "TROPHY_SILVER"
},
{
"id" : "_CAMPAIGN_80",
"title" : "Rear Admiral",
"description" : "Complete 80%% of all missions",
"value" : "TROPHY_SILVER"
},
{
"id" : "_CAMPAIGN_90",
"title" : "Admiral",
"description" : "Complete 90%% of all missions",
"value" : "TROPHY_GOLD"
},
{
"id" : "_CAMPAIGN_100",
"title" : "Fleet Admiral",
"description" : "Complete all campaign missions",
"value" : "TROPHY_GOLD"
},
{ {
"id" : "CAMPAIGN_SOL", "id" : "CAMPAIGN_SOL",
"title" : "Ready for duty", "title" : "Ready for duty",

7
src/game/trophies.c
View File

@ -403,7 +403,7 @@ void awardCampaignTrophies(void)
{ {
char trophyId[MAX_NAME_LENGTH]; char trophyId[MAX_NAME_LENGTH];
char name[MAX_NAME_LENGTH]; char name[MAX_NAME_LENGTH];
int completed, i, len; int i, len;
StarSystem *starSystem; StarSystem *starSystem;
if (game.completedMissions) if (game.completedMissions)
@ -411,11 +411,6 @@ void awardCampaignTrophies(void)
awardTrophy("CAMPAIGN_1"); awardTrophy("CAMPAIGN_1");
} }
/* check % of missions completed - 10% increments*/
completed = (getPercent(game.completedMissions, game.totalMissions) / 10) * 10;
sprintf(trophyId, "CAMPAIGN_%d", completed);
awardTrophy(trophyId);
/* check if all star system missions are completed */ /* check if all star system missions are completed */
for (starSystem = game.starSystemHead.next ; starSystem != NULL ; starSystem = starSystem->next) for (starSystem = game.starSystemHead.next ; starSystem != NULL ; starSystem = starSystem->next)
{ {