Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Legality column

Browse Source
This commit is contained in:
cim 2014-09-06 12:26:16 +01:00
parent 4ed485cd24
commit 99f724e05a
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Config/descriptions.plist
View File

@ -1411,6 +1411,11 @@
"price-column-title" = "Price:";
"for-sale-column-title" = "For sale:";
"in-hold-column-title" = "In hold:";
"oolite-legality-column-title" = "Legal status:";
"oolite-legality-clear" = "—";
"oolite-legality-export" = "Export only";
"oolite-legality-import" = "Import only";
"oolite-legality-neither" = "Restricted";
"cash-@-load-d-of-d" = "Cash: %@. Load %d of %d t.";
"cargo-tons-symbol" = "t";
"cargo-grams-symbol" = "g";

38
src/Core/Entities/PlayerEntity.m
View File

@ -9694,14 +9694,15 @@ static NSString *last_outfitting_key=nil;
OOGUITabSettings tab_stops;
tab_stops[0] = 0;
tab_stops[1] = 192;
tab_stops[2] = 272;
tab_stops[3] = 346;
tab_stops[1] = 142;
tab_stops[2] = 212;
tab_stops[3] = 276;
tab_stops[4] = 396;
[gui setTabStops:tab_stops];
[gui setColor:[OOColor greenColor] forRow:GUI_ROW_MARKET_KEY];
[gui setArray:[NSArray arrayWithObjects: DESC(@"commodity-column-title"), OOPadStringToEms(DESC(@"price-column-title"),2.5),
OOPadStringToEms(DESC(@"for-sale-column-title"),3.75), OOPadStringToEms(DESC(@"in-hold-column-title"),5.75), nil] forRow:GUI_ROW_MARKET_KEY];
OOPadStringToEms(DESC(@"for-sale-column-title"),3.75), OOPadStringToEms(DESC(@"in-hold-column-title"),5.75), DESC(@"oolite-legality-column-title"), nil] forRow:GUI_ROW_MARKET_KEY];
if (marketOffset > maxOffset)
{
@ -9740,12 +9741,39 @@ static NSString *last_outfitting_key=nil;
NSString *units = DisplayStringForMassUnit(unit);
NSString *units_available = [NSString stringWithFormat:@" %@ %@ ",available, units];
NSString *units_owned = [NSString stringWithFormat:@" %@ %@ ",owned, units];
NSUInteger import_legality = [localMarket importLegalityForGood:good];
NSUInteger export_legality = [localMarket exportLegalityForGood:good];
NSString *legaldesc = nil;
if (import_legality == 0)
{
if (export_legality == 0)
{
legaldesc = DESC(@"oolite-legality-clear");
}
else
{
legaldesc = DESC(@"oolite-legality-import");
}
}
else
{
if (export_legality == 0)
{
legaldesc = DESC(@"oolite-legality-export");
}
else
{
legaldesc = DESC(@"oolite-legality-neither");
}
}
legaldesc = [NSString stringWithFormat:@" %@ ",legaldesc];
if ([self status] == STATUS_DOCKED) // can only buy or sell in dock
{
[gui setKey:good forRow:row];
}
[gui setArray:[NSArray arrayWithObjects: desc, price, units_available, units_owned, nil] forRow:row++];
[gui setArray:[NSArray arrayWithObjects: desc, price, units_available, units_owned, legaldesc, nil] forRow:row++];
if (row >= GUI_ROW_MARKET_END)
{
break;