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

fix: delete unused turno_cocina_bol_inventario item

Browse Source
This commit is contained in:
Eneko Nieto
2024-04-09 22:16:19 +02:00
parent b6801b811f
commit 33e04e13e5
5 changed files with 394 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gymkhana/items/inventory/turno_cocina_bol_inventario.esc
View File

@@ -1,6 +0,0 @@
:action1
say player "Que cosa tan curiosa"
:action2
say player "No lo quiero coger"

38
gymkhana/items/inventory/turno_cocina_bol_inventario.tscn
View File

@@ -1,38 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" type="Texture" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_bol_inventario" type="Area2D"]
pause_mode = 1
script = ExtResource( 1 )
global_id = "turno_cocina_bol_inventario"
esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_inventario.esc"
inventory_texture = ExtResource( 2 )
dialog_color = Color( 1, 1, 1, 1 )
custom_data = {
"tooltips": {
"action1": "¿Que es esto?",
"action2": "Coger",
"action3": "Mirar dentro",
"action4": "Usar"
}
}
animations = null
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."]
position = Vector2( -51, 69 )
script = ExtResource( 3 )

2
gymkhana/items/inventory/turno_cocina_olla_llena.esc
View File

@@ -20,7 +20,7 @@
:action3 turno_cocina_bol_lentejas
say player "Lentejas pa'entro"
inventory_remove turno_cocina_bol_lentejas
inventory_add turno_cocina_bol_inventario
inventory_add turno_cocina_bol
set_global turno_cocina_ingrediente_lentejas true

3
gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
View File

@@ -19,7 +19,7 @@ inventory_remove turno_cocina_madera
say current_player "Más madera que es la guerra!"
:action3 turno_cocina_carton
say current_player "Prefiero meter el cartón cuando esté encendido."
say current_player "Debería encender el cartón antes de meterlo."
:action3 turno_cocina_carton_encendido
> [!turno_cocina_economica_con_madera]
@@ -29,4 +29,3 @@ say current_player "Prefiero meter el cartón cuando esté encendido."
set_global turno_cocina_economica_encendida true
inventory_remove turno_cocina_carton_encendido
say current_player "He encendido la cocina, a cocinar!"

392
saves/save_007.tres Normal file
View File

