Merge branch 'main' it was a pain with the wierd data helper output for the lang file

game-server/datapacks/original/assets/languages/en_US.json

@@ -87,12 +87,12 @@
     "items.materials.original.personal.suit.basic_personal_suit.desc" : "Test suit",
     "items.materials.original.personal.weapon.basic_personal_weapon" : "Personal weapon",
     "items.materials.original.personal.weapon.basic_personal_weapon.desc" : "Test weapon",
-    "items.materials.original.personal.backpack.personal_shield." : "Personal Shield",
+    "items.materials.original.personal.backpack.personal_shield" : "Personal Shield",
     "items.materials.original.personal.backpack.personal_shield.desc" : "Provides a lot of protection but lacks sufficent storage space",
 "_comment_Equipment_Ship" : "",
     "items.materials.original.ship.engine.basic_ship_engines" : "Ship engines",
     "items.materials.original.ship.engine.basic_ship_engines.desc" : "Test engines",
-    "items.materials.original.ship.engine.rtg." : "RTG",
+    "items.materials.original.ship.engine.rtg" : "RTG",
     "items.materials.original.ship.engine.rtg.desc" : "very baisic and low power genarator with a long track record of reliability",
     "items.materials.original.ship.engine.gen1_fission_reactor" : "Gen 1 nuclear reactor",
     "items.materials.original.ship.engine.gen1_fission_reactor.desc" : "A boiling water reactor. Little more than a pile of glowing rocks in some hot water",
@@ -104,13 +104,13 @@
     "items.materials.original.ship.plating.basic_plating.desc" : "Better at stopping sing large hits",
     "items.materials.original.ship.plating.heavy_plating" : "Heavy Plating",
     "items.materials.original.ship.plating.heavy_plating.desc" : "Strong plating capable of resisting high damage impacts",
-    "items.materials.original.ship.plating.reflective_plating." : "Reflective plating",
+    "items.materials.original.ship.plating.reflective_plating" : "Reflective plating",
     "items.materials.original.ship.plating.reflective_plating.desc" : "About as strong as heavy plating but reflects damage back at attackers",
     "items.materials.original.ship.shields.basic_shield" : "Ship shield",
     "items.materials.original.ship.shields.basic_shield.desc" : "Better at stopping many smaller hits. Weak to ion damage",
-    "items.materials.original.ship.shields.heavy_shield." : "Heavy shield",
+    "items.materials.original.ship.shields.heavy_shield" : "Heavy shield",
     "items.materials.original.ship.shields.heavy_shield.desc" : "A high capacity shild for dealing with lots of inbond threats",
-    "items.materials.original.ship.shields.reflecter_shield." : "Reflecter Shields",
+    "items.materials.original.ship.shields.reflecter_shield" : "Reflecter Shields",
     "items.materials.original.ship.shields.reflecter_shield.desc" : "About as strong as heavy shields but reflects a lot of damage back at the attacker",
     "items.materials.original.ship.thruster.basic_ship_thruster" : "Ship thruster",
     "items.materials.original.ship.thruster.basic_ship_thruster.desc" : "Test thruster",
@@ -281,7 +281,8 @@
     "category.tabs.original.skills" : "Skills",
     "category.tabs.original.quests" : "Quests",
 "_comment_Rooms" : "",
-    "You found a hidden cargo container filled with stolen tech." : "",
+    "rooms.original.pirates.pirate_supply_bay" : "",
+    "rooms.original.pirates.pirate_supply_bay.desc" : "",
     "rooms.original.tutorial.tutorial_boss_room.name" : "",
     "rooms.original.tutorial.tutorial_boss_room.desc" : "",
     "rooms.original.tutorial.tutorial_enemy_room.name" : "",
@@ -293,11 +294,5 @@
     "rooms.original.themed.the_rat_one" : "",
     "rooms.original.themed.the_rat_one.desc" : "",
     "rooms.original.themed.cold" : "",
-    "rooms.original.themed.cold.desc" : "",
-"_comment_Equipment" : "",
-    "items.materials.original.personal.backpack.personal_shield" : "",
-    "items.materials.original.ship.engine.rtg" : "",
-    "items.materials.original.ship.plating.reflective_plating" : "",
-    "items.materials.original.ship.shields.heavy_shield" : "",
-    "items.materials.original.ship.shields.reflecter_shield" : ""
+    "rooms.original.themed.cold.desc" : ""
 }

game-server/datapacks/original/data/items/equipment/ship/hulls/heavy_plating.json

@@ -3,18 +3,24 @@
     "id": "original:heavy_plating",
     "displayName": "items.materials.original.ship.plating.heavy_plating",
     "description": "items.materials.original.ship.plating.heavy_plating.desc",
-    "texture": "original/assets/textures/equipement/ship/hulls/heavy_plating.png",
+    "texture": "original/assets/textures/equipment/ship/hull/heavy_plating.png",
     "stats": {
+      "defence.base": 6,
+      "defence.chance": 0.1,
       "health": 30,
       "resistance.base": 0.3,
-      "defence.rating": 11,
-      "reflect.chance": 0
+      "resistance.ion": 0.2
     },
     "meta": {
       "rarity": "uncommon",
       "equipmentSlot": "original:ship_hull",
       "storeCategory": "original:ship_equipment",
-      "dungeon": "space"
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
     }
   }
 }

game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_plating.json

@@ -3,18 +3,26 @@
     "id": "original:reflective_plating",
     "displayName": "items.materials.original.ship.plating.reflective_plating",
     "description": "items.materials.original.ship.plating.reflective_plating.desc",
-    "texture": "original/assets/textures/equipement/ship/hulls/reflective_plating.png",
+    "texture": "original/assets/textures/equipment/ship/hull/reflective_plating.png",
     "stats": {
+      "defence.base": 6,
+      "defence.chance": 0.1,
       "health": 30,
-      "resistance.base": 0.2,
-      "defence.rating": 2,
-      "reflect.chance": 5
+      "reflect.base": 1,
+      "reflect.chance": 0.25,
+      "reflect.rate": 0.25,
+      "resistance.base": 0.2
     },
     "meta": {
       "rarity": "rare",
       "equipmentSlot": "original:ship_hull",
       "storeCategory": "original:ship_equipment",
-      "dungeon": "space"
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
     }
   }
-}
+}

game-server/datapacks/original/data/items/equipment/ship/hulls/resistive_plating.json

@@ -5,6 +5,7 @@
     "description": "items.materials.original.ship.plating.heavy_plating.desc",
     "texture": "original/assets/textures/equipment/ship/hull/resistive_plating.png",
     "stats": {
+      "defence.base": 6,
       "health": 30,
       "resistance.base": 0.3,
       "resistance.cold": 0.3,

game-server/datapacks/original/data/items/equipment/ship/shields/basic_shield.json

@@ -3,19 +3,26 @@
     "id": "original:basic_shield",
     "displayName": "items.materials.original.ship.shields.basic_shield",
     "description": "items.materials.original.ship.shields.basic_shield.desc",
-    "texture": "original/assets/textures/equipement/ship/shields/basic_shield.png",
+    "texture": "original/assets/textures/equipment/ship/shields/basic_shield.png",
     "stats": {
+      "defence.rate": 2,
       "health": 25,
-      "resistance.base": 0,
-      "defence.rating": 0,
+      "reflect.base": 1,
       "reflect.chance": 0.1,
+      "reflect.rate": 0.5,
+      "resistance.base": 0,
       "resistance.ion": -0.5
     },
     "meta": {
       "rarity": "common",
       "equipmentSlot": "original:ship_shields",
       "storeCategory": "original:ship_equipment",
-      "dungeon": "space"
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
     }
   }
-}
+}

game-server/datapacks/original/data/items/equipment/ship/shields/heavy_shield.json

@@ -1,21 +1,28 @@
 {
   "plating": {
-    "id": "original:basic_shield",
+    "id": "original:heavy_shield",
     "displayName": "items.materials.original.ship.shields.heavy_shield",
     "description": "items.materials.original.ship.shields.heavy_shield.desc",
-    "texture": "original/assets/textures/equipement/ship/shields/heavy_shield.png",
+    "texture": "original/assets/textures/equipment/ship/shields/heavy_shield.png",
     "stats": {
+      "defence.rate": 5,
       "health": 75,
-      "resistance.base": 0.1,
-      "defence.rating": 0.25,
+      "reflect.base": 1,
       "reflect.chance": 0.15,
+      "reflect.rate": 1,
+      "resistance.base": 0.1,
       "resistance.ion": -0.5
     },
     "meta": {
       "rarity": "uncommon",
       "equipmentSlot": "original:ship_shields",
       "storeCategory": "original:ship_equipment",
-      "dungeon": "space"
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
     }
   }
-}
+}

game-server/datapacks/original/data/items/equipment/ship/shields/reflecter_shield.json

@@ -1,21 +1,29 @@
 {
   "plating": {
-    "id": "original:basic_shield",
+    "id": "original:reflecter_shield",
     "displayName": "items.materials.original.ship.shields.reflecter_shield",
     "description": "items.materials.original.ship.shields.reflecter_shield.desc",
-    "texture": "original/assets/textures/equipement/ship/shields/reflecter_shield.png",
+    "texture": "original/assets/textures/equipment/ship/shields/reflecter_shield.png",
     "stats": {
+      "defence.chance": 0.15,
+      "defence.rate": 4,
       "health": 70,
+      "reflect.base": 3,
+      "reflect.chance": 0.5,
+      "reflect.rate": 1.5,
       "resistance.base": 0.1,
-      "defence.rating": 0.15,
-      "reflect.chance": 15,
       "resistance.ion": -0.5
     },
     "meta": {
       "rarity": "rare",
       "equipmentSlot": "original:ship_shields",
       "storeCategory": "original:ship_equipment",
-      "dungeon": "space"
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
     }
   }
-}
+}

game-server/datapacks/original/data/items/equipment/ship/thrusters/big_ship_thruster.json

@@ -0,0 +1,28 @@
+{
+  "plating": {
+    "id": "original:Big_ship_thruster",
+    "displayName": "items.materials.original.ship.thruster.big_ship_thruster",
+    "description": "items.materials.original.ship.thruster.big_ship_thruster.desc",
+    "texture": "original/assets/textures/equipment/ship/thruster/Big_ship_thruster.png",
+    "stats": {
+      "defence.chance": 0.1,
+      "health": 35
+    },
+    "meta": {
+      "rarity": "uncommon",
+      "equipmentSlot": [
+        "original:ship_thruster_1",
+        "original:ship_thruster_2",
+        "original:ship_thruster_3",
+        "original:ship_thruster_4"
+      ],
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space",
+      "storePrice": 100,
+      "storeSellValue": 25,
+      "storeShowWeight": 10,
+      "storeFeaturedDiscountPercentage": 0,
+      "storeFeaturedShowWeight": 10
+    }
+  }
+}

game-server/datapacks/original/data/recipes/ship_equipment/basic_shield.json

@@ -0,0 +1,32 @@
+{
+  "recipe": {
+    "inputs": [
+      {
+        "original:crystal_flux": 2
+      },
+      {
+        "original:ingot_iron": 1
+      },
+      {
+        "original:circuit_basic": 2
+      },
+      {
+        "original:ingot_carbon": 2
+      },
+      {
+        "original:ingot_copper": 1
+      }
+    ],
+    "output": {
+      "original:basic_shield": 1
+    },
+    "time_seconds": 60,
+    "requires": {
+      "original:high_energetics": 2
+    }
+  },
+  "craft": {
+    "type": "original:ship_equipment",
+    "id": "original:basic_shield"
+  }
+}

game-server/datapacks/original/data/recipes/ship_equipment/gen1_fission_reactor.json

@@ -0,0 +1,32 @@
+{
+  "recipe": {
+    "inputs": [
+      {
+        "original:crystal_flux": 2
+      },
+      {
+        "original:alloy_steel": 5
+      },
+      {
+        "original:circuit_basic": 2
+      },
+      {
+        "original:ingot_copper": 5
+      },
+      {
+        "original:ingot_carbon": 2
+      }
+    ],
+    "output": {
+      "original:gen1_fission_reactor": 1
+    },
+    "time_seconds": 60,
+    "requires": {
+      "original:high_energetics": 2
+    }
+  },
+  "craft": {
+    "type": "original:ship_equipment",
+    "id": "original:gen1_fission_reactor"
+  }
+}

game-server/datapacks/original/data/recipes/ship_equipment/gen2_fission_reactor.json

@@ -0,0 +1,38 @@
+{
+  "recipe": {
+    "inputs": [
+      {
+        "original:crystal_flux": 5
+      },
+      {
+        "original:alloy_steel": 6
+      },
+      {
+        "original:circuit_advanced": 3
+      },
+      {
+        "original:ingot_aluminum": 1
+      },
+      {
+        "original:ingot_copper": 5
+      },
+      {
+        "original:ingot_gold": 3
+      },
+      {
+        "original:ingot_carbon": 5
+      }
+    ],
+    "output": {
+      "original:gen2_fission_reactor": 1
+    },
+    "time_seconds": 60,
+    "requires": {
+      "original:high_energetics": 3
+    }
+  },
+  "craft": {
+    "type": "original:ship_equipment",
+    "id": "original:gen2_fission_reactor"
+  }
+}

game-server/datapacks/original/data/recipes/ship_equipment/heavy_shield.json

@@ -0,0 +1,32 @@
+{
+  "recipe": {
+    "inputs": [
+      {
+        "original:crystal_flux": 2
+      },
+      {
+        "original:alloy_steel": 1
+      },
+      {
+        "original:circuit_advanced": 2
+      },
+      {
+        "original:ingot_gold": 1
+      },
+      {
+        "original:ingot_carbon": 2
+      }
+    ],
+    "output": {
+      "original:heavy_shield": 1
+    },
+    "time_seconds": 60,
+    "requires": {
+      "original:high_energetics": 2
+    }
+  },
+  "craft": {
+    "type": "original:ship_equipment",
+    "id": "original:heavy_shield"
+  }
+}

game-server/datapacks/original/data/recipes/ship_equipment/manifest.json

@@ -0,0 +1,226 @@
+{
+  "name": "original",
+  "version": "0.0.2",
+  "admin_item_list": {
+    "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": {
+      "original:ground": {
+        "displayName": "admin.category.original.hostile_list.ground"
+      },
+      "original:ships": {
+        "displayName": "admin.category.original.hostile_list.ships"
+      }
+    }
+  },
+  "admin_player_list": {
+    "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": {
+      "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.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.weapons"
+      },
+      "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": {
+      "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": {
+      "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:personal_equipment": {
+        "displayName": "recipes.category.original.personal_equipment"
+      },
+      "original:ship_equipment": {
+        "displayName": "recipes.category.original.ship_equipment"
+      }
+    }
+  },
+  "shop": {
+    "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": {
+      "original:combat": {
+        "displayName": "skills.category.original.combat"
+      },
+      "original:crafting": {
+        "displayName": "skills.category.original.crafting"
+      },
+      "original:science": {
+        "displayName": "skills.category.original.science"
+      }
+    }
+  }
+}

game-server/datapacks/original/manifest.json

@@ -41,7 +41,7 @@
         "displayName": "admin.category.original.hostile_list.ground"
       },
       "original:ships": {
-        "displayName": "admin.category.original.hostile_list.ship"
+        "displayName": "admin.category.original.hostile_list.ships"
       }
     }
   },
@@ -101,7 +101,7 @@
         "displayName": "core_systems.category.original.person.accessory_4"
       },
       "original:personal_weapons": {
-        "displayName": "core_systems.category.original.person.weapon"
+        "displayName": "core_systems.category.original.person.weapons"
       },
       "original:ship_hull": {
         "displayName": "core_systems.category.original.ship.hull"
@@ -169,7 +169,7 @@
         "displayName": "recipes.category.original.forging"
       },
       "original:hull_sections": {
-        "displayName": "recipes.category.original.ship_components"
+        "displayName": "recipes.category.original.hull_sections"
       },
       "original:hulls": {
         "displayName": "recipes.category.original.hulls"
@@ -177,8 +177,11 @@
       "original:organics": {
         "displayName": "recipes.category.original.organics"
       },
-      "original:spacesuit_parts": {
-        "displayName": "recipes.category.original.spacesuit_parts"
+      "original:personal_equipment": {
+        "displayName": "recipes.category.original.personal_equipment"
+      },
+      "original:ship_equipment": {
+        "displayName": "recipes.category.original.ship_equipment"
       }
     }
   },
@@ -191,10 +194,10 @@
         "displayName": "shop.category.original.ships"
       },
       "original:personal_equipment": {
-        "displayName": "shop.category.original.personal.equipment"
+        "displayName": "shop.category.original.personal_equipment"
       },
       "original:ship_equipment": {
-        "displayName": "shop.category.original.ship.equipment"
+        "displayName": "shop.category.original.ship_equipment"
       },
       "original:consumables": {
         "displayName": "shop.category.original.consumables"