FSM Player movement

This commit is contained in:
Maddo 2025-02-28 19:59:36 +01:00
commit c59a480ffd
10 changed files with 131 additions and 36 deletions

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=12 format=4 uid="uid://6a6tjohypmmb"]
[gd_scene load_steps=13 format=4 uid="uid://6a6tjohypmmb"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_v2pdx"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_e12id"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_s1vkf"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_06rc0"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"]
@ -14,7 +15,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_s1vkf")
EggIndex = 0
StartingEquipment = []
StartingEquipment = Array[ExtResource("3_e12id")]([])
[node name="GameScene" type="Node2D"]
script = ExtResource("1_t2k72")

View file

@ -1,15 +1,21 @@
[gd_scene load_steps=18 format=4 uid="uid://dqyfnby0t7gu1"]
[gd_scene load_steps=23 format=4 uid="uid://dqyfnby0t7gu1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_w1v1g"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_b3hxm"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_u1i8n"]
[ext_resource type="Resource" uid="uid://dhbltvgsa3g88" path="res://Resources/Items/Spider_Bomb_Pickup.tres" id="4_yyg8m"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_6314l"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="5_mljl7"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_yyg8m"]
[ext_resource type="Script" uid="uid://v2f387aad33k" path="res://Scripts/Components/FSM/ActorStateMachine.cs" id="7_mljl7"]
[ext_resource type="SpriteFrames" uid="uid://bcc5mlwwnkvri" path="res://Resources/Sprites/Fairy.tres" id="8_0knpf"]
[ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="8_b3hxm"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="9_dj0ui"]
[ext_resource type="Script" uid="uid://bl0o35xt8wxtg" path="res://Scripts/Components/FSM/Player/Active.cs" id="9_u1i8n"]
[ext_resource type="SpriteFrames" uid="uid://bc7mghjx75qip" path="res://Resources/Sprites/player.tres" id="9_w1v1g"]
[ext_resource type="Script" uid="uid://chwqogny2v8t1" path="res://Scripts/Components/FSM/Player/Init.cs" id="9_yyg8m"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="10_qmakk"]
[ext_resource type="Script" uid="uid://b4nixnxhj5qhw" path="res://Scripts/Components/Actors/PlayerWeaponProvider.cs" id="11_6314l"]
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="11_hmqao"]
[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="12_8to53"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="13_8fnge"]
@ -18,9 +24,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_u1i8n")
EggIndex = 0
StartingEquipment = []
[sub_resource type="CircleShape2D" id="CircleShape2D_5xgmc"]
StartingEquipment = Array[ExtResource("5_mljl7")]([])
[sub_resource type="CircleShape2D" id="CircleShape2D_b3hxm"]
@ -31,6 +35,7 @@ PlayerTemplate = ExtResource("2_w1v1g")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
StartingEquipment = [ExtResource("3_6314l"), ExtResource("4_yyg8m")]
MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."]
@ -55,24 +60,17 @@ metadata/_edit_lock_ = true
[node name="Actors" type="Node2D" parent="Tilemaps"]
metadata/_edit_lock_ = true
[node name="FSMEnemy" type="CharacterBody2D" parent="Tilemaps/Actors"]
position = Vector2(161.783, 298.229)
script = ExtResource("7_mljl7")
metadata/_edit_group_ = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Tilemaps/Actors/FSMEnemy"]
shape = SubResource("CircleShape2D_5xgmc")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Tilemaps/Actors/FSMEnemy"]
sprite_frames = ExtResource("8_0knpf")
animation = &"down"
[node name="Idle" type="Node2D" parent="Tilemaps/Actors/FSMEnemy"]
[node name="FSMPlayer" type="CharacterBody2D" parent="Tilemaps/Actors"]
position = Vector2(76, 295)
script = ExtResource("8_b3hxm")
InitialState = 1
[node name="Node2D" type="Node2D" parent="Tilemaps/Actors/FSMPlayer"]
[node name="Init" type="Node2D" parent="Tilemaps/Actors/FSMPlayer"]
script = ExtResource("9_yyg8m")
[node name="Active" type="Node2D" parent="Tilemaps/Actors/FSMPlayer"]
script = ExtResource("9_u1i8n")
State = 1
[node name="CollisionShape2D" type="CollisionShape2D" parent="Tilemaps/Actors/FSMPlayer"]
shape = SubResource("CircleShape2D_b3hxm")
@ -81,6 +79,10 @@ shape = SubResource("CircleShape2D_b3hxm")
sprite_frames = ExtResource("9_w1v1g")
animation = &"idle"
[node name="WeaponProvider" type="Node2D" parent="Tilemaps/Actors/FSMPlayer"]
script = ExtResource("11_6314l")
WeaponTemplate = ExtResource("3_b3hxm")
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1
script = ExtResource("9_dj0ui")