First stab at Living Armour reimplementation.

Added a lot of the upgrades, but there's still more testing/upgrades to be done/reimplemented.
This commit is contained in:
WayofTime 2020-11-28 12:04:11 -05:00
parent 06faa916c3
commit 2075fa5be3
42 changed files with 2352 additions and 2 deletions

View file

@ -56,7 +56,7 @@ e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritu
42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json
3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json
d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json
c220fc49d1981be98283901bf1b50702f5c021cd assets/bloodmagic/lang/en_us.json
0529422020c4a1669969bd3ee63aee063de4954d assets/bloodmagic/lang/en_us.json
34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json
bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json
adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json
@ -269,6 +269,10 @@ ccbcba6e4a6450bb67f91ba17754d668ba64c0ac assets/bloodmagic/models/item/ironfragm
413fa378c40dec89cb765a7d5c8bfc9cdef1d828 assets/bloodmagic/models/item/lavacrystal.json
588c5208e3f4ef941cd8375aeceeed44484d85d3 assets/bloodmagic/models/item/lavasigil.json
5a76914a87fc9b99079bb6afed1d4cfe3e4a532e assets/bloodmagic/models/item/lightritualstone.json
bd4db65caffbc68b312607bae4258fc1b67f60fd assets/bloodmagic/models/item/livingboots.json
c80cdacad2c4b6e995fe846c11cb2124a1813d79 assets/bloodmagic/models/item/livinghelmet.json
a64aa9003209d9eeca67cd7d3f1e2f05795c8f1a assets/bloodmagic/models/item/livingleggings.json
c0c9c72a8e31c9fa2d12eb870495407255431c8b assets/bloodmagic/models/item/livingplate.json
15d8178b626da912334774142d40d1012fb21fa0 assets/bloodmagic/models/item/magicianbloodorb.json
0a3566d3c86403f24c22977dd32ffaec727a9ad3 assets/bloodmagic/models/item/masterbloodorb.json
9e377ab2c131993f96ab6fb544bda4dbba0ab87e assets/bloodmagic/models/item/masterritualstone.json
@ -322,6 +326,7 @@ fe2b201007c974229509f6900c6eb8b03d158b0a assets/bloodmagic/models/item/soulsword
29009ca92dc30e1ec4ae1d454cd3f8726d8edc3c assets/bloodmagic/models/item/stonebrickpath.json
2dc28b0e2b7ae7bb0bcf8c8e74b9ba7c800446ff assets/bloodmagic/models/item/stonetilepath.json
26cb0aae63ea4f27efd5337c90c580ddd7481b99 assets/bloodmagic/models/item/sulfur.json
1e735651ebcc0087d38dfce304e5d722d219870e assets/bloodmagic/models/item/upgradetome.json
e8fe01c5cddc268538681889f3161472a8f1c8ad assets/bloodmagic/models/item/variants/growthsigil_activated.json
20c802279de4df496057795c2e891fa54a21376f assets/bloodmagic/models/item/variants/growthsigil_deactivated.json
2778ea3a62ce6dd718a557beee7b5329bb185ff9 assets/bloodmagic/models/item/variants/icesigil_activated.json

View file

