maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-15 17:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapping and balance fixes

Browse source
This commit is contained in:
Marco 2025-06-26 13:17:21 +02:00
commit 79cac3ebae
11 changed files with 1112 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

121
Scenes/Actors/IsoPlayer_FSM.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=32 format=3 uid="uid://rimplblbptcd"]
[gd_scene load_steps=49 format=3 uid="uid://rimplblbptcd"]
[ext_resource type="Script" uid="uid://88smibkin17p" path="res://Scripts/Components/FSM/3DPlayer/IsoPlayerFSMProxy.cs" id="1_cc7e7"]
[ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="1_vex34"]
@ -25,6 +25,9 @@
[ext_resource type="Script" uid="uid://by0x0qmbmkoak" path="res://Scripts/Components/FSM/3DPlayer/PlayerWeaponProvider3D.cs" id="16_olwak"]
[ext_resource type="PackedScene" uid="uid://cfgc6ik8vb08c" path="res://Scenes/Weapons/BaseWeapon_3D.tscn" id="17_olwak"]
[ext_resource type="Script" uid="uid://cqyr8mko8oo5" path="res://Scripts/Components/FSM/3DPlayer/PlayerAcidDeathModule.cs" id="19_7selo"]
[ext_resource type="Script" uid="uid://hdw15b6fi7de" path="res://Scripts/Components/Actors/3D/PlayerDamageReceiver3D.cs" id="26_ok6gd"]
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="27_5v3dv"]
[ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="28_b3jpo"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fg04g"]
radius = 0.349554
@ -48,6 +51,87 @@ radius = 1.20117
[sub_resource type="SphereShape3D" id="SphereShape3D_ok250"]
[sub_resource type="Resource" id="Resource_c4ide"]
script = ExtResource("27_5v3dv")
DamageType = 0
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_fjg1v"]
script = ExtResource("27_5v3dv")
DamageType = 1
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_hed00"]
script = ExtResource("27_5v3dv")
DamageType = 2
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_q2flx"]
script = ExtResource("27_5v3dv")
DamageType = 3
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_k7ckg"]
script = ExtResource("27_5v3dv")
DamageType = 4
Attribute = 4
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_qlmfy"]
script = ExtResource("27_5v3dv")
DamageType = 5
Attribute = 4
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_v2m0j"]
script = ExtResource("27_5v3dv")
DamageType = 0
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_awrib"]
script = ExtResource("27_5v3dv")
DamageType = 1
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_nfrn8"]
script = ExtResource("27_5v3dv")
DamageType = 2
Attribute = 2
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_nfq4p"]
script = ExtResource("27_5v3dv")
DamageType = 3
Attribute = 1
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_m1iep"]
script = ExtResource("27_5v3dv")
DamageType = 0
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_ckpe7"]
script = ExtResource("27_5v3dv")
DamageType = 4
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="Resource" id="Resource_p5rkw"]
script = ExtResource("27_5v3dv")
DamageType = 5
Attribute = 0
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
[sub_resource type="SphereShape3D" id="SphereShape3D_p313o"]
radius = 0.0913725
[node name="IsoPlayerFsm" type="CharacterBody3D" node_paths=PackedStringArray("PlayerFSM")]
collision_layer = 2
collision_mask = 17
@ -60,11 +144,12 @@ script = ExtResource("1_vsywg")
[node name="Init" type="Node" parent="StateMachine"]
script = ExtResource("2_3oyrx")
[node name="Active" type="Node" parent="StateMachine" node_paths=PackedStringArray("_inputProvider", "AnimationProvider", "Storage", "_moduleNodes")]
[node name="Active" type="Node" parent="StateMachine" node_paths=PackedStringArray("_inputProvider", "AnimationProvider", "Storage", "DamageReceiver", "_moduleNodes")]
script = ExtResource("3_cc7e7")
_inputProvider = NodePath("../../InputProvider")
AnimationProvider = NodePath("../../Sprites")
Storage = NodePath("../../Storage")
DamageReceiver = NodePath("../../DamageReceiver")
_moduleNodes = [NodePath("../../InputProvider"), NodePath("../../MovementModule"), NodePath("../../ShadowModule"), NodePath("../../InteractionController"), NodePath("../../ActivationProvider"), NodePath("../../WeaponModule"), NodePath("../../AcidDeathModule")]
[node name="Dead" type="Node" parent="StateMachine"]
@ -82,7 +167,7 @@ pixel_size = 0.05
texture_filter = 0
sprite_frames = ExtResource("6_yq7h2")
animation = &"idle"
frame_progress = 0.0351052
frame_progress = 0.840695
script = ExtResource("9_yarib")
[node name="Legs" type="AnimatedSprite3D" parent="Sprites"]
@ -191,10 +276,40 @@ WeaponLeftOffset = NodePath("../../WeaponOffset")
script = ExtResource("19_7selo")
[node name="AcidDetector" type="Area3D" parent="."]
visible = false
collision_layer = 2
collision_mask = 256
[node name="CollisionShape3D" type="CollisionShape3D" parent="AcidDetector"]
shape = SubResource("SphereShape3D_ok250")
[node name="DamageReceiver" type="Area3D" parent="." node_paths=PackedStringArray("_healthProvider", "_shieldProvider", "_motivationProvider")]
collision_layer = 2
collision_mask = 128
script = ExtResource("26_ok6gd")
_healthProvider = NodePath("HealthProvider")
_shieldProvider = NodePath("ShieldProvider")
_motivationProvider = NodePath("MotivationProvider")
ShieldDamageResistances = Array[ExtResource("27_5v3dv")]([SubResource("Resource_c4ide"), SubResource("Resource_fjg1v"), SubResource("Resource_hed00"), SubResource("Resource_q2flx"), SubResource("Resource_k7ckg"), SubResource("Resource_qlmfy")])
HealthDamageResistances = Array[ExtResource("27_5v3dv")]([SubResource("Resource_v2m0j"), SubResource("Resource_awrib"), SubResource("Resource_nfrn8"), SubResource("Resource_nfq4p"), SubResource("Resource_m1iep"), SubResource("Resource_ckpe7"), SubResource("Resource_p5rkw")])
[node name="HealthProvider" type="Node" parent="DamageReceiver"]
script = ExtResource("28_b3jpo")
ResourceName = "Health"
_maxResource = 32.0
[node name="MotivationProvider" type="Node" parent="DamageReceiver"]
script = ExtResource("28_b3jpo")
ResourceName = "Motivation"
_maxResource = 400.0
[node name="ShieldProvider" type="Node" parent="DamageReceiver"]
script = ExtResource("28_b3jpo")
ResourceName = "Shield"
_maxResource = 32.0
[node name="CollisionShape2D" type="CollisionShape3D" parent="DamageReceiver"]
shape = SubResource("SphereShape3D_p313o")
[connection signal="area_entered" from="AcidDetector" to="AcidDeathModule" method="OnAcidCollision"]
[connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"]