Update1.15

data/achievement.lua

@@ -587,7 +587,7 @@ local d = {
         quote = [[Put your blood, sweat, and tears into the climb, or fall.]],
         credit = "@Tizago",
         rank = floorRank(1, 3, 4, 5, 6, 7, 8),
-        hide = function() return GAME.completion.EX == 0 end,
+        hide = function() return GAME.completion.EX == 0 or GAME.completion.VL == 0 end,
     },
     { -- ASGVrDPrMS
         ex = true,
@@ -707,7 +707,7 @@ local d = {
         ex = true,
         id = 'the_unreliable_one',
         name = "The Unreliable One",
-        desc = [[Highest amount of KILLs in a single reversed Duo run]],
+        desc = [[Highest amount of KILLs in a single reversed "Duo" run]],
         quote = [["I'll never let you off."]],
         scoreSimp = function(kill) return kill .. " Kills" end,
         rank = numberRank(0, 2, 3, 4, 5, 6, 8),
@@ -870,7 +870,7 @@ local d = {
         ex = true,
         id = 'zero_to_sixty',
         name = "Zero-to-sixty",
-        desc = [[Fastest time to reach Gigaspeed using NH rVL AS]],
+        desc = [[Fastest time to reach GIGASPEED using NH rVL AS]],
         quote = [["Didn't even need the 1-foot rollout!"]],
         comp = '<',
         credit = "@FCSplayz",
@@ -886,6 +886,7 @@ local d = {
         quote = [[Three steps forward, two steps back. Six steps forward, five steps back.]],
         scoreSimp = function(kill) return kill .. " Entries" end,
         rank = numberRank(0, 2, 3, 3, 4, 4, 5),
+        hide = function() return STAT.totalGiga == 0 end,
     },
     { -- under_the_radar
         ex = true,
@@ -914,7 +915,7 @@ local d = {
         quote = [[Excessive restraint can make one deeply entangled in it.]],
         comp = '<',
         scoreSimp = function(flip) return floor(flip) .. " Flips" end,
-        rank = numberRankRev(90, 86, 84, 82, 80, 77, 74),
+        rank = numberRankRev(100, 88, 85, 82, 80, 78, 74),
         hide = function() return GAME.completion.NH == 0 end,
     },
     { -- detail_oriented
@@ -2157,7 +2158,7 @@ local d = {
     { -- music_man (1.1.2)
         id = 'music_man',
         name = "Music Man!!!",
-        desc = [[Enable the Music Player in ZCEM]],
+        desc = [[Access the Music Player via ZCEM]],
         quote = [["Wait, why is "GAME PLAY" a button? Also, isn't it just one word?"]],
         credit = "@TrevorSmithy",
         hide = TRUE,

data/combo.lua

@@ -449,6 +449,7 @@ d.gameEX = {
     { set = "EX NH GV VL DH", name = "The Veteran" },
     { set = "EX NH GV VL IN", name = "Foresight" },
     { set = "EX NH GV VL AS", name = "Recursion of Death" },
+    { set = "EX NH GV VL DP", name = "Quadruple Maxout" },
     { set = "EX NH GV DH IN", name = "Readlock" },
     { set = "EX NH GV DH AS", name = "The Kill Screen" },
     { set = "EX NH GV DH DP", name = "The hanged down pair" },
@@ -492,9 +493,10 @@ d.gameEX = {
     { set = "EX GV DH AS DP", name = "Omni Spinners" },
     { set = "EX GV IN AS DP", name = "Masterclass" },
     { set = "EX VL DH IN AS", name = "Reverse Quintuple Threat" },
+    { set = "EX VL DH IN DP", name = "False Allies" },
     { set = "EX VL DH AS DP", name = "Hello BPM Year" },
     { set = "EX VL IN AS DP", name = "Oblivious Spider" },
-    { set = "EX DH IN AS DP", name = "Lost and Forgotten" },
+    { set = "EX DH IN AS DP", name = "Professional Bodybuilder" },
     { set = "NH MS GV VL DH", name = "Quintuple threat" },
     { set = "NH MS GV VL IN", name = "The Guardian of Change" },
     { set = "NH MS GV VL AS", name = "Dreadlock" },
@@ -515,7 +517,7 @@ d.gameEX = {
     { set = "NH GV VL DH AS", name = "Demonic Possession" },
     { set = "NH GV VL DH DP", name = "Duality" },
     { set = "NH GV VL IN AS", name = "Ergosphere" },
-    { set = "NH GV VL IN DP", name = "Abysmal Connection" },
+    { set = "NH GV VL IN DP", name = "Dual Black Hole System" },
     { set = "NH GV VL AS DP", name = "Forced Evolution" },
     { set = "NH GV DH IN AS", name = "Cheat Code" },
     { set = "NH GV DH IN DP", name = "Living in the Past" },

data/devcommentary.lua

@@ -408,7 +408,7 @@ return {
         I guess I'll have to just keep on going, pulling myself forward. If I wait around too long, I'll never get anything done.
     ]],
     ['eEX rNH rMS rGV eVL rDH rIN eAS rDP'] = STRING.trimIndent [[
-        The Overwhelemed Smithy, because, well, I'm Trevor Smithy and I feel like I get overwhelmed easily.
+        The Overwhelmed Smithy, because, well, I'm Trevor Smithy and I feel like I get overwhelmed easily.
         Too many things happening at once, too many conditions to handle, too many things to account for with my plans.
         Makes it necessary to step back and determine what's truly important, what truly necessitates my attention.
         Some things have to be discarded in order to clear a path to your goals.
@@ -419,6 +419,18 @@ return {
         I guess, after all this, I've come to realize that eventually you just have to accept that things won't get done if...
         well, if you don't do them. And that's okay. Not every project has to finished, not every dream seen through.
     ]],
+    ['rEX eNH eMS eGV rVL eDH eIN rAS eDP'] = STRING.trimIndent [[
+        The Underwhelmed Smithy... Is this even truly a "Smithy" if it doesn't have eEX eVL eAS?
+        Well, I found it funny, and it is an interesting run in my opinion, so here ya go.
+        The only reason this has dev commentary is because of the red text.
+    ]],
+    ['uEX eNH eMS eGV uVL eDH eIN uAS eDP'] = STRING.trimIndent [[
+        The Whelmed Smithy... Is this even truly a "Smithy" if it doesn't have eEX eVL eAS?
+        Now, I used to think that you could be overwhelmed or underwhelmed, but you could never just be
+        w h e l m e d
+        Turns out that "officially" whelmed is just a synonym of overwhelmed, although in more contemporary examples it has taken on a
+        definition of "content" or "satisfied." Which definition is more accurate for this, I am not sure. I leave that up to you, player.
+    ]],
     --one of mine
     ['eEX uGV eDH eAS'] = STRING.trimIndent [[
         But It Isn't One Of Mine, the Easy Mode counterpart to the Patience Is A Virtue achievement.

data/devscore.lua

@@ -1,4 +1,4 @@
-local d = {ASMSrDHrIN=848.9,swamp_water_lite_plus=4878.84,swamp_water_plus=2714.92,talentless=7817.15,quest_rationing=631.02,the_responsible_one=18,the_unreliable_one=14,the_responsible_one_plus=144,guardian_angel=6061.19,carried=5528.27,level_19_cap=7207.94,the_escape_artist=132,the_artist_trinity=503.8,fel_magic=107,empurple=2919.81,autoplay_is_awesome=1658.4,spotless=2916.6,a_mutual_agreement=3620.9,the_cheaters=1786.5,overprotection=1986.85,clutch_main=191,sunk_cost=4278.1,wax_wings=2412.74,the_masterful_juggler=122,the_oblivious_artist=172,zero_to_sixty=5.4,speed_bonus=10,under_the_radar=119.726,arrogance=772.74,scarcity_mindset=57,detail_oriented=0,psychokinesis=1692,divine_rejection=1649.9,moon_struck=0,lovers_promise=10598.95,hardcore_beginning=13.88,love_hotel=2.597011165,financially_responsible=5.898309714,unfair_battle=4.344901018,museum_heist=2.4841288230001,workaholic=2.3799148589999,human_experiment=2.733007991,thermal_anomaly=0.467,ultra_dash=0.496,identity=0,the_perfectionist=8310.52,cruise_control=23,dazed=16,drag_racing=29,space_race=209,fickle_fuel=851.3,the_spike_of_all_time_plus=498,blight=7733.35,desolation=6284.45,havoc=3656.14,pandemonium=3481.3,inferno=2875.1,purgatory=1840,perdition=1624.7,cataclysm=1395.49,annihilation=777.19,armageddon=423.31,abyss=196.02,cut_off=0,worn_out=0,the_harbinger=0,final_defiance=0,speedrun_speedrunning=0,abyss_weaver=0,royal_resistance=0,lovers_stand=0,romantic_homicide=0,benevolent_ambition=0,blazing_speed=0,dusty_memories=0,its_kinda_rare=0,fruitless_effort=0,false_god=0,respectful=0,zenith_relocation=0,intended_glitch=0,lucky_coincidence=0,zenith_traveler=0,dark_force=0,return_to_the_light=true,smooth_dismount=0,naga_eyes=26.456631063,clicker_speedrun=15.466656532,zenith_explorer_plus=18681.62,zenith_explorer=10666.27,plonk=148.99,speed_player=6735,rMS=3982.7,rNH=6282.1,rVL=6036.9,DH=9644.52,elegance=443220,clicker=1144046,perfect_speedrun=23.747579831,VL=11377.6,NH=10586.4,MS=6326.3,IN=10929.7,GV=10604.39,EX=8612.63,DP=10598.95,contender=10266,AS=18681.62,garbage_offensive=2239880,tower_climber=6651015.7,tower_regular=31857,rIN=5503.13,rGV=8520,rEX=2807.73,rDP=3980.74,rDH=4273.85,rAS=13294.7,supercharged=288,supercharged_plus=447,multitasker=61866.8,effective=41446.887071386,zenith_speedrun=48.891,zenith_speedrun_plus=28.87,zenith_challenger=97361.9,divine_challenger=54681.7,zenith_speedrunner=480.712,divine_speedrunner=691.846,the_spike_of_all_time=437,the_spike_of_all_time_minus=192,clock_out=874,vip_list=126,GVIN=9358.41,ASNH=14508.3,DPEX=5417.82,GVNH=8373.29,DHMSNH=7020.5,DHEXNH=6784.1,DHEXMSVL=2766.57,ASEXVL=4432.7,swamp_water_lite=4878.84,swamp_water=2985.03,rGVrIN=6076.5,EXNHrAS=5891.7,INrASrDHrNH=2711.9,DHEXrGV=6096.52,EXGVNHrMS=2860.57,ASDPGVrMSrNH=2005.6,DHrEXrVL=1664.66,ASGVrDPrMS=1853.87,NHVLrDPrGV=2178.42,VLrEXrIN=1688.17,rDPrEX=2279.1,INMSrDHrEX=1244.64,
+local d = {DHrEXrVL=1664.66,ASGVrDPrMS=1853.87,NHVLrDPrGV=2178.42,VL=11377.6,NH=10586.4,MS=6326.3,IN=10929.7,GV=10604.39,EX=8612.63,DP=10598.95,DH=9644.52,AS=18681.62,rVL=6036.9,rNH=6282.1,rMS=3982.7,rIN=5503.13,rGV=8520,rEX=2807.73,rDP=3980.74,rDH=4273.85,rAS=13294.7,royal_resistance=0,lovers_stand=0,romantic_homicide=0,benevolent_ambition=0,blazing_speed=0,dusty_memories=0,its_kinda_rare=0,fruitless_effort=0,false_god=0,respectful=0,zenith_relocation=0,intended_glitch=0,lucky_coincidence=0,zenith_traveler=0,dark_force=0,return_to_the_light=true,smooth_dismount=0,moon_struck=0,lovers_promise=10598.95,hardcore_beginning=13.88,love_hotel=2.597011165,financially_responsible=5.898309714,unfair_battle=4.344901018,museum_heist=2.4841288230001,workaholic=2.3799148589999,human_experiment=2.733007991,thermal_anomaly=0.467,ultra_dash=0.496,perfect_speedrun=22.744034702,the_perfectionist=8310.52,cruise_control=23,identity=0,ASDPGVrMSrNH=2005.6,speed_bonus=10,zero_to_sixty=5.4,the_oblivious_artist=172,wax_wings=2412.74,sunk_cost=4278.1,autoplay_is_awesome=1658.4,spotless=2916.6,clutch_main=191,the_masterful_juggler=122,empurple=2919.81,level_19_cap=7207.94,the_artist_trinity=503.8,the_escape_artist=132,the_cheaters=1786.5,a_mutual_agreement=3620.9,overprotection=1986.85,abyss_weaver=0,speedrun_speedrunning=0,final_defiance=0,the_harbinger=0,VLrEXrIN=1688.17,rDPrEX=2279.1,INMSrDHrEX=1244.64,clicker=1159046,under_the_radar=54.641,pandemonium=3481.3,inferno=2875.1,purgatory=1840,perdition=1624.7,cataclysm=1395.49,annihilation=777.19,armageddon=423.31,abyss=196.02,cut_off=0,worn_out=0,desolation=6284.45,blight=7733.35,the_spike_of_all_time_plus=626,fickle_fuel=851.3,space_race=209,drag_racing=29,havoc=3656.14,divine_rejection=1649.9,psychokinesis=1692,detail_oriented=0,scarcity_mindset=57,arrogance=772.74,ASMSrDHrIN=848.9,swamp_water_lite_plus=4878.84,swamp_water_plus=2714.92,talentless=7817.15,quest_rationing=631.02,the_responsible_one=18,the_responsible_one_plus=144,the_unreliable_one=14,guardian_angel=6061.19,carried=5528.27,contender=10447,elegance=448861,garbage_offensive=2268623,tower_climber=6726205.5,tower_regular=32310,speed_player=6862,plonk=148.99,zenith_explorer=10666.27,zenith_explorer_plus=18681.62,clicker_speedrun=15.466656532,naga_eyes=26.456631063,supercharged=288,supercharged_plus=447,multitasker=61866.8,effective=41446.887071386,zenith_speedrun=47.469,zenith_speedrun_plus=28.87,zenith_challenger=97361.9,divine_challenger=54681.7,zenith_speedrunner=480.712,divine_speedrunner=691.846,the_spike_of_all_time=533,the_spike_of_all_time_minus=192,clock_out=892,vip_list=130,GVIN=9358.41,ASNH=14508.3,DPEX=5417.82,GVNH=8373.29,DHMSNH=7020.5,DHEXNH=6784.1,DHEXMSVL=2766.57,ASEXVL=4432.7,swamp_water_lite=4878.84,swamp_water=2985.03,rGVrIN=6076.5,EXNHrAS=5891.7,INrASrDHrNH=2711.9,DHEXrGV=6096.52,EXGVNHrMS=2860.57,dazed=16,
 --deleted MrZ score
     patience_is_a_virtue=2627.37,
 -- Trevor Smithy Dev scores

data/revive.lua

@@ -26,9 +26,7 @@ local function notEMSorF6() return math.max(GAME.floor, GAME.negFloor) >= 6 and
 local function notEasyName() return not STAT.easyName end -- whether or not to use SWAMP WATER or BATH WATER
 local function easyName() return STAT.easyName end
 local function EDP() return GAME.mod.DP == -1 and GAME.mod.NH ~= 2 and GAME.animDuration < 26 end --3rd quest, don't do if rNH or excessive animDuration
-local function notUASandEDP() return not (GAME.mod.AS == 2 and URM and GAME.mod.DP == -1) end -- friend won't let you kill yourself
 local function notEDHandEDP() return GAME.mod.DH ~= -1 and GAME.mod.DP ~= -1 end -- friend removes annoying revive task
-local function notRGVandEDP() return not (GAME.mod.GV == 2 and GAME.mod.DP == -1) and math.max(GAME.floor, GAME.negFloor) <= 5 end --- no commit for 6 seconds
 
 ---@class Prompt
 ---@field rank number[]
@@ -49,8 +47,8 @@ local d = {
     { rank = { 1, 2 }, prompt = 'flip',                 target = 50,  short = "Flip 50",                 text = "Flip 50 cards" },
     { rank = { 3, 4 }, prompt = 'flip',                 target = 120, short = "Flip 120",                text = "Flip 120 cards" },
     { rank = { 5, 6 }, prompt = 'flip',                 target = 300, short = "Flip 300",                text = "Flip 300 cards" },
-    { rank = { 1, 2 }, prompt = 'flip_single',          target = 10,  short = "Flip single 10",          text = "Flip a single card\n10 times in a row",       cond = notUASandEDP },
-    { rank = { 2, 4 }, prompt = 'flip_single',          target = 20,  short = "Flip single 20",          text = "Flip a single card\n20 times in a row",       cond = notUASandEDP },
+    { rank = { 1, 2 }, prompt = 'flip_single',          target = 10,  short = "Flip single 10",          text = "Flip a single card\n10 times in a row",       cond = function() return not (URM and GAME.mod.AS == 2) end },
+    { rank = { 2, 4 }, prompt = 'flip_single',          target = 20,  short = "Flip single 20",          text = "Flip a single card\n20 times in a row",       cond = function() return not (URM and GAME.mod.AS == 2) end },
     { rank = { 1, 2 }, prompt = 'commit',               target = 6,   short = "Commit 6x",               text = "Commit 6 times" },
     { rank = { 2, 3 }, prompt = 'commit',               target = 15,  short = "Commit 15x",              text = "Commit 15 times" },
     { rank = { 3, 5 }, prompt = 'commit',               target = 30,  short = "Commit 30x",              text = "Commit 30 times" },
@@ -128,7 +126,7 @@ local d = {
     { rank = { 4, 6 }, prompt = 'keep_health_safe',     target = 8,   short = "Safe HP 8s",              text = "Keep HP safe\nfor 8 seconds",                 cond = F6 },
     { rank = { 4, 5 }, prompt = 'keep_health_danger',   target = 3,   short = "Critical HP 3s",          text = "Keep HP critical\nfor 3 seconds",             cond = notEMSorF6 },
     { rank = { 2, 5 }, prompt = 'keep_no_mouse',        target = 4,   short = "No mouse 4s",             text = "Don't use the mouse\nfor 4 seconds",          cond = f5 },
-    { rank = { 2, 4 }, prompt = 'keep_no_commit',       target = 6,   short = "No commit 6s",            text = "Don't commit\nfor 6 seconds",                 cond = notRGVandEDP },
+    { rank = { 2, 4 }, prompt = 'keep_no_commit',       target = 6,   short = "No commit 6s",            text = "Don't commit\nfor 6 seconds",                 cond = function() return math.max(GAME.floor, GAME.negFloor) <= 5 and not ((URM or GAME.mod.DP == -1) and GAME.mod.GV == 2) end },
     { rank = { 3, 6 }, prompt = 'keep_no_cancel',       target = 8,   short = "No cancel 8s",            text = "Don't cancel\nfor 8 seconds" },
     { rank = { 2, 5 }, prompt = 'keep_no_keyboard',     target = 10,  short = "No keyboard 10s",         text = "Don't use the keyboard\nfor 10 seconds",      cond = F6 },
     { rank = { 3, 5 }, prompt = 'keep_no_perfect',      target = 12,  short = "No perfect 12s",          text = "Have no perfect\npasses for 12 seconds",      cond = notENH },

data/sfx.lua

@@ -97,34 +97,34 @@ return {
     combo_2 = { 296, 1 },
     combo_3 = { 131, 1 },
     combo_4 = { 707, 1 },
-    combo_5=                     {435, 1},
-    combo_6=                     {391, 1},
-    combo_7=                     {30,  1},
-    combo_8=                     {752, 1},
-    combo_9=                     {95,  1},
-    combo_10=                    {329, 1},
-    combo_11=                    {772, 1},
-    combo_12=                    {605, 1},
-    combo_13=                    {281, 1},
-    combo_14=                    {159, 1},
-    combo_15=                    {812, 1},
-    combo_16=                    {62,  1},
-    combo_1_power=               {290, 1},
-    combo_2_power=               {7,   1},
-    combo_3_power=               {518, 1},
-    combo_4_power=               {21,  1},
-    combo_5_power=               {352, 1},
-    combo_6_power=               {143, 1},
-    combo_7_power=               {558, 1},
-    combo_8_power=               {356, 1},
-    combo_9_power=               {241, 1},
-    combo_10_power=              {288, 1},
-    combo_11_power=              {354, 1},
-    combo_12_power=              {109, 1},
-    combo_13_power=              {197, 1},
-    combo_14_power=              {395, 1},
-    combo_15_power=              {206, 1},
-    combo_16_power=              {788, 2},
+    combo_5 = { 435, 1 },
+    combo_6 = { 391, 1 },
+    combo_7 = { 30, 1 },
+    combo_8 = { 752, 1 },
+    combo_9 = { 95, 1 },
+    combo_10 = { 329, 1 },
+    combo_11 = { 772, 1 },
+    combo_12 = { 605, 1 },
+    combo_13 = { 281, 1 },
+    combo_14 = { 159, 1 },
+    combo_15 = { 812, 1 },
+    combo_16 = { 62, 1 },
+    combo_1_power = { 290, 1 },
+    combo_2_power = { 7, 1 },
+    combo_3_power = { 518, 1 },
+    combo_4_power = { 21, 1 },
+    combo_5_power = { 352, 1 },
+    combo_6_power = { 143, 1 },
+    combo_7_power = { 558, 1 },
+    combo_8_power = { 356, 1 },
+    combo_9_power = { 241, 1 },
+    combo_10_power = { 288, 1 },
+    combo_11_power = { 354, 1 },
+    combo_12_power = { 109, 1 },
+    combo_13_power = { 197, 1 },
+    combo_14_power = { 395, 1 },
+    combo_15_power = { 206, 1 },
+    combo_16_power = { 788, 2 },
     combobreak = { 377, 1 },
 
     -- btb_1=                       {507, 1},
@@ -174,7 +174,7 @@ return {
     -- finish=                      {409, 2.7},
     -- death=                       {798, 0.6},
     elim = { 460, 0.5 },
-    -- levelup=                     {522, 1.4},
+    levelup=                     {522, 1.4},
     shatter = { 300, 3 },
     hyperalert = { 333, 1.7 },
     topout = { 709, 4.6 },
@@ -239,7 +239,7 @@ return {
     -- level500=                    {587, 5},
     maintenance = { 178, 1.1 },
     map_change = { 538, 2.12 },
-    -- matchintro=                  {489, 16.5},
+    matchintro=                  {489, 16.5},
     -- mission_free=                {88,  3.4},
     -- mission_league=              {672, 11.2},
     -- mission_versus=              {397, 4.9},