From 1bedffdab78bb797e2041a478b87197d45b7ddd0 Mon Sep 17 00:00:00 2001
From: a327ex <adonaac@gmail.com>
Date: Sun, 4 Jul 2021 18:24:31 -0300
Subject: [PATCH] Bug fixes

---
 buy_screen.lua | 2 --
 enemies.lua    | 1 +
 main.lua       | 7 +++++--
 mainmenu.lua   | 9 ++++++++-
 todo           | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/buy_screen.lua b/buy_screen.lua
index 0475a81..96b4525 100644
--- a/buy_screen.lua
+++ b/buy_screen.lua
@@ -47,8 +47,6 @@ function BuyScreen:on_enter(from, level, loop, units, passives, shop_level, shop
   self.shop_xp = shop_xp
   camera.x, camera.y = gw/2, gh/2
 
-  print(self.loop)
-
   input:set_mouse_visible(true)
 
   steam.friends.setRichPresence('steam_display', '#StatusFull')
diff --git a/enemies.lua b/enemies.lua
index 68ba218..08f7c6b 100644
--- a/enemies.lua
+++ b/enemies.lua
@@ -195,6 +195,7 @@ function Seeker:init(args)
       if self.headbutt_charging or self.headbutting then return end
       self.headbutt_charging = true
       self.t:tween(2, self.color, {r = fg[0].r, b = fg[0].b, g = fg[0].g}, math.cubic_in_out, function()
+        if self.silenced or self.barbarian_stunned then return end
         self.t:tween(0.25, self.color, {r = orange[0].r, b = orange[0].b, g = orange[0].g}, math.linear)
         self.headbutt_charging = false
         headbutt1:play{pitch = random:float(0.95, 1.05), volume = 0.2}
diff --git a/main.lua b/main.lua
index 6a9c0c5..09f7928 100644
--- a/main.lua
+++ b/main.lua
@@ -1904,6 +1904,7 @@ function open_options(self)
         ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5}
         TransitionEffect{group = main.transitions, x = gw/2, y = gh/2, color = state.dark_transitions and bg[-2] or fg[0], transition_action = function()
           slow_amount = 1
+          music_slow_amount = 1
           gold = 3
           passives = {}
           main_song_instance:stop()
@@ -1913,12 +1914,14 @@ function open_options(self)
             'tremor', 'heavy_impact', 'fracture', 'meat_shield', 'hive', 'baneling_burst', 'blunt_arrow', 'explosive_arrow', 'divine_machine_arrow', 'chronomancy', 'awakening', 'divine_punishment',
             'assassination', 'flying_daggers', 'ultimatum', 'magnify', 'echo_barrage', 'unleash', 'reinforce', 'payback', 'enchanted', 'freezing_field', 'burning_field', 'gravity_field', 'magnetism',
             'insurance', 'dividends', 'berserking', 'unwavering_stance', 'unrelenting_stance', 'blessing', 'haste', 'divine_barrage', 'orbitism', 'psyker_orbs', 'psychosink', 'rearm', 'taunt', 'construct_instability',
+            'intimidation', 'vulnerability', 'temporal_chains', 'ceremonial_dagger', 'homing_barrage', 'critical_strike', 'noxious_strike', 'infesting_strike', 'burning_strike', 'lucky_strike', 'healing_strike', 'stunning_strike',
+            'silencing_strike', 'culling_strike', 'lightning_strike', 'psycholeak', 'divine_blessing', 'hardening', 
           }
-          max_units = 7 + current_new_game_plus
+          max_units = math.clamp(7 + current_new_game_plus + self.loop, 7, 12)
           main:add(BuyScreen'buy_screen')
           locked_state = nil
           system.save_run()
-          main:go_to('buy_screen', 1, {}, passives, 1, 0)
+          main:go_to('buy_screen', 1, 0, {}, passives, 1, 0)
         end, text = Text({{text = '[wavy, ' .. tostring(state.dark_transitions and 'fg' or 'bg') .. ']restarting...', font = pixul_font, alignment = 'center'}}, global_text_tags)}
       end}
     end
diff --git a/mainmenu.lua b/mainmenu.lua
index 433bdac..8d8af79 100644
--- a/mainmenu.lua
+++ b/mainmenu.lua
@@ -119,13 +119,20 @@ function MainMenu:on_enter(from)
     love.event.quit()
   end}
   self.t:every(2, function() self.soundtrack_button.spring:pull(0.025, 200, 10) end)
-  self.soundtrack_button = Button{group = self.main_ui, x = gw - 72, y = gh - 17, force_update = true, button_text = 'buy the soundtrack!', fg_color = 'bg10', bg_color = 'bg', action = function(b)
+  self.soundtrack_button = Button{group = self.main_ui, x = gw - 72, y = gh - 40, force_update = true, button_text = 'buy the soundtrack!', fg_color = 'bg10', bg_color = 'bg', action = function(b)
     ui_switch2:play{pitch = random:float(0.95, 1.05), volume = 0.5}
     b.spring:pull(0.2, 200, 10)
     b.selected = true
     ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5}
     system.open_url('https://kubbimusic.com/album/ember')
   end}
+  self.discord_button = Button{group = self.main_ui, x = gw - 92, y = gh - 17, force_update = true, button_text = 'join the community discord!', fg_color = 'bg10', bg_color = 'bg', action = function(b)
+    ui_switch2:play{pitch = random:float(0.95, 1.05), volume = 0.5}
+    b.spring:pull(0.2, 200, 10)
+    b.selected = true
+    ui_switch1:play{pitch = random:float(0.95, 1.05), volume = 0.5}
+    system.open_url('https://discord.gg/Yjk2Q5gDqA')
+  end}
 end
 
 
diff --git a/todo b/todo
index b3647b6..80bb86c 100644
--- a/todo
+++ b/todo
@@ -84,6 +84,7 @@ Invoker - casts attacks and spells from other units
 
 Future ideas:
 Chaos related classes
+Cartographer - https://i.imgur.com/Bz6glry.png
 Trappers:
 Emitters: +projectile damage, projectile mods
   warping