Strange Nut Food Item

packages/junon-common/protocol/enum.proto

@@ -261,6 +261,8 @@ enum BuildingType {
   Nigiri =  265;
   PumpkinPie =  266;
   ImperialSpecialForcesArmor = 267;
+  Starnut    = 268;
+  PointyStick = 269;
 }
 
 enum TerrainType {

packages/junon-io/client/src/entities/equipments/hand/pointy_stick.js

@@ -0,0 +1,21 @@
+const MeleeEquipment = require("./melee_equipment")
+const Constants = require("./../../../../../common/constants.json")
+const Protocol = require("./../../../../../common/util/protocol")
+
+class PointyStick extends MeleeEquipment {
+
+  getSpritePath() {
+    return 'pointy_stick.png'
+  }
+
+  getType() {
+    return Protocol.definition().BuildingType.PointyStick
+  }
+
+  getConstantsTable() {
+    return "Equipments.PointyStick"
+  }
+
+}
+
+module.exports = PointyStick

packages/junon-io/client/src/entities/equipments/index.js

@@ -6,6 +6,7 @@ const Constants = require("./../../../../common/constants.json")
 const Equipments = {}
 Equipments.LeadPipe = require("./hand/lead_pipe")
 Equipments.PlasmaBlade = require("./hand/plasma_blade")
+Equipments.PointyStick = require("./hand/pointy_stick")
 Equipments.Mop = require("./hand/mop")
 Equipments.Pistol = require("./hand/pistol")
 Equipments.Shotgun = require("./hand/shotgun")

packages/junon-io/client/src/entities/foods/index.js

@@ -30,6 +30,7 @@ Foods.Cooked.Pumpkin = require("./pumpkin")
 Foods.Cooked.Fish = require("./fish")
 Foods.Cooked.Nigiri = require("./nigiri")
 Foods.Cooked.PumpkinPie = require("./pumpkin_pie")
+Foods.Cooked.Starnut = require("./starnut")
 
 Foods.Drugs = {}
 Foods.Drugs.FirstAidKit = require("./first_aid_kit")

packages/junon-io/client/src/entities/foods/starnut.js

@@ -0,0 +1,21 @@
+const BaseFood = require("./base_food")
+const Constants = require("./../../../../common/constants.json")
+const Protocol = require("./../../../../common/util/protocol")
+
+class Starnut extends BaseFood {
+
+  getSpritePath() {
+    return 'starnut.png'
+  }
+
+  getType() {
+    return Protocol.definition().BuildingType.Starnut
+  }
+
+  getConstantsTable() {
+    return "Foods.Starnut"
+  }
+
+}
+
+module.exports = Starnut

packages/junon-io/client/src/entities/game.js

@@ -1400,8 +1400,8 @@ class Game {
     window.textureSetupTime = (new Date()).getTime()
 
     // PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST
-
-    let tempAssets = ['displacement_map.png', 'squid_lord_heart.png', 'squid_staff.png', 'fries.png', 'energy_drink.png', 'alien_juice.png', 'rocket_launcher.png', 'scar_17_by_px.png', 'bowl_by_px.png', 'potato_soup_by_px.png', 'miso_soup_by_px.png', 'slime_broth_by_px.png', 'bomber_turret_by_px.png', 'firebat.png', 'plasma_blade.png', 'raven.png', 'starberries.png', 'car.png', 'bricks_texture.png', 'checker_texture.png', 'noise_texture.png', 'x_texture.png', 'xchecker_texture.png', 'nihonshu.png', 'pumpkin.png', 'pumpkin_plant.png','pumpkin_seed.png', 'rice.png', 'rice_plant.png', 'rice_seed.png', 'fish.png', 'nigiri.png', 'katana_reskin.png', 'pumpkin_pie.png', 'imperial_special_forces_armor.png']
+    
+    let tempAssets = ['displacement_map.png', 'squid_lord_heart.png', 'squid_staff.png', 'fries.png', 'energy_drink.png', 'alien_juice.png', 'rocket_launcher.png', 'scar_17_by_px.png', 'bowl_by_px.png', 'potato_soup_by_px.png', 'miso_soup_by_px.png', 'slime_broth_by_px.png', 'bomber_turret_by_px.png', 'firebat.png', 'plasma_blade.png', 'raven.png', 'starberries.png', 'car.png', 'bricks_texture.png', 'checker_texture.png', 'noise_texture.png', 'x_texture.png', 'xchecker_texture.png', 'nihonshu.png', 'pumpkin.png', 'pumpkin_plant.png','pumpkin_seed.png', 'rice.png', 'rice_plant.png', 'rice_seed.png', 'fish.png', 'nigiri.png', 'katana_reskin.png', 'pumpkin_pie.png', 'imperial_special_forces_armor.png', 'strangenut.png', 'pointy_stick.png']
     tempAssets.forEach((asset) => {
       PIXI.Texture.addToCache(PIXI.Texture.fromImage('/assets/images/' + asset), asset)
     })

packages/junon-io/common/constants.json

@@ -3158,6 +3158,26 @@
       "upgrade": {},
       "description": "Strange berries from alien bushes."
     },
+    "Star Nut": {
+      "width": 21,
+      "height": 14,
+      "cost": {
+        "gold": 250
+      },
+      "stats": {
+        "food": 10,
+        "health": 15
+      },
+      "sprite": {
+        "position": {
+          "x": 64,
+          "y": 0
+        },
+        "rotation": 90
+      },
+      "upgrade": {},
+      "description": "A strange brown nut. Can it be planted?"
+    },
     "Fish": {
       "width": 32,
       "height": 32,
@@ -3830,6 +3850,24 @@
       },
       "description": "Strong blade made of plasma"
     },
