diff --git a/scenes/main/Main.tscn b/scenes/main/Main.tscn index bcc0aee..5312493 100644 --- a/scenes/main/Main.tscn +++ b/scenes/main/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://cozypaw_main"] +[gd_scene load_steps=22 format=3 uid="uid://cozypaw_main"] [ext_resource type="Script" path="res://scripts/main/main.gd" id="1_main"] [ext_resource type="PackedScene" path="res://scenes/rooms/floor0/Reception.tscn" id="2_reception"] @@ -18,6 +18,8 @@ [ext_resource type="PackedScene" path="res://scenes/rooms/floor2/Ultrasound.tscn" id="16_ultrasound"] [ext_resource type="PackedScene" path="res://scenes/rooms/floor2/DeliveryRoom.tscn" id="17_delivery"] [ext_resource type="PackedScene" path="res://scenes/rooms/floor2/Nursery.tscn" id="18_nursery"] +[ext_resource type="PackedScene" path="res://scenes/rooms/home/GardenParty.tscn" id="19_gardenparty"] +[ext_resource type="PackedScene" path="res://scenes/objects/HomeButton.tscn" id="20_homebtn"] [sub_resource type="Resource" id="CharacterData_bunny1"] script = ExtResource("7_chardata") @@ -92,6 +94,10 @@ target_floor = 0 target_room = 2 label_text = "←" +[node name="HomeButtonToGarden" parent="Hospital/Floor0" instance=ExtResource("20_homebtn")] +position = Vector2(640, 620) +go_to_garden = true + [node name="Floor1" type="Node2D" parent="Hospital"] position = Vector2(0, -720) @@ -191,6 +197,12 @@ target_floor = 2 target_room = 1 label_text = "←" +[node name="Home" type="Node2D" parent="."] +position = Vector2(0, 720) + +[node name="GardenParty" parent="Home" instance=ExtResource("19_gardenparty")] +position = Vector2(0, 0) + [node name="Characters" type="Node2D" parent="."] [node name="Bunny1" parent="Characters" instance=ExtResource("3_char")] diff --git a/scenes/objects/GiftBox.tscn b/scenes/objects/GiftBox.tscn new file mode 100644 index 0000000..e30f919 --- /dev/null +++ b/scenes/objects/GiftBox.tscn @@ -0,0 +1,47 @@ +[gd_scene load_steps=2 format=3 uid="uid://cozypaw_giftbox"] + +[ext_resource type="Script" path="res://scripts/objects/gift_box.gd" id="1_giftbox"] + +[node name="GiftBox" type="Node2D"] +script = ExtResource("1_giftbox") + +[node name="BoxBase" type="ColorRect" parent="."] +offset_left = -40.0 +offset_top = -60.0 +offset_right = 40.0 +offset_bottom = 0.0 +color = Color(0.90, 0.28, 0.34, 1) + +[node name="BoxStripe" type="ColorRect" parent="."] +offset_left = -6.0 +offset_top = -60.0 +offset_right = 6.0 +offset_bottom = 0.0 +color = Color(0.98, 0.82, 0.22, 1) + +[node name="Lid" type="Node2D" parent="."] +position = Vector2(0, -60) + +[node name="LidShape" type="ColorRect" parent="Lid"] +offset_left = -44.0 +offset_top = -18.0 +offset_right = 44.0 +offset_bottom = 0.0 +color = Color(0.98, 0.38, 0.42, 1) + +[node name="LidBow" type="ColorRect" parent="Lid"] +offset_left = -10.0 +offset_top = -28.0 +offset_right = 10.0 +offset_bottom = -18.0 +color = Color(0.98, 0.82, 0.22, 1) + +[node name="Gift" type="Node2D" parent="."] +position = Vector2(0, -90) + +[node name="GiftShape" type="ColorRect" parent="Gift"] +offset_left = -20.0 +offset_top = -20.0 +offset_right = 20.0 +offset_bottom = 20.0 +color = Color(0.96, 0.76, 0.22, 1) diff --git a/scenes/objects/HomeButton.tscn b/scenes/objects/HomeButton.tscn new file mode 100644 index 0000000..7b178e7 --- /dev/null +++ b/scenes/objects/HomeButton.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=2 format=3 uid="uid://cozypaw_homebtn"] + +[ext_resource type="Script" path="res://scripts/objects/home_button.gd" id="1_homebtn"] + +[node name="HomeButton" type="Node2D"] +script = ExtResource("1_homebtn") + +[node name="ButtonBody" type="ColorRect" parent="."] +offset_left = -32.0 +offset_top = -32.0 +offset_right = 32.0 +offset_bottom = 32.0 +color = Color(0.36, 0.70, 0.44, 1) + +[node name="ButtonIcon" type="ColorRect" parent="."] +offset_left = -12.0 +offset_top = -18.0 +offset_right = 12.0 +offset_bottom = 6.0 +color = Color(0.90, 0.88, 0.70, 1) diff --git a/scenes/objects/TeaPot.tscn b/scenes/objects/TeaPot.tscn new file mode 100644 index 0000000..e56cdc4 --- /dev/null +++ b/scenes/objects/TeaPot.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=2 format=3 uid="uid://cozypaw_teapot"] + +[ext_resource type="Script" path="res://scripts/objects/tea_pot.gd" id="1_teapot"] + +[node name="TeaPot" type="Node2D"] +script = ExtResource("1_teapot") + +[node name="PotBody" type="ColorRect" parent="."] +offset_left = -30.0 +offset_top = -50.0 +offset_right = 30.0 +offset_bottom = 0.0 +color = Color(0.96, 0.92, 0.84, 1) + +[node name="PotLid" type="ColorRect" parent="."] +offset_left = -28.0 +offset_top = -58.0 +offset_right = 28.0 +offset_bottom = -48.0 +color = Color(0.74, 0.62, 0.50, 1) + +[node name="PotSpout" type="ColorRect" parent="."] +offset_left = 26.0 +offset_top = -38.0 +offset_right = 46.0 +offset_bottom = -22.0 +color = Color(0.96, 0.92, 0.84, 1) + +[node name="PotHandle" type="ColorRect" parent="."] +offset_left = -48.0 +offset_top = -36.0 +offset_right = -36.0 +offset_bottom = -14.0 +color = Color(0.96, 0.92, 0.84, 1) diff --git a/scenes/rooms/home/GardenParty.tscn b/scenes/rooms/home/GardenParty.tscn new file mode 100644 index 0000000..13b19de --- /dev/null +++ b/scenes/rooms/home/GardenParty.tscn @@ -0,0 +1,86 @@ +[gd_scene load_steps=4 format=3 uid="uid://cozypaw_gardenparty"] + +[ext_resource type="PackedScene" path="res://scenes/objects/GiftBox.tscn" id="1_giftbox"] +[ext_resource type="PackedScene" path="res://scenes/objects/TeaPot.tscn" id="2_teapot"] +[ext_resource type="PackedScene" path="res://scenes/objects/HomeButton.tscn" id="3_homebtn"] + +[node name="GardenParty" type="Node2D"] + +[node name="Sky" type="ColorRect" parent="."] +offset_left = 0.0 +offset_top = 0.0 +offset_right = 1280.0 +offset_bottom = 400.0 +color = Color(0.53, 0.81, 0.98, 1) + +[node name="Grass" type="ColorRect" parent="."] +offset_left = 0.0 +offset_top = 400.0 +offset_right = 1280.0 +offset_bottom = 720.0 +color = Color(0.55, 0.76, 0.46, 1) + +[node name="GroundEdge" type="ColorRect" parent="."] +offset_left = 0.0 +offset_top = 392.0 +offset_right = 1280.0 +offset_bottom = 404.0 +color = Color(0.38, 0.62, 0.32, 1) + +[node name="TableTop" type="ColorRect" parent="."] +offset_left = 440.0 +offset_top = 464.0 +offset_right = 840.0 +offset_bottom = 480.0 +color = Color(0.82, 0.66, 0.46, 1) + +[node name="TableLeg1" type="ColorRect" parent="."] +offset_left = 456.0 +offset_top = 480.0 +offset_right = 472.0 +offset_bottom = 580.0 +color = Color(0.70, 0.52, 0.34, 1) + +[node name="TableLeg2" type="ColorRect" parent="."] +offset_left = 808.0 +offset_top = 480.0 +offset_right = 824.0 +offset_bottom = 580.0 +color = Color(0.70, 0.52, 0.34, 1) + +[node name="TeaPot" parent="." instance=ExtResource("2_teapot")] +position = Vector2(510, 464) + +[node name="GiftBox1" parent="." instance=ExtResource("1_giftbox")] +position = Vector2(640, 464) + +[node name="GiftBox2" parent="." instance=ExtResource("1_giftbox")] +position = Vector2(730, 464) + +[node name="GiftBox3" parent="." instance=ExtResource("1_giftbox")] +position = Vector2(820, 464) + +[node name="TeaCup" type="ColorRect" parent="."] +offset_left = 558.0 +offset_top = 440.0 +offset_right = 590.0 +offset_bottom = 464.0 +color = Color(0.96, 0.92, 0.84, 1) + +[node name="Balloon1" type="ColorRect" parent="."] +offset_left = 180.0 +offset_top = 120.0 +offset_right = 220.0 +offset_bottom = 180.0 +color = Color(0.96, 0.44, 0.44, 1) + +[node name="Balloon2" type="ColorRect" parent="."] +offset_left = 1020.0 +offset_top = 100.0 +offset_right = 1060.0 +offset_bottom = 160.0 +color = Color(0.56, 0.76, 0.96, 1) + +[node name="HomeButtonReturn" parent="." instance=ExtResource("3_homebtn")] +position = Vector2(100, 620) +go_to_garden = false diff --git a/scripts/objects/gift_box.gd b/scripts/objects/gift_box.gd new file mode 100644 index 0000000..c84cd99 --- /dev/null +++ b/scripts/objects/gift_box.gd @@ -0,0 +1,55 @@ +## GiftBox — tap while closed to open: lid rises and fades out, gift inside fades in. +class_name GiftBox extends Node2D + +enum State { CLOSED, OPENING, OPEN } + +const LID_OPEN_Y: float = -120.0 +const OPEN_DURATION: float = 0.5 +const GIFT_FADE_DURATION: float = 0.4 +const BUTTON_HALF_WIDTH: float = 40.0 +const BUTTON_HALF_HEIGHT: float = 50.0 + +var _state: State = State.CLOSED + + +func _ready() -> void: + var gift: Node2D = get_node_or_null("Gift") as Node2D + if gift != null: + gift.modulate.a = 0.0 + + +func _input(event: InputEvent) -> void: + if _state != State.CLOSED: + return + if not event is InputEventScreenTouch: + return + var touch: InputEventScreenTouch = event as InputEventScreenTouch + if not touch.pressed: + return + var local: Vector2 = to_local(touch.position) + if abs(local.x) > BUTTON_HALF_WIDTH or abs(local.y) > BUTTON_HALF_HEIGHT: + return + _start_opening() + + +func _start_opening() -> void: + _state = State.OPENING + var lid: Node2D = get_node_or_null("Lid") as Node2D + if lid == null: + _state = State.OPEN + return + var tween: Tween = create_tween() + tween.set_ease(Tween.EASE_OUT) + tween.set_trans(Tween.TRANS_BACK) + tween.tween_property(lid, "position:y", LID_OPEN_Y, OPEN_DURATION) + tween.parallel().tween_property(lid, "modulate:a", 0.0, OPEN_DURATION) + tween.finished.connect(_on_lid_opened) + + +func _on_lid_opened() -> void: + _state = State.OPEN + var gift: Node2D = get_node_or_null("Gift") as Node2D + if gift == null: + return + var tween: Tween = create_tween() + tween.tween_property(gift, "modulate:a", 1.0, GIFT_FADE_DURATION) diff --git a/scripts/objects/home_button.gd b/scripts/objects/home_button.gd new file mode 100644 index 0000000..d3fa1a1 --- /dev/null +++ b/scripts/objects/home_button.gd @@ -0,0 +1,35 @@ +## HomeButton — tappable button that navigates between the hospital and the garden area. +## go_to_garden = true calls RoomNavigator.go_to_home(); false calls RoomNavigator.go_to_hospital(). +class_name HomeButton extends Node2D + +const BUTTON_HALF_SIZE: float = 32.0 + +@export var go_to_garden: bool = true + +var _busy: bool = false + + +func _input(event: InputEvent) -> void: + if _busy: + return + if not event is InputEventScreenTouch: + return + var touch: InputEventScreenTouch = event as InputEventScreenTouch + if not touch.pressed: + return + var local: Vector2 = to_local(touch.position) + if abs(local.x) > BUTTON_HALF_SIZE or abs(local.y) > BUTTON_HALF_SIZE: + return + if not is_instance_valid(RoomNavigator): + return + _busy = true + if go_to_garden: + RoomNavigator.home_entered.connect(_on_transition_done, CONNECT_ONE_SHOT) + RoomNavigator.go_to_home() + else: + RoomNavigator.hospital_entered.connect(_on_transition_done, CONNECT_ONE_SHOT) + RoomNavigator.go_to_hospital() + + +func _on_transition_done() -> void: + _busy = false diff --git a/scripts/objects/tea_pot.gd b/scripts/objects/tea_pot.gd new file mode 100644 index 0000000..de23f06 --- /dev/null +++ b/scripts/objects/tea_pot.gd @@ -0,0 +1,37 @@ +## TeaPot — tap to pour: tilts 45 degrees, holds briefly, then returns to upright. +class_name TeaPot extends Node2D + +enum State { IDLE, POURING } + +const TILT_ANGLE: float = 45.0 +const TILT_DURATION: float = 0.4 +const POUR_HOLD: float = 0.8 +const RETURN_DURATION: float = 0.4 +const BUTTON_HALF_SIZE: float = 40.0 + +var _state: State = State.IDLE + + +func _input(event: InputEvent) -> void: + if _state != State.IDLE: + return + if not event is InputEventScreenTouch: + return + var touch: InputEventScreenTouch = event as InputEventScreenTouch + if not touch.pressed: + return + var local: Vector2 = to_local(touch.position) + if abs(local.x) > BUTTON_HALF_SIZE or abs(local.y) > BUTTON_HALF_SIZE: + return + _start_pouring() + + +func _start_pouring() -> void: + _state = State.POURING + var tween: Tween = create_tween() + tween.set_ease(Tween.EASE_IN_OUT) + tween.set_trans(Tween.TRANS_SINE) + tween.tween_property(self, "rotation_degrees", TILT_ANGLE, TILT_DURATION) + tween.tween_interval(POUR_HOLD) + tween.tween_property(self, "rotation_degrees", 0.0, RETURN_DURATION) + tween.finished.connect(func() -> void: _state = State.IDLE) diff --git a/scripts/systems/room_navigator.gd b/scripts/systems/room_navigator.gd index e5c6d39..f567ea5 100644 --- a/scripts/systems/room_navigator.gd +++ b/scripts/systems/room_navigator.gd @@ -1,15 +1,21 @@ -## RoomNavigator — autoload that moves the Camera2D smoothly between hospital floors and rooms. +## RoomNavigator — autoload that moves the Camera2D smoothly between hospital floors, rooms, and the home/garden area. extends Node signal room_changed(floor_index: int, room_index: int) +signal home_entered() +signal hospital_entered() const FLOOR_HEIGHT: float = 720.0 const ROOM_WIDTH: float = 1280.0 +const HOME_CAMERA_X: float = 640.0 +const HOME_CAMERA_Y: float = 1080.0 const CAMERA_TWEEN_DURATION: float = 0.6 var _current_floor: int = 0 var _current_room: int = 0 +var _is_at_home: bool = false var _camera: Camera2D +var _active_tween: Tween func initialize(camera: Camera2D) -> void: @@ -23,17 +29,52 @@ func go_to_floor(floor_index: int) -> void: func go_to_room(floor_index: int, room_index: int) -> void: if _camera == null: return - if floor_index == _current_floor and room_index == _current_room: + if not _is_at_home and floor_index == _current_floor and room_index == _current_room: return + _is_at_home = false _current_floor = floor_index _current_room = room_index var target_x: float = room_index * ROOM_WIDTH + ROOM_WIDTH * 0.5 var target_y: float = floor_index * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5 - var tween: Tween = create_tween() - tween.set_ease(Tween.EASE_IN_OUT) - tween.set_trans(Tween.TRANS_SINE) - tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION) - tween.finished.connect(func() -> void: room_changed.emit(floor_index, room_index)) + if _active_tween != null: + _active_tween.kill() + _active_tween = create_tween() + _active_tween.set_ease(Tween.EASE_IN_OUT) + _active_tween.set_trans(Tween.TRANS_SINE) + _active_tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION) + _active_tween.finished.connect(func() -> void: room_changed.emit(floor_index, room_index)) + + +func go_to_home() -> void: + if _camera == null: + return + if _is_at_home: + return + _is_at_home = true + if _active_tween != null: + _active_tween.kill() + _active_tween = create_tween() + _active_tween.set_ease(Tween.EASE_IN_OUT) + _active_tween.set_trans(Tween.TRANS_SINE) + _active_tween.tween_property(_camera, "position", Vector2(HOME_CAMERA_X, HOME_CAMERA_Y), CAMERA_TWEEN_DURATION) + _active_tween.finished.connect(func() -> void: home_entered.emit()) + + +func go_to_hospital() -> void: + if _camera == null: + return + if not _is_at_home: + return + _is_at_home = false + var target_x: float = _current_room * ROOM_WIDTH + ROOM_WIDTH * 0.5 + var target_y: float = _current_floor * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5 + if _active_tween != null: + _active_tween.kill() + _active_tween = create_tween() + _active_tween.set_ease(Tween.EASE_IN_OUT) + _active_tween.set_trans(Tween.TRANS_SINE) + _active_tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION) + _active_tween.finished.connect(func() -> void: hospital_entered.emit()) func get_current_floor() -> int: @@ -42,3 +83,7 @@ func get_current_floor() -> int: func get_current_room() -> int: return _current_room + + +func is_at_home() -> bool: + return _is_at_home