From 3ba5a3ec814b152a9a88a792085b4cf8e3c15e69 Mon Sep 17 00:00:00 2001
From: a327ex <adonaac@gmail.com>
Date: Sat, 19 Jun 2021 12:35:56 -0300
Subject: [PATCH] Bug fixes

---
 arena.lua                   |   1 -
 assets/media/item_cover.png | Bin 0 -> 6253 bytes
 enemies.lua                 |  14 ++--
 main.lua                    |  20 ++----
 player.lua                  |   4 +-
 todo                        | 135 ++----------------------------------
 6 files changed, 22 insertions(+), 152 deletions(-)
 create mode 100644 assets/media/item_cover.png

diff --git a/arena.lua b/arena.lua
index e0cb96d..39d4e3b 100644
--- a/arena.lua
+++ b/arena.lua
@@ -54,7 +54,6 @@ function Arena:on_enter(from, level, units, passives, shop_level, shop_xp, lock)
   self.main:enable_trigger_between('enemy_projectile', 'player')
   self.main:enable_trigger_between('player', 'enemy_projectile')
   self.main:enable_trigger_between('enemy_projectile', 'enemy')
-  self.main:enable_trigger_between('enemy', 'enemy_projectile')
   self.main:enable_trigger_between('player', 'ghost')
   self.main:enable_trigger_between('ghost', 'player')
 
diff --git a/assets/media/item_cover.png b/assets/media/item_cover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c8b88dbfe317a869edb7d4d11972db5ae838ac8
GIT binary patch
literal 6253
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
E--ZnHbN~PV

literal 0
HcmV?d00001

diff --git a/enemies.lua b/enemies.lua
index 0af918d..dda6222 100644
--- a/enemies.lua
+++ b/enemies.lua
@@ -393,12 +393,14 @@ function Seeker:on_collision_enter(other, contact)
     end
 
     if main.current.player.fracture then
-      trigger:after(0.01, function()
-        earth2:play{pitch = random:float(0.95, 1.05), volume = 0.5}
-        for i = 1, 6 do
-          Projectile{group = main.current.main, x = self.x, y = self.y, color = red[0], r = (i-1)*math.pi/3, v = 200, dmg = 30, parent = main.current.player, pierce = 1}
-        end
-      end)
+      if self.being_pushed then
+        trigger:after(0.01, function()
+          earth2:play{pitch = random:float(0.95, 1.05), volume = 0.5}
+          for i = 1, 6 do
+            Projectile{group = main.current.main, x = self.x, y = self.y, color = red[0], r = (i-1)*math.pi/3, v = 200, dmg = 30, parent = main.current.player, pierce = 1}
+          end
+        end)
+      end
     end
 
     if self.headbutter and self.headbutting then
