diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 2313d738..1f08bc5a 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -43,8 +43,8 @@ script = ExtResource( 2 ) global_id = "eneko_smoking" esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" is_movable = true +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -animations = ExtResource( 1 ) tooltips = { "action1": "cocina_delante_eneko_smoking_action1", "action2": "cocina_delante_eneko_smoking_action2" @@ -52,10 +52,11 @@ tooltips = { action3_target_texts = { "caja_herramientas": "Regalar", "turno_cocina_frontal": "Ofrecer", -"turno_cocina_madera": "Ofrecerle leña", +"turno_cocina_madera": "Ofrecerle leña" } target_when_selected_action_is_in = [ "action3" ] selectable = true +animations = ExtResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( 32.625, -50.56 ) diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png index 2fbda8c1..01d42239 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png index 7eb916a8..59d7f171 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png index a22aa2ab..3a9ae610 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png index 4f1ad403..dfe97129 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png index c24980c0..ed0188cc 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png index 5ba10a56..6f99e5f0 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png index 52f5b179..dbaa2e86 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png index f5a55ef7..885b005b 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png index 8a12b369..ba0f56b3 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png index b5d5880d..e3413a8f 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png index 2198fe38..7e260bf7 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png index 0228624a..c662bc10 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png index 67b8f1bc..4f44c38a 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png index 6df5a0f8..b7781e1d 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png index 4d9bca3e..b0b5025c 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png index a0042b23..6003f036 100644 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png differ