From a051f48813514af7959f2794c19ee85e7211d3c1 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:58:14 -0700 Subject: [PATCH 1/9] Strange Nut --- packages/junon-common/protocol/enum.proto | 1 + .../junon-io/client/assets/images/nut.png | Bin 0 -> 25537 bytes .../client/src/entities/foods/index.js | 1 + packages/junon-io/client/src/entities/game.js | 2 +- packages/junon-io/common/constants.json | 20 +++++++++++++++++ .../junon-io/server/entities/foods/starnut.js | 21 ++++++++++++++++++ packages/junon-io/server/entities/sector.js | 2 +- 7 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 packages/junon-io/client/assets/images/nut.png create mode 100644 packages/junon-io/server/entities/foods/starnut.js diff --git a/packages/junon-common/protocol/enum.proto b/packages/junon-common/protocol/enum.proto index a3461e12..7dafe718 100644 --- a/packages/junon-common/protocol/enum.proto +++ b/packages/junon-common/protocol/enum.proto @@ -252,6 +252,7 @@ enum BuildingType { BomberTurret = 256; PlasmaBlade = 257; Starberries = 258; + Starnut = 259; } enum TerrainType { diff --git a/packages/junon-io/client/assets/images/nut.png b/packages/junon-io/client/assets/images/nut.png new file mode 100644 index 0000000000000000000000000000000000000000..b31b231b647e5f54f057a0103c6103ddfd9c76b6 GIT binary patch literal 25537 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 Kz2v4%=>Gus!pcSf literal 0 HcmV?d00001 diff --git a/packages/junon-io/client/src/entities/foods/index.js b/packages/junon-io/client/src/entities/foods/index.js index 79f4ef1e..8981364c 100644 --- a/packages/junon-io/client/src/entities/foods/index.js +++ b/packages/junon-io/client/src/entities/foods/index.js @@ -25,6 +25,7 @@ Foods.Cooked.PotatoSoup = require("./potato_soup") Foods.Cooked.SlimeBroth = require("./slime_broth") Foods.Cooked.MisoSoup = require("./miso_soup") Foods.Cooked.Starberries = require("./starberries") +Foods.Cooked.Starnut = require("./starnut") Foods.Drugs = {} Foods.Drugs.FirstAidKit = require("./first_aid_kit") diff --git a/packages/junon-io/client/src/entities/game.js b/packages/junon-io/client/src/entities/game.js index d1b65834..6fe2a1d3 100644 --- a/packages/junon-io/client/src/entities/game.js +++ b/packages/junon-io/client/src/entities/game.js @@ -1401,7 +1401,7 @@ class Game { // 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'] + 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', 'strangenut.png'] tempAssets.forEach((asset) => { PIXI.Texture.addToCache(PIXI.Texture.fromImage('/assets/images/' + asset), asset) }) diff --git a/packages/junon-io/common/constants.json b/packages/junon-io/common/constants.json index dae42f4a..4a3242e7 100644 --- a/packages/junon-io/common/constants.json +++ b/packages/junon-io/common/constants.json @@ -3010,6 +3010,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": "Strange brown nut ish is..." + }, "Antidote": { "width": 24, "height": 24, diff --git a/packages/junon-io/server/entities/foods/starnut.js b/packages/junon-io/server/entities/foods/starnut.js new file mode 100644 index 00000000..3ba1137f --- /dev/null +++ b/packages/junon-io/server/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 Starfruit extends BaseFood { + + getSpritePath() { + return 'strangenut.png' + } + + getType() { + return Protocol.definition().BuildingType.Starnut + } + + getConstantsTable() { + return "Foods.Starnut" + } + +} + +module.exports = Starnut \ No newline at end of file diff --git a/packages/junon-io/server/entities/sector.js b/packages/junon-io/server/entities/sector.js index 3bf95201..81063d92 100644 --- a/packages/junon-io/server/entities/sector.js +++ b/packages/junon-io/server/entities/sector.js @@ -511,7 +511,7 @@ class Sector { } initDefaultSellables() { - let itemKlasses = [Ores.Sand, Ores.Wood, Buildings.CoffeeSeed, Buildings.WheatSeed, Buildings.PotatoSeed, Buildings.SunflowerSeed, Buildings.BlueSeed, Buildings.PoppySeed, Foods.Starberries, 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, Foods.Starberries, Foods.Starnut, Mobs.Chicken, Mobs.Monkey, Mobs.Cat, Mobs.CleanBot, Mobs.Car, Equipments.CombatArmor, Equipments.SantaHat, Equipments.NameTag] itemKlasses.forEach((klass) => { let group = klass.prototype.isMob() ? "mob" : "item" this.sellables[klass.prototype.getTypeName()] = { group: group, type: klass.prototype.getType(), cost: klass.getCost() } From 32dffa75507c136689043bf886e0209faf2d9163 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Thu, 5 Oct 2023 07:34:52 -0700 Subject: [PATCH 2/9] rename --- .../assets/images/{nut.png => strangenut.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/junon-io/client/assets/images/{nut.png => strangenut.png} (100%) diff --git a/packages/junon-io/client/assets/images/nut.png b/packages/junon-io/client/assets/images/strangenut.png similarity index 100% rename from packages/junon-io/client/assets/images/nut.png rename to packages/junon-io/client/assets/images/strangenut.png From eb5b85890bc211afc59db074178a429bda0c67c2 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Sun, 8 Oct 2023 16:16:41 -0700 Subject: [PATCH 3/9] Update constants.json --- packages/junon-io/common/constants.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/junon-io/common/constants.json b/packages/junon-io/common/constants.json index 4a3242e7..3694e3e2 100644 --- a/packages/junon-io/common/constants.json +++ b/packages/junon-io/common/constants.json @@ -3028,7 +3028,7 @@ "rotation": 90 }, "upgrade": {}, - "description": "Strange brown nut ish is..." + "description": "A strange brown nut. Maybe it can be planted?" }, "Antidote": { "width": 24, From b3912852791fb066ecc409bde1f113ee53f5c7e4 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Sun, 8 Oct 2023 16:45:38 -0700 Subject: [PATCH 4/9] edits --- packages/junon-io/common/constants.json | 4 ++++ packages/junon-io/server/entities/foods/index.js | 1 + 2 files changed, 5 insertions(+) diff --git a/packages/junon-io/common/constants.json b/packages/junon-io/common/constants.json index 3694e3e2..75c12dfe 100644 --- a/packages/junon-io/common/constants.json +++ b/packages/junon-io/common/constants.json @@ -3028,7 +3028,11 @@ "rotation": 90 }, "upgrade": {}, +<<<<<<< HEAD + "description": "Strange brown nut. Can it be grown?" +======= "description": "A strange brown nut. Maybe it can be planted?" +>>>>>>> eb5b85890bc211afc59db074178a429bda0c67c2 }, "Antidote": { "width": 24, diff --git a/packages/junon-io/server/entities/foods/index.js b/packages/junon-io/server/entities/foods/index.js index 0af3be1c..590c9cf7 100644 --- a/packages/junon-io/server/entities/foods/index.js +++ b/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.forType = (type) => { const klassName = Helper.getTypeNameById(type) From bf11596ad662e9acce9190b4506ca458838070a9 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Sun, 8 Oct 2023 21:48:30 -0700 Subject: [PATCH 5/9] Changed description of the starnut --- packages/junon-io/common/constants.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/junon-io/common/constants.json b/packages/junon-io/common/constants.json index 75c12dfe..3694e3e2 100644 --- a/packages/junon-io/common/constants.json +++ b/packages/junon-io/common/constants.json @@ -3028,11 +3028,7 @@ "rotation": 90 }, "upgrade": {}, -<<<<<<< HEAD - "description": "Strange brown nut. Can it be grown?" -======= "description": "A strange brown nut. Maybe it can be planted?" ->>>>>>> eb5b85890bc211afc59db074178a429bda0c67c2 }, "Antidote": { "width": 24, From 94b9e8f1498b29882e574beed9430d69482e0ab6 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Sun, 8 Oct 2023 22:44:12 -0700 Subject: [PATCH 6/9] Add Pointy Stick Weapon --- packages/junon-common/protocol/enum.proto | 1 + .../client/assets/images/pointy_stick.png | Bin 0 -> 29649 bytes .../entities/equipments/hand/pointy_stick.js | 21 ++++++++++++++++++ .../client/src/entities/equipments/index.js | 1 + packages/junon-io/client/src/entities/game.js | 2 +- packages/junon-io/common/constants.json | 18 +++++++++++++++ .../entities/equipments/hand/pointy_stick.js | 20 +++++++++++++++++ .../server/entities/equipments/index.js | 1 + 8 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 packages/junon-io/client/assets/images/pointy_stick.png create mode 100644 packages/junon-io/client/src/entities/equipments/hand/pointy_stick.js create mode 100644 packages/junon-io/server/entities/equipments/hand/pointy_stick.js diff --git a/packages/junon-common/protocol/enum.proto b/packages/junon-common/protocol/enum.proto index 7dafe718..b0f505e4 100644 --- a/packages/junon-common/protocol/enum.proto +++ b/packages/junon-common/protocol/enum.proto @@ -253,6 +253,7 @@ enum BuildingType { PlasmaBlade = 257; Starberries = 258; Starnut = 259; + PointyStick = 260; } enum TerrainType { diff --git a/packages/junon-io/client/assets/images/pointy_stick.png b/packages/junon-io/client/assets/images/pointy_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..49bc7f7ce28602ad0fb9e92025426fb332db193c GIT binary patch literal 29649 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 CbwjlP literal 0 HcmV?d00001 diff --git a/packages/junon-io/client/src/entities/equipments/hand/pointy_stick.js b/packages/junon-io/client/src/entities/equipments/hand/pointy_stick.js new file mode 100644 index 00000000..b2a90cf0 --- /dev/null +++ b/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 diff --git a/packages/junon-io/client/src/entities/equipments/index.js b/packages/junon-io/client/src/entities/equipments/index.js index e2ac100e..5c078553 100644 --- a/packages/junon-io/client/src/entities/equipments/index.js +++ b/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") diff --git a/packages/junon-io/client/src/entities/game.js b/packages/junon-io/client/src/entities/game.js index 6fe2a1d3..c3e5af06 100644 --- a/packages/junon-io/client/src/entities/game.js +++ b/packages/junon-io/client/src/entities/game.js @@ -1401,7 +1401,7 @@ class Game { // 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', 'strangenut.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', 'strangenut.png','pointy_stick.png'] tempAssets.forEach((asset) => { PIXI.Texture.addToCache(PIXI.Texture.fromImage('/assets/images/' + asset), asset) }) diff --git a/packages/junon-io/common/constants.json b/packages/junon-io/common/constants.json index 3694e3e2..46c410fe 100644 --- a/packages/junon-io/common/constants.json +++ b/packages/junon-io/common/constants.json @@ -3686,6 +3686,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, diff --git a/packages/junon-io/server/entities/equipments/hand/pointy_stick.js b/packages/junon-io/server/entities/equipments/hand/pointy_stick.js new file mode 100644 index 00000000..cc7bafb5 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/packages/junon-io/server/entities/equipments/index.js b/packages/junon-io/server/entities/equipments/index.js index 2429c8a3..b80df41a 100644 --- a/packages/junon-io/server/entities/equipments/index.js +++ b/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") From 5ec05b8cd540e01be0fe7e15ac1f8f932bc3371a Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:07:57 -0800 Subject: [PATCH 7/9] Update starnut.js --- packages/junon-io/server/entities/foods/starnut.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/junon-io/server/entities/foods/starnut.js b/packages/junon-io/server/entities/foods/starnut.js index 3ba1137f..51b2359b 100644 --- a/packages/junon-io/server/entities/foods/starnut.js +++ b/packages/junon-io/server/entities/foods/starnut.js @@ -1,8 +1,9 @@ const BaseFood = require("./base_food") + const Constants = require("./../../../../common/constants.json") const Protocol = require("./../../../../common/util/protocol") -class Starfruit extends BaseFood { +class Starnut extends BaseFood { getSpritePath() { return 'strangenut.png' @@ -18,4 +19,4 @@ class Starfruit extends BaseFood { } -module.exports = Starnut \ No newline at end of file +module.exports = Starnut From 1b0bb999f5888c8187843f8dbeff749cd85cc356 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:59:54 -0800 Subject: [PATCH 8/9] Update starnut.js --- packages/junon-io/server/entities/foods/starnut.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/junon-io/server/entities/foods/starnut.js b/packages/junon-io/server/entities/foods/starnut.js index 51b2359b..1b208066 100644 --- a/packages/junon-io/server/entities/foods/starnut.js +++ b/packages/junon-io/server/entities/foods/starnut.js @@ -4,11 +4,7 @@ const Constants = require("./../../../../common/constants.json") const Protocol = require("./../../../../common/util/protocol") class Starnut extends BaseFood { - - getSpritePath() { - return 'strangenut.png' - } - + getType() { return Protocol.definition().BuildingType.Starnut } From 395307036639dadcc1db9dd98c5258e9a8a37858 Mon Sep 17 00:00:00 2001 From: KanicoTheCrab <108701090+KanicoTheCrab@users.noreply.github.com> Date: Thu, 18 Jan 2024 14:03:22 -0800 Subject: [PATCH 9/9] Create starnut.js --- .../client/src/entities/foods/starnut.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/junon-io/client/src/entities/foods/starnut.js diff --git a/packages/junon-io/client/src/entities/foods/starnut.js b/packages/junon-io/client/src/entities/foods/starnut.js new file mode 100644 index 00000000..7891356a --- /dev/null +++ b/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