diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf index 43ce9673..d06e17a4 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf differ diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png b/gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png new file mode 100644 index 00000000..603094c2 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 83388f3c..68a15ffe 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 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] @@ -8,11 +8,12 @@ [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] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9] [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 ) +vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 36, 211, 270, 182, 278, 280, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6 ), PoolIntArray( 7, 4, 6, 0, 8 ), PoolIntArray( 7, 9, 10, 4 ), PoolIntArray( 8, 0, 3, 11 ) ] -outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 193, 193, 175, 286, -768, 301, -1163, 462 ) ] +outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 270, 182, 278, 280, -768, 301, -1163, 462 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -115,3 +116,14 @@ selectable = true position = Vector2( -44, 82 ) script = ExtResource( 5 ) global_id = "eneko_smoking" + +[node name="Foreground" type="Sprite" parent="."] +position = Vector2( 1817, 451 ) +z_index = 4096 +texture = ExtResource( 9 ) + +[node name="new_game_start_location" type="Position2D" parent="."] +position = Vector2( 1425, 527 ) +script = ExtResource( 5 ) +global_id = "new_game_start_location" +is_start_location = true diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc index 2fdbd9b8..060f9770 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -1,7 +1,6 @@ :setup inventory_add turno_cocina_frontal anim eneko_smoking idle - > [eq ESC_LAST_SCENE despensa] teleport player puerta_despensa_start set_angle player 180 @@ -10,5 +9,22 @@ teleport player puerta_detras_start set_angle player 180 stop - teleport player puerta_cocina_start + > [eq ESC_LAST_SCENE cocina_detras] + teleport player puerta_cocina_start + set_angle player 180 + stop + teleport player new_game_start_location set_angle player 180 + + +:ready + > [new_game] + set_global new_game false + accept_input SKIP + set_gui_visible false + walk_block player puerta_cocina_start + set_angle player 180 + say current_player "Alo Uli!" + set_gui_visible true + accept_input ALL + diff --git a/gymkhana/start_game.esc b/gymkhana/start_game.esc index aeea2f6b..fa8a26d8 100644 --- a/gymkhana/start_game.esc +++ b/gymkhana/start_game.esc @@ -8,4 +8,5 @@ play_snd res://game/sfx/Game-Menu_Looping.mp3 _music :newgame # 1/ Simple scene +set_global new_game true change_scene res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn