Remove E, fix UI, Altar scale better

This commit is contained in:
Pal
2026-02-14 16:49:16 -08:00
parent b17c134c9a
commit 47ceb2f613
6 changed files with 35 additions and 39 deletions

View File

@@ -25,33 +25,33 @@ public partial class Altar : SpecialFloor, IDungeonFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
NoExitArea.AreaEntered += NoExitArea_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
NoExitArea.AreaEntered += NoExitArea_AreaEntered;
FloorIsLoaded = true;
}
private void _player_PointUpFinished()
{
_player.Activate();
_player.Activate();
}
private void NoExitArea_AreaEntered(Area3D area)
{
DialogueController.ShowDialogue(Dialogue, "no_exit");
DialogueController.ShowDialogue(Dialogue, "no_exit");
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
NoExitArea.AreaEntered -= NoExitArea_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
NoExitArea.AreaEntered -= NoExitArea_AreaEntered;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -1398,7 +1398,8 @@ omni_range = 19.166
omni_attenuation = 1.106
[node name="E symbol!" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.216361, 10.8155)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.550282, 10.8155)
visible = false
layers = 2
cast_shadow = 0
mesh = SubResource("PlaneMesh_l1s1j")

View File

@@ -675,6 +675,7 @@ autoplay = "Flame Flicker"
[node name="E symbol!" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.469518, 10.8155)
visible = false
layers = 2
mesh = SubResource("PlaneMesh_vsgtq")

View File

@@ -38,29 +38,29 @@ public partial class InGameUI : Control, IInGameUI
public void Setup()
{
InGameUILogic = new InGameUILogic();
InGameUILogic.Set(_gameRepo);
InGameUILogic = new InGameUILogic();
InGameUILogic.Set(_gameRepo);
}
public void OnResolved()
{
InGameUILogicBinding = InGameUILogic.Bind();
InGameUILogicBinding = InGameUILogic.Bind();
InGameUILogicBinding
.Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { InventoryMessageUI.DisplayMessage(output.Message); })
.Handle((in InGameUILogic.Output.AnnounceMessageInInventory output) => { })
.Handle((in InGameUILogic.Output.RemoveItemFromInventory output) => { })
.Handle((in InGameUILogic.Output.ShowInventory _) => { InventoryMenu.Show(); InventoryMenu.SetProcessInput(true); })
.Handle((in InGameUILogic.Output.HideInventory _) => { CloseInventory(); });
InGameUILogicBinding
.Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { InventoryMessageUI.DisplayMessage(output.Message); })
.Handle((in InGameUILogic.Output.AnnounceMessageInInventory output) => { })
.Handle((in InGameUILogic.Output.RemoveItemFromInventory output) => { })
.Handle((in InGameUILogic.Output.ShowInventory _) => { InventoryMenu.Show(); InventoryMenu.SetProcessInput(true); })
.Handle((in InGameUILogic.Output.HideInventory _) => { CloseInventory(); });
DebugInfo.Visible = DebugMenu.DebugOverlayVisible;
DebugInfo.Visible = DebugMenu.DebugOverlayVisible;
InGameUILogic.Start();
InGameUILogic.Start();
}
public void CloseInventory()
{
InventoryMenu.Hide();
InventoryMenu.SetProcessInput(false);
InventoryMenu.Hide();
InventoryMenu.SetProcessInput(false);
}
}

View File

@@ -2,12 +2,12 @@
[ext_resource type="Script" uid="uid://dlq2mkhl4pe7a" path="res://src/ui/in_game_ui/InGameUI.cs" id="1_sc13i"]
[ext_resource type="PackedScene" uid="uid://bwbofurcvf3yh" path="res://src/minimap/Minimap.tscn" id="2_6sfje"]
[ext_resource type="PackedScene" uid="uid://t22s2y1t8ktc" path="res://src/debug/DebugInfo.tscn" id="2_f0tui"]
[ext_resource type="PackedScene" uid="uid://t22s2y1t8ktc" path="res://src/debug_info/DebugInfo.tscn" id="2_f0tui"]
[ext_resource type="PackedScene" uid="uid://dxl8il8f13c2x" path="res://src/ui/player_ui/PlayerInfoUI.tscn" id="4_46s5l"]
[ext_resource type="PackedScene" uid="uid://bea2waybmgd6u" path="res://src/ui/teleport_prompt/UseTeleportPrompt.tscn" id="5_h1hgq"]
[ext_resource type="PackedScene" uid="uid://x0f1ol50nnp3" path="res://src/ui/in_game_ui/InventoryMessageUI.tscn" id="6_y26qy"]
[ext_resource type="Texture2D" uid="uid://dnt8myee0ju3v" path="res://src/ui/UI Front with Transparency.png" id="7_higkc"]
[ext_resource type="PackedScene" uid="uid://8f3dk16nj0dn" path="res://src/menu/DebugMenu.tscn" id="7_llomk"]
[ext_resource type="Texture2D" uid="uid://bj4p4qxb1mj3q" path="res://src/ui/player_ui/Assets/panel rough draft.png" id="7_ur8ag"]
[ext_resource type="PackedScene" uid="uid://c3e6hbctay1us" path="res://src/ui/inventory_menu/InventoryMenu2.tscn" id="9_ur8ag"]
[ext_resource type="PackedScene" uid="uid://dwa7o6hkkwjg1" path="res://src/ui/inventory_menu/ItemRescueMenu.tscn" id="10_higkc"]
@@ -79,6 +79,7 @@ layout_mode = 2
[node name="Panel" type="ColorRect" parent="HBoxContainer"]
custom_minimum_size = Vector2(480, 0)
layout_mode = 2
color = Color(0, 0, 0, 1)
[node name="MinimapZone" type="Panel" parent="HBoxContainer/Panel"]
layout_mode = 2
@@ -100,15 +101,8 @@ offset_top = 354.0
offset_right = 423.0
offset_bottom = 620.0
[node name="HSeparator2" type="HSeparator" parent="HBoxContainer/Panel/MinimapZone"]
layout_mode = 2
offset_left = 78.0
offset_top = 716.0
offset_right = 370.0
offset_bottom = 722.0
theme_override_styles/separator = SubResource("StyleBoxLine_ur8ag")
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/Panel"]
texture_filter = 2
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
@@ -116,7 +110,7 @@ anchor_bottom = 1.0
offset_bottom = 1072.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("7_ur8ag")
texture = ExtResource("7_higkc")
stretch_mode = 4
[node name="PlayerInfoUI" parent="HBoxContainer/Panel" instance=ExtResource("4_46s5l")]