diff --git a/src/base-environments/transition/import/textures/pipeage.001.tres b/src/base-environments/transition/import/textures/pipeage.001.tres index c6904e7..2da2e99 100644 --- a/src/base-environments/transition/import/textures/pipeage.001.tres +++ b/src/base-environments/transition/import/textures/pipeage.001.tres @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://86e1o8vsdxu5" path="res://base-environments/transition/import/meta_station_TuberiaViaDetallada_baseColor.jpg" id="1_djcxt"] [ext_resource type="Texture2D" uid="uid://b7l6ey6alxr6f" path="res://base-environments/transition/import/meta_station_TuberiaViaDetallada_metallicRoughness.png" id="2_735f0"] -[ext_resource type="Texture2D" uid="uid://byn4hpxgh1137" path="res://base-environments/transition/import/meta_station_TuberiaViaDetallada_normal.png" id="3_3v4qt"] +[ext_resource type="Texture2D" uid="uid://bq61t3tcn3b6s" path="res://base-environments/transition/import/meta_station_TuberiaViaDetallada_normal.png" id="3_3v4qt"] [resource] resource_name = "pipeage.001" diff --git a/src/base-environments/transition/import/textures/signal_lights.tres b/src/base-environments/transition/import/textures/signal_lights.tres index c0ed433..4aa59dc 100644 --- a/src/base-environments/transition/import/textures/signal_lights.tres +++ b/src/base-environments/transition/import/textures/signal_lights.tres @@ -1,9 +1,9 @@ [gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://6sf73f16ats0"] -[ext_resource type="Texture2D" uid="uid://o8lwbii8d0md" path="res://base-environments/transition/import/meta_station_Semaforo_baseColor.jpg" id="1_emryc"] +[ext_resource type="Texture2D" uid="uid://dn5i367anne0t" path="res://base-environments/transition/import/meta_station_Semaforo_baseColor.jpg" id="1_emryc"] [ext_resource type="Texture2D" uid="uid://c8sa5i5yc05c5" path="res://base-environments/transition/import/meta_station_Semaforo_metallicRoughness.png" id="2_1tqql"] [ext_resource type="Texture2D" uid="uid://ccpqvvjamt4f7" path="res://base-environments/transition/import/meta_station_Semaforo_emissive.jpg" id="3_3ya7a"] -[ext_resource type="Texture2D" uid="uid://bgqg3xno8mb6o" path="res://base-environments/transition/import/meta_station_Semaforo_normal.png" id="4_nktry"] +[ext_resource type="Texture2D" uid="uid://4rtp3jr6of1l" path="res://base-environments/transition/import/meta_station_Semaforo_normal.png" id="4_nktry"] [resource] resource_name = "signal_lights" diff --git a/src/base-environments/transition/import/textures/speakers.tres b/src/base-environments/transition/import/textures/speakers.tres index 8559775..588aba8 100644 --- a/src/base-environments/transition/import/textures/speakers.tres +++ b/src/base-environments/transition/import/textures/speakers.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://eu4wt63mt10g"] [ext_resource type="Texture2D" uid="uid://twkgvmifyfvr" path="res://base-environments/transition/import/meta_station_Megafono_baseColor.jpg" id="1_scj7p"] -[ext_resource type="Texture2D" uid="uid://dte2qgja70u6f" path="res://base-environments/transition/import/meta_station_Megafono_metallicRoughness.png" id="2_dioip"] +[ext_resource type="Texture2D" uid="uid://cy7lo05dyqlcw" path="res://base-environments/transition/import/meta_station_Megafono_metallicRoughness.png" id="2_dioip"] [ext_resource type="Texture2D" uid="uid://d4au7oo04octd" path="res://base-environments/transition/import/meta_station_Megafono_normal.png" id="3_3fyx8"] [resource] diff --git a/src/base-environments/volunteer_room/volunteer_room.tscn b/src/base-environments/volunteer_room/volunteer_room.tscn index 347e646..8ec5135 100644 --- a/src/base-environments/volunteer_room/volunteer_room.tscn +++ b/src/base-environments/volunteer_room/volunteer_room.tscn @@ -153,7 +153,7 @@ var is_repeating = false func _ready() -> void: Scenes.scene_finished.connect(scene_finished) - + # FIXME: this needs to be made prettier. $autism.finished.connect(on_autism_done) $burnout.finished.connect(on_burnout_done) @@ -192,7 +192,7 @@ func play_scene(id: int, repeat = false): func _on_ini_room(): pass -func scene_finished(id: Scenes.id, _repeat: bool): +func scene_finished(_id: Scenes.id, _repeat: bool): queue(\"RESET\") func play(anin_name: StringName = \"\", a: float = -1, b: float = 1, c: bool = false) -> void: diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index 10e8ee0..055def9 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -17,6 +17,10 @@ func set_theme(new_theme:Theme): current_main_theme = new_theme theme_changed.emit(new_theme) +@onready var room1 := preload("res://base-environments/youth_room/youth_room.tscn") +@onready var room2 := preload("res://base-environments/transition/transition.tscn") +@onready var room3 := preload("res://base-environments/volunteer_room/volunteer_room.tscn") + @export_file var user_settings_path:String = "user://user_settings.json" @export_file var user_saves_path:String = "user://savegames"