feat(escoria4): upgraded project to Godot 4.4

This commit is contained in:
2025-03-11 12:29:32 +01:00
parent 9cbf8d17b2
commit 0fb120466b
126 changed files with 1606 additions and 1357 deletions

View File

@@ -1,219 +1,272 @@
[gd_scene load_steps=32 format=2]
[gd_scene load_steps=32 format=3 uid="uid://cjmsexhyhi4vs"]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3]
[ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture2D" id=4]
[ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://b2msjygw7oyi0" path="res://gymkhana/characters/oier/oier-mod.png" id="2"]
[ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"]
[ext_resource type="Texture2D" uid="uid://bcs6kqj5w23vk" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"]
[sub_resource type="AtlasTexture" id=22]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 5733, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="22"]
atlas = ExtResource("2")
region = Rect2(5733, 0, 273, 795)
[sub_resource type="AtlasTexture" id=23]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 5460, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="23"]
atlas = ExtResource("2")
region = Rect2(5460, 0, 273, 795)
[sub_resource type="AtlasTexture" id=24]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 4368, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="24"]
atlas = ExtResource("2")
region = Rect2(4368, 0, 273, 795)
[sub_resource type="AtlasTexture" id=25]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 5187, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="25"]
atlas = ExtResource("2")
region = Rect2(5187, 0, 273, 795)
[sub_resource type="AtlasTexture" id=26]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 4641, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="26"]
atlas = ExtResource("2")
region = Rect2(4641, 0, 273, 795)
[sub_resource type="AtlasTexture" id=27]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1638, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="27"]
atlas = ExtResource("2")
region = Rect2(1638, 0, 273, 795)
[sub_resource type="AtlasTexture" id=59]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 5733, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="59"]
atlas = ExtResource("2")
region = Rect2(5733, 0, 273, 795)
[sub_resource type="AtlasTexture" id=60]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 5733, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="60"]
atlas = ExtResource("4")
region = Rect2(5733, 0, 273, 795)
[sub_resource type="AtlasTexture" id=46]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 3549, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="46"]
atlas = ExtResource("2")
region = Rect2(3549, 0, 273, 795)
[sub_resource type="AtlasTexture" id=47]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 3822, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="47"]
atlas = ExtResource("2")
region = Rect2(3822, 0, 273, 795)
[sub_resource type="AtlasTexture" id=48]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 4095, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="48"]
atlas = ExtResource("2")
region = Rect2(4095, 0, 273, 795)
[sub_resource type="AtlasTexture" id=49]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 2184, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="49"]
atlas = ExtResource("2")
region = Rect2(2184, 0, 273, 795)
[sub_resource type="AtlasTexture" id=50]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 2457, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="50"]
atlas = ExtResource("2")
region = Rect2(2457, 0, 273, 795)
[sub_resource type="AtlasTexture" id=51]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 2730, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="51"]
atlas = ExtResource("2")
region = Rect2(2730, 0, 273, 795)
[sub_resource type="AtlasTexture" id=52]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 3003, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="52"]
atlas = ExtResource("2")
region = Rect2(3003, 0, 273, 795)
[sub_resource type="AtlasTexture" id=53]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 3276, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="53"]
atlas = ExtResource("2")
region = Rect2(3276, 0, 273, 795)
[sub_resource type="AtlasTexture" id=54]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 0, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="54"]
atlas = ExtResource("2")
region = Rect2(0, 0, 273, 795)
[sub_resource type="AtlasTexture" id=55]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 273, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="55"]
atlas = ExtResource("2")
region = Rect2(273, 0, 273, 795)
[sub_resource type="AtlasTexture" id=56]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 546, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="56"]
atlas = ExtResource("2")
region = Rect2(546, 0, 273, 795)
[sub_resource type="AtlasTexture" id=57]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 819, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="57"]
atlas = ExtResource("2")
region = Rect2(819, 0, 273, 795)
[sub_resource type="AtlasTexture" id=58]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1092, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="58"]
atlas = ExtResource("2")
region = Rect2(1092, 0, 273, 795)
[sub_resource type="AtlasTexture" id=42]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1365, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="42"]
atlas = ExtResource("2")
region = Rect2(1365, 0, 273, 795)
[sub_resource type="AtlasTexture" id=43]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1638, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="43"]
atlas = ExtResource("2")
region = Rect2(1638, 0, 273, 795)
[sub_resource type="AtlasTexture" id=44]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1911, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="44"]
atlas = ExtResource("2")
region = Rect2(1911, 0, 273, 795)
[sub_resource type="AtlasTexture" id=45]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 1638, 0, 273, 795 )
[sub_resource type="AtlasTexture" id="45"]
atlas = ExtResource("2")
region = Rect2(1638, 0, 273, 795)
[sub_resource type="SpriteFrames" id=20]
animations = [ {
"frames": [ SubResource( 22 ) ],
[sub_resource type="SpriteFrames" id="20"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("22")
}],
"loop": true,
"name": "idle_down",
"name": &"idle_down",
"speed": 5.0
}, {
"frames": [ SubResource( 23 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("23")
}],
"loop": true,
"name": "idle_down_left",
"name": &"idle_down_left",
"speed": 5.0
}, {
"frames": [ SubResource( 24 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("24")
}],
"loop": true,
"name": "idle_down_right",
"name": &"idle_down_right",
"speed": 5.0
}, {
"frames": [ SubResource( 25 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("25")
}],
"loop": true,
"name": "idle_left",
"name": &"idle_left",
"speed": 5.0
}, {
"frames": [ SubResource( 26 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("26")
}],
"loop": true,
"name": "idle_right",
"name": &"idle_right",
"speed": 5.0
}, {
"frames": [ SubResource( 27 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("27")
}],
"loop": true,
"name": "idle_up",
"name": &"idle_up",
"speed": 5.0
}, {
"frames": [ SubResource( 59 ), SubResource( 60 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("59")
}, {
"duration": 1.0,
"texture": SubResource("60")
}],
"loop": true,
"name": "speak_down",
"name": &"speak_down",
"speed": 5.0
}, {
"frames": [ SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 47 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("46")
}, {
"duration": 1.0,
"texture": SubResource("47")
}, {
"duration": 1.0,
"texture": SubResource("48")
}, {
"duration": 1.0,
"texture": SubResource("47")
}],
"loop": true,
"name": "walk_down",
"name": &"walk_down",
"speed": 5.0
}, {
"frames": [ SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ), SubResource( 53 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("49")
}, {
"duration": 1.0,
"texture": SubResource("50")
}, {
"duration": 1.0,
"texture": SubResource("51")
}, {
"duration": 1.0,
"texture": SubResource("52")
}, {
"duration": 1.0,
"texture": SubResource("53")
}],
"loop": true,
"name": "walk_left",
"name": &"walk_left",
"speed": 5.0
}, {
"frames": [ SubResource( 54 ), SubResource( 55 ), SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("54")
}, {
"duration": 1.0,
"texture": SubResource("55")
}, {
"duration": 1.0,
"texture": SubResource("56")
}, {
"duration": 1.0,
"texture": SubResource("57")
}, {
"duration": 1.0,
"texture": SubResource("58")
}],
"loop": true,
"name": "walk_right",
"name": &"walk_right",
"speed": 5.0
}, {
"frames": [ SubResource( 42 ), SubResource( 43 ), SubResource( 44 ), SubResource( 45 ) ],
"frames": [{
"duration": 1.0,
"texture": SubResource("42")
}, {
"duration": 1.0,
"texture": SubResource("43")
}, {
"duration": 1.0,
"texture": SubResource("44")
}, {
"duration": 1.0,
"texture": SubResource("45")
}],
"loop": true,
"name": "walk_up",
"name": &"walk_up",
"speed": 5.0
} ]
}]
[sub_resource type="CapsuleShape2D" id=21]
[sub_resource type="CapsuleShape2D" id="21"]
radius = 53.0
height = 208.0
[node name="ESCPlayerWithTooltip" type="Area2D"]
process_mode = 1
position = Vector2( -5, 0 )
script = ExtResource( 1 )
position = Vector2(-5, 0)
script = ExtResource("1")
global_id = "player"
esc_script = "res://gymkhana/characters/oier/oier.esc"
is_interactive = false
is_movable = true
default_action = "action1"
combine_when_selected_action_is_in = [ ]
dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 )
animations = ExtResource( 3 )
combine_when_selected_action_is_in = []
dialog_color = Color(0.321569, 0.662745, 0.301961, 1)
animations = ExtResource("3")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2( 0, -155 )
scale = Vector2( 0.389246, 0.389247 )
frames = SubResource( 20 )
position = Vector2(0, -155)
scale = Vector2(0.389246, 0.389247)
frames = SubResource("20")
animation = "speak_down"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 5, -151 )
shape = SubResource( 21 )
position = Vector2(5, -151)
shape = SubResource("21")
[node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( 1, -473 )
position = Vector2(1, -473)

View File

@@ -1,8 +1,8 @@
[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=36 format=3 uid="uid://cyjo7aq0e4hbe"]
[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"]
[ext_resource type="Script" uid="uid://sksvt0n8gle2" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
[ext_resource type="Script" uid="uid://bxc3dll30x8tl" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
[ext_resource type="Script" uid="uid://clixil1u5exq7" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"]
[sub_resource type="Resource" id="1"]
script = ExtResource("2")