zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up effect items

Browse Source 
Fix up minimap
Add some debug info
This commit is contained in:
Zenny
2026-02-12 20:49:09 -08:00
parent ac31c3ae65
commit d503413140
256 changed files with 1448 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Zennysoft.Game.Ma/src/map/dungeon/code/BossRoomA.cs
View File

@@ -13,7 +13,7 @@ public partial class BossRoomA : SpecialFloor, IBossRoom, IDungeonFloor
[Dependency] public IGame Game => this.DependOn<IGame>();
[Node] public Marker3D PlayerSpawn { get; set; } = default!;
[Node] public Marker3D PlayerSpawnPoint { get; set; } = default!;
[Node] public Node3D HorseHeadStatue { get; set; } = default!;
@@ -31,53 +31,53 @@ public partial class BossRoomA : SpecialFloor, IBossRoom, IDungeonFloor
public void OnReady()
{
ActivateTrap.BodyEntered += ActivateTrap_BodyEntered;
_exit.AreaEntered += Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
ActivateTrap.BodyEntered += ActivateTrap_BodyEntered;
_exit.AreaEntered += Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero += CheckForBossFightEnd;
}
private void ActivateTrap_BodyEntered(Node3D body)
{
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
StartBossFight();
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
StartBossFight();
}
public void StartBossFight()
{
OxFaceStatue.Hide();
HorseHeadStatue.Hide();
OxFace.StartFight();
HorseHead.StartFight();
OxFaceStatue.Hide();
HorseHeadStatue.Hide();
OxFace.StartFight();
HorseHead.StartFight();
}
private void CheckForBossFightEnd()
{
if (OxFace.HealthComponent.CurrentHP.Value <= 0 && HorseHead.HealthComponent.CurrentHP.Value <= 0)
OnBossFightEnded();
if (OxFace.HealthComponent.CurrentHP.Value <= 0 && HorseHead.HealthComponent.CurrentHP.Value <= 0)
OnBossFightEnded();
}
public void OnBossFightEnded()
{
BossDoor.CallDeferred(MethodName.QueueFree);
BossDoor.CallDeferred(MethodName.QueueFree);
}
public void ExitReached()
=> Game.FloorExitReached();
=> Game.FloorExitReached();
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public override (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint() { return (PlayerSpawn.Rotation, new Vector3(PlayerSpawn.GlobalPosition.X, -2.5f, PlayerSpawn.GlobalPosition.Z)); }
public override (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint() { return (PlayerSpawnPoint.Rotation, new Vector3(PlayerSpawnPoint.GlobalPosition.X, -2.5f, PlayerSpawnPoint.GlobalPosition.Z)); }
public void OnExitTree()
{
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
_exit.AreaEntered -= Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
ActivateTrap.BodyEntered -= ActivateTrap_BodyEntered;
_exit.AreaEntered -= Exit_AreaEntered;
OxFace.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
HorseHead.HealthComponent.HealthReachedZero -= CheckForBossFightEnd;
}
}

18
Zennysoft.Game.Ma/src/map/dungeon/code/BossRoomB.cs
View File

@@ -12,7 +12,7 @@ public partial class BossRoomB : SpecialFloor, IBossRoom, IDungeonFloor
[Dependency] public IGame Game => this.DependOn<IGame>();
[Node] public Marker3D PlayerSpawn { get; set; } = default!;
[Node] public Marker3D PlayerSpawnPoint { get; set; } = default!;
[Node] public DemonWall DemonWall { get; set; } = default!;
@@ -22,8 +22,8 @@ public partial class BossRoomB : SpecialFloor, IBossRoom, IDungeonFloor
public void OnReady()
{
ActivateTrap.BodyEntered += ActivateTrap_AreaEntered;
_exit.AreaEntered += Exit_AreaEntered;
ActivateTrap.BodyEntered += ActivateTrap_AreaEntered;
_exit.AreaEntered += Exit_AreaEntered;
}
private void ActivateTrap_AreaEntered(Node3D area) => StartBossFight();
@@ -35,21 +35,21 @@ public partial class BossRoomB : SpecialFloor, IBossRoom, IDungeonFloor
public void StartBossFight()
{
DemonWall.Activate();
DemonWall.Activate();
}
public void ExitReached()
=> Game.FloorExitReached();
=> Game.FloorExitReached();
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void OnExitTree()
{
ActivateTrap.BodyEntered -= ActivateTrap_AreaEntered;
_exit.AreaEntered -= Exit_AreaEntered;
ActivateTrap.BodyEntered -= ActivateTrap_AreaEntered;
_exit.AreaEntered -= Exit_AreaEntered;
}
}

2
Zennysoft.Game.Ma/src/map/dungeon/code/IBossRoom.cs
View File

@@ -9,5 +9,5 @@ public interface IBossRoom : INode3D
public void OnBossFightEnded();
public Marker3D PlayerSpawn { get; }
public Marker3D PlayerSpawnPoint { get; }
}

24
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn
View File

@@ -1379,7 +1379,7 @@ shape = SubResource("CylinderShape3D_1ijgn")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -52.6848, 0, 16.939)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.72795, -2.29748, 0.329851)
@@ -1418,18 +1418,7 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.2518,
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5263, -2.15637, -2.35483)
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
InitialHP = 125
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="HorseHead" type="Node3D" parent="Bosses"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.348, 0, -88.391)
@@ -1438,18 +1427,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.3
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.714, -1.38925, 10.8406)
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
InitialHP = 125
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="HorseHeadStatue" parent="Bosses/HorseHead" instance=ExtResource("15_1ijgn")]
unique_name_in_owner = true

13
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn
View File

