diff options
| -rw-r--r-- | src/scenery.c | 2 | ||||
| -rw-r--r-- | src/scenes/save_state_select.c | 2 | ||||
| -rw-r--r-- | src/scenes/world_map.c | 14 | ||||
| -rw-r--r-- | src/world.c | 11 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/scenery.c b/src/scenery.c index 0b40aa4..cb8f9c6 100644 --- a/src/scenery.c +++ b/src/scenery.c @@ -51,7 +51,7 @@ void update_render_scenery(world* world) { }
renderer->render_reset_scissor();
-#if 1
+#if 0
if (is_left_clicked()) {
vec2f coords = px_to_coords(main_window, _global_mouse.x, _global_mouse.y);
printf("Location: \"latitude\": %f, \"longitude\":%f\n", coords.y, coords.x);
diff --git a/src/scenes/save_state_select.c b/src/scenes/save_state_select.c index fcb3b17..6065735 100644 --- a/src/scenes/save_state_select.c +++ b/src/scenes/save_state_select.c @@ -783,7 +783,7 @@ static void load_save_file(s32 index) }
world_map_set_active_world(new_world);
- enable_insights_for_current_month(new_world);
+ //enable_insights_for_current_month(new_world);
world_update_location_scores(new_world);
game_set_active_scene(GAME_STATE_WORLD_MAP);
diff --git a/src/scenes/world_map.c b/src/scenes/world_map.c index 792f5d0..b161cc3 100644 --- a/src/scenes/world_map.c +++ b/src/scenes/world_map.c @@ -1118,7 +1118,7 @@ static void world_map_draw_night(platform_window* window) button_row_h = 44*scale;\
if (button_render(scale, _loan.is_active ? BUTTON_DISABLED : BUTTON_ENABLED, _txt, btn_row_x, btn_row_y, button_row_w, button_row_h)) {\
_loan.is_active = true;\
- _loan.days_left = 12*28;\
+ _loan.days_left = 56;\
_active_world->money += _loan.amount;\
audio_play_sound(snd_bell, AUDIO_CHANNEL_SFX_2);\
}\
@@ -1161,24 +1161,24 @@ static void world_map_draw_bank(platform_window* window) s32 txt_offset = 0;
if (_active_world->bank_info.loan1.is_active) {
char txt[100];
- sprintf(txt, "LOAN: 10K at $%.0f/month. %d days left.",
- _active_world->bank_info.loan1.monthly_payment, _active_world->bank_info.loan1.days_left);
+ sprintf(txt, "LOAN: 10K at $%.0f/day. %d days left.",
+ _active_world->bank_info.loan1.monthly_payment/28.0f, _active_world->bank_info.loan1.days_left);
renderer->render_text(fnt_big, btn_row_x + textpad, btn_row_y + textpad + txt_offset, txt, COLOR_TEXT);
txt_offset += fnt_big->px_h + textpad;
}
if (_active_world->bank_info.loan2.is_active) {
char txt[100];
- sprintf(txt, "LOAN: 50K at $%.0f/month. %d days left.",
- _active_world->bank_info.loan2.monthly_payment, _active_world->bank_info.loan2.days_left);
+ sprintf(txt, "LOAN: 50K at $%.0f/day. %d days left.",
+ _active_world->bank_info.loan2.monthly_payment/28.0f, _active_world->bank_info.loan2.days_left);
renderer->render_text(fnt_big, btn_row_x + textpad, btn_row_y + textpad + txt_offset, txt, COLOR_TEXT);
txt_offset += fnt_big->px_h + textpad;
}
if (_active_world->bank_info.loan3.is_active) {
char txt[100];
- sprintf(txt, "LOAN: 150K at $%.0f/month. %d days left.",
- _active_world->bank_info.loan3.monthly_payment, _active_world->bank_info.loan3.days_left);
+ sprintf(txt, "LOAN: 150K at $%.0f/day. %d days left.",
+ _active_world->bank_info.loan3.monthly_payment/28.0f, _active_world->bank_info.loan3.days_left);
renderer->render_text(fnt_big, btn_row_x + textpad, btn_row_y + textpad + txt_offset, txt, COLOR_TEXT);
txt_offset += fnt_big->px_h + textpad;
}
diff --git a/src/world.c b/src/world.c index 14000d3..bd04a52 100644 --- a/src/world.c +++ b/src/world.c @@ -288,6 +288,7 @@ truck* world_get_truck_by_type(world* world, s32 type) void add_truck_to_world_location(world* world, world_location* location, truck* tr)
{
log_assert(location->trucks.length < MAX_TRUCK_COUNT, "Too many trucks");
+ tr->assigned_employee = 0;
tr->id = world->next_id++;
array_push(&location->trucks, tr);
}
@@ -681,16 +682,16 @@ world* world_create_new(bool create_default_state) new_world->money = 100000.0f;
new_world->next_id = 1;
new_world->active_jobs = array_create(sizeof(active_job));
- new_world->investments = (company_investments){10000,10000,10000,10000};
+ new_world->investments = (company_investments){0,0,0,0};
new_world->simulation_speed = 1;
new_world->days_since_last_random_event = 0;//-365; // No random events in the first year.
new_world->log.events = array_create(sizeof(event));
new_world->log.write_cursor = 0;
new_world->log.has_unread_messages = false;
new_world->bank_info = (bank){0};
- new_world->bank_info.loan1 = (bank_loan){10000, 3, 12, 846.94, 0};
- new_world->bank_info.loan2 = (bank_loan){50000, 5, 12, 4280.38, 0};
- new_world->bank_info.loan3 = (bank_loan){150000, 8, 12, 13048.27, 0};
+ new_world->bank_info.loan1 = (bank_loan){10000, 3, 12, 846.94*6, 0};
+ new_world->bank_info.loan2 = (bank_loan){50000, 5, 12, 4280.38*6, 0};
+ new_world->bank_info.loan3 = (bank_loan){150000, 8, 12, 13048.27*6, 0};
array_reserve(&new_world->log.events, LOG_HISTORY_LENGTH);
new_world->insights = array_create(sizeof(money_data_collection));
@@ -743,7 +744,7 @@ world* world_create_new(bool create_default_state) }
world_assign_new_job_offers(new_world, true);
- enable_insights_for_current_month(new_world);
+ if (create_default_state) enable_insights_for_current_month(new_world);
world_update_location_scores(new_world);
return new_world;
|