bugfixes, fix healthbar issue, screen flash animation for first boss

evanbowman · Apr 24, 2020 · 11bbdea · 11bbdea
1 parent e380397
commit 11bbdea
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 28 deletions.
diff --git a/images/overlay.png b/images/overlay.png
diff --git a/source/entity/bosses/theFirstExplorer.cpp b/source/entity/bosses/theFirstExplorer.cpp
@@ -473,6 +473,22 @@ void TheFirstExplorer::on_collision(Platform& pf, Game& game, Laser&)
 }
 
 
+Game::DeferredCallback screen_flash_animation(int remaining)
+{
+    return [remain = remaining](Platform& pf, Game& game) {
+        if (remain > 0) {
+            pf.screen().fade(255 - remain, ColorConstant::silver_white);
+
+            game.on_timeout(milliseconds(20),
+                            screen_flash_animation(remain - 1));
+
+        } else {
+            pf.screen().fade(0);
+        }
+    };
+}
+
+
 void TheFirstExplorer::on_death(Platform& pf, Game& game)
 {
     hide_boss_health(game);
@@ -481,27 +497,31 @@ void TheFirstExplorer::on_death(Platform& pf, Game& game)
 
     const auto off = 50.f;
 
-    for (int i = 0; i < 3; ++i) {
-        game.details().spawn<Item>(
-            sample<32>(position_), pf, Item::Type::heart);
-    }
-
     big_explosion(pf, game, {position_.x - off, position_.y - off});
     big_explosion(pf, game, {position_.x + off, position_.y + off});
 
-    game.on_timeout(milliseconds(300),
-                    [pos = position_](Platform& pf, Game& game) {
-                        big_explosion(pf, game, pos);
-                        const auto off = -50.f;
+    game.on_timeout(
+        milliseconds(300), [pos = position_](Platform& pf, Game& game) {
+            big_explosion(pf, game, pos);
+            const auto off = -50.f;
+
+            big_explosion(pf, game, {pos.x - off, pos.y + off});
+            big_explosion(pf, game, {pos.x + off, pos.y - off});
 
-                        big_explosion(pf, game, {pos.x - off, pos.y + off});
-                        big_explosion(pf, game, {pos.x + off, pos.y - off});
-                    });
+            game.on_timeout(milliseconds(100), [pos](Platform& pf, Game& game) {
+                for (int i = 0; i < 3; ++i) {
+                    game.details().spawn<Item>(
+                        sample<32>(pos), pf, Item::Type::heart);
+                }
+
+                game.transporter().set_position(pos);
+
+                screen_flash_animation(255)(pf, game);
+            });
+        });
 
     pf.speaker().stop_music();
     pf.sleep(10);
 
     game.score() += 1000;
-
-    game.transporter().set_position(position_);
 }
diff --git a/source/graphics/color.hpp b/source/graphics/color.hpp
@@ -19,6 +19,7 @@ enum class ColorConstant {
     safety_orange,    // #FC7500
     rich_black,       // #000010
     stil_de_grain,    // #F9DC5C
+    silver_white,     // #F4F4F8
     count
 };
 

diff --git a/source/graphics/images.h b/source/graphics/images.h
@@ -9,7 +9,7 @@
 //	+ 477 tiles not compressed
 //	Total size: 512 + 15264 = 15776
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -38,7 +38,7 @@ extern const unsigned short old_poster_flattenedPal[256];
 //	+ 504 tiles not compressed
 //	Total size: 512 + 16128 = 16640
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -67,7 +67,7 @@ extern const unsigned short overlayPal[256];
 //	+ 73 tiles not compressed
 //	Total size: 512 + 2336 = 2848
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -96,7 +96,7 @@ extern const unsigned short overlay_journalPal[256];
 //	+ 1008 tiles Metatiled by 2x4 not compressed
 //	Total size: 512 + 32256 = 32768
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:27
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -125,7 +125,7 @@ extern const unsigned short spritesheetPal[256];
 //	+ 1008 tiles Metatiled by 2x4 not compressed
 //	Total size: 512 + 32256 = 32768
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:27
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -154,7 +154,7 @@ extern const unsigned short spritesheet2Pal[256];
 //	+ 1008 tiles Metatiled by 2x4 not compressed
 //	Total size: 512 + 32256 = 32768
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -183,7 +183,7 @@ extern const unsigned short spritesheet_boss0Pal[256];
 //	+ 504 tiles Metatiled by 4x3 not compressed
 //	Total size: 512 + 16128 = 16640
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -212,7 +212,7 @@ extern const unsigned short tilesheetPal[256];
 //	+ 504 tiles Metatiled by 4x3 not compressed
 //	Total size: 512 + 16128 = 16640
 //
