FILES
-----
debug.macros
dialog\bountytarget.config
dungeons\microdungeons\bounty\boatvault_2.json
dungeons\microdungeons\bounty\boat_4.json
dungeons\space\bountyspacesafehouse\end_2.json
dungeons\space\bountyspacesafehouse\end_3.json
dungeons\space\bountyspacesafehouse\room_1.json
dungeons\space\bountyspacesafehouse\room_10.json
dungeons\space\bountyspacesafehouse\room_2.json
dungeons\space\bountyspacesafehouse\room_3.json
dungeons\space\bountyspacesafehouse\room_4.json
dungeons\space\bountyspacesafehouse\room_5.json
dungeons\space\bountyspacesafehouse\room_6.json
dungeons\space\bountyspacesafehouse\room_7.json
dungeons\space\bountyspacesafehouse\room_8.json
dungeons\space\bountyspacesafehouse\room_9.json
interface\scripted\bountyboard\bountyboardgui.config
monsters\boss\swansong\swansong.lua
monsters\flyers\scandroid\cultistscandroid.monstertype
monsters\ghosts\ignome\electricignome.monstertype
monsters\walkers\crabcano\icecrabcano.monstertype
monsters\walkers\smoglin\poisonsmoglin.monstertype
quests\bounty\bounty.lua
quests\bounty\generator.config
quests\bounty\kill_bounty_monster.questtemplate
quests\bounty\stages.lua
scripts\bountygeneration.lua
scripts\player\playerbounty.lua
stats\effects\elitemonster\elitemonster.lua
stats\effects\elitemonster\elitemonster.statuseffect

DIFFS
-----
debug.macros
3d2
<     "/admin",
18,19c17
<     "/warp instanceworld:outpost",
<     "/admin"
---
>     "/warp instanceworld:outpost"
27d24
<     "/admin",
67,68c64
<     "/enabletech blinkdash",
<     "/admin"
---
>     "/enabletech blinkdash"

