From b8327e0457a8f40d98a8bd5a6889166d4a4afd02 Mon Sep 17 00:00:00 2001 From: celestar Date: Sat, 13 Nov 2004 15:15:41 +0000 Subject: (svn r562) newgrf: Merge most of the road vehicle info to a single road_vehicle_info table, like it already is for trains and ships. Needed for GRF custom override support. (pasky) --- table/engines.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) (limited to 'table') diff --git a/table/engines.h b/table/engines.h index bbfa266dd..07f7cc88b 100644 --- a/table/engines.h +++ b/table/engines.h @@ -385,12 +385,110 @@ RailVehicleInfo _rail_vehicle_info[] = { }; +RoadVehicleInfo _road_vehicle_info[] = { + /* FIXME: Cargo type constant may not be appropriate for the + * vehicle's climate. --pasky */ + // image_index cargo_type cargo_amount + // | base_cost | | running_cost + // | | max_speed | | sfx + // | | | | | | | + { 0, 120, 112, CT_PASSENGERS, 31, 91, 23 }, /* 0 */ + { 17, 140, 176, CT_PASSENGERS, 35, 128, 26 }, /* 1 */ + { 17, 150, 224, CT_PASSENGERS, 37, 178, 25 }, /* 2 */ + { 34, 160, 255, CT_PASSENGERS, 40, 240, 25 }, /* 3 */ + { 51, 120, 112, CT_PASSENGERS, 30, 91, 60 }, /* 4 */ + { 51, 140, 192, CT_PASSENGERS, 35, 171, 62 }, /* 5 */ + { 51, 160, 240, CT_PASSENGERS, 38, 240, 60 }, /* 6 */ + { 1, 108, 96, CT_COAL, 20, 90, 23 }, /* 7 */ + { 18, 128, 176, CT_COAL, 25, 168, 23 }, /* 8 */ + { 35, 138, 224, CT_COAL, 28, 240, 23 }, /* 9 */ + { 2, 115, 96, CT_MAIL, 22, 90, 23 }, /* 10 */ + { 19, 135, 176, CT_MAIL, 28, 168, 23 }, /* 11 */ + { 36, 145, 224, CT_MAIL, 30, 240, 23 }, /* 12 */ + { 57, 115, 96, CT_MAIL, 22, 90, 62 }, /* 13 */ + { 57, 135, 176, CT_MAIL, 28, 168, 60 }, /* 14 */ + { 57, 145, 224, CT_MAIL, 30, 240, 62 }, /* 15 */ + { 3, 110, 96, CT_OIL, 21, 90, 23 }, /* 16 */ + { 20, 140, 176, CT_OIL, 25, 168, 23 }, /* 17 */ + { 37, 150, 224, CT_OIL, 27, 240, 23 }, /* 18 */ + { 4, 105, 96, CT_LIVESTOCK, 14, 90, 23 }, /* 19 */ + { 21, 130, 176, CT_LIVESTOCK, 16, 168, 23 }, /* 20 */ + { 38, 140, 224, CT_LIVESTOCK, 18, 240, 23 }, /* 21 */ + { 5, 107, 96, CT_GOODS, 14, 90, 23 }, /* 22 */ + { 22, 130, 176, CT_GOODS, 16, 168, 23 }, /* 23 */ + { 39, 140, 224, CT_GOODS, 18, 240, 23 }, /* 24 */ + { 6, 114, 96, CT_GRAIN, 20, 90, 23 }, /* 25 */ + { 23, 133, 176, CT_GRAIN, 25, 168, 23 }, /* 26 */ + { 40, 143, 224, CT_GRAIN, 30, 240, 23 }, /* 27 */ + { 7, 118, 96, CT_WOOD, 20, 90, 23 }, /* 28 */ + { 24, 137, 176, CT_WOOD, 22, 168, 23 }, /* 29 */ + { 41, 147, 224, CT_WOOD, 24, 240, 23 }, /* 30 */ + { 8, 121, 96, CT_IRON_ORE, 22, 90, 23 }, /* 31 */ + { 25, 140, 176, CT_IRON_ORE, 25, 168, 23 }, /* 32 */ + { 42, 150, 224, CT_IRON_ORE, 27, 240, 23 }, /* 33 */ + { 9, 112, 96, CT_STEEL, 15, 90, 23 }, /* 34 */ + { 26, 135, 176, CT_STEEL, 18, 168, 23 }, /* 35 */ + { 43, 145, 224, CT_STEEL, 20, 240, 23 }, /* 36 */ + { 10, 145, 96, CT_VALUABLES, 12, 90, 23 }, /* 37 */ + { 27, 170, 176, CT_VALUABLES, 15, 168, 23 }, /* 38 */ + { 44, 180, 224, CT_VALUABLES, 16, 240, 23 }, /* 39 */ + { 11, 112, 96, CT_FOOD, 17, 90, 23 }, /* 40 */ + { 28, 134, 176, CT_FOOD, 20, 168, 23 }, /* 41 */ + { 45, 144, 224, CT_FOOD, 22, 240, 23 }, /* 42 */ + { 12, 112, 96, CT_STEEL, 15, 90, 23 }, /* 43 */ + { 29, 135, 176, CT_STEEL, 18, 168, 23 }, /* 44 */ + { 46, 145, 224, CT_STEEL, 20, 240, 23 }, /* 45 */ + { 13, 121, 96, CT_IRON_ORE, 22, 90, 23 }, /* 46 */ + { 30, 140, 176, CT_IRON_ORE, 25, 168, 23 }, /* 47 */ + { 47, 150, 224, CT_IRON_ORE, 27, 240, 23 }, /* 48 */ + { 14, 111, 96, CT_STEEL, 21, 90, 23 }, /* 49 */ + { 31, 141, 176, CT_STEEL, 25, 168, 23 }, /* 50 */ + { 48, 151, 224, CT_STEEL, 27, 240, 23 }, /* 51 */ + { 15, 118, 96, CT_LIVESTOCK, 18, 90, 23 }, /* 52 */ + { 32, 148, 176, CT_LIVESTOCK, 20, 168, 23 }, /* 53 */ + { 49, 158, 224, CT_LIVESTOCK, 23, 240, 23 }, /* 54 */ + { 16, 117, 96, CT_COAL, 17, 90, 23 }, /* 55 */ + { 33, 147, 176, CT_COAL, 19, 168, 23 }, /* 56 */ + { 50, 157, 224, CT_COAL, 22, 240, 23 }, /* 57 */ + { 52, 117, 96, CT_COAL, 17, 90, 63 }, /* 58 */ + { 52, 147, 176, CT_COAL, 19, 168, 64 }, /* 59 */ + { 52, 157, 224, CT_COAL, 22, 240, 63 }, /* 60 */ + { 53, 117, 96, CT_WOOD, 17, 90, 64 }, /* 61 */ + { 53, 147, 176, CT_WOOD, 19, 168, 63 }, /* 62 */ + { 53, 157, 224, CT_WOOD, 22, 240, 64 }, /* 63 */ + { 54, 117, 96, CT_IRON_ORE, 17, 90, 63 }, /* 64 */ + { 54, 147, 176, CT_IRON_ORE, 19, 168, 64 }, /* 65 */ + { 54, 157, 224, CT_IRON_ORE, 22, 240, 63 }, /* 66 */ + { 55, 117, 96, CT_GRAIN, 17, 90, 64 }, /* 67 */ + { 55, 147, 176, CT_GRAIN, 19, 168, 63 }, /* 68 */ + { 55, 157, 224, CT_GRAIN, 22, 240, 64 }, /* 69 */ + { 56, 117, 96, CT_OIL, 17, 90, 63 }, /* 70 */ + { 56, 147, 176, CT_OIL, 19, 168, 64 }, /* 71 */ + { 56, 157, 224, CT_OIL, 22, 240, 63 }, /* 72 */ + { 58, 117, 96, CT_GOODS, 17, 90, 64 }, /* 73 */ + { 58, 147, 176, CT_GOODS, 19, 168, 63 }, /* 74 */ + { 58, 157, 224, CT_GOODS, 22, 240, 64 }, /* 75 */ + { 59, 117, 96, CT_LIVESTOCK, 17, 90, 63 }, /* 76 */ + { 59, 147, 176, CT_LIVESTOCK, 19, 168, 64 }, /* 77 */ + { 59, 157, 224, CT_LIVESTOCK, 22, 240, 63 }, /* 78 */ + { 60, 117, 96, CT_FOOD, 17, 90, 64 }, /* 79 */ + { 60, 147, 176, CT_FOOD, 19, 168, 63 }, /* 80 */ + { 60, 157, 224, CT_FOOD, 22, 240, 64 }, /* 81 */ + { 61, 117, 96, CT_VALUABLES, 17, 90, 63 }, /* 82 */ + { 61, 147, 176, CT_VALUABLES, 19, 168, 64 }, /* 83 */ + { 61, 157, 224, CT_VALUABLES, 22, 240, 63 }, /* 84 */ + { 62, 117, 96, CT_STEEL, 17, 90, 64 }, /* 85 */ + { 62, 147, 176, CT_STEEL, 19, 168, 63 }, /* 86 */ + { 62, 157, 224, CT_STEEL, 22, 240, 64 }, /* 87 */ +}; + + ShipVehicleInfo _ship_vehicle_info[] = { // image_index cargo_type cargo_amount refittable // | base_cost | | running_cost // | | max_speed | | sfx | // | | | | | | | | - { 1, 160, 48, CT_OIL, 220, 140, 4, 0 }, /* 0 */ + { 1, 160, 48, CT_OIL, 220, 140, 4, 0 }, /* 0 */ { 1, 176, 80, CT_OIL, 350, 125, 4, 0 }, /* 1 */ { 2, 96, 64, CT_PASSENGERS, 100, 90, 5, 0 }, /* 2 */ { 2, 112, 128, CT_PASSENGERS, 130, 80, 5, 0 }, /* 3 */ -- cgit v1.2.3-54-g00ecf