diff --git a/main.lua b/main.lua
index 4cd504a..f317686 100644
--- a/main.lua
+++ b/main.lua
@@ -1502,20 +1502,12 @@ function init()
   
   --[[
   main:add(Arena'arena')
-  main:go_to('arena', 3, {
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-    {character = 'vulcanist', level = 3},
-  }, passives)
+  main:go_to('arena', 4, {
+    {character = 'arcanist', level = 1},
+    {character = 'witch', level = 1},
+    {character = 'gambler', level = 1},
+    {character = 'illusionist', level = 1},
+  }, {{passive = 'freezing_field', level = 1}})
   ]]--
 
   --[[
diff --git a/player.lua b/player.lua
index 07dda38..378a0eb 100644
--- a/player.lua
+++ b/player.lua
@@ -2313,7 +2313,7 @@ function Area:init(args)
         self.parent.t:every(0.3, function()
           _G[random:table{'cannoneer1', 'cannoneer2'}]:play{pitch = random:float(0.95, 1.05), volume = 0.5}
           Area{group = main.current.effects, x = self.x + random:float(-32, 32), y = self.y + random:float(-32, 32), r = self.r + random:float(0, 2*math.pi), w = self.parent.area_size_m*48, color = self.parent.color, 
-            dmg = 0.5*self.parent.area_dmg_m*self.dmg, character = self.character, level = self.parent.level, parent = self.parent, echo_barrage_area = true}
+            dmg = 0.5*self.parent.area_dmg_m*(self.dmg or self.parent.dmg), character = self.character, level = self.parent.level, parent = self.parent, echo_barrage_area = true}
         end, self.parent.echo_barrage)
       end
     end
@@ -3127,7 +3127,7 @@ function Gold:update(dt)
       self:apply_force(20*math.cos(r), 20*math.sin(r))
     end
   end
-  self.magnet_sensor:move_to(self.x, self.y)
+  if self.magnet_sensor then self.magnet_sensor:move_to(self.x, self.y) end
 end
 
 
diff --git a/todo b/todo
index 620a64e..2fb8f69 100644
--- a/todo
+++ b/todo
@@ -1,132 +1,3 @@
-Item Update
-  New mechanics
-    * Spend gold to level items up
-    * Block levelling for unlevellable items
-  Items
-    General:
-      * Centipede - +10/20/30% movement speed
-      * Ouroboros Technique R - rotating around yourself to the right releases 2/3/4 projectiles per second
-      * Ouroboros Technique L - rotating around yourself to the left grants +15/25/35% defense to all units
-      * Amplify - +20/35/50% AoE damage
-      * Resonance - all AoE attacks deal +3/5/7% damage per unit hit
-      * Ballista - +20/35/50% projectile damage
-      * Call of the Void - +30/60/90% DoT damage
-      * Crucio - taking damage also shares that damage across all enemies at 20/30/40% its value
-    Position:
-      * Speed 3 - position 3 has +50% attack speed
-      * Damage 4 - position 4 has +30% damage
-      * Level 5 - position 5 is 1 level higher
-      * Death 6 - position 6 takes 15% of its health as damage every 3 seconds
-      * Lasting 7 - position 7 will stay alive for 10 seconds after dying
-      * Defense Stance - first and last positions have +10/20/30% defense
-      * Offensive Stance - first and last positions have +10/20/30% damage
-    Death:
-      * Kinetic Bomb - when a unit dies it explodes, launching enemies away
-      * Porcupine Technique - when a unit dies it explodes, releasing piercing projectiles
-      * Last Stand - the last unit alive is fully healed and receives a +20% bonus to all stats
-    Voider:
-      * Seeping - enemies taking DoT damage take +15/20/25% damage from all sources for 6 seconds
-      * Deceleration - enemies damaged by voiders have their movement speed reduced by 15/20/25%
-      * Annihilation - when a voider dies deal its DoT damage to all enemies for 3 seconds
-    Curser:
-      * Malediction - +1/3/5 max curse targets to all allied cursers
-      * Hextouch - enemies take 10/15/20 damage per second for 3 seconds when cursed
-      * Whispers of Doom - curses apply doom, when 4/3/2 doom instances are reached they deal 100/150/200
-    Forcer:
-      * Tremor - when enemies die from hitting walls they create a damaging area with size according to the knockback force
-      * Heavy Impact - when enemies hit walls they take damage according to the knockback force
-      * Fracture - when enemies die from hitting walls explode into projectiles
-    Swarmer:
-      * Meat Shield - critters block enemy projectiles
-      * Hive - critters have +1/2/3 HP
-      * Baneling Burst - critters die immediately on contact but also deal AoE damage
-    Ranger:
-      * Blunt Arrow - arrows fired by rangers have a 10/20/30% chance to knockback
-      * Explosive Arrow - arrows fired by rangers have a 10/20/30% chance to explode, dealing 10/20/30% AoE damage
-      * Divine Machine Arrow - arrows fired by rangers have a 10/20/30% chance to seek enemies and pierce 1/2/3 times
-    Mage:
-      * Chronomancy - mages cast their spells 15/25/35% faster
-      * Awakening - +50/75/100% attack speed and damage to 1 mage every round for that round
-      * Divine Punishment - repeatedly deal damage to all enemies based on how many mages you have
-    Rogue:
-      * Assassination - crits from rogues deal 8/10/12x damage but normal attacks deal half damage
-      * Flying Daggers - all projectiles thrown by rogues chain +2/3/4 times
-      * Ultimatum - projectiles that chain gain +10/20/30% damage with each chain
-    Nuker:
-      * Magnify - +20/35/50% area size
-      * Echo Barrage - 10/20/30% chance to create 1/2/3 secondary AoEs on AoE hit
-      * Unleash - all nukers gain +1% area size and damage every second
-    Enchanter:
-      * Reinforce - +10/20/30% damage, defense and attack speed to all allies with at leats one enchanter 
-      * Payback - +2/5/8% damage to all allies whenever an enchanter is hit
-      * Enchanted - when enemies die they have a 10/20/30% release X homing projectiles, where X is how many enchanters you have
-    Sorcerer:
-      * Freezing Field - Create an area that slows enemies by 50% for 2 seconds whenever a sorcerer repeats a spell
-      * Burning Field - Create an area that deals 30 damage per second for 2 seconds whenever a sorcerer repeats a spell
-      * Gravity Field - Create an area that sucks enemies in for 2 seconds whenever a sorcerer repeats a spell
-    Mercenary:
-      * Magnetism - Gold coins are attracted to the snake
-      * Insurance - Dying heroes have 4 times the chance of mercenary's bonus to drop 2 gold on death
-      * Dividends - Mercenaries deal +X% extra damage, where X is how much gold you have
-    Warrior:
-      * Berserking - all warriors have up to +50/75/100% attack speed based on missing HP
-      * Unwavering Stance - all warriors gain +4/8/12% defense every 5 seconds
-      * Unrelenting Stance - +2/5/8% defense to all allies whenever a warrior is hit
-  Removed items
-    * Wall Echo
-    * Wall Rider
-    * Point Blank
-    * Longshot
-    * Hex Master
-    * Force Push
-    * Spawning Pool
-    * Void Rift
-    * Blessing
-    * Immolation
-  Balance
-    * Increased voider DoT damage bonus to 20/40% (from 15/25%)
-    * Decreased shop reroll cost to 10
-    * Decreased mercenary gold drop chance to 8/16% (from 10/20%)
-    * Changed Merchant to tier 1
-    * Changed Merchant interest to cap at 10 (having more than 100 gold won't generate more interest from the merchant)
-    * Changed Miner to tier 2
-    * Changed Arcanist projectiles to pierce once (from infinite)
-    * Changed Exploder to create a mine on death, it will explode into projectiles after a delay (this delay is smaller on higher NG+ difficulties)
-    * Decreased Shooter projectile fire rate, speed, and now the projectiles can also be blocked by enemies
-    * Decreased Tank knockback resistance
-    * Decreased level 25 elite knockback resistance
-    * Changed Beastmaster's Lv.3 effect to spawn 4 small critters when it gets hit (from 2)
-    * Changed Corruptor's Lv.3 effect to spawn 2 small critters on hit (from 3)
-  QoL
-    * Added snake to the passive selection screen
-    * Changed Volcano's icon to be a triangle instead of X so it isn't confused with a spawn marker
-    * Improved Beastmaster and Corruptor description with text describing their attack and how much damage it deals
-    * Added visual effect for when defensive ouroboros is active
-    * Added an option to force all screen transitions to be dark
-    * Added tier text to characters on the shop screen
-    * Added shop unit highlights/markers to make it easier to tell when you already own something
-    * Added unit names to the "your build" section of the end game screen
-  Bug fixes
-    * Fixed ouroboros technique passives not working with mouse controls
-    * Fixed mouse not showing up on death
-    * Fixed NG+5 achievement not triggering (this happened only between last Sunday night and Monday morning due to a small update I pushed breaking it)
-    * Fixed a bug where the nuker class was not counting towards Vagrant's and Psyker's active set bonus
-    * Fixed a bug where passives would sometimes disappear from a run?
-    * Fixed a bug where clicking "window size-" too many times could bug out the game
-    * Fixed a bug where the shop would be rerolled after quitting in the arena
-    * Fixed a bug where units could be duplicated in the shop by locking and quitting the game at certain steps
-    * Fixed a bug where quitting on level 2 would go back to level 1 shop (again)
-    * Fixed multiple bugs related to locking the shop and quitting
-    * Fixed a bug where mouse cursor wasn't visible on death
-    * Fixed a bug where NG+ level wasn't increased when the game is beaten but only when the NG+ button was clicked
-    * Fixed a bug where level 2 and level 3 achievements (win with only level 2/3 units) were not triggering correctly sometimes
-    * Fixed a bug where shop level wasn't respected on the shop's first roll
-    * Fixed multiple crashes that would happen when picking up gold
-    * Fixed a crash when the jester's curse would trigger
-    * Fixed a crash when gold would be picked up with a Miner in the party
-    * Fixed a crash involving broken state for Pets, Critters or Volcanos
-    * Fixed a crash that happened after rerolling items too many times
-
 Endless Update
   Healer rework:
     Enemies have an X/Y% chance to create healing cells on death
@@ -149,12 +20,17 @@ Endless Update
       Arena run button
       Options button
       Quit button
+    https://i.imgur.com/4hOt5uX.png "party 7/9"
   Bug fixes
     Fix fullscreen with different resolutions that don't scale properly - https://steamcommunity.com/app/915310/discussions/0/3106901665841020282/
     Fix enemies still spawning after arena clear (this happens with the extra enemy spawns that were blocked earlier)
     Kill enemies that go outside play area - https://i.imgur.com/QPgZbve.png
     https://i.imgur.com/lCdPFZx.png
     https://i.imgur.com/qrExpq5.png
+    https://i.imgur.com/Rk6qbDD.png - merchant doesnt give reroll if dies
+    https://i.imgur.com/8he1WDm.png - infinite money
+    https://i.imgur.com/0wZ5wma.png - max unit bugged when changing ng mid run
+    https://i.imgur.com/1soUUdk.png - 5th position stops shooting when 1-4 die
 
 ---
 
@@ -169,6 +45,7 @@ Brawlers: units focused on crashing on enemies
   https://i.imgur.com/5YubukS.png - unit idea
 Conjurer unit that creates an unit that actively protects you from enemy projectiles
 Guardians - https://i.imgur.com/Ynu5Cdw.png
+Cultists - https://i.imgur.com/GsfoZBd.png
 Assists (2/4) - 
   Ringmaster (tier 4 assist, nuker) - +15% to all stats to adjacent units, Lv.3 effect - create a cross that deals AoE damage 5 times for 10 seconds
   Absorber (tier 2 assist, warrior) - absorbs 50% damage from adjacent units, Lv.3 effect - absorbs 75% damage from adjacent units and gives the absorber +25% defense