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

fixes

Browse source
This commit is contained in:
Rakarake 2025-09-08 16:51:49 +02:00
parent 16a1d12d7b
commit 95ca499fde
5 changed files with 102 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project2-godot/characters/player/AnimStateTemplate.tres
View file

@ -233,4 +233,4 @@ states/slowing_l/position = Vector2(346, -76)
states/slowing_r/node = SubResource("AnimationNodeAnimation_0kly6")
states/slowing_r/position = Vector2(346, 286)
transitions = ["run_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_ontot"), "run_turn_r", "run_r", SubResource("AnimationNodeStateMachineTransition_gwrg1"), "run_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_wrqe1"), "run_turn_l", "run_l", SubResource("AnimationNodeStateMachineTransition_nj0d1"), "Start", "idle_l", SubResource("AnimationNodeStateMachineTransition_hso43"), "Start", "idle_r", SubResource("AnimationNodeStateMachineTransition_p65jq"), "idle_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_wn3to"), "idle_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_jw2dj"), "Start", "run_l", SubResource("AnimationNodeStateMachineTransition_736xv"), "Start", "run_r", SubResource("AnimationNodeStateMachineTransition_c6rbw"), "idle_l", "run_start_l", SubResource("AnimationNodeStateMachineTransition_bdtsj"), "run_start_l", "run_l", SubResource("AnimationNodeStateMachineTransition_h3n2f"), "idle_r", "run_start_r", SubResource("AnimationNodeStateMachineTransition_y2dcf"), "run_start_r", "run_r", SubResource("AnimationNodeStateMachineTransition_macrx"), "run_stop_r", "idle_r", SubResource("AnimationNodeStateMachineTransition_lowxd"), "run_stop_l", "idle_l", SubResource("AnimationNodeStateMachineTransition_vsox1"), "run_turn_l", "slide_l", SubResource("AnimationNodeStateMachineTransition_o0sij"), "slide_l", "run_stop_reverse_l", SubResource("AnimationNodeStateMachineTransition_5siuw"), "run_stop_reverse_l", "idle_l", SubResource("AnimationNodeStateMachineTransition_ocra8"), "run_l", "slide_l", SubResource("AnimationNodeStateMachineTransition_54jdr"), "slide_l", "run_l", SubResource("AnimationNodeStateMachineTransition_elf7y"), "slide_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_w7atx"), "run_turn_r", "slide_r", SubResource("AnimationNodeStateMachineTransition_so6mh"), "run_r", "slide_r", SubResource("AnimationNodeStateMachineTransition_wdin4"), "slide_r", "run_r", SubResource("AnimationNodeStateMachineTransition_2do1a"), "slide_r", "run_stop_reverse_r", SubResource("AnimationNodeStateMachineTransition_6t6et"), "run_stop_reverse_r", "idle_r", SubResource("AnimationNodeStateMachineTransition_u1477"), "slide_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_rilh2"), "run_r", "slowing_r", SubResource("AnimationNodeStateMachineTransition_qkv4g"), "run_l", "slowing_l", SubResource("AnimationNodeStateMachineTransition_0kly6"), "slowing_l", "run_stop_l", SubResource("AnimationNodeStateMachineTransition_kmaf1"), "slowing_r", "run_stop_r", SubResource("AnimationNodeStateMachineTransition_ufpug"), "slowing_r", "run_turn_l", SubResource("AnimationNodeStateMachineTransition_erwwq"), "slowing_r", "run_r", SubResource("AnimationNodeStateMachineTransition_bvj7l"), "slowing_l", "run_l", SubResource("AnimationNodeStateMachineTransition_cs0l8"), "slowing_l", "run_turn_r", SubResource("AnimationNodeStateMachineTransition_jc4tj")]
graph_offset = Vector2(-515.586, -191)
graph_offset = Vector2(-470.387, -164.074)

9
project2-godot/characters/player/Player.tscn
View file

