Gaps Fixed, Overworld Visual Fixes, Some lighting and additions to block rooms, may have accidentally moved a folder but cant find which.

This commit is contained in:
Pal
2026-02-12 20:17:13 -08:00
parent c246d8d654
commit 549040c339
97 changed files with 2022 additions and 8408 deletions

View File

@@ -47,7 +47,7 @@ script = ExtResource("1_38loe")
Dialogue = ExtResource("2_x0dcb")
[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 1.51776, 0)
transform = Transform3D(1.71, 0, 0, 0, 1.71, 0, 0, 0, 1.71, 0, 1.86436, 0)
billboard = 2
shaded = true
alpha_antialiasing_mode = 1
@@ -75,7 +75,7 @@ collision_mask = 16
shape = SubResource("CylinderShape3D_nwuwj")
[node name="Shadow" type="Sprite3D" parent="."]
transform = Transform3D(1.385, 0, 0, 0, -6.05403e-08, 1.385, 0, -1.385, -6.05403e-08, -0.00469795, -1.69794, 0)
transform = Transform3D(1.385, 0, 0, 0, -6.05403e-08, 1.385, 0, -1.385, -6.05403e-08, -0.00469795, -1.10791, 0)
transparency = 0.1
cast_shadow = 0
modulate = Color(1, 1, 1, 0.669)

View File

@@ -22,60 +22,60 @@ public partial class Npc : Node3D
public void OnReady()
{
SetPhysicsProcess(true);
DialogueZone.BodyEntered += DialogueZone_BodyEntered;
DialogueZone.BodyExited += DialogueZone_BodyExited;
DialogueExitZone.BodyExited += DialogueExitZone_BodyExited;
Hitbox.AreaEntered += Hitbox_AreaEntered;
SetPhysicsProcess(true);
DialogueZone.BodyEntered += DialogueZone_BodyEntered;
DialogueZone.BodyExited += DialogueZone_BodyExited;
DialogueExitZone.BodyExited += DialogueExitZone_BodyExited;
Hitbox.AreaEntered += Hitbox_AreaEntered;
}
private void Hitbox_AreaEntered(Area3D area)
{
if (area.GetOwner() is ThrownItem thrownItem)
{
DialogueController.ShowDialogue(Dialogue, "get_item");
thrownItem.QueueFree();
}
else
{
DialogueController.ShowDialogue(Dialogue, "hit");
}
if (area.GetOwner() is ThrownItem thrownItem)
{
DialogueController.ShowDialogue(Dialogue, "get_item");
thrownItem.QueueFree();
}
else
{
DialogueController.ShowDialogue(Dialogue, "hit");
}
}
private void Hitbox_BodyEntered(Node body)
{
DialogueController.ShowDialogue(Dialogue, "hit");
DialogueController.ShowDialogue(Dialogue, "hit");
}
private void DialogueZone_BodyExited(Node3D body)
{
_isInDialogueZone = false;
_isInDialogueZone = false;
}
private void DialogueExitZone_BodyExited(Node3D body)
{
DialogueController.Interrupt();
DialogueController.Interrupt();
}
private void DialogueZone_BodyEntered(Node3D body)
{
_isInDialogueZone = true;
_isInDialogueZone = true;
}
public override void _UnhandledInput(InputEvent @event)
{
if (@event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone)
{
DialogueController.ShowDialogue(Dialogue, "general");
}
if (@event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone)
{
DialogueController.ShowDialogue(Dialogue, "general");
}
}
public void OnExitTree()
{
DialogueZone.BodyEntered -= DialogueZone_BodyEntered;
DialogueZone.BodyExited -= DialogueZone_BodyExited;
DialogueExitZone.BodyExited -= DialogueExitZone_BodyExited;
Hitbox.AreaEntered -= Hitbox_AreaEntered;
DialogueZone.BodyEntered -= DialogueZone_BodyEntered;
DialogueZone.BodyExited -= DialogueZone_BodyExited;
DialogueExitZone.BodyExited -= DialogueExitZone_BodyExited;
Hitbox.AreaEntered -= Hitbox_AreaEntered;
}
}