diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd b/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd index 986ef76a..7c23f198 100644 --- a/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd +++ b/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd @@ -37,3 +37,9 @@ func run(command_params: Array) -> int: item_count_manager.add(command_params[0], command_params[1]) return ESCExecution.RC_OK + + +# Function called when the command is interrupted. +func interrupt(): + # Do nothing + pass diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd index ed03bd59..5eaffef9 100644 --- a/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd +++ b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd @@ -3,26 +3,47 @@ extends Resource class_name ESCItemCountManager + +# If item is countable (E.g. money) marks which texture to use depending of count value. +# Each element is a Dictionary with start and texture keys: +# custom_data = { +# "count_textures": [ +# { "start": 0, "texture": "res://gymkhana/items/inventory/assets/no_money.png"}, +# { "start": 1, "texture": "res://gymkhana/items/inventory/assets/one_coin.png"}, +# { "start": 2, "texture": "res://gymkhana/items/inventory/assets/two_coins.png"}, +# { "start": 3, "texture": "res://gymkhana/items/inventory/assets/coins.png"}, +# { "start": 10, "texture": "res://gymkhana/items/inventory/assets/bills.png"}, +# ] +# } + + func add(global_id: String, value:= 1) -> void: var item = get_item(global_id) - set(global_id, item.count + value) + setCount(global_id, getCount(item) + value) func remove(global_id: String, value:= 1) -> void: var item = get_item(global_id) - set(global_id, item.count - value) + setCount(global_id, getCount(item) - value) -func set(global_id: String, value: int) -> void: +func getCount(item: ESCItem) -> int: + if "count" in item.custom_data: + return item.custom_data["count"] + else: + return 0 + + +func setCount(global_id: String, value: int) -> void: var item = get_item(global_id) - item.count = value + item.custom_data["count"] = value escoria.globals_manager.set_global("_COUNT_%s" % global_id, value) updateSprite(item) func removeFromInventoryIfCountLessThan(global_id: String, value:= 1) -> void: var item = get_item(global_id) - if item.count < value: + if item.custom_data["count"] < value: escoria.inventory_manager.remove_item(global_id) @@ -38,7 +59,7 @@ func get_item(global_id: String) -> ESCItem: return node -func updateSprite(item: ESCItemWithTooltip) -> void: +func updateSprite(item: ESCItem) -> void: var child_node = item.get_node("Sprite") as Sprite if not child_node is Sprite: escoria.logger.error( @@ -64,9 +85,9 @@ func updateSprite(item: ESCItemWithTooltip) -> void: escoria.inventory_manager.add_item(item.global_id) -func getCountTexturePath(item: ESCItemWithTooltip) -> String: - var count = item.count - var textures = item.count_textures # TODO sort dictionaries by start key +func getCountTexturePath(item: ESCItem) -> String: + var count = item.custom_data["count"] + var textures = item.custom_data["count_textures"] # TODO sort dictionaries by start key var i = 0 while (i < textures.size() - 1) and count >= textures[i + 1].start: diff --git a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd index 8bc37c08..f4c21305 100644 --- a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd +++ b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd @@ -25,38 +25,28 @@ export(Dictionary) var action4_target_texts = {} # If action used by player is in this list, this is a valid target (second item in combination) export(Array) var target_when_selected_action_is_in = [] -# If item is countable (E.g. money) marks the quantity -export(int) var count = 0 - # ESCItemComponents children of this node var components: Dictionary = {} -# If item is countable (E.g. money) marks which texture to use depending of count value. -# Each element is a Dictionary with start and texture keys: -# [ -# { "start": 0, "texture": "res://gymkhana/items/inventory/assets/no_money.png"}, -# { "start": 1, "texture": "res://gymkhana/items/inventory/assets/one_coin.png"}, -# { "start": 2, "texture": "res://gymkhana/items/inventory/assets/two_coins.png"}, -# { "start": 3, "texture": "res://gymkhana/items/inventory/assets/coins.png"}, -# { "start": 10, "texture": "res://gymkhana/items/inventory/assets/bills.png"}, -# ] -export(Array) var count_textures = [] - func _ready(): register_components() + func set_tooltip(action: String, text: String): tooltips[action] = text + func has_component(key: String)->bool: return components.has(key) - + + func get_component(key: String): if(has_component(key)): return components[key] return null - + + func register_components(): autoload_components() for child in get_children(): @@ -65,6 +55,13 @@ func register_components(): components[child.get_component_type()] = child child.register(custom_data) + func autoload_components(): add_child(ESCItemComponentOutline.new()) add_child(ESCItemComponentInventoryChecker.new()) + + +func set_custom_data(data: Dictionary) -> void: + .set_custom_data(data) + if custom_data.has("count"): + ESCItemCountManager.new().updateSprite(self) diff --git a/gymkhana/items/inventory/turno_cocina_patata.tscn b/gymkhana/items/inventory/turno_cocina_patata.tscn index 7d2dfe49..a6b4b31b 100644 --- a/gymkhana/items/inventory/turno_cocina_patata.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata.tscn @@ -27,12 +27,14 @@ action4_target_texts = { } target_when_selected_action_is_in = [ "action3", "action4" ] animations = null -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" }, -] +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" }, + ] +} [node name="Sprite" type="Sprite" parent="."] position = Vector2( -2, 0 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 4e11e871..e34d1f8b 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -260,19 +260,14 @@ tooltips = { "action1": "Admirar la patata", "action2": "Cogerla" } -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" -} ] +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" }, + ] +} animations = null [node name="Sprite" type="Sprite" parent="cocina_patata"] diff --git a/project.godot b/project.godot index 9b90b68c..9b93eee6 100644 --- a/project.godot +++ b/project.godot @@ -680,6 +680,11 @@ _global_script_classes=[ { "path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_interactive.gd" }, { "base": "ESCBaseCommand", +"class": "SetItemCustomDataCommand", +"language": "GDScript", +"path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_item_custom_data.gd" +}, { +"base": "ESCBaseCommand", "class": "SetSpeedCommand", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_speed.gd" @@ -841,7 +846,7 @@ _global_script_class_icons={ "ESCItemComponentInventoryChecker": "", "ESCItemComponentOutline": "", "ESCItemCountManager": "", -"ESCItemWithTooltip": "", +"ESCItemWithTooltip": "res://addons/escoria-core/design/esc_item.svg", "ESCLocation": "res://addons/escoria-core/design/esc_location.svg", "ESCMain": "", "ESCMigration": "", @@ -851,7 +856,7 @@ _global_script_class_icons={ "ESCObject": "", "ESCObjectManager": "", "ESCPlayer": "res://addons/escoria-core/design/esc_player.svg", -"ESCPlayerWithTooltip": "", +"ESCPlayerWithTooltip": "res://addons/escoria-core/design/esc_player.svg", "ESCProjectSettingsManager": "", "ESCResourceCache": "", "ESCResourceDescriptor": "", @@ -914,6 +919,7 @@ _global_script_class_icons={ "SetGlobalsCommand": "", "SetGuiVisibleCommand": "", "SetInteractiveCommand": "", +"SetItemCustomDataCommand": "", "SetSpeedCommand": "", "SetStateCommand": "", "SetTooltipCommand": "", diff --git a/saves/save_001.tres b/saves/save_001.tres index b9014e71..3ac9c0d5 100644 --- a/saves/save_001.tres +++ b/saves/save_001.tres @@ -6,33 +6,38 @@ script = ExtResource( 1 ) escoria_version = "1.0.0" game_version = "0.1.0" -name = "1 patata" +name = "2 patatas" date = { -"day": 8, +"day": 21, "dst": false, -"hour": 0, -"minute": 42, +"hour": 22, +"minute": 46, "month": 2, -"second": 59, -"weekday": 4, +"second": 47, +"weekday": 3, "year": 2024 } main = { -"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn", +"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn", "last_scene_global_id": "" } globals = { -"ESC_CURRENT_SCENE": "cocina_delante", -"ESC_LAST_SCENE": "cocina", +"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": 2, +"cocina_debajo_sofa_picked": true, "cocina_delante_intro_played": true, "cocina_intro_played": true, "cocina_patata_picked": true, -"count/turno_cocina_patata": 1, "i/turno_cocina_frontal": true, +"i/turno_cocina_libro_de_cocina": true, "i/turno_cocina_patata": true, +"intro_dialog2_playing": false, "new_game": true, "turno_cocina_eneko_catando": false, +"turno_cocina_frontal_debajo_sofa": true, "turno_cocina_ingrediente_ajo": false, "turno_cocina_ingrediente_lentejas": false, "turno_cocina_ingrediente_patatas": false, @@ -48,8 +53,8 @@ objects = { "_music": { "active": true, "interactive": true, -"playback_position": 28.2413, -"state": "res://gymkhana/sounds/intro_menu_loop.ogg" +"playback_position": 2.16082, +"state": "res://gymkhana/sounds/music_loop.ogg" }, "_sound": { "active": true, @@ -62,53 +67,79 @@ objects = { "interactive": true, "state": "default" }, -"cocina_delante_pegatinas": { +"cocina_cuchillos": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, -"cocina_delante_puerta_cocina": { -"active": true, +"cocina_debajo_sofa": { +"active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, -"cocina_delante_puerta_despensa": { +"cocina_fregadero_der": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, -"cocina_delante_puerta_detras": { +"cocina_fregadero_izq": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, -"eneko_smoking": { -"active": true, -"global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ), -"interactive": true, -"last_deg": 271, -"last_dir": 0, -"state": "speak" +"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" +} ] }, -"new_game_start_location": { +"interactive": true, +"state": "default" +}, +"cocina_puerta_delante": { "active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_detras": { +"active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "player": { "active": true, -"global_transform": Transform2D( 0.976078, 0, 0, 0.976078, 698, 547 ), +"custom_data": { +}, +"global_transform": Transform2D( 1.19725, 0, 0, 1.19725, 399, 560 ), "interactive": false, "last_deg": 71, "last_dir": 4, "state": "speak_down" }, -"puerta_cocina_start": { -"active": true, -"interactive": true, -"state": "default" -}, -"puerta_despensa_start": { +"puerta_delante_start": { "active": true, "interactive": true, "state": "default" @@ -118,18 +149,73 @@ objects = { "interactive": true, "state": "default" }, -"turno_cocina_ajo": { +"turno_cocina_bol": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_cocina_gas": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "apagado" +}, +"turno_cocina_cuerno": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_economica": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { "active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, -"turno_cocina_frontal": { -"active": true, +"turno_cocina_olla_llena": { +"active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, -"turno_cocina_madera": { +"turno_cocina_patata": { "active": true, +"custom_data": { +"count": 2, +"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" +} ] +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_peso": { +"active": true, +"custom_data": { +}, "interactive": true, "state": "default" } @@ -141,7 +227,7 @@ events = { "sched_events": [ ] } terrain_navpolys = { -"cocina_delante": { +"cocina": { "NavigationPolygonInstance": true } } diff --git a/saves/save_002.tres b/saves/save_002.tres index 1f447f42..78426c2e 100644 --- a/saves/save_002.tres +++ b/saves/save_002.tres @@ -6,15 +6,15 @@ script = ExtResource( 1 ) escoria_version = "1.0.0" game_version = "0.1.0" -name = "2" +name = "Post-intro" date = { -"day": 8, +"day": 21, "dst": false, -"hour": 0, -"minute": 30, +"hour": 22, +"minute": 34, "month": 2, -"second": 27, -"weekday": 4, +"second": 36, +"weekday": 3, "year": 2024 } main = { @@ -23,11 +23,14 @@ main = { } globals = { "ESC_CURRENT_SCENE": "cocina_delante", -"ESC_LAST_SCENE": "cocina_delante", +"ESC_DIALOG_CHOSEN_OPTION": "¿Que te parece que haga la comida?", +"ESC_LAST_SCENE": "cocina", "FORCE_LAST_SCENE_NULL": false, "cocina_delante_intro_played": true, "cocina_intro_played": true, "i/turno_cocina_frontal": true, +"i/turno_cocina_libro_de_cocina": true, +"intro_dialog2_playing": false, "new_game": true, "turno_cocina_eneko_catando": false, "turno_cocina_ingrediente_ajo": false, @@ -45,13 +48,13 @@ objects = { "_music": { "active": true, "interactive": true, -"playback_position": 15.1452, -"state": "res://gymkhana/sounds/intro_menu_loop.ogg" +"playback_position": 6.26776, +"state": "res://gymkhana/sounds/music_loop.ogg" }, "_sound": { "active": true, "interactive": true, -"playback_position": 0.0, +"playback_position": 4.62113, "state": "default" }, "_speech": { @@ -61,26 +64,36 @@ objects = { }, "cocina_delante_pegatinas": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "cocina_delante_puerta_cocina": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "cocina_delante_puerta_despensa": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "cocina_delante_puerta_detras": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "eneko_smoking": { "active": true, +"custom_data": { +}, "global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ), "interactive": true, "last_deg": 271, @@ -94,10 +107,12 @@ objects = { }, "player": { "active": true, -"global_transform": Transform2D( 0.872353, 0, 0, 0.872353, 634, 486 ), +"custom_data": { +}, +"global_transform": Transform2D( 0.971569, 0, 0, 0.971569, 758.729, 541.12 ), "interactive": false, -"last_deg": 161, -"last_dir": 6, +"last_deg": 71, +"last_dir": 4, "state": "speak_down" }, "puerta_cocina_start": { @@ -117,23 +132,45 @@ objects = { }, "turno_cocina_ajo": { "active": false, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_carton": { +"active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "turno_cocina_frontal": { "active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, "turno_cocina_madera": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" } } events = { "events_queue": { -"_front": [ ] +"_front": [ ], +"intro_dialog2_channel": [ ], +"intro_dialog_channel": [ ] }, "sched_events": [ ] } diff --git a/saves/save_003.tres b/saves/save_003.tres index acdfc6bf..df2b0c81 100644 --- a/saves/save_003.tres +++ b/saves/save_003.tres @@ -6,50 +6,42 @@ script = ExtResource( 1 ) escoria_version = "1.0.0" game_version = "0.1.0" -name = "cuchillo y mechero" +name = "1 patata" date = { -"day": 13, +"day": 21, "dst": false, "hour": 23, -"minute": 3, +"minute": 26, "month": 2, -"second": 4, -"weekday": 2, +"second": 45, +"weekday": 3, "year": 2024 } main = { -"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn", +"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn", "last_scene_global_id": "" } globals = { -"ESC_CURRENT_SCENE": "cocina_detras", +"ESC_CURRENT_SCENE": "cocina", "ESC_DIALOG_CHOSEN_OPTION": "¿Que te parece que haga la comida?", -"ESC_LAST_SCENE": "cocina", +"ESC_LAST_SCENE": "cocina_delante", "FORCE_LAST_SCENE_NULL": false, -"cocina_delante_intro_dialog_option1_done": true, -"cocina_delante_intro_dialog_option2_1_done": true, -"cocina_delante_intro_dialog_option2_2_done": true, -"cocina_delante_intro_dialog_option2_3_done": true, -"cocina_delante_intro_dialog_option2_done": true, -"cocina_delante_intro_dialog_option3_done": true, -"cocina_delante_intro_dialog_option4_done": true, -"cocina_delante_intro_dialog_option5_done": true, -"cocina_delante_intro_dialog_option6_done": true, +"_COUNT_turno_cocina_patata": 1, +"cocina_debajo_sofa_picked": true, "cocina_delante_intro_played": true, "cocina_intro_played": true, -"i/turno_cocina_cuchillo": true, "i/turno_cocina_frontal": true, "i/turno_cocina_libro_de_cocina": true, -"i/turno_cocina_mechero": true, +"i/turno_cocina_patata": true, "intro_dialog2_playing": false, "new_game": true, -"turno_cocina_cuchillo_en_inventario": true, "turno_cocina_eneko_catando": false, +"turno_cocina_frontal_debajo_sofa": true, "turno_cocina_ingrediente_ajo": false, "turno_cocina_ingrediente_lentejas": false, "turno_cocina_ingrediente_patatas": false, "turno_cocina_ingrediente_romero": false, -"turno_cocina_libro_leido_count": 1 +"turno_cocina_libro_leido_count": 0 } objects = { "_camera": { @@ -60,13 +52,13 @@ objects = { "_music": { "active": true, "interactive": true, -"playback_position": 19.6248, +"playback_position": 15.3953, "state": "res://gymkhana/sounds/music_loop.ogg" }, "_sound": { "active": true, "interactive": true, -"playback_position": 5.60528, +"playback_position": 4.62113, "state": "default" }, "_speech": { @@ -74,65 +66,167 @@ objects = { "interactive": true, "state": "default" }, -"cocina_detras_puerta_cocina": { +"cocina_cuchillos": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, -"cocina_detras_puerta_delante": { +"cocina_debajo_sofa": { +"active": false, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_der": { "active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_izq": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_patata": { +"active": true, +"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" +} ] +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_delante": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_detras": { +"active": true, +"custom_data": { +}, "interactive": true, "state": "default" }, "player": { "active": true, -"global_transform": Transform2D( 0.821569, 0, 0, 0.821569, 622.001, 515 ), -"interactive": false, -"last_deg": 341, -"last_dir": 2, -"state": "speak_down" +"custom_data": { }, -"puerta_cocina_start": { -"active": true, -"interactive": true, -"state": "default" +"global_transform": Transform2D( 0.852157, 0, 0, 0.852157, 2452.29, 444 ), +"interactive": false, +"last_deg": 21, +"last_dir": 3, +"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": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_cocina_gas": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "apagado" +}, +"turno_cocina_cuerno": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_economica": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, "turno_cocina_libro_de_cocina": { "active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, -"turno_cocina_mechero": { +"turno_cocina_olla_llena": { "active": false, +"custom_data": { +}, "interactive": true, "state": "default" }, -"turno_cocina_olla_vacia": { +"turno_cocina_patata": { "active": true, +"custom_data": { +"count": 1, +"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" +} ] +}, "interactive": true, "state": "default" }, -"turno_cocina_romero": { +"turno_cocina_peso": { "active": true, +"custom_data": { +}, "interactive": true, "state": "default" } } events = { "events_queue": { -"_front": [ ], -"intro_dialog2_channel": [ ], -"intro_dialog_channel": [ ] +"_front": [ ] }, "sched_events": [ ] } terrain_navpolys = { -"cocina_detras": { +"cocina": { "NavigationPolygonInstance": true } } diff --git a/saves/save_004.tres b/saves/save_004.tres new file mode 100644 index 00000000..af6717bc --- /dev/null +++ b/saves/save_004.tres @@ -0,0 +1,268 @@ +[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 = "4 patatas" +date = { +"day": 3, +"dst": false, +"hour": 18, +"minute": 49, +"month": 3, +"second": 14, +"weekday": 0, +"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, +"i/turno_cocina_cuchillo": true, +"i/turno_cocina_frontal": true, +"i/turno_cocina_libro_de_cocina": true, +"i/turno_cocina_patata": true, +"i/turno_cocina_patata_grande": false, +"intro_dialog2_playing": false, +"new_game": true, +"turno_cocina_cuchillo_en_inventario": true, +"turno_cocina_eneko_catando": false, +"turno_cocina_frontal_debajo_sofa": true, +"turno_cocina_ingrediente_ajo": 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 +} +objects = { +"_camera": { +"active": true, +"interactive": true, +"state": "default" +}, +"_music": { +"active": true, +"interactive": true, +"playback_position": 15.1391, +"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": { +}, +"interactive": true, +"state": "default" +}, +"cocina_debajo_sofa": { +"active": false, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_der": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_izq": { +"active": true, +"custom_data": { +}, +"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" +} ] +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_delante": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_detras": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"player": { +"active": true, +"custom_data": { +}, +"global_transform": Transform2D( 0.632157, 0, 0, 0.632157, 1987, 370 ), +"interactive": false, +"last_deg": 251, +"last_dir": 0, +"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": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_cocina_gas": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "apagado" +}, +"turno_cocina_cuchillo": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_cuerno": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_economica": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_frontal": { +"active": true, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"custom_data": { +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_olla_llena": { +"active": false, +"custom_data": { +}, +"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" +} ] +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_peso": { +"active": true, +"custom_data": { +}, +"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": "simplemouse" +}