Merge pull request #153 from GameLab-UNIL-EPFL/playtestsFix

Last minute bug fixes

scenes/Brasserie/Brasserie.tscn

@@ -1475,6 +1475,9 @@ visible = false
 [node name="Label" parent="Book/Sprite" index="0"]
 text = "Lire"
 
+[node name="AnimatedSprite" parent="Book/Sprite" index="1"]
+frame = 1
+
 [node name="CollisionShape2D" parent="Book/Area2D" index="0"]
 position = Vector2( -5.67307, 11.3461 )
 shape = SubResource( 71 )
@@ -1491,6 +1494,7 @@ margin_bottom = 487.0
 [node name="PressE" parent="Book/Open" index="1" instance=ExtResource( 30 )]
 position = Vector2( -94, 260 )
 scale = Vector2( 1, 1 )
+frame = 1
 
 [node name="Label3" type="Label" parent="Book/Open" index="2"]
 margin_left = -83.0
@@ -1517,9 +1521,6 @@ visible = false
 [node name="Label" parent="Book2/Sprite" index="0"]
 text = "Lire"
 
-[node name="AnimatedSprite" parent="Book2/Sprite" index="1"]
-frame = 1
-
 [node name="CollisionShape2D" parent="Book2/Area2D" index="0"]
 position = Vector2( -5.67307, 11.3461 )
 shape = SubResource( 71 )
@@ -1536,7 +1537,6 @@ margin_bottom = 487.0
 [node name="PressE" parent="Book2/Open" index="1" instance=ExtResource( 30 )]
 position = Vector2( -94, 260 )
 scale = Vector2( 1, 1 )
-frame = 1
 
 [node name="Label3" type="Label" parent="Book2/Open" index="2"]
 margin_left = -83.0
@@ -1563,6 +1563,9 @@ visible = false
 [node name="Label" parent="Item/Sprite" index="0"]
 text = "Regarder"
 
+[node name="AnimatedSprite" parent="Item/Sprite" index="1"]
+frame = 1
+
 [node name="CollisionShape2D" parent="Item/Area2D" index="0"]
 position = Vector2( 0.667419, 10.0113 )
 shape = SubResource( 72 )
@@ -1573,6 +1576,7 @@ visible = false
 [node name="PressE" parent="Item/Open" index="1" instance=ExtResource( 30 )]
 position = Vector2( -150, 256 )
 scale = Vector2( 1.5, 1.5 )
+frame = 1
 
 [node name="Label6" type="Label" parent="Item/Open" index="2"]
 margin_left = -137.0

src/Context.cs

@@ -52,6 +52,8 @@ public class Context : Node {
 	private Vector2 PaludEnterPosition = new Vector2(608, 230);
 	private Vector2 MoulinEnterPosition = new Vector2(324, 248);
 	private Vector2 FlonEnterPosition = new Vector2(404, 210);
+	private Vector2 BrasserieEnterPosition = new Vector2(262, 284);
+	private Vector2 CasinoEnterPosition = new Vector2(320, 288);
 
 	public override void _Ready() {
 		NotebookCharInfo.Add(new CharacterInfo_t(
@@ -147,10 +149,18 @@ public NPC _GetQuestNPC() {
 	public Vector2 _GetPlayerPosition() {
 		if(GameState != GameStates.INIT) {
 			switch(CurrentLocation) {
+				case Locations.PALUD:
+					return PaludEnterPosition;
+				case Locations.INTRO:
+					return IntroEnterPosition;
 				case Locations.MOULIN:
 					return MoulinEnterPosition;
 				case Locations.FLON:
 					return FlonEnterPosition;
+				case Locations.BRASSERIE:
+					return BrasserieEnterPosition;
+				case Locations.CASINO:
+					return CasinoEnterPosition;
 				default:
 					return Vector2.Zero;
 			}

src/Player.cs

@@ -58,7 +58,7 @@ public class Player : KinematicBody2D {
 	[Export]
 	public bool isCutscene;
 	[Export]
-	public float CloseNotebookTimer = 2.0f;
+	public float CloseNotebookTimer = 1.5f;
 
 	private int cutsceneCounter = 11;