diff --git a/project/Clothes.tscn b/project/Clothes.tscn index cfc1f11..9f8c852 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://src/Clothes.gd" type="Script" id=1] [ext_resource path="res://assets/DressUp.theme" type="Theme" id=2] @@ -13,13 +13,14 @@ [ext_resource path="res://assets/z_shirt.png" type="Texture" id=11] [ext_resource path="res://assets/biker_jacket.png" type="Texture" id=12] [ext_resource path="res://assets/nl_jacket.png" type="Texture" id=13] -[ext_resource path="res://assets/briefs.png" type="Texture" id=14] -[ext_resource path="res://assets/zbriefs.png" type="Texture" id=15] -[ext_resource path="res://assets/owo_censor.png" type="Texture" id=16] -[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=17] -[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=18] +[ext_resource path="res://assets/korm_shirt.png" type="Texture" id=14] +[ext_resource path="res://assets/briefs.png" type="Texture" id=15] +[ext_resource path="res://assets/zbriefs.png" type="Texture" id=16] +[ext_resource path="res://assets/owo_censor.png" type="Texture" id=17] +[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=18] +[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=19] -[node name="Clothes" type="Node" index="0"] +[node name="Clothes" type="Node"] script = ExtResource( 1 ) @@ -30,9 +31,9 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 211.0 -margin_top = 9.0 +margin_top = 30.0 margin_right = 794.0 -margin_bottom = 447.0 +margin_bottom = 460.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -49,9 +50,9 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 13.0 -margin_top = 4.0 +margin_top = 12.0 margin_right = 575.0 -margin_bottom = 431.0 +margin_bottom = 417.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -64,6 +65,7 @@ _sections_unfolded = [ "Theme" ] [node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"] +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -78,10 +80,9 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -theme = ExtResource( 2 ) tab_align = 1 scrolling_enabled = true -_sections_unfolded = [ "Theme" ] +_sections_unfolded = [ "Theme", "custom_icons" ] [node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants" index="0"] @@ -89,8 +90,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 551.0 -margin_bottom = 112.0 +margin_left = 2.0 +margin_right = 559.0 +margin_bottom = 330.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -192,7 +194,6 @@ _sections_unfolded = [ "Textures" ] [node name="Shirts" type="Tabs" parent="RefRect/Wordrobe" index="1"] -visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -374,7 +375,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 119.0 margin_right = 85.0 -margin_bottom = 229.0 +margin_bottom = 234.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -389,6 +390,30 @@ group = null texture_normal = ExtResource( 13 ) _sections_unfolded = [ "Textures" ] +[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="7"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 89.0 +margin_top = 119.0 +margin_right = 174.0 +margin_bottom = 234.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +texture_normal = ExtResource( 14 ) +_sections_unfolded = [ "Textures" ] + [node name="Underwear" type="Tabs" parent="RefRect/Wordrobe" index="2"] visible = false @@ -444,7 +469,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) [node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="1"] @@ -466,7 +491,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 16 ) _sections_unfolded = [ "Textures" ] [node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"] @@ -489,7 +514,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 17 ) _sections_unfolded = [ "Textures" ] [node name="ClearBtn" type="Button" parent="RefRect" index="1"] @@ -498,10 +523,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 514.0 -margin_top = 4.0 +margin_left = 504.0 +margin_top = 9.0 margin_right = 575.0 -margin_bottom = 24.0 +margin_bottom = 29.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -513,7 +538,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -text = "Clear" +text = "KCLR" flat = false align = 1 @@ -524,7 +549,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 26.0 -margin_top = 282.0 +margin_top = 285.0 margin_right = 144.0 margin_bottom = 519.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -537,17 +562,17 @@ size_flags_vertical = 1 [node name="Undies" type="Sprite" parent="Body" index="0"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) [node name="Bottom" type="Sprite" parent="Body" index="1"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 17 ) +texture = ExtResource( 18 ) [node name="Top" type="Sprite" parent="Body" index="2"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 18 ) +texture = ExtResource( 19 ) [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Jeans" to="." method="_on_Jeans_pressed"] @@ -571,6 +596,8 @@ texture = ExtResource( 18 ) [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/NL Jacket" to="." method="_on_NL_Jacket_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Korm Shirt" to="." method="_on_Korm_Shirt_pressed"] + [connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Briefs" to="." method="_on_Briefs_pressed"] [connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/ZBriefs" to="." method="_on_ZBriefs_pressed"] diff --git a/project/GameScreen.tscn b/project/GameScreen.tscn index 80456d7..4d6e536 100644 --- a/project/GameScreen.tscn +++ b/project/GameScreen.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://src/GameScreen.gd" type="Script" id=1] [ext_resource path="res://assets/15_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3] [ext_resource path="res://Zack.tscn" type="PackedScene" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://Shell.tscn" type="PackedScene" id=6] -[ext_resource path="res://Interface.tscn" type="PackedScene" id=7] +[ext_resource path="res://Interface.tscn" type="PackedScene" id=6] [node name="GameScreen" type="Node"] @@ -22,17 +21,16 @@ __meta__ = { [node name="PicFrame" type="Sprite" parent="." index="1"] -position = Vector2( 93.9417, 179.396 ) +position = Vector2( 93.9417, 121.396 ) texture = ExtResource( 3 ) +__meta__ = { +"_edit_lock_": true +} [node name="Zack" parent="." index="2" instance=ExtResource( 4 )] [node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] -[node name="Shell" parent="." index="4" instance=ExtResource( 6 )] - -visible = false - -[node name="Interface" parent="." index="5" instance=ExtResource( 7 )] +[node name="Interface" parent="." index="4" instance=ExtResource( 6 )] diff --git a/project/Interface.tscn b/project/Interface.tscn index 36ef34f..7a5275a 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/Interface.gd" type="Script" id=1] [ext_resource path="res://music/piano.ogg" type="AudioStream" id=2] -[node name="Interface" type="Control"] +[node name="Interface" type="Control" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -35,10 +35,23 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 16.0 -margin_top = 16.0 -margin_right = 179.0 -margin_bottom = 95.0 +margin_top = 7.0 +margin_right = 800.0 +margin_bottom = 31.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Anchor", "Margin", "Rect" ] + +[node name="GPanel" type="Panel" parent="RefRect" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -46,16 +59,12 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="VertContainer" type="VBoxContainer" parent="RefRect" index="0"] +[node name="HBoxContainer" type="HBoxContainer" parent="RefRect/GPanel" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 4.0 -margin_top = 3.0 -margin_right = -3.0 -margin_bottom = -85.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -64,14 +73,14 @@ size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 -[node name="SettingsBtn" type="Button" parent="RefRect/VertContainer" index="0"] +[node name="SettingsBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 156.0 -margin_bottom = 20.0 +margin_right = 41.0 +margin_bottom = 24.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -84,18 +93,18 @@ enabled_focus_mode = 2 shortcut = null group = null text = "KSET" -flat = false +flat = true align = 1 -[node name="CreditsBtn" type="Button" parent="RefRect/VertContainer" index="1"] +[node name="CreditsBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 24.0 -margin_right = 156.0 -margin_bottom = 44.0 +margin_left = 45.0 +margin_right = 88.0 +margin_bottom = 24.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -108,18 +117,18 @@ enabled_focus_mode = 2 shortcut = null group = null text = "KCRE" -flat = false +flat = true align = 1 -[node name="AboutBtn" type="Button" parent="RefRect/VertContainer" index="2"] +[node name="AboutBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 48.0 -margin_right = 156.0 -margin_bottom = 68.0 +margin_left = 92.0 +margin_right = 141.0 +margin_bottom = 24.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -132,7 +141,7 @@ enabled_focus_mode = 2 shortcut = null group = null text = "KABO" -flat = false +flat = true align = 1 _sections_unfolded = [ "Margin" ] @@ -318,6 +327,7 @@ columns = 2 [node name="Languages" type="MenuButton" parent="SettingsWin/Grid" index="0"] pause_mode = 1 +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -365,11 +375,11 @@ text = "KMUS" flat = false align = 1 -[connection signal="pressed" from="RefRect/VertContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] +[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] -[connection signal="pressed" from="RefRect/VertContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] +[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] -[connection signal="pressed" from="RefRect/VertContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] +[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] [connection signal="toggled" from="SettingsWin/Grid/MusicBtn" to="." method="_on_MusicBtn_toggled"] diff --git a/project/Shell.tscn b/project/Shell.tscn deleted file mode 100644 index 1364fee..0000000 --- a/project/Shell.tscn +++ /dev/null @@ -1,115 +0,0 @@ -[gd_scene format=2] - -[node name="Shell" type="Control"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 40.0 -margin_bottom = 40.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 - -[node name="HelpWin" type="WindowDialog" parent="." index="0"] - -visible = false -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 183.0 -margin_top = 124.0 -margin_right = 373.0 -margin_bottom = 198.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -popup_exclusive = false -window_title = "KHELP" -resizable = false - -[node name="HelpTxt" type="RichTextLabel" parent="HelpWin" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_top = 4.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = true -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -bbcode_enabled = true -bbcode_text = "[center]help - Shows this window -lang en - Use English -lang sv - Use Swedish -close - Closes the shell[/center]" -visible_characters = -1 -percent_visible = 1.0 -meta_underlined = true -tab_size = 4 -text = "help - Shows this window -lang en - Use English -lang sv - Use Swedish -close - Closes the shell" -scroll_active = true -scroll_following = false -selection_enabled = true -override_selected_font_color = false -_sections_unfolded = [ "BBCode" ] - -[node name="RefRect" type="ReferenceRect" parent="." index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 498.0 -margin_top = 6.0 -margin_right = 791.0 -margin_bottom = 42.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 - -[node name="CmdLine" type="LineEdit" parent="RefRect" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 6.0 -margin_top = 6.0 -margin_right = 288.0 -margin_bottom = 30.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 1 -size_flags_horizontal = 1 -size_flags_vertical = 1 -max_length = 30 -focus_mode = 2 -context_menu_enabled = true -placeholder_alpha = 0.6 -caret_blink = true -caret_blink_speed = 0.65 -caret_position = 0 -_sections_unfolded = [ "Caret" ] - - diff --git a/project/Zack.tscn b/project/Zack.tscn index 6d9abb8..9497aa9 100644 --- a/project/Zack.tscn +++ b/project/Zack.tscn @@ -54,25 +54,23 @@ animations = [ { [node name="Tail" type="AnimatedSprite" parent="." index="0"] -position = Vector2( 50.6951, 374.417 ) +position = Vector2( 49.6951, 374.417 ) frames = SubResource( 1 ) animation = "default" -frame = 6 +frame = 3 playing = true [node name="Base" type="Sprite" parent="." index="1"] -position = Vector2( 92.6446, 354.064 ) +position = Vector2( 91.6446, 354.064 ) texture = ExtResource( 4 ) -__meta__ = { -"_edit_lock_": true -} [node name="Eyes" type="AnimatedSprite" parent="." index="2"] position = Vector2( 109.519, 255.9 ) frames = SubResource( 2 ) animation = "default" +frame = 2 playing = true [node name="Mouth" type="AnimatedSprite" parent="." index="3"] @@ -80,7 +78,7 @@ playing = true position = Vector2( 126.316, 257.474 ) frames = SubResource( 3 ) animation = "default" -frame = 15 +frame = 18 playing = true diff --git a/project/assets/korm_shirt.png b/project/assets/korm_shirt.png new file mode 100644 index 0000000..7b6d064 Binary files /dev/null and b/project/assets/korm_shirt.png differ diff --git a/project/assets/zack.png.import b/project/assets/korm_shirt.png.import similarity index 65% rename from project/assets/zack.png.import rename to project/assets/korm_shirt.png.import index b1cc0bf..d45e86f 100644 --- a/project/assets/zack.png.import +++ b/project/assets/korm_shirt.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/zack.png-74318faf97fac49ca9782014f761fb29.stex" +path="res://.import/korm_shirt.png-3d26ee9fe93558323bae3b6acd03f1ef.stex" [deps] -source_file="res://assets/zack.png" -dest_files=[ "res://.import/zack.png-74318faf97fac49ca9782014f761fb29.stex" ] +source_file="res://assets/korm_shirt.png" +dest_files=[ "res://.import/korm_shirt.png-3d26ee9fe93558323bae3b6acd03f1ef.stex" ] [params] diff --git a/project/assets/nl_jacket.png b/project/assets/nl_jacket.png index 6cb026f..b6911bd 100644 Binary files a/project/assets/nl_jacket.png and b/project/assets/nl_jacket.png differ diff --git a/project/assets/zack.png b/project/assets/zack.png deleted file mode 100644 index 22a4113..0000000 Binary files a/project/assets/zack.png and /dev/null differ diff --git a/project/assets/zack_base.png b/project/assets/zack_base.png index a4187e1..05d00d7 100644 Binary files a/project/assets/zack_base.png and b/project/assets/zack_base.png differ diff --git a/project/lang/local.csv b/project/lang/local.csv index 19f4e3c..a96296f 100644 --- a/project/lang/local.csv +++ b/project/lang/local.csv @@ -1,10 +1,14 @@ ,en,sv +KENG,English,Engelsk +KSWD,Swedish,Svenska +KBOT,Pants,Byxor +KTOP,Shirts,Skjorta +KUND,Underwear,Underkläder +KCLR,Clear,Klar KMUS,Music,Musik KCRE,Credits,Eftertexter KABO,About,Handla om KSOO,Coming Soon,Kommer snart KHELP,Help,Hjälp KSET,Settings,Inställningar -KLANG,Languages,Språk -KENG,English,Engelsk -KSWD,Swedish,Svenska \ No newline at end of file +KLANG,Languages,Språk \ No newline at end of file diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index ce0aee3..2507e0c 100644 Binary files a/project/lang/local.en.translation and b/project/lang/local.en.translation differ diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation index 8f091f7..7d6d3b3 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/project.godot b/project/project.godot index f0ac40d..8f0f834 100644 --- a/project/project.godot +++ b/project/project.godot @@ -35,4 +35,6 @@ translations=PoolStringArray( "res://lang/local.en.translation", "res://lang/loc [rendering] +quality/intended_usage/framebuffer_allocation=0 +quality/2d/use_pixel_snap=true environment/default_environment="res://default_env.tres" diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index e701d0e..bb9e40a 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -3,7 +3,7 @@ extends Node onready var bottoms = load("res://assets/bottoms_placeholder.png") -onready var undies = load("res://assets/zbriefs.png") +onready var undies = load("res://assets/briefs.png") onready var tops = load("res://assets/tops_placeholder.png") func change_bottoms(new_bottom): @@ -19,10 +19,6 @@ func change_bottoms(new_bottom): func change_undies(new_undies): undies = new_undies - - if new_undies == null: - $Body/Undies.texture = undies - $Body/Undies.texture = undies func change_tops(new_top): @@ -63,6 +59,9 @@ func _on_Raw_pressed(): func _on_Atomic_pressed(): change_tops(load("res://assets/atomic_shirt.png")) + +func _on_Korm_Shirt_pressed(): + change_tops(load("res://assets/korm_shirt.png")) func _on_Z_Shirt_pressed(): change_tops(load("res://assets/z_shirt.png")) @@ -78,5 +77,5 @@ func _on_NL_Jacket_pressed(): func _on_ClearBtn_pressed(): change_bottoms(null) - change_undies(null) + change_undies(load("res://assets/briefs.png")) change_tops(null) diff --git a/project/src/GameScreen.gd b/project/src/GameScreen.gd index 9345cf7..4ff60c6 100644 --- a/project/src/GameScreen.gd +++ b/project/src/GameScreen.gd @@ -1,24 +1,3 @@ +# Anthony Wilcox licenses this file to you under the GPL license. +# See the LICENSE file in the project root for more information. extends Node - -const CLOSE_CMD = "close" - -func _process(delta): - shell_interface() - -func shell_interface(): - var shell = $Shell - var cmdl = $Shell/RefRect/CmdLine - var cmdl_help = $Shell/HelpWin - var settingsWin = $Interface/SettingsWin - - if Input.is_action_pressed("ui_shell"): - if cmdl.text == CLOSE_CMD: - cmdl.text = "" - shell.show() - - if cmdl.text == "help" and Input.is_key_pressed(KEY_ENTER): - cmdl_help.show() - elif cmdl.text == "settings" and Input.is_key_pressed(KEY_ENTER): - settingsWin.show() - elif cmdl.text == CLOSE_CMD and Input.is_key_pressed(KEY_ENTER): - shell.hide() diff --git a/project/src/Interface.gd b/project/src/Interface.gd index 8f23541..9a14f73 100644 --- a/project/src/Interface.gd +++ b/project/src/Interface.gd @@ -7,7 +7,6 @@ onready var credits_win = $CreditsWin onready var settings_win = $SettingsWin func _on_AboutBtn_pressed(): - about_win.show() func _on_CreditsBtn_pressed():