Merge pull request #1 from plex1on/rebalance

katelyynn · Oct 13, 2022 · bbcc852 · bbcc852
2 parents 601b4b5 + d1e3d38
commit bbcc852
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/data/acrace/functions/load/values.mcfunction b/data/acrace/functions/load/values.mcfunction
@@ -17,9 +17,9 @@ scoreboard players set @e[tag=achievement,tag=story_form_obsidian,limit=1] achie
 scoreboard players set @e[tag=achievement,tag=story_mine_diamond,limit=1] achievement.values 4
 scoreboard players set @e[tag=achievement,tag=story_diamond_tools,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=story_enter_the_nether,limit=1] achievement.values 4
-scoreboard players set @e[tag=achievement,tag=story_shiny_gear,limit=1] achievement.values 7
+scoreboard players set @e[tag=achievement,tag=story_shiny_gear,limit=1] achievement.values 4
 scoreboard players set @e[tag=achievement,tag=story_diamond_armor,limit=1] achievement.values 15
-scoreboard players set @e[tag=achievement,tag=story_enchant_item,limit=1] achievement.values 7
+scoreboard players set @e[tag=achievement,tag=story_enchant_item,limit=1] achievement.values 6
 scoreboard players set @e[tag=achievement,tag=story_cure_zombie_villager,limit=1] achievement.values 12
 scoreboard players set @e[tag=achievement,tag=story_follow_ender_eye,limit=1] achievement.values 6
 scoreboard players set @e[tag=achievement,tag=story_enter_the_end,limit=1] achievement.values 3
