Changed player to new one

This commit is contained in:
Marco 2025-03-02 11:58:30 +01:00
commit 1c1436a539
27 changed files with 323 additions and 87 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=35 format=3 uid="uid://c4pr2707hbeph"]
[gd_scene load_steps=39 format=3 uid="uid://c4pr2707hbeph"]
[ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="1_mpmil"]
[ext_resource type="Script" uid="uid://chwqogny2v8t1" path="res://Scripts/Components/FSM/Player/Init.cs" id="2_i6wc8"]
@ -9,6 +9,7 @@
[ext_resource type="SpriteFrames" uid="uid://bc7mghjx75qip" path="res://Resources/Sprites/player.tres" id="4_s0ir4"]
[ext_resource type="Script" uid="uid://b4nixnxhj5qhw" path="res://Scripts/Components/Actors/PlayerWeaponProvider.cs" id="5_gp3hw"]
[ext_resource type="Script" uid="uid://b0khv2fcrgm6t" path="res://Scripts/Components/FSM/Player/Teleporting.cs" id="5_yifvs"]
[ext_resource type="Script" uid="uid://br2ev58gwuvu4" path="res://Scripts/Components/FSM/Player/UnTeleporting.cs" id="6_7n10g"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="6_8dcio"]
[ext_resource type="Script" uid="uid://bwtcgcvfw8urt" path="res://Scripts/Components/FSM/Player/Controlling.cs" id="6_82vrk"]
[ext_resource type="Script" uid="uid://bo5sgbv1t8ril" path="res://Scripts/Components/Actors/PlayerAnimationProvider.cs" id="7_pmkfo"]
@ -21,11 +22,13 @@
[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://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"]
[ext_resource type="AudioStream" uid="uid://myr6n2c1u503" path="res://SFX/581602__samsterbirdies__beep-error.mp3" id="24_5tmtw"]
[sub_resource type="CircleShape2D" id="CircleShape2D_b3hxm"]
radius = 5.0
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_0pqs8"]
particle_flag_disable_z = true
@ -66,6 +69,21 @@ animations = [{
"speed": 5.0
}]
[sub_resource type="AtlasTexture" id="AtlasTexture_vwjki"]
atlas = ExtResource("20_3ho10")
region = Rect2(0, 0, 32, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_g3wua"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_vwjki")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[sub_resource type="AtlasTexture" id="AtlasTexture_igu66"]
atlas = ExtResource("13_pmkfo")
region = Rect2(0, 0, 4, 4)
@ -118,16 +136,23 @@ script = ExtResource("5_yifvs")
_animationProvider = NodePath("../AnimationProvider")
State = 3
[node name="Controlling" type="Node2D" parent="." node_paths=PackedStringArray("_animationProvider")]
script = ExtResource("6_82vrk")
[node name="UnTeleporting" type="Node2D" parent="." node_paths=PackedStringArray("_animationProvider")]
script = ExtResource("6_7n10g")
_animationProvider = NodePath("../AnimationProvider")
State = 4
[node name="Dead" type="Node2D" parent="." node_paths=PackedStringArray("_animationProvider")]
script = ExtResource("4_0pqs8")
[node name="Controlling" type="Node2D" parent="." node_paths=PackedStringArray("_animationProvider")]
script = ExtResource("6_82vrk")
_animationProvider = NodePath("../AnimationProvider")
State = 5
[node name="Dead" type="Node2D" parent="." node_paths=PackedStringArray("_animationProvider", "_inputProvider", "_healthProvider")]
script = ExtResource("4_0pqs8")
_animationProvider = NodePath("../AnimationProvider")
_inputProvider = NodePath("../InputProvider")
_healthProvider = NodePath("../DamageReceiver/HealthProvider")
State = 6
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_b3hxm")
@ -165,16 +190,22 @@ CrosshairDistance = 35.0
[node name="Crosshair" type="AnimatedSprite2D" parent="CrosshairProvider"]
sprite_frames = SubResource("SpriteFrames_n5ijo")
[node name="StrafeSpriteProvider" type="Node2D" parent="." node_paths=PackedStringArray("Hitbox", "Circle")]
[node name="StrafeSpriteProvider" type="Node2D" parent="." node_paths=PackedStringArray("Hitbox", "Circle", "Square")]
show_behind_parent = true
script = ExtResource("10_gp3hw")
Hitbox = NodePath("Hitbox")
Circle = NodePath("MagicCircle")
Square = NodePath("MagicSquare")
RotationSpeed = 1.0
[node name="MagicCircle" type="AnimatedSprite2D" parent="StrafeSpriteProvider"]
modulate = Color(1, 1, 1, 0.501961)
sprite_frames = SubResource("SpriteFrames_igu66")
[node name="MagicSquare" type="AnimatedSprite2D" parent="StrafeSpriteProvider"]
modulate = Color(1, 1, 1, 0.501961)
sprite_frames = SubResource("SpriteFrames_g3wua")
[node name="Hitbox" type="AnimatedSprite2D" parent="StrafeSpriteProvider"]
z_index = 2
sprite_frames = SubResource("SpriteFrames_5qlss")