add special attacks

o2sh · Feb 19, 2021 · 3ed10bf · 3ed10bf
1 parent ecbb43c
commit 3ed10bf
Show file tree

Hide file tree

Showing 45 changed files with 662 additions and 117 deletions.
diff --git a/README.md b/README.md
@@ -21,4 +21,5 @@ cargo run
 
 * The Arrow Keys move the character around
 * Z causes a short barrage of shots to be fired; it may be held down for rapidfire
+* X releases a bomb, also known as a Spell Card (presuming that any are left)
 * Esc pauses the game and brings you to the in-game menu
diff --git a/assets/gfx/bg.json b/assets/gfx/bg.json
@@ -2,7 +2,7 @@
   "meta": {
     "image": "bg.png",
     "size": {
-      "w": 1536,
+      "w": 1024,
       "h": 1024
     },
     "scale": "1"
@@ -47,26 +47,6 @@
         "w": 512,
         "h": 1024
       }
-    },
-    "bg_grass.png": {
-      "frame": {
-        "x": 1024,
-        "y": 0,
-        "w": 512,
-        "h": 1024
-      },
-      "rotated": false,
-      "trimmed": false,
-      "spriteSourceSize": {
-        "x": 0,
-        "y": 0,
-        "w": 512,
-        "h": 1024
-      },
-      "sourceSize": {
-        "w": 512,
-        "h": 1024
-      }
     }
   }
 }
