diff --git a/project/ImportItems.gd b/project/ImportItems.gd new file mode 100644 index 0000000..53d8bb0 --- /dev/null +++ b/project/ImportItems.gd @@ -0,0 +1,12 @@ +extends Node + +# export (String, FILE, "*.json") var item_file : String + +func load_items(file_path) -> Dictionary: + var file = File.new() + assert file.file_exists(file_path) + + file.open(file_path) + var items = parse_json(file.get_as_text()) + assert items.size() > 0 + return items \ No newline at end of file diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index 735432d..5a5bdfb 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=22 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] @@ -6,23 +6,21 @@ [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/beyond_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.svg" type="Texture" id=9] -[ext_resource path="res://sprites/beyond_jacket.svg" 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.svg" 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/x_button.svg" type="Texture" id=7] +[ext_resource path="res://sprites/old_sweatshirt.svg" type="Texture" id=8] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=9] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=10] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=11] +[ext_resource path="res://sprites/biker_jacket.svg" type="Texture" id=12] +[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=13] +[ext_resource path="res://sprites/train_hoodie.svg" type="Texture" id=14] +[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=15] +[ext_resource path="res://sprites/whatsnew_shirt.svg" type="Texture" id=16] +[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=17] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=18] +[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=19] +[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=20] +[ext_resource path="res://sprites/camera.png" type="Texture" id=21] [node name="Clothes" type="Node"] @@ -41,6 +39,7 @@ 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="Pants" type="Tabs" parent="Wordrobe"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 31.0 @@ -76,12 +75,6 @@ margin_right = 436.0 margin_bottom = 112.0 texture_normal = ExtResource( 6 ) -[node name="BeyondPants" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 440.0 -margin_right = 546.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 7 ) - [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] margin_top = 116.0 margin_right = 106.0 @@ -91,11 +84,10 @@ 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"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 31.0 @@ -110,75 +102,68 @@ 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="BeyondJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_right = 174.0 margin_bottom = 115.0 +texture_normal = ExtResource( 9 ) + +[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 178.0 +margin_right = 284.0 +margin_bottom = 115.0 texture_normal = ExtResource( 10 ) -[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 178.0 -margin_right = 263.0 +[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 288.0 +margin_right = 369.0 margin_bottom = 115.0 texture_normal = ExtResource( 11 ) -[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 267.0 -margin_right = 373.0 +[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 373.0 +margin_right = 458.0 margin_bottom = 115.0 texture_normal = ExtResource( 12 ) -[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 377.0 -margin_right = 458.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 13 ) - -[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 462.0 margin_right = 547.0 margin_bottom = 115.0 -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 13 ) -[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 551.0 margin_right = 636.0 margin_bottom = 115.0 -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 14 ) -[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_top = 119.0 margin_right = 85.0 margin_bottom = 234.0 -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 15 ) -[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_top = 119.0 margin_right = 174.0 margin_bottom = 234.0 -texture_normal = ExtResource( 17 ) - -[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 178.0 -margin_top = 119.0 -margin_right = 263.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 16 ) [node name="RemoveShirt" type="Button" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 267.0 +margin_left = 178.0 margin_top = 119.0 -margin_right = 373.0 +margin_right = 284.0 margin_bottom = 234.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="Underwear" type="Tabs" parent="Wordrobe"] @@ -198,25 +183,25 @@ 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( 17 ) [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( 18 ) [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( 19 ) [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( 20 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] editor/display_folded = true @@ -234,17 +219,17 @@ columns = 6 [node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccsGrid"] margin_right = 85.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 23 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 21 ) [node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccsGrid"] margin_left = 89.0 -margin_right = 207.0 -margin_bottom = 118.0 +margin_right = 195.0 +margin_bottom = 112.0 rect_min_size = Vector2( 85, 105 ) 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 7a31960..051ca30 100644 --- a/project/scn/CreditsScn.tscn +++ b/project/scn/CreditsScn.tscn @@ -9,6 +9,15 @@ [node name="Credits" type="Node"] script = ExtResource( 1 ) +[node name="RichTextLabel" type="RichTextLabel" parent="."] +margin_left = 33.0 +margin_top = 19.0 +margin_right = 320.0 +margin_bottom = 206.0 +theme = ExtResource( 2 ) +bbcode_text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." +text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." + [node name="Credits" type="RichTextLabel" parent="."] anchor_left = 0.5 anchor_right = 0.5 @@ -28,8 +37,8 @@ Megawolf77 Canon Rhode Raier -[img]sprites/sixam_wordmark.svg[/img] -sixam.xyz +Made with +Godot Engine [/center]" text = "Created by Anthony Wilcox @@ -42,8 +51,8 @@ Megawolf77 Canon Rhode Raier - -sixam.xyz +Made with +Godot Engine " [node name="Character" parent="." instance=ExtResource( 3 )] diff --git a/project/sprites/beyond_jacket.svg b/project/sprites/beyond_jacket.svg deleted file mode 100644 index 6927c21..0000000 --- a/project/sprites/beyond_jacket.svg +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/project/sprites/beyond_jacket.svg.import b/project/sprites/beyond_jacket.svg.import deleted file mode 100644 index 39a496c..0000000 --- a/project/sprites/beyond_jacket.svg.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/beyond_jacket.svg-98f6b1bf2a6317c20336645182f41937.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/beyond_jacket.svg" -dest_files=[ "res://.import/beyond_jacket.svg-98f6b1bf2a6317c20336645182f41937.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/beyond_jeans.svg b/project/sprites/beyond_jeans.svg deleted file mode 100644 index 5e8e8ce..0000000 --- a/project/sprites/beyond_jeans.svg +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/project/sprites/beyond_jeans.svg.import b/project/sprites/beyond_jeans.svg.import deleted file mode 100644 index 32afa42..0000000 --- a/project/sprites/beyond_jeans.svg.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/beyond_jeans.svg-7d94689020ceb4d3ef57e6a831a9ead6.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/beyond_jeans.svg" -dest_files=[ "res://.import/beyond_jeans.svg-7d94689020ceb4d3ef57e6a831a9ead6.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/tops.json b/project/sprites/tops.json new file mode 100644 index 0000000..05ca6c7 --- /dev/null +++ b/project/sprites/tops.json @@ -0,0 +1,7 @@ +{ + "accessoires": { + "camera": { + "sprite": {} + } + } +} \ No newline at end of file diff --git a/project/src/GameKit.gd b/project/src/GameKit.gd index 1d069eb..e7f7783 100644 --- a/project/src/GameKit.gd +++ b/project/src/GameKit.gd @@ -2,7 +2,7 @@ # See the LICENSE file in the project root for more information. extends Node -var version = "19.xx" +var version = "2.0" func is_game_paused(is_paused): if is_paused == true: diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd index 612a05d..07398cd 100644 --- a/project/src/GameScn.gd +++ b/project/src/GameScn.gd @@ -53,10 +53,6 @@ func _process(delta): if $Clothes/Wordrobe/Pants/PantsGrid/Jeans.is_pressed(): change_bottoms(load("res://sprites/jeans.svg")) - if $Clothes/Wordrobe/Pants/PantsGrid/BeyondPants.is_pressed(): - change_bottoms(load("res://sprites/beyond_jeans.svg")) - - if $Clothes/Wordrobe/Pants/PantsGrid/Sweats.is_pressed(): change_bottoms(load("res://sprites/sweat_pants.svg")) @@ -83,11 +79,8 @@ func _process(delta): if $Clothes/Wordrobe/Shirts/ShirtsGrid/TrainHoodie.is_pressed(): change_tops(load("res://sprites/train_hoodie.svg")) - if $Clothes/Wordrobe/Shirts/ShirtsGrid/WhatsNewShirt.is_pressed(): - change_tops(load("res://sprites/whatsnew_shirt.svg")) - - if $Clothes/Wordrobe/Shirts/ShirtsGrid/BeyondJacket.is_pressed(): - change_tops(load("res://sprites/beyond_jacket.svg")) + if $Clothes/Wordrobe/Shirts/ShirtsGrid/Sweatshirt.is_pressed(): + change_tops(load("res://sprites/old_sweatshirt.svg")) # Remove clothes # ===========================================================