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

2-24-16 build changes

Browse Source
This commit is contained in:
Zenny
2026-02-24 10:39:34 -08:00
parent 3c1a221522
commit 846c8a4c59
65 changed files with 1909 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zennysoft.Game.Ma/src/map/IMap.cs
View File

@@ -8,6 +8,8 @@ namespace Zennysoft.Game.Ma;
public interface IMap : INode3D
{
void ClearFloor();
Task LoadFloor();
Task LoadFloor(string sceneName);

9
Zennysoft.Game.Ma/src/map/Map.cs
View File

@@ -46,14 +46,15 @@ public partial class Map : Node3D, IMap
if (animName == "fade_out")
{
await LoadNewFloor();
FloorLoaded?.Invoke();
}
}
private async Task LoadNewFloor()
{
CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
SpawnPointCreated?.Invoke((Vector3.Forward, new Vector3(-999, -999, -999)));
var newFloor = await LoadNewFloor(_sceneName);
ClearFloor();
AddChild(newFloor);
InitializeFloor(newFloor);
var floor = MapOrder.GetChildren().OfType<FloorNode>().ElementAt(CurrentFloorNumber.Value);
@@ -82,6 +83,11 @@ public partial class Map : Node3D, IMap
return (spawnPoint.Rotation, spawnPoint.Position);
}
public void ClearFloor()
{
CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
}
public async Task LoadFloor()
{
var floor = MapOrder.GetChildren().OfType<FloorNode>().ElementAt(CurrentFloorNumber.Value + 1);
@@ -104,7 +110,6 @@ public partial class Map : Node3D, IMap
SetupDungeonFloor();
CurrentFloor.FloorIsLoaded = true;
CurrentFloorNumber.OnNext(CurrentFloorNumber.Value + 1);
FloorLoaded?.Invoke();
}
private async Task<Node> LoadNewFloor(string sceneName)

7
Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs
View File

@@ -27,6 +27,8 @@ public partial class Overworld : SpecialFloor, IDungeonFloor
[Node] private Node DimmableAudio { get; set; } = default!;
[Node] private Node3D DeathTorches { get; set; } = default!;
private Timer RestoreTimer { get; set; }
private bool _insideItemRescueZone = false;
@@ -44,6 +46,11 @@ public partial class Overworld : SpecialFloor, IDungeonFloor
FloorIsLoaded = true;
Game.ItemRescueMenu.SetProcessInput(false);
var torches = DeathTorches.GetChildren().OfType<Torch>().ToList();
var torchesToLight = Mathf.Min(Game.QuestData.DeathCount, 15);
for (var i = 0; i < torchesToLight; i++)
torches[i].Show();
ItemRescueInteractZone.AreaEntered += ItemRescueInteractZone_AreaEntered;
var dimmableAudio = DimmableAudio.GetChildren().OfType<IDimmableAudioStreamPlayer>();
foreach (var dimmable in dimmableAudio)

6
Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5B.tscn
View File

File diff suppressed because one or more lines are too long

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

@@ -1427,7 +1427,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.3
[node name="HorseHead" parent="Bosses/HorseHead" instance=ExtResource("14_jb41f")]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.714, -2.7938, 10.841)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.714, -2.8, 10.841)
visible = false
InitialHP = 125

1350
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn
View File

File diff suppressed because one or more lines are too long

16
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn
View File

@@ -129,33 +129,27 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 2, -8.8875)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.95499, 0.615637, 7.621)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.95499, -3.02636, 7.621)
[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0)
[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -1.37378, 3.63487)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -3.48518, 3.63487)
[node name="ItemSpawnPoint2" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -1.37378, 10.8984)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -3.48518, 10.8984)
[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -1.37378, 11.6249)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -3.48518, 11.6249)
[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0)
[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -3.4914, 3.35927)
[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -3.79757, 6.01731)
[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9776, -3.78559, 11.068)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.99224, -3.4914, 10.5658)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 2, -8.8875)