@ -2952,7 +2952,8 @@ advance_expression = "on_floor && !just_dashed && (standing_still || !standing_s
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_o5kw1"]
advance_mode = 2
advance_expression = "!on_floor || just_dashed || (just_attacked && !(input_dir.y > 0 && on_floor)) || just_died"
advance_expression = "!on_floor || just_dashed ||
(just_attacked && !(input_dir.y > 0 && on_floor)) || just_died"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_j7etd"]
advance_mode = 2
@ -3122,7 +3123,7 @@ states/dash/position = Vector2(-38.132, -112.011)
states/wavedash/node = SubResource("AnimationNodeStateMachine_f5nf7")
states/wavedash/position = Vector2(-204, -112.011)
transitions = ["Start", "RESET", SubResource("AnimationNodeStateMachineTransition_0alk5"), "RESET", "Falling", SubResource("AnimationNodeStateMachineTransition_blac4"), "Falling", "RESET", SubResource("AnimationNodeStateMachineTransition_6bj8y"), "RESET", "Idle+Run", SubResource("AnimationNodeStateMachineTransition_jltsu"), "Idle+Run", "RESET", SubResource("AnimationNodeStateMachineTransition_o5kw1"), "RESET", "Attack", SubResource("AnimationNodeStateMachineTransition_j7etd"), "Attack", "RESET", SubResource("AnimationNodeStateMachineTransition_def5w"), "Travelling up in Air", "RESET", SubResource("AnimationNodeStateMachineTransition_s04l8"), "RESET", "Wallslide", SubResource("AnimationNodeStateMachineTransition_nj1pf"), "Wallslide", "RESET", SubResource("AnimationNodeStateMachineTransition_vqtub"), "Falling", "Land", SubResource("AnimationNodeStateMachineTransition_ui3n6"), "Land", "RESET", SubResource("AnimationNodeStateMachineTransition_h0nth"), "RESET", "Death", SubResource("AnimationNodeStateMachineTransition_1scf8"), "Death", "RESET", SubResource("AnimationNodeStateMachineTransition_s8jy1"), "RESET", "dash", SubResource("AnimationNodeStateMachineTransition_he4oo"), "dash", "RESET", SubResource("AnimationNodeStateMachineTransition_ebbxk"), "dash", "Death", SubResource("AnimationNodeStateMachineTransition_7cktu"), "Attack", "Death", SubResource("AnimationNodeStateMachineTransition_5brr7"), "Land", "Death", SubResource("AnimationNodeStateMachineTransition_wa5ni"), "RESET", "Double Jump", SubResource("AnimationNodeStateMachineTransition_p83q2"), "dash", "Double Jump", SubResource("AnimationNodeStateMachineTransition_6myfo"), "Double Jump", "Death", SubResource("AnimationNodeStateMachineTransition_40cv0"), "Double Jump", "RESET", SubResource("AnimationNodeStateMachineTransition_8qlk8"), "dash", "Wallslide", SubResource("AnimationNodeStateMachineTransition_n0kro"), "Walljump", "RESET", SubResource("AnimationNodeStateMachineTransition_ktgdi"), "Walljump", "dash", SubResource("AnimationNodeStateMachineTransition_rcedk"), "Walljump", "Death", SubResource("AnimationNodeStateMachineTransition_i3uf7"), "RESET", "Walljump", SubResource("AnimationNodeStateMachineTransition_vs4qx"), "dash", "Walljump", SubResource("AnimationNodeStateMachineTransition_udgv8"), "Jump from Floor", "RESET", SubResource("AnimationNodeStateMachineTransition_gli7k"), "RESET", "Jump from Floor", SubResource("AnimationNodeStateMachineTransition_pa3i5"), "RESET", "Travelling up in Air", SubResource("AnimationNodeStateMachineTransition_4rb7w"), "Jump from Floor", "Death", SubResource("AnimationNodeStateMachineTransition_8f7nk"), "dash", "wavedash", SubResource("AnimationNodeStateMachineTransition_f5nf7"), "wavedash", "RESET", SubResource("AnimationNodeStateMachineTransition_hpecy"), "wavedash", "Death", SubResource("AnimationNodeStateMachineTransition_x0sja"), "RESET", "wavedash", SubResource("AnimationNodeStateMachineTransition_5q6y4"), "Jump from Floor", "dash", SubResource("AnimationNodeStateMachineTransition_p3dsc"), "wavedash", "dash", SubResource("AnimationNodeStateMachineTransition_cqepf")]
graph_offset = Vector2(-797.2, -133.203)
graph_offset = Vector2(-441.423, -289.605)
[sub_resource type="Resource" id="Resource_55jfm"]
script = ExtResource("65_8qlk8")
@ -3274,8 +3275,8 @@ anim_player = NodePath("../AnimationPlayer")
[node name="PlayerCamera" type="Node2D" parent="."]
script = ExtResource("63_wa5ni")
enabled = true
x_pan = 400.0
y_pan_amount = 200.0
x_pan = 140.0
y_pan_amount = 500.0
debug_show = true
fallback_properties = NodePath("../CameraProperties")