+    "PointyStick": {
+      "parent": "Equipments.MeleeEquipment",
+      "isWeapon": true,
+      "cost": {
+        "gold": 250
+      },
+      "categories": {"melee_damage": true},
+      "isAnimatable": true,
+      "stats": {
+        "damage": 14,
+        "range": 55,
+        "meleeRange": 55
+      },
+      "requirements": {
+        "Wood": 5
+      },
+      "description": "A weak but pointy stick"
+    },
     "AssassinsKnife": {
       "parent": "Equipments.MeleeEquipment",
       "isWeapon": true,

packages/junon-io/server/entities/equipments/hand/pointy_stick.js

@@ -0,0 +1,20 @@
+const MeleeEquipment = require("./melee_equipment")
+
+const Protocol = require('../../../../common/util/protocol')
+const Constants = require("../../../../common/constants.json")
+
+
+class PointyStick extends MeleeEquipment {
+  onEquipmentConstructed() {
+  }
+
+  getType() {
+    return Protocol.definition().BuildingType.PointyStick
+  }
+
+  getConstantsTable() {
+    return "Equipments.PointyStick"
+  }
+}
+
+module.exports = PointyStick

packages/junon-io/server/entities/equipments/index.js

@@ -9,6 +9,7 @@ Equipments.Pistol = require("./hand/pistol")
 Equipments.Shotgun = require("./hand/shotgun")
 Equipments.LeadPipe = require("./hand/lead_pipe")
 Equipments.PlasmaBlade = require("./hand/plasma_blade")
+Equipments.PointyStick = require("./hand/pointy_stick")
 Equipments.FireExtinguisher = require("./hand/fire_extinguisher")
 Equipments.Syringe = require("./hand/syringe")
 Equipments.FlameThrower = require("./hand/flame_thrower")

packages/junon-io/server/entities/foods/index.js

@@ -25,6 +25,7 @@ Foods.MisoSoup = require("./miso_soup")
 Foods.PotatoSoup = require("./potato_soup")
 Foods.SlimeBroth = require("./slime_broth")
 Foods.Starberries = require("./starberries")
+Foods.Starnut = require("./starnut")
 Foods.Pumpkin = require("./pumpkin")
 Foods.Rice = require("./rice")
 Foods.Fish = require("./fish")

packages/junon-io/server/entities/foods/starnut.js

@@ -0,0 +1,18 @@
+const BaseFood = require("./base_food")
+
+const Constants = require("./../../../../common/constants.json")
+const Protocol = require("./../../../../common/util/protocol")
+
+class Starnut extends BaseFood {
+
+  getType() {
+    return Protocol.definition().BuildingType.Starnut
+  }
+
+  getConstantsTable() {
+    return "Foods.Starnut"
+  }
+
+}
+
+module.exports = Starnut

packages/junon-io/server/entities/sector.js

@@ -511,7 +511,9 @@ class Sector {
   }
 
   initDefaultSellables() {
-    let itemKlasses = [Ores.Sand, Ores.Wood, Buildings.CoffeeSeed, Buildings.WheatSeed, Buildings.PotatoSeed, Buildings.SunflowerSeed, Buildings.BlueSeed, Buildings.PoppySeed,Buildings.PumpkinSeed,Buildings.RiceSeed, Foods.Starberries, Foods.Fish, Mobs.Chicken, Mobs.Monkey, Mobs.Cat, Mobs.CleanBot, Mobs.Car, Equipments.CombatArmor, Equipments.SantaHat, Equipments.NameTag]
+
+    let itemKlasses = [Ores.Sand, Ores.Wood, Buildings.CoffeeSeed, Buildings.WheatSeed, Buildings.PotatoSeed, Buildings.SunflowerSeed, Buildings.BlueSeed, Buildings.PoppySeed,Buildings.PumpkinSeed,Buildings.RiceSeed, Foods.Starberries, Foods.Fish, Mobs.Chicken, Mobs.Monkey, Mobs.Cat, Mobs.CleanBot, Mobs.Car, Equipments.CombatArmor, Equipments.SantaHat, Equipments.NameTag, Foods.Starnut]
+
     itemKlasses.forEach((klass) => {
       let group = klass.prototype.isMob() ? "mob" : "item"
       this.sellables[klass.prototype.getTypeName()] = { group: group, type: klass.prototype.getType(), cost: klass.getCost() }