commit c09b4d3ef50a4b284486eeb0ae62f94c64ba6110 · dunkirk.sh/smackdown

+13 -11

src/enemy.ts

···

       116
        
               k.color(255, 0, 0),

     

       117
        
               k.z(1),

     

       118
        
             ]);

     

       119
       -
             

     

       120
        
             // Handle collisions with sword

     

       121
        
             this.onCollide("sword", (sword) => {

     

       122
        
               if (sword.isAttacking && !isHit) {

     
···

       151
        
                 this.flipX = normalizedDir.x < 0;

     

       152
        
               }

     

       153
        
             }

     

       154
       -
             

     

       155
        
             // Check for collision with player and apply damage if in contact

     

       156
        
             // Only apply damage if cooldown has passed

     

       157
        
             if (k.time() - lastDamageTime > DAMAGE_COOLDOWN) {

     

       158
        
               const playerObj = k.get("player")[0];

     

       159
        
               if (playerObj && this.isColliding(playerObj)) {

     

       160
        
                 lastDamageTime = k.time();

     

       161
       -
                 

     

       162
        
                 // Damage player

     

       163
        
                 if (playerObj.damage) {

     

       164
        
                   playerObj.damage(5);

     

       165
        
                 }

     

       166
       -
                 

     

       167
        
                 // Knockback effect

     

       168
        
                 const knockback = 200;

     

       169
       -
                 const knockbackDir = k.vec2(

     

       170
       -
                   playerObj.pos.x - this.pos.x,

     

       171
       -
                   playerObj.pos.y - this.pos.y

     

       172
       -
                 ).unit();

     

       173
       -
                 

     

       174
       -
                 playerObj.move(knockbackDir.x * knockback, knockbackDir.y * knockback);

     

       0
        
       
     

       0
        
       
     

       175
        
               }

     

       176
        
             }

     

       177
        
       

     
···

       206
        
           enemy(k, target),

     

       207
        
           "enemy", // Add tag for collision detection

     

       208
        
         ]);

     

       209
       -
         

     

       210
        
         return newEnemy;

     

       211
        
       }

     

       212

···

       116
        
               k.color(255, 0, 0),

     

       117
        
               k.z(1),

     

       118
        
             ]);

     

       119
       +
       

     

       120
        
             // Handle collisions with sword

     

       121
        
             this.onCollide("sword", (sword) => {

     

       122
        
               if (sword.isAttacking && !isHit) {

     
···

       151
        
                 this.flipX = normalizedDir.x < 0;

     

       152
        
               }

     

       153
        
             }

     

       154
       +
       

     

       155
        
             // Check for collision with player and apply damage if in contact

     

       156
        
             // Only apply damage if cooldown has passed

     

       157
        
             if (k.time() - lastDamageTime > DAMAGE_COOLDOWN) {

     

       158
        
               const playerObj = k.get("player")[0];

     

       159
        
               if (playerObj && this.isColliding(playerObj)) {

     

       160
        
                 lastDamageTime = k.time();

     

       161
       +
       

     

       162
        
                 // Damage player

     

       163
        
                 if (playerObj.damage) {

     

       164
        
                   playerObj.damage(5);

     

       165
        
                 }

     

       166
       +
       

     

       167
        
                 // Knockback effect

     

       168
        
                 const knockback = 200;

     

       169
       +
                 const knockbackDir = k

     

       170
       +
                   .vec2(playerObj.pos.x - this.pos.x, playerObj.pos.y - this.pos.y)

     

       171
       +
                   .unit();

     

       172
       +
       

     

       173
       +
                 playerObj.move(

     

       174
       +
                   knockbackDir.x * knockback,

     

       175
       +
                   knockbackDir.y * knockback,

     

       176
       +
                 );

     

       177
        
               }

     

       178
        
             }

     

       179
        
       

     
···

       208
        
           enemy(k, target),

     

       209
        
           "enemy", // Add tag for collision detection

     

       210
        
         ]);

     

       211
       +
       

     

       212
        
         return newEnemy;

     

       213
        
       }

     

       214

+31 -20

src/main.ts

