From 06645579723c2d76eafb25fc60a2444c3461fbba Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 21 Sep 2015 16:44:57 +0100 Subject: [PATCH] Removed passive wither config and locked it to 48000 ticks (2 ingame days). Also added an entry to the Generating Flora section to explain it better. --- .../vazkii/botania/client/gui/lexicon/GuiLexicon.java | 1 + .../botania/common/core/handler/ConfigHandler.java | 6 ++---- .../vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ .../java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 11 ++++++++--- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 3f5b2eac4..e95a2f459 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -490,6 +490,7 @@ public class GuiLexicon extends GuiScreen { tutorial.add(LexiconData.pool); tutorial.add(LexiconData.spreader); tutorial.add(LexiconData.generatingIntro); + tutorial.add(LexiconData.passiveGen); tutorial.add(LexiconData.daybloom); tutorial.add(LexiconData.endoflame); tutorial.add(LexiconData.openCrate); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 44c1829ae..c6e1623fd 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -28,6 +28,8 @@ public final class ConfigHandler { private static final String CATEGORY_POTIONS = "potions"; + public static final int hardcorePassiveGeneration = 48000; + public static boolean useShaders = true; public static boolean lexiconRotatingItems = true; public static boolean lexiconJustifiedText = false; @@ -54,7 +56,6 @@ public final class ConfigHandler { public static int spreaderPositionShift = 1; public static boolean flowerForceCheck = true; public static boolean enderPickpocketEnabled = true; - public static int hardcorePassiveGeneration = 48000; public static boolean fallenKanadeEnabled = true; public static boolean darkQuartzEnabled = true; @@ -166,9 +167,6 @@ public final class ConfigHandler { desc = "Set to false to disable the ability for the Hand of Ender to pickpocket other players' ender chests."; enderPickpocketEnabled = loadPropBool("enderPickpocket.enabled", desc, enderPickpocketEnabled); - desc = "Set to anything other than -1 for passive generation flowers (dayblooms, nightshades, hydroangeas) to die after a specific amount of ticks. 48000 is 2 Minecraft days, that's a recomended value."; - hardcorePassiveGeneration = loadPropInt("passiveWither.time", desc, hardcorePassiveGeneration); - desc = "Set this to false to disable the Fallen Kanade flower (gives Regeneration). This config option is here for those using Blood Magic. Note: Turning this off will not remove ones already in the world, it'll simply prevent the crafting."; fallenKanadeEnabled = loadPropBool("fallenKanade.enabled", desc, fallenKanadeEnabled); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index c7562b381..99481b0fd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -124,6 +124,7 @@ public final class LexiconData { public static LexiconEntry solegnolia; public static LexiconEntry generatingIntro; + public static LexiconEntry passiveGen; public static LexiconEntry daybloom; public static LexiconEntry nightshade; public static LexiconEntry endoflame; @@ -529,6 +530,9 @@ public final class LexiconData { generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); + passiveGen = new BLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers); + passiveGen.setPriority().setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(Blocks.deadbush)); + daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "1a" : "1"), new PageImage("3", LibResources.ENTRY_DIMINISHING_RETURNS), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe), new PageText("4"), new PageText("5")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 3cf605a43..4247e3c6e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -92,6 +92,7 @@ public final class LibLexicon { public static final String FFLOWER_SOLEGNOLIA = "solegnolia"; public static final String GFLOWER_INTRO = "gIntro"; + public static final String GFLOWER_PASSIVE_GENERATION = "passiveGen"; public static final String GFLOWER_DAYBLOOM = "daybloom"; public static final String GFLOWER_NIGHTSHADE = "nightshade"; public static final String GFLOWER_ENDOFLAME = "endoflame"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index f6210db28..4a118dde6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2332,11 +2332,16 @@ botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
This mana will be stored in the closest &1Mana Spreader&0 around. botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other. It can be bound to another spreader with a wand in &4Bind Mode&0. +# -- CAVEATS OF PASSIVE GENERATION +botania.entry.passiveGen=Caveats of Passive Generation +botania.page.passiveGen0=The spectrum of &4Generating Flowers&0 can be arranged in two groups, &4Passive&0 and &4Active&0.
&4Passive Flowers&0 are those that simply create &4Mana&0 using a completely free resource, such as the sun, or water. &4Active Flowers&0 require some sort of resource to transform into &4Mana&0, be it renewable or not. +botania.page.passiveGen1=At the start of a botanist's career, only very basic and rudimentary &4Passive Flowers&0 are available, such as the &1Daybloom&0 or &1Nightshade&0.
These flowers are required to advance on to more potent and effective &4Active Flowers&0, but they should not be relied upon aside from being a stepping stone, as all &4Passive Flowers&0 will decay into a &1Dead Bush&0 after two days of work. + # -- DAYBLOOM botania.entry.daybloom=Daybloom botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it performs a modified photosynthesis process, in order to transform sunlight into &4Mana&0.
The process is rather slow, about ten or a dozen of these should get the job done, for now. botania.page.daybloom1=These flowers tend to compete among themselves for what sunlight hits an area, thus having any other of the same type adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This fact only applies to &1Dayblooms&0 and &1Nightshades&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. -botania.page.daybloom1a=Having any other &1Dayblooms&0 adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This only applies to &1Dayblooms&0 and &1Nightshades&0.
&1Dayblooms&0 are not very resistant, and after some time they'll wither and die off. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. +botania.page.daybloom1a=Having any other &1Dayblooms&0 adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This only applies to &1Dayblooms&0 and &1Nightshades&0.
&1Dayblooms&0 are classified as &4passive flowers&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. botania.page.daybloom3=Diminishing Returns botania.page.daybloom2=&oStarting up a brand new day&r. botania.page.daybloom4=&oHow many of you people out there been hurt in some kind of love affair? And how many times do you swear that you'll never love again? How many lonely, sleepless nights? How many lies? How many fights? And why would you want to put yourself through all that again? "Love is pain," I hear you say. Love has a cruel and bitter way of paying you back for all the faith you ever had in your brain. (...) @@ -2345,7 +2350,7 @@ botania.page.daybloom5=&oHow could it be that what you need the most can leave y # -- NIGHTSHADE botania.entry.nightshade=Nightshade botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime
Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent. -botania.page.nightshade0a=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime.
Alike its shining counterpart, they suffer diminishing returns from having any adjacent and are not very resistant, after some time they'll wither and die off. +botania.page.nightshade0a=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime.
Alike its shining counterpart, they suffer diminishing returns from having any adjacent and are classified as &4passive flowers&0. botania.page.nightshade1=&oThe shadow of the day&r. # -- ENDOFLAME @@ -2357,7 +2362,7 @@ botania.page.endoflame2=&oNot nitor&r. # -- HYDROANGEAS botania.entry.hydroangeas=Hydroangeas botania.page.hydroangeas0=While passive &4Mana&0 generation can be easily achieved through &1Dayblooms&0, different means of doing so might come in handy. The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought? -botania.page.hydroangeas0a=The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought?
Similarly to the &1Daybloom&0, these flowers are not very resistant, and after some time they'll wither and die off. +botania.page.hydroangeas0a=The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought?
&1Hydroangeas&0 are classified as &4passive flowers&0. botania.page.hydroangeas2=A simple &1Hydroangeas&0 system botania.page.hydroangeas3=These flowers, similarly to &1Dayblooms&0 or &1Nightshades&0 will receive a portion of diminishing returns if put in too compact of a pattern. Having any two &1Hydroangeas&0 one block away from eachother, including diagonals, will drastically reduce the production rate of both, as the roots get tangled. Having even more in the short space will further weaken their potency. The blue particles between them indicate this. botania.page.hydroangeas1=&oFrom some Hyperdimension&r?