@@ -0,0 +1,392 @@
[gd_resource type="Resource" load_steps=2 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )
escoria_version = "1.0.0"
game_version = "0.1.0"
name = "Lentejas en inventario"
date = {
"day": 26,
"dst": false,
"hour": 22,
"minute": 50,
"month": 3,
"second": 44,
"weekday": 2,
"year": 2024
}
main = {
"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn",
"last_scene_global_id": ""
}
globals = {
"ESC_CURRENT_SCENE": "cocina",
"ESC_DIALOG_CHOSEN_OPTION": "¿Que te parece que haga la comida?",
"ESC_LAST_SCENE": "cocina_delante",
"FORCE_LAST_SCENE_NULL": false,
"_COUNT_turno_cocina_patata": 4,
"cocina_debajo_sofa_picked": true,
"cocina_delante_intro_played": true,
"cocina_intro_played": true,
"cocina_patata_picked": true,
"intro_dialog2_playing": false,
"new_game": true,
"turno_cocina_cuchillo_en_inventario": true,
"turno_cocina_economica_con_madera": true,
"turno_cocina_economica_con_olla": true,
"turno_cocina_eneko_catando": false,
"turno_cocina_frontal_debajo_sofa": true,
"turno_cocina_ingrediente_ajo_en_lentejas": false,
"turno_cocina_ingrediente_lentejas": false,
"turno_cocina_ingrediente_patatas": false,
"turno_cocina_ingrediente_romero": false,
"turno_cocina_libro_leido_count": 0,
"turno_cocina_patata_grande_picked": true
}
inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_patata", "turno_cocina_cuchillo", "turno_cocina_carton", "turno_cocina_peso", "turno_cocina_bol_lentejas" ]
objects = {
"_camera": {
"active": true,
"interactive": true,
"state": "default",
"target": "player"
},
"_music": {
"active": true,
"interactive": true,
"playback_position": 6.4924,
"state": "res://gymkhana/sounds/music_loop.ogg"
},
"_sound": {
"active": true,
"interactive": true,
"playback_position": 4.62113,
"state": "default"
},
"_speech": {
"active": true,
"interactive": true,
"state": "default"
},
"cocina_cuchillos": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Contar los cuchillos",
"action2": "Coger un buen cuchillo"
}
},
"interactive": true,
"state": "default"
},
"cocina_debajo_sofa": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar debajo del sofa",
"action2": "Meter la mano"
}
},
"interactive": true,
"state": "default"
},
"cocina_fregadero_der": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar fregadero",
"action2": "Usar"
}
},
"interactive": true,
"state": "default"
},
"cocina_fregadero_izq": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar el fregadero",
"action2": "Usar"
}
},
"interactive": true,
"state": "default"
},
"cocina_patata": {
"active": false,
"custom_data": {
"count_textures": [ {
"start": 1,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png"
}, {
"start": 2,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png"
}, {
"start": 3,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png"
}, {
"start": 4,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
} ],
"tooltips": {
"action1": "Admirar la patata",
"action2": "Cogerla"
}
},
"interactive": true,
"state": "default"
},
"cocina_puerta_delante": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Salir de la cocina"
}
},
"interactive": true,
"state": "default"
},
"cocina_puerta_detras": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Ir detrás"
}
},
"interactive": true,
"state": "default"
},
"player": {
"active": true,
"custom_data": {
},
"global_transform": Transform2D( 1.19725, 0, 0, 1.19725, 1747.81, 565.068 ),
"interactive": false,
"last_deg": 111,
"last_dir": 5,
"state": "speak_down"
},
"puerta_delante_start": {
"active": true,
"interactive": true,
"state": "default"
},
"puerta_detras_start": {
"active": true,
"interactive": true,
"state": "default"
},
"turno_cocina_bol": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Coger un bol",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_carton": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_cocina_gas": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Encender"
}
},
"interactive": true,
"state": "apagado"
},
"turno_cocina_cuchillo": {
"active": true,
"custom_data": {
"tooltips": {
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_cuerno": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar el cuerno",
"action2": "Coger el cuerno",
"action3": "Mirar el cuerno",
"action4": "Tocar el cuerno"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_economica": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_frontal": {
"active": true,
"custom_data": {
"tooltips": {
"action3": "frontal_action3",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_libro_de_cocina": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Coger",
"action3": "Leer"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_madera": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "cocina_delante_madera_action1",
"action2": "cocina_delante_madera_action2",
"action3": "cocina_delante_madera_action3",
"action4": "cocina_delante_madera_action4"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_mechero": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_olla_llena": {
"active": true,
"custom_data": {
"tooltips": {
"action1": "Mirar dentro",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_olla_vacia": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "Mirar",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_patata": {
"active": true,
"custom_data": {
"count": 4,
"count_textures": [ {
"start": 1,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png"
}, {
"start": 2,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png"
}, {
"start": 3,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png"
}, {
"start": 4,
"texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png"
} ],
"tooltips": {
"action3": "Contar las patatas",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
},
"turno_cocina_peso": {
"active": false,
"custom_data": {
"tooltips": {
"action1": "¿Que es esto?",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
}
},
"interactive": true,
"state": "default"
}
}
events = {
"events_queue": {
"_front": [ ]
},
"sched_events": [ ]
}
terrain_navpolys = {
"cocina": {
"NavigationPolygonInstance": true
}
}
settings = {
"custom_settings": {
"a_custom_setting": 100
},
"escoria_version": "1.0.0",
"fullscreen": false,
"master_volume": 0.391,
"music_volume": 0.649,
"sfx_volume": 1.0,
"speech_enabled": true,
"speech_volume": 1.0,
"text_lang": "es",
"voice_lang": "fr_FR"
}
custom_data = {
"ui_type": "rtmi-ui"
}