Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

gymkhana/rooms/home/esc/right_exit.esc

@@ -1,3 +1,7 @@
-:exit_scene
+:action1
 play_snd res://game/sfx/sounds/doorOpen_2.ogg
-change_scene "res://game/rooms/room02/room02.tscn"
+change_scene "res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn"
+
+:action2
+play_snd res://game/sfx/sounds/doorOpen_2.ogg
+change_scene "res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn"

gymkhana/rooms/home/home.tscn

@@ -21,7 +21,7 @@ script = ExtResource( 6 )
 __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
-global_id = "room1"
+global_id = "home"
 esc_script = "res://gymkhana/rooms/home/esc/room01.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1280, 550 ) ]
@@ -88,11 +88,10 @@ script = ExtResource( 5 )
 global_id = "r1_r_exit"
 esc_script = "res://gymkhana/rooms/home/esc/right_exit.esc"
 is_exit = true
-tooltip_name = "Exit to room 2"
+tooltip_name = "Exit to Trasera cocina"
 default_action = "walk"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"]
 polygon = PoolVector2Array( 1173, 63, 1278, 106, 1278, 420, 1172, 356 )
@@ -107,11 +106,10 @@ script = ExtResource( 5 )
 global_id = "r1_wall_item1"
 esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc"
 tooltip_name = "This is action1"
-tooltip2_name = "This is action2"
 combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 10 )
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
+tooltip2_name = "This is action2"
 
 [node name="Art1" type="Sprite" parent="Hotspots/artwork1"]
 position = Vector2( 470, 140 )
@@ -134,7 +132,6 @@ custom_fonts/font = ExtResource( 3 )
 text = "If you look at this object, the character's
 speech will appear above his head"
 __meta__ = {
-"_edit_use_anchors_": false,
 "_editor_description_": ""
 }
 
@@ -148,7 +145,6 @@ default_action = "action2"
 combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 9 )
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
 
 [node name="Art12" type="Sprite" parent="Hotspots/artwork2"]
 position = Vector2( 830, 140 )
@@ -184,7 +180,6 @@ is_trigger = true
 player_orients_on_arrival = false
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_talk"]
 polygon = PoolVector2Array( 1027, 352, 1187, 502, 1249.67, 445.131, 1123, 351 )