Skip to content

Commit

Permalink
F7 screen config and layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@phkb
phkb committed May 23, 2017
1 parent 9a7a947 commit 6866e53
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 56 deletions.
22 changes: 20 additions & 2 deletions Resources/Config/descriptions.plist
View file
Expand Up @@ -1538,17 +1538,35 @@
"sysdata-tl" = "Tech Level:";
"sysdata-tl-value" = "[techLevel]";
"sysdata-pop" = "Population:";
"sysdata-pop-value" = "[population|multiply:0.1|precision:1] Billion\n([inhabitants])";
"sysdata-pop-value" = "[population|multiply:0.1|precision:1] Billion";
"sysdata-prod" = "Gross productivity:";
"sysdata-prod-value" = "[productivity] M₢";
"sysdata-radius" = "Average radius:";
"sysdata-radius-value" = "[radius] km";
"sysdata-distance" = "Distance:";
"system-description-string" = "[14] is [22].";
"sysdata-route-hours%0" = "Hour";
"sysdata-route-hours%1" = "Hours";
"sysdata-route-jumps%0" = "Jump";
"sysdata-route-jumps%1" = "Jumps";


"sysdata-line-1" = "[sysdata-eco]\t[economy_desc]";
"sysdata-line-2" = "";
"sysdata-line-3" = "[sysdata-govt]\t[government_desc]";
"sysdata-line-4" = "";
"sysdata-line-5" = "[sysdata-tl]\t[sysdata-tl-value]";
"sysdata-line-6" = "";
"sysdata-line-7" = "[sysdata-pop]\t[populationDesc]";
"sysdata-line-8" = "\t([inhabitants])";
"sysdata-line-9" = "";
"sysdata-line-10" = "[sysdata-prod]\t\t[sysdata-prod-value]";
"sysdata-line-11" = "";
"sysdata-line-12" = "[sysdata-radius]\t\t[sysdata-radius-value]";
"sysdata-line-13" = "";
"sysdata-line-14" = "[sysdata-distance]\t[distanceInfo]";
"sysdata-line-15" = "";
"sysdata-line-16" = "";

// Options / Loadsave screen
"options-quick-save" = " Quick-Save ";
"options-save-commander" = " Save Commander ";
Expand Down
109 changes: 55 additions & 54 deletions src/Core/Entities/PlayerEntity.m
View file
Expand Up @@ -703,6 +703,8 @@ - (void) setInfoSystemID: (OOSystemID) sid moveChart: (BOOL) moveChart
{
OOSystemID old = info_system_id;
info_system_id = sid;
JSContext *context = OOJSAcquireContext();
ShipScriptEvent(context, self, "infoSystemWillChange", INT_TO_JSVAL(info_system_id), INT_TO_JSVAL(old));
if (gui_screen == GUI_SCREEN_LONG_RANGE_CHART || gui_screen == GUI_SCREEN_SHORT_RANGE_CHART)
{
if(moveChart)
Expand All @@ -724,7 +726,6 @@ - (void) setInfoSystemID: (OOSystemID) sid moveChart: (BOOL) moveChart
target_chart_focus = chart_focus_coordinates;
}
}
JSContext *context = OOJSAcquireContext();
ShipScriptEvent(context, self, "infoSystemChanged", INT_TO_JSVAL(info_system_id), INT_TO_JSVAL(old));
OOJSRelinquishContext(context);
}
Expand Down Expand Up @@ -8190,7 +8191,7 @@ - (void) setGuiToSystemDataScreen
NSString *system_desc = [infoSystemData oo_stringForKey:KEY_DESCRIPTION];

NSString *populationDesc = [infoSystemData oo_stringForKey:KEY_POPULATION_DESC
defaultValue:OOExpandKeyWithSeed(kNilRandomSeed, @"sysdata-pop-value", population, inhabitants)];
defaultValue:OOExpandKeyWithSeed(kNilRandomSeed, @"sysdata-pop-value", population)];

if (sunGoneNova)
{
Expand All @@ -8206,7 +8207,7 @@ - (void) setGuiToSystemDataScreen
NSString *system = infoSystemName;
system_desc = OOExpandKeyWithSeed(infoSystemRandomSeed, @"nova-system-description", system);
}
populationDesc = OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-pop-value", population, inhabitants);
populationDesc = OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-pop-value", population);
}


Expand Down Expand Up @@ -8234,50 +8235,6 @@ - (void) setGuiToSystemDataScreen
}
else
{
NSArray *populationDescLines = [populationDesc componentsSeparatedByString:@"\n"];
NSString *populationDesc1 = [populationDescLines objectAtIndex:0];
NSString *populationDesc2 = [populationDescLines lastObject];

if ([populationDesc1 isEqualToString:populationDesc2]) populationDesc2 = @"";

[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-eco"),
economy_desc,
nil]
forRow:1];
[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-govt"),
government_desc,
nil]
forRow:3];
[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-tl"),
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-tl-value", techLevel),
nil]
forRow:5];
[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-pop"),
populationDesc1,
nil]
forRow:7];
[gui setArray:[NSArray arrayWithObjects:@"",
populationDesc2,
nil]
forRow:8];
[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-prod"),
@"",
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-prod-value", productivity),
nil]
forRow:10];
[gui setArray:[NSArray arrayWithObjects:
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-radius"),
@"",
OOExpandKeyWithSeed(infoSystemRandomSeed, @"sysdata-radius-value",
radius),
nil]
forRow:12];

NSPoint infoSystemCoordinates = [[UNIVERSE systemManager] getCoordinatesForSystem: info_system_id inGalaxy: galaxy_number];
double distance = distanceBetweenPlanetPositions(infoSystemCoordinates.x, infoSystemCoordinates.y, galaxy_coordinates.x, galaxy_coordinates.y);
if(distance == 0.0 && info_system_id != system_id)
Expand Down Expand Up @@ -8308,13 +8265,57 @@ - (void) setGuiToSystemDataScreen
DESC_PLURAL(@"sysdata-route-jumps", routeJumps)];
}
}
[gui setArray:[NSArray arrayWithObjects:
@"Distance:",
distanceInfo,
nil]
forRow: 14];

OOGUIRow i = [gui addLongText:system_desc startingAtRow:17 align:GUI_ALIGN_LEFT];

OOGUIRow i;

for (i = 1; i <= 16; i++) {
NSString *ln = [NSString stringWithFormat:@"sysdata-line-%d", i];
NSString *line = OOExpandKeyWithSeed(infoSystemRandomSeed, ln, economy_desc, government_desc, techLevel, populationDesc, inhabitants, productivity, radius, distanceInfo);
if (![line isEqualToString:@""])
{
NSArray *lines = [line componentsSeparatedByString:@"\t"];
if ([lines count] == 1)
{
[gui setArray:[NSArray arrayWithObjects:[lines objectAtIndex:0],
nil]
forRow:i];
}
if ([lines count] == 2)
{
[gui setArray:[NSArray arrayWithObjects:[lines objectAtIndex:0],
[lines objectAtIndex:1],
nil]
forRow:i];
}
if ([lines count] == 3)
{
if ([[lines objectAtIndex:2] isEqualToString:@""])
{
[gui setArray:[NSArray arrayWithObjects:[lines objectAtIndex:0],
[lines objectAtIndex:1],
nil]
forRow:i];
}
else
{
[gui setArray:[NSArray arrayWithObjects:[lines objectAtIndex:0],
[lines objectAtIndex:1],
[lines objectAtIndex:2],
nil]
forRow:i];
}
}
}
else
{
[gui setArray:[NSArray arrayWithObjects:@"",
nil]
forRow:i];
}
}


i = [gui addLongText:system_desc startingAtRow:17 align:GUI_ALIGN_LEFT];
missionTextRow = i;
for (i-- ; i > 16 ; --i)
{
Expand Down

0 comments on commit 6866e53

Please sign in to comment.