Menu
▾
▴
[Raceintospace-cvs] race ChangeLog crew.c future.c museum.c options.c start.c version.c
|
From: Leon B. <pe...@us...> - 2012-03-04 22:55:00
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv32371/race
Modified Files:
ChangeLog crew.c future.c museum.c options.c start.c version.c
Log Message:
Adv Train +1 skill after 2 turns; crew skills highlight when assigning crews to missions
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- ChangeLog 30 Sep 2011 04:08:28 -0000 1.266
+++ ChangeLog 4 Mar 2012 22:54:57 -0000 1.267
@@ -1,3 +1,17 @@
+2012-03-04 Leon Baradat <pe...@us...>
+
+ * V272
+
+ * start.c: Advanced Training now gives +1 skill halfway through
+
+ * crew.c: Crew members' relevant skills now highlighted when assigning crews to missions
+
+ * options.c: Touched up grammar in config file
+
+ * museum.c: adjusted centering in 'Naut History screen
+
+ * future.c: adjusted centering of letters in CONTINUE button
+
2011-09-29 Leon Baradat <pe...@us...>
* V271
Index: crew.c
===================================================================
RCS file: /cvsroot/raceintospace/race/crew.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- crew.c 7 Sep 2010 14:27:14 -0000 1.17
+++ crew.c 4 Mar 2012 22:54:57 -0000 1.18
@@ -370,14 +370,22 @@
if (Data->P[plr].Pool[m[i]-1].Mood<20) RectFill(88,40+i*14,94,44+i*14,0);
if (Data->P[plr].Pool[m[i]-1].Mood==0) RectFill(88,40+i*14,94,44+i*14,3);
//87 - 169
+ if (i==0) {grSetColor(11);} /* Highlight CA for command pilot */
PrintAt(87,51+i*14,"CP:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Cap);
+ grSetColor(1);
+ if (i==1 && men>1) {grSetColor(11);} /* Highlight LM for LM pilot */
PrintAt(0,0," LM:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].LM);
+ grSetColor(1);
+ if (men==1 || ((men==2 || men==3) && i==1) || (men==4 && i>1)) {grSetColor(11);} /* Highlight EV for EVA specialist */
PrintAt(0,0," EV:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].EVA);
+ grSetColor(1);
+ if ((men==2 && i==0) || (men==3 && i==2)) {grSetColor(11);} /* Highlight DO for docking specialist */
PrintAt(0,0," DO:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Docking);
+ grSetColor(1); /* Never highlight EN skill */
PrintAt(0,0," EN:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Endurance);
};
Index: options.c
===================================================================
RCS file: /cvsroot/raceintospace/race/options.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- options.c 29 Jun 2011 00:56:40 -0000 1.28
+++ options.c 4 Mar 2012 22:54:57 -0000 1.29
@@ -57,7 +57,7 @@
# if HAVE_SDL_GETENV
# define getenv SDL_getenv
# else
-# warn I dont know a way to read environment on this system
+# warn I don't know a way to read environment on this system
# define getenv(a) (NULL)
# endif
#endif
@@ -66,7 +66,7 @@
LOG_DEFAULT_CATEGORY(config)
-/*set-up array for environment vars */
+/*set up array for environment vars */
static struct {
char *name;
char **dest;
@@ -106,17 +106,17 @@
{"no_backup", &options.feat_no_backup, "%u", 0,
"Set to zero to require assigning a Backup crew." }, // No Backup crew required -Leon
{"cheat_no_damage", &options.cheat_no_damage, "%u", 0,
- "Set to non-zero to disable damaged equipment (Will prevent future damage)." },
+ "Set to non-zero to disable damaged equipment (will prevent future damage)." },
{"random_eq", &options.feat_random_eq, "%u", 0,
- "Set to non-zero to enable random equipment Model (Will break game balance and possibly break the AI)." },
+ "Set to non-zero to enable random equipment model (will break game balance and possibly break the AI)." },
{"eq_name_change", &options.feat_eq_new_name, "%u", 0,
"Set to non-zero to be able to change equipment name when starting a new game." },
{"altasLunar", &options.cheat_altasOnMoon, "%u", 0,
- "Set to non-zero to enable Altas rockets in lunar missions." },
+ "Set to non-zero to enable Atlas rockets in lunar missions." },
{"succesRDMax", &options.cheat_addMaxS, "%u", 0,
- "Set to zero to make MaxRD not change with succesful missions." },
+ "Set to zero to make MaxRD not change with successful missions." },
{"boosterSafety", &options.boosterSafety, "%u", 0,
- "0: Stadistical Safety (default) - 1: Min Safety - 2: Average Safety" },
+ "0: Statistical Safety (default) - 1: Min Safety - 2: Average Safety." },
};
/** prints the minimal usage information to stderr
@@ -349,7 +349,7 @@
fix_pathsep(options.dir_gamedata);
}
-/** read the commandline options
+/** read the command-line options
*
* \return length of modified argv
*
@@ -379,7 +379,7 @@
*env_vars[i].dest = xstrdup(env_vars[i].def_val);
}
- /* setup default values */
+ /* set up default values */
options.want_audio = 1;
options.want_intro = 1;
options.want_cheats = 0;
@@ -393,8 +393,8 @@
options.cheat_no_damage=0; //Damaged Equipment Cheat, Nikakd, 10/8/10
options.feat_random_eq=0;
options.feat_eq_new_name =0;
- options.cheat_altasOnMoon=0;
- options.cheat_addMaxS=1;
+ options.cheat_altasOnMoon=0;
+ options.cheat_addMaxS=1;
options.boosterSafety=0;
fixpath_options();
@@ -479,7 +479,7 @@
shift_argv(argv + pos, argc - pos, 1);
/*
- * now we have one less arg, pos points to the next arg,
+ * now we have one fewer arg, pos points to the next arg,
* keep it this way after incrementing it on top of the loop
*/
pos--;
Index: start.c
===================================================================
RCS file: /cvsroot/raceintospace/race/start.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- start.c 26 May 2011 13:08:19 -0000 1.17
+++ start.c 4 Mar 2012 22:54:57 -0000 1.18
@@ -137,7 +137,7 @@
astro->Active++;
}
- /* Move All unassign astros to limbo */
+ /* Move All unassigned astros to limbo */
if ((astro->Una == 0)
&& (astro->Status == AST_ST_ACTIVE)
&& (astro->Assign != 0))
@@ -205,6 +205,13 @@
astro->Status = AST_ST_TRAIN_ADV_4;
else
astro->Status = AST_ST_TRAIN_ADV_3;
+
+ assert((unsigned) astro->Focus <= NUM_SKILLS);
+
+ /* Increase trained skill by 1 ('naut is halfway through adv training) */
+ char* skill = skills[astro->Focus - 1];
+ *skill = min(*skill + 1, skillMax);
+
break;
case AST_ST_TRAIN_ADV_3:
@@ -221,9 +228,9 @@
assert((unsigned) astro->Focus <= NUM_SKILLS);
- /* Increase trained skill by 2 */
+ /* Increase trained skill by 1 */
char* skill = skills[astro->Focus - 1];
- *skill = min(*skill + 2, skillMax);
+ *skill = min(*skill + 1, skillMax);
break;
}
@@ -444,7 +451,7 @@
if (Data->P[j].Other & 2)
Data->P[j].Pool[i].Mood -= random(2) + 1;
- /* Compatability */
+ /* Compatibility */
for (k = 0; k < 5; k++)
Compat[k] = 0;
cnt = 0;
@@ -502,19 +509,19 @@
temp = 0;
char sameGroup=0, group=Data->P[j].Pool[i].Group, mates=0;
for (k = 0; k < ASTRONAUT_FLT_CREW_MAX; k++)
- {
- char guyCode = Data->P[j].Crew[Data->P[j].Pool[i].Assign][Data->P[j].Pool[i].Crew-1][k]-1;
- if (guyCode>-1 && guyCode!=i) {
+ {
+ char guyCode = Data->P[j].Crew[Data->P[j].Pool[i].Assign][Data->P[j].Pool[i].Crew-1][k]-1;
+ if (guyCode>-1 && guyCode!=i) {
mates++;
for (l = 0; l < cnt; l++)
{
if (Compat[l] ==
- Data->P[j].Pool[guyCode].Compat
+ Data->P[j].Pool[guyCode].Compat
)
temp++;
- }
- if (group==Data->P[j].Pool[guyCode].Group)
- sameGroup++;
+ }
+ if (group==Data->P[j].Pool[guyCode].Group)
+ sameGroup++;
}
}
Index: museum.c
===================================================================
RCS file: /cvsroot/raceintospace/race/museum.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- museum.c 22 Jun 2010 21:11:47 -0000 1.23
+++ museum.c 4 Mar 2012 22:54:57 -0000 1.24
@@ -214,7 +214,7 @@
PrintAt(175,120,"2ND:");
PrintAt(212,120,"SUBS:");
PrintAt(254,120,"FAIL:");
- grSetColor(1);PrintAt(257,13,"CONTINUE");
+ grSetColor(1);PrintAt(255,13,"CONTINUE");
PrintAt(17,39,"FIRST:");
PrintAt(19,81,"DATE:");
grSetColor(11);PrintAt(71,37,"# SPACE FIRSTS:");
@@ -477,7 +477,7 @@
char index,yr,season,j,temp=0;
/* Okay, now we have to decide whether there are any missions displayed
- on the screen at this time. If there are any, parse the button. */
+ on the screen at this time. If there are any, parse the button. */
if(Data->P[plr].PastMis==0) return;
index=0;
season =*where % 2;
@@ -745,8 +745,8 @@
FadeOut(2,pal,5,0,0);
RectFill(1,39,157,184,3);
- DispBig(65,71,"NO",0,-1);
- DispBig(42,90,"MISSION",0,-1);
+ DispBig(68,71,"NO",0,-1);
+ DispBig(46,90,"MISSION",0,-1);
DispBig(27,109,"EXPERIENCE",0,-1);
gxGetImage(&vhptr2,22,69,133,123,0);
PatchMe(0,0,0,0,0,32);
@@ -761,7 +761,7 @@
if(plr==0) FlagSm(0,4,4);
else FlagSm(1,4,4);
grSetColor(1);
- PrintAt(259,13,"CONTINUE");
+ PrintAt(257,13,"CONTINUE");
ShBox(0,24,158,199);
ShBox(161,24,319,199);
InBox(233,29,314,80);
Index: future.c
===================================================================
RCS file: /cvsroot/raceintospace/race/future.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- future.c 30 Jul 2011 01:32:29 -0000 1.31
+++ future.c 4 Mar 2012 22:54:57 -0000 1.32
@@ -30,7 +30,7 @@
/*missStep.dat is plain text, with:
Mission Number (2 first bytes of each line)
A Coded letter, each drawing a different line (1105-1127 for all possible letters)
-Numbers folowing each letter, which are the parameters of the function
+Numbers following each letter, which are the parameters of the function
Each line must finish with a Z, so the game stops reading
Any other char is ignored, but it's easier to read for a human that way */
@@ -53,7 +53,7 @@
char D; /**< JOINT */
char E; /**< MANNED/UNMANNED/Duration 0==unmanned 1-6==duration */
char X; /**< the type of mission for assign crew and hardware */
- char Z; /**< A duaration mission only */
+ char Z; /**< A duration mission only */
} V[62];
extern int Bub_Count;
@@ -188,7 +188,7 @@
};
grSetColor(1);
PrintAt(9,80,"RESET");
- PrintAt(258,13,"CONTINUE");
+ PrintAt(256,13,"CONTINUE");
grSetColor(11);
if (Data->Season==0) PrintAt(200,9,"SPRING");
else PrintAt(205,9,"FALL");
@@ -1144,7 +1144,7 @@
#ifdef DEAD_CODE
/** Draws stuff about choosing a program and having < 2 groups available
*
- * \deprecated This function appears to be depricated.
+ * \deprecated This function appears to be deprecated.
*/
char FutBad(void)
{
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- version.c 30 Sep 2011 04:08:28 -0000 1.256
+++ version.c 4 Mar 2012 22:54:57 -0000 1.257
@@ -1 +1 @@
-271
+272
|
