admin/peggle-roguelike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin/peggle-roguelike:f022333c9b378e5a77d8d2727f2a9cb16dd1b8f8
Branches Tags
admin/peggle-roguelike:main
...
compare: admin/peggle-roguelike:95cdd81a3f33fd41eb55b64c80e2a7a671d1f57a
Branches Tags
admin/peggle-roguelike:main

2 Commits
f022333c9b ... 95cdd81a3f

Author SHA1 Message Date
admin 95cdd81a3f Merge branch 'main' of https://git.cojoedmo.com/admin/peggle-roguelike 2026-06-24 00:08:32 -04:00
admin b1bae1f973 reverting to prior change 2026-06-23 23:55:12 -04:00
1 changed files with 4 additions and 0 deletions
Expand all files Collapse all files
EnemyController.cs
+4
View File
@@ -11,8 +11,12 @@ public partial class EnemyController : TurnController
public PackedScene _enemyScene = GD.Load<PackedScene>("res://Enemy.tscn"); public PackedScene _enemyScene = GD.Load<PackedScene>("res://Enemy.tscn");
public List<Enemy> _enemies = new(); public List<Enemy> _enemies = new();
public PlayerController _playerController; public PlayerController _playerController;
<<<<<<< HEAD
public Tween _movementTween;
=======
public Dictionary<float, List<Tween>> _tweenStages = new(); public Dictionary<float, List<Tween>> _tweenStages = new();
public Tween _tween; public Tween _tween;
>>>>>>> f022333c9b378e5a77d8d2727f2a9cb16dd1b8f8
public void AddEnemies(int ENEMY_COUNT = 1) public void AddEnemies(int ENEMY_COUNT = 1)
{ {