diff --git a/gymkhana/characters/oier/oier-mod.png b/gymkhana/characters/oier/oier-mod.png new file mode 100644 index 00000000..ace0a84e Binary files /dev/null and b/gymkhana/characters/oier/oier-mod.png differ diff --git a/gymkhana/characters/oier/oier.esc b/gymkhana/characters/oier/oier.esc new file mode 100644 index 00000000..0d252281 --- /dev/null +++ b/gymkhana/characters/oier/oier.esc @@ -0,0 +1,3 @@ +:look + +say OierPlayer "Jelouu!!🎉" diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn new file mode 100644 index 00000000..4017bbb0 --- /dev/null +++ b/gymkhana/characters/oier/oier.tscn @@ -0,0 +1,199 @@ +[gd_scene load_steps=29 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1] +[ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture" id=2] +[ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3] + +[sub_resource type="AtlasTexture" id=22] +flags = 4 +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=24] +flags = 4 +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=26] +flags = 4 +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=46] +flags = 4 +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=48] +flags = 4 +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=50] +flags = 4 +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=52] +flags = 4 +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=54] +flags = 4 +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=56] +flags = 4 +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=58] +flags = 4 +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=43] +flags = 4 +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=45] +flags = 4 +atlas = ExtResource( 2 ) +region = Rect2( 1638, 0, 273, 795 ) + +[sub_resource type="SpriteFrames" id=20] +animations = [ { +"frames": [ SubResource( 22 ) ], +"loop": true, +"name": "idle_down", +"speed": 5.0 +}, { +"frames": [ SubResource( 23 ) ], +"loop": true, +"name": "idle_down_left", +"speed": 5.0 +}, { +"frames": [ SubResource( 24 ) ], +"loop": true, +"name": "idle_down_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 25 ) ], +"loop": true, +"name": "idle_left", +"speed": 5.0 +}, { +"frames": [ SubResource( 26 ) ], +"loop": true, +"name": "idle_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 27 ) ], +"loop": true, +"name": "idle_up", +"speed": 5.0 +}, { +"frames": [ SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 47 ) ], +"loop": true, +"name": "walk_down", +"speed": 5.0 +}, { +"frames": [ SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ), SubResource( 53 ) ], +"loop": true, +"name": "walk_left", +"speed": 5.0 +}, { +"frames": [ SubResource( 54 ), SubResource( 55 ), SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ], +"loop": true, +"name": "walk_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 42 ), SubResource( 43 ), SubResource( 44 ), SubResource( 45 ) ], +"loop": true, +"name": "walk_up", +"speed": 5.0 +} ] + +[sub_resource type="CapsuleShape2D" id=21] +radius = 53.0 +height = 208.0 + +[node name="ESCPlayer" type="Area2D"] +pause_mode = 1 +position = Vector2( -5, 0 ) +script = ExtResource( 1 ) +global_id = "player" +esc_script = "res://gymkhana/characters/oier/oier.esc" +is_movable = true +default_action = "action1" +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +animations = ExtResource( 3 ) + +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( 0, -155 ) +scale = Vector2( 0.389246, 0.389247 ) +frames = SubResource( 20 ) +animation = "idle_up" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 5, -151 ) +shape = SubResource( 21 ) diff --git a/gymkhana/characters/oier/oier_animations.tres b/gymkhana/characters/oier/oier_animations.tres new file mode 100644 index 00000000..14e8c39d --- /dev/null +++ b/gymkhana/characters/oier/oier_animations.tres @@ -0,0 +1,172 @@ +[gd_resource type="Resource" load_steps=36 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] + +[sub_resource type="Resource" id=1] +script = ExtResource( 2 ) +angle_start = 340 +angle_size = 40 + +[sub_resource type="Resource" id=2] +script = ExtResource( 2 ) +angle_start = 20 +angle_size = 50 + +[sub_resource type="Resource" id=3] +script = ExtResource( 2 ) +angle_start = 70 +angle_size = 40 + +[sub_resource type="Resource" id=4] +script = ExtResource( 2 ) +angle_start = 110 +angle_size = 50 + +[sub_resource type="Resource" id=5] +script = ExtResource( 2 ) +angle_start = 160 +angle_size = 40 + +[sub_resource type="Resource" id=6] +script = ExtResource( 2 ) +angle_start = 200 +angle_size = 50 + +[sub_resource type="Resource" id=7] +script = ExtResource( 2 ) +angle_start = 250 +angle_size = 40 + +[sub_resource type="Resource" id=8] +script = ExtResource( 2 ) +angle_start = 290 +angle_size = 50 + +[sub_resource type="Resource" id=9] +script = ExtResource( 3 ) +animation = "walk_up" +mirrored = false + +[sub_resource type="Resource" id=10] +script = ExtResource( 3 ) +animation = "walk_up" +mirrored = false + +[sub_resource type="Resource" id=11] +script = ExtResource( 3 ) +animation = "walk_right" +mirrored = false + +[sub_resource type="Resource" id=12] +script = ExtResource( 3 ) +animation = "walk_down" +mirrored = false + +[sub_resource type="Resource" id=13] +script = ExtResource( 3 ) +animation = "walk_down" +mirrored = false + +[sub_resource type="Resource" id=14] +script = ExtResource( 3 ) +animation = "walk_down" +mirrored = false + +[sub_resource type="Resource" id=15] +script = ExtResource( 3 ) +animation = "walk_right" +mirrored = true + +[sub_resource type="Resource" id=16] +script = ExtResource( 3 ) +animation = "walk_up" +mirrored = false + +[sub_resource type="Resource" id=17] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[sub_resource type="Resource" id=18] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[sub_resource type="Resource" id=19] +script = ExtResource( 3 ) +animation = "idle_right" +mirrored = false + +[sub_resource type="Resource" id=20] +script = ExtResource( 3 ) +animation = "idle_down_right" +mirrored = false + +[sub_resource type="Resource" id=21] +script = ExtResource( 3 ) +animation = "idle_down" +mirrored = false + +[sub_resource type="Resource" id=22] +script = ExtResource( 3 ) +animation = "idle_down_left" +mirrored = false + +[sub_resource type="Resource" id=23] +script = ExtResource( 3 ) +animation = "idle_left" +mirrored = false + +[sub_resource type="Resource" id=24] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[sub_resource type="Resource" id=25] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[sub_resource type="Resource" id=26] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[sub_resource type="Resource" id=27] +script = ExtResource( 3 ) +animation = "idle_right" +mirrored = false + +[sub_resource type="Resource" id=28] +script = ExtResource( 3 ) +animation = "idle_down" +mirrored = false + +[sub_resource type="Resource" id=29] +script = ExtResource( 3 ) +animation = "idle_down" +mirrored = false + +[sub_resource type="Resource" id=30] +script = ExtResource( 3 ) +animation = "idle_down" +mirrored = false + +[sub_resource type="Resource" id=31] +script = ExtResource( 3 ) +animation = "idle_right" +mirrored = true + +[sub_resource type="Resource" id=32] +script = ExtResource( 3 ) +animation = "idle_up" +mirrored = false + +[resource] +script = ExtResource( 1 ) +dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ] +directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ] +idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ] +speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ] diff --git a/gymkhana/characters/oier/sfx/footstep_concrete_000.ogg b/gymkhana/characters/oier/sfx/footstep_concrete_000.ogg new file mode 100644 index 00000000..163cc564 Binary files /dev/null and b/gymkhana/characters/oier/sfx/footstep_concrete_000.ogg differ diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 921a71c1..d79b3604 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -5,8 +5,8 @@ [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] [ext_resource path="res://gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png" type="Texture" id=6] -[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=7] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577.jpg" type="Texture" id=6] +[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] [ext_resource path="res://game/items/inventory/wrench.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10] @@ -63,7 +63,7 @@ script = ExtResource( 2 ) position = Vector2( 1476, 363 ) scale = Vector2( 0.634168, 0.634168 ) frames = SubResource( 2 ) -frame = 12 +frame = 8 playing = true flip_h = true @@ -71,7 +71,7 @@ flip_h = true position = Vector2( 1018, 333 ) scale = Vector2( 0.867751, 0.867751 ) frames = SubResource( 2 ) -frame = 11 +frame = 7 playing = true offset = Vector2( -0.09375, 20.0582 ) @@ -97,10 +97,10 @@ script = ExtResource( 28 ) global_id = "l_exit" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" is_exit = true -tooltip_name = "Esto es una puerta" +tooltip_name = "Esto es una puerta y tiene una descripcion mu larga" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -tooltip2_name = "Entrar!" +tooltip2_name = "Entrar! con descricion..." animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/entrada_cocina"]