Various updated made to various things, tying more of the game together

game/initial_save.json

@@ -4,7 +4,7 @@
 	"totems": {},
 	"coins": 0, 
 	"py_scripter_tabs": 1,
-	"py_scripter_enabled": false,
+	"has_unlocked_pyscripter": false,
 	"player_type": "male_0",
 	"level_data" : {
 		"world_1" : {

game/levels/world1/level1/bridge/layout.tmx

@@ -36,8 +36,8 @@
  </layer>
  <objectgroup name="Object Layer 1" width="25" height="30">
   <object name="characters/player/player_one" gid="286" x="512" y="1920"/>
-  <object name="tile_trigger/exit_to_village_bottom" gid="292" x="576" y="1920"/>
-  <object name="tile_trigger/exit_to_village_top" gid="292" x="512" y="1920"/>
+  <object name="tile_trigger/exit_to_village_bottom" gid="292" x="576" y="1984"/>
+  <object name="tile_trigger/exit_to_village_top" gid="292" x="512" y="1984"/>
   <object name="sign/village_sign" gid="288" x="192" y="1216"/>
   <object name="sign/bog_sign" gid="288" x="704" y="1216"/>
   <object name="characters/npcs/heidi/heidi" gid="291" x="1536" y="1920"/>

game/levels/world1/level1/player_house/scripts/start.py

@@ -13,10 +13,11 @@
 #end save-data set-up
 
 #setting the player's starting position
+player_one.set_busy(True)
 if player_data.get_previous_exit() == "/world_1/intro":
-    pass  #start player in default
+    player_one.set_busy(False)
 elif player_data.get_previous_exit() == "/world1/level1/rossumberg":
-    player_one.move_to((3, 4), callback = player_one.move_south)
+    player_one.move_to((3, 4), callback = lambda: player_one.move_south(callback = lambda: player_one.set_busy(False)))
 
 #end setting the player's starting position
 

game/levels/world1/level1/rossumberg/layout.tmx

@@ -27,16 +27,16 @@
  </layer>
  <layer name="SpecialLayer" width="26" height="20">
   <data encoding="base64" compression="zlib">
-   eJzF1EsKACAIRdFaifvfZaNAgsLP1R44zEMWyhxDHLXjORMp7VSat3Q52rK4ZGjj1YO09KysDjW77FuTVofTYfy4C/UPqx3r3M4dUuVkQuxKysiYUcPiEb3JWlQEIKE=
+   eJzF1EEKACAIRNE6Sfe/ZatAosL0Tw24zEcWtlpKu6iRmzORso7S3EXdf2V5XDK0cepBWnZWXoeaHfXmhPXCeWH8uAv1D9WOd27zDlE5mZA7M2tkzKjh8YjeZHWkaCBh
   </data>
  </layer>
  <objectgroup name="Object Layer 1" width="26" height="20">
   <object name="characters/player/player_one" gid="191" x="1152" y="448"/>
   <object name="characters/npcs/heidi/heidi" gid="196" x="0" y="1216"/>
   <object name="sign/route_sign" gid="193" x="960" y="256"/>
   <object name="tile_trigger/exit_to_house" gid="197" x="1152" y="448"/>
-  <object name="tile_trigger/exit_to_road_top" gid="197" x="768" y="64"/>
-  <object name="tile_trigger/exit_to_road_bottom" gid="197" x="832" y="64"/>
+  <object name="tile_trigger/exit_to_road_top" gid="197" x="768" y="0"/>
+  <object name="tile_trigger/exit_to_road_bottom" gid="197" x="832" y="0"/>
   <object name="player_data/player_data" gid="192" x="0" y="64"/>
   <object name="characters/npcs/generic/villager1" gid="196" x="1088" y="768"/>
   <object name="characters/npcs/generic/villager2" gid="196" x="640" y="576"/>

game/levels/world1/level1/rossumberg/scripts/start.py

@@ -72,6 +72,7 @@ def heidi_player_action(player_object):
         lambda callback: heidi.move_south(callback = callback),
         lambda callback: heidi.move_south(callback = callback),
         lambda callback: heidi.move_south(callback = callback),
+        lambda callback: heidi.move_south(callback = callback),
         lambda callback: heidi.face_east(callback = callback),
         lambda callback: player_one.face_west(callback = callback),
         lambda callback: engine.show_dialogue(engine.get_player_name() + "!", callback = callback),

game/objects/characters/character.py

@@ -467,10 +467,9 @@ def __move_x(self, face_x, parent_move_x, callback = lambda: None):
         callback : func, optional
             Places the callback onto the engine event-queue
         """
-        if not self.is_busy():
-            face_x()
-            self.start_animating()
-            parent_move_x(lambda: self.__stop_animating_func(callback))
+        face_x()
+        self.start_animating()
+        parent_move_x(lambda: self.__stop_animating_func(callback))
         return
 
     def __stop_animating_func(self, callback = lambda : None):

game/objects/characters/player/player.py

@@ -150,8 +150,8 @@ def move_north(self, callback = lambda: None):
         x,y = self.get_position()
         target_position = (x, y+1)
         if (engine.get_tile_type(target_position) != engine.TILE_TYPE_WATER) and (not engine.is_solid(target_position)): #stop the player from being Chris Angel
-            self.wait(0.0, callback = lambda: self.__trigger_walk_off((x,y)))
             super().move_north(callback)
+            self.__trigger_walk_off((x,y))
             self.wait(0.2, callback = lambda: self.__trigger_walk_on(target_position)) #call walk-on triggers on objects player walks on
         else:
             self.face_north()
@@ -173,8 +173,8 @@ def move_east(self, callback = lambda: None):
         x,y = self.get_position()
         target_position = (x+1, y)
         if (engine.get_tile_type(target_position) != engine.TILE_TYPE_WATER) and (not engine.is_solid(target_position)): #stop the player from being Chris Angel
-            self.wait(0.0, callback = lambda: self.__trigger_walk_off((x,y)))
             super().move_east(callback)
+            self.__trigger_walk_off((x,y))
             self.wait(0.2, callback = lambda: self.__trigger_walk_on(target_position)) #call walk-on triggers on objects player walks on
         else:
             self.face_east()
@@ -196,8 +196,8 @@ def move_south(self, callback = lambda: None):
         x,y = self.get_position()
         target_position = (x, y-1)
         if (engine.get_tile_type(target_position) != engine.TILE_TYPE_WATER) and (not engine.is_solid(target_position)): #stop the player from being Chris Angel
-            self.wait(0.0, callback = lambda: self.__trigger_walk_off((x,y)))
             super().move_south(callback)
+            self.__trigger_walk_off((x,y))
             self.wait(0.2, callback = lambda: self.__trigger_walk_on(target_position)) #call walk-on triggers on objects player walks on a moment before they reach there
         else:
             self.face_south()
@@ -220,8 +220,8 @@ def move_west(self, callback = lambda: None):
         x,y = self.get_position()
         target_position = (x-1, y)
         if (engine.get_tile_type(target_position) != engine.TILE_TYPE_WATER) and (not engine.is_solid(target_position)): #stop the player from being Chris Angel
-            self.wait(0.0, callback = lambda: self.__trigger_walk_off((x,y)))
             super().move_west(callback)
+            self.__trigger_walk_off((x,y))
             self.wait(0.2, callback = lambda: self.__trigger_walk_on(target_position)) #call walk-on triggers on objects player walks on
         else:
             self.face_west()

src/core/game_main.cpp

@@ -426,9 +426,7 @@ void GameMain::game_loop(bool showMouse)
         challenge_data->run_challenge = true;
 
         changing_challenge = false;
-    }
-    else if ((!challenge_data->game_window->check_close()) && challenge_data->run_challenge && run_game)
-    {
+    } else if ((!challenge_data->game_window->check_close()) && challenge_data->run_challenge && run_game) {
         //std::cout << "running game loop" << std::endl;
 
         last_clock = std::chrono::steady_clock::now();
@@ -438,14 +436,9 @@ void GameMain::game_loop(bool showMouse)
 
         VLOG(3) << "} IM | EM {";
 
-        do
-        {
+        do {
             EventManager::get_instance()->process_events(interpreter.interpreter_context);
-        }
-        while (
-            std::chrono::steady_clock::now() - last_clock
-            < std::chrono::nanoseconds(1000000000 / 60)
-        );
+        } while (std::chrono::steady_clock::now() - last_clock < std::chrono::nanoseconds(1000000000 / 60));
 
         VLOG(3) << "} EM | RM {";
         //std::cout << "calling render" << std::endl;