~williewillus/violet-moon

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
4 3

[PATCH botania] Fix lang for manaweave buff, misc documentation

Details
Message ID
<20231005115553.17297-1-actuallyadarsh@gmail.com>
DKIM signature
missing
Download raw message
Patch: +5 -5
Added info about new Bergamute behaviour, sphere mode for Sextant and Dispenser functionality to Lexicon, as well as changing 35% -> 40% to reflect code.
---
 .../src/main/resources/assets/botania/lang/en_us.json  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
index b996f2efe..b996ce1d2 100644
--- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
+++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
@@ -266,7 +266,7 @@
  "botania.armorset.terrasteel.desc1": "Regen even if hunger isn't topped off",
  "botania.armorset.terrasteel.desc2": "Passive Mana generation on Mana Tablets",
  "botania.armorset.manaweave.name": "Manatide Prowess",
  "botania.armorset.manaweave.desc0": "35%% less Mana cost on Mana Tools and Rods",
  "botania.armorset.manaweave.desc0": "40%% less Mana cost on Mana Tools and Rods",
  "botania.armorset.manaweave.desc1": "Increased proficiency with Magical Rods",

  "botania.armorset.will_ahrim.desc": "Ahrim: Critical Hits apply a strong weakness effect",
@@ -2279,7 +2279,7 @@
  "botania.entry.bergamute": "Bergamute",
  "botania.tagline.bergamute": "Absorbs sound",
  "botania.page.bergamute0": "Anyone who's ever attempted ranching knows of the cacophonous din emitted by herds of animals. Luckily, the $(item)Bergamute$(0) can deafen such dins.",
  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly.$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",
  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly. It halves the volume of sounds within reach, the effect stacking with other nearby $(item)Bergamutes$(0).$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",
  "botania.page.bergamute2": "Deaf to All but the Song",

  "botania.entry.gIntro": "Generating Flora",
@@ -2640,7 +2640,7 @@

  "botania.entry.grassSeeds": "Pasture Seeds",
  "botania.tagline.grassSeeds": "Seeds to create Grass, Podzol and Mycelium",
  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block.$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block, either by hand or in a $(item)Dispenser$(0).$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
  "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for grass",
  "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for podzol",
  "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for mycelium",
@@ -2906,8 +2906,8 @@

  "botania.entry.sextant": "Worldshaper's Sextant",
  "botania.tagline.sextant": "A tool to help create circles",
  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
  "botania.page.sextant1": "To use the item, simply right-click and hold at a block to choose a circle's center, and look around to choose its radius; a blue circle will appear in the world as a preview of the circle's shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the circle.",
  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles and spheres is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
  "botania.page.sextant1": "To use the sextant, sneak-right click to choose a mode. Simply right-click and hold at a block to choose the shape's center, and look around to choose its radius; blue circles will appear in the world as an outline of the final shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the guide.",
  "botania.page.sextant2": "You sketch a circle, filling you with determination",

  "botania.entry.astrolabe": "Worldshaper's Astrolabe",
-- 
2.34.1

[botania/patches/linux.yml] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CW0HZ636I89C.1L7CB1HC6CAPO@cirno2>
In-Reply-To
<20231005115553.17297-1-actuallyadarsh@gmail.com> (view parent)
DKIM signature
missing
Download raw message
botania/patches/linux.yml: SUCCESS in 21m6s

[Fix lang for manaweave buff, misc documentation][0] from [Adarsh][1]

[0]: https://lists.sr.ht/~williewillus/violet-moon/patches/45389
[1]: actuallyadarsh@gmail.com

✓ #1068903 SUCCESS botania/patches/linux.yml https://builds.sr.ht/~williewillus/job/1068903
Details
Message ID
<87r0m8blcy.fsf@vincent-lee.net>
In-Reply-To
<20231005115553.17297-1-actuallyadarsh@gmail.com> (view parent)
DKIM signature
missing
Download raw message
Adarsh <actuallyadarsh@gmail.com> writes:

> Added info about new Bergamute behaviour, sphere mode for Sextant and Dispenser functionality to Lexicon, as well as changing 35% -> 40% to reflect code.
> ---
>  .../src/main/resources/assets/botania/lang/en_us.json  | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> index b996f2efe..b996ce1d2 100644
> --- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
> +++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> @@ -266,7 +266,7 @@
>    "botania.armorset.terrasteel.desc1": "Regen even if hunger isn't topped off",
>    "botania.armorset.terrasteel.desc2": "Passive Mana generation on Mana Tablets",
>    "botania.armorset.manaweave.name": "Manatide Prowess",
> -  "botania.armorset.manaweave.desc0": "35%% less Mana cost on Mana Tools and Rods",
> +  "botania.armorset.manaweave.desc0": "40%% less Mana cost on Mana Tools and Rods",
>    "botania.armorset.manaweave.desc1": "Increased proficiency with Magical Rods",
>  
>    "botania.armorset.will_ahrim.desc": "Ahrim: Critical Hits apply a strong weakness effect",
> @@ -2279,7 +2279,7 @@
>    "botania.entry.bergamute": "Bergamute",
>    "botania.tagline.bergamute": "Absorbs sound",
>    "botania.page.bergamute0": "Anyone who's ever attempted ranching knows of the cacophonous din emitted by herds of animals. Luckily, the $(item)Bergamute$(0) can deafen such dins.",
> -  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly.$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",
> +  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly. It halves the volume of sounds within reach, the effect stacking with other nearby $(item)Bergamutes$(0).$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",

Just making sure, for this stuff (and below) you checked ingame that
these don't overflow the lexicon page? If they do you'll have to break
up the page into two.

>    "botania.page.bergamute2": "Deaf to All but the Song",
>  
>    "botania.entry.gIntro": "Generating Flora",
> @@ -2640,7 +2640,7 @@
>  
>    "botania.entry.grassSeeds": "Pasture Seeds",
>    "botania.tagline.grassSeeds": "Seeds to create Grass, Podzol and Mycelium",
> -  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block.$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
> +  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block, either by hand or in a $(item)Dispenser$(0).$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
>    "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for grass",
>    "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for podzol",
>    "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for mycelium",
> @@ -2906,8 +2906,8 @@
>  
>    "botania.entry.sextant": "Worldshaper's Sextant",
>    "botania.tagline.sextant": "A tool to help create circles",
> -  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
> -  "botania.page.sextant1": "To use the item, simply right-click and hold at a block to choose a circle's center, and look around to choose its radius; a blue circle will appear in the world as a preview of the circle's shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the circle.",
> +  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles and spheres is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
> +  "botania.page.sextant1": "To use the sextant, sneak-right click to choose a mode. Simply right-click and hold at a block to choose the shape's center, and look around to choose its radius; blue circles will appear in the world as an outline of the final shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the guide.",
>    "botania.page.sextant2": "You sketch a circle, filling you with determination",
>  
>    "botania.entry.astrolabe": "Worldshaper's Astrolabe",
Details
Message ID
<CAJSrJi_Sx+zjp-GzMpDHm7E-Po4nAXYjhCXNsuiUvwcUqC=PAw@mail.gmail.com>
In-Reply-To
<87r0m8blcy.fsf@vincent-lee.net> (view parent)
DKIM signature
missing
Download raw message
Yep, checked in-game while editing the entries, they all fit fine.

