From 2b785ba9b214dcf1b577b5088c21c4d1f9477099 Mon Sep 17 00:00:00 2001 From: peyre Date: Wed, 27 Apr 2011 03:04:53 +0000 Subject: [PATCH] Added morale boxes to the launch facility screenE --- ChangeLog | 66 ++++++++++++++++++++++++++++++------------------------- radar.c | 22 +++++++++++++++++++ version.c | 2 +- 3 files changed, 59 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e92564..d4df4d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,49 +1,55 @@ +2011-02-23 Leon Baradat + + * V259 + + * radar.c: Added morale boxes next to 'naut names in launch facility screen + 2011-02-23 Nicolas Laplume * V258 - * configure.in: Changed version to 1.0.0 - - * vab.c, options.c, options.h: Readded Atlas/R7 Booster capacity (removed option to turn it off) - - * prest.c: Changed Prestige Seconds text from "(SCD)" to "(2ND)" - - * budget.c: Fixed bug in Viewing Stand when flown missions was fewer than 3 - - * mission.dat: Fixed bug in Lunar Missions (from V252) - + * configure.in: Changed version to 1.0.0 + + * vab.c, options.c, options.h: Readded Atlas/R7 Booster capacity (removed option to turn it off) + + * prest.c: Changed Prestige Seconds text from "(SCD)" to "(2ND)" + + * budget.c: Fixed bug in Viewing Stand when flown missions was fewer than 3 + + * mission.dat: Fixed bug in Lunar Missions (from V252) + 2011-02-20 Nicolas Laplume * V257 - * mission.dat: Fixed bug in some failures in Lunar Missions (from V252) - - * place.c: Changed the Prestige First screen in Mission Review to show also Prestige Seconds - - * prest.c: Reduced penalty in manned missions when no-one dies to -7 - + * mission.dat: Fixed bug in some failures in Lunar Missions (from V252) + + * place.c: Changed the Prestige First screen in Mission Review to show also Prestige Seconds + + * prest.c: Reduced penalty in manned missions when no-one dies to -7 + 2011-02-17 Nicolas Laplume * V256 - * newmis.c: Fixed bug in the order of the missions in 2-players games - + * newmis.c: Fixed bug in the order of the missions in 2-players games + 2011-02-14 Nicolas Laplume * V255 - * start.c: Fixed bug in the naut morale caluclations. Changed the penalty/bonus when crewmates are compatible - - * place.c: Added Prestige First in Mission Review - - * budget.c: Viwing Stand now shows all missions, not just last 3 - - * vab.c: VAB's Autopurchase now shows the price of the equipment - - * vab.c, options: Removed Atlas Booster capacity (can be turned on in config file) - - * mc.c, options: Added Cheat to enable sucessful missions increase R&DMax - + * start.c: Fixed bug in the naut morale caluclations. Changed the penalty/bonus when crewmates are compatible + + * place.c: Added Prestige First in Mission Review + + * budget.c: Viwing Stand now shows all missions, not just last 3 + + * vab.c: VAB's Autopurchase now shows the price of the equipment + + * vab.c, options: Removed Atlas Booster capacity (can be turned on in config file) + + * mc.c, options: Added Cheat to enable sucessful missions increase R&DMax + 2011-02-10 Nicolas Laplume * V254 diff --git a/radar.c b/radar.c index 3afb15a..a9c4abe 100644 --- a/radar.c +++ b/radar.c @@ -145,6 +145,17 @@ void PadDraw(char plr,char pad) if (j==6) PrintAt(0,0,"(CREW VII)"); if (j==7) PrintAt(0,0,"(CREW VIII)"); for (k=0;kP[plr].Gcnt[i][j];k++) { + // Draw a morale box for each crew member - Leon + grSetColor(1); + RectFill(13,110+7*k,20,110+7*k,2); // Top + RectFill(13,110+7*k,13,116+7*k,2); // Left + RectFill(13,116+7*k,20,116+7*k,4); // Bottom + RectFill(21,110+7*k,21,116+7*k,4); // Right + if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood>=65) RectFill(14,111+7*k,20,115+7*k,16); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood<65 && Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood>=40) RectFill(14,111+7*k,20,115+7*k,11); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood<40 && Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood>=20) RectFill(14,111+7*k,20,115+7*k,8); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood<20) RectFill(14,111+7*k,20,115+7*k,0); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Mood==0) RectFill(14,111+7*k,20,115+7*k,3); grSetColor(1); if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].Sex==1) grSetColor(5); // Show female 'nauts in blue if (Data->P[plr].Pool[Data->P[plr].Crew[i][j][k]-1].RDelay>0) grSetColor(0); // Show anyone who's announced retirement in black @@ -168,6 +179,17 @@ void PadDraw(char plr,char pad) if (l==6) PrintAt(0,0,"(CREW VII)"); if (l==7) PrintAt(0,0,"(CREW VIII)"); for (k=0;kP[plr].Gcnt[i][l];k++) { + // Draw a morale box for each crew member - Leon + grSetColor(1); + RectFill(13,148+7*k,20,148+7*k,2); // Top + RectFill(13,148+7*k,13,154+7*k,2); // Left + RectFill(13,154+7*k,20,154+7*k,4); // Bottom + RectFill(21,148+7*k,21,154+7*k,4); // Right + if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood>=65) RectFill(14,149+7*k,20,153+7*k,16); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood<65 && Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood>=40) RectFill(14,149+7*k,20,153+7*k,11); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood<40 && Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood>=20) RectFill(14,149+7*k,20,153+7*k,8); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood<20) RectFill(14,149+7*k,20,153+7*k,0); + if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Mood==0) RectFill(14,149+7*k,20,153+7*k,3); grSetColor(1); if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].Sex==1) grSetColor(5); // Show female 'nauts in blue if (Data->P[plr].Pool[Data->P[plr].Crew[i][l][k]-1].RDelay>0) grSetColor(0); // But show anyone who's announced retirement in black diff --git a/version.c b/version.c index 8c9cf7e..98ecf58 100644 --- a/version.c +++ b/version.c @@ -1 +1 @@ -258 +259