From b335a623096b65d8cd78ce28adfacc798a4dba45 Mon Sep 17 00:00:00 2001 From: a327ex Date: Fri, 11 Jun 2021 09:07:27 -0300 Subject: [PATCH] Bug fixes --- arena.lua | 31 ++----------------- assets/media/achievement_mercenaries_win.png | Bin 2182 -> 1660 bytes buy_screen.lua | 4 +-- main.lua | 10 ++++-- 4 files changed, 13 insertions(+), 32 deletions(-) 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 75ab2bf3753969e4d7d0d5ca7ddc34f7033c0098..298c1f510efef1db7c2b943408b5791e50a1ad20 100644 GIT binary patch literal 1660 zcmd5-k55xq7`^YM1zI8?)!>8xF#?-zP{HwIQlO5B#6q1;B5GR@q%s(EGDb7Vi0FCJuE4%)U%Je67>?<<(S7lxZSFlw74hEVMh%NSMlM66hzm!iXf^pkZD2Dg4v;JMjgF`MCz;R7pWf zojaPqm}!Y_Qi#n>NSF<8tWBceqz)+v9U<`gjwD~JTtP*ucB5h{@>VdBNIsbwYe18@ zsJP8e$QdYYZt$ie|6tO@CoCX%qWsAo;lj&S3G;cIC&-rq29R94N8tS&y|@m9z8{Aa zJ0`UR-kFXF@um(MLIKrMkd>txRNiBYq9}lxh$yZW60_O7e3#rDD%Plbs`}tv;1^p3 z8d=ki2f7%lS(Q=&Cs&iy8yXEm!``(iAd~@0rn|81jTOEpHBa3-!27q}VuLfUEK+x! z0TCuGNOAA8sj7ZgN;AzN#sP2G-sW_CKf!DYHdjmdQeTm zP&T%S%bq_4*`HjbW?M=|iM*BgUchG{8~cI;s`oUYBenA3#37maO0C(VSo=&nNC3H3 zlI}Kp_2zPP+=f}gDByS)FcI$@Q7Jcs0l#qY6T@O3ZqCGc`Ro>^se91kblCm`F&CE0 zNu$kF6i%PT;5x|8&b5xH`?vabV>tQv%m9HUP|E?N6Rx-JI(r7+#OV}S+Z$49Gyd3^4Z^X zI(_=A*ZEgiJg#F9cP~Xf^m@mdB8qq^Rt^OW2Z@C{UY!cab8Xuuzc?AAdL3LjyA6AY z1>>fM3vRwX?KK*WjL&ONzIB|8`K=Yib8kiuUVJ#mk$dt&AfFh-Xxz&r8f~4>*9@R< zTq>&kV+HUl@Xg^0v}L7^CHmWW0`St>nd?ICs}Y8jXt3=rB9IG=me0El9Ci@ymnPsD z^Ve3;;~Xr&k6nD-%znpXVv)Z~ARbps;TQX=Y1kUL7d)f>g8dR*htbw>6ep=$*|_x1 z#q{rLQo-&7L6U(*+|7V_X91EhbF KnJQbKbMS8xb#5sD literal 2182 zcma)8YgAKL7Cx6iKp;ZLA_G){byex$BNY(@fgp^C8V0C<4-qhWZ}gpi4R6TJ{|eAF0d@OvbNzs#w|#!yGCP-_wvtb^?J`cecsVut3k$l+B1AtpH8}#>q+&>JLO$$F19(W(*1MHhK+%Ipae>7PNwm#AwCh> zOns-{AlP4NCy!#uug5G5$kdX^Y0}2IeoK$O98zsAJ+gxyyOL#-W>yzi*nsTTEUK0p z@Hx$_>t8iK{<1%yJNuWci87)>*MNXDV}6O$CN_n-Y? zkYq_$(Yn}Tln87yB;swA!Dc&0z|i0@i46Qtz}hz0s=JS15_Z3C7IPVbGA`p-e7lt! zL*Yp6lb7;xeRuZ%iyk|Tx+bpg5ztD%h!2F!?2Le?Y`6e>vzmq6RzS1P{^m+1S{Ic8%WpYZH!dJ1P%g8a3U+YR*Y z?RWXfC*sm%wR_9Gvu^Tf?$}_JHQEpa=PZ2J3#J1q4*UW`11W=`K2X8+&t5*i53B#^ z?xLi?$3>{7>K{ISU0eImm-{FE+%1%3j8GVa7u23`-#R2}hUGm7M!0vD?ky+!I?@&C zv>)(u1Hk78X-XH`vkXj5zVh5o54l8^)Dp^Cj?l}XcGO_mRoo;a-l9oVdB@^Sxjny4 zt9_JzuvSZ>cMc7q=n$+)TZkk^^dDfrILZOBeAdhOz@YJJRj(NCb}%HEd|x|F>vz$; zptu`EZbIs+f8kVwLP}wFkJ*m*imhOdN@V`9SYVz%aBJImkYHLTk$3dA=>_#ZjNtiq z;#rTp|2-?-M3;F#$IMY$$|K>Jc*7xv*B3`@h0o+ESgirS%TZJb`2+SoR8k3He~qz7 zmH1ksh-_P+e`m#H&MKFcI$5Pw$EAsBIcGYSbnR{a+e;6j(!HW8Kp2F&u{6ZXh}j|7 zJ3nW)ssz<)Jn^{9hry{*n<%Mb9tlr$H-r-MxvQQ4c~OH689L?0*sEA~UQg9#FP^Jg zq)Jjg#mscSfqbH=*9X;rjyw8#d!k>8`|_BEhd)f_bF|t@8Pq7v>D`_Z4<9cL-WQl+0AZ@Zbe0fjfWCa*PiGeX9Y`K zkUCIfjB<&1N7Kvm`1wN=RLT|-ZqJqzQLr$LG@)sTC^L`>8k03me9rW;f3#|o26(=4 zf7O+ag}X(-+$9>5utQ)z{~#oS>SmY;Eg0t});i*7jo10A3We-#M21NQzaNdnIbC=Y zMYupdj9lH}?bh)TsUeZpwewe%m24#*Suo0s{q4EAGR)8#3gpj~n;~f479pZ=fl=m( w|7VjpZ!OcAXAx2&Hks-E&9VDaTl$pVp@35m6JU1%{yTu6KL-ai@1dOk58K?9)&Kwi 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) ]]--