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

Give plasma ammo with powerups in super-easy mode.

This commit is contained in:
Layla Marchant 2020-05-26 16:47:14 -04:00
parent 1a4e2ea71e
commit d8734e5625
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/game.c
View File

@ -362,12 +362,16 @@ static void game_doCollectables()
strcpy(temp, _("Firing rate increased")); strcpy(temp, _("Firing rate increased"));
} }
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.difficulty == DIFFICULTY_SUPEREASY)
(player.ammo[0] > 0)) || (game.area != MISN_INTERCEPTION)
|| (player.ammo[0] > 0))
{
if ((game.difficulty == DIFFICULTY_SUPEREASY)
|| (game.area != MISN_INTERCEPTION))
{ {
if (game.area != MISN_INTERCEPTION)
LIMIT_ADD(player.ammo[0], collectable->value, LIMIT_ADD(player.ammo[0], collectable->value,
0, game.maxPlasmaAmmo); 0, game.maxPlasmaAmmo);
}
if (weapons[W_PLAYER_WEAPON].reload[0] <= rate2reload[game.maxPlasmaRate]) if (weapons[W_PLAYER_WEAPON].reload[0] <= rate2reload[game.maxPlasmaRate])
strcpy(temp, _("Firing rate already at maximum")); strcpy(temp, _("Firing rate already at maximum"));
@ -399,12 +403,16 @@ static void game_doCollectables()
strcpy(temp, _("Plasma output increased")); strcpy(temp, _("Plasma output increased"));
} }
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.difficulty == DIFFICULTY_SUPEREASY)
(player.ammo[0] > 0)) || (game.area != MISN_INTERCEPTION)
|| (player.ammo[0] > 0))
{
if ((game.difficulty == DIFFICULTY_SUPEREASY)
|| (game.area != MISN_INTERCEPTION))
{ {
if (game.area != MISN_INTERCEPTION)
LIMIT_ADD(player.ammo[0], collectable->value, LIMIT_ADD(player.ammo[0], collectable->value,
0, game.maxPlasmaAmmo); 0, game.maxPlasmaAmmo);
}
if (weapons[W_PLAYER_WEAPON].ammo[0] >= game.maxPlasmaOutput) if (weapons[W_PLAYER_WEAPON].ammo[0] >= game.maxPlasmaOutput)
strcpy(temp, _("Plasma output already at maximum")); strcpy(temp, _("Plasma output already at maximum"));
@ -436,12 +444,16 @@ static void game_doCollectables()
strcpy(temp, _("Plasma damage increased")); strcpy(temp, _("Plasma damage increased"));
} }
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.difficulty == DIFFICULTY_SUPEREASY)
(player.ammo[0] > 0)) || (game.area != MISN_INTERCEPTION)
|| (player.ammo[0] > 0))
{
if ((game.difficulty == DIFFICULTY_SUPEREASY)
|| (game.area != MISN_INTERCEPTION))
{ {
if (game.area != MISN_INTERCEPTION)
LIMIT_ADD(player.ammo[0], collectable->value, LIMIT_ADD(player.ammo[0], collectable->value,
0, game.maxPlasmaAmmo); 0, game.maxPlasmaAmmo);
}
if (weapons[W_PLAYER_WEAPON].damage >= game.maxPlasmaDamage) if (weapons[W_PLAYER_WEAPON].damage >= game.maxPlasmaDamage)
strcpy(temp, _("Plasma damage already at maximum")); strcpy(temp, _("Plasma damage already at maximum"));