Merge remote-tracking branch 'WanderingHero/master' into dev

This commit is contained in:
Martin Robertz committed 2025-12-23 19:51:53 +01:00
commit afd2d9802d
2 files changed
+41 -14

No files matched your search

+33 -14
View File
@@ -147,10 +147,20 @@ 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(60) == 0) {
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));
@@ -168,19 +178,23 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
+ "increase, and strange things will start happening."));
}
// First effect should become active after ~1 Minute
if (corruption > 60 && corruption < 300 && random.nextInt(100) == 0) {
if (corruption > 60 && corruption < 400 && random.nextInt(100) == 0) {
((EntityPlayer) player)
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "The Ring somehow feels heavy"));
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(75) == 0) {
if (corruption > 30 && random.nextInt(80) == 0) {
((EntityPlayer) player)
.addChatMessage(new ChatComponentText(EMTTextHelper.PURPLE + "The Ring falters"));
player.removePotionEffect(14);
player.removePotionEffect(11);
player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 800, 2, false));
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)
@@ -191,13 +205,13 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
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, 800, 4, false));
player.addPotionEffect(new PotionEffect(Potion.weakness.id, 800, 4, false));
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 >= 1500 && random.nextInt(800) == 0) {
} else if (corruption >= 1000 && random.nextInt(500) == 0) {
player.removePotionEffect(11);
player.addPotionEffect(new PotionEffect(Potion.wither.id, 100, 4, false));
}
@@ -208,15 +222,17 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
((EntityPlayer) player).addChatMessage(
new ChatComponentText(EMTTextHelper.PURPLE + "The Ring suddenly starts to glow purple"));
}
if (random.nextInt(150) == 0) { // randomly every 2.5 minutes
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 30, true); // adds 30 temp 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 >= 180) { // if you wear it for 3 minutes
if (random.nextInt(100) == 0) {
ThaumcraftApiHelper.addWarpToPlayer((EntityPlayer) player, 30 + random.nextInt(70), true); // adds
// 30-100
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
@@ -252,7 +268,10 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun
public void onUnequipped(ItemStack stack, EntityLivingBase player) {
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));
}
}
}