diff --git a/Scenes/Actors/fsm_player.tscn b/Scenes/Actors/fsm_player.tscn index 0228cc1d..2b2454e8 100644 --- a/Scenes/Actors/fsm_player.tscn +++ b/Scenes/Actors/fsm_player.tscn @@ -17,13 +17,13 @@ [ext_resource type="Script" uid="uid://dq338w2lw5phl" path="res://Scripts/Components/Actors/KeyboardInputProvider.cs" id="8_i6wc8"] [ext_resource type="PackedScene" uid="uid://biugfbp0yae2s" path="res://Scenes/Particles/DeathParticles.tscn" id="9_0pyos"] [ext_resource type="Script" uid="uid://d208gvthkstvc" path="res://Scripts/Components/Actors/PlayerCrosshairProvider.cs" id="9_s0ir4"] -[ext_resource type="Texture2D" uid="uid://cfrvb1moh857m" path="res://Sprites/Crosshair.png" id="10_8dcio"] [ext_resource type="Script" uid="uid://bgve2lktony00" path="res://Scripts/Components/FSM/Player/Drowning.cs" id="10_es1gk"] [ext_resource type="Script" uid="uid://3jxrxcqp3ndr" path="res://Scripts/Components/Actors/PlayerHitboxSpriteProvider.cs" id="10_gp3hw"] [ext_resource type="Texture2D" uid="uid://bwjrdlnysft15" path="res://Sprites/Actors/Focus_Circle.png" id="12_8dcio"] [ext_resource type="Texture2D" uid="uid://bf37ce6jskdel" path="res://Sprites/SmallHitbox.png" id="13_pmkfo"] [ext_resource type="Script" uid="uid://dkmsw828qwikk" path="res://Scripts/Components/Actors/PlayerDamageReceiver.cs" id="14_igu66"] [ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="15_5qlss"] +[ext_resource type="Texture2D" uid="uid://cf2855sd3hqty" path="res://Sprites/Actors/Aiming_Reticule_Small.png" id="19_fnw0c"] [ext_resource type="Texture2D" uid="uid://bc4tp44e00g0d" path="res://Sprites/Actors/Focus_Square.png" id="20_3ho10"] [ext_resource type="Script" uid="uid://dv205x8msohpv" path="res://Scripts/Components/Actors/ActivationProvider.cs" id="22_12cwd"] [ext_resource type="PackedScene" uid="uid://chkpk7erlqajg" path="res://Scenes/Selector.tscn" id="23_5tmtw"] @@ -46,15 +46,15 @@ orbit_velocity_max = 1.098 gravity = Vector3(0, 0, 0) color = Color(0.0392157, 0.380392, 1, 1) -[sub_resource type="AtlasTexture" id="AtlasTexture_pmkfo"] -atlas = ExtResource("10_8dcio") -region = Rect2(0, 0, 8, 8) +[sub_resource type="AtlasTexture" id="AtlasTexture_12erk"] +atlas = ExtResource("19_fnw0c") +region = Rect2(0, 0, 16, 16) [sub_resource type="SpriteFrames" id="SpriteFrames_n5ijo"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_pmkfo") +"texture": SubResource("AtlasTexture_12erk") }], "loop": true, "name": &"default", diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 9b21466a..3ff929f3 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -61,7 +61,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("5_u1i8n")]([]) [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"] size = Vector2(30, 52.5) diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 148c5c41..8715dd00 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1026,7 +1026,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = [ExtResource("84_ma1ta")] +Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) diff --git a/Sprites/Mouse_Cursor.png b/Sprites/Mouse_Cursor.png new file mode 100644 index 00000000..18fcbf8b --- /dev/null +++ b/Sprites/Mouse_Cursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f8fb7a6d18168b7e57e67cd15f7e3d37174f7f1a256d92c8c969b3e1c4e0db1 +size 294 diff --git a/Sprites/Mouse_Cursor.png.import b/Sprites/Mouse_Cursor.png.import new file mode 100644 index 00000000..edcc20c7 --- /dev/null +++ b/Sprites/Mouse_Cursor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8nns6w0skiy3" +path="res://.godot/imported/Mouse_Cursor.png-16136306be944f40f771a8eda85b188d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Mouse_Cursor.png" +dest_files=["res://.godot/imported/Mouse_Cursor.png-16136306be944f40f771a8eda85b188d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/project.godot b/project.godot index 96270e58..b80a027e 100644 --- a/project.godot +++ b/project.godot @@ -110,6 +110,8 @@ window/size/window_width_override=1920 window/size/window_height_override=1080 window/stretch/mode="canvas_items" window/stretch/scale_mode="integer" +mouse_cursor/custom_image="uid://8nns6w0skiy3" +mouse_cursor/custom_image_hotspot=Vector2(24, 24) [dotnet]