matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve the GOL menu descriptions

Browse Source
This commit is contained in:
jacob1 2012-10-12 13:11:34 -04:00 committed by Simon Robertshaw
parent c58a3fb2dc
commit ccd9284e61
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulation/Simulation.cpp
View File

@ -2504,7 +2504,7 @@ void Simulation::kill_part(int i)//kills particle number i
if (parts[i].type == PT_NONE)
return;
if(parts[i].type > 0 && parts[i].type < PT_NUM && elementCount[parts[i].type] && parts[i].type)
if(parts[i].type > 0 && parts[i].type < PT_NUM && elementCount[parts[i].type])
elementCount[parts[i].type]--;
if (parts[i].type == PT_STKM)
{

51
src/simulation/SimulationData.cpp
View File

@ -13,30 +13,30 @@ gol_menu * LoadGOLMenu(int & golMenuCount)
{
gol_menu golMenu[NGOL] =
{
{"GOL", PIXPACK(0x0CAC00), 0, "Game Of Life B3/S23"},
{"HLIF", PIXPACK(0xFF0000), 1, "High Life B36/S23"},
{"ASIM", PIXPACK(0x0000FF), 2, "Assimilation B345/S4567"},
{"2x2", PIXPACK(0xFFFF00), 3, "2x2 B36/S125"},
{"DANI", PIXPACK(0x00FFFF), 4, "Day and Night B3678/S34678"},
{"AMOE", PIXPACK(0xFF00FF), 5, "Amoeba B357/S1358"},
{"MOVE", PIXPACK(0xFFFFFF), 6, "'Move' particles. Does not move things.. it is a life type B368/S245"},
{"PGOL", PIXPACK(0xE05010), 7, "Pseudo Life B357/S238"},
{"DMOE", PIXPACK(0x500000), 8, "Diamoeba B35678/S5678"},
{"34", PIXPACK(0x500050), 9, "34 B34/S34"},
{"LLIF", PIXPACK(0x505050), 10, "Long Life B345/S5"},
{"STAN", PIXPACK(0x5000FF), 11, "Stains B3678/S235678"},
{"SEED", PIXPACK(0xFBEC7D), 12, "B2/S"},
{"MAZE", PIXPACK(0xA8E4A0), 13, "B3/S12345"},
{"COAG", PIXPACK(0x9ACD32), 14, "B378/S235678"},
{"WALL", PIXPACK(0x0047AB), 15, "B45678/S2345"},
{"GNAR", PIXPACK(0xE5B73B), 16, "B1/S1"},
{"REPL", PIXPACK(0x259588), 17, "B1357/S1357"},
{"MYST", PIXPACK(0x0C3C00), 18, "B3458/S05678"},
{"LOTE", PIXPACK(0xFF0000), 19, "Behaves kinda like Living on the Edge S3458/B37/4"},
{"FRG2", PIXPACK(0x00FF00), 20, "Like Frogs rule S124/B3/3"},
{"STAR", PIXPACK(0x0000FF), 21, "Like Star Wars rule S3456/B278/6"},
{"FROG", PIXPACK(0x00AA00), 22, "Frogs S12/B34/3"},
{"BRAN", PIXPACK(0xCCCC00), 23, "Brian 6 S6/B246/3"}
{"GOL", PIXPACK(0x0CAC00), 0, "Game Of Life: Begin 3/Stay 23"},
{"HLIF", PIXPACK(0xFF0000), 1, "High Life: B36/S23"},
{"ASIM", PIXPACK(0x0000FF), 2, "Assimilation: B345/S4567"},
{"2x2", PIXPACK(0xFFFF00), 3, "2x2: B36/S125"},
{"DANI", PIXPACK(0x00FFFF), 4, "Day and Night: B3678/S34678"},
{"AMOE", PIXPACK(0xFF00FF), 5, "Amoeba: B357/S1358"},
{"MOVE", PIXPACK(0xFFFFFF), 6, "'Move' particles. Does not move things.. it is a life type: B368/S245"},
{"PGOL", PIXPACK(0xE05010), 7, "Pseudo Life: B357/S238"},
{"DMOE", PIXPACK(0x500000), 8, "Diamoeba: B35678/S5678"},
{"34", PIXPACK(0x500050), 9, "34: B34/S34"},
{"LLIF", PIXPACK(0x505050), 10, "Long Life: B345/S5"},
{"STAN", PIXPACK(0x5000FF), 11, "Stains: B3678/S235678"},
{"SEED", PIXPACK(0xFBEC7D), 12, "Seeds: B2/S"},
{"MAZE", PIXPACK(0xA8E4A0), 13, "Maze: B3/S12345"},
{"COAG", PIXPACK(0x9ACD32), 14, "Coagulations: B378/S235678"},
{"WALL", PIXPACK(0x0047AB), 15, "Walled cities: B45678/S2345"},
{"GNAR", PIXPACK(0xE5B73B), 16, "Gnarl: B1/S1"},
{"REPL", PIXPACK(0x259588), 17, "Replicator: B1357/S1357"},
{"MYST", PIXPACK(0x0C3C00), 18, "Mystery: B3458/S05678"},
{"LOTE", PIXPACK(0xFF0000), 19, "Living on the Edge: B37/S3458/4"},
{"FRG2", PIXPACK(0x00FF00), 20, "Like Frogs rule: B3/S124/3"},
{"STAR", PIXPACK(0x0000FF), 21, "Like Star Wars rule: B278/S3456/6"},
{"FROG", PIXPACK(0x00AA00), 22, "Frogs: B34/S12/3"},
{"BRAN", PIXPACK(0xCCCC00), 23, "Brian 6: B246/S6/3"}
};
golMenuCount = NGOL;
gol_menu * golMenuT = (gol_menu*)malloc(NGOL*sizeof(gol_menu));
@ -159,10 +159,9 @@ menu_section * LoadMenus(int & menuCount)
{"\xD1", "Solids", 0, 1},
{"\xC6", "Radioactive", 0, 1},
{"\xCC", "Special", 0, 1},
{"\xD2", "Life", 0, 1},
{"\xD2", "Game Of Life", 0, 1},
{"\xD7", "Tools", 0, 1},
{"\xE4", "Decoration tools", 0, 1},
{"\xC8", "", 0, 0},
{"\xC8", "Cracker", 0, 0},
{"\xC8", "Cracker!", 0, 0},
};