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

gymkhana/items/inventory/turno_cocina_mechero.esc

@@ -1,6 +1,20 @@
 :action1
-say player "Que cosa tan curiosa"
+set_angle player 270
+say player "Mi mechero, que bien!!"
+set_angle player 270
+say player "Ayer lo dejé un segundo encima de la mesa y desapareció."
 
 :action2
-say player "No lo quiero coger"
+set_angle player 270
+say current_player "A la saca!"
+set_active turno_cocina_mechero false
+inventory_add turno_cocina_mechero
 
+:action3
+say player "Parece que no tiene gas."
+say player "Eso explica que lo hayan abandonado."
+set_angle player 180
+say player "Si vienes a Uli vigila tu mechero."
+
+:action4 turno_cocina_carton
+say player "Fuego!"

gymkhana/items/inventory/turno_cocina_mechero.tscn

@@ -1,24 +1,21 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" type="Texture" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
-
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 22.5, 12.5 )
 
 [node name="turno_cocina_mechero" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_mechero"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc"
+combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar",
-    "action4": "Usar"
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
 }
 animations = null
 
@@ -27,10 +24,5 @@ position = Vector2( -2, 0 )
 scale = Vector2( 0.5, 0.5 )
 texture = ExtResource( 2 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -1.5, -0.5 )
-shape = SubResource( 1 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( -51, 69 )
-script = ExtResource( 3 )
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 )

gymkhana/items/inventory/wrench.esc

@@ -1,10 +0,0 @@
-:action1
-say player "That's a wrench on the floor."
-stop
-
-:action2
-set_active wrench false
-inventory_add wrench
-
-:action3
-say player "It seems even more useful now that I picked it up."

gymkhana/items/inventory/wrench.tscn

@@ -1,36 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://gymkhana/items/inventory/assets/wrench.png" type="Texture" id=1]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2]
-[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=3]
-
-[sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 37, 33.5 )
-
-[node name="wrench" type="Area2D"]
-pause_mode = 1
-script = ExtResource( 3 )
-global_id = "wrench"
-esc_script = "res://gymkhana/items/inventory/wrench.esc"
-tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "¿Que es esto?",
-    "action4": "Usar"
-}
-combine_when_selected_action_is_in = [ "action4" ]
-inventory_texture = ExtResource( 1 )
-dialog_color = Color( 1, 1, 1, 1 )
-animations = null
-
-[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( 0, 0 )
-texture = ExtResource( 1 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, 0 )
-shape = SubResource( 2 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( 0, 0 )
-script = ExtResource( 2 )