diff --git a/README.md b/README.md index 2a42dbc..bc9fff3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Zack's Dress Up 1½ -Zack's Dress Up is a basic drag and drop-based dress up game written and designed in Godot 3. It's a partial port and remake of my original Flash game, ZC's Dress Up, that contains all the original assets with only minor edits. +​Zack's Dress Up 1½​ is a basic drag and drop-based dress up game written and designed in Godot 3. It's a port of my original Flash game, ZC's Dress Up, that contains all the original assets with only minor edits. I have high confidence that I'll be able to get around to developing a proper sequel with newer graphics and better game play mechenics sometime Q1 2019. diff --git a/project/GameScreen.tscn b/project/GameScreen.tscn index 271eb58..79e9d86 100644 --- a/project/GameScreen.tscn +++ b/project/GameScreen.tscn @@ -2,13 +2,13 @@ [ext_resource path="res://src/GameScreen.gd" type="Script" id=1] [ext_resource path="res://assets/dress up bg.png" type="Texture" id=2] -[ext_resource path="res://assets/zack.png" type="Texture" id=3] -[ext_resource path="res://assets/lights.png" type="Texture" id=4] +[ext_resource path="res://assets/lights.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] -[node name="GameScreen" type="Node2D"] +[node name="GameScreen" type="Node" index="0"] script = ExtResource( 1 ) @@ -20,23 +20,17 @@ __meta__ = { "_edit_lock_": true } -[node name="Zack" type="Sprite" parent="." index="1"] - -position = Vector2( 85, 352 ) -texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} - -[node name="Lights" type="Sprite" parent="." index="2"] +[node name="Lights" type="Sprite" parent="." index="1"] position = Vector2( 477.823, 100.811 ) -texture = ExtResource( 4 ) +texture = ExtResource( 3 ) _sections_unfolded = [ "Z Index" ] __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 )] diff --git a/project/Interface.tscn b/project/Interface.tscn index 15eea5f..9f0cbd4 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -1,8 +1,12 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://src/Interface.gd" type="Script" id=1] [ext_resource path="res://music/piano.ogg" type="AudioStream" id=2] +[sub_resource type="ButtonGroup" id=1] + +resource_local_to_scene = true + [node name="Interface" type="Control"] anchor_left = 0.0 @@ -29,16 +33,16 @@ autoplay = true mix_target = 0 bus = "Master" -[node name="ReferenceRect" type="ReferenceRect" parent="." index="1"] +[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 = 11.0 -margin_top = 27.0 +margin_top = 16.0 margin_right = 165.0 -margin_bottom = 161.0 +margin_bottom = 178.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -46,7 +50,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="VertContainer" type="VBoxContainer" parent="ReferenceRect" index="0"] +[node name="VertContainer" type="VBoxContainer" parent="RefRect" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -64,7 +68,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 -[node name="MusicBtn" type="CheckBox" parent="ReferenceRect/VertContainer" index="0"] +[node name="MusicBtn" type="CheckBox" parent="RefRect/VertContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -92,7 +96,32 @@ flat = false align = 1 _sections_unfolded = [ "custom_colors" ] -[node name="CreditsBtn" type="Button" parent="ReferenceRect/VertContainer" index="1"] +[node name="SettingsBtn" type="Button" parent="RefRect/VertContainer" index="1"] + +visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 28.0 +margin_right = 147.0 +margin_bottom = 48.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 +text = "KSET" +flat = false +align = 1 + +[node name="CreditsBtn" type="Button" parent="RefRect/VertContainer" index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -116,7 +145,7 @@ text = "KCRE" flat = false align = 1 -[node name="AboutBtn" type="Button" parent="ReferenceRect/VertContainer" index="2"] +[node name="AboutBtn" type="Button" parent="RefRect/VertContainer" index="3"] anchor_left = 0.0 anchor_top = 0.0 @@ -270,10 +299,61 @@ selection_enabled = true override_selected_font_color = false _sections_unfolded = [ "BBCode" ] -[connection signal="toggled" from="ReferenceRect/VertContainer/MusicBtn" to="." method="_on_MusicBtn_toggled"] +[node name="SettingsWin" type="AcceptDialog" parent="." index="4"] -[connection signal="pressed" from="ReferenceRect/VertContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] +visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 242.0 +margin_top = 69.0 +margin_right = 379.0 +margin_bottom = 140.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 = "KSET" +resizable = false +dialog_hide_on_ok = true +_sections_unfolded = [ "Dialog" ] -[connection signal="pressed" from="ReferenceRect/VertContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] +[node name="Languages" type="MenuButton" parent="SettingsWin" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = 129.0 +margin_bottom = 35.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 +toggle_mode = false +action_mode = 0 +enabled_focus_mode = 0 +shortcut = null +group = SubResource( 1 ) +text = "Languages" +flat = true +align = 1 +items = [ ] + +[connection signal="toggled" from="RefRect/VertContainer/MusicBtn" to="." method="_on_MusicBtn_toggled"] + +[connection signal="pressed" from="RefRect/VertContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] + +[connection signal="pressed" from="RefRect/VertContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] + +[connection signal="pressed" from="RefRect/VertContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] diff --git a/project/Zack.tscn b/project/Zack.tscn new file mode 100644 index 0000000..a85e2a0 --- /dev/null +++ b/project/Zack.tscn @@ -0,0 +1,45 @@ +[gd_scene load_steps=11 format=2] + +[ext_resource path="res://assets/zack_base.png" type="Texture" id=1] +[ext_resource path="res://assets/eyes/eyes1.png" type="Texture" id=2] +[ext_resource path="res://assets/eyes/eyes2.png" type="Texture" id=3] +[ext_resource path="res://assets/eyes/eyes3.png" type="Texture" id=4] +[ext_resource path="res://assets/eyes/eyes4.png" type="Texture" id=5] +[ext_resource path="res://assets/eyes/eyes5.png" type="Texture" id=6] +[ext_resource path="res://assets/eyes/eyes6.png" type="Texture" id=7] +[ext_resource path="res://assets/eyes/eyes7.png" type="Texture" id=8] +[ext_resource path="res://assets/mouth/mouth.png" type="Texture" id=9] + +[sub_resource type="SpriteFrames" id=1] + +animations = [ { +"frames": [ ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 8 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] + +[node name="Zack" type="Node2D" index="0"] + +[node name="Base" type="Sprite" parent="." index="0"] + +position = Vector2( 92.6446, 354.064 ) +texture = ExtResource( 1 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="Eyes" type="AnimatedSprite" parent="." index="1"] + +position = Vector2( 109.519, 255.9 ) +frames = SubResource( 1 ) +animation = "default" +frame = 3 +playing = true + +[node name="Mouth" type="Sprite" parent="." index="2"] + +position = Vector2( 98.4389, 276.779 ) +texture = ExtResource( 9 ) + + diff --git a/project/assets/eyes/eyes1.png b/project/assets/eyes/eyes1.png new file mode 100644 index 0000000..c480043 Binary files /dev/null and b/project/assets/eyes/eyes1.png differ diff --git a/project/assets/eyes/eyes1.png.import b/project/assets/eyes/eyes1.png.import new file mode 100644 index 0000000..3dca977 --- /dev/null +++ b/project/assets/eyes/eyes1.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes1.png-aa858d638a23d47f6e4032a5d7ba92a3.stex" + +[deps] + +source_file="res://assets/eyes/eyes1.png" +dest_files=[ "res://.import/eyes1.png-aa858d638a23d47f6e4032a5d7ba92a3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes2.png b/project/assets/eyes/eyes2.png new file mode 100644 index 0000000..1e7c4d1 Binary files /dev/null and b/project/assets/eyes/eyes2.png differ diff --git a/project/assets/eyes/eyes2.png.import b/project/assets/eyes/eyes2.png.import new file mode 100644 index 0000000..a299ac2 --- /dev/null +++ b/project/assets/eyes/eyes2.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes2.png-e01c542f6c53f746cf3032fe571c04ac.stex" + +[deps] + +source_file="res://assets/eyes/eyes2.png" +dest_files=[ "res://.import/eyes2.png-e01c542f6c53f746cf3032fe571c04ac.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes3.png b/project/assets/eyes/eyes3.png new file mode 100644 index 0000000..d0e3bce Binary files /dev/null and b/project/assets/eyes/eyes3.png differ diff --git a/project/assets/eyes/eyes3.png.import b/project/assets/eyes/eyes3.png.import new file mode 100644 index 0000000..3fd309b --- /dev/null +++ b/project/assets/eyes/eyes3.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes3.png-93f0f2e08c0c341d9a7ccd1fa3224b60.stex" + +[deps] + +source_file="res://assets/eyes/eyes3.png" +dest_files=[ "res://.import/eyes3.png-93f0f2e08c0c341d9a7ccd1fa3224b60.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes4.png b/project/assets/eyes/eyes4.png new file mode 100644 index 0000000..4e695ba Binary files /dev/null and b/project/assets/eyes/eyes4.png differ diff --git a/project/assets/eyes/eyes4.png.import b/project/assets/eyes/eyes4.png.import new file mode 100644 index 0000000..f751566 --- /dev/null +++ b/project/assets/eyes/eyes4.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes4.png-935657edd1ab4ad240b6ccfd17095400.stex" + +[deps] + +source_file="res://assets/eyes/eyes4.png" +dest_files=[ "res://.import/eyes4.png-935657edd1ab4ad240b6ccfd17095400.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes5.png b/project/assets/eyes/eyes5.png new file mode 100644 index 0000000..d0e3bce Binary files /dev/null and b/project/assets/eyes/eyes5.png differ diff --git a/project/assets/eyes/eyes5.png.import b/project/assets/eyes/eyes5.png.import new file mode 100644 index 0000000..5e2e11a --- /dev/null +++ b/project/assets/eyes/eyes5.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes5.png-c1048d3d0e969d24b1ebbf898f25b418.stex" + +[deps] + +source_file="res://assets/eyes/eyes5.png" +dest_files=[ "res://.import/eyes5.png-c1048d3d0e969d24b1ebbf898f25b418.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes6.png b/project/assets/eyes/eyes6.png new file mode 100644 index 0000000..273199f Binary files /dev/null and b/project/assets/eyes/eyes6.png differ diff --git a/project/assets/eyes/eyes6.png.import b/project/assets/eyes/eyes6.png.import new file mode 100644 index 0000000..bdc9764 --- /dev/null +++ b/project/assets/eyes/eyes6.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes6.png-42ae52773be76d0f75a27b72f92cc126.stex" + +[deps] + +source_file="res://assets/eyes/eyes6.png" +dest_files=[ "res://.import/eyes6.png-42ae52773be76d0f75a27b72f92cc126.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/eyes/eyes7.png b/project/assets/eyes/eyes7.png new file mode 100644 index 0000000..c480043 Binary files /dev/null and b/project/assets/eyes/eyes7.png differ diff --git a/project/assets/eyes/eyes7.png.import b/project/assets/eyes/eyes7.png.import new file mode 100644 index 0000000..e68efff --- /dev/null +++ b/project/assets/eyes/eyes7.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/eyes7.png-975ad58cf9a1d07608243a0f49f2f430.stex" + +[deps] + +source_file="res://assets/eyes/eyes7.png" +dest_files=[ "res://.import/eyes7.png-975ad58cf9a1d07608243a0f49f2f430.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth.png b/project/assets/mouth/mouth.png new file mode 100644 index 0000000..23f5d0c Binary files /dev/null and b/project/assets/mouth/mouth.png differ diff --git a/project/assets/mouth/mouth.png.import b/project/assets/mouth/mouth.png.import new file mode 100644 index 0000000..ad733c3 --- /dev/null +++ b/project/assets/mouth/mouth.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth.png-d7730d0f2ae63c0bd7ed8bd4b15e737b.stex" + +[deps] + +source_file="res://assets/mouth/mouth.png" +dest_files=[ "res://.import/mouth.png-d7730d0f2ae63c0bd7ed8bd4b15e737b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth10.png b/project/assets/mouth/mouth10.png new file mode 100644 index 0000000..f55d9b3 Binary files /dev/null and b/project/assets/mouth/mouth10.png differ diff --git a/project/assets/mouth/mouth10.png.import b/project/assets/mouth/mouth10.png.import new file mode 100644 index 0000000..9f55e30 --- /dev/null +++ b/project/assets/mouth/mouth10.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth10.png-1a638009ae4e2715d670c10834a52fa0.stex" + +[deps] + +source_file="res://assets/mouth/mouth10.png" +dest_files=[ "res://.import/mouth10.png-1a638009ae4e2715d670c10834a52fa0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth11.png b/project/assets/mouth/mouth11.png new file mode 100644 index 0000000..6b245cf Binary files /dev/null and b/project/assets/mouth/mouth11.png differ diff --git a/project/assets/mouth/mouth11.png.import b/project/assets/mouth/mouth11.png.import new file mode 100644 index 0000000..bf1fdbf --- /dev/null +++ b/project/assets/mouth/mouth11.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth11.png-3e6ebc017cbb4b91b42c34bbbfd3ecba.stex" + +[deps] + +source_file="res://assets/mouth/mouth11.png" +dest_files=[ "res://.import/mouth11.png-3e6ebc017cbb4b91b42c34bbbfd3ecba.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth12.png b/project/assets/mouth/mouth12.png new file mode 100644 index 0000000..265721b Binary files /dev/null and b/project/assets/mouth/mouth12.png differ diff --git a/project/assets/mouth/mouth12.png.import b/project/assets/mouth/mouth12.png.import new file mode 100644 index 0000000..8c9ef83 --- /dev/null +++ b/project/assets/mouth/mouth12.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth12.png-2b29d803195ebbafb230104bd3c4289a.stex" + +[deps] + +source_file="res://assets/mouth/mouth12.png" +dest_files=[ "res://.import/mouth12.png-2b29d803195ebbafb230104bd3c4289a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth2.png b/project/assets/mouth/mouth2.png new file mode 100644 index 0000000..be85e57 Binary files /dev/null and b/project/assets/mouth/mouth2.png differ diff --git a/project/assets/mouth/mouth2.png.import b/project/assets/mouth/mouth2.png.import new file mode 100644 index 0000000..0dfffcf --- /dev/null +++ b/project/assets/mouth/mouth2.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth2.png-112e0b947ef6b4319f416fc82bd442f8.stex" + +[deps] + +source_file="res://assets/mouth/mouth2.png" +dest_files=[ "res://.import/mouth2.png-112e0b947ef6b4319f416fc82bd442f8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth3.png b/project/assets/mouth/mouth3.png new file mode 100644 index 0000000..5dbaefe Binary files /dev/null and b/project/assets/mouth/mouth3.png differ diff --git a/project/assets/mouth/mouth3.png.import b/project/assets/mouth/mouth3.png.import new file mode 100644 index 0000000..8e4131b --- /dev/null +++ b/project/assets/mouth/mouth3.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth3.png-1a30eea3e8bf771d522c14841b12fdb2.stex" + +[deps] + +source_file="res://assets/mouth/mouth3.png" +dest_files=[ "res://.import/mouth3.png-1a30eea3e8bf771d522c14841b12fdb2.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth4.png b/project/assets/mouth/mouth4.png new file mode 100644 index 0000000..f32783f Binary files /dev/null and b/project/assets/mouth/mouth4.png differ diff --git a/project/assets/mouth/mouth4.png.import b/project/assets/mouth/mouth4.png.import new file mode 100644 index 0000000..0f81483 --- /dev/null +++ b/project/assets/mouth/mouth4.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth4.png-b6e35031cd35604bde047f68aa45aa3b.stex" + +[deps] + +source_file="res://assets/mouth/mouth4.png" +dest_files=[ "res://.import/mouth4.png-b6e35031cd35604bde047f68aa45aa3b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth5.png b/project/assets/mouth/mouth5.png new file mode 100644 index 0000000..155e0cd Binary files /dev/null and b/project/assets/mouth/mouth5.png differ diff --git a/project/assets/mouth/mouth5.png.import b/project/assets/mouth/mouth5.png.import new file mode 100644 index 0000000..009b8a7 --- /dev/null +++ b/project/assets/mouth/mouth5.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth5.png-d83d9df17553995c7fb19b3a57ec244a.stex" + +[deps] + +source_file="res://assets/mouth/mouth5.png" +dest_files=[ "res://.import/mouth5.png-d83d9df17553995c7fb19b3a57ec244a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth6.png b/project/assets/mouth/mouth6.png new file mode 100644 index 0000000..545d987 Binary files /dev/null and b/project/assets/mouth/mouth6.png differ diff --git a/project/assets/mouth/mouth6.png.import b/project/assets/mouth/mouth6.png.import new file mode 100644 index 0000000..906f4df --- /dev/null +++ b/project/assets/mouth/mouth6.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth6.png-9a962eb7d367bcb46b2d547351fab8e9.stex" + +[deps] + +source_file="res://assets/mouth/mouth6.png" +dest_files=[ "res://.import/mouth6.png-9a962eb7d367bcb46b2d547351fab8e9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth7.png b/project/assets/mouth/mouth7.png new file mode 100644 index 0000000..f0bf5b1 Binary files /dev/null and b/project/assets/mouth/mouth7.png differ diff --git a/project/assets/mouth/mouth7.png.import b/project/assets/mouth/mouth7.png.import new file mode 100644 index 0000000..d2e2dfa --- /dev/null +++ b/project/assets/mouth/mouth7.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth7.png-02ab0f94c063f36d04b082f0a31ad4d9.stex" + +[deps] + +source_file="res://assets/mouth/mouth7.png" +dest_files=[ "res://.import/mouth7.png-02ab0f94c063f36d04b082f0a31ad4d9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth8.png b/project/assets/mouth/mouth8.png new file mode 100644 index 0000000..356fc19 Binary files /dev/null and b/project/assets/mouth/mouth8.png differ diff --git a/project/assets/mouth/mouth8.png.import b/project/assets/mouth/mouth8.png.import new file mode 100644 index 0000000..8c96986 --- /dev/null +++ b/project/assets/mouth/mouth8.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth8.png-4c2a02dae5e4dafbfbc0ee0afbbce06d.stex" + +[deps] + +source_file="res://assets/mouth/mouth8.png" +dest_files=[ "res://.import/mouth8.png-4c2a02dae5e4dafbfbc0ee0afbbce06d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/mouth/mouth9.png b/project/assets/mouth/mouth9.png new file mode 100644 index 0000000..37f0c50 Binary files /dev/null and b/project/assets/mouth/mouth9.png differ diff --git a/project/assets/mouth/mouth9.png.import b/project/assets/mouth/mouth9.png.import new file mode 100644 index 0000000..94f0b84 --- /dev/null +++ b/project/assets/mouth/mouth9.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth9.png-9cce36808e303dc5cce515b006fef411.stex" + +[deps] + +source_file="res://assets/mouth/mouth9.png" +dest_files=[ "res://.import/mouth9.png-9cce36808e303dc5cce515b006fef411.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/zack_base.png b/project/assets/zack_base.png new file mode 100644 index 0000000..a4187e1 Binary files /dev/null and b/project/assets/zack_base.png differ diff --git a/project/assets/zack_base.png.import b/project/assets/zack_base.png.import new file mode 100644 index 0000000..d1c3c79 --- /dev/null +++ b/project/assets/zack_base.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/zack_base.png-2923a5a1e7ff4f3f0fc3145ae1dd489a.stex" + +[deps] + +source_file="res://assets/zack_base.png" +dest_files=[ "res://.import/zack_base.png-2923a5a1e7ff4f3f0fc3145ae1dd489a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/lang/local.csv b/project/lang/local.csv index f30f2c9..365805d 100644 --- a/project/lang/local.csv +++ b/project/lang/local.csv @@ -3,4 +3,5 @@ KMUS,Music,Musik KCRE,Credits,Eftertexter KABO,About,Handla om KSOO,Coming Soon,Kommer snart -KHELP,Help,Hjälp \ No newline at end of file +KHELP,Help,Hjälp +KSET,Settings,Inställningar \ No newline at end of file diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index 543aa3c..f38e4d8 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 5047e21..5078e68 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/src/GameScreen.gd b/project/src/GameScreen.gd index 128857f..6be9448 100644 --- a/project/src/GameScreen.gd +++ b/project/src/GameScreen.gd @@ -1,4 +1,4 @@ -extends Node2D +extends Node onready var shell = $Shell onready var cmdl = $Shell/RefRect/CmdLine @@ -10,6 +10,8 @@ func _process(delta): cmd_interface() func cmd_interface(): + var settingsBtn = $Interface/RefRect/VertContainer/SettingsBtn + if Input.is_action_pressed("ui_shell"): if cmdl.text == CLOSE_CMD: cmdl.text = "" @@ -21,5 +23,9 @@ func cmd_interface(): TranslationServer.set_locale("en") elif cmdl.text == "help"and Input.is_key_pressed(KEY_ENTER): cmdl_help.show() + elif cmdl.text == "show settings" and Input.is_key_pressed(KEY_ENTER): + settingsBtn.show() + elif cmdl.text == "hide settings" and Input.is_key_pressed(KEY_ENTER): + settingsBtn.hide() 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 42c1236..3b1bff7 100644 --- a/project/src/Interface.gd +++ b/project/src/Interface.gd @@ -4,12 +4,16 @@ extends Control onready var about_win = $AboutWin onready var credits_win = $CreditsWin +onready var settings_win = $SettingsWin func _on_AboutBtn_pressed(): about_win.show() func _on_CreditsBtn_pressed(): credits_win.show() + +func _on_SettingsBtn_pressed(): + settings_win.show() func _on_MusicBtn_toggled(button_pressed): if button_pressed == true: