diff options
| -rw-r--r-- | data/img/mercedes-actos.png | bin | 0 -> 442715 bytes | |||
| -rw-r--r-- | data/img/mercedes-new-actos.png | bin | 0 -> 316907 bytes | |||
| -rw-r--r-- | data/img/volvo-aero.png | bin | 0 -> 313650 bytes | |||
| -rw-r--r-- | data/img/volvo-globetrotter.png | bin | 0 -> 257438 bytes | |||
| -rw-r--r-- | data/world/dealers.json | 50 | ||||
| -rw-r--r-- | src/data.c | 4 | ||||
| -rw-r--r-- | src/include/data.h | 4 | ||||
| -rw-r--r-- | src/main.c | 4 |
8 files changed, 28 insertions, 34 deletions
diff --git a/data/img/mercedes-actos.png b/data/img/mercedes-actos.png Binary files differnew file mode 100644 index 0000000..38c6d64 --- /dev/null +++ b/data/img/mercedes-actos.png diff --git a/data/img/mercedes-new-actos.png b/data/img/mercedes-new-actos.png Binary files differnew file mode 100644 index 0000000..cd7062f --- /dev/null +++ b/data/img/mercedes-new-actos.png diff --git a/data/img/volvo-aero.png b/data/img/volvo-aero.png Binary files differnew file mode 100644 index 0000000..2ac0040 --- /dev/null +++ b/data/img/volvo-aero.png diff --git a/data/img/volvo-globetrotter.png b/data/img/volvo-globetrotter.png Binary files differnew file mode 100644 index 0000000..24b76e8 --- /dev/null +++ b/data/img/volvo-globetrotter.png diff --git a/data/world/dealers.json b/data/world/dealers.json index 714972a..f5efd6c 100644 --- a/data/world/dealers.json +++ b/data/world/dealers.json @@ -1,46 +1,31 @@ -[{
+[
+ {
"name": "Mercedes-Benz",
"logo": "data/img/mercedes-logo.png",
- "trucks": [{
+ "trucks": [
+ {
"name": "Actros",
"power": 320,
"price": 110000,
"fuelcapacity": 600,
"torque": 1080,
- "logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
- },
- {
- "name": "New Actros",
- "power": 517,
- "price": 220000,
- "fuelcapacity": 960,
- "torque": 1100,
- "logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
+ "logo": "data/img/mercedes-actos.png",
+ "fuelusage": 27.0
}
]
},
{
"name": "Iveco",
"logo": "data/img/iveco-logo.png",
- "trucks": [{
- "name": "Stralis Active Space",
- "power": 310,
- "price": 90000,
- "fuelcapacity": 1200,
- "torque": 1340,
- "logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
- },
+ "trucks": [
{
- "name": "Stralis Large Space",
+ "name": "Stralis Active Space",
"power": 310,
"price": 90000,
"fuelcapacity": 1200,
"torque": 1340,
"logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
+ "fuelusage": 30.5
},
{
"name": "Stralis Hi-Way",
@@ -49,30 +34,31 @@ "fuelcapacity": 1200,
"torque": 1400,
"logo": "data/img/iveco-stralis-hiway.png",
- "fuelusage": 30.0
+ "fuelusage": 25.1
}
]
},
{
"name": "Volvo",
"logo": "data/img/volvo-logo.png",
- "trucks": [{
- "name": "FH Sleeper",
+ "trucks": [
+ {
+ "name": "Aero",
"power": 420,
"price": 112000,
"fuelcapacity": 1400,
"torque": 1000,
- "logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
+ "logo": "data/img/volvo-aero.png",
+ "fuelusage": 25.5
},
{
- "name": "FH Globetrotter",
+ "name": "Globetrotter",
"power": 500,
"price": 170000,
"fuelcapacity": 800,
"torque": 1150,
- "logo": "data/img/iveco-stralis-activespace.png",
- "fuelusage": 30.0
+ "logo": "data/img/volvo-globetrotter.png",
+ "fuelusage": 23.2
}
]
}
@@ -15,6 +15,10 @@ void data_load() img_truck_unknown = assets_load_image_from_file("data/img/truck-unknown.png");
img_iveco_stralis_hiway = assets_load_image_from_file("data/img/iveco-stralis-hiway.png");
img_iveco_stralis_activespace = assets_load_image_from_file("data/img/iveco-stralis-activespace.png");
+ img_mercedes_actos = assets_load_image_from_file("data/img/mercedes-actos.png");
+ img_mercedes_new_actos = assets_load_image_from_file("data/img/mercedes-new-actos.png");
+ img_volvo_aero = assets_load_image_from_file("data/img/volvo-aero.png");
+ img_volvo_globetrotter = assets_load_image_from_file("data/img/volvo-globetrotter.png");
img_logo_mercedes = assets_load_image_from_file("data/img/mercedes-logo.png");
img_logo_iveco = assets_load_image_from_file("data/img/iveco-logo.png");
diff --git a/src/include/data.h b/src/include/data.h index 2574ee7..7073f60 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -16,6 +16,10 @@ image* img_logo_fruitosis; image* img_truck_unknown;
image* img_iveco_stralis_activespace;
image* img_iveco_stralis_hiway;
+image* img_mercedes_actos;
+image* img_mercedes_new_actos;
+image* img_volvo_aero;
+image* img_volvo_globetrotter;
image* img_logo_mercedes;
image* img_logo_iveco;
@@ -1,7 +1,7 @@ #define ASSET_FONT_COUNT 25
#define ASSET_WORKER_COUNT 4
-#define ASSET_QUEUE_COUNT 100
-#define ASSET_IMAGE_COUNT 70
+#define ASSET_QUEUE_COUNT 150
+#define ASSET_IMAGE_COUNT 100
#define ASSET_SOUND_COUNT 30
#define NUM_AUDIO_CHANNELS 8
#define GAME_VERSION "0.1"
|
