feat: added using of items

added item data and using of items, including healing and placing.

Author: Picoseconds

.gitignore

@@ -1,4 +1,5 @@
 package-lock.json
 node_modules/
 .vscode/
-lib/
+lib/
+.data/

src/items/Item.ts

@@ -0,0 +1,15 @@
+import { ItemType } from './UpgradeItems';
+
+enum Resources {
+    Food,
+    Wood,
+    Stone,
+    Points
+}
+
+export default class Item {
+    constructor(
+        public type: ItemType,
+        public requires?: [Resources, number]
+    ) { }
+}

src/items/StartingItems.ts

@@ -1,15 +1,31 @@
+/* enum StartingItems {
+  Axe = 1,
+  Sword = 3,
+  Polearm = 5,
+  Bat = 6,
+  Daggers = 7,
+  Stick = 8
+} */
+
+enum StartingItems {
+  Apple = 0,
+  WoodWall = 3,
+  Spikes = 6,
+  Windmill = 10
+}
+
 enum Age3Items {
-  Cookie = 17,
+  Cookie = 1,
   StoneWall = 20
 }
 
 enum Age4Items {
-  PitTrap = 31,
+  PitTrap = 15,
   BoostPad = 32
 }
 
 enum Age5Items {
-  GreaterSpikes = 23,
+  GreaterSpikes = 7,
   FasterWindmill = 27,
   Mine = 29,
   Sapling = 30
@@ -43,4 +59,19 @@ enum Age9Items {
   PoisonSpikes = 24,
   SpinningSpikes = 25,
   SpawnPad = 36
-}
+}
+
+const ItemType = {
+  ...StartingItems,
+  ...Age3Items,
+  ...Age4Items,
+  ...Age5Items,
+  ...Age6Items,
+  ...Age7Items,
+  ...Age8Items,
+  ...Age9Items
+};
+
+type ItemType = StartingItems | Age3Items | Age4Items | Age5Items | Age6Items | Age7Items | Age8Items | Age9Items;
+
+export { Age3Items, Age4Items, Age5Items, Age6Items, Age7Items, Age8Items, Age9Items, ItemType }

src/items/UpgradeItems.ts

@@ -1,4 +1,6 @@
 import weapons from './weapons.json';
