Spring Cleaning.

trackedout · Dec 10, 2024 · 674ebb7 · 674ebb7
1 parent 89b058b
commit 674ebb7
Show file tree

Hide file tree

Showing 7 changed files with 647 additions and 623 deletions.
diff --git a/Brilliance Datapack/TODO.md b/Brilliance Datapack/TODO.md
@@ -1,27 +1,21 @@
 # Other TODO:
-- Egg Hunt advancements can trigger by spectators.
+- Rename Level Controller to Mob Controller.
+- level controller has no preset names for wardens and drowned. In case player somehow goes over default number of names.
+- Backroom zone markers need to be populated.
+- Numbered Ravager currently only counts ravagers in their ZONE, not across the entire level. Need to fix, and exclude special mobs in the count.
 - Check for TOO MANY mobs to correct them.
-- Rusty Repaired advancement
-- Limit mobs per level to 30 for level controller.
-- Add Level 3, Level 4 & Backrooms to level controller mob control.
 - Config Info "booklet" needs to be updated with the new force saturation level
   - Go into more detail on the Fresh Runs & Balance Changes in the config book.
-- Randomly determine TIME of day, instead of just day/night
 - Update Brilliance's main readme.
 - Add a config to LIMIT people from receiving logs. (atm it's freely available from the /trigger cmd)
 - Fix on_crown_acquired to not log EVERY crown but instead a total of crowns, once. 
-- Track embers DROPPED in dungeon
-- Track embers ATTEMPTED to be RELEASED.
-- Track treasure DROPPED in dungeon
-- Track treasure ATTEMPTED to be RELEASED.
 - Fresh runs, reset_stat_containers contains a link to the document. Should the doc be moved to a more permanent location OR as a PDF on tracked out's website URL needs to be adjusted.
 - Finish the level interface book.
   - Need Mob Amount & Names implemented.
 - Fish markers have same issue as ravager markers, can be duplicated as it takes several ticks to summon markers so it can attempt to summon 99 of them for multiple ticks letting them stack up.
 - Have dropper config book have LINKS to each of the dropper categories.
 - DM each person on the list of players in the credits tab ask them for a short description/saying/quote for their advancement.
 - Check credit list to add ALL players to the credits tab.
-- Move all HERMITCRAFT items from resourcepack/assets/do2 to resourcepack/assets/hermitcraft
 - Remove file at "dev/markers/controller.mcfunction" eventually.
 - Maybe track card vs natural stats:
   - Hazard
@@ -36,14 +30,8 @@ triggered_shrieker
   on_reached_top_tnt_depth_charge
 - Add option for log to let receiver TP to depth charge
 - Log Lock/Unlock settings room.
-- Log level interface changes
 
 # List of things todo AFTER builder's "repair" version is done.
-- Add Bdub's clock, to be the actual new clock.
-  - Update all of the artifact spots that accept the clock
-  - Add clock to the item whitelist.
-- Update all of the compasses to the new CustomModelData.
-- Update all of the compasses filters to the new CustomModelData.
 - Add a Tango Easter Egg to the dungeon, and automate it's score.
     - **_(Builders need to hide egg first)_**
 
@@ -70,11 +58,6 @@ triggered_shrieker
     - Don't have data tracking for crafting legendaries yet.
 - lifetime_tomes, lifetime_crowns, lifetime_embers
     - Don't have lifetime totals.
-- submit_tomes
-    - Don't have tomes submissions.
 
 
 
-## Testing Automation
-We really need to test every single advancement to make sure they work exactly as how they should.
-
diff --git a/Brilliance Datapack/data/do2/functions/events/systems/on_clank_generated.mcfunction b/Brilliance Datapack/data/do2/functions/events/systems/on_clank_generated.mcfunction
@@ -1,5 +1,4 @@
 # Ran when clank is GENERATED
-# Todo: differentiate PLAYER vs CARD clank (maybe)
 # - Start Log -
 execute as @a[scores={do2.logs.clank=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Generated §8Clank§r."}]
 # - End Log -

diff --git a/...liance Datapack/data/do2/functions/level_controller/generate_mobs/merge_errors.mcfunction b/...liance Datapack/data/do2/functions/level_controller/generate_mobs/merge_errors.mcfunction
diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction
@@ -1,3 +1,3 @@
-# DATAPACK VERSION NUMBER: 0.13.0
+# DATAPACK VERSION NUMBER: 0.13.1
 
-tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.0§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
+tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.1§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
diff --git a/JSON/scoreboards.json b/JSON/scoreboards.json
@@ -257,18 +257,6 @@
         "category": "config",
         "description": "The chance for the dungeon to set the time to night."
     },
-    "do2.config.useDaylightCycle": {
-        "auto": 2,
-        "target": "$dungeon",
-        "category": "config",
-        "description": "Whether the doDaylightCycle gamerule is true"
-    },
-    "do2.config.useWeatherCycle": {
-        "auto": 2,
-        "target": "$dungeon",
-        "category": "config",
-        "description": "Whether the doWeatherCycle gamerule is true"
-    },
     "do2.config.vexTracking": {
         "auto": 2,
         "target": "$dungeon",
@@ -443,6 +431,12 @@
         "category": "config",
         "description": "Whether zones should be used on L4."
     },
+    "do2.config.mc.controlSummons": {
+        "auto": 2,
+        "target": "$dungeon",
+        "category": "config",
+        "description": "Whether to use legacy system or the new level controller."
+    },
     "do2.eggs.total": {
         "auto": 1,
         "target": "both",
@@ -1527,7 +1521,7 @@
         "auto": 1,
         "target": "both",
         "category": "current",
-        "description": "Whether the card pirate's booty was available to purchase this run."
+        "description": "Whether the card pirates booty was available to purchase this run."
     },
     "do2.run.cards.available.COS": {
         "auto": 1,
@@ -2526,10 +2520,10 @@
         "description": "Detection used to check players running /trigger. Lets you customize the GUI settings."
     },
     "do2.tendriltravels": {
-        "auto": 0,
-        "target": "unknown",
-        "category": "unknown",
-        "description": "unknown"
+        "auto": 1,
+        "target": "players",
+        "category": "totals",
+        "description": "Used to denote how many tendrils the player has visited."
     },
     "do2.cards.available.EVA": {
         "auto": 1,
@@ -3119,34 +3113,88 @@
         "category": "utility",
         "description": "Used to check whether a jackpot was won from the crown shops."
     },
-    "do2.utility.mobCountCounterTest": {
+    "do2.tests.amountOfRavagers": {
+        "auto": 1,
+        "target": "$dungeon",
+        "category": "tests",
+        "description": "used to count how many ravagers already are summoned in order to generate an numbered name."
+    },
+    "do2.tests.arrayIndex": {
+        "auto": 1,
+        "target": "$dungeon",
+        "category": "tests",
+        "description": "Used for array manipulation for Mob Controller."
+    },
+    "do2.rustyrepairs": {
+        "auto": 1,
+        "target": "players",
+        "category": "totals",
+        "description": "Used to track how many"
+    },
+    "do2.run.systems.embers.attempts": {
+        "auto": 1,
+        "target": "both",
+        "category": "totals",
+        "description": "Used to track how much embers attempted to drop in the dungeon in this run."
+    },
+    "do2.run.systems.treasure.attempts": {
+        "auto": 1,
+        "target": "both",
+        "category": "totals",
+        "description": "Used to track how much treasure attempted to drop in the dungeon in this run."
+    },
+    "do2.systems.embers.attempts": {
+        "auto": 1,
+        "target": "both",
+        "category": "totals",
+        "description": "Used to track the total of how much embers attempted to drop in the dungeon."
+    },
+    "do2.systems.treasure.attempts": {
+        "auto": 1,
+        "target": "both",
+        "category": "totals",
+        "description": "Used to track the total of how much treasure attempted to drop in the dungeon."
+    },
+    "do2.utility.playersExperience": {
         "auto": 1,
         "target": "$dungeon",
         "category": "utility",
-        "description": "Used to help count how many mobs are meant to be in each zone."
+        "description": "Used to check player's exp in order to give them 1 level if they dont have one."
     },
-    "do2.utility.mobCountCounterTotal": {
+    "do2.utility.mc.mobCountCounterTest": {
         "auto": 1,
         "target": "$dungeon",
         "category": "utility",
-        "description": "Used to store the count how many mobs are meant to be in each zone."
+        "description": "Used to add to the total count of how many mobs are wanted in a zone."
     },
-    "do2.utility.mobGeneration": {
+    "do2.utility.mc.mobCountCounterTotal": {
         "auto": 1,
         "target": "$dungeon",
         "category": "utility",
-        "description": "Used to check whether the amount of mobs generate match the mobs needed."
+        "description": "Used to total up the count of how many mobs are wanted in a zone."
     },
-    "do2.utility.mobNamesCount": {
+    "do2.utility.mc.mobGenerationCount": {
         "auto": 1,
         "target": "$dungeon",
         "category": "utility",
-        "description": "Used to count how many names are inside a list of names."
+        "description": "Count of how many mobs the Mob Controller needs to generate in it's zone."
     },
-    "do2.config.mc.controlSummons": {
-        "auto": 0,
-        "target": "unknown",
-        "category": "unknown",
-        "description": "unknown"
+    "do2.utility.mc.mobGenerationType": {
+        "auto": 1,
+        "target": "$dungeon",
+        "category": "utility",
+        "description": "What kind of mob is being worked on in the Mob Controller's zone."
+    },
+    "do2.utility.mc.mobNamesCount": {
+        "auto": 1,
+        "target": "$dungeon",
+        "category": "utility",
+        "description": "How many mob names are in the zone the Mob Controller is working on."
+    },
+    "do2.utility.mc.collectingLogs": {
+        "auto": 1,
+        "target": "$dungeon",
+        "category": "utility",
+        "description": "Whether the Mob Controller is collecting logs to bundle up."
     }
-}
+}
diff --git a/docs/advancements.md b/docs/advancements.md
@@ -32,7 +32,7 @@ For all advancements related to exploring the dungeon, finding unique items and
 |   ✅    | Strung Along                | [string_pickup.json](./../Brilliance%20Datapack/data/do2/advancements/hidden/adventuring/string_pickup.json "string_pickup.json")                                  | Obtain string inside the dungeon.                                                                                       | adventuring_root         |
 |   ✅    | Dangerous Dive              | [survive_tnt_dive.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/survive_tnt_dive.json "survive_tnt_dive.json")                        | Survive the TnT Depth Charge Dive                                                                                       | win_1_times              |
 |   ✅    | Safety ~~First~~ Last       | [take_tnt_damage.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/take_tnt_damage.json "take_tnt_damage.json")                           | Take damage from TnT                                                                                                    | adventuring_root         |
-|   ❌    | Tendril Traveler            | [travel_to_tendrils.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/travel_to_tendrils.json "travel_to_tendrils.json")                  | Travel to the end of all nine Level Four tendrils.                                                                      | open_basalt_door         |
+|   ✅    | Tendril Traveler            | [travel_to_tendrils.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/travel_to_tendrils.json "travel_to_tendrils.json")                  | Travel to the end of all nine Level Four tendrils.                                                                      | open_basalt_door         |
 |   ✅    | If a Key Fits...            | [use_dm_key.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/use_dm_key.json "use_dm_key.json")                                          | Use the Dungeon Master's Key.                                                                                           | open_basalt_door         |
 |   ✅    | Upsetti Spayeti             | [yeti_scare.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/yeti_scare.json "yeti_scare.json")                                          | Get jump-scared by the yeti                                                                                             | adventuring_root         |
 |   ✅    | BdoubleO Egg                | [bdoubleo.json](./../Brilliance%20Datapack/data/do2/advancements/visible/adventuring/egg_hunt/level_1/bdoubleo.json "bdoubleo.json")                               | Find the BdoubleO Egg hidden in Decked Out 2                                                                            | find_all_eggs            |
@@ -139,10 +139,10 @@ For all advancements related to exploring the card collecting and deck building.
 |   ✅    | Points Mean Prizes       | [buy_1_tome.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/buy_1_tome.json)                                       | Buy your first Tome.                                                | pickup_1_treasure          |
 |   ✅    | Tomes or Bust            | [buy_9_tomes.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/buy_9_tomes.json)                                     | Buy 9 tomes in a single shop visit                                  | buy_1_tome                 |
 |   ✅    | Game the System          | [end_more_embers_than_artifact.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/end_more_embers_than_artifact.json) | Win a run with more floor Frost Embers than your artifact is worth. | pickup_1_ember             |
-|   ❌    | Bargain Buy              | [get_shard_mystery_box.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/get_shard_mystery_box.json)                 | Get a Frozen Shard from a mystery box at the crown shop.            | pickup_1_crown             |
-|   ❌    | Random Key Jackpot       | [get_shard_random_key.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/get_shard_random_key.json)                   | Get a Frozen Shard from a random key purchase at the crown shop.    | pickup_1_crown             |
+|   ✅    | Bargain Buy              | [get_shard_mystery_box.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/get_shard_mystery_box.json)                 | Get a Frozen Shard from a mystery box at the crown shop.            | pickup_1_crown             |
+|   ✅    | Random Key Jackpot       | [get_shard_random_key.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/get_shard_random_key.json)                   | Get a Frozen Shard from a random key purchase at the crown shop.    | pickup_1_crown             |
 |   ✅    | Digger                   | [find_1_artifact.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/find_1_artifact.json)                             | Find your first Artifact.                                           | pickup_1_treasure          |
-|   ❌    | Fake it Till you Make it | [convert_into_artifake.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/convert_into_artifake.json)                 | Convert an artifact into an Artifake™.                              | find_1_artifact            |
+|   ✅    | Fake it Till you Make it | [convert_into_artifake.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/convert_into_artifake.json)                 | Convert an artifact into an Artifake™.                              | find_1_artifact            |
 |   ✅    | Miner                    | [find_all_level_1_artifacts.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/find_all_level_1_artifacts.json)       | Find every Artifact on Level 1: Frozen Crypts.                      | find_1_artifact            |
 |   ✅    | Driller                  | [find_all_level_2_artifacts.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/find_all_level_2_artifacts.json)       | Find every Artifact on Level 2: Caves of Carnage.                   | find_all_level_1_artifacts |
 |   ✅    | Excavator                | [find_all_level_3_artifacts.json](./../Brilliance%20Datapack/data/do2/advancements/visible/treasure/find_all_level_3_artifacts.json)       | Find every Artifact on Level 3: Black Mines.                        | find_all_level_2_artifacts |