diff --git a/game-server/datapacks/original/assets/languages/en_US.json b/game-server/datapacks/original/assets/languages/en_US.json index 2f30e06..a0d7a40 100644 --- a/game-server/datapacks/original/assets/languages/en_US.json +++ b/game-server/datapacks/original/assets/languages/en_US.json @@ -49,6 +49,8 @@ "_comment_Enemies" : "", "enemies.original.pirate.black_mark_heavy_cruiser" : "Black Mark Heavy Cruiser", "enemies.original.pirate.raider_frigate" : "Raider Frigate", + "enemies.original.pirate.snacher_clipper": "Snacher Clipper", + "enemies.original.pirate.corvid_corvette": "Corvid Corvette", "enemies.original.pirate.scout_drone" : "Scout Drone", "enemies.original.tutorial.tutorial_hostile" : "Tutorial hostile", "enemies.original.tutorial.tutorial_boss_hostile" : "Tutorial Boss", @@ -76,12 +78,18 @@ "items.materials.original.ship.engine.gen2_fission_reactor.desc":"A Gas cooled reactor. Uses CO2 as a coolant allowing it to run hotter and at higher pressures and be much more power dense. The high power density and pressures comes at a price of reliability", "items.materials.original.ship.engine.gen3_fission_reactor":"Gen 3 nuclear reactor", "items.materials.original.ship.engine.gen3_fission_reactor.desc":"A Molten salt reactor. The pinical of fission power. Uses molten salt as its coolant allowing for very high temperatures and low pressures. Safer than most reactors", - "items.materials.original.ship.plating.basic_ship_plating" :"Ship plating", - "items.materials.original.ship.plating.basic_ship_plating.desc" :"Test plating", - "items.materials.original.ship.plating.reflective_ship_plating.":"Reflective plating", - "items.materials.original.ship.plating.reflective_ship_plating.desc":"about as strong as standerd plating but reflects damage back at attackers", - "items.materials.original.ship.shields.basic_ship_shield" :"Ship shield", - "items.materials.original.ship.shields.basic_ship_shield.desc" :"Test shield", + "items.materials.original.ship.plating.basic_plating" :"Ship plating", + "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.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.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.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", "items.materials.original.ship.thruster.big_ship_thruster":"Big ship thruster", diff --git a/game-server/datapacks/original/assets/languages/fr_FR.json b/game-server/datapacks/original/assets/languages/fr_FR.json index fe2ca44..8787d3a 100644 --- a/game-server/datapacks/original/assets/languages/fr_FR.json +++ b/game-server/datapacks/original/assets/languages/fr_FR.json @@ -48,6 +48,8 @@ "_comment_Enemies": "", "enemies.original.pirate.black_mark_heavy_cruiser": "Croiseur Lourd Marque Noire", "enemies.original.pirate.raider_frigate": "Frégate d'Assaillant", + "enemies.original.pirate.snacher_clipper": "Snacher Clipper", + "enemies.original.pirate.corvid_corvette": "Corvid Corvette", "enemies.original.pirate.scout_drone": "Drone d'espionnage", "enemies.original.tutorial.tutorial_hostile": "Tutoriel hostile", "enemies.original.tutorial.tutorial_boss_hostile": "Maître tutoriel", diff --git a/game-server/datapacks/original/assets/languages/uk_UA.json b/game-server/datapacks/original/assets/languages/uk_UA.json index f1522e2..f5a23e0 100644 --- a/game-server/datapacks/original/assets/languages/uk_UA.json +++ b/game-server/datapacks/original/assets/languages/uk_UA.json @@ -48,6 +48,8 @@ "_comment_Enemies": "", "enemies.original.pirate.black_mark_heavy_cruiser": "Важкий крейсер «Чорної Мітки»", "enemies.original.pirate.raider_frigate": "Фрегат рейдерів", + "enemies.original.pirate.snacher_clipper": "Snacher Clipper", + "enemies.original.pirate.corvid_corvette": "Corvid Corvette", "enemies.original.pirate.scout_drone": "Дрон-розвідник", "enemies.original.tutorial.tutorial_hostile": "Тренувальний ворог", "enemies.original.tutorial.tutorial_boss_hostile": "Бос навчання", diff --git a/game-server/datapacks/original/data/enemies/hostiles/pirates/black_mark_cruiser.json b/game-server/datapacks/original/data/enemies/hostiles/pirates/black_mark_cruiser.json index 7b94bf4..b907a62 100644 --- a/game-server/datapacks/original/data/enemies/hostiles/pirates/black_mark_cruiser.json +++ b/game-server/datapacks/original/data/enemies/hostiles/pirates/black_mark_cruiser.json @@ -1,7 +1,7 @@ { "hostile": { "id": "original:pirates/black_mark_cruiser", - "displayName": "Black Mark Heavy Cruiser", + "displayName": "enemies.original.pirate.black_mark_heavy_cruiser", "stats": { "health": 850, "defense": 5.0, diff --git a/game-server/datapacks/original/data/enemies/hostiles/pirates/corvid_corvette.json b/game-server/datapacks/original/data/enemies/hostiles/pirates/corvid_corvette.json new file mode 100644 index 0000000..50608b0 --- /dev/null +++ b/game-server/datapacks/original/data/enemies/hostiles/pirates/corvid_corvette.json @@ -0,0 +1,13 @@ +{ + "hostile": { + "id": "original:pirates/corvid_corvette", + "displayName": "enemies.original.pirate.corvid_corvette", + "stats": { + "health": 100, + "defense": 1, + "damage": 4, + "critical.chance": 0.1, + "attack.rate": 2.0 + } + } +} diff --git a/game-server/datapacks/original/data/enemies/hostiles/pirates/raider_frigate.json b/game-server/datapacks/original/data/enemies/hostiles/pirates/raider_frigate.json index 63553bb..e9f61bb 100644 --- a/game-server/datapacks/original/data/enemies/hostiles/pirates/raider_frigate.json +++ b/game-server/datapacks/original/data/enemies/hostiles/pirates/raider_frigate.json @@ -1,11 +1,11 @@ { "hostile": { "id": "original:pirates/raider_frigate", - "displayName": "Raider Frigate", + "displayName": "enemies.original.pirate.raider_frigate", "stats": { - "health": 110, + "health": 210, "defense": 1.5, - "damage": 6.5, + "damage": 7, "critical.chance": 0.2, "attack.rate": 1.0 } diff --git a/game-server/datapacks/original/data/enemies/hostiles/pirates/scout_drone.json b/game-server/datapacks/original/data/enemies/hostiles/pirates/scout_drone.json index 57c3c69..ef860cd 100644 --- a/game-server/datapacks/original/data/enemies/hostiles/pirates/scout_drone.json +++ b/game-server/datapacks/original/data/enemies/hostiles/pirates/scout_drone.json @@ -1,11 +1,11 @@ { "hostile": { "id": "original:pirates/scout_drone", - "displayName": "Pirate Scout Drone", + "displayName": "enemies.original.pirate.scout_drone" , "stats": { "health": 25, "defense": 0.2, - "damage": 1.8, + "damage": 2, "critical.chance": 0.1, "attack.rate": 3.0 } diff --git a/game-server/datapacks/original/data/enemies/hostiles/pirates/snacher_clipper.json b/game-server/datapacks/original/data/enemies/hostiles/pirates/snacher_clipper.json new file mode 100644 index 0000000..1621f63 --- /dev/null +++ b/game-server/datapacks/original/data/enemies/hostiles/pirates/snacher_clipper.json @@ -0,0 +1,13 @@ +{ + "hostile": { + "id": "original:pirates/snacher_clipper", + "displayName": "enemies.original.pirate.snacher_clipper", + "stats": { + "health": 100, + "defense": 4, + "damage": 4, + "critical.chance": 0.3, + "attack.rate": 3.0 + } + } +} diff --git a/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_boss_hostile.json b/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_boss_hostile.json index 1e76af4..3863b07 100644 --- a/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_boss_hostile.json +++ b/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_boss_hostile.json @@ -5,7 +5,7 @@ "stats": { "health": 90, "defense": 1.3, - "damage": 4.1, + "damage": 4, "critical.chance": 0.3, "attack.rate": 2 } diff --git a/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_hostile.json b/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_hostile.json index 8b57d26..6679335 100644 --- a/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_hostile.json +++ b/game-server/datapacks/original/data/enemies/hostiles/tutorial/tutorial_hostile.json @@ -4,10 +4,10 @@ "displayName": "enemies.original.tutorial.tutorial_hostile", "stats": { "health": 30, - "defense": 0.3, - "damage": 2.1, - "critical,chance": 0.3, - "attack.rate": 2 + "defense": 0.0, + "damage": 2, + "critical,chance": 0.0, + "attack.rate": 1 } } } diff --git a/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json b/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_plating.json similarity index 69% rename from game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json rename to game-server/datapacks/original/data/items/equipment/ship/hulls/basic_plating.json index 8504772..6723630 100644 --- a/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json +++ b/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_plating.json @@ -1,14 +1,14 @@ { "plating": { - "id": "original:basic_ship_plating", - "displayName": "items.materials.original.ship.plating.basic_ship_plating", - "description": "items.materials.original.ship.plating.basic_ship_plating.desc", - "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png", + "id": "original:basic_plating", + "displayName": "items.materials.original.ship.plating.basic_plating", + "description": "items.materials.original.ship.plating.basic_plating.desc", + "texture": "original/assets/textures/equipement/ship/hulls/basic_plating.png", "stats": { "health": 10, - "resistance.base": 0.1, - "defence.rating": 2.3, - "reflect.chance": 1.3 + "resistance.base": 0.2, + "defence.rating": 4, + "reflect.chance": 0 }, "meta": { "rarity": "common", diff --git a/game-server/datapacks/original/data/items/equipment/ship/hulls/heavy_plating.json b/game-server/datapacks/original/data/items/equipment/ship/hulls/heavy_plating.json new file mode 100644 index 0000000..a8530a4 --- /dev/null +++ b/game-server/datapacks/original/data/items/equipment/ship/hulls/heavy_plating.json @@ -0,0 +1,20 @@ +{ + "plating": { + "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", + "stats": { + "health": 30, + "resistance.base": 0.3, + "defence.rating": 11, + "reflect.chance": 0 + }, + "meta": { + "rarity": "uncommon", + "equipmentSlot": "original:ship_hull", + "storeCategory": "original:ship_equipment", + "dungeon": "space" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_ship_plating.json b/game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_plating.json similarity index 68% rename from game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_ship_plating.json rename to game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_plating.json index d7ae46e..bd479a3 100644 --- a/game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_ship_plating.json +++ b/game-server/datapacks/original/data/items/equipment/ship/hulls/reflective_plating.json @@ -1,14 +1,14 @@ { "plating": { - "id": "original:reflective__ship_plating", - "displayName": "items.materials.original.ship.plating.reflective_ship_plating", - "description": "items.materials.original.ship.plating.reflective_ship_plating.desc", - "texture": "original/assets/textures/equipement/ship/hulls/reflective_ship_plating.png", + "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", "stats": { - "health": 20, + "health": 30, "resistance.base": 0.2, - "defence.rating": 1, - "reflect.chance": 11.3 + "defence.rating": 2, + "reflect.chance": 5 }, "meta": { "rarity": "rare", diff --git a/game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json b/game-server/datapacks/original/data/items/equipment/ship/shields/basic_shield.json similarity index 58% rename from game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json rename to game-server/datapacks/original/data/items/equipment/ship/shields/basic_shield.json index 0e40346..41f6992 100644 --- a/game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json +++ b/game-server/datapacks/original/data/items/equipment/ship/shields/basic_shield.json @@ -1,14 +1,15 @@ { "plating": { - "id": "original:basic_ship_shield", - "displayName": "items.materials.original.ship.shields.basic_ship_shield", - "description": "items.materials.original.ship.shields.basic_ship_shield.desc", - "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png", + "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", "stats": { "health": 25, - "resistance.base": 0.75, - "defence.rating": 5.25, - "reflect.chance": 7.25 + "resistance.base": 0, + "defence.rating": 0, + "reflect.chance": 0.1, + "resistance.ion": -0.5 }, "meta": { "rarity": "common", diff --git a/game-server/datapacks/original/data/items/equipment/ship/shields/heavy_shield.json b/game-server/datapacks/original/data/items/equipment/ship/shields/heavy_shield.json new file mode 100644 index 0000000..6bb52dd --- /dev/null +++ b/game-server/datapacks/original/data/items/equipment/ship/shields/heavy_shield.json @@ -0,0 +1,21 @@ +{ + "plating": { + "id": "original:basic_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", + "stats": { + "health": 75, + "resistance.base": 0.1, + "defence.rating": 0.25, + "reflect.chance": 0.15, + "resistance.ion": -0.5 + }, + "meta": { + "rarity": "uncommon", + "equipmentSlot": "original:ship_shields", + "storeCategory": "original:ship_equipment", + "dungeon": "space" + } + } +} diff --git a/game-server/datapacks/original/data/items/equipment/ship/shields/reflecter_shield.json b/game-server/datapacks/original/data/items/equipment/ship/shields/reflecter_shield.json new file mode 100644 index 0000000..c0c85d7 --- /dev/null +++ b/game-server/datapacks/original/data/items/equipment/ship/shields/reflecter_shield.json @@ -0,0 +1,21 @@ +{ + "plating": { + "id": "original:basic_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", + "stats": { + "health": 70, + "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" + } + } +}