@@ -63,18 +63,18 @@ scoreboard players set @e[tag=achievement,tag=adventure_honey_block_slide,limit=
 scoreboard players set @e[tag=achievement,tag=adventure_ol_betsy,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_lightning_rod_with_villager_no_fire,limit=1] achievement.values 6
 scoreboard players set @e[tag=achievement,tag=adventure_spelunker,limit=1] achievement.values 5
-scoreboard players set @e[tag=achievement,tag=adventure_fall_from_world_height,limit=1] achievement.values 8
+scoreboard players set @e[tag=achievement,tag=adventure_fall_from_world_height,limit=1] achievement.values 9
 scoreboard players set @e[tag=achievement,tag=adventure_avoid_vibration,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_sleep_in_bed,limit=1] achievement.values 2
 scoreboard players set @e[tag=achievement,tag=adventure_hero_of_the_village,limit=1] achievement.values 9
 scoreboard players set @e[tag=achievement,tag=adventure_spyglass_at_ghast,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_throw_trident,limit=1] achievement.values 4
 scoreboard players set @e[tag=achievement,tag=adventure_kill_mob_near_sculk_catalyst,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_shoot_arrow,limit=1] achievement.values 2
-scoreboard players set @e[tag=achievement,tag=adventure_kill_all_mobs,limit=1] achievement.values 14
+scoreboard players set @e[tag=achievement,tag=adventure_kill_all_mobs,limit=1] achievement.values 26
 scoreboard players set @e[tag=achievement,tag=adventure_totem_of_undying,limit=1] achievement.values 8
-scoreboard players set @e[tag=achievement,tag=adventure_summon_iron_golem,limit=1] achievement.values 10
-scoreboard players set @e[tag=achievement,tag=adventure_trade_at_world_height,limit=1] achievement.values 14
+scoreboard players set @e[tag=achievement,tag=adventure_summon_iron_golem,limit=1] achievement.values 9
+scoreboard players set @e[tag=achievement,tag=adventure_trade_at_world_height,limit=1] achievement.values 15
 scoreboard players set @e[tag=achievement,tag=adventure_two_birds_one_arrow,limit=1] achievement.values 9
 scoreboard players set @e[tag=achievement,tag=adventure_whos_the_pillager_now,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_arbalistic,limit=1] achievement.values 14
@@ -83,8 +83,8 @@ scoreboard players set @e[tag=achievement,tag=adventure_play_jukebox_in_meadows,
 scoreboard players set @e[tag=achievement,tag=adventure_walk_on_powder_snow_with_leather_boots,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=adventure_spyglass_at_dragon,limit=1] achievement.values 5
 scoreboard players set @e[tag=achievement,tag=adventure_very_very_frightening,limit=1] achievement.values 8
-scoreboard players set @e[tag=achievement,tag=adventure_sniper_duel,limit=1] achievement.values 6
-scoreboard players set @e[tag=achievement,tag=adventure_bullseye,limit=1] achievement.values 3
+scoreboard players set @e[tag=achievement,tag=adventure_sniper_duel,limit=1] achievement.values 5
+scoreboard players set @e[tag=achievement,tag=adventure_bullseye,limit=1] achievement.values 2
 scoreboard players set @e[tag=achievement,tag=husbandry_safely_harvest_honey,limit=1] achievement.values 2
 scoreboard players set @e[tag=achievement,tag=husbandry_breed_an_animal,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=husbandry_allay_deliver_item_to_player,limit=1] achievement.values 5
@@ -93,15 +93,15 @@ scoreboard players set @e[tag=achievement,tag=husbandry_tame_an_animal,limit=1]
 scoreboard players set @e[tag=achievement,tag=husbandry_make_a_sign_glow,limit=1] achievement.values 3
 scoreboard players set @e[tag=achievement,tag=husbandry_fishy_business,limit=1] achievement.values 2
 scoreboard players set @e[tag=achievement,tag=husbandry_silk_touch_nest,limit=1] achievement.values 8
-scoreboard players set @e[tag=achievement,tag=husbandry_tadpole_in_a_bucket,limit=1] achievement.values 3
+scoreboard players set @e[tag=achievement,tag=husbandry_tadpole_in_a_bucket,limit=1] achievement.values 2
 scoreboard players set @e[tag=achievement,tag=husbandry_plant_seed,limit=1] achievement.values 1
 scoreboard players set @e[tag=achievement,tag=husbandry_wax_on,limit=1] achievement.values 2
-scoreboard players set @e[tag=achievement,tag=husbandry_bred_all_animals,limit=1] achievement.values 9
+scoreboard players set @e[tag=achievement,tag=husbandry_bred_all_animals,limit=1] achievement.values 14
 scoreboard players set @e[tag=achievement,tag=husbandry_allay_deliver_cake_to_note_block,limit=1] achievement.values 7
 scoreboard players set @e[tag=achievement,tag=husbandry_complete_catalogue,limit=1] achievement.values 8
 scoreboard players set @e[tag=achievement,tag=husbandry_tactical_fishing,limit=1] achievement.values 1
 scoreboard players set @e[tag=achievement,tag=husbandry_leash_all_frog_variants,limit=1] achievement.values 8
-scoreboard players set @e[tag=achievement,tag=husbandry_balanced_diet,limit=1] achievement.values 15
+scoreboard players set @e[tag=achievement,tag=husbandry_balanced_diet,limit=1] achievement.values 26
 scoreboard players set @e[tag=achievement,tag=husbandry_obtain_netherite_hoe,limit=1] achievement.values 12
 scoreboard players set @e[tag=achievement,tag=husbandry_wax_off,limit=1] achievement.values 1
 scoreboard players set @e[tag=achievement,tag=husbandry_axolotl_in_a_bucket,limit=1] achievement.values 3

diff --git a/docs/achievements.json b/docs/achievements.json
@@ -38,6 +38,7 @@
         "advanced_almost_full": 15,
         "advanced_full": 16,
         "advanced_max": 20,
+        "advanced_max_max": 26,
         "advanced_full_max": 32,
         "what": 100
     },
@@ -146,7 +147,7 @@
             "description": "Diamond armor saves lives",
             "id": "shiny_gear",
             "category": "story",
-            "points": "mid"
+            "points": "start_bit_less"
         },
         {
             "icon": "diamond_chestplate",
@@ -163,7 +164,7 @@
             "description": "Enchant an item at an Enchantment Table",
             "id": "enchant_item",
             "category": "story",
-            "points": "speedrun"
+            "points": "start_but_not"
         },
         {
             "icon": "golden_apple",
@@ -530,7 +531,7 @@
             "description": "Free fall from the top of the world (build limit) to the bottom of the world and survive",
             "id": "fall_from_world_height",
             "category": "adventure",
-            "points": "speedrun_a_bit"
+            "points": "speedrun_end"
         },
         {
             "icon": "sculk_sensor_side",
@@ -597,7 +598,7 @@
             "id": "kill_all_mobs",
             "category": "adventure",
             "type": "fancy",
-            "points": "advanced"
+            "points": "advanced_max_max"
         },
         {
             "icon": "totem_of_undying",
@@ -615,15 +616,15 @@
             "id": "summon_iron_golem",
             "category": "adventure",
             "type": "oval",
-            "points": "normal"
+            "points": "speedrun_end"
         },
         {
             "icon": "emerald",
             "name": "Star Trader",
             "description": "Trade with a Villager at the build height limit",
             "id": "trade_at_world_height",
             "category": "adventure",
-            "points": "advanced"
+            "points": "advanced_almost_full"
         },
         {
             "icon": "crossbow_standby",
@@ -699,7 +700,7 @@
             "id": "sniper_duel",
             "category": "adventure",
             "type": "fancy",
-            "points": "start_but_not"
+            "points": "start"
         },
         {
             "icon": "target_side",
@@ -708,7 +709,7 @@
             "id": "bullseye",
             "category": "adventure",
             "type": "fancy",
-            "points": "start_less"
+            "points": "bit_harder"
         },
         {
             "icon": "honey_bottle",
@@ -780,7 +781,7 @@
             "description": "Catch a Tadpole in a Bucket",
             "id": "tadpole_in_a_bucket",
             "category": "husbandry",
-            "points": "start_less"
+            "points": "bit_harder"
         },
         {
             "icon": "wheat",
@@ -805,7 +806,7 @@
             "id": "bred_all_animals",
             "category": "husbandry",
             "type": "fancy",
-            "points": "speedrun_end"
+            "points": "advanced"
         },
         {
             "icon": "note_block",
@@ -848,7 +849,7 @@
             "id": "balanced_diet",
             "category": "husbandry",
             "type": "fancy",
-            "points": "advanced_almost_full"
+            "points": "advanced_max_max"
         },
         {
             "icon": "netherite_hoe",

diff --git a/docs/css/style.css b/docs/css/style.css
@@ -96,6 +96,10 @@
     color: #FFD966 !important;
     --color: #1d1b8d;
 }
+[data-points="52"] {
+    color: #FFD966 !important;
+    --color: #1b1983;
+}
 [data-points="64"] {
     color: #FFD966 !important;
     --color: #131177;

diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
-        "description": "Achievement Race for 1.19\n\u00A762022.1009 \u00A7r• \u00A7bplexion.dev",
+        "description": "Achievement Race for 1.19\n\u00A762022.1013 \u00A7r• \u00A7bplexion.dev",
         "pack_format": 10
     }
 }