From c0acac3a14616917acc59f90450f8a90c0de5185 Mon Sep 17 00:00:00 2001 From: belugas Date: Sat, 22 Apr 2006 01:37:31 +0000 Subject: (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. --- table/landscape_const.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) (limited to 'table') diff --git a/table/landscape_const.h b/table/landscape_const.h index 8cf1083c0..672bafd80 100644 --- a/table/landscape_const.h +++ b/table/landscape_const.h @@ -1,6 +1,21 @@ /* $Id$ */ -static const LandscapePredefVar _landscape_predef_var[4] = { +typedef struct CargoTypesValues { + StringID names[NUM_CARGO]; + StringID units_volume[NUM_CARGO]; + byte weights[NUM_CARGO]; + SpriteID sprites[NUM_CARGO]; + + uint16 initial_cargo_payment[NUM_CARGO]; + byte transit_days_table_1[NUM_CARGO]; + byte transit_days_table_2[NUM_CARGO]; + + byte road_veh_by_cargo_start[NUM_CARGO]; + byte road_veh_by_cargo_count[NUM_CARGO]; +} CargoTypesValues; + + +static const CargoTypesValues _cargo_types_base_values[4] = { { /* normal names */ { @@ -17,6 +32,22 @@ static const LandscapePredefVar _landscape_predef_var[4] = { STR_0019_VALUABLES, STR_000E, }, + + { /* normal units of volume */ + STR_PASSENGERS, + STR_TONS, + STR_BAGS, + STR_LITERS, + STR_ITEMS, + STR_CRATES, + STR_TONS, + STR_TONS, + STR_TONS, + STR_TONS, + STR_BAGS, + STR_RES_OTHER + }, + /* normal weights */ { 1, 16, 4, 16, 3, 8, 16, 16, 16, 16, 2, 0, @@ -63,6 +94,22 @@ static const LandscapePredefVar _landscape_predef_var[4] = { STR_0020_GOLD, STR_001E_FOOD, }, + + { /* hilly units of volume */ + STR_PASSENGERS, + STR_TONS, + STR_BAGS, + STR_LITERS, + STR_ITEMS, + STR_CRATES, + STR_TONS, + STR_TONS, + STR_RES_OTHER, + STR_TONS, + STR_BAGS, + STR_TONS + }, + /* hilly weights */ { 1, 16, 4, 16, 3, 8, 16, 16, 0, 16, 8, 16 @@ -93,7 +140,6 @@ static const LandscapePredefVar _landscape_predef_var[4] = { {7, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3}, }, - { /* desert names */ { @@ -110,6 +156,22 @@ static const LandscapePredefVar _landscape_predef_var[4] = { STR_001D_DIAMONDS, STR_001E_FOOD }, + + { /* desert units of volume */ + STR_PASSENGERS, + STR_LITERS, + STR_BAGS, + STR_LITERS, + STR_TONS, + STR_CRATES, + STR_TONS, + STR_TONS, + STR_TONS, + STR_LITERS, + STR_BAGS, + STR_TONS + }, + /* desert weights */ { 1, 16, 4, 16, 16, 8, 16, 16, 16, 16, 2, 16, @@ -156,6 +218,22 @@ static const LandscapePredefVar _landscape_predef_var[4] = { STR_002C_PLASTIC, STR_002D_FIZZY_DRINKS, }, + + { /* candy unitrs of volume */ + STR_PASSENGERS, + STR_TONS, + STR_BAGS, + STR_NOTHING, + STR_NOTHING, + STR_TONS, + STR_TONS, + STR_LITERS, + STR_TONS, + STR_NOTHING, + STR_LITERS, + STR_NOTHING + }, + /* candy weights */ { 1, 16, 4, 2, 4, 5, 16, 16, 16, 1, 16, 2 -- cgit v1.2.3-70-g09d2