diff --git a/arena.lua b/arena.lua index 222b8f0..98065fd 100644 --- a/arena.lua +++ b/arena.lua @@ -389,7 +389,7 @@ function Arena:update(dt) ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() slow_amount = 1 - gold = 2 + gold = 3 passives = {} main_song_instance:stop() run_passive_pool_by_tiers = { @@ -567,7 +567,7 @@ function Arena:update(dt) ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() slow_amount = 1 - gold = 2 + gold = 3 passives = {} main_song_instance:stop() run_passive_pool_by_tiers = { @@ -667,31 +667,6 @@ function Arena:quit() self.credits_button = Button{group = self.ui, x = gw - 40, y = gh - 44, force_update = true, button_text = 'credits', fg_color = 'bg10', bg_color = 'bg', action = function() self:create_credits() end} - --[[ - self.restart_button = Button{group = self.ui, x = gw - 40, y = gh - 68, force_update = true, button_text = 'restart', fg_color = 'bg10', bg_color = 'bg', action = function(b) - self.transitioning = true - ui_transition2:play{pitch = random:float(0.95, 1.05), volume = 0.5} - ui_switch2:play{pitch = random:float(0.95, 1.05), volume = 0.5} - ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} - TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() - slow_amount = 1 - gold = 2 - passives = {} - main_song_instance:stop() - run_passive_pool_by_tiers = { - [1] = { 'wall_echo', 'wall_rider', 'centipede', 'temporal_chains', 'amplify', 'amplify_x', 'ballista', 'ballista_x', 'blunt_arrow', 'berserking', 'unwavering_stance', 'assassination', 'unleash', 'blessing', - 'hex_master', 'force_push', 'spawning_pool'}, - [2] = {'ouroboros_technique_r', 'ouroboros_technique_l', 'intimidation', 'vulnerability', 'resonance', 'point_blank', 'longshot', 'explosive_arrow', 'chronomancy', 'awakening', 'ultimatum', 'echo_barrage', - 'reinforce', 'payback', 'whispers_of_doom', 'heavy_impact', 'immolation', 'call_of_the_void'}, - [3] = {'divine_machine_arrow', 'divine_punishment', 'flying_daggers', 'crucio', 'hive', 'void_rift'}, - } - max_units = 7 + current_new_game_plus - main:add(BuyScreen'buy_screen') - system.save_run() - main:go_to('buy_screen', 0, {}, passives) - end, text = Text({{text = '[wavy, bg]restarting...', font = pixul_font, alignment = 'center'}}, global_text_tags)} - end} - ]]-- end end) @@ -991,7 +966,7 @@ function Arena:die() ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() slow_amount = 1 - gold = 2 + gold = 3 passives = {} main_song_instance:stop() run_passive_pool_by_tiers = { diff --git a/assets/media/achievement_mercenaries_win.png b/assets/media/achievement_mercenaries_win.png index 75ab2bf..298c1f5 100644 Binary files a/assets/media/achievement_mercenaries_win.png and b/assets/media/achievement_mercenaries_win.png differ diff --git a/buy_screen.lua b/buy_screen.lua index ba8919a..faae610 100644 --- a/buy_screen.lua +++ b/buy_screen.lua @@ -138,7 +138,7 @@ function BuyScreen:on_enter(from, level, units, passives, shop_level, shop_xp) ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() slow_amount = 1 - gold = 2 + gold = 3 passives = {} main_song_instance:stop() run_passive_pool_by_tiers = { @@ -522,7 +522,7 @@ function RestartButton:update(dt) ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5} TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = fg[0], transition_action = function() slow_amount = 1 - gold = 2 + gold = 3 passives = {} main_song_instance:stop() run_passive_pool_by_tiers = { diff --git a/main.lua b/main.lua index 495e167..8768dce 100644 --- a/main.lua +++ b/main.lua @@ -1465,8 +1465,14 @@ function init() --[[ main:add(Arena'arena') - main:go_to('arena', 4, { - {character = 'plague_doctor', level = 3}, + main:go_to('arena', 21, { + {character = 'plague_doctor', level = 2}, + {character = 'swordsman', level = 3}, + {character = 'barbarian', level = 2}, + {character = 'outlaw', level = 2}, + {character = 'warden', level = 2}, + {character = 'juggernaut', level = 2}, + {character = 'blade', level = 2}, }, passives) ]]--