mirror of
https://github.com/tonytins/dressupzack
synced 2025-05-08 06:14:48 -04:00
Changed window dialog types
- Changed the window dialog types to so they can be exited upon just by pressing "Ok" - Settings shell command has been simplfied so typing "settings" will show the setting window, as oppose to the button. - Renamed cmd_interface to shell_interface - Tweaked the about text
This commit is contained in:
parent
05b137616c
commit
602e6b0a45
4 changed files with 30 additions and 34 deletions
|
@ -170,7 +170,7 @@ flat = false
|
||||||
align = 1
|
align = 1
|
||||||
_sections_unfolded = [ "Margin" ]
|
_sections_unfolded = [ "Margin" ]
|
||||||
|
|
||||||
[node name="AboutWin" type="WindowDialog" parent="." index="2"]
|
[node name="AboutWin" type="AcceptDialog" parent="." index="2"]
|
||||||
|
|
||||||
visible = false
|
visible = false
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
|
@ -180,7 +180,7 @@ anchor_bottom = 0.0
|
||||||
margin_left = 260.0
|
margin_left = 260.0
|
||||||
margin_top = 132.0
|
margin_top = 132.0
|
||||||
margin_right = 608.0
|
margin_right = 608.0
|
||||||
margin_bottom = 382.0
|
margin_bottom = 400.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
|
@ -190,17 +190,18 @@ size_flags_vertical = 1
|
||||||
popup_exclusive = false
|
popup_exclusive = false
|
||||||
window_title = "KABO"
|
window_title = "KABO"
|
||||||
resizable = false
|
resizable = false
|
||||||
|
dialog_hide_on_ok = true
|
||||||
|
|
||||||
[node name="AboutTxt" type="RichTextLabel" parent="AboutWin" index="1"]
|
[node name="AboutTxt" type="RichTextLabel" parent="AboutWin" index="4"]
|
||||||
|
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
margin_left = 12.0
|
margin_left = 8.0
|
||||||
margin_top = 7.0
|
margin_top = 8.0
|
||||||
margin_right = -16.0
|
margin_right = -8.0
|
||||||
margin_bottom = -14.0
|
margin_bottom = -36.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = true
|
rect_clip_content = true
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
|
@ -214,7 +215,7 @@ visible_characters = -1
|
||||||
percent_visible = 1.0
|
percent_visible = 1.0
|
||||||
meta_underlined = true
|
meta_underlined = true
|
||||||
tab_size = 4
|
tab_size = 4
|
||||||
text = "Zack's Dress Up is a port and remake of ZC's Dress Up. Both created by Anthony Wilcox.
|
text = "Zack's Dress Up is a port of ZC's Dress Up, both created by Anthony Wilcox.
|
||||||
|
|
||||||
This 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.
|
This 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.
|
||||||
|
|
||||||
|
@ -225,8 +226,9 @@ scroll_active = true
|
||||||
scroll_following = false
|
scroll_following = false
|
||||||
selection_enabled = true
|
selection_enabled = true
|
||||||
override_selected_font_color = false
|
override_selected_font_color = false
|
||||||
|
_sections_unfolded = [ "BBCode" ]
|
||||||
|
|
||||||
[node name="CreditsWin" type="WindowDialog" parent="." index="3"]
|
[node name="CreditsWin" type="AcceptDialog" parent="." index="3"]
|
||||||
|
|
||||||
visible = false
|
visible = false
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
|
@ -236,7 +238,7 @@ anchor_bottom = 0.0
|
||||||
margin_left = 260.0
|
margin_left = 260.0
|
||||||
margin_top = 132.0
|
margin_top = 132.0
|
||||||
margin_right = 608.0
|
margin_right = 608.0
|
||||||
margin_bottom = 382.0
|
margin_bottom = 399.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
|
@ -246,17 +248,18 @@ size_flags_vertical = 1
|
||||||
popup_exclusive = false
|
popup_exclusive = false
|
||||||
window_title = "KCRE"
|
window_title = "KCRE"
|
||||||
resizable = false
|
resizable = false
|
||||||
|
dialog_hide_on_ok = true
|
||||||
|
|
||||||
[node name="CreditsTxt" type="RichTextLabel" parent="CreditsWin" index="1"]
|
[node name="CreditsTxt" type="RichTextLabel" parent="CreditsWin" index="4"]
|
||||||
|
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 12.0
|
margin_left = 8.0
|
||||||
margin_top = 7.0
|
margin_top = 8.0
|
||||||
margin_right = 332.0
|
margin_right = 340.0
|
||||||
margin_bottom = 236.0
|
margin_bottom = 231.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = true
|
rect_clip_content = true
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[gd_scene format=2]
|
[gd_scene format=2]
|
||||||
|
|
||||||
[node name="Shell" type="Control" index="0"]
|
[node name="Shell" type="Control"]
|
||||||
|
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
|
|
|
@ -38,7 +38,7 @@ animations = [ {
|
||||||
"speed": 4.0
|
"speed": 4.0
|
||||||
} ]
|
} ]
|
||||||
|
|
||||||
[node name="Zack" type="Node2D" index="0"]
|
[node name="Zack" type="Node2D"]
|
||||||
|
|
||||||
[node name="Base" type="Sprite" parent="." index="0"]
|
[node name="Base" type="Sprite" parent="." index="0"]
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ __meta__ = {
|
||||||
position = Vector2( 109.519, 255.9 )
|
position = Vector2( 109.519, 255.9 )
|
||||||
frames = SubResource( 1 )
|
frames = SubResource( 1 )
|
||||||
animation = "default"
|
animation = "default"
|
||||||
frame = 3
|
frame = 1
|
||||||
playing = true
|
playing = true
|
||||||
|
|
||||||
[node name="Mouth" type="AnimatedSprite" parent="." index="2"]
|
[node name="Mouth" type="AnimatedSprite" parent="." index="2"]
|
||||||
|
|
|
@ -1,31 +1,24 @@
|
||||||
extends Node
|
extends Node
|
||||||
|
|
||||||
onready var shell = $Shell
|
|
||||||
onready var cmdl = $Shell/RefRect/CmdLine
|
|
||||||
onready var cmdl_help = $Shell/HelpWin
|
|
||||||
|
|
||||||
const CLOSE_CMD = "close"
|
const CLOSE_CMD = "close"
|
||||||
|
|
||||||
func _process(delta):
|
func _process(delta):
|
||||||
cmd_interface()
|
shell_interface()
|
||||||
|
|
||||||
func cmd_interface():
|
func shell_interface():
|
||||||
var settingsBtn = $Interface/RefRect/VertContainer/SettingsBtn
|
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 Input.is_action_pressed("ui_shell"):
|
||||||
if cmdl.text == CLOSE_CMD:
|
if cmdl.text == CLOSE_CMD:
|
||||||
cmdl.text = ""
|
cmdl.text = ""
|
||||||
shell.show()
|
shell.show()
|
||||||
|
|
||||||
if cmdl.text == "lang sv" and Input.is_key_pressed(KEY_ENTER):
|
if cmdl.text == "help"and Input.is_key_pressed(KEY_ENTER):
|
||||||
TranslationServer.set_locale("sv")
|
|
||||||
elif cmdl.text == "lang en" and Input.is_key_pressed(KEY_ENTER):
|
|
||||||
TranslationServer.set_locale("en")
|
|
||||||
elif cmdl.text == "help"and Input.is_key_pressed(KEY_ENTER):
|
|
||||||
cmdl_help.show()
|
cmdl_help.show()
|
||||||
elif cmdl.text == "show settings" and Input.is_key_pressed(KEY_ENTER):
|
elif cmdl.text == "settings" and Input.is_key_pressed(KEY_ENTER):
|
||||||
settingsBtn.show()
|
settingsWin.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):
|
elif cmdl.text == CLOSE_CMD and Input.is_key_pressed(KEY_ENTER):
|
||||||
shell.hide()
|
shell.hide()
|
||||||
|
|
Loading…
Add table
Reference in a new issue