diff --git a/export_presets.cfg b/export_presets.cfg index d6cd619..e69eb83 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -31,7 +31,7 @@ codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) -application/icon="" +application/icon="res://media/image/icon/rota.ico" application/file_version="" application/product_version="" application/company_name="Harmony Honey" diff --git a/media/image/UI/btn_lb.png b/media/image/UI/btn_lb.png new file mode 100644 index 0000000..cc13c3a Binary files /dev/null and b/media/image/UI/btn_lb.png differ diff --git a/media/image/UI/btn_ls.png b/media/image/UI/btn_ls.png new file mode 100644 index 0000000..e8eb4e0 Binary files /dev/null and b/media/image/UI/btn_ls.png differ diff --git a/media/image/UI/btn_lt.png b/media/image/UI/btn_lt.png new file mode 100644 index 0000000..1a46885 Binary files /dev/null and b/media/image/UI/btn_lt.png differ diff --git a/media/image/UI/btn_rb.png b/media/image/UI/btn_rb.png new file mode 100644 index 0000000..e5e4d49 Binary files /dev/null and b/media/image/UI/btn_rb.png differ diff --git a/media/image/UI/btn_rs.png b/media/image/UI/btn_rs.png new file mode 100644 index 0000000..928b038 Binary files /dev/null and b/media/image/UI/btn_rs.png differ diff --git a/media/image/UI/btn_rt.png b/media/image/UI/btn_rt.png new file mode 100644 index 0000000..d69cd97 Binary files /dev/null and b/media/image/UI/btn_rt.png differ diff --git a/media/image/UI/boot_splash.png b/media/image/UI/title_splash.png similarity index 100% rename from media/image/UI/boot_splash.png rename to media/image/UI/title_splash.png diff --git a/media/image/icon/icon100.png b/media/image/icon/icon100.png new file mode 100644 index 0000000..899af17 Binary files /dev/null and b/media/image/icon/icon100.png differ diff --git a/media/image/icon/icon128.png b/media/image/icon/icon128.png new file mode 100644 index 0000000..c2a3e7d Binary files /dev/null and b/media/image/icon/icon128.png differ diff --git a/media/image/icon/icon16.png b/media/image/icon/icon16.png new file mode 100644 index 0000000..f3a9b20 Binary files /dev/null and b/media/image/icon/icon16.png differ diff --git a/media/image/icon/icon200.png b/media/image/icon/icon200.png new file mode 100644 index 0000000..0a855ad Binary files /dev/null and b/media/image/icon/icon200.png differ diff --git a/media/image/icon/icon256.png b/media/image/icon/icon256.png new file mode 100644 index 0000000..c562df7 Binary files /dev/null and b/media/image/icon/icon256.png differ diff --git a/media/image/icon/icon32.png b/media/image/icon/icon32.png new file mode 100644 index 0000000..f856d71 Binary files /dev/null and b/media/image/icon/icon32.png differ diff --git a/media/image/icon/icon48.png b/media/image/icon/icon48.png new file mode 100644 index 0000000..5e58d93 Binary files /dev/null and b/media/image/icon/icon48.png differ diff --git a/media/image/icon/icon64.png b/media/image/icon/icon64.png new file mode 100644 index 0000000..1f0557a Binary files /dev/null and b/media/image/icon/icon64.png differ diff --git a/media/image/icon/rota.ico b/media/image/icon/rota.ico new file mode 100644 index 0000000..16d120d Binary files /dev/null and b/media/image/icon/rota.ico differ diff --git a/project.godot b/project.godot index 7df1d43..4ca04d2 100644 --- a/project.godot +++ b/project.godot @@ -68,9 +68,10 @@ run/main_scene="res://src/menu/MenuTitle.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="ROTA-Harmony" config/project_settings_override="user://override.cfg" -boot_splash/image="res://media/image/UI/boot_splash.png" +boot_splash/image="res://media/image/UI/title_splash.png" boot_splash/bg_color=Color( 0, 0, 0, 1 ) -config/icon="res://media/image/gobot.png" +config/icon="res://media/image/icon/icon128.png" +config/windows_native_icon="res://media/image/icon/rota.ico" [autoload] diff --git a/src/actor/Hair.gd b/src/actor/Hair.gd index 0dd240b..1891f97 100644 --- a/src/actor/Hair.gd +++ b/src/actor/Hair.gd @@ -1,7 +1,6 @@ tool extends Node2D -export var color := Color("00fff9") # 00fff9 ff007e export var width := 50.0 setget set_width export var end_scale := 0.75 setget set_end export var length = 25.0 diff --git a/src/actor/Player.tscn b/src/actor/Player.tscn index 21fb1f7..f2194b2 100644 --- a/src/actor/Player.tscn +++ b/src/actor/Player.tscn @@ -444,22 +444,22 @@ use_parent_material = true position = Vector2( 0, -25 ) end_scale = 0.8 -[node name="Left" type="Line2D" parent="Sprites/Root/Body"] -position = Vector2( -5, -9.5 ) -rotation = 0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 0.34, 0.725, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 - -[node name="Middle" type="Line2D" parent="Sprites/Root/Body"] +[node name="Torso" type="Line2D" parent="Sprites/Root/Body"] position = Vector2( 0, -9.5 ) points = PoolVector2Array( 0, 0, 0, 20 ) width = 22.0 width_curve = SubResource( 13 ) -default_color = Color( 1, 0.34, 0.725, 1 ) +default_color = Color( 1, 0.341176, 0.72549, 1 ) -[node name="Right" type="Line2D" parent="Sprites/Root/Body"] +[node name="LegL" type="Line2D" parent="Sprites/Root/Body"] +position = Vector2( -5, -9.5 ) +rotation = 0.387463 +points = PoolVector2Array( 0, 0, 0, 26 ) +default_color = Color( 1, 0.341176, 0.72549, 1 ) +begin_cap_mode = 2 +end_cap_mode = 2 + +[node name="LegR" type="Line2D" parent="Sprites/Root/Body"] position = Vector2( 5, -9.5 ) rotation = -0.387463 points = PoolVector2Array( 0, 0, 0, 26 ) @@ -473,18 +473,18 @@ position = Vector2( 0, -25 ) scale = Vector2( 0.4, 0.4 ) texture = ExtResource( 14 ) -[node name="EyeL" type="Line2D" parent="Sprites/Root/Body/Head"] -position = Vector2( -25, -16 ) -points = PoolVector2Array( 0, 0, 0, 15 ) -width = 20.0 +[node name="EyeL" type="Line2D" parent="Sprites/Root/Body"] +position = Vector2( -10, -31.5 ) +points = PoolVector2Array( 0, 0, 0, 6 ) +width = 8.0 default_color = Color( 0.180392, 0.180392, 0.180392, 1 ) begin_cap_mode = 2 end_cap_mode = 2 -[node name="EyeR" type="Line2D" parent="Sprites/Root/Body/Head"] -position = Vector2( 25, -16 ) -points = PoolVector2Array( 0, 0, 0, 15 ) -width = 20.0 +[node name="EyeR" type="Line2D" parent="Sprites/Root/Body"] +position = Vector2( 10, -31.5 ) +points = PoolVector2Array( 0, 0, 0, 6 ) +width = 8.0 default_color = Color( 0.180392, 0.180392, 0.180392, 1 ) begin_cap_mode = 2 end_cap_mode = 2 diff --git a/src/menu/MenuBase.gd b/src/menu/MenuBase.gd index 3906b33..5857ed9 100644 --- a/src/menu/MenuBase.gd +++ b/src/menu/MenuBase.gd @@ -142,6 +142,9 @@ func sub_menu(arg : MenuBase): arg.is_open = true arg.connect("signal_close", self, "sub_close") + + joy = Vector2.ZERO + joy_last = Vector2.ZERO func sub_close(arg): is_sub_menu = false diff --git a/src/menu/MenuBoot.gd b/src/menu/MenuBoot.gd index 175b420..8a8170d 100644 --- a/src/menu/MenuBoot.gd +++ b/src/menu/MenuBoot.gd @@ -14,8 +14,9 @@ func _ready(): Shared.save_slot = -1 - randomize() - Music.play_song() + if !Music.playing: + randomize() + Music.play_song() func _exit_tree(): UI.menu.show = false diff --git a/src/menu/options/Key.tscn b/src/menu/options/Key.tscn index 8cde274..bb94660 100644 --- a/src/menu/options/Key.tscn +++ b/src/menu/options/Key.tscn @@ -26,6 +26,10 @@ var tex = {\"JOY 0\": preload(\"res://media/image/UI/btn_a.png\"), \"JOY 1\": preload(\"res://media/image/UI/btn_b.png\"), \"JOY 2\": preload(\"res://media/image/UI/btn_x.png\"), \"JOY 3\": preload(\"res://media/image/UI/btn_y.png\"), +\"JOY 4\": preload(\"res://media/image/UI/btn_lb.png\"), +\"JOY 5\": preload(\"res://media/image/UI/btn_rb.png\"), +\"JOY 8\": preload(\"res://media/image/UI/btn_ls.png\"), +\"JOY 9\": preload(\"res://media/image/UI/btn_rs.png\"), \"JOY 10\": preload(\"res://media/image/UI/btn_select.png\"), \"JOY 11\": preload(\"res://media/image/UI/btn_start.png\"), \"JOY 12\": preload(\"res://media/image/UI/dpad_up.png\"), @@ -40,6 +44,8 @@ var tex = {\"JOY 0\": preload(\"res://media/image/UI/btn_a.png\"), \"AXIS 2+\": preload(\"res://media/image/UI/r_stick_right.png\"), \"AXIS 3-\": preload(\"res://media/image/UI/r_stick_up.png\"), \"AXIS 3+\": preload(\"res://media/image/UI/r_stick_down.png\"), +\"AXIS 6+\": preload(\"res://media/image/UI/btn_lt.png\"), +\"AXIS 7+\": preload(\"res://media/image/UI/btn_rt.png\"), \"KEY\": preload(\"res://media/image/box/round_rect200.png\"), \"KEY_2\": preload(\"res://media/image/UI/key_2.png\"), \"KEY_3\": preload(\"res://media/image/UI/key_3.png\"),