mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-20 03:59:36 +00:00
Rework The One Ring (#110)
Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
1 parent
eab5ce16af
commit
572b1eff97
3 files changed
+75
-58
No files matched your search
@@ -124,10 +124,6 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, EntityLivingBase player) {
|
||||
if (!player.isInvisible()) {
|
||||
player.setInvisible(true);
|
||||
((EntityPlayer) player).capabilities.disableDamage = true;
|
||||
}
|
||||
|
||||
// Stop doing this 20 times per second...
|
||||
if (random.nextInt(20) > 0) return;
|
||||
@@ -151,11 +147,27 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
if (!player.worldObj.isRemote) {
|
||||
// EMT.LOGGER.info( String.format( "Total Corruption: %d ItemWarpLevel: %d", corruption, getItemWarpLevel(
|
||||
// stack, false ) ));
|
||||
|
||||
if (random.nextInt(55) == 0) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 2000, 4, false));
|
||||
player.addPotionEffect(new PotionEffect(Potion.resistance.id, 2000, 4, false));
|
||||
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 2000, 0, false));
|
||||
if (corruption > 3000) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 2000, 1, false));
|
||||
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 2000, 1, false));
|
||||
}
|
||||
if (corruption > 1000) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2000, 1, false));
|
||||
}
|
||||
if (corruption > 6000) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2000, 1, false));
|
||||
}
|
||||
}
|
||||
if (corruption == 0) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 2000, 4, false));
|
||||
player.addPotionEffect(new PotionEffect(Potion.resistance.id, 2000, 4, false));
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(
|
||||
EMTTextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever "
|
||||
EMTTextHelper.PURPLE + "You have worn the Ring. Your soul has now been temporarily "
|
||||
+ EMTTextHelper.PURPLE
|
||||
+ "tainted. "
|
||||
+ EMTTextHelper.RED
|
||||
@@ -165,48 +177,62 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
+ EMTTextHelper.ITALIC
|
||||
+ "increase, and strange things will start happening."));
|
||||
}
|
||||
// First effect should become active after ~5 Minutes
|
||||
else if (corruption > 300 && corruption < 1400 && random.nextInt(100) == 0) {
|
||||
// First effect should become active after ~1 Minute
|
||||
if (corruption > 60 && corruption < 400 && random.nextInt(100) == 0) {
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "The Ring somehow feels heavy"));
|
||||
if (random.nextBoolean()) player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 2, false));
|
||||
else player.addPotionEffect(new PotionEffect(Potion.confusion.id, 500, 2, false));
|
||||
} else if (corruption >= 1400 && corruption < 3800 && random.nextInt(100) == 0) {
|
||||
((EntityPlayer) player).capabilities.disableDamage = false;
|
||||
player.addPotionEffect(new PotionEffect(Potion.poison.id, 500, 2, false));
|
||||
} else if (corruption >= 3800 && corruption < 6500 && random.nextInt(100) == 0) {
|
||||
((EntityPlayer) player).capabilities.disableDamage = false;
|
||||
player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 200, 3, false));
|
||||
if (random.nextBoolean()) player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 4, false));
|
||||
else player.addPotionEffect(new PotionEffect(Potion.confusion.id, 500, 4, false));
|
||||
}
|
||||
if (corruption > 30 && random.nextInt(80) == 0) {
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "The Ring falters"));
|
||||
player.removePotionEffect(14);
|
||||
player.removePotionEffect(11);
|
||||
player.removePotionEffect(5);
|
||||
player.removePotionEffect(1);
|
||||
player.removePotionEffect(8);
|
||||
player.removePotionEffect(3);
|
||||
player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 400, 3, false));
|
||||
/*
|
||||
* Wtf? Remove ForgeData tag? There are more mods using this tag than just emt! ((EntityPlayer)
|
||||
* player).writeToNBT(tag); tag.removeTag( NBT_TAG_FORGE_DATA ); ((EntityPlayer)
|
||||
* player).readFromNBT(tag);
|
||||
*/
|
||||
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 200, 1, false));
|
||||
}
|
||||
if (corruption >= 150 && corruption < 8000 && random.nextInt(150) == 0) {
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "Your arms feel heavy"));
|
||||
player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 600, 4, false));
|
||||
player.addPotionEffect(new PotionEffect(Potion.weakness.id, 600, 4, false));
|
||||
}
|
||||
if (corruption >= 700 && corruption < 8000 && random.nextInt(150) == 0) {
|
||||
player.removePotionEffect(11);
|
||||
player.motionY += 2d;
|
||||
} else if (corruption >= 6500 && random.nextInt(10000) == 0) {
|
||||
((EntityPlayer) player).capabilities.disableDamage = false;
|
||||
} else if (corruption >= 1000 && random.nextInt(500) == 0) {
|
||||
player.removePotionEffect(11);
|
||||
player.addPotionEffect(new PotionEffect(Potion.wither.id, 100, 4, false));
|
||||
}
|
||||
|
||||
if (corruption >= 300) { // worn more than 5 minutes
|
||||
if (corruption >= 60) { // worn more than 1 minute
|
||||
if (random.nextInt(100) == 0) { // every 100 seconds
|
||||
getItemWarpLevel(stack, true);
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(EMTTextHelper.PURPLE + "The Ring suddenly starts to glow purple"));
|
||||
}
|
||||
if (random.nextInt(300) == 0) { // randomly every 5 minutes
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 1, false); // adds 1 perm warp
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer((EntityPlayer) player, random.nextInt(1)); // adds 0-1
|
||||
// sticky warp
|
||||
if (random.nextInt(300) == 2) { // randomly every 5 minutes
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 15, true); // adds 15 temp warp
|
||||
((EntityPlayer) player).addChatMessage(
|
||||
new ChatComponentText(EMTTextHelper.PURPLE + "Your body suddenly starts to glow purple"));
|
||||
}
|
||||
if (corruption >= 3600) { // if you wear it for more than an hour total
|
||||
if (random.nextInt(300) == 0) {
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 5 + random.nextInt(5), false); // adds
|
||||
// 5-10
|
||||
// perm
|
||||
// warp
|
||||
ThaumcraftApiHelper.addStickyWarpToPlayer((EntityPlayer) player, 5 + random.nextInt(5)); // adds
|
||||
// 5-10
|
||||
// sticky
|
||||
// warp
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 10 + random.nextInt(40), true); // adds
|
||||
// 10-50
|
||||
if (corruption >= 180) { // if you wear it for 3 minutes
|
||||
if (random.nextInt(290) == 1) {
|
||||
((EntityPlayer) player)
|
||||
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "The Ring corrupts"));
|
||||
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 10 + random.nextInt(20), true); // adds
|
||||
// 10-30
|
||||
// temp
|
||||
// warp,
|
||||
// but
|
||||
@@ -240,10 +266,12 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
|
||||
|
||||
@Override
|
||||
public void onUnequipped(ItemStack stack, EntityLivingBase player) {
|
||||
player.setInvisible(false);
|
||||
if (!((EntityPlayer) player).capabilities.isCreativeMode)
|
||||
((EntityPlayer) player).capabilities.disableDamage = false;
|
||||
|
||||
player.removePotionEffect(14);
|
||||
player.removePotionEffect(11);
|
||||
player.removePotionEffect(5);
|
||||
player.removePotionEffect(1);
|
||||
player.removePotionEffect(8);
|
||||
player.removePotionEffect(3);
|
||||
/*
|
||||
* Wtf? Remove ForgeData tag? There are more mods using this tag than just emt! ((EntityPlayer)
|
||||
* player).writeToNBT(tag); tag.removeTag( NBT_TAG_FORGE_DATA ); ((EntityPlayer) player).readFromNBT(tag);
|
||||
|
||||
@@ -17,5 +17,13 @@ public class EMTDungeonChestGenerator {
|
||||
1,
|
||||
EMTConfigHandler.chanceTaintedMjolnir));
|
||||
}
|
||||
if (!EMTConfigHandler.oneRingSpawn) {
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(
|
||||
new WeightedRandomChestContent(
|
||||
new ItemStack(EMTItems.onering),
|
||||
0,
|
||||
1,
|
||||
EMTConfigHandler.chanceOneRing));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,14 @@
|
||||
package emt.util;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.monster.EntityCreeper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingHurtEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
import baubles.api.BaublesApi;
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
@@ -29,7 +25,7 @@ public class EMTEventHandler {
|
||||
|
||||
/**
|
||||
* Intercept the onLivingHurt event so that we can mitigate fall damage with feather wings
|
||||
*
|
||||
*
|
||||
* @param e Entity that is being damaged
|
||||
*/
|
||||
@SubscribeEvent
|
||||
@@ -82,21 +78,6 @@ public class EMTEventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onSetEntityAttack(LivingSetAttackTargetEvent e) {
|
||||
if (e.entityLiving instanceof EntityLiving && e.target instanceof EntityPlayer) {
|
||||
IInventory inventory = BaublesApi.getBaubles((EntityPlayer) e.target);
|
||||
|
||||
for (int i = 0; i < inventory.getSizeInventory(); i++) {
|
||||
ItemStack stack = inventory.getStackInSlot(i);
|
||||
|
||||
if (stack != null && stack.getItem() == EMTItems.onering) {
|
||||
((EntityLiving) e.entityLiving).setAttackTarget(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void createCloud(PlayerInteractEvent e) {
|
||||
if (e.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || e.world.isRemote) {
|
||||
|
||||
Reference in new issue
Block a user