@@ -149,7 +149,7 @@ shape = SubResource("ConcavePolygonShape3D_s7h55")
[node name="Spawn Points" type="Node3D" parent="."]
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.953, 0, 149.677)
@@ -182,17 +182,6 @@ shape = SubResource("BoxShape3D_s7h55")
[node name="DemonWall" parent="." instance=ExtResource("25_k2q0o")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.747, 3.84071, 55.334)
_maximumWallMoveAmount = null
InitialHP = null
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="Lights" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)

1
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn
View File

@@ -1923,7 +1923,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.23212, -1.76654, 7.753)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.77516, 0)
visible = false
[node name="Room" type="Area3D" parent="Room"]
unique_name_in_owner = true

8
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn
View File

@@ -1167,11 +1167,15 @@ animations = [{
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5n72k"]
transparency = 1
shading_mode = 0
albedo_texture = ExtResource("6_ljhl3")
heightmap_scale = -7.477
texture_filter = 0
[sub_resource type="PlaneMesh" id="PlaneMesh_l1s1j"]
lightmap_size_hint = Vector2i(12, 12)
material = SubResource("StandardMaterial3D_5n72k")
size = Vector2(4, 4)
[sub_resource type="Environment" id="Environment_xwq6u"]
background_energy_multiplier = 0.0
@@ -1391,7 +1395,9 @@ 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.39854, 10.8155)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.216361, 10.8155)
layers = 2
cast_shadow = 0
mesh = SubResource("PlaneMesh_l1s1j")
[node name="TEST ENVIRONMENT" type="WorldEnvironment" parent="."]

47
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/32. Proscenium's Room.tscn
View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=28 format=3 uid="uid://cuau7xgx3rkxu"]
[gd_scene load_steps=25 format=3 uid="uid://cuau7xgx3rkxu"]
[ext_resource type="Script" uid="uid://bccyfmj8ikewh" path="res://src/map/dungeon/code/SpecialRoom.cs" id="1_w3a78"]
[ext_resource type="PackedScene" uid="uid://dekf66gxvufrt" path="res://src/map/dungeon/models/Area 2/Proscenium/A2-Proscenium.glb" id="2_vbs5p"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="5_wpyu0"]
[ext_resource type="Texture2D" uid="uid://dvast710lxrmw" path="res://src/map/assets/Dungeon Door Models/A2_BLOCKED_DOOR.png" id="24_wjhqq"]
[ext_resource type="PackedScene" uid="uid://bhsoehmr37aws" path="res://src/npc/Proscenium/Proscenium.tscn" id="32_t4lrk"]
[sub_resource type="BoxShape3D" id="BoxShape3D_u1ybt"]
@@ -43,12 +42,6 @@ size = Vector3(2.42413, 10.4887, 28.0771)
[sub_resource type="BoxShape3D" id="BoxShape3D_vwwuc"]
size = Vector3(66.2156, 0.100586, 30.1233)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dhety"]
albedo_texture = ExtResource("24_wjhqq")
texture_filter = 0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hwsho"]
[sub_resource type="BoxShape3D" id="BoxShape3D_nu4bg"]
size = Vector3(36, 6, 28)
@@ -199,28 +192,6 @@ shape = SubResource("BoxShape3D_vbs5p")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.41394, -3.08452, -9.26294)
shape = SubResource("BoxShape3D_vwwuc")
[node name="Doors" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.74721, 0)
[node name="CSGBox3D" type="CSGBox3D" parent="Doors"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0224749, 1.83591, -0.00639793)
visible = false
operation = 1
flip_faces = true
size = Vector3(20.0113, 8, 16.0328)
[node name="CSGBox2" type="CSGBox3D" parent="Doors"]
transform = Transform3D(1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -17.9446, -0.0149008, -0.0786845)
use_collision = true
size = Vector3(4.05, 4.05, 0.01)
material = SubResource("StandardMaterial3D_dhety")
[node name="DOOR1" type="CSGBox3D" parent="Doors/CSGBox2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.264776, 0.057373, 0.0686455)
material_override = SubResource("StandardMaterial3D_hwsho")
operation = 2
size = Vector3(5.09671, 4.3667, 2)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.32238, 0)
@@ -252,24 +223,24 @@ transform = Transform3D(-5.24537e-08, 0, 1.2, 0, 1.2, 0, -1.2, 0, -5.24537e-08,
[node name="AnimatedSprite3D" parent="NPC/Proscenium" index="0"]
transform = Transform3D(1.1, 0, 7.10543e-15, 0, 1.1, 0, -7.10543e-15, 0, 1.1, 0, 0.0548556, 0)
[node name="DialogueZone" parent="NPC/Proscenium" index="1"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/DialogueZone" index="0"]
visible = false
[node name="Collision" parent="NPC/Proscenium" index="2"]
[node name="Collision" parent="NPC/Proscenium" index="1"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/Collision" index="0"]
visible = false
[node name="Hitbox" parent="NPC/Proscenium" index="3"]
[node name="Hitbox" parent="NPC/Proscenium" index="2"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/Hitbox" index="0"]
visible = false
[node name="DialogueZone" parent="NPC/Proscenium" index="4"]
visible = false
[node name="CollisionShape3D" parent="NPC/Proscenium/DialogueZone" index="0"]
visible = false
[node name="Light" type="Node3D" parent="."]
[node name="OmniLight3D2" type="OmniLight3D" parent="Light"]

3
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/38. Floor Exit B.tscn
View File

@@ -674,7 +674,8 @@ libraries = {
autoplay = "Flame Flicker"
[node name="E symbol!" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.39854, 10.8155)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.469518, 10.8155)
layers = 2
mesh = SubResource("PlaneMesh_vsgtq")
[node name="A2SOCKET" parent="." instance=ExtResource("7_d13sj")]