Project2/Project2
Project2/Project2
2
0
Fork 0
Code Issues 11 Pull requests Actions Packages Projects Releases Wiki Activity

WIP animation tree complex expressions

Browse source
This commit is contained in:
Rakarake 2025-02-16 16:12:11 +01:00
parent 26d8f40b0a
commit a75c9b6dc0
4 changed files with 78 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
characters/enemies/Bingus/run-stats.tres
View file

@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="RunStats" load_steps=5 format=3 uid="uid://cdynh4jxcd7nf"]
[ext_resource type="Script" path="res://state_machine/misc/RunStats.gd" id="1_cje7e"]
[ext_resource type="Script" uid="uid://ckrifgfjoj43a" path="res://state_machine/misc/RunStats.gd" id="1_cje7e"]
[sub_resource type="Curve" id="Curve_q4yvk"]
min_value = -100.0

89
characters/player/Player.tscn
View file

@ -2,16 +2,16 @@
[ext_resource type="Script" path="res://characters/player/Player.gd" id="1_l3wc5"]
[ext_resource type="Texture2D" uid="uid://mu78xlrkgmpq" path="res://debug/debug_asset_debug/updated player size v1.png" id="2_1bl0t"]
[ext_resource type="Script" path="res://state_machine/StateMachine.gd" id="2_ae3rk"]
[ext_resource type="Script" path="res://state_machine/Run.gd" id="3_r7kf7"]
[ext_resource type="Script" path="res://state_machine/misc/RunStats.gd" id="4_towo1"]
[ext_resource type="Script" uid="uid://2xux1ohyteb2" path="res://state_machine/StateMachine.gd" id="2_ae3rk"]
[ext_resource type="Script" uid="uid://dyinmqkd8n1e7" path="res://state_machine/Run.gd" id="3_r7kf7"]
[ext_resource type="Script" uid="uid://ckrifgfjoj43a" path="res://state_machine/misc/RunStats.gd" id="4_towo1"]
[ext_resource type="Resource" uid="uid://bwu3tfatay4xu" path="res://characters/player/normal_jump.tres" id="5_42qg3"]
[ext_resource type="Script" path="res://state_machine/Air.gd" id="6_vkhjv"]
[ext_resource type="Script" uid="uid://dr5x24g332mp4" path="res://state_machine/Air.gd" id="6_vkhjv"]
[ext_resource type="Curve" uid="uid://mxv5toxidjer" path="res://characters/player/falling_curve.tres" id="7_5npc2"]
[ext_resource type="Script" path="res://state_machine/Dash.gd" id="8_cenpi"]
[ext_resource type="Script" path="res://state_machine/Wallslide.gd" id="8_g5obm"]
[ext_resource type="Script" uid="uid://c7esih4vqonsn" path="res://state_machine/Dash.gd" id="8_cenpi"]
[ext_resource type="Script" uid="uid://c04nwbkwmtvtl" path="res://state_machine/Wallslide.gd" id="8_g5obm"]
[ext_resource type="Shape2D" uid="uid://c1iuvxx2i661g" path="res://characters/player/shape.tres" id="9_lka70"]
[ext_resource type="Script" path="res://state_machine/misc/HurtBox.gd" id="10_mejgj"]
[ext_resource type="Script" uid="uid://b230k0tqwex5k" path="res://state_machine/misc/HurtBox.gd" id="10_mejgj"]
[ext_resource type="Script" path="res://state_machine/Death.gd" id="12_33ksn"]
[ext_resource type="Texture2D" uid="uid://c25ofwwebxe3m" path="res://characters/player/assets/atk/atk d.png" id="12_hw4yd"]
[ext_resource type="Texture2D" uid="uid://6umggvev6qyw" path="res://characters/player/assets/atk/atk l.png" id="12_vtiwo"]
@ -356,18 +356,68 @@ resource_name = "jump_l"
[sub_resource type="Animation" id="Animation_ywdao"]
resource_name = "jump_r"
[sub_resource type="Animation" id="Animation_gx7lj"]
resource_name = "run_l"
[sub_resource type="Animation" id="Animation_v57yh"]
resource_name = "run_r"
[sub_resource type="Animation" id="Animation_4aiv8"]
resource_name = "wallslide_l"
[sub_resource type="Animation" id="Animation_ya4h8"]
resource_name = "wallslide_r"
[sub_resource type="Animation" id="Animation_u0xyx"]
resource_name = "run_r"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("PlayerCharacterSprite:progress")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, 1.0]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("PlayerCharacterSprite:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"run_r"]
}
[sub_resource type="Animation" id="Animation_y6mni"]
resource_name = "run_l"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("PlayerCharacterSprite:progress")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, 1.0]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("PlayerCharacterSprite:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"run_l"]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_fc3th"]
_data = {
"RESET": SubResource("Animation_wyfca"),
@ -383,8 +433,8 @@ _data = {
"idle_r": SubResource("Animation_fi0uf"),
"jump_l": SubResource("Animation_ljkap"),
"jump_r": SubResource("Animation_ywdao"),
"run_l": SubResource("Animation_gx7lj"),
"run_r": SubResource("Animation_v57yh"),
"run_l": SubResource("Animation_y6mni"),
"run_r": SubResource("Animation_u0xyx"),
"wallslide_l": SubResource("Animation_4aiv8"),
"wallslide_r": SubResource("Animation_ya4h8")
}
@ -431,10 +481,11 @@ advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_n5tbp"]
advance_mode = 2
advance_condition = &"on_floor"
advance_expression = "self[\"parameters/conditions/on_floor\"] && self[\"parameters/conditions/standing_still\"]"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_laqlw"]
advance_mode = 2
advance_expression = "on_floor && !standing_still"
advance_expression = "self[\"parameters/conditions/on_floor\"] && !self[\"parameters/conditions/standing_still\"]"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5f167"]
advance_mode = 2
@ -446,11 +497,11 @@ advance_condition = &"standing_still"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_t33hw"]
advance_mode = 2
advance_expression = "on_floor && standing_still"
advance_expression = "self[\"parameters/conditions/on_floor\"] && self[\"parameters/conditions/standing_still\"]"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1b6pj"]
advance_mode = 2
advance_expression = "on_floor && !standing_still"
advance_expression = "self[\"parameters/conditions/on_floor\"] && !self[\"parameters/conditions/standing_still\"]"
[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_kn6jm"]
states/End/position = Vector2(623, 51.051)
@ -468,7 +519,7 @@ states/Run/node = SubResource("AnimationNodeBlendSpace1D_7655x")
states/Run/position = Vector2(304.317, 90.051)
states/Start/position = Vector2(-100, -25.949)
transitions = ["Start", "RESET", SubResource("AnimationNodeStateMachineTransition_57ss2"), "RESET", "Idle", SubResource("AnimationNodeStateMachineTransition_n5tbp"), "RESET", "Run", SubResource("AnimationNodeStateMachineTransition_laqlw"), "RESET 2", "RESET 3", SubResource("AnimationNodeStateMachineTransition_5f167"), "RESET 3", "RESET 2", SubResource("AnimationNodeStateMachineTransition_j8mbf"), "Run", "Idle", SubResource("AnimationNodeStateMachineTransition_t33hw"), "Idle", "Run", SubResource("AnimationNodeStateMachineTransition_1b6pj")]
graph_offset = Vector2(-223.581, -125.937)
graph_offset = Vector2(-216.132, -123.187)
[sub_resource type="Curve" id="Curve_w1mwi"]
max_value = 300.0

2
characters/player/normal_jump.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="JumpStats" load_steps=4 format=3 uid="uid://bwu3tfatay4xu"]
[ext_resource type="Curve" uid="uid://mxv5toxidjer" path="res://characters/player/falling_curve.tres" id="1_46nf6"]
[ext_resource type="Script" path="res://state_machine/misc/JumpStats.gd" id="1_p0xow"]
[ext_resource type="Script" uid="uid://c3joat1uqwo78" path="res://state_machine/misc/JumpStats.gd" id="1_p0xow"]
[sub_resource type="Curve" id="Curve_4h0vl"]
min_value = -400.0

12
test_levels/test_1.tscn
View file

@ -2,12 +2,12 @@
[ext_resource type="Script" path="res://characters/player/ExtendedCamera.gd" id="1_22nty"]
[ext_resource type="Texture2D" uid="uid://bgw5itdndav4s" path="res://icon.svg" id="1_a777e"]
[ext_resource type="Script" path="res://global/SceneTransition.gd" id="1_heet6"]
[ext_resource type="Script" path="res://global/FocusZone.gd" id="1_kki15"]
[ext_resource type="Script" uid="uid://dboeuh5ymmvso" path="res://global/SceneTransition.gd" id="1_heet6"]
[ext_resource type="Script" uid="uid://cbhe4svme1axe" path="res://global/FocusZone.gd" id="1_kki15"]
[ext_resource type="Texture2D" uid="uid://ddlrqr4ss8vls" path="res://debug/debug_asset_debug/down.png" id="1_oukny"]
[ext_resource type="Shader" path="res://assets/shaders/blurX.gdshader" id="1_x15t4"]
[ext_resource type="Shader" path="res://assets/shaders/blurY.gdshader" id="2_kpx7o"]
[ext_resource type="Script" path="res://test_levels/ExpressiveStone.gd" id="2_rd8co"]
[ext_resource type="Shader" uid="uid://b6er4bnj6bwyd" path="res://assets/shaders/blurX.gdshader" id="1_x15t4"]
[ext_resource type="Shader" uid="uid://io718ahx46m8" path="res://assets/shaders/blurY.gdshader" id="2_kpx7o"]
[ext_resource type="Script" uid="uid://dgxn3a7clr5vt" path="res://test_levels/ExpressiveStone.gd" id="2_rd8co"]
[ext_resource type="Texture2D" uid="uid://3hyrbswjn4e" path="res://expressive_stone.png" id="2_vgtwj"]
[ext_resource type="PackedScene" uid="uid://sxcxj2sua5ho" path="res://characters/enemies/Bingus/Bingus.tscn" id="5_0m374"]
[ext_resource type="TileSet" uid="uid://nvduvcllkfyc" path="res://test_levels/test_1_tileset.tres" id="5_3r2p0"]
@ -15,7 +15,7 @@
[ext_resource type="Texture2D" uid="uid://bvfk2imjwpga7" path="res://debug/debug_asset_debug/x-grid.png" id="8_ulsik"]
[ext_resource type="Texture2D" uid="uid://5qnqarh456gc" path="res://debug/debug_asset_debug/y-grid.png" id="9_72m0c"]
[ext_resource type="Texture2D" uid="uid://rbbqk1tv4e5x" path="res://debug/debug_asset_debug/fogTest.png" id="10_qlm2x"]
[ext_resource type="Script" path="res://global/RelativeParallax2D.gd" id="11_6rg2v"]
[ext_resource type="Script" uid="uid://deg5jn14kcdvc" path="res://global/RelativeParallax2D.gd" id="11_6rg2v"]
[ext_resource type="Texture2D" uid="uid://bhcl4y1hdhm6" path="res://debug/debug_asset_debug/credits meow 4.png" id="11_8s8sg"]
[ext_resource type="Texture2D" uid="uid://6vvjkjlc0y6d" path="res://debug/debug_asset_debug/test fluid anim/fluid_test_sprite_sheet_1440.png" id="19_oioxv"]
[ext_resource type="Texture2D" uid="uid://bc1qao5dv1cqq" path="res://debug/debug_asset_debug/test fluid anim/fluid_test_sprite_sheet.png" id="268_whvcx"]