maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 11:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enemy spawning

Browse source
This commit is contained in:
Marco 2025-06-21 16:44:44 +02:00
commit 29dc9bebe0
20 changed files with 564 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Scripts/Actors/EnemyMarker3D.cs Normal file
View file

@ -0,0 +1,69 @@
using Cirno.Scripts.Components.FSM.Enemy._3D;
using Cirno.Scripts.Resources;
using Cirno.Scripts.Utils;
using Godot;
namespace Cirno.Scripts.Actors;
[Tool]
public partial class EnemyMarker3D : PreviewMarker3D
{
private EnemyResource _enemy;
[Export]
public EnemyResource Enemy
{
get => _enemy;
set
{
_enemy = value;
if (Engine.IsEditorHint())
{
//QueueRedraw();
this.Texture = _enemy.IconSprite;
}
}
}
[Export] public bool AutoSpawn { get; set; } = false;
private EnemyProxy3D _spawnedEnemy;
public override void _Ready()
{
base._Ready();
if (AutoSpawn)
{
Spawn(false);
}
}
public EnemyProxy3D Spawn(bool deleteMarker)
{
if (Engine.IsEditorHint()) return null ;
if (Enemy is null) return null;
if (_spawnedEnemy is not null) return _spawnedEnemy;
if (deleteMarker)
{
this.QueueFree();
}
var enemyScene = GD.Load<PackedScene>(Enemy.PrefabPath);
_spawnedEnemy = this.CreateSibling<EnemyProxy3D>(enemyScene);
_spawnedEnemy.Init(Enemy);
//Spawned = true;
_spawnedEnemy.Death += SpawnedEnemyOnDeath;
return _spawnedEnemy;
}
private void SpawnedEnemyOnDeath(EnemyProxy3D enemy)
{
_spawnedEnemy.Death -= SpawnedEnemyOnDeath;
_spawnedEnemy = null;
//Spawned = false;
}
}

1
Scripts/Actors/EnemyMarker3D.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://00rbjdb4mnb0

106
Scripts/Actors/ItemMarker3D.cs
View file