···

       45
        
       let spawnInterval = initialSpawnInterval;

     

       46
        
       let gameTime = 0; // Track game time in seconds

     

       47
        
       let difficultyLevel = 1;

     

       48
       -
       let spawnLoopId: any = null;

     

       0
        
       
     

       0
        
       
     

       49
        
       

     

       50
        
       // Difficulty scaling

     

       51
        
       function updateDifficulty() {

     

       52
        
         gameTime += 1; // Increment game time by 1 second

     

       53
       -
         

     

       54
        
         // Every 30 seconds, increase difficulty

     

       55
       -
         if (gameTime % 30 === 0) {

     

       56
        
           difficultyLevel += 1;

     

       57
       -
           

     

       58
        
           // Increase max enemies (cap at 15)

     

       59
       -
           maxEnemies = Math.min(initialMaxEnemies + difficultyLevel, 15);

     

       60
       -
           

     

       61
        
           // Decrease spawn interval (minimum 0.5 seconds)

     

       62
       -
           spawnInterval = Math.max(initialSpawnInterval - (difficultyLevel * 0.3), 0.5);

     

       63
       -
           

     

       64
       -
           console.log(`Difficulty increased to level ${difficultyLevel}. Max enemies: ${maxEnemies}, Spawn interval: ${spawnInterval}s`);

     

       65
       -
           

     

       0
        
       
     

       0
        
       
     

       66
        
           // Cancel previous spawn loop and start a new one with updated interval

     

       67
       -
           if (spawnLoopId !== null) {

     

       68
       -
             k.cancel(spawnLoopId);

     

       69
       -
           }

     

       70
       -
           spawnLoopId = k.loop(spawnInterval, spawnEnemy);

     

       71
       -
           

     

       72
        
           // Visual feedback for difficulty increase

     

       73
        
           const screenCenter = k.vec2(k.width() / 2, k.height() / 2);

     

       74
        
           if (k.addConfetti) {

     

       75
        
             k.addConfetti(screenCenter);

     

       76
        
           }

     

       77
       -
           

     

       78
        
           // Add difficulty level text

     

       79
        
           const levelText = k.add([

     

       80
        
             k.text(`Difficulty Level ${difficultyLevel}!`, { size: 32 }),

     
···

       85
        
             k.z(100),

     

       86
        
             k.opacity(1),

     

       87
        
           ]);

     

       88
       -
           

     

       89
        
           // Fade out and destroy the text

     

       90
        
           k.tween(

     

       91
        
             1,

     
···

       96
        
             },

     

       97
        
             k.easings.easeInQuad,

     

       98
        
           );

     

       99
       -
           

     

       100
        
           k.wait(2, () => {

     

       101
        
             levelText.destroy();

     

       102
        
           });

     
···

       113
        
       

     

       114
        
         // Random position at the edges of the screen

     

       115
        
         const side = Math.floor(Math.random() * 4); // 0: top, 1: right, 2: bottom, 3: left

     

       116
       -
         let x, y;

     

       0
        
       
     

       117
        
       

     

       118
        
         switch (side) {

     

       119
        
           case 0: // top

     
···

       141
        
         // Remove from array when destroyed

     

       142
        
         newEnemy.on("destroy", () => {

     

       143
        
           enemies = enemies.filter((e) => e !== newEnemy);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       144
        
         });

     

       145
        
       }

     

       146
        
       

     

       147
        
       // Start spawning enemies

     

       148
       -
       spawnLoopId = k.loop(spawnInterval, spawnEnemy);

     

       149
        
       

     

       150
        
       // Game loop

     

       151
        
       k.onUpdate(() => {

···

       45
        
       let spawnInterval = initialSpawnInterval;

     

       46
        
       let gameTime = 0; // Track game time in seconds

     

       47
        
       let difficultyLevel = 1;

     

       48
       +
       let score = 0;

     

       49
       +
       

     

       50
       +
       const scoreText = k.add([k.text(`Score: ${score}`), k.pos(16, 16)]);

     

       51
        
       

     

       52
        
       // Difficulty scaling

     

       53
        
       function updateDifficulty() {

     

       54
        
         gameTime += 1; // Increment game time by 1 second

     

       55
       +
       

     

       56
        
         // Every 30 seconds, increase difficulty

     

       57
       +
         if (score != 0 && score % (50 * difficultyLevel) === 0) {

     

       58
        
           difficultyLevel += 1;

     

       59
       +
       

     

       60
        
           // Increase max enemies (cap at 15)

     

       61
       +
           maxEnemies = Math.min(initialMaxEnemies + difficultyLevel * 3, 15);

     

       62
       +
       

     

       63
        
           // Decrease spawn interval (minimum 0.5 seconds)

     

       64
       +
           spawnInterval = Math.max(initialSpawnInterval - difficultyLevel * 0.3, 0.5);

     

       65
       +
       

     

       66
       +
           console.log(

     

       67
       +
             `Difficulty increased to level ${difficultyLevel}. Max enemies: ${maxEnemies}, Spawn interval: ${spawnInterval}s`,

     

       68
       +
           );

     

       69
       +
       

     

       70
        
           // Cancel previous spawn loop and start a new one with updated interval

     

       71
       +
           k.cancel();

     

       72
       +
           k.loop(spawnInterval, spawnEnemy);

     

       73
       +
       

     

       0
        
       
     

       0
        
       
     

       74
        
           // Visual feedback for difficulty increase

     

       75
        
           const screenCenter = k.vec2(k.width() / 2, k.height() / 2);

     

       76
        
           if (k.addConfetti) {

     

       77
        
             k.addConfetti(screenCenter);

     

       78
        
           }

     

       79
       +
       

     

       80
        
           // Add difficulty level text

     

       81
        
           const levelText = k.add([

     

       82
        
             k.text(`Difficulty Level ${difficultyLevel}!`, { size: 32 }),

     
···

       87
        
             k.z(100),

     

       88
        
             k.opacity(1),

     

       89
        
           ]);

     

       90
       +
       

     

       91
        
           // Fade out and destroy the text

     

       92
        
           k.tween(

     

       93
        
             1,

     
···

       98
        
             },

     

       99
        
             k.easings.easeInQuad,

     

       100
        
           );

     

       101
       +
       

     

       102
        
           k.wait(2, () => {

     

       103
        
             levelText.destroy();

     

       104
        
           });

     
···

       115
        
       

     

       116
        
         // Random position at the edges of the screen

     

       117
        
         const side = Math.floor(Math.random() * 4); // 0: top, 1: right, 2: bottom, 3: left

     

       118
       +
         let x = 0,

     

       119
       +
           y = 0;

     

       120
        
       

     

       121
        
         switch (side) {

     

       122
        
           case 0: // top

     
···

       144
        
         // Remove from array when destroyed

     

       145
        
         newEnemy.on("destroy", () => {

     

       146
        
           enemies = enemies.filter((e) => e !== newEnemy);

     

       147
       +
       

     

       148
       +
           // Increase score when enemy is destroyed

     

       149
       +
           score += 10 + Math.pow(difficultyLevel, 0.75);

     

       150
       +
       

     

       151
       +
           // Update score display

     

       152
       +
           scoreText.text = `Score: ${score}`;

     

       153
       +
       

     

       154
       +
           if (Math.random() < 0.5) spawnEnemy();

     

       155
        
         });

     

       156
        
       }

     

       157
        
       

     

       158
        
       // Start spawning enemies

     

       159
       +
       k.loop(spawnInterval, spawnEnemy);

     

       160
        
       

     

       161
        
       // Game loop

     

       162
        
       k.onUpdate(() => {

+12 -6

src/player.ts

···

       222
        
               enemies.forEach((enemy) => {

     

       223
        
                 const dist = k.vec2(enemy.pos).dist(clampedPos);

     

       224
        
                 if (dist < explosionRadius) {

     

       225
       -
                   // Calculate damage based on distance from center

     

       226
       -
                   // At center (dist = 0): 70 damage (70% of enemy health)

     

       227
       -
                   // At edge (dist = explosionRadius): 20 damage (20% of enemy health)

     

       228
       -
                   const damagePercent = 0.7 - (0.5 * dist) / explosionRadius;

     

       229
       -
                   const damage = Math.floor(100 * damagePercent); // 100 is enemy max health

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       230
        
       

     

       231
        
                   console.log(

     

       232
       -
                     `Direct damage to enemy: ${damage}, distance: ${dist}, percent: ${damagePercent}`,

     

       233
        
                   );

     

       234
        
                   // Add type assertion to tell TypeScript that enemy has a damage method

     

       235
        
                   (enemy as any).damage(damage);

···

       222
        
               enemies.forEach((enemy) => {

     

       223
        
                 const dist = k.vec2(enemy.pos).dist(clampedPos);

     

       224
        
                 if (dist < explosionRadius) {

     

       225
       +
                   // Normalize distance to 0-1 range

     

       226
       +
                   const normalizedDist = dist / explosionRadius;

     

       227
       +
       

     

       228
       +
                   const maxDamage = 80;

     

       229
       +
                   const minDamage = 10;

     

       230
       +
                   const logFalloff = Math.log(10 * normalizedDist) / Math.log(20);

     

       231
       +
                   const damagePercent = 1 - logFalloff;

     

       232
       +
                   const damage = Math.max(

     

       233
       +
                     Math.floor(maxDamage * damagePercent),

     

       234
       +
                     minDamage,

     

       235
       +
                   );

     

       236
        
       

     

       237
        
                   console.log(

     

       238
       +
                     `Explosion damage to enemy: ${damage}, distance: ${dist}, normalized: ${normalizedDist}, falloff: ${logFalloff}`,

     

       239
        
                   );

     

       240
        
                   // Add type assertion to tell TypeScript that enemy has a damage method

     

       241
        
                   (enemy as any).damage(damage);