Skip to content

Commit

Permalink
Remake PR WayofTime#1930 on 1.20.
Browse files Browse the repository at this point in the history
Squash-Merge the 1.18 PR branch into a new 1.20 branch.

commit 0f2cfdd
Author: VT-14 <GamingVT14@Gmail.com>
Date:   Sat Sep 3 23:55:06 2022 -0400

    Added "Default Ranges" to Ritual Documentation

    * Added new "Default Ranges" page type.  Applied to all relevant Ritual entries.

    * Removed `RitualInfoProcessor`.  Replaced with a new `RitualProcessorCore`, `RitualDataProcessor`, and `RitualInfoProcessor`.  Added completley new `RitualRangesProcessor`.  Core contains the shared code for all 3.

    * Removed the Blood Altar link from the "List of Rituals" category text.  Due to a bug in Patchouli it would be clicked instead of the actual Ritual Entry someone wanted.

    * Added "waterTank" area description to the Water Ritual entry.
  • Loading branch information
VT-14 committed Jan 25, 2024
1 parent f41d1e0 commit b987232
Show file tree
Hide file tree
Showing 35 changed files with 632 additions and 272 deletions.
9 changes: 7 additions & 2 deletions src/generated/resources/assets/bloodmagic/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,22 @@
"guide.patchouli.bloodmagic.arc_processor.fluid": "%dmb of %s",
"guide.patchouli.bloodmagic.arc_processor.no_fluid": "None",
"guide.patchouli.bloodmagic.common.double_new_line": "$(br2)%s",
"guide.patchouli.bloodmagic.common.header": "$(bold)%s$()$(br)",
"guide.patchouli.bloodmagic.living_armour_upgrade_table.level": "Level",
"guide.patchouli.bloodmagic.living_armour_upgrade_table.upgrade_points": "Upgrade Points",
"guide.patchouli.bloodmagic.ritual_info.activation_cost": "$(br)Activation Cost: $(blood)%d LP$()",
"guide.patchouli.bloodmagic.ritual_info.awakened_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#awakened)%s$(/l)",
"guide.patchouli.bloodmagic.ritual_info.counter_formatter": "$(br)%s%s$()",
"guide.patchouli.bloodmagic.ritual_info.full_range": "Full Range",
"guide.patchouli.bloodmagic.ritual_info.info_formatter": "%s$(br)%s$(br2)%s$(br)%s%s%s",
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s",
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s",
"guide.patchouli.bloodmagic.ritual_info.text_override_formatter": "\\$(%s)%s\\$()",
"guide.patchouli.bloodmagic.ritual_info.upkeep_cost": "$(br)Base Usage Cost: $(blood)%d LP$()$(br)Base Interval: %d Ticks",
"guide.patchouli.bloodmagic.ritual_info.weak_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#weak)%s$(/l)",
"guide.patchouli.bloodmagic.ritual_ranges.above_mrs": "Size: %d x %d x %d$(br)Center: %d above the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.at_mrs": "Size: %d x %d x %d$(br)Center: at the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs": "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.below_mrs": "Size: %d x %d x %d$(br)Center: %d below the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"hud.bloodmagic.inactive": "Inactive",
"item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal",
"item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal",
Expand Down Expand Up @@ -467,7 +472,7 @@
"ritual.bloodmagic.blockRange.tooFar": "The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks.",
"ritual.bloodmagic.cobblestoneRitual": "Le Vulcanos Frigius",
"ritual.bloodmagic.condorRitual": "Reverence of the Condor",
"ritual.bloodmagic.condorRitual.flightRange.info": "Players within this range will receive a Flight buff.",
"ritual.bloodmagic.condorRitual.flightRange.info": "(Flight Range) Players within this range will receive a Flight buff.",
"ritual.bloodmagic.condorRitual.info": "Provides flight in an area around the ritual.",
"ritual.bloodmagic.containmentRitual": "Ritual of Containment",
"ritual.bloodmagic.containmentRitual.containmentRange.info": "(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ protected void addTranslations()
add("ritual.bloodmagic.fellingRitual.fellingRange.info", "(Cutting) The range that the ritual will search out logs and leaves in order to cut down.");
add("ritual.bloodmagic.fellingRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the results into.");
add("ritual.bloodmagic.pumpRitual.pumpRange.info", "(Pump) The region that the ritual will look for fluids to grab from the world.");
add("ritual.bloodmagic.condorRitual.flightRange.info", "Players within this range will receive a Flight buff.");
add("ritual.bloodmagic.condorRitual.flightRange.info", "(Flight Range) Players within this range will receive a Flight buff.");
add("ritual.bloodmagic.downgradeRitual.info", "Consumes items from a linked chest to forcefully downgrade worn Living Armour.");
add("ritual.bloodmagic.groundingRitual.groundingRange.info", "(Range) Affects entities within range.");

Expand Down Expand Up @@ -508,6 +508,7 @@ protected void addTranslations()
add("guide.bloodmagic.name", "Sanguine Scientiem");
add("guide.bloodmagic.landing_text", "Welcome to $(6)Blood Magic$()! $(br2)$(l:bloodmagic:utility/nyi)A lot of stuff$() isn't yet implemented, so please excuse our dust. $(br2)Click $(l:bloodmagic:utility/getting_started)HERE$() to get started. If you find any bugs, please report them on our $(l:https://github.com/WayofTime/BloodMagic/issues)Github$().");
add("guide.bloodmagic.subtitle", "Alchemical Wizardry");
add("guide.patchouli.bloodmagic.common.header", "$(bold)%s$()$(br)"); // Bold + new line
add("guide.patchouli.bloodmagic.common.double_new_line", "$(br2)%s");
add("guide.patchouli.bloodmagic.arc_processor.fluid", "%dmb of %s");
add("guide.patchouli.bloodmagic.arc_processor.no_fluid", "None");
Expand All @@ -520,8 +521,12 @@ protected void addTranslations()
add("guide.patchouli.bloodmagic.ritual_info.counter_formatter", "$(br)%s%s$()");
add("guide.patchouli.bloodmagic.ritual_info.text_override_formatter", "\\$(%s)%s\\$()");
add("guide.patchouli.bloodmagic.ritual_info.info_formatter", "%s$(br)%s$(br2)%s$(br)%s%s%s");
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s");
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s");
add("guide.patchouli.bloodmagic.ritual_info.full_range", "Full Range");
add("guide.patchouli.bloodmagic.ritual_ranges.at_mrs", "Size: %d x %d x %d$(br)Center: at the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.above_mrs", "Size: %d x %d x %d$(br)Center: %d above the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.below_mrs", "Size: %d x %d x %d$(br)Center: %d below the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs", "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)");

// Keybinds
add("bloodmagic.keybind.open_holding", "Open Sigil of Holding");
Expand Down

This file was deleted.

Loading

0 comments on commit b987232

Please sign in to comment.