diff --git a/game/storage/PCScreen.gd b/game/storage/PCScreen.gd index 7e5081c..d77e6e6 100644 --- a/game/storage/PCScreen.gd +++ b/game/storage/PCScreen.gd @@ -481,4 +481,4 @@ func _close() -> void: func _restore_mouse() -> void: if !_mouse_saved: return Input.mouse_mode = _prev_mouse_mode - _mouse_saved = false \ No newline at end of file + _mouse_saved = false diff --git a/game/storage/storage.gd b/game/storage/storage.gd new file mode 100644 index 0000000..777df7b --- /dev/null +++ b/game/storage/storage.gd @@ -0,0 +1,18 @@ +extends Node + +@onready var canvas_layer: CanvasLayer = $"." + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + GameData.player_team.add_pokemon(PokemonInstance.create(Pokedex.get_pokemon("pikachu"), 5)) + GameData.player_team.add_pokemon(PokemonInstance.create(Pokedex.get_pokemon("pikachu"), 15)) + + var pc := PCScreen.new() + canvas_layer.add_child(pc) + pc.setup(GameData.player_team, GameData.player_storage) + pc.closed.connect(pc.queue_free) + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/game/storage/storage.gd.uid b/game/storage/storage.gd.uid new file mode 100644 index 0000000..24095f3 --- /dev/null +++ b/game/storage/storage.gd.uid @@ -0,0 +1 @@ +uid://dmdmxqw3k3ntu diff --git a/game/world/main.tscn b/game/world/main.tscn index 0309ce7..2485aea 100644 --- a/game/world/main.tscn +++ b/game/world/main.tscn @@ -1,14 +1,15 @@ [gd_scene format=3 uid="uid://bicg07c42wm1t"] -[ext_resource type="Texture2D" uid="uid://c8arnlq67qi7" path="res://assets/textures/grids/Dark/texture_05.png" id="1_jyhfs"] -[ext_resource type="Texture2D" uid="uid://b58xv1joypxo5" path="res://assets/textures/grids/Orange/texture_09.png" id="2_tbgi4"] -[ext_resource type="Texture2D" uid="uid://cm5m7nr7dugjd" path="res://assets/textures/grids/Purple/texture_09.png" id="3_tefeu"] -[ext_resource type="Texture2D" uid="uid://djg8y25y06h5n" path="res://assets/textures/grids/Green/texture_09.png" id="4_o6xl0"] -[ext_resource type="Texture2D" uid="uid://hu5rfl6qr2nv" path="res://assets/textures/grids/Red/texture_09.png" id="5_o6xl0"] -[ext_resource type="Script" uid="uid://ce2wj6d8xb055" path="res://game/player/aim/aim_target.gd" id="6_85g3d"] -[ext_resource type="PackedScene" uid="uid://dwxpt0s7vn36k" path="res://game/player/player_character.tscn" id="6_o6xl0"] -[ext_resource type="PackedScene" uid="uid://d1mcef8gl66j" path="res://game/ui/pause_menu/pause_menu.tscn" id="6_tefeu"] -[ext_resource type="PackedScene" uid="uid://di22cs2qposdm" path="res://game/ui/hud/ui.tscn" id="8_tipki"] +[ext_resource type="Texture2D" uid="uid://c8arnlq67qi7" path="res://assets/textures/grids/Dark/texture_05.png" id="1_i34dy"] +[ext_resource type="Texture2D" uid="uid://b58xv1joypxo5" path="res://assets/textures/grids/Orange/texture_09.png" id="2_rr16o"] +[ext_resource type="Texture2D" uid="uid://cm5m7nr7dugjd" path="res://assets/textures/grids/Purple/texture_09.png" id="3_qfowi"] +[ext_resource type="Texture2D" uid="uid://djg8y25y06h5n" path="res://assets/textures/grids/Green/texture_09.png" id="4_jcfev"] +[ext_resource type="Texture2D" uid="uid://hu5rfl6qr2nv" path="res://assets/textures/grids/Red/texture_09.png" id="5_rkxil"] +[ext_resource type="Script" uid="uid://ce2wj6d8xb055" path="res://game/player/aim/aim_target.gd" id="6_ajh0j"] +[ext_resource type="PackedScene" uid="uid://di22cs2qposdm" path="res://game/ui/hud/ui.tscn" id="7_yebv1"] +[ext_resource type="PackedScene" uid="uid://d1mcef8gl66j" path="res://game/ui/pause_menu/pause_menu.tscn" id="8_g80jn"] +[ext_resource type="PackedScene" uid="uid://dwxpt0s7vn36k" path="res://game/player/player_character.tscn" id="9_42ub6"] +[ext_resource type="Script" uid="uid://dmdmxqw3k3ntu" path="res://game/storage/storage.gd" id="10_rr16o"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_tipki"] sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) @@ -27,23 +28,23 @@ fog_light_color = Color(1, 1, 1, 1) fog_density = 0.001 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ya4ey"] -albedo_texture = ExtResource("1_jyhfs") +albedo_texture = ExtResource("1_i34dy") uv1_triplanar = true [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_eb6dy"] -albedo_texture = ExtResource("2_tbgi4") +albedo_texture = ExtResource("2_rr16o") uv1_triplanar = true [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_trceg"] -albedo_texture = ExtResource("3_tefeu") +albedo_texture = ExtResource("3_qfowi") uv1_triplanar = true [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a8y0u"] -albedo_texture = ExtResource("4_o6xl0") +albedo_texture = ExtResource("4_jcfev") uv1_triplanar = true [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tipki"] -albedo_texture = ExtResource("5_o6xl0") +albedo_texture = ExtResource("5_rkxil") [node name="world" type="Node3D" unique_id=832308324] @@ -87,7 +88,7 @@ size = Vector3(0.5, 0.5, 0.5) [node name="AimTarget" type="Marker3D" parent="map/target" unique_id=807674215] transform = Transform3D(1, 0, 3.7252903e-09, 0, 1, 0, -3.7252903e-09, 0, 1, 0, 0.030708313, 0) -script = ExtResource("6_85g3d") +script = ExtResource("6_ajh0j") [node name="target2" type="CSGBox3D" parent="map" unique_id=1489015232] transform = Transform3D(0.99887395, 0, -0.04744184, 0, 1, 0, 0.04744184, 0, 0.99887395, 7.7646155, 0.20568156, 2.931901) @@ -97,7 +98,7 @@ size = Vector3(0.5, 0.5, 0.5) [node name="AimTarget" type="Marker3D" parent="map/target2" unique_id=1618946008] transform = Transform3D(1, 0, 3.7252903e-09, 0, 1, 0, -3.7252903e-09, 0, 1, 0, 0.030708313, 0) -script = ExtResource("6_85g3d") +script = ExtResource("6_ajh0j") [node name="target3" type="CSGBox3D" parent="map" unique_id=1721457742] transform = Transform3D(0.99887395, 0, -0.04744184, 0, 1, 0, 0.04744184, 0, 0.99887395, 7.7646155, 1.7272058, 8.399635) @@ -107,12 +108,15 @@ size = Vector3(0.5, 0.5, 0.5) [node name="AimTarget" type="Marker3D" parent="map/target3" unique_id=1848628150] transform = Transform3D(1, 0, 3.7252903e-09, 0, 1, 0, -3.7252903e-09, 0, 1, 0, 0.030708313, 0) -script = ExtResource("6_85g3d") +script = ExtResource("6_ajh0j") -[node name="Ui" parent="." unique_id=1881560149 instance=ExtResource("8_tipki")] +[node name="Ui" parent="." unique_id=1881560149 instance=ExtResource("7_yebv1")] -[node name="PauseMenu" parent="." unique_id=871841579 instance=ExtResource("6_tefeu")] +[node name="PauseMenu" parent="." unique_id=871841579 instance=ExtResource("8_g80jn")] process_mode = 3 -[node name="PlayerCharacter" parent="." unique_id=1830301535 instance=ExtResource("6_o6xl0")] +[node name="PlayerCharacter" parent="." unique_id=1830301535 instance=ExtResource("9_42ub6")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2155721, -0.00040316582, 0.73769236) + +[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=78269872] +script = ExtResource("10_rr16o")