From 270a5fcccf442d471fa9eae9f1d1b08be8618eb4 Mon Sep 17 00:00:00 2001 From: cowcannon Date: Mon, 30 Mar 2026 18:02:54 -0500 Subject: [PATCH] started alloys and reqequired resources. updated skill lvls for already implemtened items modified: game-server/datapacks/original/assets/languages/en_US.json modified: game-server/datapacks/original/assets/languages/fr_FR.json modified: game-server/datapacks/original/assets/languages/uk_UA.json new file: game-server/datapacks/original/data/items/materials/alloys/chronotanium.json new file: game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json new file: game-server/datapacks/original/data/items/materials/alloys/void_steel.json new file: game-server/datapacks/original/data/items/materials/crystals/flux crystal.json new file: game-server/datapacks/original/data/items/materials/crystals/void crystal.json new file: game-server/datapacks/original/data/items/materials/ingots/carbon.json new file: game-server/datapacks/original/data/recipes/alloys/chronotanium.json modified: game-server/datapacks/original/data/recipes/alloys/steel.json new file: game-server/datapacks/original/data/recipes/alloys/titianium_weave.json new file: game-server/datapacks/original/data/recipes/alloys/voidsteel.json modified: game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json modified: game-server/datapacks/original/data/recipes/circuits/ai_core.json modified: game-server/datapacks/original/data/recipes/circuits/basic_circuit.json modified: game-server/datapacks/original/data/recipes/circuits/processing_circuit.json modified: game-server/datapacks/original/data/recipes/circuits/quantum_processor.json modified: game-server/datapacks/original/data/recipes/ingots/aluminum.json new file: game-server/datapacks/original/data/recipes/ingots/carbon.json modified: game-server/datapacks/original/data/recipes/ingots/copper.json modified: game-server/datapacks/original/data/recipes/ingots/iron.json modified: game-server/datapacks/original/data/skills/crafting/circuit_assembly.json modified: game-server/datapacks/original/manifest.json --- .../original/assets/languages/en_US.json | 13 ++++++++++++ .../original/assets/languages/fr_FR.json | 5 +++++ .../original/assets/languages/uk_UA.json | 5 +++++ .../items/materials/alloys/chronotanium.json | 11 ++++++++++ .../materials/alloys/titianium_weave.json | 11 ++++++++++ .../items/materials/alloys/void_steel.json | 11 ++++++++++ .../materials/crystals/flux crystal.json | 11 ++++++++++ .../materials/crystals/void crystal.json | 11 ++++++++++ .../data/items/materials/ingots/carbon.json | 11 ++++++++++ .../data/recipes/alloys/chronotanium.json | 20 +++++++++++++++++++ .../original/data/recipes/alloys/steel.json | 7 +++++-- .../data/recipes/alloys/titianium_weave.json | 19 ++++++++++++++++++ .../data/recipes/alloys/voidsteel.json | 19 ++++++++++++++++++ .../recipes/circuits/advanced_circuit.json | 4 ++-- .../data/recipes/circuits/ai_core.json | 4 ++-- .../data/recipes/circuits/basic_circuit.json | 2 +- .../recipes/circuits/processing_circuit.json | 4 ++-- .../recipes/circuits/quantum_processor.json | 4 ++-- .../data/recipes/ingots/aluminum.json | 2 +- .../original/data/recipes/ingots/carbon.json | 18 +++++++++++++++++ .../original/data/recipes/ingots/copper.json | 2 +- .../original/data/recipes/ingots/iron.json | 4 ++-- .../skills/crafting/circuit_assembly.json | 2 +- game-server/datapacks/original/manifest.json | 5 +++++ 24 files changed, 189 insertions(+), 16 deletions(-) create mode 100644 game-server/datapacks/original/data/items/materials/alloys/chronotanium.json create mode 100644 game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json create mode 100644 game-server/datapacks/original/data/items/materials/alloys/void_steel.json create mode 100644 game-server/datapacks/original/data/items/materials/crystals/flux crystal.json create mode 100644 game-server/datapacks/original/data/items/materials/crystals/void crystal.json create mode 100644 game-server/datapacks/original/data/items/materials/ingots/carbon.json create mode 100644 game-server/datapacks/original/data/recipes/alloys/chronotanium.json create mode 100644 game-server/datapacks/original/data/recipes/alloys/titianium_weave.json create mode 100644 game-server/datapacks/original/data/recipes/alloys/voidsteel.json create mode 100644 game-server/datapacks/original/data/recipes/ingots/carbon.json diff --git a/game-server/datapacks/original/assets/languages/en_US.json b/game-server/datapacks/original/assets/languages/en_US.json index 3766eb7..1ee65c9 100644 --- a/game-server/datapacks/original/assets/languages/en_US.json +++ b/game-server/datapacks/original/assets/languages/en_US.json @@ -63,6 +63,12 @@ "items.materials.original.bio.bio_pulp.desc" : "A pile of biological material.", "items.materials.original.alloys.steel" : "Steel Ingot", "items.materials.original.alloys.steel.desc" : "A steel ingot.", + "items.materials.original.alloys.titanium_weave" : "titianium weave", + "items.materials.original.alloys.titanium_weave.desc" : "used where flexibility does not compromise strength", + "items.materials.original.alloys.chronotanium" :"A chronotanium ingot", + "items.materials.original.alloys.void_steel" : "Void steel", + "items.materials.original.alloys.void_steel.desc" : "Steel that is very strong and increadably light absorbent", + "items.materials.original.alloys.chronotanium.desc" :"A chronite-titianium alloy for strong and energetic applications", "items.materials.original.circuits.basic" : "Basic Circuit", "items.materials.original.circuits.basic.desc" : "Basic electronics used in simple electromecanical systems. Probably made in someone's shed. Rated for common Tier systems.", "items.materials.original.circuits.advanced" : "Advanced Circuit", @@ -73,8 +79,14 @@ "items.materials.original.circuits.quantum_processor.desc" : "Increadably electronics used in complex systems, featuring quantum cores for unparalleled parallel computation. Made with . Rated for Epic Tier systems.", "items.materials.original.circuits.ai_core" : "Ai Core", "items.materials.original.circuits.ai_core.desc" : "A semi sapient general intelligence, featuring advanced reasoning skills and simulated simulations, it will never truly know if it is in another simulation. Made under incudulus supervison and adhears to strict laws. Warrrenty void if not reset every terran standerd season.", + "items.materials.original.crystal.flux" :"Flux crystal", + "items.materials.original.crystal.flux.desc" :"A crystal whose properties are in constant flux. Commenly used in high power electrical aplications", + "items.materials.original.crystal.void" :"Void crystal", + "items.materials.original.crystal.void.desc" :"A crystal that seems to sap the very light from the room. Commenly used in armor and stealth applications", "items.materials.original.ingots.aluminum" : "Aluminum Ingot", "items.materials.original.ingots.aluminum.desc" : "An aluminum ingot.", + "items.materials.original.ingots.carbon" : "carbon Ingot", + "items.materials.original.ingots.carbon.desc" : "A carbon ingot.", "items.materials.original.ingots.chronite" : "Chronite Ingot", "items.materials.original.ingots.chronite.desc" : "A chronite ingot.", "items.materials.original.ingots.copper" : "Copper Ingot", @@ -108,6 +120,7 @@ "_comment_Recipes" : "", "recipes.category.original.alloys" : "Alloys", "recipes.category.original.circuits" : "Circuits", + "recipes.category.original.crystals" : "Crystals", "recipes.category.original.food" : "Food", "recipes.category.original.forging" : "Forging", "recipes.category.original.hull_sections" : "Hull Sections", diff --git a/game-server/datapacks/original/assets/languages/fr_FR.json b/game-server/datapacks/original/assets/languages/fr_FR.json index 219adb8..cd835e8 100644 --- a/game-server/datapacks/original/assets/languages/fr_FR.json +++ b/game-server/datapacks/original/assets/languages/fr_FR.json @@ -63,6 +63,10 @@ "items.materials.original.bio.bio_pulp.desc": "Une pile de matériel biologique.", "items.materials.original.alloys.steel": "Lingot d'Acier", "items.materials.original.alloys.steel.desc": "Un lingot d'acier.", + "items.materials.original.alloys.titanium_weave" : "titianium weave", + "items.materials.original.alloys.titanium_weave.desc" : "used where flexibility does not compromise strength", + "items.materials.original.alloys.chronotanium" :"Chronotanium", + "items.materials.original.alloys.chronotanium.desc" :"A chronite-titianium alloy for strong and energetic applications", "items.materials.original.circuits.basic" : "Basic Circuit", "items.materials.original.circuits.basic.desc" : "Basic electronics used in simple electromecanical systems. Probably made in someone's shed. Rated for common Tier systems.", "items.materials.original.circuits.advanced" : "Advanced Circuit", @@ -108,6 +112,7 @@ "_comment_Recipes": "", "recipes.category.original.alloys": "Alliages", "recipes.category.original.circuits": "Circuits", + "recipes.category.original.crystals" : "Crystals", "recipes.category.original.food": "Nourriture", "recipes.category.original.forging": "Forge", "recipes.category.original.hull_sections": "Sections de coque", diff --git a/game-server/datapacks/original/assets/languages/uk_UA.json b/game-server/datapacks/original/assets/languages/uk_UA.json index 3a495cf..59f039b 100644 --- a/game-server/datapacks/original/assets/languages/uk_UA.json +++ b/game-server/datapacks/original/assets/languages/uk_UA.json @@ -63,6 +63,10 @@ "items.materials.original.bio.bio_pulp.desc": "Купа біологічного матеріалу.", "items.materials.original.alloys.steel": "Сталевий злиток", "items.materials.original.alloys.steel.desc": "Злиток високоміцної сталі.", + "items.materials.original.alloys.titanium_weave" : "titianium weave", + "items.materials.original.alloys.titanium_weave.desc" : "used where flexibility does not compromise strength", + "items.materials.original.alloys.chronotanium" :"Chronotanium", + "items.materials.original.alloys.chronotanium.desc" :"A chronite-titianium alloy for strong and energetic applications", "items.materials.original.circuits.basic" : "Basic Circuit", "items.materials.original.circuits.basic.desc" : "Basic electronics used in simple electromecanical systems. Probably made in someone's shed. Rated for common Tier systems.", "items.materials.original.circuits.advanced" : "Advanced Circuit", @@ -108,6 +112,7 @@ "_comment_Recipes": "", "recipes.category.original.alloys": "Сплави", "recipes.category.original.circuits": "Схеми", + "recipes.category.original.crystals" : "Crystals", "recipes.category.original.food": "Їжа", "recipes.category.original.forging": "Кування", "recipes.category.original.hull_sections": "Секції корпусу", diff --git a/game-server/datapacks/original/data/items/materials/alloys/chronotanium.json b/game-server/datapacks/original/data/items/materials/alloys/chronotanium.json new file mode 100644 index 0000000..ac0b9f4 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/alloys/chronotanium.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:alloy_chronotanium", + "texture": "original/assets/textures/materials/alloy/chronotanium.png", + "displayName": "items.materials.original.alloys.chronotanium", + "description": "items.materials.original.alloys.chronotanium.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json b/game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json new file mode 100644 index 0000000..7a22d34 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:alloy_titianium_weave", + "texture": "original/assets/textures/materials/alloy/titianium_weave.png", + "displayName": "items.materials.original.alloys.titianium_weave", + "description": "items.materials.original.alloys.titianium_weave.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/alloys/void_steel.json b/game-server/datapacks/original/data/items/materials/alloys/void_steel.json new file mode 100644 index 0000000..5f56fd2 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/alloys/void_steel.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:alloy_void_steel", + "texture": "original/assets/textures/materials/alloy/void_steel.png", + "displayName": "items.materials.original.alloys.void_steel", + "description": "items.materials.original.alloys.void_steel.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/crystals/flux crystal.json b/game-server/datapacks/original/data/items/materials/crystals/flux crystal.json new file mode 100644 index 0000000..13778c6 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/crystals/flux crystal.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:crystal_flux", + "texture": "original/assets/textures/materials/ingot/crystal_flux.png", + "displayName": "items.materials.original.crystal.flux", + "description": "items.materials.original.crystal.flux.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/crystals/void crystal.json b/game-server/datapacks/original/data/items/materials/crystals/void crystal.json new file mode 100644 index 0000000..0c40fd8 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/crystals/void crystal.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:crystal_void", + "texture": "original/assets/textures/materials/ingot/crystal_void.png", + "displayName": "items.materials.original.crystal.void", + "description": "items.materials.original.crystal.void.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/ingots/carbon.json b/game-server/datapacks/original/data/items/materials/ingots/carbon.json new file mode 100644 index 0000000..26cc59e --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/ingots/carbon.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:ingot_carbon", + "texture": "original/assets/textures/materials/ingot/carbon.png", + "displayName": "items.materials.original.ingots.carbon", + "description": "items.materials.original.ingots.carbon.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/recipes/alloys/chronotanium.json b/game-server/datapacks/original/data/recipes/alloys/chronotanium.json new file mode 100644 index 0000000..36d2b72 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/alloys/chronotanium.json @@ -0,0 +1,20 @@ +{ + "recipe": { + "inputs": [ + { "original:ingot_titanium": 2 }, + { "original:ingot_chronite": 1 }, + { "original:ingot_aluminum": 1 } + ], + "output": { + "original:alloy_steel": 1 + }, + "time_seconds": 1200, + "requires": { + "original:alloying": 8 + } + }, + "craft": { + "type": "original:alloys", + "id": "original:alloy_chronotanium" + } +} diff --git a/game-server/datapacks/original/data/recipes/alloys/steel.json b/game-server/datapacks/original/data/recipes/alloys/steel.json index db5e4b6..e06e283 100644 --- a/game-server/datapacks/original/data/recipes/alloys/steel.json +++ b/game-server/datapacks/original/data/recipes/alloys/steel.json @@ -1,12 +1,15 @@ { "recipe": { - "inputs": [{ "original:ingot_iron": 1 }, { "original:ore_coal": 5 }], + "inputs": [ + { "original:ingot_iron": 2 }, + { "original:ore_coal": 5 } + ], "output": { "original:alloy_steel": 1 }, "time_seconds": 10, "requires": { - "original:alloying": 0 + "original:alloying": 1 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/alloys/titianium_weave.json b/game-server/datapacks/original/data/recipes/alloys/titianium_weave.json new file mode 100644 index 0000000..5e70494 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/alloys/titianium_weave.json @@ -0,0 +1,19 @@ +{ + "recipe": { + "inputs": [ + { "original:ingot_titanium": 1 }, + { "original:ingot_carbon": 5 } + ], + "output": { + "original:alloy_titanium_weave": 1 + }, + "time_seconds": 300, + "requires": { + "original:alloying": 4 + } + }, + "craft": { + "type": "original:alloys", + "id": "original:alloy_titanium_weave" + } +} diff --git a/game-server/datapacks/original/data/recipes/alloys/voidsteel.json b/game-server/datapacks/original/data/recipes/alloys/voidsteel.json new file mode 100644 index 0000000..1240c27 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/alloys/voidsteel.json @@ -0,0 +1,19 @@ +{ + "recipe": { + "inputs": [ + { "original:ingot_steel": 2 }, + { "original:crystal_void": 1 } + ], + "output": { + "original:alloy_voidsteel": 2 + }, + "time_seconds": 100, + "requires": { + "original:alloying": 3 + } + }, + "craft": { + "type": "original:alloys", + "id": "original:alloy_voidsteel" + } +} diff --git a/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json b/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json index fcd76a2..e60cce8 100644 --- a/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json +++ b/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json @@ -4,14 +4,14 @@ "inputs": [ {"original:circuit_basic": 2}, {"original:ingot_gold": 1}, - {"original:ore_coal": 2} + {"original:ingot_carbon": 2} ], "output": { "original:circuit_advanced": 1 }, "time_seconds": 20, "requires": { - "original:circuit_assembly": 0 + "original:circuit_assembly": 2 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/circuits/ai_core.json b/game-server/datapacks/original/data/recipes/circuits/ai_core.json index 74780c3..715267e 100644 --- a/game-server/datapacks/original/data/recipes/circuits/ai_core.json +++ b/game-server/datapacks/original/data/recipes/circuits/ai_core.json @@ -8,9 +8,9 @@ "output": { "original:circuit_ai_core": 1 }, - "time_seconds": 20, + "time_seconds": 1200, "requires": { - "original:circuit_assembly": 0 + "original:circuit_assembly": 8 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json b/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json index 17eb745..edf4093 100644 --- a/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json +++ b/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json @@ -10,7 +10,7 @@ }, "time_seconds": 10, "requires": { - "original:circuit_assembly": 0 + "original:circuit_assembly": 1 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json b/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json index 963881d..3ca7358 100644 --- a/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json +++ b/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json @@ -9,9 +9,9 @@ "output": { "original:circuit_processing_unit": 1 }, - "time_seconds": 20, + "time_seconds": 60, "requires": { - "original:circuit_assembly": 0 + "original:circuit_assembly": 4 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json b/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json index 7e9c43a..cd76d37 100644 --- a/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json +++ b/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json @@ -9,9 +9,9 @@ "output": { "original:circuit_quantum_processor": 1 }, - "time_seconds": 20, + "time_seconds": 120, "requires": { - "original:circuit_assembly": 0 + "original:circuit_assembly": 6 } }, "craft": { diff --git a/game-server/datapacks/original/data/recipes/ingots/aluminum.json b/game-server/datapacks/original/data/recipes/ingots/aluminum.json index 9b083e7..809e5be 100644 --- a/game-server/datapacks/original/data/recipes/ingots/aluminum.json +++ b/game-server/datapacks/original/data/recipes/ingots/aluminum.json @@ -7,7 +7,7 @@ "output": { "original:ingot_aluminum": 1 }, - "time_seconds": 15, + "time_seconds": 180, "requires": { "original:forging": 2 } diff --git a/game-server/datapacks/original/data/recipes/ingots/carbon.json b/game-server/datapacks/original/data/recipes/ingots/carbon.json new file mode 100644 index 0000000..e898ff9 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/ingots/carbon.json @@ -0,0 +1,18 @@ +{ + "recipe": { + "inputs": [ + { "original:ore_coal": 5 } + ], + "output": { + "original:ingot_carbon": 1 + }, + "time_seconds": 30, + "requires": { + "original:forging": 2 + } + }, + "craft": { + "type": "original:forging", + "id": "original:ingot_carbon" + } +} diff --git a/game-server/datapacks/original/data/recipes/ingots/copper.json b/game-server/datapacks/original/data/recipes/ingots/copper.json index afaffce..2f1a286 100644 --- a/game-server/datapacks/original/data/recipes/ingots/copper.json +++ b/game-server/datapacks/original/data/recipes/ingots/copper.json @@ -7,7 +7,7 @@ "output": { "original:ingot_copper": 1 }, - "time_seconds": 15, + "time_seconds": 5, "requires": { "original:forging": 0 } diff --git a/game-server/datapacks/original/data/recipes/ingots/iron.json b/game-server/datapacks/original/data/recipes/ingots/iron.json index 9c9a51f..6738f62 100644 --- a/game-server/datapacks/original/data/recipes/ingots/iron.json +++ b/game-server/datapacks/original/data/recipes/ingots/iron.json @@ -7,9 +7,9 @@ "output": { "original:ingot_iron": 1 }, - "time_seconds": 60, + "time_seconds": 5, "requires": { - "original:forging": 1 + "original:forging": 0 } }, "craft": { diff --git a/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json b/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json index 991009b..51f00c5 100644 --- a/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json +++ b/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json @@ -8,7 +8,7 @@ "topLevel": 10, "math": { "start": 500, - "input": 1.7 + "progressionCurve": 1.7 } } } diff --git a/game-server/datapacks/original/manifest.json b/game-server/datapacks/original/manifest.json index 767d9cc..b8e4218 100644 --- a/game-server/datapacks/original/manifest.json +++ b/game-server/datapacks/original/manifest.json @@ -164,6 +164,10 @@ }, "original:circuits": { "displayName": "recipes.category.original.circuits" + + }, + "original:crystals": { + "displayName": "recipes.category.original.crystals" }, "original:food": { "displayName": "recipes.category.original.food" @@ -177,6 +181,7 @@ "original:hulls": { "displayName": "recipes.category.original.hulls" }, + "original:organics": { "displayName": "recipes.category.original.organics" },