Clean up path and names

This commit is contained in:
Mathilde Grapin 2023-06-13 21:36:01 +02:00
parent 92ccf7279d
commit 1aff1c2e38
46 changed files with 203 additions and 117 deletions

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://cy0ko2cawudia"]
[ext_resource type="Texture2D" uid="uid://dl8qfp3u18nkx" path="res://art/pilko.png" id="1_20u67"]
[ext_resource type="Texture2D" uid="uid://dl8qfp3u18nkx" path="res://art/objects/ball.png" id="1_un30v"]
[sub_resource type="CircleShape2D" id="CircleShape2D_srlvs"]
radius = 5.0
@ -9,7 +9,7 @@ radius = 5.0
z_index = 1
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("1_20u67")
texture = ExtResource("1_un30v")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_srlvs")

View file

@ -1,10 +1,10 @@
[gd_scene load_steps=12 format=3 uid="uid://bktg1ypaav3q3"]
[ext_resource type="Texture2D" uid="uid://bbwsdd0jddmck" path="res://art/Pink_Monster_Walk_6.png" id="1_e5603"]
[ext_resource type="Script" path="res://scripts/enemy.gd" id="1_l5lyv"]
[ext_resource type="Texture2D" uid="uid://dylr4xf3far68" path="res://art/Pink_Monster_Idle_4.png" id="2_duxxr"]
[ext_resource type="Texture2D" uid="uid://bydnrc6ixlv8w" path="res://art/Pink_Monster_Throw_4.png" id="2_iscwr"]
[ext_resource type="Script" path="res://scripts/enemy/enemy.gd" id="1_2uhn6"]
[ext_resource type="Texture2D" uid="uid://bydnrc6ixlv8w" path="res://art/characters/Pink_Monster_Throw_4.png" id="2_5t5q0"]
[ext_resource type="Texture2D" uid="uid://dylr4xf3far68" path="res://art/characters/Pink_Monster_Idle_4.png" id="3_5xsrd"]
[ext_resource type="PackedScene" uid="uid://b51tdt5kunai" path="res://scenes/enemy_behavior_tree.tscn" id="3_jk76t"]
[ext_resource type="Texture2D" uid="uid://bbwsdd0jddmck" path="res://art/characters/Pink_Monster_Walk_6.png" id="4_qk3ak"]
[sub_resource type="Animation" id="Animation_ouyrp"]
length = 0.001
@ -23,7 +23,47 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_duxxr")]
"values": [ExtResource("3_5xsrd")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Sprite2D:hframes")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [4]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Sprite2D:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.1, 0.2, 0.3),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [0, 1, 2, 3]
}
[sub_resource type="Animation" id="Animation_jt5bg"]
resource_name = "throw"
length = 0.4
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:texture")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_5t5q0")]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -64,7 +104,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("1_e5603")]
"values": [ExtResource("4_qk3ak")]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -91,46 +131,6 @@ tracks/2/keys = {
"values": [0, 1, 2, 3, 4, 5]
}
[sub_resource type="Animation" id="Animation_jt5bg"]
resource_name = "throw"
length = 0.4
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:texture")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_iscwr")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Sprite2D:hframes")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [4]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Sprite2D:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.1, 0.2, 0.3),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [0, 1, 2, 3]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_gnukq"]
_data = {
"RESET": SubResource("Animation_ouyrp"),
@ -143,11 +143,11 @@ _data = {
size = Vector2(17, 10)
[node name="Enemy" type="CharacterBody2D"]
script = ExtResource("1_l5lyv")
script = ExtResource("1_2uhn6")
[node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2(0, -16)
texture = ExtResource("2_iscwr")
texture = ExtResource("2_5t5q0")
flip_h = true
hframes = 4

View file

@ -3,14 +3,14 @@
[ext_resource type="Script" path="res://addons/beehave/nodes/beehave_tree.gd" id="1_b2pc4"]
[ext_resource type="Script" path="res://addons/beehave/nodes/composites/sequence.gd" id="2_80fm4"]
[ext_resource type="Script" path="res://addons/beehave/nodes/composites/selector.gd" id="2_xkd41"]
[ext_resource type="Script" path="res://scripts/is_idle_condition.gd" id="3_5jur1"]
[ext_resource type="Script" path="res://scripts/move_to_target_action.gd" id="4_1on4v"]
[ext_resource type="Script" path="res://scripts/can_wait_condition.gd" id="4_x5ium"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/can_wait_condition.gd" id="4_0jr1a"]
[ext_resource type="Script" path="res://addons/beehave/nodes/decorators/time_limiter.gd" id="5_012bh"]
[ext_resource type="Script" path="res://scripts/wait_action.gd" id="5_xel2n"]
[ext_resource type="Script" path="res://scripts/can_throw_ball_condition.gd" id="7_qj5mg"]
[ext_resource type="Script" path="res://scripts/get_random_top_cell_action.gd" id="7_uo3i6"]
[ext_resource type="Script" path="res://scripts/throw_ball_action.gd" id="8_sunpr"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/wait_action.gd" id="6_eyknc"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/can_throw_ball_condition.gd" id="7_k5qlq"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/throw_ball_action.gd" id="8_wytqf"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/is_idle_condition.gd" id="9_vboat"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/get_random_destination_action.gd" id="10_f4jrw"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/move_to_destination_action.gd" id="11_tjc85"]
[node name="EnemyBehaviorTree" type="Node"]
script = ExtResource("1_b2pc4")
@ -22,32 +22,32 @@ script = ExtResource("2_xkd41")
script = ExtResource("2_80fm4")
[node name="CanWait" type="Node" parent="MainSelector/WaitSequence"]
script = ExtResource("4_x5ium")
script = ExtResource("4_0jr1a")
[node name="TimeLimiterDecorator" type="Node" parent="MainSelector/WaitSequence"]
script = ExtResource("5_012bh")
wait_time = 2.0
[node name="Wait" type="Node" parent="MainSelector/WaitSequence/TimeLimiterDecorator"]
script = ExtResource("5_xel2n")
script = ExtResource("6_eyknc")
[node name="ThrowBallSequence" type="Node" parent="MainSelector"]
script = ExtResource("2_80fm4")
[node name="CanThrowBall" type="Node" parent="MainSelector/ThrowBallSequence"]
script = ExtResource("7_qj5mg")
script = ExtResource("7_k5qlq")
[node name="ThrowBall" type="Node" parent="MainSelector/ThrowBallSequence"]
script = ExtResource("8_sunpr")
script = ExtResource("8_wytqf")
[node name="ReturnBallSequence" type="Node" parent="MainSelector"]
script = ExtResource("2_80fm4")
[node name="IsIdle" type="Node" parent="MainSelector/ReturnBallSequence"]
script = ExtResource("3_5jur1")
script = ExtResource("9_vboat")
[node name="GetRandomTopCell" type="Node" parent="MainSelector/ReturnBallSequence"]
script = ExtResource("7_uo3i6")
[node name="GetRandomDestination" type="Node" parent="MainSelector/ReturnBallSequence"]
script = ExtResource("10_f4jrw")
[node name="MoveToTarget" type="Node" parent="MainSelector/ReturnBallSequence"]
script = ExtResource("4_1on4v")
[node name="MoveToDestination" type="Node" parent="MainSelector/ReturnBallSequence"]
script = ExtResource("11_tjc85")

View file

@ -1,13 +1,13 @@
[gd_scene load_steps=16 format=3 uid="uid://ba1t35yyot4jl"]
[ext_resource type="Texture2D" uid="uid://bqkvmyqo86dtj" path="res://art/Owlet_Monster_Walk_6.png" id="1_e23l4"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_fmx2p"]
[ext_resource type="Texture2D" uid="uid://cjxkidkeka7yp" path="res://art/Owlet_Monster_Run_6.png" id="2_qq5i7"]
[ext_resource type="Texture2D" uid="uid://bi7ceeuwhg5mp" path="res://art/Owlet_Monster_Idle_4.png" id="4_orj3a"]
[ext_resource type="Texture2D" uid="uid://dbrr63tv6i2ek" path="res://art/Owlet_Monster_Throw_4.png" id="5_2s1mg"]
[ext_resource type="Script" path="res://scripts/state_machine.gd" id="6_hl63m"]
[ext_resource type="Script" path="res://scripts/player_idle_state.gd" id="7_0nfrc"]
[ext_resource type="Script" path="res://scripts/player_walk_state.gd" id="7_gcd3q"]
[ext_resource type="Texture2D" uid="uid://bqkvmyqo86dtj" path="res://art/characters/Owlet_Monster_Walk_6.png" id="1_e23l4"]
[ext_resource type="Script" path="res://scripts/player/player.gd" id="1_fmx2p"]
[ext_resource type="Texture2D" uid="uid://cjxkidkeka7yp" path="res://art/characters/Owlet_Monster_Run_6.png" id="2_qq5i7"]
[ext_resource type="Texture2D" uid="uid://bi7ceeuwhg5mp" path="res://art/characters/Owlet_Monster_Idle_4.png" id="4_orj3a"]
[ext_resource type="Texture2D" uid="uid://dbrr63tv6i2ek" path="res://art/characters/Owlet_Monster_Throw_4.png" id="5_2s1mg"]
[ext_resource type="Script" path="res://scripts/state_machine/state_machine.gd" id="6_hl63m"]
[ext_resource type="Script" path="res://scripts/player/states/player_idle_state.gd" id="7_0nfrc"]
[ext_resource type="Script" path="res://scripts/player/states/player_walk_state.gd" id="7_gcd3q"]
[sub_resource type="Animation" id="Animation_rh7n7"]
length = 0.001

View file

@ -1,24 +1,40 @@
[gd_scene load_steps=7 format=3 uid="uid://m8uyi35gr3qd"]
[gd_scene load_steps=11 format=3 uid="uid://m8uyi35gr3qd"]
[ext_resource type="Texture2D" uid="uid://cm58s70te836m" path="res://art/tile.png" id="1_2goti"]
[ext_resource type="Texture2D" uid="uid://lnt0clkwms52" path="res://art/wall.png" id="2_xllgf"]
[ext_resource type="Script" path="res://scripts/tile_map.gd" id="3_067ya"]
[ext_resource type="Texture2D" uid="uid://cm58s70te836m" path="res://art/tiles/ground_tile.png" id="1_set62"]
[ext_resource type="Texture2D" uid="uid://lnt0clkwms52" path="res://art/tiles/wall_tile.png" id="2_iitec"]
[ext_resource type="Texture2D" uid="uid://b7565sd31qorm" path="res://art/tiles/destination_tile.png" id="3_ca0hc"]
[ext_resource type="Texture2D" uid="uid://d265li1k63anm" path="res://art/tiles/target_tile.png" id="4_w73lj"]
[ext_resource type="Script" path="res://scripts/tile_map/tile_map.gd" id="5_hxvn0"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_wq1n0"]
texture = ExtResource("1_2goti")
texture = ExtResource("1_set62")
texture_region_size = Vector2i(32, 32)
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u0t08"]
texture = ExtResource("2_xllgf")
texture = ExtResource("2_iitec")
texture_region_size = Vector2i(32, 32)
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 8.5, 0, 1.5, 15.5, 9, 0, 16)
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_x1mdb"]
texture = ExtResource("3_ca0hc")
texture_region_size = Vector2i(32, 32)
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_hm0kl"]
texture = ExtResource("4_w73lj")
texture_region_size = Vector2i(32, 32)
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
[sub_resource type="TileSet" id="TileSet_kwgeq"]
tile_shape = 1
tile_layout = 5
@ -26,6 +42,8 @@ tile_size = Vector2i(32, 16)
physics_layer_0/collision_layer = 1
sources/0 = SubResource("TileSetAtlasSource_wq1n0")
sources/1 = SubResource("TileSetAtlasSource_u0t08")
sources/2 = SubResource("TileSetAtlasSource_x1mdb")
sources/3 = SubResource("TileSetAtlasSource_hm0kl")
[node name="TileMap" type="TileMap"]
y_sort_enabled = true
@ -40,4 +58,4 @@ layer_1/y_sort_enabled = true
layer_1/y_sort_origin = 0
layer_1/z_index = 1
layer_1/tile_data = PackedInt32Array()
script = ExtResource("3_067ya")
script = ExtResource("5_hxvn0")