-//	Time-stamp: 2020-04-23, 00:30:26
+//	Time-stamp: 2020-04-24, 00:08:28
 //	Exported by Cearn's GBA Image Transmogrifier, v
 //	( http://www.coranac.com/projects/#grit )
 //

diff --git a/source/graphics/overlay.cpp b/source/graphics/overlay.cpp
@@ -377,7 +377,7 @@ BossHealthBar::BossHealthBar(Platform& pfrm,
     : pfrm_(pfrm), position_(position), height_(height)
 {
     pfrm_.set_overlay_tile(position_.x, position_.y, 82);
-    pfrm_.set_overlay_tile(position_.x, position_.y + height, 83);
+    pfrm_.set_overlay_tile(position_.x, position_.y + height + 1, 83);
     set_health(0.f);
 }
 
@@ -396,14 +396,14 @@ void BossHealthBar::set_health(Float percentage)
         ++current_tile;
     }
 
-    if (current_tile < height_ + 1 and fractional_pixels % 8 not_eq 0) {
+    if (current_tile < height_ and fractional_pixels % 8 not_eq 0) {
         pfrm_.set_overlay_tile(position_.x,
                                position_.y + 1 + current_tile,
                                83 + fractional_pixels % 8);
         ++current_tile;
     }
 
-    while (current_tile < height_ + 1) {
+    while (current_tile < height_) {
         pfrm_.set_overlay_tile(position_.x, position_.y + 1 + current_tile, 92);
         ++current_tile;
     }

diff --git a/source/graphics/overlay.s b/source/graphics/overlay.s
@@ -9,7 +9,7 @@
 @	+ 504 tiles not compressed
 @	Total size: 512 + 16128 = 16640
 @
-@	Time-stamp: 2020-04-23, 00:30:26
+@	Time-stamp: 2020-04-24, 00:08:28
 @	Exported by Cearn's GBA Image Transmogrifier, v
 @	( http://www.coranac.com/projects/#grit )
 @
@@ -112,7 +112,7 @@ overlayTiles:
 	.word 0x44444444,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
 	.word 0x00000000,0x44444440,0x42444240,0x42222240,0x42424240,0x42222240,0x44222440,0x44444440
-	.word 0x44444440,0x44444440,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
+	.word 0x44444440,0x44444440,0x44444440,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
 	.word 0x42222240,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440
 	.word 0x42222240,0x42222240,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440
 	.word 0x42222240,0x42222240,0x42222240,0x44444440,0x44444440,0x44444440,0x44444440,0x44444440

diff --git a/source/number/numeric.hpp b/source/number/numeric.hpp
@@ -223,7 +223,7 @@ inline UnitVec direction(const Vec2<Float>& origin, const Vec2<Float>& target)
 }
 
 
-inline Vec2<Float> rotate(const Vec2<Float>& input, Angle angle)
+inline Vec2<Float> rotate(const Vec2<Float>& input, Float angle)
 {
     const s16 converted_angle = INT16_MAX * (angle / 360.f);
     const Float cos_theta = Float(cosine(converted_angle)) / INT16_MAX;

diff --git a/source/platform/gba_platform.cpp b/source/platform/gba_platform.cpp
@@ -318,6 +318,10 @@ const Color& real_color(ColorConstant k)
         static const Color steel_blue(6, 10, 16);
         return steel_blue;
 
+    case ColorConstant::silver_white:
+        static const Color silver_white(29, 29, 30);
+        return silver_white;
+
     default:
     case ColorConstant::null:
     case ColorConstant::rich_black: