Change player cannon position (#55)

* change cannon sprite * change the blade explosion skill * remove space bar shooting and repatch blade explosion * change tutorial section for space bar shooting
MounirAia · Sep 18, 2024 · 4ba8da9 · 4ba8da9
1 parent 5fb2378
commit 4ba8da9
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 311 deletions.
diff --git a/index.html b/index.html
@@ -75,7 +75,6 @@ <h1 class="header">Web Shoot'em UP</h1>
                 <canvas id="canvas" width="1280" height="720" style="background-color: #cccccc"></canvas>
                 <ul>
                     <li>Use 'wasd' keys (or zqsd in azerty keyboards) to move the player</li>
-                    <li>Use the 'Space Bar' to shoot</li>
                     <li>Press 'H' to buy skills in game</li>
                     <li>
                         Press 'U', 'I', 'O', or 'P' to quickly upgrade <br /><br />

diff --git a/src/SpriteStaticInformation/Cosmetics/Upgrade/infoRocketCannon.ts b/src/SpriteStaticInformation/Cosmetics/Upgrade/infoRocketCannon.ts
@@ -5,134 +5,67 @@ const Info = {
     Level1: {
         Meta: {
             TileDimensions: {
-                Width: 8,
-                Height: 8,
+                Width: 9,
+                Height: 2,
             },
             RealDimension: {
-                Width: 3 * CANVA_SCALEX,
-                Height: 5 * CANVA_SCALEY,
+                Width: 9 * CANVA_SCALEX,
+                Height: 2 * CANVA_SCALEY,
             },
             SpriteShiftPosition: {
-                X: -3 * CANVA_SCALEX,
-                Y: -1 * CANVA_SCALEY,
+                X: 0 * CANVA_SCALEX,
+                Y: 0 * CANVA_SCALEY,
             },
             SpriteShiftPositionOnPlayer: {
-                Cannon1: { X: 19 * CANVA_SCALEX, Y: -5 * CANVA_SCALEY },
+                Cannon1: { X: 25 * CANVA_SCALEX, Y: 4 * CANVA_SCALEY },
             },
         },
         Hitbox: [
             {
-                X: 19 * CANVA_SCALEX,
-                Y: -5 * CANVA_SCALEY,
-                Width: 3 * CANVA_SCALEX,
-                Height: 5 * CANVA_SCALEY,
+                X: 25 * CANVA_SCALEX,
+                Y: 4 * CANVA_SCALEY,
+                Width: 9 * CANVA_SCALEX,
+                Height: 2 * CANVA_SCALEY,
             },
         ],
         Animations: {
             Idle: {
                 FrameLengthInTime: Infinity,
                 Frames: [0],
             },
-            Destroyed: {
-                FrameLengthInTime: 6 / 60,
-                Frames: [1, 2, 3],
-            },
         },
     },
     Level2: {
         Meta: {
             TileDimensions: {
-                Width: 16,
-                Height: 16,
+                Width: 12,
+                Height: 2,
             },
             RealDimension: {
-                Width: 8 * CANVA_SCALEX,
-                Height: 6 * CANVA_SCALEY,
+                Width: 12 * CANVA_SCALEX,
+                Height: 2 * CANVA_SCALEY,
             },
             SpriteShiftPosition: {
-                X: -4 * CANVA_SCALEX,
-                Y: -5 * CANVA_SCALEY,
+                X: 0 * CANVA_SCALEX,
+                Y: 0 * CANVA_SCALEY,
             },
             SpriteShiftPositionOnPlayer: {
-                Cannon1: { X: 14 * CANVA_SCALEX, Y: -6 * CANVA_SCALEY },
-                Cannon2: { X: 14 * CANVA_SCALEX, Y: 12 * CANVA_SCALEY },
-            },
-        },
-        Hitbox: {
-            Cannon1: [
-                {
-                    X: 14 * CANVA_SCALEX,
-                    Y: -6 * CANVA_SCALEY,
-                    Width: 8 * CANVA_SCALEX,
-                    Height: 6 * CANVA_SCALEY,
-                },
-            ],
-            Cannon2: [
-                {
-                    X: 14 * CANVA_SCALEX,
-                    Y: 12 * CANVA_SCALEY,
-                    Width: 8 * CANVA_SCALEX,
-                    Height: 6 * CANVA_SCALEY,
-                },
-            ],
-        },
-        Animations: {
-            Idle: {
-                FrameLengthInTime: Infinity,
-                Frames: [0],
-            },
-            Destroyed: {
-                FrameLengthInTime: 6 / 60,
-                Frames: [1, 2, 3, 4],
+                Cannon1: { X: 22 * CANVA_SCALEX, Y: 0 * CANVA_SCALEY },
             },
         },
-    },
-    Level3: {
-        Meta: {
-            TileDimensions: {
-                Width: 16,
-                Height: 16,
-            },
-            RealDimension: {
-                Width: 7 * CANVA_SCALEX,
-                Height: 7 * CANVA_SCALEY,
-            },
-            SpriteShiftPosition: {
-                X: -5 * CANVA_SCALEX,
-                Y: -5 * CANVA_SCALEY,
-            },
-            SpriteShiftPositionOnPlayer: {
-                Cannon1: { X: 14 * CANVA_SCALEX, Y: -7 * CANVA_SCALEY },
-                Cannon2: { X: 14 * CANVA_SCALEX, Y: 12 * CANVA_SCALEX },
+        Hitbox: [
+            {
+                X: 22 * CANVA_SCALEX,
+                Y: 0 * CANVA_SCALEY,
+                Width: 12 * CANVA_SCALEX,
+                Height: 2 * CANVA_SCALEY,
             },
-        },
-        Hitbox: {
-            Cannon1: [
-                {
-                    X: 14 * CANVA_SCALEX,
-                    Y: -7 * CANVA_SCALEY,
-                    Width: 7 * CANVA_SCALEX,
-                    Height: 7 * CANVA_SCALEY,
-                },
-            ],
-            Cannon2: [
-                {
-                    X: 14 * CANVA_SCALEX,
-                    Y: 12 * CANVA_SCALEX,
-                    Width: 7 * CANVA_SCALEX,
-                    Height: 7 * CANVA_SCALEY,
-                },
-            ],
-        },
+        ],
         Animations: {
             Idle: {
                 FrameLengthInTime: Infinity,
                 Frames: [0],
             },
-            Destroyed: {
-                FrameLengthInTime: 0.1,
-                Frames: [1, 2, 3, 4],
-            },
         },
     },
 };

diff --git a/src/SpriteStaticInformation/Skills/Special/Rocket/infoRocketSkill.ts b/src/SpriteStaticInformation/Skills/Special/Rocket/infoRocketSkill.ts
@@ -16,7 +16,7 @@ const Info = {
                 Y: -5 * CANVA_SCALEY,
             },
             SpriteShiftPositionOnPlayer: {
-                Up: { X: 19 * CANVA_SCALEX, Y: -5 * CANVA_SCALEY },
+                Up: { X: (25 + 8) * CANVA_SCALEX, Y: 3.5 * CANVA_SCALEY },
             },
         },
         Hitbox: {
@@ -56,8 +56,8 @@ const Info = {
                 Y: -6 * CANVA_SCALEX,
             },
             SpriteShiftPositionOnPlayer: {
-                Up: { X: 19 * CANVA_SCALEX, Y: -5 * CANVA_SCALEY },
-                Down: { X: 19 * CANVA_SCALEX, Y: 12 * CANVA_SCALEY },
+                Up: { X: (22 + 13) * CANVA_SCALEX, Y: -1.5 * CANVA_SCALEY },
+                Down: { X: (25 + 10) * CANVA_SCALEX, Y: 2.5 * CANVA_SCALEY },
             },
         },
         Hitbox: {
@@ -99,8 +99,8 @@ const Info = {
                 Y: -6 * CANVA_SCALEY,
             },
             SpriteShiftPositionOnPlayer: {
-                Up: { X: 19 * CANVA_SCALEX, Y: -5 * CANVA_SCALEY },
-                Down: { X: 19 * CANVA_SCALEX, Y: 12 * CANVA_SCALEY },
+                Up: { X: (22 + 12) * CANVA_SCALEX, Y: -1 * CANVA_SCALEY },
+                Down: { X: (25 + 9) * CANVA_SCALEX, Y: 3 * CANVA_SCALEY },
             },
         },
         Hitbox: {

diff --git a/src/Sprites/Player.ts b/src/Sprites/Player.ts
@@ -289,8 +289,7 @@ class Player extends Sprite implements IServicePlayer, ISpriteWithSpeed, ISprite
         this.shockwaveControler.Update(dt);
 
         this.UpdateHitboxes(dt);
-
-        if (keyboardManager.GetCommandState({ command: 'PlayerShoot' }).IsDown && this.CanShootRegular) {
+        if (this.CanShootRegular) {
             const bullet = new RegularPlayerBullet(this.X, this.Y);
             ServiceLocator.GetService<IServiceGeneratedSpritesManager>('GeneratedSpritesManager').AddSprite(bullet);
         } else {
@@ -300,7 +299,7 @@ class Player extends Sprite implements IServicePlayer, ISpriteWithSpeed, ISprite
             }
         }
 
-        if (keyboardManager.GetCommandState({ command: 'PlayerShoot' }).IsDown && this.CanShootSpecial) {
+        if (this.CanShootSpecial) {
             this.currentSkill.get('special')?.Effect();
         } else if (this.currentSkill.get('special')) {
             const specialSkillAS = this.currentSkill.get('special')?.AttackSpeed?.();