diff --git a/project/boot_splash.png b/project/boot_splash.png deleted file mode 100644 index 972d9f0..0000000 Binary files a/project/boot_splash.png and /dev/null differ diff --git a/project/fonts/montserrat/Montserrat-ExtraBold.otf b/project/fonts/montserrat/Montserrat-ExtraBold.otf new file mode 100644 index 0000000..d572750 Binary files /dev/null and b/project/fonts/montserrat/Montserrat-ExtraBold.otf differ diff --git a/project/fonts/montserrat_extra_bold_16.tres b/project/fonts/montserrat_extra_bold_16.tres new file mode 100644 index 0000000..d5a2ce4 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_16.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_24.tres b/project/fonts/montserrat_extra_bold_24.tres new file mode 100644 index 0000000..abe38e1 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_24.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +size = 32 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_32.tres b/project/fonts/montserrat_extra_bold_32.tres new file mode 100644 index 0000000..da82d19 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_32.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +size = 32 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_48.tres b/project/fonts/montserrat_extra_bold_48.tres new file mode 100644 index 0000000..25617b7 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_48.tres @@ -0,0 +1,13 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + + +[resource] + +size = 48 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) +_sections_unfolded = [ "Settings" ] + diff --git a/project/fonts/montserrat_extra_bold_62.tres b/project/fonts/montserrat_extra_bold_62.tres new file mode 100644 index 0000000..f1fa875 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_62.tres @@ -0,0 +1,13 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + + +[resource] + +size = 62 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) +_sections_unfolded = [ "Settings" ] + diff --git a/project/icon.png b/project/icon.png index 294d96d..98e171f 100644 Binary files a/project/icon.png and b/project/icon.png differ diff --git a/project/icon.svg b/project/icon.svg new file mode 100644 index 0000000..12bf384 --- /dev/null +++ b/project/icon.svg @@ -0,0 +1,196 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/boot_splash.png.import b/project/icon.svg.import similarity index 70% rename from project/boot_splash.png.import rename to project/icon.svg.import index 15f9b66..b806afb 100644 --- a/project/boot_splash.png.import +++ b/project/icon.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" +path="res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://boot_splash.png" -dest_files=[ "res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" ] +source_file="res://icon.svg" +dest_files=[ "res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex" ] [params] diff --git a/project/music/mushrooms.ogg b/project/music/mushrooms.ogg new file mode 100644 index 0000000..efcbb80 Binary files /dev/null and b/project/music/mushrooms.ogg differ diff --git a/project/music/mushrooms.ogg.import b/project/music/mushrooms.ogg.import new file mode 100644 index 0000000..3dd6c1e --- /dev/null +++ b/project/music/mushrooms.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/mushrooms.ogg-5d11893cda0d4333d75a0ef8474477bb.oggstr" + +[deps] + +source_file="res://music/mushrooms.ogg" +dest_files=[ "res://.import/mushrooms.ogg-5d11893cda0d4333d75a0ef8474477bb.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/project.godot b/project/project.godot index cb47b4c..6006db6 100644 --- a/project/project.godot +++ b/project/project.godot @@ -18,7 +18,7 @@ _global_script_class_icons={ config/name="Nathan's Dress Up" run/main_scene="res://scn/TitleScn.tscn" config/use_custom_user_dir=true -boot_splash/image="res://boot_splash.png" +boot_splash/image="res://icon.png" boot_splash/bg_color=Color( 0.8, 0.8, 0.4, 1 ) config/icon="res://icon.png" name_sv="Nathans klä upp" @@ -26,7 +26,6 @@ name_sv="Nathans klä upp" [autoload] GameKit="*res://src/GameKit.gd" -WinDialogs="*res://scn/WinDialogs.tscn" [debug] @@ -54,7 +53,6 @@ translations=PoolStringArray( "res://lang/local.en.translation", "res://lang/loc [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=0 quality/2d/use_pixel_snap=true diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index 17f8eda..605e76f 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -57,6 +57,7 @@ animations = [ { [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) +frame = 8 playing = true [node name="Nathan" type="Sprite" parent="Base"] @@ -66,12 +67,13 @@ texture = ExtResource( 4 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) +frame = 4 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 22 +frame = 2 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/project/scn/ClassicScn.tscn b/project/scn/ClassicScn.tscn index 5c3cf92..66907df 100644 --- a/project/scn/ClassicScn.tscn +++ b/project/scn/ClassicScn.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://src/ClassicScn.gd" type="Script" id=1] [ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=2] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3] -[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=4] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=3] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) @@ -11,5 +10,3 @@ script = ExtResource( 1 ) [node name="Clothes" parent="." instance=ExtResource( 2 )] [node name="WinDialogs" parent="." instance=ExtResource( 3 )] - -[node name="GlobalMenu" parent="." instance=ExtResource( 4 )] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index da2ea5d..a78ffc4 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,28 +1,27 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] [ext_resource path="res://styles/wordrobe_panel.stylebox" type="StyleBox" id=2] -[ext_resource path="res://sprites/lights.png" type="Texture" id=3] -[ext_resource path="res://sprites/jeans.svg" type="Texture" id=4] -[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=5] -[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=6] -[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=7] -[ext_resource path="res://sprites/x_button.svg" type="Texture" id=8] -[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=9] -[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=10] -[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=11] -[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=12] -[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=13] -[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=14] -[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=15] -[ext_resource path="res://sprites/train_hoodie.svg" type="Texture" id=16] -[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=17] -[ext_resource path="res://sprites/whatsnew_shirt.svg" type="Texture" id=18] -[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=19] -[ext_resource path="res://sprites/briefs.svg" type="Texture" id=20] -[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=21] -[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=22] -[ext_resource path="res://sprites/camera.png" type="Texture" id=23] +[ext_resource path="res://sprites/jeans.svg" type="Texture" id=3] +[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=4] +[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=5] +[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=6] +[ext_resource path="res://sprites/x_button.svg" type="Texture" id=7] +[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=8] +[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=9] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=10] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=11] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=12] +[ext_resource path="res://sprites/biker_jacket.svg" type="Texture" id=13] +[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=14] +[ext_resource path="res://sprites/train_hoodie.svg" type="Texture" id=15] +[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=16] +[ext_resource path="res://sprites/whatsnew_shirt.svg" type="Texture" id=17] +[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=18] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=19] +[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=20] +[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=21] +[ext_resource path="res://sprites/camera.png" type="Texture" id=22] [node name="Clothes" type="Node"] @@ -31,24 +30,19 @@ anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 margin_left = -721.0 -margin_top = 32.0 +margin_top = 21.0 margin_right = -25.0 -margin_bottom = -6.0 +margin_bottom = -35.0 theme = ExtResource( 1 ) custom_styles/panel = ExtResource( 2 ) custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color_bg = Color( 0.921569, 0.921569, 0.921569, 1 ) custom_colors/font_color_fg = Color( 1, 1, 1, 1 ) -[node name="Lights" type="Sprite" parent="Wordrobe"] -position = Vector2( 346.41, 165.623 ) -texture = ExtResource( 3 ) - [node name="Pants" type="Tabs" parent="Wordrobe"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 custom_constants/hseparation = 0 [node name="PantsGrid" type="GridContainer" parent="Wordrobe/Pants"] @@ -60,43 +54,45 @@ columns = 5 [node name="Jeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_right = 106.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 4 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 3 ) [node name="Sweats" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 110.0 margin_right = 216.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 5 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 4 ) [node name="BlueCamoJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 220.0 margin_right = 326.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 6 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 5 ) [node name="BeatUpJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 330.0 margin_right = 436.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 7 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 6 ) [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] margin_left = 440.0 -margin_right = 558.0 -margin_bottom = 118.0 +margin_right = 546.0 +margin_bottom = 112.0 rect_min_size = Vector2( 0, 112 ) custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 8 ) +icon = ExtResource( 7 ) flat = true [node name="Shirts" type="Tabs" parent="Wordrobe"] +editor/display_folded = true +visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="ShirtsGrid" type="GridContainer" parent="Wordrobe/Shirts"] margin_left = 18.0 @@ -108,63 +104,63 @@ columns = 7 [node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_right = 85.0 margin_bottom = 115.0 -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 8 ) [node name="DJShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_right = 174.0 margin_bottom = 115.0 -texture_normal = ExtResource( 10 ) +texture_normal = ExtResource( 9 ) [node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 178.0 margin_right = 263.0 margin_bottom = 115.0 -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 10 ) [node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 267.0 margin_right = 385.0 margin_bottom = 115.0 -texture_normal = ExtResource( 12 ) +texture_normal = ExtResource( 11 ) [node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 389.0 margin_right = 470.0 margin_bottom = 115.0 -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 12 ) [node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 474.0 -margin_right = 559.0 +margin_left = 475.0 +margin_right = 560.0 margin_bottom = 115.0 -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 13 ) [node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 563.0 margin_right = 648.0 margin_bottom = 115.0 -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 14 ) [node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_top = 119.0 margin_right = 85.0 margin_bottom = 237.0 -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 15 ) [node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_top = 119.0 margin_right = 174.0 margin_bottom = 237.0 -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 16 ) [node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 178.0 margin_top = 119.0 margin_right = 263.0 margin_bottom = 237.0 -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 17 ) [node name="RemoveShirt" type="Button" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 267.0 @@ -176,7 +172,7 @@ custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 8 ) +icon = ExtResource( 7 ) flat = true [node name="Underwear" type="Tabs" parent="Wordrobe"] @@ -184,7 +180,7 @@ editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="UndiesGrid" type="GridContainer" parent="Wordrobe/Underwear"] margin_left = 21.0 @@ -196,32 +192,32 @@ columns = 6 [node name="OwOCensor" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_right = 106.0 margin_bottom = 112.0 -texture_normal = ExtResource( 19 ) +texture_normal = ExtResource( 18 ) [node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 110.0 margin_right = 216.0 margin_bottom = 112.0 -texture_normal = ExtResource( 20 ) +texture_normal = ExtResource( 19 ) [node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 220.0 margin_right = 326.0 margin_bottom = 112.0 -texture_normal = ExtResource( 21 ) +texture_normal = ExtResource( 20 ) [node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 330.0 margin_right = 436.0 margin_bottom = 112.0 -texture_normal = ExtResource( 22 ) +texture_normal = ExtResource( 21 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="AccsGrid" type="GridContainer" parent="Wordrobe/Accessoires"] margin_left = 20.0 @@ -233,7 +229,7 @@ columns = 6 [node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccsGrid"] margin_right = 85.0 margin_bottom = 118.0 -texture_normal = ExtResource( 23 ) +texture_normal = ExtResource( 22 ) [node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccsGrid"] margin_left = 89.0 @@ -244,5 +240,5 @@ custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 8 ) +icon = ExtResource( 7 ) flat = true diff --git a/project/scn/CreditsScn.tscn b/project/scn/CreditsScn.tscn index 9d4d9a3..7a31960 100644 --- a/project/scn/CreditsScn.tscn +++ b/project/scn/CreditsScn.tscn @@ -1,19 +1,21 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=6 format=2] -[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=1] -[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/CreditsScn.gd" type="Script" id=1] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] +[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=3] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] [node name="Credits" type="Node"] +script = ExtResource( 1 ) [node name="Credits" type="RichTextLabel" parent="."] anchor_left = 0.5 -anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -173.0 -margin_top = -262.0 -margin_right = 146.0 -margin_bottom = 280.0 +margin_left = -159.0 +margin_right = 160.0 +margin_bottom = 586.0 +theme = ExtResource( 2 ) bbcode_enabled = true bbcode_text = "[center]Created by Anthony Wilcox @@ -21,15 +23,12 @@ Anthony Wilcox Music by Michael Carey -Fonts by -Google - Clothing inspired by Megawolf77 Canon Rhode Raier -[img]sprites/sixam_wordmark.png[/img] +[img]sprites/sixam_wordmark.svg[/img] sixam.xyz [/center]" text = "Created by @@ -38,9 +37,6 @@ Anthony Wilcox Music by Michael Carey -Fonts by -Google - Clothing inspired by Megawolf77 Canon Rhode @@ -50,7 +46,17 @@ Raier sixam.xyz " -[node name="Character" parent="." instance=ExtResource( 1 )] -position = Vector2( 48.4215, 256.845 ) +[node name="Character" parent="." instance=ExtResource( 3 )] +position = Vector2( 68.8273, 256.845 ) -[node name="GlobalMenu" parent="." instance=ExtResource( 2 )] +[node name="WinDialogs" parent="." instance=ExtResource( 4 )] + +[node name="Music" type="AudioStreamPlayer" parent="."] +script = ExtResource( 5 ) + +[node name="Version" type="Label" parent="."] +margin_left = 950.908 +margin_top = 568.64 +margin_right = 990.908 +margin_bottom = 582.64 +text = "Version" diff --git a/project/scn/GameScn.tscn b/project/scn/GameScn.tscn index a5def0c..6ab3670 100644 --- a/project/scn/GameScn.tscn +++ b/project/scn/GameScn.tscn @@ -1,28 +1,30 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://src/GameScn.gd" type="Script" id=1] -[ext_resource path="res://sprites/icrazy_frame.png" type="Texture" id=2] -[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/Soundtrack.gd" type="Script" id=4] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=5] -[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=6] +[ext_resource path="res://sprites/icrazy_frame.svg" type="Texture" id=2] +[ext_resource path="res://sprites/lights.png" type="Texture" id=3] +[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=6] [ext_resource path="res://scn/Character.tscn" type="PackedScene" id=7] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) [node name="PicFrame" type="Sprite" parent="."] -position = Vector2( 167.38, 140.341 ) +position = Vector2( 165.38, 245.341 ) texture = ExtResource( 2 ) -[node name="Clothes" parent="." instance=ExtResource( 3 )] +[node name="Light" type="Light2D" parent="."] +position = Vector2( 201.79, 232.073 ) +texture = ExtResource( 3 ) + +[node name="Clothes" parent="." instance=ExtResource( 4 )] [node name="Music" type="AudioStreamPlayer" parent="."] -script = ExtResource( 4 ) +script = ExtResource( 5 ) -[node name="WinDialogs" parent="." instance=ExtResource( 5 )] - -[node name="GlobalMenu" parent="." instance=ExtResource( 6 )] +[node name="PauseScn" parent="." instance=ExtResource( 6 )] [node name="Nathan" parent="." instance=ExtResource( 7 )] position = Vector2( 84.5004, 252.934 ) diff --git a/project/scn/GlobalMenu.tscn b/project/scn/GlobalMenu.tscn deleted file mode 100644 index 9231545..0000000 --- a/project/scn/GlobalMenu.tscn +++ /dev/null @@ -1,28 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://src/GlobalMenu.gd" type="Script" id=1] -[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] -[ext_resource path="res://styles/global_menu.stylebox" type="StyleBox" id=3] -[ext_resource path="res://sprites/exit_symbol.svg" type="Texture" id=4] - -[node name="GlobalMenu" type="Node"] -script = ExtResource( 1 ) - -[node name="MenuPanel" type="Panel" parent="."] -anchor_right = 1.0 -margin_bottom = 26.0 -theme = ExtResource( 2 ) -custom_styles/panel = ExtResource( 3 ) - -[node name="TitleScreenBtn" type="Button" parent="MenuPanel"] -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -margin_left = -63.0 -margin_top = -12.0 -margin_right = -4.0 -margin_bottom = 13.0 -text = "Exit" -icon = ExtResource( 4 ) -flat = true diff --git a/project/scn/WinDialogs.tscn b/project/scn/PauseScn.tscn similarity index 94% rename from project/scn/WinDialogs.tscn rename to project/scn/PauseScn.tscn index 567ae0a..3ff02da 100644 --- a/project/scn/WinDialogs.tscn +++ b/project/scn/PauseScn.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] -[ext_resource path="res://src/WinDialogs.gd" type="Script" id=2] +[ext_resource path="res://src/PauseScn.gd" type="Script" id=2] [node name="WinDialogs" type="Control"] anchor_left = 0.5 @@ -13,7 +13,6 @@ script = ExtResource( 2 ) [node name="PauseWin" type="PopupDialog" parent="."] pause_mode = 2 -editor/display_folded = true anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -33,26 +32,26 @@ margin_bottom = -10.0 [node name="PauseLbl" type="Label" parent="PauseWin/PauseVbox"] margin_right = 156.0 -margin_bottom = 14.0 +margin_bottom = 21.0 text = "KPUS" align = 1 [node name="SettingsBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 18.0 +margin_top = 25.0 margin_right = 156.0 -margin_bottom = 38.0 +margin_bottom = 46.0 text = "KSET" [node name="ResumeBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 42.0 +margin_top = 50.0 margin_right = 156.0 -margin_bottom = 62.0 +margin_bottom = 71.0 text = "KRUS" [node name="ExitBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 66.0 +margin_top = 75.0 margin_right = 156.0 -margin_bottom = 86.0 +margin_bottom = 96.0 text = "KEXT" [node name="CreditsWin" type="AcceptDialog" parent="."] @@ -73,7 +72,7 @@ anchor_bottom = 1.0 margin_left = 8.0 margin_top = 8.0 margin_right = -8.0 -margin_bottom = -41.0 +margin_bottom = -37.0 focus_mode = 2 bbcode_enabled = true bbcode_text = "[center]Created by @@ -133,7 +132,7 @@ anchor_bottom = 0.5 margin_left = -68.0 margin_top = -26.0 margin_right = 68.0 -margin_bottom = -7.0 +margin_bottom = -3.0 columns = 3 [node name="Languages" type="MenuButton" parent="SettingsWin/Grid"] @@ -169,7 +168,7 @@ anchor_right = 0.5 margin_left = -194.0 margin_top = 8.0 margin_right = 194.0 -margin_bottom = 234.0 +margin_bottom = 238.0 bbcode_enabled = true bbcode_text = "Nathan's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn index 9b9f5d3..3948f01 100644 --- a/project/scn/TitleScn.tscn +++ b/project/scn/TitleScn.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] [ext_resource path="res://sprites/title.svg" type="Texture" id=3] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=4] [node name="Start" type="Node"] script = ExtResource( 1 ) @@ -28,27 +28,26 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -68.0 +margin_left = -67.5 margin_top = -42.5 -margin_right = 68.0 -margin_bottom = 42.5 +margin_right = 68.5 +margin_bottom = 61.5 [node name="PlayBtn" type="Button" parent="MenuRf/StartVbox"] margin_right = 136.0 -margin_bottom = 25.0 -toggle_mode = true +margin_bottom = 21.0 text = "KPLY" [node name="CreditsBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 29.0 +margin_top = 25.0 margin_right = 136.0 -margin_bottom = 54.0 +margin_bottom = 46.0 text = "KCRE" [node name="LicenseBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 58.0 +margin_top = 50.0 margin_right = 136.0 -margin_bottom = 83.0 +margin_bottom = 71.0 text = "KLIC" [node name="ModePanel" type="WindowDialog" parent="MenuRf"] @@ -92,6 +91,13 @@ margin_left = 97.0 margin_top = 37.0 margin_right = 97.0 margin_bottom = 37.0 + +[node name="Version" type="Label" parent="."] +margin_left = 950.908 +margin_top = 568.64 +margin_right = 990.908 +margin_bottom = 582.64 +text = "Version" [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"] diff --git a/project/sprites/biker_jacket.svg b/project/sprites/biker_jacket.svg new file mode 100644 index 0000000..0130602 --- /dev/null +++ b/project/sprites/biker_jacket.svg @@ -0,0 +1,137 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/sixam_wordmark.png.import b/project/sprites/biker_jacket.svg.import similarity index 68% rename from project/sprites/sixam_wordmark.png.import rename to project/sprites/biker_jacket.svg.import index c3a9736..c391efe 100644 --- a/project/sprites/sixam_wordmark.png.import +++ b/project/sprites/biker_jacket.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sixam_wordmark.png-a838e2a1a647ca5f6d38732caafef5a1.stex" +path="res://.import/biker_jacket.svg-e4eb87ceed9266fe4354ce7432371bfb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/sixam_wordmark.png" -dest_files=[ "res://.import/sixam_wordmark.png-a838e2a1a647ca5f6d38732caafef5a1.stex" ] +source_file="res://sprites/biker_jacket.svg" +dest_files=[ "res://.import/biker_jacket.svg-e4eb87ceed9266fe4354ce7432371bfb.stex" ] [params] diff --git a/project/sprites/exit_symbol.svg b/project/sprites/exit_symbol.svg index 909f745..072c26d 100644 --- a/project/sprites/exit_symbol.svg +++ b/project/sprites/exit_symbol.svg @@ -8,9 +8,9 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" - width="14.999983pt" - height="14.999971pt" - viewBox="0 0 14.999983 14.999971" + width="40pt" + height="40pt" + viewBox="0 0 40 39.999999" preserveAspectRatio="xMidYMid meet" id="svg8" sodipodi:docname="exit_symbol.svg" @@ -44,8 +44,8 @@ showgrid="false" inkscape:pagecheckerboard="true" inkscape:zoom="5.6568543" - inkscape:cx="48.959773" - inkscape:cy="24.135628" + inkscape:cx="19.438064" + inkscape:cy="24.135632" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" @@ -54,19 +54,14 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" /> - - - - + + diff --git a/project/sprites/icrazy_frame.svg b/project/sprites/icrazy_frame.svg new file mode 100644 index 0000000..bf53e75 --- /dev/null +++ b/project/sprites/icrazy_frame.svg @@ -0,0 +1,191 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/icrazy_frame.svg.import b/project/sprites/icrazy_frame.svg.import new file mode 100644 index 0000000..5f54b48 --- /dev/null +++ b/project/sprites/icrazy_frame.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icrazy_frame.svg-5b50831a46f310682a70f3d23d28a5f9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/icrazy_frame.svg" +dest_files=[ "res://.import/icrazy_frame.svg-5b50831a46f310682a70f3d23d28a5f9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/lights.png b/project/sprites/lights.png index fe63e81..f87d606 100644 Binary files a/project/sprites/lights.png and b/project/sprites/lights.png differ diff --git a/project/sprites/sixam_wordmark.png b/project/sprites/sixam_wordmark.png deleted file mode 100644 index 3f36f06..0000000 Binary files a/project/sprites/sixam_wordmark.png and /dev/null differ diff --git a/project/sprites/sixam_wordmark.svg b/project/sprites/sixam_wordmark.svg new file mode 100644 index 0000000..869638a --- /dev/null +++ b/project/sprites/sixam_wordmark.svg @@ -0,0 +1,96 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/sprites/sixam_wordmark.svg.import b/project/sprites/sixam_wordmark.svg.import new file mode 100644 index 0000000..e667915 --- /dev/null +++ b/project/sprites/sixam_wordmark.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sixam_wordmark.svg-b71d21b034a1362d87ee40fbd49bcca6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/sixam_wordmark.svg" +dest_files=[ "res://.import/sixam_wordmark.svg-b71d21b034a1362d87ee40fbd49bcca6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/whatsnew_shirt.svg b/project/sprites/whatsnew_shirt.svg index 994216b..30fb38a 100644 --- a/project/sprites/whatsnew_shirt.svg +++ b/project/sprites/whatsnew_shirt.svg @@ -49,12 +49,12 @@ fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="5.6568543" - inkscape:cx="61.06424" - inkscape:cy="59.691654" + inkscape:cx="57.175153" + inkscape:cy="57.852419" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer3" /> + inkscape:current-layer="layer2" /> + style="display:inline">