From 9194dc50ed3bdeb82715b5224d7838acbd0712b5 Mon Sep 17 00:00:00 2001
From: Pascal Syma <pascal@syma.dev>
Date: Fri, 17 Jul 2020 03:40:42 +0200
Subject: [PATCH] added jump

Signed-off-by: Pascal Syma <pascal@syma.dev>
---
 src/assets/items/jump.png | Bin 0 -> 2180 bytes
 src/entities/Chest.js     |   2 +-
 src/entities/Item.js      |  12 ++++++++++++
 src/entities/Player.js    |   3 ++-
 src/scenes/Game.js        |   9 ++++++++-
 src/scenes/Preload.js     |   2 ++
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/items/jump.png

diff --git a/src/assets/items/jump.png b/src/assets/items/jump.png
new file mode 100644
index 0000000000000000000000000000000000000000..707a2e9419102794064617c17bee1952c6b311e1
GIT binary patch
literal 2180
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

literal 0
HcmV?d00001

diff --git a/src/entities/Chest.js b/src/entities/Chest.js
index f073829..5698714 100644
--- a/src/entities/Chest.js
+++ b/src/entities/Chest.js
@@ -29,7 +29,7 @@ export default class Chest extends Interactable {
 
         this.play('chest_open');
 
-        const options = [/*"slow", "speed", "storm", */"heal"];
+        const options = [/*"storm", "slow", */"jump", "speed", "heal"];
 
         let item = new Item(this.scene, {
             x: this.x,
diff --git a/src/entities/Item.js b/src/entities/Item.js
index 557e63e..2536a82 100644
--- a/src/entities/Item.js
+++ b/src/entities/Item.js
@@ -34,6 +34,18 @@ export default class Item extends Interactable {
             case "heal":
                 user.hit(-2)
                 break;
+            case "speed":
+                const oldSpeed = user.getData('speed');
+
+                user.setData("speed", oldSpeed * 1.5);
+                setTimeout(() => user.setData('speed', oldSpeed), 5000);
+                break;
+            case "jump":
+                const oldjump = user.getData('jump');
+
+                user.setData("jump", oldjump * 2);
+                setTimeout(() => user.setData('jump', oldSpeed), 5000);
+                break;
         }
         this.die();
     }
diff --git a/src/entities/Player.js b/src/entities/Player.js
index 1fc44ff..8293106 100644
--- a/src/entities/Player.js
+++ b/src/entities/Player.js
@@ -14,6 +14,7 @@ export default class Player extends Entity {
     constructor(scene, spawnPoint, texture) {
         super(scene, spawnPoint.x, spawnPoint.y, texture);
         this.setData("speed", 100);
+        this.setData('jump', 1.5)
         this.setData('hp', 10);
         this.setOrigin(0.5, 1).setScale(32 / 48);
 
@@ -74,7 +75,7 @@ export default class Player extends Entity {
 
         // Jumping, Dashing
         if (this.scene.upActive() && this.body.blocked.down) {
-            this.body.velocity.y = -this.getData('speed') * 1.5;
+            this.body.velocity.y = -this.getData('speed') * this.getData('jump');
         }
 
         // Walking L R
diff --git a/src/scenes/Game.js b/src/scenes/Game.js
index 755aef2..4635bc2 100644
--- a/src/scenes/Game.js
+++ b/src/scenes/Game.js
@@ -25,7 +25,7 @@ export default class Game extends Phaser.Scene {
                 default: 'arcade',
                 arcade: {
                     gravity: {y: 300},
-                    debug: true
+                    // debug: true
                 }
             }
         });
@@ -251,6 +251,13 @@ export default class Game extends Phaser.Scene {
             repeat: -1
         });
 
+        this.anims.create({
+            key: 'item_jump',
+            frames: this.anims.generateFrameNumbers('jump', {start: 0, end: 11}),
+            frameRate: 10,
+            repeat: -1
+        });
+
 
         const mapKey = this.scene.settings.data.level;
         const mapTilesetKey = "tiles";
diff --git a/src/scenes/Preload.js b/src/scenes/Preload.js
index 74cc9ea..8106278 100644
--- a/src/scenes/Preload.js
+++ b/src/scenes/Preload.js
@@ -26,6 +26,7 @@ import heal from "../assets/items/heal.png";
 import slow from "../assets/items/slow.png";
 import speed from "../assets/items/speed.png";
 import storm from "../assets/items/storm.png";
+import jump from "../assets/items/jump.png";
 import heart from "../assets/heart.png";
 import chest from "../assets/chest.png";
 import arrow from "../assets/arrow.png";
@@ -66,6 +67,7 @@ export default class Preload extends Phaser.Scene {
         this.load.spritesheet('storm', storm, {frameWidth: 16, frameHeight: 16, margin: 1, spacing: 2});
         this.load.spritesheet('speed', speed, {frameWidth: 16, frameHeight: 16, margin: 1, spacing: 2});
         this.load.spritesheet('slow', slow, {frameWidth: 16, frameHeight: 16, margin: 1, spacing: 2});
+        this.load.spritesheet('jump', jump, {frameWidth: 16, frameHeight: 16, margin: 1, spacing: 2});
         this.load.tilemapTiledJSON("lvl1", lvl1);
         this.load.tilemapTiledJSON("tutorial", tutorial);
         this.load.tilemapTiledJSON("menu", menu);