dialog\bountytarget.config
389,435c389,420
<       "default" : {
<         "default" : [
<           "Ha! You want to try again? You won't catch me!",
<           "You came back, Peacekeeper? I didn't think you had it in you!",
<           "You came back for another round against the ^orange;<gangName>^reset;?"
<         ]
<       },
<       "apex" : {
<         "default" : [
<           "So, you want to try again? That's some real monkey business!",
<           "You came back, Peacekeeper? I didn't think you had it in you!",
<           "You came back for another round against the ^orange;<gangName>^reset;?"
<         ]
<       },
<       "avian" : {
<         "default" : [
<           "So, you want to try again? You won't catch but a feather from my head!",
<           "You came back, Peacekeeper? I didn't think you had it in you!",
<           "You came back for another round against the ^orange;<gangName>^reset;?"
<         ]
<       },
<       "floran" : {
<         "default" : [
<           "You came back to fight Floran? You aren't ssso smart!"
<         ]
<       },
<       "glitch" : {
<         "default" : [
<           "Excited. So, you want to try again? You won't catch me!",
<           "Impressed. You came back, Peacekeeper? I didn't think you had it in you!",
<           "Surprised. You came back for another round against the ^orange;<gangName>^reset;?"
<         ]
<       },
<       "hylotl" : {
<         "default" : [
<           "So, you want to try again? You won't catch me!",
<           "You came back, Peacekeeper? I didn't think you had it in you!",
<           "You came back for another round against the ^orange;<gangName>^reset;?"
<         ]
<       },
<       "novakid" : {
<         "default" : [
<           "So, you want to try again? You ain't gonna catch me that easily!",
<           "You came back, Peacekeeper? I didn't think you had the guts!",
<           "You came back for another round against the ^orange;<gangName>^reset;? I guess you ain't very smart!"
<         ]
<       }
---
>     "default" : {
>       "default" : [
>         "Ha! You want to try again? You won't catch me!",
>         "You came back, Peacekeeper? I didn't think you had it in you!",
>         "You came back for another round against the ^orange;<gangName>^reset;?"
>       ]
>     },
>     "apex" : {
>       "default" : [
>         "So, you want to try again? That's some real monkey business!",
>         "You came back, Peacekeeper? I didn't think you had it in you!",
>         "You came back for another round against the ^orange;<gangName>^reset;?"
>       ]
>     },
>     "avian" : {
>       "default" : [
>         "So, you want to try again? You won't catch but a feather from my head!",
>         "You came back, Peacekeeper? I didn't think you had it in you!",
>         "You came back for another round against the ^orange;<gangName>^reset;?"
>       ]
>     },
>     "floran" : {
>       "default" : [
>         "You came back to fight Floran? You aren't ssso smart!"
>       ]
>     },
>     "glitch" : {
>       "default" : [
>         "Excited. So, you want to try again? You won't catch me!",
>         "Impressed. You came back, Peacekeeper? I didn't think you had it in you!",
>         "Surprised. You came back for another round against the ^orange;<gangName>^reset;?"
>       ]
436a422,436
>     "hylotl" : {
>       "default" : [
>         "So, you want to try again? You won't catch me!",
>         "You came back, Peacekeeper? I didn't think you had it in you!",
>         "You came back for another round against the ^orange;<gangName>^reset;?"
>       ]
>     },
>     "novakid" : {
>       "default" : [
>         "So, you want to try again? You ain't gonna catch me that easily!",
>         "You came back, Peacekeeper? I didn't think you had the guts!",
>         "You came back for another round against the ^orange;<gangName>^reset;? I guess you ain't very smart!"
>       ]
>     }
>   },
438,492c438,460
<       "default" : {
<         "default" : [
<           "That's what you get for trying to lock ME up!",
<           "That's what you get for messing with the ^orange;<gangName>^reset;!",
<           "Ha! ^orange;<gangName>^reset; forever!",
<           "Another win for the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "apex" : {
<         "default" : [
<           "That's what you get for trying to lock ME up!",
<           "That's what you get for messing with the ^orange;<gangName>^reset;!",
<           "Ha! ^orange;<gangName>^reset; forever!",
<           "Another win for the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "avian" : {
<         "default" : [
<           "That's what you get for trying to lock ME up!",
<           "That's what you get for messing with the ^orange;<gangName>^reset;!",
<           "Ha! ^orange;<gangName>^reset; forever!",
<           "Another win for the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "floran" : {
<         "default" : [
<           "Floran won? Floran WON!",
<           "Floran enjoysss a good fight!",
<           "You messsed with the wrong gang! Floran isss part of the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "glitch" : {
<         "default" : [
<           "Overjoyed. That is what you get for trying to lock me up!",
<           "Pleased. This is what you get for messing with the ^orange;<gangName>^reset;!",
<           "Ecstatic. The ^orange;<gangName>^reset; will not be bested!",
<           "Overjoyed. Yet another win for the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "hylotl" : {
<         "default" : [
<           "That's what you get for trying to lock ME up!",
<           "That's what you get for messing with the ^orange;<gangName>^reset;!",
<           "Ha! ^orange;<gangName>^reset; forever!",
<           "Another win for the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "novakid" : {
<         "default" : [
<           "You ain't gonna jail me so easy! You got what you deserve!",
<           "That's what you get for messin' with the ^orange;<gangName>^reset;!",
<           "Ha! ^orange;<gangName>^reset; forever!",
<           "Another win for the ^orange;<gangName>^reset;!"
<         ]
<       }
---
>     "default" : {
>       "default" : [
>         "That's what you get for trying to lock ME up!",
>         "That's what you get for messing with the ^orange;<gangName>^reset;!",
>         "Ha! ^orange;<gangName>^reset; forever!",
>         "Another win for the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "apex" : {
>       "default" : [
>         "That's what you get for trying to lock ME up!",
>         "That's what you get for messing with the ^orange;<gangName>^reset;!",
>         "Ha! ^orange;<gangName>^reset; forever!",
>         "Another win for the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "avian" : {
>       "default" : [
>         "That's what you get for trying to lock ME up!",
>         "That's what you get for messing with the ^orange;<gangName>^reset;!",
>         "Ha! ^orange;<gangName>^reset; forever!",
>         "Another win for the ^orange;<gangName>^reset;!"
>       ]
493a462,493
>     "floran" : {
>       "default" : [
>         "Floran won? Floran WON!",
>         "Floran enjoysss a good fight!",
>         "You messsed with the wrong gang! Floran isss part of the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "glitch" : {
>       "default" : [
>         "Overjoyed. That is what you get for trying to lock me up!",
>         "Pleased. This is what you get for messing with the ^orange;<gangName>^reset;!",
>         "Ecstatic. The ^orange;<gangName>^reset; will not be bested!",
>         "Overjoyed. Yet another win for the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "hylotl" : {
>       "default" : [
>         "That's what you get for trying to lock ME up!",
>         "That's what you get for messing with the ^orange;<gangName>^reset;!",
>         "Ha! ^orange;<gangName>^reset; forever!",
>         "Another win for the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "novakid" : {
>       "default" : [
>         "You ain't gonna jail me so easy! You got what you deserve!",
>         "That's what you get for messin' with the ^orange;<gangName>^reset;!",
>         "Ha! ^orange;<gangName>^reset; forever!",
>         "Another win for the ^orange;<gangName>^reset;!"
>       ]
>     }
>   },
496,550c496,548
<       "default" : {
<         "default" : [
<           "Hey, did they give up? Haha, no-one will ever stop ME!",
<           "Looks like the Peacekeeper chickened out! Just as I thought.",
<           "I can't find them... They must have fled in fear!",
<           "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "apex" : {
<         "default" : [
<           "Hey, did they give up? Haha, no-one will ever stop ME!",
<           "Looks like the Peacekeeper chickened out! Just as I thought.",
<           "I can't find them... They must have fled in fear!",
<           "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "avian" : {
<         "default" : [
<           "Hey, did they give up? Haha, no-one will ever stop ME!",
<           "Looks like the Peacekeeper chickened out! Just as I thought.",
<           "I can't find them... They must have fled in fear!",
<           "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "floran" : {
<         "default" : [
<           "Did they run from Floran? Floran mussst be too ssscary for them!",
<           "Floran mussst be too ssscary to fight!"
<         ]
<       },
<       "glitch" : {
<         "default" : [
<           "Bemused. Did they flee? We were having such fun!",
<           "Unimpressed. It appears to be that the Peacekeeper has fled in cowardice! Just as I thought.",
<           "Surprised. I cannot find them... Perhaps they fled in fear?",
<           "Surprised. I don't blame them for running away - they WERE messing with the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "hylotl" : {
<         "default" : [
<           "Hey, did they give up? Haha, no-one will ever stop ME!",
<           "Looks like the Peacekeeper chickened out! Just as I thought.",
<           "I can't find them... They must have fled in fear!",
<           "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
<         ]
<       },
<       "novakid" : {
<         "default" : [
<           "Did they just pack up an' leave? What a yellow-belly!",
<           "Looks like the Peacekeeper ran away! They ain't gonna come round these parts anytime soon, I'm sure...",
<           "I can't find them... Dangnabbit!",
<           "Where in tarnation did that Peacekeeper go?",
<           "That's what you get for messin' with the ^orange;<gangName>^reset;!"
<         ]
<       }
---
>       "default" : [
>         "Hey, did they give up? Haha, no-one will ever stop ME!",
>         "Looks like the Peacekeeper chickened out! Just as I thought.",
>         "I can't find them... They must have fled in fear!",
>         "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "apex" : {
>       "default" : [
>         "Hey, did they give up? Haha, no-one will ever stop ME!",
>         "Looks like the Peacekeeper chickened out! Just as I thought.",
>         "I can't find them... They must have fled in fear!",
>         "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "avian" : {
>       "default" : [
>         "Hey, did they give up? Haha, no-one will ever stop ME!",
>         "Looks like the Peacekeeper chickened out! Just as I thought.",
>         "I can't find them... They must have fled in fear!",
>         "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "floran" : {
>       "default" : [
>         "Did they run from Floran? Floran mussst be too ssscary for them!",
>         "Floran mussst be too ssscary to fight!"
>       ]
>     },
>     "glitch" : {
>       "default" : [
>         "Bemused. Did they flee? We were having such fun!",
>         "Unimpressed. It appears to be that the Peacekeeper has fled in cowardice! Just as I thought.",
>         "Surprised. I cannot find them... Perhaps they fled in fear?",
>         "Surprised. I don't blame them for running away - they WERE messing with the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "hylotl" : {
>       "default" : [
>         "Hey, did they give up? Haha, no-one will ever stop ME!",
>         "Looks like the Peacekeeper chickened out! Just as I thought.",
>         "I can't find them... They must have fled in fear!",
>         "I suppose they fled. I don't blame them - they WERE messing with the ^orange;<gangName>^reset;!"
>       ]
>     },
>     "novakid" : {
>       "default" : [
>         "Did they just pack up an' leave? What a yellow-belly!",
>         "Looks like the Peacekeeper ran away! They ain't gonna come round these parts anytime soon, I'm sure...",
>         "I can't find them... Dangnabbit!",
>         "Where in tarnation did that Peacekeeper go?",
>         "That's what you get for messin' with the ^orange;<gangName>^reset;!"
>       ]

dungeons\microdungeons\bounty\boatvault_2.json
[TMX file differences are left out for huge size.]

dungeons\microdungeons\bounty\boat_4.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\end_2.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\end_3.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_1.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_10.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_2.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_3.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_4.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_5.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_6.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_7.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_8.json
[TMX file differences are left out for huge size.]

dungeons\space\bountyspacesafehouse\room_9.json
[TMX file differences are left out for huge size.]

interface\scripted\bountyboard\bountyboardgui.config
265c265
<         "minorSpecial" : ["cyberspace"],
---
>         "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
282c282
<         "minorSpecial" : ["cyberspace"],
---
>         "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
299c299
<         "minorSpecial" : ["cyberspace"],
---
>         "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
316c316
<         "minorSpecial" : ["cyberspace"],
---
>         "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
333c333
<         "minorSpecial" : ["cyberspace"],
---
>         "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
357c357
<       "minorSpecial" : ["cyberspace"],
---
>       "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
375c375
<       "minorSpecial" : ["cyberspace"],
---
>       "minorSpecial" : ["cyberspace", "minorMonster", "minorPlanet"],
503d502
<         "endStep" : "capture_bounty",

monsters\boss\swansong\swansong.lua
1307c1307
<   await(resetBoss())
---
>   resetAttacks()

monsters\flyers\scandroid\cultistscandroid.monstertype
57c57
<             "windupTime" : 0.4,
---
>             "windupTime" : 0.8,
61c61
<               "speed" : 50
---
>               "speed" : 35
69,70c69,70
<             "winddownState" : "",
<             "winddownTime" : 0.5
---
>             "winddownState" : "idle",
>             "winddownTime" : 2.0

monsters\ghosts\ignome\electricignome.monstertype
173,175d172
<         "lavaImmunity" : {
<           "baseValue" : 1.0
<         },

monsters\walkers\crabcano\icecrabcano.monstertype
183,185d182
<         "lavaImmunity" : {
<           "baseValue" : 1.0
<         },

monsters\walkers\smoglin\poisonsmoglin.monstertype
194,196d193
<         "lavaImmunity" : {
<           "baseValue" : 1.0
<         },

quests\bounty\bounty.lua
79,80d78
<   
<   self.playingMusic = true
193,196c191
<   if self.playingMusic then
<     world.sendEntityMessage(player.id(), "stopAltMusic")
<     self.playingMusic = false
<   end
---
>   world.sendEntityMessage(player.id(), "stopBountyMusic")

quests\bounty\generator.config
3c3
<   "assignmentMinWorlds" : 30,
---
>   "assignmentMinWorlds" : 25,
8c8,9
<     "magma"
---
>     "magma",
>     "garden"
556a558,561
>         },
>         "gang" : {
>           "type" : "stagehand",
>           "stagehand" : "gangspawn"
566c571
<           "location" : "clue",
---
>           "location" : "gang",
597a603,606
>         },
>         "gang" : {
>           "type" : "stagehand",
>           "stagehand" : "gangspawn"
604a614,619
>         },
>         "gang" : {
>           "location" : "gang",
>           "type" : "npc",
>           "gangMember" : true,
>           "multiple" : true
632a648,651
>         },
>         "gang" : {
>           "type" : "stagehand",
>           "stagehand" : "gangspawn"
642c661
<           "location" : "clue",
---
>           "location" : "gang",
765c784,788
<           "stagehand" : "clueroom"
---
>           "stagehand" : "bountyspawn"
>         },
>         "gang" : {
>           "type" : "stagehand",
>           "stagehand" : "gangspawn"
775c798
<           "location" : "clue",
---
>           "location" : "gang",
839c862
<           "stagehand" : "clueroom"
---
>           "stagehand" : "bountyspawn"
896a920,923
>         },
>         "gang" : {
>           "type" : "stagehand",
>           "stagehand" : "gangspawn"
910c937
<           "location" : "bounty",
---
>           "location" : "gang",
976,977c1003
<           "type" : "previous",
<           "questParameter" : "world"
---
>           "prevSystem" : true

quests\bounty\kill_bounty_monster.questtemplate
48a49
>     "approachMusic" : "/music/dead-or-alive.ogg",

quests\bounty\stages.lua
24,26c24
<     self.playingMusic = true
<     sb.logInfo("Play alt music track %s", musicTrack)
<     world.sendEntityMessage(player.id(), "playAltMusic", {musicTrack})
---
>     world.sendEntityMessage(player.id(), "startBountyMusic", {musicTrack})

scripts\bountygeneration.lua
145c145
<   self.stepCount = {4, 5}
---
>   self.stepCount = {4, 4}
1107c1107,1108
<   while #steps < minStepCount do
---
>   while stepCount < minStepCount do
>     stepCount = stepCount + 1

scripts\player\playerbounty.lua
27a28,39
> 
>   self.bountyMusicCount = 0
>   self.musicTracks = {}
>   self.playingMusic = false
>   message.setHandler("startBountyMusic", function(_, _, tracks, fadeTime) 
>     self.musicTracks = tracks
>     self.bountyMusicCount = self.bountyMusicCount + 1
>   end)
> 
>   message.setHandler("stopBountyMusic", function(_, _, fadeTime)
>     self.bountyMusicCount = self.bountyMusicCount - 1
>   end)
30a43,50
>   if not self.playingMusic and self.bountyMusicCount > 0 then
>     world.sendEntityMessage(player.id(), "playAltMusic", self.musicTracks, 2.0)
>     self.playingMusic = true
>   end
>   if self.playingMusic and self.bountyMusicCount <= 0 then
>     world.sendEntityMessage(player.id(), "stopAltMusic", 2.0)
>     self.playingMusic = false
>   end

stats\effects\elitemonster\elitemonster.lua
2,5c2
<   effect.addStatModifierGroup({
<     {stat = "maxHealth", baseMultiplier = config.getParameter("healthMultiplier", 0)},
<     {stat = "powerMultiplier", baseMultiplier = config.getParameter("powerMultiplier", 0)},
<   })
---
>   effect.addStatModifierGroup(config.getParameter("statModifiers", {}))

stats\effects\elitemonster\elitemonster.statuseffect
5c5,19
<     "powerMultiplier" : 2.0
---
>     "powerMultiplier" : 2.0,
>     "statModifiers" : [
>       {
>         "stat" : "maxHealth",
>         "effectiveMultiplier" : 4.0
>       },
>       {
>         "stat" : "powerMultiplier",
>         "baseMultiplier" : 2.0
>       },
>       {
>         "stat" : "statusImmunity",
>         "amount" : 1.0
>       }
>     ]