tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-05 13:34:48 -04:00
Code Issues Releases Wiki Activity

Interactive fan

Browse source 
- Enabled outfit selection again
This commit is contained in:
Tony Bark 2024-01-19 14:56:36 -05:00
parent 5a0223b340
commit e977e944c2
8 changed files with 66 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/scenes/game.tscn
View file

@ -1,11 +1,13 @@
[gd_scene load_steps=33 format=3 uid="uid://cvr2aries2lhr"]
[gd_scene load_steps=36 format=3 uid="uid://cvr2aries2lhr"]
[ext_resource type="Script" path="res://src/scripts/game.gd" id="1_qt3fe"]
[ext_resource type="Texture2D" uid="uid://33g80p0qnfw4" path="res://src/sprites/world/background.svg" id="1_uee2i"]
[ext_resource type="AudioStream" uid="uid://b01v3d3npeyt1" path="res://src/sounds/kenny_ui_sounds/click_001.wav" id="2_0ca4n"]
[ext_resource type="Texture2D" uid="uid://bi7ayrxnn7hex" path="res://src/sprites/world/icrazy_frame.svg" id="2_n1kmf"]
[ext_resource type="AudioStream" uid="uid://dd1xw5yy6ckcg" path="res://src/sounds/kenny_ui_sounds/click_002.wav" id="3_who0m"]
[ext_resource type="AudioStream" uid="uid://cqtk1nmij02ue" path="res://src/sounds/kenny_ui_sounds/switch_004.wav" id="4_1vpui"]
[ext_resource type="Texture2D" uid="uid://d1u3w61r0uv7p" path="res://src/sprites/world/boxersOfAmericaFrame.png" id="4_327cy"]
[ext_resource type="AudioStream" uid="uid://y4amvcp0iak4" path="res://src/sounds/fan.ogg" id="4_ce266"]
[ext_resource type="PackedScene" uid="uid://detf8uwimqp3v" path="res://src/scenes/character.tscn" id="6_tdil0"]
[ext_resource type="SpriteFrames" uid="uid://bhyon1s1op8ly" path="res://src/scenes/items.tres" id="7_3ykci"]
[ext_resource type="Texture2D" uid="uid://d1ebnalp5ubm5" path="res://src/sprites/world/fan/fan0001.png" id="8_op8gm"]
@ -31,6 +33,7 @@
[ext_resource type="Texture2D" uid="uid://u5nmph4ob2rt" path="res://src/sprites/world/fan/fan0013.png" id="20_6cokn"]
[ext_resource type="Texture2D" uid="uid://63nrlmta5nbc" path="res://src/sprites/world/fan/fan0014.png" id="21_4g4xp"]
[ext_resource type="Texture2D" uid="uid://bewpgbagatqn0" path="res://src/sprites/world/shelf.png" id="22_kss16"]
[ext_resource type="Texture2D" uid="uid://b5vt6y7uf4fi1" path="res://src/sprites/world/fan-button.png" id="33_oenpt"]
[sub_resource type="SpriteFrames" id="SpriteFrames_wfogq"]
animations = [{
@ -79,7 +82,7 @@ animations = [{
}],
"loop": true,
"name": &"default",
"speed": 10.0
"speed": 100.0
}]
[node name="Game" type="Node"]
@ -91,6 +94,12 @@ stream = ExtResource("2_0ca4n")
[node name="BackClick" type="AudioStreamPlayer" parent="."]
stream = ExtResource("3_who0m")
[node name="FanClick" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_1vpui")
[node name="FanAsmr" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_ce266")
[node name="World" type="Node2D" parent="."]
[node name="Background" type="Sprite2D" parent="World"]
@ -111,9 +120,6 @@ texture = ExtResource("2_n1kmf")
[node name="Fan" type="AnimatedSprite2D" parent="World"]
position = Vector2(523.641, 120.505)
sprite_frames = SubResource("SpriteFrames_wfogq")
frame = 10
frame_progress = 0.989141
speed_scale = 2.0
[node name="Shelf" type="Sprite2D" parent="World"]
position = Vector2(522.056, 189.082)
@ -121,6 +127,7 @@ texture = ExtResource("22_kss16")
[node name="Character" parent="." instance=ExtResource("6_tdil0")]
position = Vector2(291.682, 143.132)
rotation = -0.00207467
[node name="Seperate" type="Node2D" parent="Character"]
position = Vector2(-299.61, -133.222)
@ -139,7 +146,7 @@ animation = &"tops"
visible = false
position = Vector2(-2.43002, 124.632)
sprite_frames = ExtResource("7_3ykci")
animation = &"fullbody"
animation = &"outfits"
[node name="Canvas" type="CanvasLayer" parent="."]
@ -238,7 +245,6 @@ theme_override_styles/hover = ExtResource("11_a038t")
theme_override_styles/pressed = ExtResource("11_a038t")
theme_override_styles/disabled = ExtResource("15_0xxs0")
theme_override_styles/focus = ExtResource("11_a038t")
disabled = true
text = "Outfits"
metadata/_edit_use_anchors_ = true
@ -323,6 +329,17 @@ script = ExtResource("12_o3hu5")
icon_type = "brands"
icon_name = "creative-commons-zero"
[node name="FanBtn" type="TextureButton" parent="Canvas/UI"]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.866667
anchor_top = 0.4075
anchor_right = 0.88
anchor_bottom = 0.4225
toggle_mode = true
texture_normal = ExtResource("33_oenpt")
metadata/_edit_use_anchors_ = true
[connection signal="pressed" from="Canvas/UI/DressUpCtrls/TopsFwdBtn" to="." method="_on_tops_fwd_btn_pressed"]
[connection signal="pressed" from="Canvas/UI/DressUpCtrls/TopsBckBtn" to="." method="_on_tops_bck_btn_pressed"]
[connection signal="pressed" from="Canvas/UI/DressUpCtrls/BottomsBckBtn" to="." method="_on_bottoms_bck_btn_pressed"]
@ -330,3 +347,4 @@ icon_name = "creative-commons-zero"
[connection signal="pressed" from="Canvas/UI/SettingsCtrls/FullbodyBtn" to="." method="_on_fullbody_btn_pressed"]
[connection signal="pressed" from="Canvas/UI/SettingsCtrls/SeparateBtn" to="." method="_on_separate_btn_pressed"]
[connection signal="pressed" from="Canvas/UI/SettingsCtrls/SaveBtn" to="." method="_on_save_btn_pressed"]
[connection signal="toggled" from="Canvas/UI/FanBtn" to="." method="_on_fan_btn_toggled"]

12
src/scenes/items.tres
View file

@ -1,4 +1,4 @@
[gd_resource type="SpriteFrames" load_steps=28 format=3 uid="uid://bhyon1s1op8ly"]
[gd_resource type="SpriteFrames" load_steps=26 format=3 uid="uid://bhyon1s1op8ly"]
[ext_resource type="Texture2D" uid="uid://4f7dfxy24fey" path="res://src/sprites/clothes/sequences/bottoms/bottoms0001.png" id="1_i4r3c"]
[ext_resource type="Texture2D" uid="uid://bs6nkpurxgr3p" path="res://src/sprites/clothes/sequences/bottoms/bottoms0002.png" id="2_pkmjm"]
@ -14,9 +14,7 @@
[ext_resource type="Texture2D" uid="uid://ccl0jntyuqb1l" path="res://src/sprites/clothes/sequences/outfits/outfits0003.png" id="12_rl56u"]
[ext_resource type="Texture2D" uid="uid://1vp35m015ypl" path="res://src/sprites/clothes/sequences/outfits/outfits0004.png" id="13_hhvfk"]
[ext_resource type="Texture2D" uid="uid://d3bhccyds3af6" path="res://src/sprites/clothes/sequences/outfits/outfits0005.png" id="14_tgnpk"]
[ext_resource type="Texture2D" uid="uid://duhwfr8wv184a" path="res://src/sprites/clothes/sequences/outfits/outfits0006.png" id="15_gcogo"]
[ext_resource type="Texture2D" uid="uid://tqeyv6mvy6x0" path="res://src/sprites/clothes/sequences/outfits/outfits0007.png" id="16_fogca"]
[ext_resource type="Texture2D" uid="uid://22rtpk5uwfot" path="res://src/sprites/clothes/sequences/outfits/outfits0008.png" id="17_8r7xk"]
[ext_resource type="Texture2D" uid="uid://3gxc6wknllcq" path="res://src/sprites/clothes/sequences/tops/tops0001.png" id="18_edhqb"]
[ext_resource type="Texture2D" uid="uid://dhjg5vo1cs62m" path="res://src/sprites/clothes/sequences/tops/tops0002.png" id="19_57y8n"]
[ext_resource type="Texture2D" uid="uid://b3f3sxfsteowe" path="res://src/sprites/clothes/sequences/tops/tops0003.png" id="20_s7eb7"]
@ -79,16 +77,10 @@ animations = [{
"texture": ExtResource("14_tgnpk")
}, {
"duration": 1.0,
"texture": ExtResource("15_gcogo")
}, {
"duration": 1.0,
"texture": ExtResource("16_fogca")
}, {
"duration": 1.0,
"texture": ExtResource("17_8r7xk")
}],
"loop": true,
"name": &"fullbody",
"name": &"outfits",
"speed": 5.0
}, {
"frames": [{

29
src/scripts/game.gd
View file

@ -2,16 +2,15 @@ extends Node
@onready var tops = $Character/Seperate/Tops
@onready var bottoms = $Character/Seperate/Bottoms
@onready var seperate_items = $Seperate
@onready var seperate_items = $Character/Seperate
@onready var bottoms_bck = $Canvas/UI/DressUpCtrls/BottomsBckBtn
@onready var bottoms_fwd = $Canvas/UI/DressUpCtrls/BottomsFwdBtn
@onready var outfits = $Character/Outfits
@onready var fan = $World/Fan
@onready var forward_click = $ForwardClick
@onready var back_click = $BackClick
# Only here for debugging purposes
@onready var outfits_btn = $Canvas/UI/SettingsCtrls/FullbodyBtn
@onready var fan_click = $FanClick
@onready var fan_asmr = $FanAsmr
var is_seperate: bool = true
var is_outfits: bool = false
@ -23,12 +22,6 @@ var save_file = Config.save_file()
func _ready():
# Keep outfits button enabled in debug builds
if OS.is_debug_build():
outfits_btn.disabled = false
fan.play("default")
# If config files don't exist, create them
if !FileAccess.file_exists(config_file):
Config.save_config(config_file)
@ -83,13 +76,13 @@ func _on_tops_fwd_btn_pressed():
next_frame(tops, tops.sprite_frames, "tops")
if is_outfits:
next_frame(outfits, outfits.sprite_frames, "fullbody")
next_frame(outfits, outfits.sprite_frames, "outfits")
func _on_tops_bck_btn_pressed():
next_frame(tops, tops.sprite_frames, "tops", true)
if is_outfits:
next_frame(outfits, outfits.sprite_frames, "fullbody", true)
next_frame(outfits, outfits.sprite_frames, "outfits", true)
func _on_bottoms_bck_btn_pressed():
next_frame(bottoms, bottoms.sprite_frames, "bottoms", true)
@ -98,7 +91,7 @@ func _on_bottoms_bck_btn_pressed():
func _on_bottoms_fwd_btn_pressed():
next_frame(bottoms, bottoms.sprite_frames, "bottoms")
func _on_fullbody_btn_pressed():
func _on_outfits_btn_pressed():
is_seperate = false
is_outfits = true
seperate_items.hide()
@ -114,4 +107,12 @@ func _on_separate_btn_pressed():
bottoms_fwd.show()
outfits.hide()
func _on_fan_btn_toggled(toggled_on):
if toggled_on:
fan_click.play()
fan.play("default")
fan_asmr.play()
else:
fan_click.play()
fan.stop()
fan_asmr.stop()

BIN
src/sounds/fan.ogg Normal file
View file

Binary file not shown.

19
src/sounds/fan.ogg.import Normal file
View file

@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://y4amvcp0iak4"
path="res://.godot/imported/fan.ogg-f549b5b02a1b888798d1483329397afb.oggvorbisstr"
[deps]
source_file="res://src/sounds/fan.ogg"
dest_files=["res://.godot/imported/fan.ogg-f549b5b02a1b888798d1483329397afb.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

67
src/sprites/clothes/exit_symbol.svg
View file

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
width="40pt"
height="40pt"
viewBox="0 0 40 39.999999"
preserveAspectRatio="xMidYMid meet"
id="svg8"
sodipodi:docname="exit_symbol.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata14">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1001"
id="namedview10"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="5.6568543"
inkscape:cx="19.438064"
inkscape:cy="24.135632"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg8"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<path
inkscape:connector-curvature="0"
style="fill:#ffffff;stroke:none;stroke-width:0.0037296"
id="path2"
d="M 17.591034,1.0597325 C 16.973197,1.1944783 16.485432,1.4793694 16.019344,1.9798538 15.658036,2.3686917 15.448478,2.7228807 15.300341,3.1964159 15.17027,3.6122029 15.13414,3.9124936 15.13414,4.5708231 v 0.5890316 h 8.508803 c 6.120558,0 8.559387,0.01155 8.696684,0.042349 0.603384,0.1347458 1.087537,0.6544796 1.217608,1.2974095 0.05781,0.2925909 0.05781,26.2099828 0,26.5025738 -0.130071,0.64293 -0.617837,1.162664 -1.217608,1.29741 -0.137297,0.0308 -2.576126,0.04235 -8.696684,0.04235 H 15.13414 v 0.585182 c 0,0.662179 0.03613,0.96247 0.166201,1.378257 0.148137,0.469685 0.357695,0.823874 0.719003,1.216562 0.48054,0.515884 1.004436,0.812325 1.658404,0.935521 0.148136,0.0308 2.915755,0.04235 8.6461,0.04235 9.282003,0 8.653327,0.0154 9.260324,-0.234843 0.3866,-0.157845 0.693712,-0.384988 1.047794,-0.766126 0.455248,-0.488935 0.726229,-1.058717 0.827395,-1.732446 0.0542,-0.350339 0.0542,-31.6806625 0,-32.0310016 C 37.260642,2.3956409 36.270658,1.3138246 35.013306,1.0558826 34.630319,0.97888498 17.955955,0.98273488 17.591034,1.0597325 Z" />
<path
inkscape:connector-curvature="0"
style="fill:#ffffff;stroke:none;stroke-width:0.0037296"
id="path4"
d="m 18.169699,9.918306 c -0.158976,0.0539 -0.281821,0.165545 -1.044181,0.97017 -0.961079,1.020218 -1.03334,1.124165 -1.03334,1.528403 0,0.142445 0.0289,0.29259 0.06865,0.388837 0.04697,0.107797 0.737068,0.873923 2.33405,2.57942 l 2.269014,2.421575 -9.300068,0.01925 -9.3000678,0.01925 -0.1481363,0.0847 c -0.2023325,0.115496 -0.4299565,0.396537 -0.4805397,0.596731 -0.032518,0.119346 -0.039744,0.550533 -0.032518,1.474504 0.010839,1.262761 0.014452,1.312809 0.090327,1.466804 0.090327,0.184795 0.2998857,0.388838 0.4660873,0.461986 0.1011663,0.0462 1.6114338,0.0539 9.4084605,0.0539 5.105282,0 9.285616,0.01155 9.285616,0.02695 0,0.0154 -1.015276,1.112615 -2.258175,2.436974 -1.727052,1.844092 -2.272628,2.448523 -2.326824,2.579419 -0.09755,0.230993 -0.09755,0.577482 0,0.808475 0.10478,0.246392 1.640339,1.890291 1.889641,2.021187 0.231237,0.123196 0.567254,0.130896 0.791265,0.01925 0.112005,-0.05775 1.311548,-1.312809 4.400731,-4.608306 4.191173,-4.473561 4.248982,-4.539008 4.364601,-4.8162 0.108392,-0.254092 0.119231,-0.30799 0.108392,-0.577482 -0.01807,-0.373438 -0.126458,-0.619831 -0.444409,-1.012518 -0.12646,-0.157852 -2.034166,-2.202139 -4.234531,-4.546716 C 20.214702,11.308113 18.989868,10.033803 18.877862,9.972205 18.671917,9.860558 18.397323,9.841309 18.169699,9.918306 Z" />
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/sprites/world/fan-button.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 210 B

11
src/sprites/clothes/exit_symbol.svg.import → src/sprites/world/fan-button.png.import
View file

@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c2a13o0rcyned"
path="res://.godot/imported/exit_symbol.svg-ff081f8f5e81765d8a3e710ff997f080.ctex"
uid="uid://b5vt6y7uf4fi1"
path="res://.godot/imported/fan-button.png-3f6175299598b381713bc19b5a8fecd7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/sprites/clothes/exit_symbol.svg"
dest_files=["res://.godot/imported/exit_symbol.svg-ff081f8f5e81765d8a3e710ff997f080.ctex"]
source_file="res://src/sprites/world/fan-button.png"
dest_files=["res://.godot/imported/fan-button.png-3f6175299598b381713bc19b5a8fecd7.ctex"]
[params]
@ -32,6 +32,3 @@ process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false