From 05cc47e9d91b999816f7fbdd482f2b2f45876869 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com> Date: Wed, 1 May 2019 00:56:33 -0400 Subject: [PATCH] New title! Finally. - Changing Nathan to a fennec, starting with the ears. - Cleaned up README --- README.md | 2 +- project/default_env.tres | 1 - project/scn/Character.tscn | 4 +- project/scn/ClassicScn.tscn | 20 ++---- project/scn/TitleScn.tscn | 50 +++++-------- project/sprites/blue_camo_jeans.svg | 36 +++++----- project/sprites/character_base.svg | 97 +++++++++++++------------ project/sprites/title.svg | 105 +++++++++++++++++++++++----- project/src/TitleScn.gd | 15 +--- 9 files changed, 186 insertions(+), 144 deletions(-) diff --git a/README.md b/README.md index 8b9b679..4945c89 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![ko-fi](https://www.ko-fi.com/img/donate_sm.png)](https://ko-fi.com/X8X5LDU7) -​Nathan's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up, that contains all the original assets with only minor edits. You can download this game for free, with an option to donate, at [Itch.io](https://antonwilc0x.itch.io/zacksdressup) or become a [Patreon​​](https://www.patreon.com/antonwilc0x) and get your name in the credits. +​Nathan's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up. ## Screenshot diff --git a/project/default_env.tres b/project/default_env.tres index 378e0c1..dfe62ab 100644 --- a/project/default_env.tres +++ b/project/default_env.tres @@ -12,4 +12,3 @@ sun_energy = 16.0 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index ffaa1f6..b0df14c 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -68,7 +68,7 @@ __meta__ = { [node name="Eyes" type="AnimatedSprite" parent="."] position = Vector2( 109.519, 253.9 ) frames = SubResource( 2 ) -frame = 16 +frame = 2 playing = true __meta__ = { "_edit_lock_": true @@ -77,7 +77,7 @@ __meta__ = { [node name="Mouth" type="AnimatedSprite" parent="."] position = Vector2( 126.316, 257.474 ) frames = SubResource( 3 ) -frame = 10 +frame = 2 playing = true __meta__ = { "_edit_lock_": true diff --git a/project/scn/ClassicScn.tscn b/project/scn/ClassicScn.tscn index c7fc678..0fb082c 100644 --- a/project/scn/ClassicScn.tscn +++ b/project/scn/ClassicScn.tscn @@ -7,33 +7,25 @@ [ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=5] [ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=6] - - -[node name="GameScreen" type="Node" index="0"] - +[node name="GameScreen" type="Node"] script = ExtResource( 1 ) -[node name="Background" type="Sprite" parent="." index="0"] - +[node name="Background" type="Sprite" parent="."] position = Vector2( 400, 277 ) texture = ExtResource( 2 ) __meta__ = { "_edit_lock_": true } -[node name="Lights" type="Sprite" parent="." index="1"] - +[node name="Lights" type="Sprite" parent="."] position = Vector2( 477.823, 100.811 ) texture = ExtResource( 3 ) -_sections_unfolded = [ "Z Index" ] __meta__ = { "_edit_lock_": true } -[node name="Nathan" parent="." index="2" instance=ExtResource( 4 )] - -[node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] - -[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] +[node name="Nathan" parent="." instance=ExtResource( 4 )] +[node name="Clothes" parent="." instance=ExtResource( 5 )] +[node name="WinDialogs" parent="." instance=ExtResource( 6 )] diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn index e121d17..67ef605 100644 --- a/project/scn/TitleScn.tscn +++ b/project/scn/TitleScn.tscn @@ -1,44 +1,30 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://sprites/modern_dress_up_blurred_bg.png" type="Texture" id=2] -[ext_resource path="res://sprites/dressup_blurred_wardrobe.png" type="Texture" id=3] -[ext_resource path="res://sprites/classic_dress_up_blurred_bg.png" type="Texture" id=4] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=5] +[ext_resource path="res://sprites/title.svg" type="Texture" id=3] +[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] [node name="Start" type="Node"] script = ExtResource( 1 ) -[node name="Modern" type="Node2D" parent="."] - -[node name="ModernBG" type="Sprite" parent="Modern"] +[node name="ModernBG" type="Sprite" parent="."] position = Vector2( 400, 277 ) texture = ExtResource( 2 ) __meta__ = { "_edit_lock_": true } -[node name="WordrobeBG" type="Sprite" parent="Modern"] -visible = false -position = Vector2( 492.609, 280.27 ) +[node name="Title" type="Sprite" parent="."] +position = Vector2( 399.047, 113.148 ) texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} - -[node name="ClassicBG" type="Sprite" parent="."] -visible = false -position = Vector2( 400, 277 ) -texture = ExtResource( 4 ) -__meta__ = { -"_edit_lock_": true -} [node name="MenuRf" type="ReferenceRect" parent="."] -margin_left = 202.0 -margin_top = 67.0 -margin_right = 762.0 -margin_bottom = 518.0 +editor/display_folded = true +margin_left = 130.323 +margin_top = 34.4196 +margin_right = 690.323 +margin_bottom = 485.42 [node name="StartVbox" type="VBoxContainer" parent="MenuRf"] anchor_left = 0.5 @@ -68,15 +54,14 @@ margin_right = 136.0 margin_bottom = 68.0 text = "KLIC" -[node name="ModePanel" type="Panel" parent="MenuRf"] -visible = false +[node name="ModePanel" type="WindowDialog" parent="MenuRf"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = 80.0 +margin_left = -73.0 margin_top = -46.0 -margin_right = 226.0 +margin_right = 73.0 margin_bottom = 46.0 [node name="PlayVbox" type="VBoxContainer" parent="MenuRf/ModePanel"] @@ -117,12 +102,9 @@ __meta__ = { "_edit_lock_": true } -[node name="WinDialogs" parent="." instance=ExtResource( 5 )] - -[connection signal="toggled" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_toggled"] +[node name="WinDialogs" parent="." instance=ExtResource( 4 )] +[connection signal="pressed" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"] [connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ModernBtn" to="." method="_on_ModernBtn_pressed"] -[connection signal="mouse_entered" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_entered"] -[connection signal="mouse_exited" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_exited"] [connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_pressed"] diff --git a/project/sprites/blue_camo_jeans.svg b/project/sprites/blue_camo_jeans.svg index b3fcdf3..0835ead 100644 --- a/project/sprites/blue_camo_jeans.svg +++ b/project/sprites/blue_camo_jeans.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" + inkscape:zoom="5.6" inkscape:cx="67.738265" - inkscape:cy="77.809596" + inkscape:cy="72.758833" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -41,7 +41,8 @@ inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:lockguides="true" /> @@ -54,15 +55,12 @@ - + inkscape:label="Re-ink" + style="display:inline" + sodipodi:insensitive="true"> @@ -103,27 +101,27 @@ id="path2579" inkscape:connector-curvature="0" /> @@ -152,7 +150,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> @@ -163,7 +161,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" /> diff --git a/project/sprites/character_base.svg b/project/sprites/character_base.svg index a826d68..925e51f 100644 --- a/project/sprites/character_base.svg +++ b/project/sprites/character_base.svg @@ -25,23 +25,23 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.979899" - inkscape:cx="80.061629" - inkscape:cy="172.34635" + inkscape:zoom="2.8" + inkscape:cx="86.349322" + inkscape:cy="146.4697" inkscape:document-units="mm" - inkscape:current-layer="layer2" + inkscape:current-layer="layer3" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:pagecheckerboard="true" - showguides="false" - inkscape:window-width="1920" - inkscape:window-height="1001" - inkscape:window-x="-9" - inkscape:window-y="-9" - inkscape:window-maximized="1" + showguides="true" + inkscape:window-width="958" + inkscape:window-height="991" + inkscape:window-x="-8" + inkscape:window-y="0" + inkscape:window-maximized="0" inkscape:lockguides="false" /> @@ -64,20 +64,13 @@ + inkscape:label="Color"> - + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> - + sodipodi:nodetypes="zczczzcczscz" /> + + + + + inkscape:label="Re-ink" + style="display:inline" + sodipodi:insensitive="true"> + sodipodi:nodetypes="csc" /> - + diff --git a/project/sprites/title.svg b/project/sprites/title.svg index 93c277b..b019278 100644 --- a/project/sprites/title.svg +++ b/project/sprites/title.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="102.53982mm" - height="12.457465mm" - viewBox="0 0 102.53982 12.457465" + width="103.24624mm" + height="36.245796mm" + viewBox="0 0 103.24624 36.245796" version="1.1" id="svg8" inkscape:version="0.92.3 (2405546, 2018-03-11)" @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="177.04774" - inkscape:cy="-43.325592" + inkscape:cx="426.57668" + inkscape:cy="19.131602" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -57,17 +57,88 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(54.296804,-86.706353)"> - Nathan's Dress Up + transform="translate(54.41838,-81.046773)"> + + + + + + + + + + + + + + + + + + + diff --git a/project/src/TitleScn.gd b/project/src/TitleScn.gd index 8238689..691a622 100644 --- a/project/src/TitleScn.gd +++ b/project/src/TitleScn.gd @@ -8,22 +8,11 @@ func _on_ClassicBtn_pressed(): func _on_ModernBtn_pressed(): switch_scenes("modern") -func _on_ClassicBtn_mouse_entered(): - $Modern.hide() - $ClassicBG.show() - -func _on_ClassicBtn_mouse_exited(): - $ClassicBG.hide() - $Modern.show() - func _on_CreditsBtn_pressed(): $WinDialogs/CreditsWin.show() func _on_LicenseBtn_pressed(): $WinDialogs/LicenseWin.show() -func _on_PlayBtn_toggled(button_pressed): - if button_pressed == true: - $MenuRf/ModePanel.show() - else: - $MenuRf/ModePanel.hide() +func _on_PlayBtn_pressed(): + $MenuRf/ModePanel.show()