11
project2-godot/global/camera/CameraFocusArea.tscn Normal file
View file

@ -0,0 +1,11 @@
[gd_scene load_steps=2 format=3 uid="uid://xj7pp2dytbxi"]
[ext_resource type="Script" uid="uid://rvypec07l773" path="res://global/camera/CameraFocuser.gd" id="1_8k616"]
[node name="CameraFocusArea" type="Area2D"]
collision_layer = 0
collision_mask = 4
script = ExtResource("1_8k616")
[connection signal="body_entered" from="." to="." method="focus"]
[connection signal="body_exited" from="." to="." method="stop_focus"]

1
project2-godot/global/camera/CameraFocuser.gd
View file

@ -5,6 +5,7 @@ extends Node
@export var camera: CameraProperties
func focus(actor):
print("focusing: ", actor)
actor.apply_camera(camera)
func stop_focus(actor):

173
project2-godot/test_levels/test_bad_performance.tscn
View file

@ -6,12 +6,19 @@
[ext_resource type="PackedScene" uid="uid://b2awe6tx7xq0c" path="res://global/scene_transition/SceneTransition.tscn" id="2_uhdkp"]
[ext_resource type="PackedScene" uid="uid://dfeledodwea5b" path="res://global/camera/CameraFocusZone.tscn" id="4_dn1o1"]
[ext_resource type="Shader" uid="uid://tibpqmkay46y" path="res://debug/shaders/wobbly.gdshader" id="4_o1bhb"]
[ext_resource type="PackedScene" uid="uid://xj7pp2dytbxi" path="res://global/camera/CameraFocusArea.tscn" id="5_gawt8"]
[ext_resource type="Texture2D" uid="uid://tfth34htn52n" path="res://expressive_stone.png" id="6_3t7se"]
[ext_resource type="PackedScene" uid="uid://d0wkusth6nbhh" path="res://global/camera/CameraProperties.tscn" id="6_tdtq1"]
[ext_resource type="PackedScene" uid="uid://sxcxj2sua5ho" path="res://characters/enemies/Bingus/Bingus.tscn" id="8_puapy"]
[ext_resource type="PackedScene" uid="uid://dwg8c17nqiep2" path="res://global/powerups/Powerup.tscn" id="9_r6xmg"]
[ext_resource type="PackedScene" uid="uid://bkh0o0gbpctui" path="res://global/saving/SaveSpot.tscn" id="10_tdtq1"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rle0b"]
size = Vector2(81, 769)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_o46l2"]
size = Vector2(121.5, 876.5)
[sub_resource type="Resource" id="Resource_y1jh6"]
script = ExtResource("2_tdtq1")
left = 0.0
@ -20,6 +27,31 @@ top = -1e+07
bottom = 1000.0
metadata/_custom_type_script = "uid://dbhp6ek2kwibq"
[sub_resource type="Resource" id="Resource_ytue1"]
script = ExtResource("2_tdtq1")
left = -1e+07
right = 2000.0
top = -1e+07
bottom = 1e+07
metadata/_custom_type_script = "uid://dbhp6ek2kwibq"
[sub_resource type="RectangleShape2D" id="RectangleShape2D_xx7wp"]
size = Vector2(99.5, 1068.5)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_o1bhb"]
size = Vector2(105.5, 1091.25)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_gawt8"]
size = Vector2(630, 754.5)
[sub_resource type="Resource" id="Resource_gawt8"]
script = ExtResource("2_tdtq1")
left = -1e+07
right = 1e+07
top = -1e+07
bottom = 1e+07
metadata/_custom_type_script = "uid://dbhp6ek2kwibq"
[sub_resource type="RectangleShape2D" id="RectangleShape2D_6n8gr"]
size = Vector2(53.5, 389)
@ -41,52 +73,67 @@ shader_parameter/intensity = 0.61
shader_parameter/frequency = 9.965
shader_parameter/scale = 2.285
[sub_resource type="RectangleShape2D" id="RectangleShape2D_xx7wp"]
size = Vector2(99.5, 1068.5)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_o1bhb"]
size = Vector2(105.5, 1091.25)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_tdtq1"]
size = Vector2(216, 208)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_y1jh6"]
size = Vector2(208, 197)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_gawt8"]
size = Vector2(926, 361.75)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ytue1"]
size = Vector2(449, 205)
[sub_resource type="Resource" id="Resource_gawt8"]
script = ExtResource("2_tdtq1")
left = -1e+07
right = 1e+07
top = -1e+07
bottom = 1e+07
metadata/_custom_type_script = "uid://dbhp6ek2kwibq"
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rle0b"]
size = Vector2(81, 769)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_o46l2"]
size = Vector2(121.5, 876.5)
[sub_resource type="Resource" id="Resource_ytue1"]
script = ExtResource("2_tdtq1")
left = -1e+07
right = 2000.0
top = -1e+07
bottom = 1e+07
metadata/_custom_type_script = "uid://dbhp6ek2kwibq"
[node name="TestBadPerformance" type="Node2D"]
editor_description = "No fancy graphics stuff here!"
[node name="SceneCamera" parent="." instance=ExtResource("1_r6xmg")]
[node name="CameraStuff" type="Node2D" parent="."]
[node name="LimitsFocusZone" parent="CameraStuff" node_paths=PackedStringArray("camera") instance=ExtResource("4_dn1o1")]
position = Vector2(3450, -757)
camera = NodePath("../LimitsCameraProperties")
[node name="Enter" parent="CameraStuff/LimitsFocusZone" index="0"]
position = Vector2(-782, 203)
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraStuff/LimitsFocusZone/Enter" index="0"]
position = Vector2(364, -80)
shape = SubResource("RectangleShape2D_rle0b")
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraStuff/LimitsFocusZone/Exit" index="0"]
position = Vector2(-712, 63)
shape = SubResource("RectangleShape2D_o46l2")
[node name="SceneCamera" parent="CameraStuff" instance=ExtResource("1_r6xmg")]
limits = SubResource("Resource_y1jh6")
[node name="LimitsCameraProperties" parent="CameraStuff" instance=ExtResource("6_tdtq1")]
position = Vector2(3450, -757)
limits = SubResource("Resource_ytue1")
[node name="ExpressiveStoneFocusZone" parent="CameraStuff" node_paths=PackedStringArray("camera") instance=ExtResource("4_dn1o1")]
position = Vector2(799, 469)
camera = NodePath("../../ExpressiveStone/CameraProperties")
[node name="Enter" parent="CameraStuff/ExpressiveStoneFocusZone" index="0"]
position = Vector2(247, -66)
[node name="Shape" type="CollisionShape2D" parent="CameraStuff/ExpressiveStoneFocusZone/Enter" index="0"]
position = Vector2(180, -18)
shape = SubResource("RectangleShape2D_xx7wp")
[node name="Exit" parent="CameraStuff/ExpressiveStoneFocusZone" index="1"]
position = Vector2(-303, -71)
[node name="Shape" type="CollisionShape2D" parent="CameraStuff/ExpressiveStoneFocusZone/Exit" index="0"]
position = Vector2(361, 10)
shape = SubResource("RectangleShape2D_o1bhb")
[node name="CameraFocusArea" parent="CameraStuff" node_paths=PackedStringArray("camera") instance=ExtResource("5_gawt8")]
camera = NodePath("CameraProperties")
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraStuff/CameraFocusArea"]
position = Vector2(348, -338)
shape = SubResource("RectangleShape2D_gawt8")
[node name="CameraProperties" parent="CameraStuff/CameraFocusArea" instance=ExtResource("6_tdtq1")]
limits = SubResource("Resource_gawt8")
[node name="PointMaine" parent="." instance=ExtResource("2_uhdkp")]
position = Vector2(128, 675)
scene = "res://test_levels/test_bad_performance2.tscn"
@ -110,24 +157,6 @@ texture = ExtResource("6_3t7se")
[node name="CameraProperties" parent="ExpressiveStone" instance=ExtResource("6_tdtq1")]
inherit_transform = true
[node name="ExpressiveStoneFocusZone" parent="." node_paths=PackedStringArray("camera") instance=ExtResource("4_dn1o1")]
position = Vector2(799, 469)
camera = NodePath("../ExpressiveStone/CameraProperties")
[node name="Enter" parent="ExpressiveStoneFocusZone" index="0"]
position = Vector2(247, -66)
[node name="Shape" type="CollisionShape2D" parent="ExpressiveStoneFocusZone/Enter" index="0"]
position = Vector2(180, -18)
shape = SubResource("RectangleShape2D_xx7wp")
[node name="Exit" parent="ExpressiveStoneFocusZone" index="1"]
position = Vector2(-303, -71)
[node name="Shape" type="CollisionShape2D" parent="ExpressiveStoneFocusZone/Exit" index="0"]
position = Vector2(361, 10)
shape = SubResource("RectangleShape2D_o1bhb")
[node name="Bingus" parent="." instance=ExtResource("8_puapy")]
position = Vector2(1656, -333)
@ -157,39 +186,5 @@ offset_right = 40.0
offset_bottom = 23.0
text = "save spot"
[node name="NoLimitsFocusZone" parent="." node_paths=PackedStringArray("camera") instance=ExtResource("4_dn1o1")]
position = Vector2(600, -415)
camera = NodePath("NoLimitsCameraProperties")
[node name="CollisionShape2D" type="CollisionShape2D" parent="NoLimitsFocusZone/Enter" index="0"]
position = Vector2(67, 29.125)
shape = SubResource("RectangleShape2D_gawt8")
[node name="CollisionShape2D" type="CollisionShape2D" parent="NoLimitsFocusZone/Exit" index="0"]
position = Vector2(-167, 369)
shape = SubResource("RectangleShape2D_ytue1")
[node name="NoLimitsCameraProperties" parent="NoLimitsFocusZone" instance=ExtResource("6_tdtq1")]
limits = SubResource("Resource_gawt8")
[node name="LimitsFocusZone" parent="." node_paths=PackedStringArray("camera") instance=ExtResource("4_dn1o1")]
position = Vector2(3450, -757)
camera = NodePath("LimitsCameraProperties")
[node name="Enter" parent="LimitsFocusZone" index="0"]
position = Vector2(-782, 203)
[node name="CollisionShape2D" type="CollisionShape2D" parent="LimitsFocusZone/Enter" index="0"]
position = Vector2(364, -80)
shape = SubResource("RectangleShape2D_rle0b")
[node name="CollisionShape2D" type="CollisionShape2D" parent="LimitsFocusZone/Exit" index="0"]
position = Vector2(-712, 63)
shape = SubResource("RectangleShape2D_o46l2")
[node name="LimitsCameraProperties" parent="LimitsFocusZone" instance=ExtResource("6_tdtq1")]
limits = SubResource("Resource_ytue1")
[editable path="ExpressiveStoneFocusZone"]
[editable path="NoLimitsFocusZone"]
[editable path="LimitsFocusZone"]
[editable path="CameraStuff/LimitsFocusZone"]
[editable path="CameraStuff/ExpressiveStoneFocusZone"]