diff --git a/assets/gfx/bg.png b/assets/gfx/bg.png
diff --git a/assets/gfx/big_orbs.json b/assets/gfx/big_orbs.json
@@ -0,0 +1,92 @@
+{
+  "meta": {
+    "image": "big_orbs.png",
+    "size": {
+      "w": 256,
+      "h": 64
+    },
+    "scale": "1"
+  },
+  "frames": {
+    "big_orb0.png": {
+      "frame": {
+        "x": 0,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "sourceSize": {
+        "w": 64,
+        "h": 64
+      }
+    },
+    "big_orb1.png": {
+      "frame": {
+        "x": 64,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "sourceSize": {
+        "w": 64,
+        "h": 64
+      }
+    },
+    "big_orb2.png": {
+      "frame": {
+        "x": 128,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "sourceSize": {
+        "w": 64,
+        "h": 64
+      }
+    },
+    "big_orb3.png": {
+      "frame": {
+        "x": 192,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 64,
+        "h": 64
+      },
+      "sourceSize": {
+        "w": 64,
+        "h": 64
+      }
+    }
+  }
+}
diff --git a/assets/gfx/big_orbs.png b/assets/gfx/big_orbs.png
diff --git a/assets/gfx/special.json b/assets/gfx/special.json
@@ -0,0 +1,52 @@
+{
+  "meta": {
+    "image": "special.png",
+    "size": {
+      "w": 640,
+      "h": 488
+    },
+    "scale": "1"
+  },
+  "frames": {
+    "special0.png": {
+      "frame": {
+        "x": 0,
+        "y": 0,
+        "w": 320,
+        "h": 488
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 320,
+        "h": 488
+      },
+      "sourceSize": {
+        "w": 320,
+        "h": 488
+      }
+    },
+    "special1.png": {
+      "frame": {
+        "x": 320,
+        "y": 0,
+        "w": 320,
+        "h": 488
+      },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": {
+        "x": 0,
+        "y": 0,
+        "w": 320,
+        "h": 488
+      },
+      "sourceSize": {
+        "w": 320,
+        "h": 488
+      }
+    }
+  }
+}
diff --git a/assets/gfx/special.png b/assets/gfx/special.png
diff --git a/assets/sfx/se_spell.ogg b/assets/sfx/se_spell.ogg
diff --git a/common/src/game/player_data.rs b/common/src/game/player_data.rs
@@ -1,6 +1,8 @@
 pub struct PlayerData<'a> {
     pub sprite: &'a str,
     pub bullet: &'a str,
+    pub special: &'a str,
+    pub big_orb: &'a str,
     pub neutral_face: &'a str,
     pub attack_face: &'a str,
     pub dialog_face: &'a str,
@@ -14,6 +16,8 @@ impl<'a> PlayerData<'a> {
             0 => Self {
                 sprite: "reimu0",
                 bullet: "spell0",
+                special: "special0",
+                big_orb: "big_orb0",
                 neutral_face: "a_reimu0",
                 attack_face: "a_reimu1",
                 damage_face: "a_reimu2",
@@ -36,6 +40,8 @@ impl<'a> PlayerData<'a> {
             _ => Self {
                 sprite: "marisa0",
                 bullet: "spell4",
+                special: "special1",
+                big_orb: "big_orb1",
                 neutral_face: "a_marisa0",
                 attack_face: "a_marisa1",
                 damage_face: "a_marisa2",

diff --git a/common/src/traits/renderer.rs b/common/src/traits/renderer.rs
@@ -25,7 +25,7 @@ pub trait Renderer {
         alpha: u8,
     );
     fn draw_texture(&mut self, tex_name: &str, width: i32, height: i32);
-    fn draw_scrolling_bg(&mut self, sprite_name: &str, width: i32, height: i32);
+    fn draw_scrolling_bg(&mut self, sprite_name: &str, width: i32, height: i32, alpha: u8);
     fn set_draw_color(&mut self, r: u8, g: u8, b: u8);
     fn draw_vertical_separation(&mut self, width: i32, height: i32);
     fn draw_rect(&mut self, pos: &Vector2D<i32>, width: i32, height: i32, color: RGBA);

diff --git a/common/src/utils/consts.rs b/common/src/utils/consts.rs
@@ -2,12 +2,13 @@ use crate::utils::math::*;
 
 pub const SFX_VOLUME: f32 = 0.05;
 pub const BGM_VOLUME: f32 = 0.1;
-pub const CHANNEL_COUNT: u32 = 5;
+pub const CHANNEL_COUNT: u32 = 6;
 pub const CH_BG_MUSIC: u32 = 0;
 pub const CH_SHOT: u32 = 1;
 pub const CH_KILL: u32 = 2;
 pub const CH_ITEM: u32 = 3;
 pub const CH_DAMAGE: u32 = 4;
+pub const CH_SPELL: u32 = 5;
 
 pub const WINDOW_WIDTH: i32 = 700;
 pub const WINDOW_HEIGHT: i32 = 256 * 2;
@@ -44,7 +45,6 @@ pub const ENE_SHOT_SPEED1: i32 = 25 * ONE / 10;
 pub const ENE_SHOT_SPEED2: i32 = 40 * ONE / 10;
 
 pub const BG1_TEXTURE: &str = "bg_ground";
-pub const BG3_TEXTURE: &str = "bg_grass";
 pub const BG2_TEXTURE: &str = "bg_water";
 
 pub const BG_MUSIC: &str = "stage01";
@@ -56,6 +56,7 @@ pub const SE_OK: &str = "assets/sfx/se_ok00";
 pub const SE_SELECT: &str = "assets/sfx/se_select00";
 pub const SE_ITEM: &str = "assets/sfx/se_item00";
 pub const SE_DAMAGE: &str = "assets/sfx/se_damage";
+pub const SE_SPELL: &str = "assets/sfx/se_spell";
 
 pub const RE_FONT: &str = "assets/fonts/regular.ttf";
 pub const IM_FONT: &str = "assets/fonts/immortal.ttf";
diff --git a/common/src/utils/pad.rs b/common/src/utils/pad.rs
@@ -9,6 +9,7 @@ pub enum Key {
     Up,
     Down,
     Z,
+    X,
 }
 
 bitflags! {
@@ -20,6 +21,7 @@ bitflags! {
         const D = 0b00001000;
         const A = 0b00010000;
         const Z = 0b00100000;
+        const X = 0b01000000;
     }
 }
 
@@ -63,6 +65,7 @@ fn get_key_bit(key: Key) -> PadBit {
         Key::Up => PadBit::U,
         Key::Down => PadBit::D,
         Key::Z => PadBit::Z,
+        Key::X => PadBit::X,
         Key::Space => PadBit::A,
         _ => PadBit::empty(),
     }

diff --git a/docs/0.bootstrap.js b/docs/0.bootstrap.js
diff --git a/docs/assets/gfx/bg.json b/docs/assets/gfx/bg.json
@@ -2,7 +2,7 @@
   "meta": {
     "image": "bg.png",
     "size": {
-      "w": 1536,
+      "w": 1024,
       "h": 1024
     },
     "scale": "1"
@@ -47,26 +47,6 @@
         "w": 512,
         "h": 1024
       }
-    },
-    "bg_grass.png": {
-      "frame": {
-        "x": 1024,
-        "y": 0,
-        "w": 512,
-        "h": 1024
-      },
-      "rotated": false,
-      "trimmed": false,
-      "spriteSourceSize": {
-        "x": 0,
-        "y": 0,
-        "w": 512,
-        "h": 1024
-      },
-      "sourceSize": {
-        "w": 512,
-        "h": 1024
-      }
     }
   }
 }
diff --git a/docs/assets/gfx/bg.png b/docs/assets/gfx/bg.png