From 977ae218ea36dc47a4807235072bae721ed922b2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 11 Nov 2015 00:22:12 +0000 Subject: [PATCH] The Solegnolia now negates any rings worn by players inside it. --- .../common/item/equipment/bauble/ItemMagnetRing.java | 6 ++++++ src/main/resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 8c41703fc..aa392fbca 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -92,6 +92,12 @@ public class ItemMagnetRing extends ItemBauble { int cooldown = getCooldown(stack); + if(SubTileSolegnolia.hasSolegnoliaAround(player)) { + if(cooldown < 0) + setCooldown(stack, 2); + return; + } + if(cooldown <= 0) { if(!player.isSneaking()) { double x = player.posX; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index eddcded12..781949100 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2436,7 +2436,7 @@ botania.page.bubbell1=&oLike some casual game&r. # -- SOLEGNOLIA botania.entry.solegnolia=Solegnolia botania.tagline.solegnolia=Creates spaces where the Ring of Magnetization doesn't work -botania.page.solegnolia0=The &1Ring of Magnetization&0 is a rather handy tool for anyone digging or collecting. It does, however, fall into the problem that it picks up unwanted items near complex systems.
The &1Solegnolia&0 disrupts the ring and prevents any items around it from being pulled towards a wearer of one. It uses up a small bit of &4Mana&0 for this, but nothing considerate. +botania.page.solegnolia0=The &1Ring of Magnetization&0 is a rather handy tool for anyone digging or collecting. It does, however, fall into the problem that it picks up unwanted items near complex systems. The &1Solegnolia&0 disrupts the ring and prevents any items around it from being pulled towards a wearer of one, and any rings whose wearers stand inside the radius from picking items up. It uses up a small bit of &4Mana&0 for this, but nothing considerate. botania.page.solegnolia1=On/Off # - GENERATING FLOWERS