Compare commits

..

2 Commits

8 changed files with 24 additions and 15 deletions

View File

@ -1,5 +1,5 @@
extends Node3D
func _ready() -> void:
State.room.save_game.burnout = true
State.room.save_game.subway_burnout = true
%PlayerDetect.body_entered.connect(func(body): if visible and body is PlayerController: State.room.proceed.emit(Main.adulthood_room_path))

View File

@ -1,4 +1,5 @@
extends RoomTemplate
class_name VolunteerRoom
@onready var card_picker: CardPicker = %Picker
@onready var player: PlayerController = %PlayerController
@ -14,11 +15,11 @@ func get_ready() -> void:
Scenes.scene_finished.connect(_on_scene_finished)
card_picker.cards_picked.connect(card_board.populate_board)
save_game = State.save_game
Scenes.completed_sequences = save_game.mementos_complete
Scenes.started_sequences = save_game.mementos_complete
Scenes.enabled_sequences = save_game.sequences_enabled
#FIXME: fix the bloddy card board loading algorythm
#card_board.initialise_from_save(save_game)
%TherapyVoluntaryInteractable.visible = not save_game.subway_burnout
%TherapyUniInteractable.visible = save_game.subway_burnout
card_board.initialise_from_save(save_game)
card_board.board_completed.connect(func():
#TODO: hook in ending
save_room()

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=49 format=3 uid="uid://flisupth27th"]
[ext_resource type="PackedScene" uid="uid://dwbhei5kywqbd" path="res://volunteer_room_visuals.tscn" id="1_ln5pp"]
[ext_resource type="Script" uid="uid://wiw2j1gw230e" path="res://base-environments/volunteer_room/shared_flat.gd" id="1_wdfvq"]
[ext_resource type="Script" uid="uid://wiw2j1gw230e" path="res://base-environments/volunteer_room/volunteer_room.gd" id="1_wdfvq"]
[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="2_upyac"]
[ext_resource type="Script" uid="uid://c281w7earok6w" path="res://base-environments/youth_room/crouch_volume.gd" id="3_fli74"]
[ext_resource type="PackedScene" uid="uid://dreokijo757l1" path="res://logic-scenes/interactable/interactable.tscn" id="5_my8p4"]
@ -207,6 +207,9 @@ unique_name_in_owner = true
transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 2.2023005, 0, 0.7319784)
initial_pitch = 0.0
[node name="Camera3D" parent="PlayerController/Yaw/Pitch/Mount" index="0"]
transform = Transform3D(1, 0, 0, 0, 1.0000006, 0, 0, 0, 1.0000006, 0, 0.38172483, -0.05718814)
[node name="volunteer_room" parent="." instance=ExtResource("1_ln5pp")]
[node name="MeshInstance3D" type="MeshInstance3D" parent="volunteer_room"]
@ -226,7 +229,7 @@ shape = SubResource("CapsuleShape3D_2fihi")
[node name="Collectables" type="Node3D" parent="."]
[node name="KitchenInteractable" parent="Collectables" instance=ExtResource("5_my8p4")]
transform = Transform3D(-0.999999, 0, 8.742269e-08, 0, 1, 0, -8.742269e-08, 0, -0.999999, 3.46201, 1.8257881, -4.097006)
transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0.8310573, 1.0068259, -2.7083611)
interaction = ExtResource("12_6rb4d")
[node name="BurnoutInteractable" parent="Collectables" instance=ExtResource("5_my8p4")]
@ -243,17 +246,19 @@ interaction = ExtResource("17_my8p4")
billboard = false
[node name="TherapyVoluntaryInteractable" parent="Collectables" instance=ExtResource("5_my8p4")]
unique_name_in_owner = true
transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0.399901, 1.21835, 1.29166)
interaction = ExtResource("15_ci4rn")
billboard = false
[node name="TherapyUniInteractable" parent="Collectables" instance=ExtResource("5_my8p4")]
unique_name_in_owner = true
transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0.399901, 1.21835, 1.29166)
interaction = ExtResource("14_upyac")
billboard = false
[node name="UniversityInteractable" parent="Collectables" instance=ExtResource("5_my8p4")]
transform = Transform3D(-4.371135e-08, 0, -0.9999991, 0, 1, 0, 0.9999991, 0, -4.371135e-08, -2.7745893, 1.593935, -3.0279322)
transform = Transform3D(-4.371135e-08, 0, -0.9999991, 0, 1, 0, 0.9999991, 0, -4.371135e-08, -2.7745893, 1.4022808, -3.0279322)
interaction = ExtResource("13_5s6pb")
billboard = false
@ -272,6 +277,7 @@ billboard = false
[node name="VoxelGI" type="VoxelGI" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.08276367, 1.3269348, 0.05317688)
subdiv = 3
size = Vector3(6.132324, 2.9212036, 12.054474)
data = ExtResource("8_fli74")
@ -406,3 +412,5 @@ script = SubResource("GDScript_ri8p0")
environment = SubResource("Environment_pdgua")
camera_attributes = SubResource("CameraAttributesPractical_0bxa6")
script = SubResource("GDScript_3k3rl")
[editable path="PlayerController"]

View File

@ -19,7 +19,7 @@ class_name SaveGame extends Resource
@export var seen : Array[StringName] = []
@export var is_childhood_board_complete: bool = false
@export var burnout : bool = false
@export var subway_burnout : bool = false
@export var player_position : Vector3 = Vector3.ZERO
@export var player_yaw : float = 0.0

View File

@ -370,7 +370,8 @@ func _by_spatial(a: Draggable, b: Draggable) -> bool:
func _by_mouse(a: Draggable, b: Draggable) -> bool:
var mouse_pos : Vector2 = get_viewport().get_mouse_position()
var viewport := get_viewport() # when app closes, the sorting might still be going on
var mouse_pos : Vector2 = viewport.get_mouse_position() if viewport else Vector2.ZERO
return (a.position-mouse_pos).length() < (b.position-mouse_pos).length()

View File

@ -7,8 +7,7 @@
[ext_resource type="FontFile" uid="uid://qalmecrbkxyp" path="res://import/fonts/icon.ttf" id="5_wl31y"]
[ext_resource type="PackedScene" uid="uid://bdnesuqroi7ss" path="res://vfx/collectable_particles.tscn" id="6_a6wx8"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ih54h"]
height = 1.1483154
[sub_resource type="SphereShape3D" id="SphereShape3D_ih54h"]
[node name="Interactable" type="Area3D" groups=["interactables"]]
collision_layer = 16
@ -17,8 +16,8 @@ script = ExtResource("1_ih54h")
metadata/_custom_type_script = "uid://bp6s7vhdd6btk"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -0.2727661, -1.1922985e-08, 0)
shape = SubResource("CapsuleShape3D_ih54h")
transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("SphereShape3D_ih54h")
[node name="OmniLight3D" type="OmniLight3D" parent="."]
light_energy = 0.01