oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

Browse Source
This commit is contained in:
Oier Bravo
2023-08-27 03:31:27 +02:00
parent beb244a01e 1a159efa20
commit 50ccb0f25b
6 changed files with 30 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
gymkhana/characters/eneko/eneko-smoking.tscn
View File

@@ -1,62 +0,0 @@
[gd_scene load_steps=21 format=2]
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=3]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png" type="Texture" id=4]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=5]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png" type="Texture" id=6]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png" type="Texture" id=7]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png" type="Texture" id=8]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png" type="Texture" id=9]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png" type="Texture" id=10]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png" type="Texture" id=11]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png" type="Texture" id=12]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png" type="Texture" id=13]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png" type="Texture" id=14]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png" type="Texture" id=15]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png" type="Texture" id=16]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png" type="Texture" id=17]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=18]
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"frames": [ ExtResource( 7 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 14 ), ExtResource( 4 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 11 ), ExtResource( 10 ), ExtResource( 8 ), ExtResource( 3 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 9 ) ],
"loop": true,
"name": "idle",
"speed": 5.0
}, {
"frames": [ ExtResource( 7 ) ],
"loop": true,
"name": "speak",
"speed": 5.0
} ]
[sub_resource type="CapsuleShape2D" id=2]
radius = 103.0
height = 238.0
[node name="ESCPlayerWithTooltip" type="Area2D"]
pause_mode = 1
script = ExtResource( 2 )
global_id = "eneko_smoking"
esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
is_movable = true
default_action = "action1"
combine_when_selected_action_is_in = [ ]
dialog_color = Color( 1, 1, 1, 1 )
animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 32.625, -50.56 )
scale = Vector2( 1.71167, 1.71167 )
frames = SubResource( 1 )
animation = "idle"
flip_h = true
[node name="dialog_position" type="Position2D" parent="."]
position = Vector2( -1, -223 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 26, -42 )
shape = SubResource( 2 )

0
gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc → gymkhana/characters/eneko/eneko_smoking.esc
View File

15
gymkhana/characters/eneko/eneko_smoking.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=2]
[gd_scene load_steps=20 format=2]
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2]
@@ -32,15 +32,11 @@ animations = [ {
"speed": 5.0
} ]
[sub_resource type="CapsuleShape2D" id=2]
radius = 103.0
height = 238.0
[node name="ESCPlayerWithTooltip" type="Area2D"]
pause_mode = 1
script = ExtResource( 2 )
global_id = "eneko_smoking"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc"
esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
is_movable = true
default_action = "action1"
combine_when_selected_action_is_in = [ ]
@@ -49,7 +45,7 @@ animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 32.625, -50.56 )
scale = Vector2( 1.71167, 1.71167 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 1 )
animation = "idle"
flip_h = true
@@ -57,6 +53,5 @@ flip_h = true
[node name="dialog_position" type="Position2D" parent="."]
position = Vector2( -1, -223 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 26, -42 )
shape = SubResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -5, 6, -4, 22, -7, 32, -10, 39, -6, 43, 7, 43, 12, 35, 14, 25, 12, 12, 10, -25, 31, -38, 32, 37, 48, 37, 49, 28, 46, 22, 50, -1, 51, -35, 57, -39, 57, -72, 58, -74, 70, -68, 76, -69, 79, -76, 78, -81, 72, -89, 67, -104, 56, -114, 47, -115, 45, -120, 46, -140, 38, -145, 34, -146, 28, -144, 24, -139, 22, -129, 24, -122, 23, -119, 17, -114, 5, -109, -7, -80, -7, -62, 4, -58, 5, -53, -7, -34 )

21
gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -7,6 +7,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" type="Texture" id=7]
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 36, 211, 193, 193, 175, 286, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 )
@@ -96,3 +97,21 @@ polygon = PoolVector2Array( 5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506
position = Vector2( 1131, 460 )
script = ExtResource( 5 )
global_id = "puerta_detras_start"
[node name="EnekoSmoking" parent="." instance=ExtResource( 8 )]
position = Vector2( 813, 440 )
tooltip_name = "Objervar sujeto"
dialog_color = Color( 0, 1, 0.462745, 1 )
action1_text = "Objervar sujeto"
action2_text = "Hablar"
action3_target_texts = {
"bombona2": "Toma, un regalo",
"caja_herramientas": "Regalar"
}
target_when_selected_action_is_in = [ "action3" ]
selectable = true
[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"]
position = Vector2( -44, 82 )
script = ExtResource( 5 )
global_id = "eneko_smoking"

1
gymkhana/rooms/turno_cocina/despensa/despensa.tscn
View File

@@ -178,6 +178,7 @@ dialog_color = Color( 1, 1, 1, 1 )
action1_text = "Mirar dentro"
action2_text = "Coger"
action3_target_texts = {
"turno_cocina_bol": "Coger lentejas a ojo",
"turno_cocina_peso_bol": "Coger las lentejas exactas"
}
target_when_selected_action_is_in = [ "action3" ]

5
gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc
View File

@@ -4,8 +4,11 @@
:action2
say player "Necesito cogerlas con algo."
:action3 turno_cocina_bol
say player "No quiero hacer lentejas para un ejercito, debería coger la cantidad justa."
:action3 turno_cocina_peso_bol
say player "Con esto suficiente"
say player "Con esto suficiente."
inventory_remove turno_cocina_peso_bol
inventory_add turno_cocina_bol_lentejas
inventory_add turno_cocina_peso