Refine movement, water recovery, and UI baseline
This commit is contained in:
parent
d2fe367891
commit
e2067e3bf4
23 changed files with 905 additions and 146 deletions
14
main/main.gd
14
main/main.gd
|
|
@ -5,13 +5,19 @@ const FishBuyerProfileType = preload("res://economy/fish_buyer_profile.gd")
|
|||
const FishPoolType = preload("res://fish/fish_pool.gd")
|
||||
const GameUIType = preload("res://ui/game_ui.gd")
|
||||
const PlayerType = preload("res://player/player.gd")
|
||||
const TestWorldType = preload("res://world/test_world.gd")
|
||||
const WaterRecoveryControllerType = preload(
|
||||
"res://world/water_recovery_controller.gd"
|
||||
)
|
||||
|
||||
@export var fish_catalog: FishPoolType
|
||||
@export var pelican_buyer_profile: FishBuyerProfileType
|
||||
|
||||
@onready var _test_world: TestWorldType = $TestWorld
|
||||
@onready var _player: PlayerType = %Player
|
||||
@onready var _fishing_spot: FishingSpotType = %FishingSpot
|
||||
@onready var _game_ui: GameUIType = %GameUI
|
||||
@onready var _water_recovery: WaterRecoveryControllerType = %WaterRecovery
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
|
|
@ -34,3 +40,11 @@ func _ready() -> void:
|
|||
fish_catalog,
|
||||
_fishing_spot
|
||||
)
|
||||
_water_recovery.setup(
|
||||
_player,
|
||||
_fishing_spot,
|
||||
_game_ui,
|
||||
_game_ui.get_screen_fade(),
|
||||
_test_world.get_player_water_trigger(),
|
||||
_test_world.get_safe_respawn_points()
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3]
|
||||
[gd_scene load_steps=9 format=3]
|
||||
|
||||
[ext_resource type="PackedScene" path="res://world/test_world.tscn" id="1_world"]
|
||||
[ext_resource type="PackedScene" path="res://player/player.tscn" id="2_player"]
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
[ext_resource type="PackedScene" path="res://ui/game_ui.tscn" id="5_ui"]
|
||||
[ext_resource type="Resource" path="res://fish/pools/test_water_pool.tres" id="6_pool"]
|
||||
[ext_resource type="Resource" path="res://economy/buyers/pelicans.tres" id="7_pelicans"]
|
||||
[ext_resource type="Script" path="res://world/water_recovery_controller.gd" id="8_recovery"]
|
||||
|
||||
[node name="Main" type="Node3D"]
|
||||
script = ExtResource("3_main")
|
||||
|
|
@ -25,5 +26,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5)
|
|||
unique_name_in_owner = true
|
||||
position = Vector3(0, 1.02, -18)
|
||||
|
||||
[node name="WaterRecovery" type="Node" parent="."]
|
||||
unique_name_in_owner = true
|
||||
script = ExtResource("8_recovery")
|
||||
|
||||
[node name="GameUI" parent="." instance=ExtResource("5_ui")]
|
||||
unique_name_in_owner = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue