From bedc5e5524400d6f7b25e6eb6bbc51f03b7e42c7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Wed, 28 Jun 2023 02:03:48 -0400 Subject: [PATCH] 0.0.2.6 (#28) * Final Update for this Dev Cycle (#23) * Revert "Merge branch 'master' into main" This reverts commit a1b75550d62f0bf01653ea99bff878c56424458c, reversing changes made to 5685839c2bef8bba2caa6445e2b5e5d37b54facd. * Temp * Failure * Final Bugfix of this stable (hopefully) If I can figure out how to make the goggles unremovable before next RC, I'll push one final one after this. * + Spotless * + Spotless * + Spotless * Updating the BS * Fixed the buildscript again * Update en_US.lang * Ugh, accidently made main again (#24) * Revert "Merge branch 'master' into main" This reverts commit a1b75550d62f0bf01653ea99bff878c56424458c, reversing changes made to 5685839c2bef8bba2caa6445e2b5e5d37b54facd. * Temp * Failure * Final Bugfix of this stable (hopefully) If I can figure out how to make the goggles unremovable before next RC, I'll push one final one after this. * + Spotless * + Spotless * + Spotless * Updating the BS * Fixed the buildscript again * Update en_US.lang * Small little change I didn't notice Just makes the sanitizing soap beta (Alastor's Soap in game) use the perm warp modifier as intended when considering to give the player temp warp instead of using the temp warp modifier. * Update en_US.lang * You're no fun * dep bump * Update dependencies.gradle * update dep +bs + sa * Temp Update to the Goggles * small changes so I can move to pc * it's always spotless in Philadelphia * reducing the price of eggs in china * ugh enum fix * fixing previous mistake (#27) * Make Insurgence's Lore a Little Less Cringe (#30) * fixing previous mistake * Lang update * Fixing the one typo and awkward paragraph (#31) * fixing previous mistake * Lang update * How do I always miss the typos --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Martin Robertz --- .../main/utils/compat/ThaumcraftHelper.java | 6 ++++-- .../assets/thaumicinsurgence/lang/en_US.lang | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/thaumicinsurgence/main/utils/compat/ThaumcraftHelper.java b/src/main/java/thaumicinsurgence/main/utils/compat/ThaumcraftHelper.java index b5bef30..c281284 100644 --- a/src/main/java/thaumicinsurgence/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/thaumicinsurgence/main/utils/compat/ThaumcraftHelper.java @@ -312,6 +312,7 @@ public static void setupResearch() { ResearchItem soapBetaPage; ResearchPage soapBeta1; ResearchPage soapBeta2; + ResearchPage soapBeta3; ResearchItem littleSponge; ResearchPage unintelligbleLaughter; @@ -384,7 +385,8 @@ public static void setupResearch() { soapAlpha1 = new ResearchPage("SoapAlpha.1"); soapAlpha2 = new ResearchPage(soapAlpha); soapBeta1 = new ResearchPage("SoapBeta.1"); - soapBeta2 = new ResearchPage(soapBeta); + soapBeta2 = new ResearchPage("SoapBeta.2"); + soapBeta3 = new ResearchPage(soapBeta); unintelligbleLaughter = new ResearchPage("unintelligbleLaughter"); shootForTheSky = new ResearchPage(bigShot); @@ -401,7 +403,7 @@ public static void setupResearch() { soapAlphaPage.setPages(soapAlpha1, soapAlpha2); soapAlphaPage.setParents("SANESOAP"); - soapBetaPage.setPages(soapBeta1, soapBeta2); + soapBetaPage.setPages(soapBeta1, soapBeta2, soapBeta3); soapBetaPage.setParents("TI_SanitizingSoapAlpha"); littleSponge.setPages(unintelligbleLaughter, shootForTheSky); diff --git a/src/main/resources/assets/thaumicinsurgence/lang/en_US.lang b/src/main/resources/assets/thaumicinsurgence/lang/en_US.lang index 3363433..fcb30d5 100644 --- a/src/main/resources/assets/thaumicinsurgence/lang/en_US.lang +++ b/src/main/resources/assets/thaumicinsurgence/lang/en_US.lang @@ -22,6 +22,9 @@ tc.research_name.TI_ThaumicInterfacer=Madman's Lens tc.research_text.TI_ThaumicInterfacer=Seeing between the cracks InfusionIntercepter.1=Finally, after all of this time...

You finally did it...

After years of hard work and a pact with that damnable [Entity]...

You finally did it...

You infused your very [Soul] into this block...

You don't know why, but you placed it under the central pedestal and attached your tubes to the bottom of this block and by the eldritch it [W0RKED!!]

He said he'd make you a [BIG SHOT], but what happens now? +PreviousIntercepterLore=Do you hate how slow infusion is? Are you sick and tired of the lag associated with WAing it? WELL DO I HAVE THE SOLUTION FOR YOU!!! FOR ONE LOW LOW PAYMENT OF [$4.99 warp] I CAN JAILBREAK YOUR INFUSION MATRIX FOR YOU AND ALLOW IT TO ACCEPT THE ESSENTIA PROVIDER!!! Place the intercepter directly below your infusion altar's center pedestal, it takes essentia from the bottom face. + +item.ItemPactRing.name=Ring of Pacts PreviousIntercepterLore=Do you hate how slow infusion is? Are you sick and tired of the lag associated with WAing it? WELL DO I HAVE THE SOLUTION FOR YOU!!! FOR ONE LOW LOW PAYMENT OF [$4.99 warp] I CAN JAILBREAK YOUR INFUSION MATRIX FOR YOU AND ALLOW IT TO ACCEPT THE ESSENTIA PROVIDER!!! Place the intercepter directly below your infusion altar's center pedestal, it takes essentia from the bottom face. @@ -30,17 +33,19 @@ item.ItemPactRing.name=Ring of Pacts tc.research_name.TI_SanitizingSoapAlpha=Sanitizing Soap Alpha -tc.research_text.TI_SanitizingSoapAlpha= + +tc.research_text.TI_SanitizingSoapAlpha=Washing away the sins of the past + tc.research_name.TI_SanitizingSoapBeta=Alastor's Soap tc.research_text.TI_SanitizingSoapBeta=In the [Deep Abyss] lies a [Great Deal] he said... but at what cost? unintelligbleLaughter=I USED TO BE NOTHING BUT THE E_MAIL GUY, NOW I'M THE [[It Burns! Ow! Stop! Help Me! It Burns!]] GUY! [[Amazed at thi5 amazing transformation? You too can]] HAVE A [[Communion]] WITH [[Unintelligble Laughter]] -SoapAlpha.1=[Insert punchline here] boosts the base chance for normal warp removal to 50% from 33%, so now you can guarantee normal warp removal! -SoapBeta.1= +SoapAlpha.1=It concerned you that your thaumically perfected soap can't even guarantee relief from your personal demons. But with a little trickery, you were able to push it the extra mile!

You wonder if there's any way you can push further... +SoapBeta.1=After some thought on your previous attempt at improving your soap, you began to believe there was some room for improvement...

You've been able to rid yourself of the stickier tears in your mind, but yet, you could still feel the tangible rips in your soul as their effects coursed through your mind, yet you weren't able to rid yourself of them...
Until now.
While you quickly figured out that it was impossible to directly remove them, by happenstance you found success in transmogrification. +SoapBeta.2=Albeit with a few caveats...

The baseline success rate is extremely low and failure is taxing on the primitive portions of your mind.

The cost of this transmogrification, however, is that for every hole within your soul, twice the number of tears rip open within your mind.

Yet you feel as if there was yet still some way you could improve this further... -.=Do you have perm warp that induces constant nightmares foreboding eldritch horrors rending your flesh from your bones? Have you grown a cloaca? Well I have the solution for you! For the low low price of your [[soul]] you can have a [[miniscule]] chance to lower your perm warp by 1 at the low low price of [[2 normal]] Warning: This product will cause you to develop 2 points of temp warp for every failed attempt to remove perm warp. Purchase now at [[hyperlink blocked]]! ThaumicInterfacer.1=I'm not sure where I found this design. It looks like an early attempt at making or modifying a thaumometer, hence my working name for it. The device seems to show something, but not what a properly made one does. It seems like the work of someone tinkering with infusion, given its method of creation and its reaction to runic matrices. Probably just a curiosity, for the average thaumaturge not tinkering with the innate fundamentals of infusion. This likely won't help you on your journey young thaumaturge. @@ -63,5 +68,4 @@ item.ItemThaumicInterfacer.name=Madman's Lens -itemGroup.Thaumic Insurgence=Thaumic Insurgence - +itemGroup.Thaumic Insurgence=Thaumic Insurgence \ No newline at end of file