From b9e74f1d0db9df879e5d886f7d60f1c4ba0ea3dd Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 21 Dec 2018 19:21:09 +1100 Subject: [PATCH] item list --- client/src/scenes/item.list.js | 45 ++++++++++++++++++++++++++++++++++ server/WORKLOG.md | 1 - server/src/game.rs | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 client/src/scenes/item.list.js diff --git a/client/src/scenes/item.list.js b/client/src/scenes/item.list.js new file mode 100644 index 00000000..2e855f53 --- /dev/null +++ b/client/src/scenes/item.list.js @@ -0,0 +1,45 @@ +const Phaser = require('phaser'); + +const { + TEXT, + // COLOURS, + POSITIONS: { GAME_LIST }, +} = require('./constants'); + +class ItemList extends Phaser.GameObjects.Group { + constructor(args) { + super(args.list); + + const { list, ws, itemList } = args; + + const X = GAME_LIST.x() + GAME_LIST.x(); + const WIDTH = Math.floor(GAME_LIST.width()); + const HEIGHT = GAME_LIST.height(); + + const itemRow = (item, i) => { + const ITEM_X = X; + const ITEM_Y = GAME_LIST.rowY(i); + + const itemBox = list.add + .rectangle(ITEM_X, ITEM_Y, WIDTH * 2, HEIGHT, 0x111111) + .setInteractive() + .setOrigin(0); + + this.add(list.add.text(ITEM_X, ITEM_Y, item.action, TEXT.HEADER)); + + itemBox.on('pointerdown', () => { + ws.sendItemUse(item.id); + }); + }; + + itemList.forEach(itemRow); + + return true; + } + + cleanup() { + return true; + } +} + +module.exports = ItemList; diff --git a/server/WORKLOG.md b/server/WORKLOG.md index 071d97c3..2e9fa413 100644 --- a/server/WORKLOG.md +++ b/server/WORKLOG.md @@ -6,7 +6,6 @@ # WORK WORK broken skills -parry strangle diff --git a/server/src/game.rs b/server/src/game.rs index 0dcdc9b0..6eeec5b5 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -799,7 +799,7 @@ pub fn game_pve(params: GamePveParams, tx: &mut Transaction, account: &Account) .set_team_size(cryps.len()); // create the mob team - let mut mob_team = generate_mob_team(params.mode, &cryps); + let mob_team = generate_mob_team(params.mode, &cryps); // add the players let mut plr_team = Team::new(account.id);