From the shadows

This commit is contained in:
2025-09-10 03:26:36 +02:00
parent 4bd417870a
commit 51c9e0dd8e
13 changed files with 75 additions and 40 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://cabos3cse6b71"]
[gd_scene load_steps=22 format=3 uid="uid://cabos3cse6b71"]
[ext_resource type="PackedScene" uid="uid://bl50queikqfjc" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" id="1"]
[ext_resource type="Script" uid="uid://dfl7khtlretr7" path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" id="2"]
@@ -19,6 +19,15 @@
[ext_resource type="Texture2D" uid="uid://d2sehci16hioi" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"]
[ext_resource type="Texture2D" uid="uid://e2xk0aimdte" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"]
[ext_resource type="PackedScene" uid="uid://c0066wpl3qky4" path="res://addons/escoria-ui-return-monkey-island/menus/language_selector/language_selector.tscn" id="19_we0hb"]
[ext_resource type="Shader" uid="uid://iehp1eakxyak" path="res://addons/escoria-ui-return-monkey-island/shaders/vignette.gdshader" id="20_parhr"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_qk4ex"]
shader = ExtResource("20_parhr")
shader_parameter/inner_radius = 0.3
shader_parameter/outer_radius = 1.2
shader_parameter/vignette_strength = 0.9
shader_parameter/dither_strength = 0.03
shader_parameter/vignette_color = Color(0, 0, 0, 1)
[node name="game" type="Node2D" node_paths=PackedStringArray("inventory_ui", "rtmi_tooltip_node")]
script = ExtResource("5")
@@ -29,6 +38,14 @@ pause_menu = NodePath("menu_layer/pause_menu")
mouse_tooltip_margin = 70.0
editor_debug_mode = 1
[node name="Vignette" type="CanvasLayer" parent="."]
process_mode = 4
[node name="ColorRect" type="ColorRect" parent="Vignette"]
material = SubResource("ShaderMaterial_qk4ex")
custom_minimum_size = Vector2(1280, 720)
color = Color(0, 0, 0, 1)
[node name="camera" parent="." instance=ExtResource("3")]
[node name="game_layer" type="CanvasLayer" parent="."]

View File

@@ -21,12 +21,11 @@ func _enter_tree():
#var twee
pivot_offset = size / 2
scale = Vector2(0.5,0.5)
modulate = Color(1, 1, 1, 0.5)
var tween: Tween = create_tween().set_loops(1)
#tween.tween_property(self,"scale",Vector2(0.9,0.9),0.1).set_trans(Tween.TRANS_SINE)
tween.tween_property(self,"scale",Vector2.ONE,0.2).set_trans(Tween.TRANS_SPRING).from(Vector2(0.9,0.9))
tween.parallel().tween_property(self, "modulate:a",1.0,0.3).set_trans(Tween.TRANS_SINE)
tween.parallel().tween_property(self, "modulate:a",1.0,0.3).from(0.0).set_trans(Tween.TRANS_SINE)
pass

View File

@@ -0,0 +1,17 @@
shader_type canvas_item;
uniform float inner_radius = 0.1;
uniform float outer_radius = 1.0;
uniform float vignette_strength = 1.0;
uniform float dither_strength = 0.03;
uniform vec4 vignette_color: source_color;
void fragment() {
float dist = distance(UV, vec2(0.5));
float vignette = smoothstep(inner_radius, outer_radius, dist) * vignette_strength;
float dither = fract(sin(dot(UV, vec2(12.9898, 78.233))) * 43758.5453123) * dither_strength;
COLOR = vec4(vignette_color.rgb, vignette + dither);
}

View File

@@ -0,0 +1 @@
uid://iehp1eakxyak

View File

@@ -1,7 +1,8 @@
[gd_resource type="Theme" load_steps=2 format=3 uid="uid://23n73qci0qc3"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3hnbv"]
bg_color = Color(0.173269, 0.0886366, 0, 1)
bg_color = Color(0, 0, 0, 1)
shadow_size = 16
[resource]
MarginContainer/constants/margin_bottom = 8

View File

@@ -11,6 +11,8 @@
say($player, "Por ahora, con leer el libro de recetas bastará.", "cocina_libro_de_cocina_action2_say_4")
:action3
global cocina_intro_played
if !cocina_intro_played:
accept_input("SKIP")
set_active($turno_cocina_economica, true)

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

View File

@@ -1,17 +1,21 @@
[gd_scene load_steps=14 format=3 uid="uid://dwvu5kn7qr35s"]
[gd_scene load_steps=18 format=3 uid="uid://dwvu5kn7qr35s"]
[ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
[ext_resource type="Texture2D" uid="uid://b40fujejphqna" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" id="3"]
[ext_resource type="Texture2D" uid="uid://sdv18jxcknuw" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" id="3"]
[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"]
[ext_resource type="Texture2D" uid="uid://cf03psgagyflc" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" id="7"]
[ext_resource type="Texture2D" uid="uid://dhj8k3ro2vayg" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/light.png" id="6_ugqpr"]
[ext_resource type="Texture2D" uid="uid://js3u7hbljn2x" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" id="7"]
[ext_resource type="PackedScene" uid="uid://wx76bqug4qy8" path="res://gymkhana/characters/eneko/eneko_smoking.tscn" id="8"]
[ext_resource type="Texture2D" uid="uid://foc4og4iun0y" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" id="9"]
[ext_resource type="Texture2D" uid="uid://du7o4ic4601dk" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" id="9"]
[ext_resource type="PackedScene" uid="uid://cbsyjat8xvwfx" path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" id="10"]
[ext_resource type="PackedScene" uid="uid://84h4l81cuwdv" path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" id="11"]
[ext_resource type="PackedScene" uid="uid://dyejne0ibag68" path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" id="12"]
[ext_resource type="Texture2D" uid="uid://b580c3swhl2q3" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="12_us6ip"]
[ext_resource type="Texture2D" uid="uid://c47biotravims" path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" id="14_ref2y"]
[ext_resource type="Texture2D" uid="uid://cw3t327fk3bcg" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="16_dqfmc"]
[sub_resource type="NavigationPolygon" id="1"]
vertices = PackedVector2Array(-768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166)
@@ -34,6 +38,7 @@ script = ExtResource("4")
scales = ExtResource("7")
scale_min = 0.25
scale_max = 1.4
lightmap = ExtResource("6_ugqpr")
[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
position = Vector2(1159, 289)
@@ -44,14 +49,13 @@ process_mode = 1
script = ExtResource("6")
global_id = "cocina_delante_puerta_cocina"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc"
is_exit = true
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
custom_data = {
"tooltips": {
"action1": "tooltip_cocina_delante_puerta_cocina_action1"
}
}
animations = null
[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
position = Vector2(630, -130)
@@ -68,14 +72,13 @@ process_mode = 1
script = ExtResource("6")
global_id = "cocina_delante_puerta_despensa"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc"
is_exit = true
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
custom_data = {
"tooltips": {
"action1": "tooltip_cocina_delante_puerta_despensa_action1"
}
}
animations = null
[node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"]
position = Vector2(51, 113)
@@ -92,14 +95,13 @@ process_mode = 1
script = ExtResource("6")
global_id = "cocina_delante_puerta_detras"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc"
is_exit = true
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
custom_data = {
"tooltips": {
"action1": "tooltip_cocina_delante_puerta_detras_action1"
}
}
animations = null
[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"]
position = Vector2(1067, -26)
@@ -113,7 +115,6 @@ global_id = "puerta_detras_start"
[node name="EnekoSmoking" parent="." instance=ExtResource("8")]
position = Vector2(813, 440)
combine_when_selected_action_is_in = PackedStringArray()
[node name="ESCLocation" type="Marker2D" parent="EnekoSmoking"]
position = Vector2(-44, 82)
@@ -144,7 +145,6 @@ custom_data = {
"action2": "tooltip_cocina_delante_pegatinas_action2"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="pegatinas"]
position = Vector2(-33, -25)
@@ -158,6 +158,7 @@ script = ExtResource("5")
position = Vector2(1505, 160)
scale = Vector2(0.880435, 0.88735)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("12_us6ip")
[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"]
position = Vector2(396.395, 87.9022)
@@ -170,6 +171,7 @@ script = ExtResource("5")
[node name="turno_cocina_ajo" parent="." instance=ExtResource("11")]
position = Vector2(858, 399)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("14_ref2y")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo"]
position = Vector2(-21, 91)
@@ -178,6 +180,7 @@ script = ExtResource("5")
[node name="turno_cocina_carton" parent="." instance=ExtResource("12")]
position = Vector2(1221, 423)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("16_dqfmc")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton"]
position = Vector2(-52, 34)

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -1,16 +1,20 @@
[gd_scene load_steps=13 format=3 uid="uid://b1seq58sj62b4"]
[gd_scene load_steps=17 format=3 uid="uid://b1seq58sj62b4"]
[ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
[ext_resource type="Texture2D" uid="uid://kijietn8e0b3" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" id="3"]
[ext_resource type="Texture2D" uid="uid://bvwi32gj8oivm" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" id="3"]
[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"]
[ext_resource type="Texture2D" uid="uid://crsf8mk6i56sr" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" id="7"]
[ext_resource type="Texture2D" uid="uid://bkyw83035dd4f" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" id="8"]
[ext_resource type="Texture2D" uid="uid://cb0wp1hxr3ljr" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/light.jpg" id="6_ipxey"]
[ext_resource type="Texture2D" uid="uid://loskq8fjc0f6" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" id="7"]
[ext_resource type="Texture2D" uid="uid://diekyfeyu702i" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" id="8"]
[ext_resource type="PackedScene" uid="uid://dgucic2086suo" path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" id="9"]
[ext_resource type="PackedScene" uid="uid://bxjtxquhseqdp" path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" id="10"]
[ext_resource type="Texture2D" uid="uid://brjb1fkbo0so" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" id="10_g23j7"]
[ext_resource type="PackedScene" uid="uid://bu2xpoyifwi5o" path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" id="11"]
[ext_resource type="Texture2D" uid="uid://7jfdrbqf2a0h" path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" id="12_ipxey"]
[ext_resource type="Texture2D" uid="uid://bcfcq1yurr0sf" path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" id="14_hlfsp"]
[sub_resource type="NavigationPolygon" id="1"]
vertices = PackedVector2Array(-1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198)
@@ -19,9 +23,6 @@ outlines = Array[PackedVector2Array]([PackedVector2Array(-1146, 112, -1013, 114,
[node name="ESCRoom" type="Node2D"]
script = ExtResource("1")
__meta__ = {
"_edit_lock_": true
}
global_id = "cocina_detras"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc"
player_scene = ExtResource("2")
@@ -30,40 +31,31 @@ camera_limits = [Rect2(0, 0, 1500, 577)]
[node name="background" type="Sprite2D" parent="."]
position = Vector2(750, 289)
texture = ExtResource("3")
__meta__ = {
"_edit_lock_": true
}
[node name="ESCTerrain" type="Navigation2D" parent="."]
[node name="ESCTerrain" type="Node2D" parent="."]
script = ExtResource("4")
__meta__ = {
"_edit_lock_": true
}
scales = ExtResource("7")
scale_min = 0.5
lightmap = ExtResource("6_ipxey")
player_speed_multiplier = 1.3
player_doubleclick_speed_multiplier = 2.0
[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
position = Vector2(1252, 260)
navigation_polygon = SubResource("1")
__meta__ = {
"_edit_lock_": true
}
[node name="puerta_cocina" type="Area2D" parent="."]
process_mode = 1
script = ExtResource("6")
global_id = "cocina_detras_puerta_cocina"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc"
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
combine_when_selected_action_is_in = []
custom_data = {
"tooltips": {
"action1": "tooltip_cocina_detras_cocina_detras_puerta_cocina"
}
}
animations = null
[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
position = Vector2(630, -130)
@@ -80,14 +72,13 @@ process_mode = 1
script = ExtResource("6")
global_id = "cocina_detras_puerta_delante"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc"
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
combine_when_selected_action_is_in = []
custom_data = {
"tooltips": {
"action1": "tooltip_cocina_detras_cocina_detras_puerta_delante"
}
}
animations = null
[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
position = Vector2(298, -203)
@@ -100,13 +91,14 @@ script = ExtResource("5")
global_id = "puerta_delante_start"
[node name="Columna" type="Sprite2D" parent="."]
position = Vector2(235, 294)
z_index = 400
position = Vector2(235, 294)
texture = ExtResource("8")
[node name="turno_cocina_olla_vacia" parent="." instance=ExtResource("9")]
position = Vector2(883, 451)
scale = Vector2(0.5, 0.5)
inventory_texture_hovered = ExtResource("10_g23j7")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_vacia"]
position = Vector2(1, 96)
@@ -116,6 +108,8 @@ script = ExtResource("5")
position = Vector2(108, 438)
rotation = 1.44513
scale = Vector2(0.4, 0.4)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("12_ipxey")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_mechero"]
position = Vector2(296.645, -154.035)
@@ -123,6 +117,8 @@ script = ExtResource("5")
[node name="turno_cocina_romero" parent="." instance=ExtResource("11")]
position = Vector2(61, 341)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("14_hlfsp")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_romero"]
position = Vector2(89, 60)
@@ -137,13 +133,12 @@ process_mode = 1
script = ExtResource("6")
global_id = "cocina_detras_mikel"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_common_look"
}
}
animations = null
[node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"]
position = Vector2(751, -159)