From ff051d1f34878880de1cab7bdd7ca70dccc41501 Mon Sep 17 00:00:00 2001 From: Hans Kokx Date: Tue, 17 Mar 2026 13:15:35 +0100 Subject: [PATCH] Update enemy sprite IDs Signed-off-by: Hans Kokx --- .../lib/screens/sprite_gallery.dart | 28 +++++++++------ apps/wolf_3d_gui/lib/screens/vga_gallery.dart | 35 ++++++++++--------- .../entities/entities/enemies/enemy_type.dart | 18 +++++----- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart b/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart index 3338ffb..e1ccec9 100644 --- a/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart +++ b/apps/wolf_3d_gui/lib/screens/sprite_gallery.dart @@ -22,6 +22,8 @@ class SpriteGallery extends StatelessWidget { body: GridView.builder( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 8, + crossAxisSpacing: 8, + mainAxisSpacing: 8, ), itemCount: sprites.length, itemBuilder: (context, index) { @@ -46,17 +48,21 @@ class SpriteGallery extends StatelessWidget { } } - return Column( - children: [ - Text( - label, - style: const TextStyle(color: Colors.white, fontSize: 10), - textAlign: TextAlign.center, - ), - Expanded( - child: WolfAssetPainter.sprite(sprites[index]), - ), - ], + return Card( + color: Colors.blueGrey, + child: Column( + spacing: 8, + children: [ + Text( + label, + style: const TextStyle(color: Colors.white, fontSize: 10), + textAlign: TextAlign.center, + ), + Expanded( + child: WolfAssetPainter.sprite(sprites[index]), + ), + ], + ), ); }, ), diff --git a/apps/wolf_3d_gui/lib/screens/vga_gallery.dart b/apps/wolf_3d_gui/lib/screens/vga_gallery.dart index e7850ea..f4801b8 100644 --- a/apps/wolf_3d_gui/lib/screens/vga_gallery.dart +++ b/apps/wolf_3d_gui/lib/screens/vga_gallery.dart @@ -15,26 +15,29 @@ class VgaGallery extends StatelessWidget { body: GridView.builder( gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( maxCrossAxisExtent: 150, - crossAxisSpacing: 10, - mainAxisSpacing: 10, + crossAxisSpacing: 8, + mainAxisSpacing: 8, ), itemCount: images.length, itemBuilder: (context, index) { - return Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Index: $index\n${images[index].width} x ${images[index].height}", - style: const TextStyle(color: Colors.white, fontSize: 12), - textAlign: TextAlign.center, - ), - const SizedBox(height: 8), - Expanded( - child: Center( - child: WolfAssetPainter.vga(images[index]), + return Card( + color: Colors.blueGrey, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + spacing: 8, + children: [ + Text( + "Index: $index\n${images[index].width} x ${images[index].height}", + style: const TextStyle(color: Colors.white, fontSize: 12), + textAlign: TextAlign.center, ), - ), - ], + Expanded( + child: Center( + child: WolfAssetPainter.vga(images[index]), + ), + ), + ], + ), ); }, ), diff --git a/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart index 8f93b5b..5273f44 100644 --- a/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart +++ b/packages/wolf_3d_dart/lib/src/entities/entities/enemies/enemy_type.dart @@ -146,9 +146,9 @@ enum EnemyType { idle: SpriteFrameRange(99, 106), walking: SpriteFrameRange(107, 130), attacking: SpriteFrameRange(135, 137), - pain: SpriteFrameRange(131, 131), - dying: SpriteFrameRange(132, 134), - dead: SpriteFrameRange(137, 137), + pain: SpriteFrameRange(137, 137), + dying: SpriteFrameRange(131, 133), + dead: SpriteFrameRange(134, 134), ), ), @@ -157,10 +157,10 @@ enum EnemyType { mapData: EnemyMapData(MapObject.ssStart), animations: EnemyAnimationMap( idle: SpriteFrameRange(138, 145), - walking: SpriteFrameRange(146, 178), + walking: SpriteFrameRange(146, 177), attacking: SpriteFrameRange(184, 186), pain: SpriteFrameRange(182, 182), - dying: SpriteFrameRange(179, 181), + dying: SpriteFrameRange(178, 181), dead: SpriteFrameRange(183, 183), ), ), @@ -173,8 +173,8 @@ enum EnemyType { walking: SpriteFrameRange(195, 226), attacking: SpriteFrameRange(234, 237), pain: SpriteFrameRange(231, 231), - dying: SpriteFrameRange(227, 230), - dead: SpriteFrameRange(232, 232), + dying: SpriteFrameRange(227, 232, excluded: {231}), + dead: SpriteFrameRange(233, 233), ), existsInShareware: false, ), @@ -187,8 +187,8 @@ enum EnemyType { walking: SpriteFrameRange(246, 277), attacking: SpriteFrameRange(285, 287), pain: SpriteFrameRange(282, 282), - dying: SpriteFrameRange(278, 281), - dead: SpriteFrameRange(283, 283), + dying: SpriteFrameRange(278, 283, excluded: {282}), + dead: SpriteFrameRange(284, 284), ), existsInShareware: false, )