+import items from './items.json';
+import { ItemType } from './UpgradeItems';
 
 /**
  * An enum containing the names of all the items. Saves you the effort of differentiating weapon items and other items
@@ -91,5 +93,29 @@ function getWeaponDamage(item: Weapons) {
   return weapon?.dmg || 0;
 }
 
-export { StartingItems, StartingItems as Age2Items } from "./StartingItems";
-export { PrimaryWeapons, SecondaryWeapons, getHitTime, Weapons, getWeaponAttackDetails, getWeaponDamage };
+function getItemCost(item: ItemType) {
+  return items[item].req;
+}
+
+function getPlaceable(item: ItemType) {
+  return !!items[item].group.place;
+}
+
+function getPlaceOffset(item: ItemType) {
+  return items[item].placeOffset;
+}
+
+function getScale(item: ItemType) {
+  return items[item].scale;
+}
+
+function getGameObjID(item: ItemType) {
+  switch (item) {
+    case ItemType.WoodWall:
+      return 3;
+  }
+
+  return 0;
+}
+
+export { PrimaryWeapons, SecondaryWeapons, getHitTime, Weapons, getWeaponAttackDetails, getWeaponDamage, getItemCost, getPlaceable, getPlaceOffset, getScale, getGameObjID };

src/items/items.ts

@@ -4,7 +4,7 @@ import WebSocket from "ws";
 import Client from "./Client";
 import Player from "./Player";
 import * as lowDb from 'lowdb';
-import { randomPos } from "./util";
+import { randomPos, chunk } from "./util";
 import msgpack from "msgpack-lite";
 import GameState from "./GameState";
 import * as Physics from "./Physics";
@@ -15,7 +15,7 @@ import GameObject from "../gameobjects/GameObject";
 import { PacketType } from "../packets/PacketType";
 import FileAsync from 'lowdb/adapters/FileAsync';
 import { PacketFactory } from "../packets/PacketFactory";
-import { getWeaponDamage, getWeaponAttackDetails } from "../items/items";
+import { getWeaponDamage, getWeaponAttackDetails, getItemCost, getPlaceable } from "../items/items";
 import { gameObjectSizes, GameObjectType } from "../gameobjects/gameobjects";
 
 let currentGame: Game | null = null;
@@ -58,6 +58,12 @@ export default class Game {
     process.nextTick(this.update);
   }
 
+  getNextGameObjectID() {
+    return this.state.gameObjects.length > 0
+      ? Math.max(...this.state.gameObjects.map((gameObj) => gameObj.id)) + 1
+      : 0;
+  }
+
   generateStructures() {
     const gameObjectTypes = [GameObjectType.Tree];
 
@@ -68,13 +74,11 @@ export default class Game {
 
       if (sizes) {
         let newGameObject = new GameObject(
-          this.state.gameObjects.length > 0
-            ? Math.max(...this.state.gameObjects.map((gameObj) => gameObj.id)) + 1
-            : 0,
+          this.getNextGameObjectID(),
           randomPos(12e3, 12e3),
-          0,
-          sizes[Math.floor(Math.random() * sizes.length)],
-          gameObjectType
+            0,
+            sizes[Math.floor(Math.random() * sizes.length)],
+            gameObjectType
         );
 
         for (let gameObject of this.state.gameObjects) {
@@ -166,8 +170,8 @@ export default class Game {
   }
 
   kickClient(client: Client, reason: string = "kicked") {
-    console.log(`Kicked ${client.id}: ${reason}`);
     this.clients.splice(this.clients.indexOf(client), 1);
+    console.log(`Kicked ${client.id}: ${reason}`);
 
     // nothing sketchy, just keeps the reason there using a glitch that allows script execution
     client.socket.send(msgpack.encode(["d", [
@@ -176,7 +180,7 @@ export default class Game {
 
     setTimeout(() => {
       client.socket.close();
-    }, 10);
+    }, 1);
   }
 
   async banClient(client: Client) {
@@ -185,6 +189,7 @@ export default class Game {
         await (await (await this.db.get("bannedIPs")).push(client.ip)).write();
       }
 
+      console.log(`Banned ${client.id} with ip ${client.ip}`);
       this.kickClient(client, "Banned by a Moderator");
     }
   }
@@ -350,7 +355,7 @@ export default class Game {
     this.state.players.forEach((player) => {
       Physics.movePlayer(player, 33);
 
-      if (player.isAttacking) {
+      if (player.isAttacking && player.buildItem == -1) {
         if (Date.now() - player.lastHitTime >= player.getWeaponHitTime()) {
           let nearbyPlayers = player.getNearbyPlayers(this.state);
 
@@ -441,11 +446,35 @@ export default class Game {
    * @param player the player doing the attacking
    */
   normalAttack(player: Player) {
-    player.isAttacking = true;
-
     if (player.buildItem != -1) {
-      // TODO: use the item
+      let item = player.buildItem;
+      if (player.useItem(item, this.state, this.getNextGameObjectID())) {
+        if (getPlaceable(item)) {
+          player.getNearbyPlayers(this.state).forEach(nearbyPlayer => this.sendGameObjects(nearbyPlayer))
+          this.sendGameObjects(player);
+        }
+
+        let itemCost = getItemCost(item);
+        let costs = chunk(itemCost, 2);
+
+        for (let cost of costs) {
+          switch (cost[0]) {
+            case "food":
+              player.food -= cost[1] as number;
+              break;
+            case "wood":
+              player.wood -= cost[1] as number;
+              break;
+            case "stone":
+              player.stone -= cost[1] as number;
+              break;
+          }
+        }
+
+        player.buildItem = -1;
+      }
     } else {
+      player.isAttacking = true;
     }
   }
 
@@ -530,6 +559,11 @@ export default class Game {
             newPlayer.dead = false;
             newPlayer.health = 100;
 
+            newPlayer.food = packet.data[0].moofoll ? 100 : 0;
+            newPlayer.points = packet.data[0].moofoll ? 100 : 0;
+            newPlayer.stone = packet.data[0].moofoll ? 100 : 0;
+            newPlayer.wood = packet.data[0].moofoll ? 100 : 0;
+
             client.socket.send(
               packetFactory.serializePacket(
                 new Packet(PacketType.PLAYER_START, [newPlayer.id])
@@ -672,6 +706,46 @@ export default class Game {
           }
         }
         break;
+      case PacketType.SELECT_ITEM:
+        if (client.player) {
+          let isWeapon = packet.data[1];
+
+          if (isWeapon) {
+            client.player.buildItem = -1;
+            if (client.player.weapon == packet.data[0]) {
+              client.player.selectedWeapon = client.player.weapon;
+            } else if (client.player.secondaryWeapon == packet.data[0]) {
+              client.player.selectedWeapon = client.player.secondaryWeapon;
+            }
+          } else {
+            let itemCost = getItemCost(packet.data[0]);
+            let costs = chunk(itemCost, 2);
+
+            for (let cost of costs) {
+              switch (cost[0]) {
+                case "food":
+                  if (client.player.food < cost[1])
+                    return;
+                  break;
+                case "wood":
+                  if (client.player.wood < cost[1])
+                    return;
+                  break;
+                case "stone":
+                  if (client.player.stone < cost[1])
+                    return;
+                  break;
+              }
+            }
+
+            if (client.player.buildItem == packet.data[0]) {
+              client.player.buildItem = -1;
+            } else {
+              client.player.buildItem = packet.data[0];
+            }
+          }
+        }
+        break;
     }
   }
 }