@ -5,7 +5,7 @@ using Godot;
namespace Cirno.Scripts.Actors;
[Tool]
public partial class ItemMarker3D : Marker3D
public partial class ItemMarker3D : PreviewMarker3D
{
private LootItem _item;
@ -18,15 +18,16 @@ public partial class ItemMarker3D : Marker3D
_item = value;
if (Engine.IsEditorHint())
{
QueueRedraw();
//QueueRedraw();
this.Texture = _item.InventorySprite;
}
}
}
[Export] public bool AutoSpawn { get; set; } = false;
[ExportToolButton("Update Icon")] public Callable RedrawButton => Callable.From(Redraw);
[ExportToolButton("Clear Children")] public Callable ClearChildrenButton => Callable.From(ClearChildren);
// [ExportToolButton("Update Icon")] public Callable RedrawButton => Callable.From(Redraw);
// [ExportToolButton("Clear Children")] public Callable ClearChildrenButton => Callable.From(ClearChildren);
// public override void _Draw()
// {
@ -37,60 +38,61 @@ public partial class ItemMarker3D : Marker3D
// DrawTexture(Item.InventorySprite, - new Vector2(Item.InventorySprite.GetWidth() / 2f, Item.InventorySprite.GetHeight() / 2f));
// }
//
private void Redraw()
{
QueueRedraw();
}
// private void Redraw()
// {
// QueueRedraw();
// }
private void ClearChildren()
{
var children = GetChildren();
foreach (var child in children)
{
if (child is Sprite3D)
{
child.QueueFree();
}
}
_sprite = null;
}
// private void ClearChildren()
// {
// var children = GetChildren();
// foreach (var child in children)
// {
// if (child is Sprite3D)
// {
// child.QueueFree();
// }
// }
//
// _sprite = null;
// }
private void QueueRedraw()
{
if (!Engine.IsEditorHint()) return;
if (Item?.InventorySprite is null) return;
// private void QueueRedraw()
// {
// if (!Engine.IsEditorHint()) return;
// if (Item?.InventorySprite is null) return;
//
// if (_sprite is null)
// {
// GD.Print("Remaking sprite");
// _sprite = new EditorSprite3D();
// this.AddChild(_sprite);
// //_sprite.Owner = GetTree().EditedSceneRoot;
// }
//
// _sprite.Texture = Item.InventorySprite;
// //_sprite.SetRotationDegrees(new Vector3(-45, 45, 0));
// _sprite.FixedSize = true;
// _sprite.SetBillboardMode(BaseMaterial3D.BillboardModeEnum.Enabled);
// _sprite.TextureFilter = BaseMaterial3D.TextureFilterEnum.Nearest;
//
//
// }
if (_sprite is null)
{
GD.Print("Remaking sprite");
_sprite = new EditorSprite3D();
this.AddChild(_sprite);
//_sprite.Owner = GetTree().EditedSceneRoot;
}
_sprite.Texture = Item.InventorySprite;
//_sprite.SetRotationDegrees(new Vector3(-45, 45, 0));
_sprite.FixedSize = true;
_sprite.SetBillboardMode(BaseMaterial3D.BillboardModeEnum.Enabled);
_sprite.TextureFilter = BaseMaterial3D.TextureFilterEnum.Nearest;
}
private Sprite3D _sprite;
//private Sprite3D _sprite;
public override void _Ready()
{
_sprite = GetNodeOrNull<Sprite3D>("Sprite3D");
if (Engine.IsEditorHint())
{
QueueRedraw();
return;
}
ClearChildren();
base._Ready();
// _sprite = GetNodeOrNull<Sprite3D>("Sprite3D");
// if (Engine.IsEditorHint())
// {
// QueueRedraw();
//
// return;
// }
//
// ClearChildren();
if (AutoSpawn)
{

124
Scripts/Actors/PreviewMarker3D.cs Normal file
View file

@ -0,0 +1,124 @@
using Godot;
namespace Cirno.Scripts.Actors;
[Tool]
public partial class PreviewMarker3D : Marker3D
{
private Texture2D _texture;
protected Texture2D Texture
{
get => _texture;
set
{
_texture = value;
if (Engine.IsEditorHint())
{
QueueRedraw();
}
}
}
private bool _fixedSize;
private bool _billboard;
private float _pixelSize = 0.1f;
[Export]
protected bool FixedSize
{
get => _fixedSize;
set
{
_fixedSize = value;
if (Engine.IsEditorHint())
{
QueueRedraw();
}
}
}
[Export]
protected bool Billboard
{
get => _billboard;
set
{
_billboard = value;
if (Engine.IsEditorHint())
{
QueueRedraw();
}
}
}
[Export]
protected float PixelSize
{
get => _pixelSize;
set
{
_pixelSize = value;
if (Engine.IsEditorHint())
{
QueueRedraw();
}
}
}
[ExportToolButton("Update Icon")] public Callable RedrawButton => Callable.From(Redraw);
[ExportToolButton("Clear Children")] public Callable ClearChildrenButton => Callable.From(ClearChildren);
private Sprite3D _sprite;
public override void _Ready()
{
_sprite = GetNodeOrNull<Sprite3D>("Sprite3D");
ClearChildren();
if (Engine.IsEditorHint())
{
QueueRedraw();
return;
}
}
private void Redraw()
{
QueueRedraw();
}
private void ClearChildren()
{
var children = GetChildren();
foreach (var child in children)
{
if (child is Sprite3D)
{
child.QueueFree();
}
}
_sprite = null;
}
protected void QueueRedraw()
{
if (!Engine.IsEditorHint()) return;
if (_texture is null) return;
if (_sprite is null)
{
GD.Print("Remaking sprite");
_sprite = new EditorSprite3D();
this.AddChild(_sprite);
//_sprite.Owner = GetTree().EditedSceneRoot;
}
_sprite.Texture = _texture;
//_sprite.SetRotationDegrees(new Vector3(-45, 45, 0));
_sprite.FixedSize = FixedSize;
_sprite.SetBillboardMode(Billboard ? BaseMaterial3D.BillboardModeEnum.Enabled : BaseMaterial3D.BillboardModeEnum.Disabled);
_sprite.TextureFilter = BaseMaterial3D.TextureFilterEnum.Nearest;
_sprite.PixelSize = PixelSize;
}
}

1
Scripts/Actors/PreviewMarker3D.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://c3imdj88iofiy

18
Scripts/Components/FSM/Enemy/3D/EnemyFSMAnimatedSprite3D.cs
View file

@ -1,16 +1,20 @@
using Godot;
using Cirno.Scripts.Resources;
using Godot;
namespace Cirno.Scripts.Components.FSM.Enemy._3D;
public partial class EnemyFSMAnimatedSprite3D : AnimatedSprite3D
{
[Export] public EnemyProxy3D EnemyProxy { get; private set; }
public override void _Ready()
{
var enemyFsmProxy = this.GetParentOrNull<EnemyProxy3D>();
if (enemyFsmProxy?.EnemyResource?.AnimationFrames != null)
{
this.SpriteFrames = enemyFsmProxy.EnemyResource.AnimationFrames;
}
//EnemyProxy.Initialized += EnemyFsmProxyOnInitialized;
this.SpriteFrames = EnemyProxy.EnemyResource.AnimationFrames;
}
private void EnemyFsmProxyOnInitialized(EnemyResource resource)
{
this.SpriteFrames = resource.AnimationFrames;
}
}

5
Scripts/Components/FSM/Enemy/3D/EnemyProxy3D.cs
View file

@ -26,10 +26,13 @@ public partial class EnemyProxy3D : CharacterBody3D, IActivable
[Signal] public delegate void DeathEventHandler(EnemyProxy3D enemy);
[Signal]
public delegate void InitializedEventHandler(EnemyResource resource);
public void Init(EnemyResource enemyResource)
{
this.EnemyResource = enemyResource;
EmitSignalInitialized(enemyResource);
}
public void TriggerDeath()