From 8775702c1cf8f5ae288be2b8c68ec8d29b1a62f1 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sun, 1 Dec 2024 17:21:09 +0100 Subject: close #39 --- data/img/mercedes-actos.png | Bin 0 -> 442715 bytes data/img/mercedes-new-actos.png | Bin 0 -> 316907 bytes data/img/volvo-aero.png | Bin 0 -> 313650 bytes data/img/volvo-globetrotter.png | Bin 0 -> 257438 bytes data/world/dealers.json | 50 +++++++++++++++------------------------- src/data.c | 4 ++++ src/include/data.h | 4 ++++ src/main.c | 4 ++-- 8 files changed, 28 insertions(+), 34 deletions(-) create mode 100644 data/img/mercedes-actos.png create mode 100644 data/img/mercedes-new-actos.png create mode 100644 data/img/volvo-aero.png create mode 100644 data/img/volvo-globetrotter.png diff --git a/data/img/mercedes-actos.png b/data/img/mercedes-actos.png new file mode 100644 index 0000000..38c6d64 Binary files /dev/null and b/data/img/mercedes-actos.png differ diff --git a/data/img/mercedes-new-actos.png b/data/img/mercedes-new-actos.png new file mode 100644 index 0000000..cd7062f Binary files /dev/null and b/data/img/mercedes-new-actos.png differ diff --git a/data/img/volvo-aero.png b/data/img/volvo-aero.png new file mode 100644 index 0000000..2ac0040 Binary files /dev/null and b/data/img/volvo-aero.png differ diff --git a/data/img/volvo-globetrotter.png b/data/img/volvo-globetrotter.png new file mode 100644 index 0000000..24b76e8 Binary files /dev/null and b/data/img/volvo-globetrotter.png differ 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 } ] } diff --git a/src/data.c b/src/data.c index 409c6ef..d8d6051 100644 --- a/src/data.c +++ b/src/data.c @@ -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; diff --git a/src/main.c b/src/main.c index 41a47ba..2a5e908 100644 --- a/src/main.c +++ b/src/main.c @@ -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" -- cgit v1.2.3-70-g09d2