diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index 9204657..c918c6d 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -90,7 +90,7 @@ public class TAIGA { integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2); integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4); integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4); - integrateMaterial("Karmesine", karmesine, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); + integrateMaterial("Terrax", terrax, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3); integrateMaterial("Uru", uru, uruFluid, 877, 2f, 7.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6); integrateMaterial("Eezo", eezo, eezoFluid, 50, 23f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false); @@ -121,6 +121,9 @@ public class TAIGA { integrateOre("Osram", osramFluid); integrateOre("Abyssum", abyssumFluid); integrateOre("Iox", ioxFluid); + integrateOre("Karmesine", karmesineFluid); + integrateOre("Ovium", oviumFluid); + integrateOre("Jauxum", jauxumFluid); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java index 57653a7..5f0538a 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -19,7 +19,7 @@ import slimeknights.tconstruct.library.utils.TinkerUtil; public class TraitSoulEater extends AbstractTrait { - private static float divisor = 20000f; + private static float divisor = 25000f; public TraitSoulEater() { super(TraitSoulEater.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java index 829c73f..995582b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -35,7 +35,6 @@ public class TraitWhirl extends AbstractTrait { if (entity instanceof FakePlayer || entity.worldObj.isRemote) { return; } - if (entity.ticksExisted % TICK_PER_STAT > 0) { return; } diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index b96f169..00b4c2b 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -75,6 +75,8 @@ tile.meteorite_block.name=Meteorite Block tile.obsidiorite_block.name=Obsidiorite Block tile.magma_block.name=Magma Block tile.nitronite_block.name=Nitronite Block +tile.meteoritecobble_block.name=Meteorite Cobble Block +tile.obsidioritecobble_block.name=Meteorite Cobble Block tile.basalt_ore.name=Basalt Erz tile.tiberium_ore.name=Tiberium Erz @@ -123,9 +125,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget -tile.jauxum_nugget.name=Jauxum Nugget -tile.ovium_nugget.name=Ovium Nugget -tile.terrax_nugget.name=Terrax Nugget +item.jauxum_nugget.name=Jauxum Nugget +item.ovium_nugget.name=Ovium Nugget +item.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -153,6 +155,8 @@ item.meteorite_nugget.name=Meteorite Nugget item.obsidiorite_nugget.name=Obsidiorite Nugget item.magma_nugget.name=Magma Nugget item.nitronite_nugget.name=Nitronite Nugget +item.iron_nugget.name=Iron Nugget + item.basalt_dust.name=Basalt Staub item.tiberium_dust.name=Tiberium Staub @@ -162,9 +166,9 @@ item.duranite_dust.name=Duranite Staub item.valyrium_dust.name=Valyrium Staub item.vibranium_dust.name=Vibranium Staub item.karmesine_dust.name=Karmesine Staub -tile.jauxum_dust.name=Jauxum Staub -tile.ovium_dust.name=Ovium Staub -tile.terrax_dust.name=Terrax Staub +item.jauxum_dust.name=Jauxum Staub +item.ovium_dust.name=Ovium Staub +item.terrax_dust.name=Terrax Staub item.palladium_dust.name=Palladium Staub item.uru_dust.name=Uru Staub item.osram_dust.name=Osram Staub @@ -201,9 +205,9 @@ item.duranite_ingot.name=Duranite Barren item.valyrium_ingot.name=Valyrium Barren item.vibranium_ingot.name=Vibranium Barren item.karmesine_ingot.name=Karmesine Barren -tile.jauxum_ingot.name=Jauxum Barren -tile.ovium_ingot.name=Ovium Barren -tile.terrax_ingot.name=Terrax Barren +item.jauxum_ingot.name=Jauxum Barren +item.ovium_ingot.name=Ovium Barren +item.terrax_ingot.name=Terrax Barren item.palladium_ingot.name=Palladium Barren item.uru_ingot.name=Uru Barren item.osram_ingot.name=Osram Barren diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 75cc117..5c1eba5 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -35,7 +35,7 @@ material.iox.name=Iox material.meteorite.name=Meteorite material.obsidiorite.name=Obsidiorite material.magma.name=Magma -material.nitronite.name=Nitronite +material.nitronite.name=Nitronit tile.basalt_block.name=Basalt Block tile.tiberium_block.name=Tiberium Block @@ -75,6 +75,9 @@ tile.meteorite_block.name=Meteorite Block tile.obsidiorite_block.name=Obsidiorite Block tile.magma_block.name=Magma Block tile.nitronite_block.name=Nitronite Block +tile.meteoritecobble_block.name=Meteorite Cobble Block +tile.obsidioritecobble_block.name=Meteorite Cobble Block + tile.basalt_ore.name=Basalt Ore tile.tiberium_ore.name=Tiberium Ore @@ -115,6 +118,7 @@ tile.obsidiorite_ore.name=Obsidiorite Ore tile.magma_ore.name=Magma Ore tile.nitronite_ore.name=Nitronite Ore + item.basalt_nugget.name=Basalt Nugget item.tiberium_nugget.name=Tiberium Nugget item.aurorium_nugget.name=Aurorium Nugget @@ -123,9 +127,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget -tile.jauxum_nugget.name=Jauxum Nugget -tile.ovium_nugget.name=Ovium Nugget -tile.terrax_nugget.name=Terrax Nugget +item.jauxum_nugget.name=Jauxum Nugget +item.ovium_nugget.name=Ovium Nugget +item.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -153,6 +157,8 @@ item.meteorite_nugget.name=Meteorite Nugget item.obsidiorite_nugget.name=Obsidiorite Nugget item.magma_nugget.name=Magma Nugget item.nitronite_nugget.name=Nitronite Nugget +item.iron_nugget.name=Iron Nugget + item.basalt_dust.name=Basalt Dust item.tiberium_dust.name=Tiberium Dust @@ -162,9 +168,9 @@ item.duranite_dust.name=Duranite Dust item.valyrium_dust.name=Valyrium Dust item.vibranium_dust.name=Vibranium Dust item.karmesine_dust.name=Karmesine Dust -tile.jauxum_dust.name=Jauxum Dust -tile.ovium_dust.name=Ovium Dust -tile.terrax_dust.name=Terrax Dust +item.jauxum_dust.name=Jauxum Dust +item.ovium_dust.name=Ovium Dust +item.terrax_dust.name=Terrax Dust item.palladium_dust.name=Palladium Dust item.uru_dust.name=Uru Dust item.osram_dust.name=Osram Dust @@ -201,9 +207,9 @@ item.duranite_ingot.name=Duranite Ingot item.valyrium_ingot.name=Valyrium Ingot item.vibranium_ingot.name=Vibranium Ingot item.karmesine_ingot.name=Karmesine Ingot -tile.jauxum_ingot.name=Jauxum Ingot -tile.ovium_ingot.name=Ovium Ingot -tile.terrax_ingot.name=Terrax Ingot +item.jauxum_ingot.name=Jauxum Ingot +item.ovium_ingot.name=Ovium Ingot +item.terrax_ingot.name=Terrax Ingot item.palladium_ingot.name=Palladium Ingot item.uru_ingot.name=Uru Ingot item.osram_ingot.name=Osram Ingot @@ -271,60 +277,75 @@ fluid.tconstruct.obsidiorite_fluid.name=Obsidiorite Fluid fluid.tconstruct.magma_fluid.name=Magma Fluid fluid.tconstruct.nitronite_fluid.name=Nitronite Fluid + +modifier.catcher.name=Catcher +modifier.catcher.desc=§oGotta catch 'em all!§r\nRandomly catch Mobs and stores it... and release it! modifier.analysing.name=Analysing -modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot. +modifier.analysing.desc=§oI know what you are!§r\nLess drops but more experience! +modifier.congenial.name=Congenial +modifier.congenial.desc=§oYou are my rival!§r\nAlready known enemies take more damage. modifier.arcane.name=Arcane -modifier.arcane.desc=§oIt's dark outside, let's go mining!§r\Nighttime is good for tool health. -modifier.organizing.name=Organizing -modifier.organizing.desc=§oNow you are tree!§r\Possibly creates wood. +modifier.arcane.desc=§oLet's go out! It's dark!§r\nNighttime is good for the tool health. modifier.blind.name=Blind -modifier.blind.desc=§oIt's a dark night, I can't even see!§r\Darkness brings weakness or more darkness. +modifier.blind.desc=§oIt's a dark night, I can't even see!§r\nDarkness brings weakness and also more darkness. modifier.bright.name=Bright -modifier.bright.desc=§oIt's a bright day, I feel strong!§r\Daytime let you glow. +modifier.bright.desc=§oIt's a bright day, I feel strong!§r\nDaytime let you glow. modifier.cascade.name=Cascade -modifier.cascade.desc=§oThis tool is vibrating!§r\Breaks blocks like an earthquake. +modifier.cascade.desc=§oThrough the walls!§r\nBreaks blocks like an wandering earthquake. modifier.curvature.name=Curvature -modifier.curvature.desc=§oIt pulls me back and forth!§r\Sometimes it teleports you or your surroundings. +modifier.curvature.desc=§oIt pulls me!§r\nSometimes it teleports you or your surroundings. modifier.dark.name=Dark -modifier.dark.desc=§oIt's dark outside, let's fight!§r\Nighttime makes you stronger. +modifier.dark.desc=§oIt's dark outside, let's fight!§r\nNighttime makes you stronger. modifier.diffuse.name=Diffuse -modifier.diffuse.desc=§oSo much EXP... or nothing?§r\Regular blocks drop exp, but loot is probably gone. +modifier.diffuse.desc=§oThere is much to learn!§r\nRegular blocks drop exp, but loot is probably gone. modifier.dissolving.name=Dissolving -modifier.dissolving.desc=§oI don't care about missing Experience.§r\Switching amount of experience. +modifier.dissolving.desc=§oThis seems a lot.§r\nSometimes there is no experience and then a huge amount. modifier.fracture.name=Fracture -modifier.fracture.desc=§oYou gonna dig deep!§r\Do you have a drill or something? +modifier.fracture.desc=§oRupture!§r\nBreaks blocks in a straight line. modifier.fragile.name=Fragile -modifier.fragile.desc=§oKind of earthquake.§r\Blocks are getting weak and your tool drops health. +modifier.fragile.desc=§oEarthquake§r\nBlocks are getting cracked and your tool health drops. modifier.garishly.name=Garishly -modifier.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff. +modifier.garishly.desc=§oIt's so hot.§r\nThey actually drop fiery stuff. modifier.glimmer.name=Glimmer -modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision. -modifier.haunted.name=Haunted -modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\This is mad cow desease. +modifier.glimmer.desc=§oNo darkness for me!§r\nSometimes you get night vision. modifier.heroic.name=Heroic -modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger. +modifier.heroic.desc=§oUntil you'll die.§r\nWhen the end is near, you grow stronger. modifier.hollow.name=Hollow -modifier.hollow.desc=§oBraindead!§r\Brain smash! +modifier.hollow.desc=§oBraindead!§r\nMakes your enemies brainless. modifier.instable.name=Unstable -modifier.instable.desc=§oWhat the heck?§r\Seriously, this is unstable! +modifier.instable.desc=§oCan you feel this?§r\nSeriously, this ist completely unstable! Expect explosions! modifier.naturebound.name=Naturebound -modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature. +modifier.naturebound.desc=§oYou are one with your surrounding!§r\nRepairs the tool on several blocks. modifier.pulverizing.name=Pulverizing -modifier.pulverizing.desc=§oHulk... Smash!§r\Destroy the stuff you mine. -modifier.randomize.name=Randomize -modifier.randomize.desc=§oWho are you?§r\Randomizes entities and vanilla metal-ores. +modifier.pulverizing.desc=§oSmash it!§r\nDestroy a lot of your drops. modifier.resonance.name=Resonance -modifier.resonance.desc=§oVibranium!!! Baaaam!§r\Take that smash! +modifier.resonance.desc=§oFeel the vibrations!§r\Enemies propably fly away after a hit! modifier.slaughtering.name=Slaughtering -modifier.slaughtering.desc=§oYum yum!§r\Who needs EXP if you can have meat? +modifier.slaughtering.desc=§oYum yum!§r\nWho needs EXP if you can have a lot more meat? modifier.softy.name=Softy -modifier.softy.desc=§oI love dirt!§r\Dirt heals! +modifier.softy.desc=§oI love dirt!§r\nDirt digging heals! modifier.uncertain.name=Uncertain -modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not unstable...or? +modifier.uncertain.desc=§oSome kind of risky to use.§r\nAt least it's not unstable...or? modifier.reviving.name=Reviving -modifier.reviving.desc=§oPlease kill it already!§r\Zombies!? +modifier.reviving.desc=§oPlease kill it already!§r\nThey revive like zombies! modifier.melting.name=Melting -modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn! +modifier.melting.desc=§oSo damn hot!§r\nMelts down blocks to lava! +modifier.cursed.name=Cursed +modifier.cursed.desc=§oI don't feel well!§r\nThe more enemies killed, the more there is a chance for random pain. +modifier.superheavy.name=Super Heavy +modifier.superheavy.desc=§oIt weights over 9000!§r\nAs you dig a lot, it will make you tired. +modifier.whirl.name=Whirl +modifier.whirl.desc=§oLike a sponge!§r\nRemove water at a gained radius. +modifier.souleater.name=Soul Eater +modifier.souleater.desc=§oKill a lot, be a veteran§r\nIf you kill a lot of enemies, your weapon will get stronger. +modifier.beserk.name=BESERK +modifier.beserk.desc=§oBecome the Hulk!§r\nActivate the life consumption and be three times faster and stronger. +modifier.tantrum.name=Tantrum +modifier.tantrum.desc=§oCast an explosion!§r\nIf you activate the stacked explosion you won't get hurt. +modifier.decay.name=Decay +modifier.decay.desc=§oRadioactive!§r\nYour tool is fading away over time. +modifier.ported.name=Ported +modifier.ported.desc=§oBeam me up!§r\nTry to escape out of a cave with right clicks. Needs several tries. gui.taiga_configuration.mainTitle=TAIGA Configuration itemGroup.taiga_block=TAIGA Blocks