Merge branch 'main' of https://github.com/StikmanMann/allaroundtheworld

Florian/Map/chinese_ny_new.gd

@@ -0,0 +1,59 @@
+extends Node3D
+
+var paused = false
+var finished = false
+var main_scene : PackedScene
+
+func _ready() -> void:
+	$PauseMenu.hide()
+	$PauseMenu.resume.connect(_on_resume_button_pressed)
+	$PauseMenu.main_menu.connect(_on_menu_button_pressed)
+	$FinishScreen.hide()
+	$FinishScreen.retry.connect(_on_retry_button_pressed)
+	$FinishScreen.exit.connect(_on_exit_button_pressed)
+	main_scene = load("res://Nikita/hub_scene.tscn")
+
+func _process(delta: float) -> void:
+	if Input.is_action_just_pressed("take_picture"):
+		await PictureTakeablesArray.calcualtion_finished
+		finish()
+	if Input.is_action_just_pressed("pause"):
+		pause_menu()
+
+func pause_menu():
+	if paused:
+		$PauseMenu.hide()
+		get_tree().paused = false
+		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
+	else:
+		$PauseMenu.show()
+		get_tree().paused = true
+	paused = !paused
+
+func finish():
+	if finished:
+		$FinishScreen.hide()
+		get_tree().paused = false
+		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
+	else:
+		$FinishScreen.show()
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+		get_tree().paused = true
+	finished = !finished
+
+func _on_resume_button_pressed():
+	pause_menu()
+
+func _on_menu_button_pressed():
+	pause_menu()
+	get_tree().change_scene_to_packed(main_scene)
+
+func _on_retry_button_pressed():
+	finish()
+	PictureTakeablesArray.picture_takables.clear()
+	PictureTakeablesArray.picture_spots.clear()
+	get_tree().reload_current_scene()
+
+func _on_exit_button_pressed():
+	finish()
+	get_tree().change_scene_to_packed(main_scene)

Florian/Map/chinese_ny_new.gd.uid

@@ -0,0 +1 @@
+uid://douec45766xq4

Nikita/balloonfest.tscn

@@ -313,7 +313,7 @@ points_worth = 100
 points_name = "blue balloon"
 
 [node name="PathFollow3D2" type="PathFollow3D" parent="Balloons/Path3D4"]
-transform = Transform3D(0.963824, 0.0899486, 0.250846, -0.0929526, 0.995663, 0.000130762, -0.249747, -0.0234432, 0.968018, 4.18684, -4.32774, -53.3213)
+transform = Transform3D(0.963823, 0.0899486, 0.250846, -0.0929526, 0.995663, 0.000130762, -0.249747, -0.0234432, 0.968018, 4.18684, -4.32774, -53.3213)
 progress = 89.7982
 rotation_mode = 1
 script = ExtResource("22_hsesi")

Nikita/earth.tscn

@@ -4,9 +4,9 @@
 [ext_resource type="Texture2D" uid="uid://cw4gkryn2sl7y" path="res://Nikita/textures/Earth2_Water_BaseColor.png" id="2_v2ft5"]
 [ext_resource type="Texture2D" uid="uid://da0uksbt2mkqw" path="res://Nikita/textures/Earth2_Land_BaseColor.png" id="3_drefq"]
 [ext_resource type="PackedScene" uid="uid://ccjwh4alvryho" path="res://Nikita/waypoint.tscn" id="4_drefq"]
-[ext_resource type="PackedScene" uid="uid://by5cq6m32hbor" path="res://Florian/Map/Oktoberfest.tscn" id="5_tyl1s"]
+[ext_resource type="PackedScene" uid="uid://byenpgf2e6dq8" path="res://Florian/Map/Oktoberfest_new.tscn" id="5_if1dy"]
 [ext_resource type="PackedScene" uid="uid://cge0bfktyd7ka" path="res://Nikita/balloonfest.tscn" id="6_3pxso"]
-[ext_resource type="PackedScene" uid="uid://b2rihishxk0on" path="res://Florian/Map/chinese_ny.tscn" id="6_if1dy"]
+[ext_resource type="PackedScene" uid="uid://kcgefrq2227x" path="res://Florian/Map/chinese_ny_new.tscn" id="6_if1dy"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tyl1s"]
 albedo_texture = ExtResource("2_v2ft5")
@@ -34,7 +34,7 @@ disabled = true
 transform = Transform3D(-0.01, 0, -8.74228e-10, 0, 0.01, 0, 8.74228e-10, 0, -0.01, 0.00702367, 0.0636012, 0.0580069)
 scene_name = "Oktoberfest"
 scene_description = "Help light up the festival and bring people to the dance floor"
-switch_to = ExtResource("5_tyl1s")
+switch_to = ExtResource("5_if1dy")
 
 [node name="WaypointChi" parent="." index="2" instance=ExtResource("4_drefq")]
 transform = Transform3D(-4.37114e-10, 0, -0.01, 0, 0.01, 0, 0.01, 0, -4.37114e-10, 0.0740627, 0.0439419, 0)

Nikita/finish_screen.tscn

@@ -16,16 +16,17 @@ script = ExtResource("1_pfd8y")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
 layout_mode = 1
-anchors_preset = 7
+anchors_preset = 8
 anchor_left = 0.5
-anchor_top = 1.0
+anchor_top = 0.5
 anchor_right = 0.5
-anchor_bottom = 1.0
+anchor_bottom = 0.5
 offset_left = -147.5
-offset_top = -144.0
+offset_top = -72.0
 offset_right = 147.5
+offset_bottom = 72.0
 grow_horizontal = 2
-grow_vertical = 0
+grow_vertical = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
 layout_mode = 2
@@ -48,6 +49,7 @@ layout_mode = 2
 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 1
+theme_override_font_sizes/font_size = 42
 text = "Score:"
 vertical_alignment = 1
 
@@ -56,6 +58,7 @@ layout_mode = 2
 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 1
+theme_override_font_sizes/font_size = 42
 text = "999"
 horizontal_alignment = 2
 vertical_alignment = 1