From 37e437955e50e6f1075005c5b79bce9b34bc83d8 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 25 Dec 2015 19:46:17 +0000 Subject: [PATCH] The Solegnolia no longer uses mana. --- .../common/block/subtile/functional/SubTileSolegnolia.java | 7 ++----- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 3edb7787e..9ad426e52 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -38,9 +38,6 @@ public class SubTileSolegnolia extends SubTileFunctional { if(!registered) registered = true; } - - if(ticksExisted % 10 == 0 && mana > 0 && redstoneSignal == 0) - mana--; } @Override @@ -50,7 +47,7 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { for(SubTileSolegnolia flower : existingFlowers) { - if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) + if(flower.redstoneSignal > 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) continue; double range = flower.getRange(); @@ -63,7 +60,7 @@ public class SubTileSolegnolia extends SubTileFunctional { @Override public int getMaxMana() { - return 20; + return 1; } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 639c1d075..bed17b7e8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2479,7 +2479,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, 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.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 does not require &4Mana&0. botania.page.solegnolia1=On/Off # - GENERATING FLOWERS