On Fri, 6 Oct 2023 at 02:17, Vincent Lee <vincent@vincent-lee.net> wrote:
>
>
> Adarsh <actuallyadarsh@gmail.com> writes:
>
> > Added info about new Bergamute behaviour, sphere mode for Sextant and Dispenser functionality to Lexicon, as well as changing 35% -> 40% to reflect code.
> > ---
> >  .../src/main/resources/assets/botania/lang/en_us.json  | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> > index b996f2efe..b996ce1d2 100644
> > --- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
> > +++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> > @@ -266,7 +266,7 @@
> >    "botania.armorset.terrasteel.desc1": "Regen even if hunger isn't topped off",
> >    "botania.armorset.terrasteel.desc2": "Passive Mana generation on Mana Tablets",
> >    "botania.armorset.manaweave.name": "Manatide Prowess",
> > -  "botania.armorset.manaweave.desc0": "35%% less Mana cost on Mana Tools and Rods",
> > +  "botania.armorset.manaweave.desc0": "40%% less Mana cost on Mana Tools and Rods",
> >    "botania.armorset.manaweave.desc1": "Increased proficiency with Magical Rods",
> >
> >    "botania.armorset.will_ahrim.desc": "Ahrim: Critical Hits apply a strong weakness effect",
> > @@ -2279,7 +2279,7 @@
> >    "botania.entry.bergamute": "Bergamute",
> >    "botania.tagline.bergamute": "Absorbs sound",
> >    "botania.page.bergamute0": "Anyone who's ever attempted ranching knows of the cacophonous din emitted by herds of animals. Luckily, the $(item)Bergamute$(0) can deafen such dins.",
> > -  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly.$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",
> > +  "botania.page.bergamute1": "The $(item)Bergamute$(0) absorbs sound energy emitted in a close radius around itself, converting it into trace amounts of mana and dispersing it harmlessly. It halves the volume of sounds within reach, the effect stacking with other nearby $(item)Bergamutes$(0).$(p)Additionally, $(l:tools/grass_horn)$(item)Horns$(0)$(/l) or $(l:devices/forest_drum)$(item)Drums$(0)$(/l) will not break blocks within its range.",
>
> Just making sure, for this stuff (and below) you checked ingame that
> these don't overflow the lexicon page? If they do you'll have to break
> up the page into two.
>
> >    "botania.page.bergamute2": "Deaf to All but the Song",
> >
> >    "botania.entry.gIntro": "Generating Flora",
> > @@ -2640,7 +2640,7 @@
> >
> >    "botania.entry.grassSeeds": "Pasture Seeds",
> >    "botania.tagline.grassSeeds": "Seeds to create Grass, Podzol and Mycelium",
> > -  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block.$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
> > +  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block, either by hand or in a $(item)Dispenser$(0).$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
> >    "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for grass",
> >    "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for podzol",
> >    "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for mycelium",
> > @@ -2906,8 +2906,8 @@
> >
> >    "botania.entry.sextant": "Worldshaper's Sextant",
> >    "botania.tagline.sextant": "A tool to help create circles",
> > -  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
> > -  "botania.page.sextant1": "To use the item, simply right-click and hold at a block to choose a circle's center, and look around to choose its radius; a blue circle will appear in the world as a preview of the circle's shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the circle.",
> > +  "botania.page.sextant0": "In a world of cubes, the secrets of creating circles and spheres is a lost art coveted by many-- so much so, in fact, that some to turn to the unholy act of \"tabbing out\" to learn the proper procedures.$(p)The $(item)Worldshaper's Sextant$(0), however, provides a ready alternative to such an act. ",
> > +  "botania.page.sextant1": "To use the sextant, sneak-right click to choose a mode. Simply right-click and hold at a block to choose the shape's center, and look around to choose its radius; blue circles will appear in the world as an outline of the final shape. Upon release of the sextant, a mirage of $(item)Cobblestone$(0) blocks will appear as a building guide.$(p)Sneak-right clicking the sextant will remove the guide.",
> >    "botania.page.sextant2": "You sketch a circle, filling you with determination",
> >
> >    "botania.entry.astrolabe": "Worldshaper's Astrolabe",
>
Details
Message ID
<87r0lx9mwj.fsf@vincent-lee.net>
In-Reply-To
<CAJSrJi_Sx+zjp-GzMpDHm7E-Po4nAXYjhCXNsuiUvwcUqC=PAw@mail.gmail.com> (view parent)
DKIM signature
missing
Download raw message
Committed, thanks
Reply to thread Export thread (mbox)