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-25 20:07:40 +02:00
parent f750eeced6 100fa7e4ef
commit 7169516f37
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,16 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 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]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" type="Texture" id=3]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4]
[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]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -236, 229, 193, 193, 175, 286, -981, 285, -527, 170, -374, 165 )
polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 0, 2, 3 ), PoolIntArray( 0, 3, 4, 5 ) ]
outlines = [ PoolVector2Array( -981, 285, -527, 170, -374, 165, -236, 229, 193, 193, 175, 286 ) ]
vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, -236, 229, 193, 193, 175, 286, -360, 166 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 0 ), PoolIntArray( 4, 0, 3, 7 ) ]
outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, 193, 193, 175, 286, -768, 301, -1163, 462 ) ]
[node name="ESCRoom" type="Node2D"]
script = ExtResource( 1 )
@@ -31,7 +32,23 @@ scale_max = 0.75
position = Vector2( 1160, 289 )
navpoly = SubResource( 1 )
[node name="start" type="Position2D" parent="."]
[node name="puerta_cocina" type="Area2D" parent="."]
pause_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 = [ ]
dialog_color = Color( 1, 1, 1, 1 )
action1_text = "Entrar"
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_cocina"]
position = Vector2( 630, -130 )
scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( -1.03802, 589.367, -1.03809, 311.899, 166.085, 311.899, 166.085, 589.367 )
[node name="start" type="Position2D" parent="puerta_cocina"]
position = Vector2( 716, 473 )
script = ExtResource( 5 )
global_id = "start"

2
gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc Normal file
View File

@@ -0,0 +1,2 @@
:action1
change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn"