diff --git a/Actors/admonitor.lua b/Actors/admonitor.lua index c1b1c6d6..9c746a26 100644 --- a/Actors/admonitor.lua +++ b/Actors/admonitor.lua @@ -123,7 +123,7 @@ statePuncherPrimary:onStep(function(actor, data) if data.fired == 2 and actor.image_index >= 16 then data.fired = 3 if gm._mod_net_isHost() then - local attack = actor:fire_explosion(actor.x + 75 * actor.image_xscale, actor.y - 5, 130, 32, 4.2, nil, gm.constants.wSparks4).attack_info + local attack = actor:fire_explosion(actor.x + 75 * actor.image_xscale, actor.y - 13, 130, 40, 4.2, nil, gm.constants.wSparks4).attack_info attack.__ssr_puncher_push = 4 * actor.image_xscale end end diff --git a/CHANGELOG.md b/CHANGELOG.md index dd3d7846..66657225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # SSR Changelog *spoilers below!!* +## 0.1.3 +- Added 3-4 skins to every survivor except Technician (cuz he had them already) +- Resprited Balloon, Coffee Bag, Cryptic Source, Juddering Egg, Roulette, Watch Metronome and Wonder Herbs +- Added a log for MULE +- Added a russian translation for Clay Admonitor's log +- Clay Admonitor's attack is now slightly taller so you can't jump over it +- Artifact of Displacement no longer includes stage 5s in the randomization process (broke Artifact of Tempus unlock) +- Fixed M.I.D.A.S not giving money +- Fixed Technician crashing the game when attempting to build a turret while holding a Mocha +- Fixed Technician upgraded Forced Shutdown mine erroring when a Magma Worm or a Bramble are in its range + ## 0.1.2 - Various fixes for Mule and Technician - New enemy: Clay Admonitor diff --git a/Items/balloon.lua b/Items/balloon.lua index b2cb5246..2cd43dcd 100644 --- a/Items/balloon.lua +++ b/Items/balloon.lua @@ -1,4 +1,4 @@ -local sprite_item = Resources.sprite_load(NAMESPACE, "Balloon", path.combine(PATH, "Sprites/Items/balloon.png"), 1, 17, 17) +local sprite_item = Resources.sprite_load(NAMESPACE, "Balloon", path.combine(PATH, "Sprites/Items/balloon.png"), 1, 17, 19) local sprite_effect = Resources.sprite_load(NAMESPACE, "EfBalloon", path.combine(PATH, "Sprites/Items/Effects/balloon.png"), 6, 4, 6) local sound_pop = Resources.sfx_load(NAMESPACE, "BalloonPop", path.combine(PATH, "Sounds/Items/balloonPop.ogg")) diff --git a/Sprites/Items/balloon.png b/Sprites/Items/balloon.png index ffc6c61c..b2f2e09b 100644 Binary files a/Sprites/Items/balloon.png and b/Sprites/Items/balloon.png differ diff --git a/Survivors/technician.lua b/Survivors/technician.lua index 7f522b13..639125f4 100644 --- a/Survivors/technician.lua +++ b/Survivors/technician.lua @@ -902,7 +902,7 @@ end) obj_mine_pull:onStep(function(inst) inst.ff = inst.ff + 1 local targets = List.new() - inst:collision_circle_list(inst.x, inst.y, MACHINE_MINE_PULL_RADIUS, gm.constants.pActorCollisionBase, false, true, targets, false) + inst:collision_circle_list(inst.x, inst.y, MACHINE_MINE_PULL_RADIUS, gm.constants.pActor, false, true, targets, false) for _, target in ipairs(targets) do --Check if we should pull the target --Pulling is weird with ropes so climbing enemies are excluded