diff --git a/export_presets.cfg b/export_presets.cfg index 00b2025..c0808e4 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="./Midori in the Magic School..x86_64" +export_path="./Midori in the Magic School.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/levels/ui/credits.tscn b/levels/ui/credits.tscn index 26afb71..f664179 100644 --- a/levels/ui/credits.tscn +++ b/levels/ui/credits.tscn @@ -55,6 +55,9 @@ Page Asgardius Fireworks design Midori Asgardius / Lily +Memory integrity check +Falcighol Arch / Mariana Kaizo + Feedback Sakura Nakayama Tood diff --git a/levels/ui/gameplay.gd b/levels/ui/gameplay.gd index 0ac4b90..345cb3f 100644 --- a/levels/ui/gameplay.gd +++ b/levels/ui/gameplay.gd @@ -65,7 +65,7 @@ func _process(delta): #velocity = (Vector2.RIGHT.rotated(rotation) * -100 * Global.xm * delta)-Vector2.UP.rotated(rotation) * -100 * Global.ym * delta func _input(event): - if Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_BACK): + if (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_BACK)) && Global.cdialog == []: Global.live = 0 Global.bossready = false get_tree().root.remove_child(thud) diff --git a/levels/ui/tophud.gd b/levels/ui/tophud.gd index 87ff65e..b25f590 100644 --- a/levels/ui/tophud.gd +++ b/levels/ui/tophud.gd @@ -13,11 +13,15 @@ var focus1 var focus2 var focus3 var focus4 +var topmini +var topminibg # Called when the node enters the scene tree for the first time. func _ready(): topleft = $Topleft topleftbg = $Topleftbg + topmini = $Topmini + topminibg = $Topminibg cn1 = $Topleft/Character1/VBoxContainer/HBoxContainer/Label cn2 = $Topleft/Character2/VBoxContainer/HBoxContainer/Label cn3 = $Topleft/Character3/VBoxContainer/HBoxContainer/Label @@ -30,9 +34,13 @@ func _ready(): focus2 = $Topleft/Character2/ColorRect2 focus3 = $Topleft/Character3/ColorRect2 focus4 = $Topleft/Character4/ColorRect2 + topleft.visible = false + topleftbg.visible = false if Global.mangohud: topleft.position.y = 244 topleftbg.position.y = 244 + topmini.position.y = 601 + topminibg.position.y = 601 _charrefresh() # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -40,6 +48,12 @@ func _process(delta): pass func _input(event): + if Input.is_key_pressed(KEY_V) || Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER): + topleft.visible = true + topleftbg.visible = true + else: + topleft.visible = false + topleftbg.visible = false _charrefresh() func _charrefresh(): if Global.debug: diff --git a/levels/ui/tophud.tscn b/levels/ui/tophud.tscn index 9888c8a..2042d8b 100644 --- a/levels/ui/tophud.tscn +++ b/levels/ui/tophud.tscn @@ -23,11 +23,105 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_pntuv") +[node name="Topminibg" type="ColorRect" parent="."] +layout_mode = 0 +offset_right = 377.0 +offset_bottom = 116.0 +color = Color(0.254902, 0.254902, 0.254902, 1) + +[node name="Topmini" type="HBoxContainer" parent="."] +layout_mode = 2 +offset_right = 377.0 +offset_bottom = 116.0 + +[node name="TextureRect" type="TextureRect" parent="Topmini"] +custom_minimum_size = Vector2(116, 116) +layout_mode = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="Topmini"] +layout_mode = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="Topmini/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="Topmini/VBoxContainer/HBoxContainer"] +custom_minimum_size = Vector2(174, 0) +layout_mode = 2 +text = "Name" + +[node name="Label3" type="Label" parent="Topmini/VBoxContainer/HBoxContainer"] +layout_mode = 2 +text = "R1" +horizontal_alignment = 2 + +[node name="HBoxContainer2" type="HBoxContainer" parent="Topmini/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="Topmini/VBoxContainer/HBoxContainer2"] +custom_minimum_size = Vector2(70, 0) +layout_mode = 2 +text = "Health" + +[node name="ProgressBar" type="ProgressBar" parent="Topmini/VBoxContainer/HBoxContainer2"] +custom_minimum_size = Vector2(100, 0) +layout_mode = 2 +theme_override_styles/background = SubResource("StyleBoxFlat_ualpu") +theme_override_styles/fill = SubResource("StyleBoxFlat_patnr") + +[node name="Label2" type="Label" parent="Topmini/VBoxContainer/HBoxContainer2"] +custom_minimum_size = Vector2(63, 0) +layout_mode = 2 +text = "100/100" +horizontal_alignment = 2 + +[node name="HBoxContainer3" type="HBoxContainer" parent="Topmini/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="Topmini/VBoxContainer/HBoxContainer3"] +custom_minimum_size = Vector2(70, 0) +layout_mode = 2 +text = "Stamina" + +[node name="ProgressBar" type="ProgressBar" parent="Topmini/VBoxContainer/HBoxContainer3"] +custom_minimum_size = Vector2(100, 0) +layout_mode = 2 +theme_override_styles/background = SubResource("StyleBoxFlat_05pau") +theme_override_styles/fill = SubResource("StyleBoxFlat_u3vj7") + +[node name="Label2" type="Label" parent="Topmini/VBoxContainer/HBoxContainer3"] +custom_minimum_size = Vector2(63, 0) +layout_mode = 2 +text = "100/100" +horizontal_alignment = 2 + +[node name="HBoxContainer4" type="HBoxContainer" parent="Topmini/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="Topmini/VBoxContainer/HBoxContainer4"] +custom_minimum_size = Vector2(70, 0) +layout_mode = 2 +text = "Skill" + +[node name="ProgressBar" type="ProgressBar" parent="Topmini/VBoxContainer/HBoxContainer4"] +custom_minimum_size = Vector2(100, 0) +layout_mode = 2 +theme_override_styles/background = SubResource("StyleBoxFlat_ftyws") + +[node name="Label2" type="Label" parent="Topmini/VBoxContainer/HBoxContainer4"] +custom_minimum_size = Vector2(63, 0) +layout_mode = 2 +text = "100/100" +horizontal_alignment = 2 + +[node name="ColorRect2" type="ColorRect" parent="Topmini"] +custom_minimum_size = Vector2(12, 64) +layout_mode = 2 + [node name="Topleftbg" type="ColorRect" parent="."] layout_mode = 0 offset_right = 377.0 offset_bottom = 476.0 -color = Color(0.254902, 0.254902, 0.254902, 0.788235) +color = Color(0.254902, 0.254902, 0.254902, 1) [node name="Topleft" type="VBoxContainer" parent="."] layout_mode = 0