From 96186592bf61bb1ce07f59c4305f686c031494c6 Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Mon, 20 Apr 2026 14:12:48 -0300 Subject: [PATCH] Revert "added test helmet and weapon" This reverts commit b9275223d9e76db763a8abd9ce6d6995936afab6. --- .../personal/personal_helmet/test_helmet.json | 24 -- .../personal/weapns/test_weapon.json | 24 -- game-server/datapacks/original/manifest.json | 210 +++++++++++++++++- 3 files changed, 199 insertions(+), 59 deletions(-) delete mode 100644 game-server/datapacks/original/data/items/equipment/personal/personal_helmet/test_helmet.json delete mode 100644 game-server/datapacks/original/data/items/equipment/personal/weapns/test_weapon.json diff --git a/game-server/datapacks/original/data/items/equipment/personal/personal_helmet/test_helmet.json b/game-server/datapacks/original/data/items/equipment/personal/personal_helmet/test_helmet.json deleted file mode 100644 index 77b9434..0000000 --- a/game-server/datapacks/original/data/items/equipment/personal/personal_helmet/test_helmet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "plating": { - "id": "original:test_helmet", - "displayName": "items.personal.original.helmet.test_helmet", - "description": "items.personal.original.helmet.test_helmet.desc", - "texture": "original/assets/textures/equipment/personal/helmet/test_helmet.png", - "stats": { - "defence.base": 2.5, - "health": 7.5, - "resistance.heat": 1.5 - }, - "meta": { - "rarity": "common", - "equipmentSlot": "original:personal_helmet", - "storeCategory": "original:personal_equipment", - "dungeon": "ground", - "storePrice": 100, - "storeSellValue": 25, - "storeShowWeight": 10, - "storeFeaturedDiscountPercentage": 0, - "storeFeaturedShowWeight": 10 - } - } -} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/equipment/personal/weapns/test_weapon.json b/game-server/datapacks/original/data/items/equipment/personal/weapns/test_weapon.json deleted file mode 100644 index 0481a51..0000000 --- a/game-server/datapacks/original/data/items/equipment/personal/weapns/test_weapon.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "plating": { - "id": "original:test_weapon", - "displayName": "items.personal.original.weapon.test_weapon", - "description": "items.personal.original.weapon.test_weapon.desc", - "texture": "original/assets/textures/equipment/personal/weapon/test_weapon.png", - "stats": { - "attack.base": 3.5, - "attack.rate": 0, - "penetration.base": 2 - }, - "meta": { - "rarity": "common", - "equipmentSlot": "original:personal_weapons", - "storeCategory": "original:personal_equipment", - "dungeon": "ground", - "storePrice": 100, - "storeSellValue": 25, - "storeShowWeight": 10, - "storeFeaturedDiscountPercentage": 0, - "storeFeaturedShowWeight": 10 - } - } -} \ No newline at end of file diff --git a/game-server/datapacks/original/manifest.json b/game-server/datapacks/original/manifest.json index 830b29d..5548770 100644 --- a/game-server/datapacks/original/manifest.json +++ b/game-server/datapacks/original/manifest.json @@ -2,34 +2,222 @@ "name": "original", "version": "0.0.2", "admin_item_list": { - "categories": {} + "categories": { + "original:alloys": { + "displayName": "admin.category.original.item_list.alloys" + }, + "original:circuits": { + "displayName": "admin.category.original.item_list.circuits" + }, + "original:customizables": { + "displayName": "admin.category.original.item_list.customizables" + }, + "original:ingots": { + "displayName": "admin.category.original.item_list.ingots" + }, + "original:materials": { + "displayName": "admin.category.original.item_list.materials" + }, + "original:ores": { + "displayName": "admin.category.original.item_list.ores" + }, + "original:personal": { + "displayName": "admin.category.original.item_list.personal" + }, + "original:ships": { + "displayName": "admin.category.original.item_list.ships" + }, + "original:shields": { + "displayName": "admin.category.original.item_list.shields" + }, + "original:weapons": { + "displayName": "admin.category.original.item_list.weapons" + } + } }, "admin_hostiles_list": { - "categories": {} + "categories": { + "original:ground": { + "displayName": "admin.category.original.hostile_list.ground" + }, + "original:ships": { + "displayName": "admin.category.original.hostile_list.ship" + } + } }, "admin_player_list": { - "categories": {} + "categories": { + "original:members": { + "displayName": "admin.category.original.player_list.members" + }, + "original:moderators": { + "displayName": "admin.category.original.player_list.moderators" + }, + "original:admins": { + "displayName": "admin.category.original.player_list.admins" + } + } }, "admin_role": { - "categories": {} + "categories": { + "original:members": { + "displayName": "admin.category.original.player_list.members" + }, + "original:moderators": { + "displayName": "admin.category.original.player_list.moderators" + }, + "original:admins": { + "displayName": "admin.category.original.player_list.admins" + } + } }, "core_systems": { "categories": { - "original:personal-helmet": { - "displayName": "core_systems.category.original.personal-helmet" + "original:personal_helmet": { + "displayName": "core_systems.category.original.person.helmet" + }, + "original:personal_suit": { + "displayName": "core_systems.category.original.person.suit" + }, + "original:personal_gloves": { + "displayName": "core_systems.category.original.person.gloves" + }, + "original:personal_backpack": { + "displayName": "core_systems.category.original.person.backpack" + }, + "original:personal_boots": { + "displayName": "core_systems.category.original.person.boots" + }, + "original:personal_accessory_1": { + "displayName": "core_systems.category.original.person.accessory_1" + }, + "original:personal_accessory_2": { + "displayName": "core_systems.category.original.person.accessory_2" + }, + "original:personal_accessory_3": { + "displayName": "core_systems.category.original.person.accessory_3" + }, + "original:personal_accessory_4": { + "displayName": "core_systems.category.original.person.accessory_4" + }, + "original:personal_weapons": { + "displayName": "core_systems.category.original.person.weapon" + }, + "original:ship_hull": { + "displayName": "core_systems.category.original.ship.hull" + }, + "original:ship_shields": { + "displayName": "core_systems.category.original.ship.shields" + }, + "original:ship_engines": { + "displayName": "core_systems.category.original.ship.engines" + }, + "original:ship_weapon_1": { + "displayName": "core_systems.category.original.ship.weapon_1" + }, + "original:ship_weapon_2": { + "displayName": "core_systems.category.original.ship.weapon_2" + }, + "original:ship_thruster_1": { + "displayName": "core_systems.category.original.ship.thruster_1" + }, + "original:ship_thruster_2": { + "displayName": "core_systems.category.original.ship.thruster_2" + }, + "original:ship_thruster_3": { + "displayName": "core_systems.category.original.ship.thruster_3" + }, + "original:ship_thruster_4": { + "displayName": "core_systems.category.original.ship.thruster_4" } } }, "quests": { - "categories": {} + "categories": { + "original:story": { + "displayName": "quests.category.original.story" + }, + "original:daily": { + "displayName": "quests.category.original.daily" + }, + "original:weekly": { + "displayName": "quests.category.original.weekly" + }, + "original:monthly": { + "displayName": "quests.category.original.monthly" + }, + "original:seasonal": { + "displayName": "quests.category.original.seasonal" + } + } }, "recipes": { - "categories": {} + "categories": { + "original:alloys": { + "displayName": "recipes.category.original.alloys" + }, + "original:circuits": { + "displayName": "recipes.category.original.circuits" + }, + "original:crystals": { + "displayName": "recipes.category.original.crystals" + }, + "original:food": { + "displayName": "recipes.category.original.food" + }, + "original:forging": { + "displayName": "recipes.category.original.forging" + }, + "original:hull_sections": { + "displayName": "recipes.category.original.hull_sections" + }, + "original:hulls": { + "displayName": "recipes.category.original.hulls" + }, + "original:organics": { + "displayName": "recipes.category.original.organics" + }, + "original:spacesuit_parts": { + "displayName": "recipes.category.original.spacesuit_parts" + } + } }, "shop": { - "categories": {} + "categories": { + "original:featured": { + "displayName": "shop.category.original.featured" + }, + "original:ships": { + "displayName": "shop.category.original.ships" + }, + "original:personal_equipment": { + "displayName": "shop.category.original.personal.equipment" + }, + "original:ship_equipment": { + "displayName": "shop.category.original.ship.equipment" + }, + "original:consumables": { + "displayName": "shop.category.original.consumables" + }, + "original:materials": { + "displayName": "shop.category.original.materials" + }, + "original:premium": { + "displayName": "shop.category.original.premium" + } + } }, "skills": { - "categories": {} + "categories": { + "original:combat": { + "displayName": "skills.category.original.combat" + }, + "original:crafting": { + "displayName": "skills.category.original.crafting" + }, + "original:science": { + "displayName": "skills.category.original.science" + } + } } -} \ No newline at end of file +}