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

2023-08-26 20:49:41 +02:00
parent 4a5db47371 19d38e5e1c
commit 3cbc77f308
4 changed files with 10 additions and 11 deletions
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -31,8 +31,8 @@ texture = ExtResource( 3 )
 position = Vector2( 302.5, 0 )
 script = ExtResource( 4 )
 scales = ExtResource( 7 )
-scale_min = 0.25
-scale_max = 1.25
+scale_min = 0.3
+scale_max = 1.4
 player_speed_multiplier = 1.2
 player_doubleclick_speed_multiplier = 2.0

--- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
@@ -1,4 +1,6 @@
 :setup
+  inventory_add turno_cocina_frontal
+  
   > [eq ESC_LAST_SCENE despensa]
    teleport player puerta_despensa_start
    set_angle player 180