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

Mergepoint II

Browse Source
This commit is contained in:
Pal
2025-09-26 04:08:37 -07:00
parent 3aa1d66040 7e9114bfd1
commit 578cde65cc
21 changed files with 170 additions and 2213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs
View File

@@ -24,15 +24,30 @@ public partial class PauseDebugMenu : Control, IDebugMenu
[Node] public OptionButton SpawnEnemyDropDown { get; set; } = default!;
private ImmutableList<InventoryItem> _spawnableItems;
private ImmutableList<PackedScene> _spawnableEnemies;
[Export]
private EnemyDatabase _enemyDatabase;
private ImmutableList<string> _spawnableEnemies =
[
@"res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn",
@"res://src/enemy/enemy_types/02. michael/Michael.tscn",
@"res://src/enemy/enemy_types/03. filth_eater/FilthEater.tscn",
@"res://src/enemy/enemy_types/04. sara/Sara.tscn",
@"res://src/enemy/enemy_types/05. ballos/Ballos.tscn",
@"res://src/enemy/enemy_types/06. chariot/Chariot.tscn",
@"res://src/enemy/enemy_types/07. chinthe/Chinthe.tscn",
@"res://src/enemy/enemy_types/08a. Ambassador/Ambassador.tscn",
@"res://src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn",
@"res://src/enemy/enemy_types/08c. Ambassador (steel)/AmbassadorSteel.tscn",
@"res://src/enemy/enemy_types/09. Agni/AgniDemon.tscn",
@"res://src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn",
@"res://src/enemy/enemy_types/11. Palan/Palan.tscn",
@"res://src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn",
@"res://src/enemy/enemy_types/13. gold sproingy/GoldSproingy.tscn"
];
private ItemDatabase _itemDatabase;
public override void _Ready()
{
<<<<<<< HEAD
VisibilityChanged += PauseDebugMenu_VisibilityChanged;
LoadNextFloorButton.Pressed += LoadNextFloorButton_Pressed;
_itemDatabase = new ItemDatabase();
@@ -50,6 +65,18 @@ public partial class PauseDebugMenu : Control, IDebugMenu
}
SpawnItemDropDown.AllowReselect = true;
SpawnEnemyDropDown.AllowReselect = true;
=======
VisibilityChanged += PauseDebugMenu_VisibilityChanged;
LoadNextFloorButton.Pressed += LoadNextFloorButton_Pressed;
_itemDatabase = new ItemDatabase();
_spawnableItems = _itemDatabase.Items;
foreach (var item in _spawnableItems)
SpawnItemDropDown.AddItem(item.ItemName);
SpawnItemDropDown.AllowReselect = true;
SpawnEnemyDropDown.AllowReselect = true;
>>>>>>> 7e9114bfd1f6c5dd447c4c4e54a2e8ccb9f38e24
SpawnItemDropDown.ItemSelected += SpawnItemDropDown_ItemSelected;
SpawnEnemyDropDown.ItemSelected += SpawnEnemyDropDown_ItemSelected;
@@ -57,10 +84,17 @@ public partial class PauseDebugMenu : Control, IDebugMenu
private void SpawnEnemyDropDown_ItemSelected(long index)
{
<<<<<<< HEAD
var enemyToSpawn = _spawnableEnemies.ElementAt((int)index);
var loadedEnemy = enemyToSpawn.Instantiate<Enemy>();
AddChild(loadedEnemy);
loadedEnemy.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
=======
var enemyToSpawn = _spawnableEnemies.ElementAt((int)index);
var loadedEnemy = GD.Load<PackedScene>(enemyToSpawn).Instantiate<Enemy>();
AddChild(loadedEnemy);
loadedEnemy.GlobalPosition = new Vector3(_player.CurrentPosition.X, _player.CurrentPosition.Y + 1, _player.CurrentPosition.Z) + (-_player.CurrentBasis.Z * 2);
>>>>>>> 7e9114bfd1f6c5dd447c4c4e54a2e8ccb9f38e24
}
private void SpawnItemDropDown_ItemSelected(long index)