close #2, close #3

3 files changed, 7 insertions, 5 deletions

diff --git a/src/scenes/place_detail.c b/src/scenes/place_detail.c
index 0cf8de8..1f08e88 100644
--- a/src/scenes/place_detail.c
+++ b/src/scenes/place_detail.c
@@ -252,8 +252,8 @@ static void place_detail_draw_job_offers(platform_window* window, tab tab, float
 		// price

 		{

 			char pricebuf[25];

-			sprintf(pricebuf, "$%d/trip", offer->reward);

-			TAB_ITEM_PUSH_TEXT(pricebuf, width_of_piece, price_text_w);

+			sprintf(pricebuf, "$%d ($%.2f/km)", offer->reward, offer->reward / (float)offer->total_distance);

+			TAB_ITEM_PUSH_TEXT(pricebuf, width_of_piece*1.5f, price_text_w);

 		}

 

 		// distance

@@ -1672,7 +1672,7 @@ static void place_detail_draw_title(platform_window* window)
 		// price

 		{

 			char pricebuf[25];

-			sprintf(pricebuf, "$%d/trip", job_to_inspect->reward);

+			sprintf(pricebuf, "$%d ($%.2f/km)", job_to_inspect->reward, job_to_inspect->reward / (float)job_to_inspect->total_distance);

 			PUSH_TAG(pricebuf, img_coins);

 		}

 

diff --git a/src/scenes/world_map.c b/src/scenes/world_map.c
index a4e9479..63e988c 100644
--- a/src/scenes/world_map.c
+++ b/src/scenes/world_map.c
@@ -1104,7 +1104,7 @@ void world_map_scene_render(platform_window* window)
 	renderer->set_render_depth(0);

 

 	vec4 area = camera_get_target_rectangle(window);

-	renderer->render_rectangle(area.x + camera_x, area.y + camera_y, area.w*zoom, area.h*zoom, map_bg_color);

+	renderer->render_rectangle(area.x + camera_x, area.y + camera_y, area.w*zoom, area.h*zoom, COLOR_WORLD_MAP_BACKGROUND);

 	renderer->render_image(img_world_map, area.x + camera_x, area.y + camera_y, area.w*zoom, area.h*zoom);

 }

 

diff --git a/src/world.c b/src/world.c
index 4665a86..8ceb5b3 100644
--- a/src/world.c
+++ b/src/world.c
@@ -725,7 +725,9 @@ static void world_assign_new_job_offers(world* world)
 			total_dist += distance_between_location(source, dest);

 		}

 		new_offer.total_distance = total_dist;

-		new_offer.reward = (u32)(new_offer.total_distance * 2.1);

+		new_offer.reward = (u32)((new_offer.total_distance * 2.1) * 

+			(1 + (0.2f * (location->score))) *

+			(1 + (get_random_number(0, 10) / 100.0f)));

 

 		// lets assume most experienced drivers drive at 90km/h

 		double min_duration_hours = (new_offer.total_distance/90.0);