FILES
-----
interface\collections.png
interface\scripted\collections\collectionsgui.config
interface\scripted\collections\collectionsicon.png
items\active\unsorted\relocator\relocate.lua
items\active\unsorted\relocator\relocator.activeitem
objects\bugs\gasgiant\gasgiant.object
projectiles\activeitems\traildash\icetrail.projectile
projectiles\boss\crystalboss\crystalbeamdamage.projectile
scripts\companions\capturable.lua
species\avian.species
stats\effects\monsterrelocate\monsterrelocate.lua
vehicles\boat\boat.animation

DIFFS
-----
interface\scripted\collections\collectionsgui.config
70c70
<       "position" : [147, 208],
---
>       "position" : [138, 208],
76c76
<       "position" : [147, 192],
---
>       "position" : [138, 192],
91c91
<       "subtitle" : "Things you have collected",
---
>       "subtitle" : "Catalogue everything you've seen and done!",

items\active\unsorted\relocator\relocate.lua
17a18,31
> 
>   message.setHandler("confirmRelocate", function(_,_, monsterId, petInfo)
>     if #storage.storedMonsters < self.maxStorage and (self.weapon.currentState == nil or self.weapon.currentState == self.scan) then
>       petInfo.parameters = petInfo.parameters or {}
>       petInfo.parameters.persistent = true
>       petInfo.parameters.wasRelocated = true
>       table.insert(storage.storedMonsters, petInfo)
> 
>       self:setState(self.absorb, monsterId, petInfo)
>       return true
>     else
>       return false
>     end
>   end)
53d66
<   self.promise = nil
76c89
<         local promise = world.sendEntityMessage(monsterId, "pet.attemptRelocate")
---
>         local promise = world.sendEntityMessage(monsterId, "pet.attemptRelocate", activeItem.ownerEntityId())
82,86d94
<         local result = promise:result()
<         if result then
<           self:setState(self.absorb, monsterId, result)
<         end
< 
91a100
> 
101,105d109
< 
<   monster.parameters = monster.parameters or {}
<   monster.parameters.persistent = true
<   monster.parameters.wasRelocated = true
<   table.insert(storage.storedMonsters, monster)

items\active\unsorted\relocator\relocator.activeitem
9a10
>   "category" : "Tool",

objects\bugs\gasgiant\gasgiant.object
7c7
<   "description" : "\"These bugs float on updrafts of poisonous gases.",
---
>   "description" : "These bugs float on updrafts of poisonous gases.",

projectiles\activeitems\traildash\icetrail.projectile
106,117c106,117
<     "type" : "animated",
<     "animation" : "/animations/elementalaura/iceaura/iceaura.animation",
<     "initialVelocity" : [0, 1],
<     "finalVelocity" : [0, 3],
<     "approach" : [1, 1],
<     "timeToLive" : 1.0,
<     "size" : 0.7,
<     "layer" : "back",
<     "variance" : {
<       "initialVelocity" : [4, 1],
<       "rotation" : 180,
<       "angularVelocity" : 20
---
>             "type" : "animated",
>             "animation" : "/animations/elementalaura/iceaura/iceaura.animation",
>             "initialVelocity" : [0, 1],
>             "finalVelocity" : [0, 3],
>             "approach" : [1, 1],
>             "timeToLive" : 1.0,
>             "size" : 0.7,
>             "layer" : "back",
>             "variance" : {
>               "initialVelocity" : [4, 1],
>               "rotation" : 180,
>               "angularVelocity" : 20

projectiles\boss\crystalboss\crystalbeamdamage.projectile
9c9
<   "damageKind" : "default"
---
>   "damageKind" : "plasma"

scripts\companions\capturable.lua
78a79,90
> 
>   if capturable.confirmRelocate then
>     if capturable.confirmRelocate:finished() then
>       if capturable.confirmRelocate:result() then
>         capturable.despawnTimer = 0.3
>       else
>         status.removeEphemeralEffect("monsterrelocate")
>         status.addEphemeralEffect("monsterrelocatespawn")
>       end
>       capturable.confirmRelocate = nil
>     end
>   end
198,199c210,211
< function capturable.attemptRelocate()
<   if config.getParameter("relocatable", false) then
---
> function capturable.attemptRelocate(sourceEntity)
>   if config.getParameter("relocatable", false) and not capturable.confirmRelocate then
216,217c228,229
<     capturable.despawnTimer = 0.3
<     return petInfo
---
>     capturable.confirmRelocate = world.sendEntityMessage(sourceEntity, "confirmRelocate", entity.id(), petInfo)
>     return true

species\avian.species
115c115
<       "shirt" : [ "avianadventurershirt", "aviancommonershirt", "avianfancyshirt", "avianworkershirt" ],
---
>       "shirt" : [ "avianadventurershirt", "aviancommonershirt", "avianfancyshirt", "avianworkershirt", "protectorateshirtchest", "protectoratevestchest" ],

stats\effects\monsterrelocate\monsterrelocate.lua
12,13d11
<   world.sendEntityMessage(entity.id(), "despawn", false)
< 

vehicles\boat\boat.animation
24c24,28
<             "transition" : "warpOutPart2"
---
>             "transition" : "warpOutPart2",
>             "properties" : {
>               "immediateSound" : "/sfx/tech/vehicle_disappear1.ogg",
>               "immediateSoundRangeMultiplier" : 1.0
>             }
47c51,55
<             "mode" : "loop"
---
>             "mode" : "loop",
>             "properties" : {
>               "persistentSound" : "/sfx/objects/propeller.ogg",
>               "persistentSoundRangeMultiplier" : 1.0
>             }