Merge pull request #128 from GameLab-UNIL-EPFL/fix

Separated map and notebook

scenes/Notebook/Notebook.tscn

@@ -7,7 +7,7 @@
 [ext_resource path="res://assets/04_notebook/noteBooksTabsSheet.png" type="Texture" id=5]
 [ext_resource path="res://scenes/Notebook/NotebookList.tscn" type="PackedScene" id=6]
 [ext_resource path="res://scenes/Notebook/Map.tscn" type="PackedScene" id=7]
-[ext_resource path="res://src/Map.cs" type="Script" id=8]
+[ext_resource path="res://scenes/Interaction/PressSpace.tscn" type="PackedScene" id=8]
 [ext_resource path="res://assets/07_sounds/Sounds/pageTurn.wav" type="AudioStream" id=9]
 [ext_resource path="res://src/Notebook.cs" type="Script" id=10]
 [ext_resource path="res://assets/01_characters/03_pnjs/angeliqueTruschel.png" type="Texture" id=11]
@@ -540,24 +540,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="TabMap" type="Sprite" parent="."]
-position = Vector2( 527, 260 )
-texture = ExtResource( 5 )
-vframes = 2
-frame = 1
-
-[node name="MapButton" type="Button" parent="."]
-margin_left = 515.0
-margin_top = 249.0
-margin_right = 541.0
-margin_bottom = 269.0
-focus_mode = 0
-enabled_focus_mode = 0
-flat = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="Portrait1" type="Sprite" parent="."]
 position = Vector2( 171.51, 112 )
 texture = ExtResource( 11 )
@@ -616,7 +598,6 @@ vframes = 2
 [node name="Map" parent="." instance=ExtResource( 7 )]
 visible = false
 position = Vector2( 96, 48 )
-script = ExtResource( 8 )
 
 [node name="ButtonSound" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 9 )
@@ -635,6 +616,10 @@ __meta__ = {
 
 [node name="PressTab" parent="." instance=ExtResource( 15 )]
 
+[node name="PressSpace" parent="." instance=ExtResource( 8 )]
+visible = false
+position = Vector2( 20, 340 )
+
 [connection signal="pressed" from="ColorRect/CloseNotebook" to="." method="_on_NotebookController_pressed"]
 [connection signal="OpenOptions" from="Sprite/Prenom" to="NotebookList" method="_on_OpenOptions"]
 [connection signal="OpenOptions" from="Sprite/Nom" to="NotebookList" method="_on_OpenOptions"]
@@ -643,8 +628,6 @@ __meta__ = {
 [connection signal="OpenOptions" from="Sprite/Conjoint" to="NotebookList" method="_on_OpenOptions"]
 [connection signal="OpenOptions" from="Sprite/Enfants" to="NotebookList" method="_on_OpenOptions"]
 [connection signal="OpenOptions" from="Sprite/Metier" to="NotebookList" method="_on_OpenOptions"]
-[connection signal="pressed" from="MapButton" to="." method="_on_MapButton_pressed"]
-[connection signal="pressed" from="MapButton" to="Map" method="_on_MapButton_pressed"]
 [connection signal="UpdateInfo" from="NotebookList" to="Sprite/Prenom" method="_on_UpdateInfo"]
 [connection signal="UpdateInfo" from="NotebookList" to="Sprite/Nom" method="_on_UpdateInfo"]
 [connection signal="UpdateInfo" from="NotebookList" to="Sprite/Adresse" method="_on_UpdateInfo"]

src/Notebook.cs

@@ -17,7 +17,7 @@ public class Notebook : Node2D {
 	private bool mapOpen = false;
 	private AudioStreamPlayer ASP;
 
-	private Map M;
+	private Node2D M;
 
 	private Context context;
 	private Player p;
@@ -94,7 +94,7 @@ public override void _Ready() {
 		context = GetNode<Context>("/root/Context");
 		p = GetNode<Player>("../YSort/Player");
 		ASP = GetNode<AudioStreamPlayer>("../NotebookClick");
-		M = GetNode<Map>("Map");
+		M = GetNode<Node2D>("Map");
 
 		//Make sure that the context has the questNPC
 		context._FetchQuestNPC();
@@ -220,15 +220,16 @@ public void _on_SendInfoToQuestNPC(NPC questNPC) {
 
 	public void _on_NotebookController_pressed() {
 		if(mapOpen) {
-			_on_MapButton_pressed();
-			M._on_MapButton_pressed();
+			_on_MapB_pressed();
+			hidden = true;
+			Show();
 		}
-
 		if(ASP.Playing == false) {
 			ASP.Play();
 		}
 		if(hidden) {
 			Show();
+			ShowAll();
 			AudioServer.SetBusMute(2, true);
 			p.BlockPlayer();
 		} else {
@@ -240,20 +241,58 @@ public void _on_NotebookController_pressed() {
 
 		//Update Context
 		FillCharInfo();
+		_UpdateNotebook(correctInfo);
 		context._UpdateNotebookCharInfo(curTabId, characterInfo);
+		context._UpdateNotebookCorrectInfo(curTabId, correctInfo);
+	}
+
+	private void ShowAll() {
+		var bg = GetNode<Sprite>("Sprite");
+		bg.Show();
+		var pressTab = GetNode<Sprite>("PressTab");
+		pressTab.Show();
+		foreach(var inf in info) {
+			inf.Show();
+		}
+		foreach(var inf in infoStatic) {
+			inf.Show();
+		}
+		for(int i = 0; i < 4; ++i) {
+			tabSprites[i].Show();
+			tabButtons[i].Show();
+		}
+	}
+
+	private void HideAll() {
+		var bg = GetNode<Sprite>("Sprite");
+		bg.Hide();
+		var pressTab = GetNode<Sprite>("PressTab");
+		pressTab.Hide();
+		foreach(var inf in info) {
+			inf.Hide();
+		}
+		foreach(var inf in infoStatic) {
+			inf.Hide();
+		}
+		for(int i = 0; i < 4; ++i) {
+			tabSprites[i].Hide();
+			tabButtons[i].Hide();
+		}
 	}
 
 	public void _on_MapB_pressed() {
-		if(hidden) {
-			_on_NotebookController_pressed();
-			
-			_on_MapButton_pressed();
-			M._on_MapButton_pressed();
-		} else if(!hidden && !mapOpen) {
-			_on_MapButton_pressed();
-			M._on_MapButton_pressed();
+		_on_MapButton_pressed();
+		M.Show();
+		var space = GetNode<Sprite>("PressSpace");
+		space.Show();
+
+		if(mapOpen) {
+			Show();
+			HideAll();
 		} else {
-			_on_NotebookController_pressed();
+			M.Hide();
+			space.Hide();
+			Hide();
 		}
 	}
 
@@ -278,6 +317,7 @@ public void _on_MapButton_pressed() {
 		//Update Context
 		FillCharInfo();
 		context._UpdateNotebookCharInfo(curTabId, characterInfo);
+		context._UpdateNotebookCorrectInfo(curTabId, correctInfo);
 	}
 
 	private void _on_OpenMapZone_area_entered(Area2D tb) {

src/NotebookController.cs

@@ -14,7 +14,6 @@ public override void _Ready()
 		AnimPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
 		MB = GetNode<TextureButton>("MapButton");
 		NB = GetNode<Notebook>("../Notebook");
-		M = GetNode<Map>("../Notebook/Map");
 
 		if(!MB.IsConnected("pressed", NB, "_on_MapB_pressed")){
 			MB.Connect("pressed", NB, "_on_MapB_pressed");