diff --git a/src/detail/BarrelCacti.tscn b/src/detail/BarrelCacti.tscn index 84a7d0f..4e68d0f 100644 --- a/src/detail/BarrelCacti.tscn +++ b/src/detail/BarrelCacti.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/detail/FlowerPetals.tscn" type="PackedScene" id=1] -[ext_resource path="res://media/image/details/circle200.png" type="Texture" id=2] [ext_resource path="res://src/detail/BarrelCacti.gd" type="Script" id=3] +[ext_resource path="res://src/actor/Circle.gd" type="Script" id=4] [node name="BarrelCacti" type="Node2D"] z_index = -10 @@ -10,11 +10,11 @@ z_as_relative = false script = ExtResource( 3 ) palette = 1 -[node name="Circle" type="Sprite" parent="."] +[node name="Circle" type="Node2D" parent="."] modulate = Color( 0.364706, 1, 0, 1 ) position = Vector2( 0, 28.5 ) -scale = Vector2( 0.35, 0.35 ) -texture = ExtResource( 2 ) +script = ExtResource( 4 ) +radius = 35.0 [node name="FlowerPetals" parent="." instance=ExtResource( 1 )] z_index = 0 diff --git a/src/detail/Flower.tscn b/src/detail/Flower.tscn index f8745b8..50b859c 100644 --- a/src/detail/Flower.tscn +++ b/src/detail/Flower.tscn @@ -1,7 +1,5 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://media/image/details/FlowerPetals.png" type="Texture" id=1] -[ext_resource path="res://media/image/details/FlowerStem.png" type="Texture" id=2] [ext_resource path="res://src/detail/PaletteSwap.gd" type="Script" id=3] [ext_resource path="res://media/audio/sfx/piano_high.wav" type="AudioStream" id=5] [ext_resource path="res://src/detail/Spring.gd" type="Script" id=6] @@ -15,29 +13,49 @@ z_as_relative = false script = ExtResource( 3 ) palette = 1 colors = PoolColorArray( 1, 1, 1, 1, 1, 0, 0, 1, 1, 0.470588, 0.796078, 1, 0.47451, 1, 1, 1, 1, 0.980392, 0, 1, 1, 0.788235, 0, 1 ) -sprite_path = NodePath("Sprites/Petals") +sprite_path = NodePath("Images/Petals") [node name="Spring" type="Node2D" parent="."] position = Vector2( 2, 1 ) script = ExtResource( 6 ) -sprites_path = NodePath("../Sprites") add_vel = 5.0 weight = 3.0 audio_path = NodePath("../Audio/Hit") pitch_from = 0.8 pitch_to = 1.2 -[node name="Sprites" type="Node2D" parent="."] -scale = Vector2( 0.5, 0.5 ) +[node name="Images" type="Node2D" parent="."] -[node name="Stem" type="Sprite" parent="Sprites"] +[node name="Stem" type="Line2D" parent="Images"] position = Vector2( 0, -50 ) -texture = ExtResource( 2 ) +points = PoolVector2Array( 0, 0, 0, 50 ) +width = 13.0 +default_color = Color( 0.137255, 1, 0, 1 ) +joint_mode = 2 +begin_cap_mode = 2 +end_cap_mode = 2 -[node name="Petals" type="Sprite" parent="Sprites"] +[node name="Petals" type="Node2D" parent="Images"] modulate = Color( 1, 0, 0, 1 ) -position = Vector2( 0, -100 ) -texture = ExtResource( 1 ) +position = Vector2( 0, -50 ) + +[node name="Line2D" type="Line2D" parent="Images/Petals"] +rotation = -0.785397 +points = PoolVector2Array( 0, 17, 0, -17 ) +width = 17.0 +default_color = Color( 1, 1, 1, 1 ) +joint_mode = 2 +begin_cap_mode = 2 +end_cap_mode = 2 + +[node name="Line2D2" type="Line2D" parent="Images/Petals"] +rotation = 0.785397 +points = PoolVector2Array( 0, 17, 0, -17 ) +width = 17.0 +default_color = Color( 1, 1, 1, 1 ) +joint_mode = 2 +begin_cap_mode = 2 +end_cap_mode = 2 [node name="Area2D" type="Area2D" parent="."] visible = false diff --git a/src/detail/FlowerPetals.tscn b/src/detail/FlowerPetals.tscn index 1440bd4..d78b754 100644 --- a/src/detail/FlowerPetals.tscn +++ b/src/detail/FlowerPetals.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://src/detail/PaletteSwap.gd" type="Script" id=1] -[ext_resource path="res://media/image/details/FlowerPetals.png" type="Texture" id=2] [ext_resource path="res://media/audio/sfx/guitar_pluck.wav" type="AudioStream" id=3] [ext_resource path="res://src/detail/Spring.gd" type="Script" id=4] @@ -14,23 +13,37 @@ z_as_relative = false script = ExtResource( 1 ) palette = 1 colors = PoolColorArray( 1, 1, 1, 1, 1, 0, 0, 1, 1, 0.470588, 0.796078, 1, 0.47451, 1, 1, 1, 1, 0.980392, 0, 1, 1, 0.788235, 0, 1 ) -sprite_path = NodePath("Sprites/Petals") +sprite_path = NodePath("Images") [node name="Spring" type="Node2D" parent="."] script = ExtResource( 4 ) -sprites_path = NodePath("../Sprites") +sprites_path = NodePath("../Images") add_vel = 7.0 weight = 2.5 audio_path = NodePath("../Audio/Hit") pitch_from = 0.85 pitch_to = 1.15 -[node name="Sprites" type="Node2D" parent="."] - -[node name="Petals" type="Sprite" parent="Sprites"] +[node name="Images" type="Node2D" parent="."] modulate = Color( 1, 0, 0, 1 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) + +[node name="Line2D" type="Line2D" parent="Images"] +rotation = -0.785397 +points = PoolVector2Array( 0, 17, 0, -17 ) +width = 17.0 +default_color = Color( 1, 1, 1, 1 ) +joint_mode = 2 +begin_cap_mode = 2 +end_cap_mode = 2 + +[node name="Line2D2" type="Line2D" parent="Images"] +rotation = 0.785397 +points = PoolVector2Array( 0, 17, 0, -17 ) +width = 17.0 +default_color = Color( 1, 1, 1, 1 ) +joint_mode = 2 +begin_cap_mode = 2 +end_cap_mode = 2 [node name="Area2D" type="Area2D" parent="."] visible = false