From 337a61596e609396b7b8edc45d5d0e22881c7b03 Mon Sep 17 00:00:00 2001
From: Cameron Reikes <cameronreikes@gmail.com>
Date: Tue, 8 Nov 2022 17:54:57 -0800
Subject: [PATCH] Respawn at last medbay and tune save timing

---
 gamestate.c | 17 ++++++++++++++---
 types.h     |  3 ++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gamestate.c b/gamestate.c
index a03c1d2..4b6ee92 100644
--- a/gamestate.c
+++ b/gamestate.c
@@ -1188,6 +1188,13 @@ EntityID create_spacestation(GameState* gs)
 	return get_id(gs, grid);
 }
 
+void exit_seat(GameState *gs, Entity *seat_in, Entity *player)
+{
+	V2 pilot_seat_exit_spot = V2add(entity_pos(seat_in), V2scale(box_facing_vector(seat_in), BOX_SIZE));
+	cpBodySetPosition(player->body, v2_to_cp(pilot_seat_exit_spot));
+	cpBodySetVelocity(player->body, v2_to_cp(player_vel(gs, player)));
+}
+
 void process(GameState* gs, float dt)
 {
 	assert(gs->space != NULL);
@@ -1204,6 +1211,11 @@ void process(GameState* gs, float dt)
 			p = new_entity(gs);
 			create_player(gs, p);
 			player->entity = get_id(gs, p);
+			Entity* medbay = get_entity(gs, player->last_used_medbay);
+			if (medbay != NULL)
+			{
+				exit_seat(gs, medbay, p);
+			}
 			entity_ensure_in_orbit(p);
 		}
 		assert(p->is_player);
@@ -1239,6 +1251,7 @@ void process(GameState* gs, float dt)
 						{
 							p->currently_inside_of_box = get_id(gs, potential_seat);
 							potential_seat->player_who_is_inside_of_me = get_id(gs, p);
+							player->last_used_medbay = p->currently_inside_of_box;
 						}
 					}
 				}
@@ -1249,9 +1262,7 @@ void process(GameState* gs, float dt)
 			}
 			else
 			{
-				V2 pilot_seat_exit_spot = V2add(entity_pos(seat_maybe_in), V2scale(box_facing_vector(seat_maybe_in), BOX_SIZE));
-				cpBodySetPosition(p->body, v2_to_cp(pilot_seat_exit_spot));
-				cpBodySetVelocity(p->body, v2_to_cp(player_vel(gs, p)));
+				exit_seat(gs, seat_maybe_in, p);
 				seat_maybe_in->player_who_is_inside_of_me = (EntityID){ 0 };
 				p->currently_inside_of_box = (EntityID){ 0 };
 			}
diff --git a/types.h b/types.h
index 192b671..348789e 100644
--- a/types.h
+++ b/types.h
@@ -31,7 +31,7 @@
 #define EXPLOSION_RADIUS 1.0f
 #define EXPLOSION_DAMAGE_THRESHOLD 0.2f // how much damage until it explodes
 #define GOLD_UNLOCK_RADIUS 1.0f
-#define TIME_BETWEEN_WORLD_SAVE 5.0f
+#define TIME_BETWEEN_WORLD_SAVE 30.0f
 
 #define TIMESTEP (1.0f / 60.0f) // not required to simulate at this, but this defines what tick the game is on
 #define TIME_BETWEEN_INPUT_PACKETS (1.0f / 20.0f)
@@ -192,6 +192,7 @@ typedef struct Player
 	bool connected;
 	bool unlocked_bombs;
 	EntityID entity;
+	EntityID last_used_medbay;
 	InputFrame input;
 } Player;
 // gotta update the serialization functions when this changes