@ -60,6 +60,7 @@
"block.bloodmagic.wornstonebrickpath": "Worn Stone Path",
"block.bloodmagic.wornstonetilepath": "Tiled Worn Stone Path",
"chat.bloodmagic.damageSource": "%s's soul became too weak",
"chat.bloodmagic.living_upgrade_level_increase": "%s has leveled up to %d",
"chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!",
"chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...",
"chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!",
@ -112,6 +113,10 @@
"item.bloodmagic.lavacrystal": "Lava Crystal",
"item.bloodmagic.lavasigil": "Lava Sigil",
"item.bloodmagic.life_essence_bucket": "Bucket of Life",
"item.bloodmagic.livingboots": "Living Boots",
"item.bloodmagic.livinghelmet": "Living Helmet",
"item.bloodmagic.livingleggings": "Living Leggings",
"item.bloodmagic.livingplate": "Living Chestplate",
"item.bloodmagic.magicianbloodorb": "Magician Blood Orb",
"item.bloodmagic.masterbloodorb": "Master Blood Orb",
"item.bloodmagic.miningsigil": "Sigil of the Fast Miner",
@ -150,6 +155,7 @@
"item.bloodmagic.soulsword": "Sentient Sword",
"item.bloodmagic.steadfastcrystal": "Steadfast Will Crystal",
"item.bloodmagic.sulfur": "Sulfur",
"item.bloodmagic.upgradetome": "Living Armour Upgrade Tome",
"item.bloodmagic.vengefulcrystal": "Vengeful Will Crystal",
"item.bloodmagic.voidsigil": "Void Sigil",
"item.bloodmagic.waterscribetool": "Inscription Tool: Water",
@ -170,6 +176,41 @@
"jei.bloodmagic.recipe.requiredtier": "Tier: %d",
"jei.bloodmagic.recipe.soulforge": "Hellfire Forge",
"jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will",
"living_upgrade.bloodmagic.arrowShot": "Trick Shot",
"living_upgrade.bloodmagic.arrow_protect": "Pin Cushion",
"living_upgrade.bloodmagic.battleHunger": "Battle Hungry",
"living_upgrade.bloodmagic.crippledArm": "Crippled Arm",
"living_upgrade.bloodmagic.criticalStrike": "True Strike",
"living_upgrade.bloodmagic.digSlowdown": "Weakened Pick",
"living_upgrade.bloodmagic.digging": "Dwarven Might",
"living_upgrade.bloodmagic.disoriented": "Disoriented",
"living_upgrade.bloodmagic.elytra": "Elytra",
"living_upgrade.bloodmagic.experienced": "Experienced",
"living_upgrade.bloodmagic.fallProtect": "Soft Fall",
"living_upgrade.bloodmagic.fireResist": "Gift of Ignis",
"living_upgrade.bloodmagic.graveDigger": "Grave Digger",
"living_upgrade.bloodmagic.grimReaper": "Grim Reaper's Sprint",
"living_upgrade.bloodmagic.health": "Healthy",
"living_upgrade.bloodmagic.jump": "Strong Legs",
"living_upgrade.bloodmagic.knockback": "Body Builder",
"living_upgrade.bloodmagic.meleeDamage": "Fierce Strike",
"living_upgrade.bloodmagic.meleeDecrease": "Dulled Blade",
"living_upgrade.bloodmagic.nightSight": "Nocturnal Prowess",
"living_upgrade.bloodmagic.physicalProtect": "Tough",
"living_upgrade.bloodmagic.poisonResist": "Poison Resistance",
"living_upgrade.bloodmagic.quenched": "Quenched",
"living_upgrade.bloodmagic.repair": "Repairing",
"living_upgrade.bloodmagic.revealing": "Revealing",
"living_upgrade.bloodmagic.self_sacrifice": "Tough Palms",
"living_upgrade.bloodmagic.slippery": "Loose Traction",
"living_upgrade.bloodmagic.slowHeal": "Diseased",
"living_upgrade.bloodmagic.slowness": "Limp Leg",
"living_upgrade.bloodmagic.solarPowered": "Solar Powered",
"living_upgrade.bloodmagic.speed": "Quick Feet",
"living_upgrade.bloodmagic.sprint_attack": "Charging Strike",
"living_upgrade.bloodmagic.stepAssist": "Step Assist",
"living_upgrade.bloodmagic.stormTrooper": "Storm Trooper",
"living_upgrade.bloodmagic.thaumRunicShielding": "Runic Shielding",
"ritual.bloodmagic.altarBuilderRitual": "The Assembly of the High Altar",
"ritual.bloodmagic.altarBuilderRitual.info": "Builds an altar out of the components inside of the connected inventory.",
"ritual.bloodmagic.animalGrowthRitual": "Ritual of the Shepherd",
@ -203,8 +244,10 @@
"ritual.bloodmagic.crushingRitual.info": "Breaks blocks within its crushing range and places the items into the linked chest.",
"ritual.bloodmagic.crushingRitual.steadfast.info": "(Steadfast) Causes all blocks that are broken to be picked up with silk touch. Overrides Fortune where applicable.",
"ritual.bloodmagic.crushingRitual.vengeful.info": "(Vengeful) Compresses the inventory on successful operation. Currently only does one compression per operation.",
"ritual.bloodmagic.crystalHarvestRitual": "Crack of the Fractured Crystal",
"ritual.bloodmagic.crystalHarvestRitual.crystal.info": "(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it.",
"ritual.bloodmagic.crystalHarvestRitual.info": "Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals.",
"ritual.bloodmagic.crystalSplitRitual": "Resonance of the Faceted Crystal",
"ritual.bloodmagic.crystalSplitRitual.info": "Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters.",
"ritual.bloodmagic.ellipseRitual.chest.info": "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world.",
"ritual.bloodmagic.ellipseRitual.info": "Creates a hollow spheroid around the ritual using the blocks in the attached chest.",
@ -226,6 +269,7 @@
"ritual.bloodmagic.fellingRitual.chest.info": "(Chest) The location of the inventory that the ritual will place the results into.",
"ritual.bloodmagic.fellingRitual.fellingRange.info": "(Cutting) The range that the ritual will search out logs and leaves in order to cut down.",
"ritual.bloodmagic.fellingRitual.info": "A standard tree-cutting machine, this ritual will cut down all trees and leaves within its area and collect the drops.",
"ritual.bloodmagic.forsakenSoulRitual": "Gathering of the Forsaken Souls",
"ritual.bloodmagic.forsakenSoulRitual.crystal.info": "(Crystal) Demon Crystals in this range receive an increase in growth speed when a mob is killed by the ritual.",
"ritual.bloodmagic.forsakenSoulRitual.damage.info": "(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals.",
"ritual.bloodmagic.forsakenSoulRitual.info": "Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown.",
@ -360,6 +404,10 @@
"tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-",
"tooltip.bloodmagic.holdShiftForInfo": "Press shift for extra info",
"tooltip.bloodmagic.inscriber.desc": "The writing is on the wall...",
"tooltip.bloodmagic.livingarmour.extraExtraInfo": "&9-Hold shift + M for progress info-",
"tooltip.bloodmagic.livingarmour.upgrade.level": "%s (Level %d)",
"tooltip.bloodmagic.livingarmour.upgrade.points": "Upgrade points: %s / %s",
"tooltip.bloodmagic.livingarmour.upgrade.progress": "%s (%d/100)",
"tooltip.bloodmagic.orb.desc": "Stores raw Life Essence",
"tooltip.bloodmagic.orb.owner": "Added by: %s",
"tooltip.bloodmagic.ritualReader.currentState": "Current mode: %s",

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "bloodmagic:item/livingboots"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "bloodmagic:item/livinghelmet"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "bloodmagic:item/livingleggings"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "bloodmagic:item/livingplate"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "bloodmagic:item/upgradetome"
}
}