FILES ----- versioning.config animations\teleport\playerwarpin2.frames animations\teleport\playerwarpin2.png animations\teleport\playerwarpout2.frames animations\teleport\playerwarpout2.png interface\ai\ai.config interface\quests\questcomplete\questcomplete.png interface\windowconfig\questcomplete.config interface\windowconfig\teleportdialog.config monsters\groundmovement.lua monsters\boss\bossmonster.lua monsters\boss\missile\behavior.lua monsters\boss\tentaclecometspore\behavior.lua monsters\crawling\crawlingmonster.lua monsters\flying\skills\flyingrangedswoopattack.lua [NEW] monsters\ground\hugebiped\melty\hugemeltybody.monsterpart [NEW] monsters\ground\hugebiped\melty\hugemeltybody.png monsters\pets\groundpet.lua monsters\pets\actions\eataction.lua monsters\pets\actions\followaction.lua monsters\swimming\swimmingmonster.lua monsters\unique\bugs\behavior.lua monsters\unique\giftmonster\behavior.lua monsters\unique\po\behavior.lua npcs\followstate.lua npcs\meleeattackstate.lua npcs\rangedattackstate.lua npcs\sitstate.lua npcs\wanderstate.lua npcs\guard\guardstate.lua objects\apex\securitycamera\securitycamera.lua objects\apex\turret\turret.lua objects\generic\remoteteleporter\remoteteleporter.png objects\generic\remoteteleporter\remoteteleporterlit.png [NEW] objects\outpost\penguinbay\merchant.frames [NEW] objects\outpost\penguinbay\merchant.png [NEW] objects\outpost\penguinbay\penguinbay.animation [NEW] objects\outpost\penguinbay\penguinbay.lua objects\outpost\penguinbay\penguinbay.object objects\outpost\penguinbay\penguinbayleft.frames objects\outpost\penguinbay\penguinbayleft.png objects\outpost\penguinbay\penguinbayright.frames objects\outpost\penguinbay\penguinbayright.png [NEW] objects\outpost\penguinbay\previewleft.png [NEW] objects\outpost\penguinbay\previewright.png objects\wired\ironbeacon\decoyprincess.lua objects\wired\ironbeacon\ironbeacon.lua objects\wired\ironbeacon\jellyboss.lua objects\wired\ironbeacon\robot.lua objects\wired\standingturret\standingturret.lua player\playereffects.animation scripts\pathing.lua scripts\sensors.lua scripts\util.lua stats\effects\levitation\levitation.lua tech\blink\blink.lua tech\skyrail\skyrail.lua [NEW] versioning\playerentity_4_5.lua [NEW] versioning\universesettings_2_3.lua DIFFS ----- versioning.config 4c4 < "UniverseSettings" : 2, --- > "UniverseSettings" : 3, 8c8 < "PlayerEntity" : 4, --- > "PlayerEntity" : 5, animations\teleport\playerwarpin2.frames 5,6c5,6 < "dimensions" : [15, 1], < "names" : [ [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15" ] ] --- > "dimensions" : [13, 1], > "names" : [ [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13" ] ] animations\teleport\playerwarpout2.frames 4,5c4,5 < "dimensions" : [10, 1], < "names" : [ [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" ] ] --- > "dimensions" : [13, 1], > "names" : [ [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13" ] ] interface\ai\ai.config 3,4c3,4 < "disabledTechText" : "\n\n^green;Unlock this tech with a blank tech card.", < "disabledTechButtonConfig" : { --- > "unlockTechText" : "\n\n^green;Unlock this tech with a blank tech card.", > "unlockTechButtonConfig" : { 9c9 < "enabledTechButtonConfig" : { --- > "selectTechButtonConfig" : { 266a267 > "pressedOffset" : [0, 0], interface\windowconfig\questcomplete.config 15,33d14 < "close" : { < "type" : "button", < "base" : "/interface/inventory/x.png", < "hover" : "/interface/inventory/xhover.png", < "press" : "/interface/inventory/xpress.png", < "position" : [261, 247] < }, < "windowtitle" : { < "type" : "title", < "title" : "", < "subtitle" : "", < "position" : [0, 254], < "icon" : { < "type" : "image", < "file" : "/interface/quests/quest.png", < "position" : [0, 0], < "zlevel" : -1 < } < }, 56c37 < "position" : [45, 151] --- > "position" : [-11, 130] interface\windowconfig\teleportdialog.config 16c16 < "hover" : "/interface/warping/xup.png", --- > "hover" : "/interface/warping/xdown.png", 18c18 < "position" : [173, 161] --- > "position" : [171, 161] monsters\groundmovement.lua 40c40 < if world.rectCollision(jumpRegion, true) then --- > if world.rectCollision(jumpRegion, "Dynamic") then 54c54 < if not world.rectCollision(jumpClearanceRegion, true) then --- > if not world.rectCollision(jumpClearanceRegion, "Dynamic") then 73c73 < if not world.rectCollision(gapRegion, false) then --- > if not world.rectCollision(gapRegion, "Any") then 88c88 < if world.rectCollision(blockedRect, true) then --- > if world.rectCollision(blockedRect, "Dynamic") then monsters\boss\bossmonster.lua 225c225 < return world.lineTileCollision(lineStart, lineEnd, true) --- > return world.lineTileCollision(lineStart, lineEnd, "Dynamic") monsters\boss\missile\behavior.lua 130c130 < if world.lineTileCollision(lineStart, lineEnd, true) then --- > if world.lineTileCollision(lineStart, lineEnd, "Dynamic") then monsters\boss\tentaclecometspore\behavior.lua 55,56c55,56 < not world.rectTileCollision(bounds, true) and < world.rectTileCollision(bounds, false) --- > not world.rectTileCollision(bounds, "Dynamic") and > world.rectTileCollision(bounds, "Any") monsters\crawling\crawlingmonster.lua 333c333 < return world.rectTileCollision(floorCheckRegion, true) --- > return world.rectTileCollision(floorCheckRegion, "Dynamic") 439c439 < if world.rectTileCollision(stepCheckRegion, true) then --- > if world.rectTileCollision(stepCheckRegion, "Dynamic") then 468c468 < if world.rectTileCollision(wallCheckRegion, true) then --- > if world.rectTileCollision(wallCheckRegion, "Dynamic") then 543c543 < if not world.rectTileCollision(floorCheckRegion, true) then --- > if not world.rectTileCollision(floorCheckRegion, "Dynamic") then 551c551 < if world.rectTileCollision(convexCheckRegion, true) then --- > if world.rectTileCollision(convexCheckRegion, "Dynamic") then 764c764 < local canStand = world.lineTileCollision(approachPoint, {approachPoint[1], startRect[2] + mcontroller.boundBox()[2]}, false) --- > local canStand = world.lineTileCollision(approachPoint, {approachPoint[1], startRect[2] + mcontroller.boundBox()[2]}, "Any") 935c935 < end \ No newline at end of file --- > end monsters\flying\skills\flyingrangedswoopattack.lua 11c11 < if world.lineTileCollision(self.position, forwardSensor, true) then --- > if world.lineTileCollision(self.position, forwardSensor, "Dynamic") then 16c16 < if world.lineTileCollision(self.position, downSensor, true) then --- > if world.lineTileCollision(self.position, downSensor, "Dynamic") then monsters\pets\groundpet.lua 363c363 < if world.lineTileCollision({position[1], position[2] + bounds[2] + 1.5}, { position[1] + boundsEdge + direction, position[2] + bounds[2] + 1.5}, true) then --- > if world.lineTileCollision({position[1], position[2] + bounds[2] + 1.5}, { position[1] + boundsEdge + direction, position[2] + bounds[2] + 1.5}, "Dynamic") then 377c377 < end \ No newline at end of file --- > end monsters\pets\actions\eataction.lua 40c40 < return true, entity.configParameter("actionParams.eat.cooldown") --- > return true, 5 monsters\pets\actions\followaction.lua 52c52 < if status.resource("curiosity") <= 0 or self.pathing.stuckTimer > self.pathing.maxStuckTime then --- > if status.resource("curiosity") <= 0 or self.pathing.stuck then monsters\swimming\swimmingmonster.lua 131c131 < if world.pointTileCollision(entity.toAbsolutePosition(vec2.rotate(sensor, self.rotation)), true) then --- > if world.pointTileCollision(entity.toAbsolutePosition(vec2.rotate(sensor, self.rotation)), "Dynamic") then monsters\unique\bugs\behavior.lua 32c32 < if world.lineTileCollision(position, minGroundLine, true) or world.liquidAt(minGroundLine) then --- > if world.lineTileCollision(position, minGroundLine, "Dynamic") or world.liquidAt(minGroundLine) then 34c34 < elseif not world.lineTileCollision(position, maxGroundLine, true) or not world.liquidAt(maxGroundLine) then --- > elseif not world.lineTileCollision(position, maxGroundLine, "Dynamic") or not world.liquidAt(maxGroundLine) then monsters\unique\giftmonster\behavior.lua 61c61 < if world.rectTileCollision(bounds, true) then --- > if world.rectTileCollision(bounds, "Dynamic") then monsters\unique\po\behavior.lua 131c131 < return world.rectTileCollision(groundRegion, true) --- > return world.rectTileCollision(groundRegion, "Dynamic") npcs\followstate.lua 34c34 < local blocksInLos = world.collisionBlocksAlongLine(position, playerPosition, true) --- > local blocksInLos = world.collisionBlocksAlongLine(position, playerPosition, "Dynamic") 185c185 < local blocks = world.collisionBlocksAlongLine(lineStart, lineEnd, false) --- > local blocks = world.collisionBlocksAlongLine(lineStart, lineEnd, "Any") 195c195 < local blocksInLos = world.collisionBlocksAlongLine(mcontroller.position(), playerPosition, true) --- > local blocksInLos = world.collisionBlocksAlongLine(mcontroller.position(), playerPosition, "Dynamic") 227c227 < end \ No newline at end of file --- > end npcs\meleeattackstate.lua 297c297 < return not world.rectTileCollision(otherSideRegion, true) --- > return not world.rectTileCollision(otherSideRegion, "Dynamic") 328c328 < end \ No newline at end of file --- > end npcs\rangedattackstate.lua 160,161c160,161 < return world.lineTileCollision({ position[1], position[2] + entity.configParameter("rangedAttack.coverYOffset") }, targetPosition, true) and < not world.lineTileCollision({ position[1], position[2] + entity.configParameter("rangedAttack.coverYClearanceOffset") }, targetPosition, true) --- > return world.lineTileCollision({ position[1], position[2] + entity.configParameter("rangedAttack.coverYOffset") }, targetPosition, "Dynamic") and > not world.lineTileCollision({ position[1], position[2] + entity.configParameter("rangedAttack.coverYClearanceOffset") }, targetPosition, "Dynamic") 167c167 < return not world.lineTileCollision(coverPosition, coverEndpoint, true) --- > return not world.lineTileCollision(coverPosition, coverEndpoint, "Dynamic") npcs\sitstate.lua 36c36 < if world.magnitude(toTarget) < entity.configParameter("sit.sitRadius") and not world.lineTileCollision(position, targetPosition, true) then --- > if world.magnitude(toTarget) < entity.configParameter("sit.sitRadius") and not world.lineTileCollision(position, targetPosition, "Dynamic") then npcs\wanderstate.lua 119c119 < if world.rectTileCollision(region, true) then --- > if world.rectTileCollision(region, "Dynamic") then npcs\guard\guardstate.lua 146c146 < if not world.lineTileCollision(position, vec2.add({ -direction * entity.configParameter("guard.wallCheckDistance"), 0 }, position), true) then --- > if not world.lineTileCollision(position, vec2.add({ -direction * entity.configParameter("guard.wallCheckDistance"), 0 }, position), "Dynamic") then objects\apex\securitycamera\securitycamera.lua 50c50 < local blocks = world.collisionBlocksAlongLine(tipPosition, laserEndpoint, true, 1) --- > local blocks = world.collisionBlocksAlongLine(tipPosition, laserEndpoint, "Dynamic", 1) objects\apex\turret\turret.lua 53c53 < local blocks = world.collisionBlocksAlongLine(tipPosition, laserEndpoint, true, 1) --- > local blocks = world.collisionBlocksAlongLine(tipPosition, laserEndpoint, "Dynamic", 1) objects\outpost\penguinbay\penguinbay.object 17,25d16 < < "scripts" : [ "/scripts/chattyObject.lua" ], < "scriptDelta" : 0, < < "chatOptions" : [ < "Try making yourself useful around here, then we'll have something to talk about.", < "Scratch a few more backs around the Outpost and I just might scratch yours.", < "I've got some good stuff for the right person, but you're not quite right yet." < ], 30c21 < "image" : "penguinbayleft.png:.", --- > "image" : "previewleft.png", 34,35c25,30 < "frames" : 24, < "animationCycle" : 2.4, --- > > "animationPosition" : [-56, 0], > "animationParts" : { > "shop" : "penguinbayleft.png", > "merchant" : "merchant.png" > }, 38,56c33,51 < [-7, 0], [-6, 0], [-5, 0], [-4, 0], [-3, 0], [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [3, 0], [4, 0], [5, 0], [6, 0], < [-7, 1], [-6, 1], [-5, 1], [-4, 1], [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [3, 1], [4, 1], [5, 1], [6, 1], < [-7, 2], [-6, 2], [-5, 2], [-4, 2], [-3, 2], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [3, 2], [4, 2], [5, 2], [6, 2], < [-7, 3], [-6, 3], [-5, 3], [-4, 3], [-3, 3], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [3, 3], [4, 3], [5, 3], [6, 3], < [-7, 4], [-6, 4], [-5, 4], [-4, 4], [-3, 4], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [3, 4], [4, 4], [5, 4], [6, 4], < [-7, 5], [-6, 5], [-5, 5], [-4, 5], [-3, 5], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [3, 5], [4, 5], [5, 5], [6, 5], < [-4, 6], [-3, 6], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [3, 6], [4, 6], [5, 6], [6, 6], < [-3, 7], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [3, 7], [4, 7], [5, 7], < [-3, 8], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [3, 8], [4, 8], < [-4, 9], [-3, 9], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [3, 9], [4, 9], < [-3, 10], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [3, 10], [4, 10], < [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [3, 11], < [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [3, 12], < [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [3, 13], < [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [3, 14], < [-1, 15], [0, 15], [1, 15], [2, 15], < [-1, 16], [0, 16], [1, 16], [2, 16], < [-1, 17], [0, 17], [1, 17], [2, 17], < [-1, 18], [0, 18], [1, 18], [2, 18] --- > [-7, 0], [-6, 0], [-5, 0], [-4, 0], [-3, 0], [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [3, 0], [4, 0], [5, 0], [6, 0], > [-7, 1], [-6, 1], [-5, 1], [-4, 1], [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [3, 1], [4, 1], [5, 1], [6, 1], > [-7, 2], [-6, 2], [-5, 2], [-4, 2], [-3, 2], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [3, 2], [4, 2], [5, 2], [6, 2], > [-7, 3], [-6, 3], [-5, 3], [-4, 3], [-3, 3], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [3, 3], [4, 3], [5, 3], [6, 3], > [-7, 4], [-6, 4], [-5, 4], [-4, 4], [-3, 4], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [3, 4], [4, 4], [5, 4], [6, 4], > [-7, 5], [-6, 5], [-5, 5], [-4, 5], [-3, 5], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [3, 5], [4, 5], [5, 5], [6, 5], > [-4, 6], [-3, 6], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [3, 6], [4, 6], [5, 6], [6, 6], > [-3, 7], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [3, 7], [4, 7], [5, 7], > [-3, 8], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [3, 8], [4, 8], > [-4, 9], [-3, 9], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [3, 9], [4, 9], > [-3, 10], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [3, 10], [4, 10], > [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [3, 11], > [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [3, 12], > [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [3, 13], > [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [3, 14], > [-1, 15], [0, 15], [1, 15], [2, 15], > [-1, 16], [0, 16], [1, 16], [2, 16], > [-1, 17], [0, 17], [1, 17], [2, 17], > [-1, 18], [0, 18], [1, 18], [2, 18] 58a54,55 > "detectArea" : [ [-8, 0], [-1, 5] ], > 64c61 < "image" : "penguinbayright.png:.", --- > "image" : "previewright.png", 68,69c65,70 < "frames" : 24, < "animationCycle" : 2.4, --- > > "animationPosition" : [-56, 0], > "animationParts" : { > "shop" : "penguinbayright.png", > "merchant" : "merchant.png" > }, 72,90c73,91 < [-7, 0], [-6, 0], [-5, 0], [-4, 0], [-3, 0], [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [3, 0], [4, 0], [5, 0], [6, 0], < [-7, 1], [-6, 1], [-5, 1], [-4, 1], [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [3, 1], [4, 1], [5, 1], [6, 1], < [-7, 2], [-6, 2], [-5, 2], [-4, 2], [-3, 2], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [3, 2], [4, 2], [5, 2], [6, 2], < [-7, 3], [-6, 3], [-5, 3], [-4, 3], [-3, 3], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [3, 3], [4, 3], [5, 3], [6, 3], < [-7, 4], [-6, 4], [-5, 4], [-4, 4], [-3, 4], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [3, 4], [4, 4], [5, 4], [6, 4], < [-7, 5], [-6, 5], [-5, 5], [-4, 5], [-3, 5], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [3, 5], [4, 5], [5, 5], [6, 5], < [-7, 6], [-6, 6], [-5, 6],[-4, 6], [-3, 6], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [3, 6], < [-6, 7], [-5, 7], [-4, 7], [-3, 7], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], < [-5, 8], [-4, 8], [-3, 8], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], < [-5, 9], [-4, 9], [-3, 9], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [3, 9], < [-5, 10], [-4, 10], [-3, 10], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], < [-4, 11], [-3, 11], [-2, 11], [-1, 11], [0, 11], [1, 11], < [-4, 12], [-3, 12], [-2, 12], [-1, 12], [0, 12], [1, 12], < [-4, 13], [-3, 13], [-2, 13], [-1, 13], [0, 13], [1, 13], < [-4, 14], [-3, 14], [-2, 14], [-1, 14], [0, 14], [1, 14], < [-3, 15], [-2, 15], [-1, 15], [0, 15], < [-3, 16], [-2, 16], [-1, 16], [0, 16], < [-3, 17], [-2, 17], [-1, 17], [0, 17], < [-3, 18], [-2, 18], [-1, 18], [0, 18] --- > [-7, 0], [-6, 0], [-5, 0], [-4, 0], [-3, 0], [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [3, 0], [4, 0], [5, 0], [6, 0], > [-7, 1], [-6, 1], [-5, 1], [-4, 1], [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [3, 1], [4, 1], [5, 1], [6, 1], > [-7, 2], [-6, 2], [-5, 2], [-4, 2], [-3, 2], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [3, 2], [4, 2], [5, 2], [6, 2], > [-7, 3], [-6, 3], [-5, 3], [-4, 3], [-3, 3], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [3, 3], [4, 3], [5, 3], [6, 3], > [-7, 4], [-6, 4], [-5, 4], [-4, 4], [-3, 4], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [3, 4], [4, 4], [5, 4], [6, 4], > [-7, 5], [-6, 5], [-5, 5], [-4, 5], [-3, 5], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [3, 5], [4, 5], [5, 5], [6, 5], > [-7, 6], [-6, 6], [-5, 6],[-4, 6], [-3, 6], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [3, 6], > [-6, 7], [-5, 7], [-4, 7], [-3, 7], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], > [-5, 8], [-4, 8], [-3, 8], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], > [-5, 9], [-4, 9], [-3, 9], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [3, 9], > [-5, 10], [-4, 10], [-3, 10], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], > [-4, 11], [-3, 11], [-2, 11], [-1, 11], [0, 11], [1, 11], > [-4, 12], [-3, 12], [-2, 12], [-1, 12], [0, 12], [1, 12], > [-4, 13], [-3, 13], [-2, 13], [-1, 13], [0, 13], [1, 13], > [-4, 14], [-3, 14], [-2, 14], [-1, 14], [0, 14], [1, 14], > [-3, 15], [-2, 15], [-1, 15], [0, 15], > [-3, 16], [-2, 16], [-1, 16], [0, 16], > [-3, 17], [-2, 17], [-1, 17], [0, 17], > [-3, 18], [-2, 18], [-1, 18], [0, 18] 92a94,95 > "detectArea" : [ [1, 0], [8, 5] ], > 97a101,116 > > "animation" : "/objects/outpost/penguinbay/penguinbay.animation", > "animationParts" : { > "shop" : "penguinbayleft.png", > "merchant" : "merchant.png" > }, > > "scripts" : [ "/objects/outpost/penguinbay/penguinbay.lua" ], > "scriptDelta" : 20, > > "chatOptions" : [ > "Try making yourself useful around here, then we'll have something to talk about.", > "Scratch a few more backs around the Outpost and I just might scratch yours.", > "I've got some good stuff for the right person, but you're not quite right yet." > ], > 104a124 > 111a132 > objects\outpost\penguinbay\penguinbayleft.frames 2d1 < 5c4 < "dimensions" : [24, 6], --- > "dimensions" : [4, 1], 7,12c6 < [ "default.0", "default.1", "default.2", "default.3" ], < [ "default.4", "default.5", "default.6", "default.7" ], < [ "default.8", "default.9", "default.10", "default.11" ], < [ "default.12", "default.13", "default.14", "default.15" ], < [ "default.16", "default.17", "default.18", "default.19" ], < [ "default.20", "default.21", "default.22", "default.23" ] --- > [ "default.1", "default.2", "default.3", "default.4" ] 14d7 < 18c11 < "default.default" : "default.0" --- > "default.default" : "default.1" objects\outpost\penguinbay\penguinbayright.frames 2d1 < 5c4 < "dimensions" : [24, 6], --- > "dimensions" : [4, 1], 7,12c6 < [ "default.0", "default.1", "default.2", "default.3" ], < [ "default.4", "default.5", "default.6", "default.7" ], < [ "default.8", "default.9", "default.10", "default.11" ], < [ "default.12", "default.13", "default.14", "default.15" ], < [ "default.16", "default.17", "default.18", "default.19" ], < [ "default.20", "default.21", "default.22", "default.23" ] --- > [ "default.1", "default.2", "default.3", "default.4" ] 17c11 < "default.default" : "default.0" --- > "default.default" : "default.1" objects\wired\ironbeacon\decoyprincess.lua 16c16 < return not world.rectTileCollision(bounds, true) --- > return not world.rectTileCollision(bounds, "Dynamic") objects\wired\ironbeacon\ironbeacon.lua 16c16 < return not world.rectTileCollision(bounds, true) --- > return not world.rectTileCollision(bounds, "Dynamic") objects\wired\ironbeacon\jellyboss.lua 16c16 < return not world.rectTileCollision(bounds, true) --- > return not world.rectTileCollision(bounds, "Dynamic") objects\wired\ironbeacon\robot.lua 16c16 < return not world.rectTileCollision(bounds, true) --- > return not world.rectTileCollision(bounds, "Dynamic") objects\wired\standingturret\standingturret.lua 101c101 < local blocks = world.collisionBlocksAlongLine(basePosition, targetPosition, true, 1) --- > local blocks = world.collisionBlocksAlongLine(basePosition, targetPosition, "Dynamic", 1) player\playereffects.animation 9c9 < "frames" : 15, --- > "frames" : 13, 18c18 < "frames" : 10, --- > "frames" : 13, scripts\pathing.lua 17c17,18 < swimCost = 40 --- > swimCost = 40, > boundBox = mcontroller.boundBox() 76c77,80 < world.callScriptedEntity(closedDoorId, "openDoor") --- > if not world.callScriptedEntity(closedDoorId, "openDoor") then > self.pathing.path = nil > return false > end 105c109 < if not path.jumped then --- > if not self.pathing.jumped then 112,114c116,117 < path.currentEdgeIndex = path.currentEdgeIndex + 1 < path.currentEdge = path.path[path.currentEdgeIndex+1] < path.jumped = nil --- > advancePath() > self.pathing.jumped = nil 121c124 < if not path.jumped then --- > if not self.pathing.jumped then 131c134 < path.jumped = true --- > self.pathing.jumped = true 136,137c139 < path.currentEdgeIndex = path.currentEdgeIndex + 1 < path.currentEdge = path.path[path.currentEdgeIndex+1] --- > advancePath() 140a143 > self.pathing.jumped = false 148c151,156 < self.pathing.path = nil --- > if delta[2] < 0 then > moveX(delta[1], options.run) > else > self.pathing.expirationTime = nil > self.pathing.path = nil > end 154,157c162,165 < if currentEdge.source.velocity ~= nil then < mcontroller.setXVelocity(currentEdge.source.velocity[1]) < elseif currentEdge.target.velocity ~= nil then < mcontroller.setXVelocity(currentEdge.target.velocity[1]) --- > local velocity = currentEdge.source.velocity or currentEdge.target.velocity > if velocity then > mcontroller.setXVelocity(velocity[1]) > self.pathing.deltaX = velocity[1] > 0 and 1 or -1 211a220,234 > > -- Simple pathing call count > -- if self.debug then > -- local findPathCount = world.getProperty("findPathCount") or 0 > -- findPathCount = findPathCount + 1 > -- world.setProperty("findPathCount", findPathCount) > -- world.logInfo("Path count: %s", findPathCount) > -- end > > if self.pathing.path == nil then > pathStuck() > else > self.pathing.stuck = nil > self.pathing.stuckCount = 0 > end 219c242,248 < if self.pathing.expirationTime < world.time() then --- > --Update path, pruning nodes > self.pathing.path = entity.updatePath(self.pathing.path) > > --Find a new path if we need to > local path = self.pathing.path > if not path then > self.pathing.expirationTime = nil 222,223c251,277 < self.pathing.path = entity.updatePath(self.pathing.path) < return self.pathing.path --- > return path > end > > function advancePath() > local path = self.pathing.path > path.currentEdgeIndex = path.currentEdgeIndex + 1 > -- Index + 1 because Lua is 1-indexed > path.currentEdge = path.path[path.currentEdgeIndex+1] > end > > function pathStuck() > local position = mcontroller.position() > if self.pathing.stuckCount == nil then > self.pathing.stuckCount = 0 > end > > --Reset stuck when moved to a new position > if self.pathing.stuckPosition and world.magnitude(position, self.pathing.stuckPosition) > 1 then > self.pathing.stuckCount = 0 > self.pathing.stuckPosition = nil > end > > self.pathing.stuckCount = self.pathing.stuckCount + 1 > if self.pathing.stuckCount >= 3 then > self.pathing.stuck = true > self.pathing.stuckPosition = position > end 283c337 < if (world.rectTileCollision(groundRegion, false) or world.liquidAt(position)) and collisionResolve then --- > if (world.rectTileCollision(groundRegion, "Any") or world.liquidAt(position)) and collisionResolve then 321c375 < return world.rectTileCollision(groundRegion, true) --- > return world.rectTileCollision(groundRegion, "Dynamic") 345c399 < local step = 0 --- > local step = 1 348c402 < local edge = path.path[path.currentEdgeIndex+step] --- > local edge = path.path[path.currentEdgeIndex + 1 + step] 355a410,412 > -- if edge.action == "Arc" then > -- world.debugLine(nextStep, vec2.add(nextStep, edge.source.velocity or edge.target.velocity or {0,0}), "blue") > -- end scripts\sensors.lua 29c29 < return world.pointTileCollision(position, true) --- > return world.pointTileCollision(position, "Dynamic") 32c32 < return world.lineTileCollision(mcontroller.position(), position, true) --- > return world.lineTileCollision(mcontroller.position(), position, "Dynamic") scripts\util.lua 15c15 < if world.pointTileCollision(entity.toAbsolutePosition(sensor), true) then --- > if world.pointTileCollision(entity.toAbsolutePosition(sensor), "Dynamic") then stats\effects\levitation\levitation.lua 102c102,106 < local blocks = world.collisionBlocksAlongLine(lineStart, lineEnd, ignorePlatforms) --- > local collisionLevel = "Any" > if ignorePlatforms then > collisionLevel = "Dynamic" > end > local blocks = world.collisionBlocksAlongLine(lineStart, lineEnd, collisionLevel) 163c167 < end \ No newline at end of file --- > end tech\blink\blink.lua 8c8 < local collisionBlocks = world.collisionBlocksAlongLine(mcontroller.position(), position, true, 1) --- > local collisionBlocks = world.collisionBlocksAlongLine(mcontroller.position(), position, "Dynamic", 1) 24c24 < local groundBlocks = world.collisionBlocksAlongLine(position, {position[1], position[2] + blinkFootOffset}, true, 1) --- > local groundBlocks = world.collisionBlocksAlongLine(position, {position[1], position[2] + blinkFootOffset}, "Dynamic", 1) 32c32 < local ceilingBlocks = world.collisionBlocksAlongLine(position, {position[1], position[2] + blinkHeadOffset}, true, 1) --- > local ceilingBlocks = world.collisionBlocksAlongLine(position, {position[1], position[2] + blinkHeadOffset}, "Dynamic", 1) 41c41 < if not position or world.lineTileCollision(mcontroller.position(), position, true) then --- > if not position or world.lineTileCollision(mcontroller.position(), position, "Dynamic") then 51c51 < if world.pointTileCollision(checkPosition, false) then --- > if world.pointTileCollision(checkPosition, "Any") then tech\skyrail\skyrail.lua 444,445c444,445 < if world.lineTileCollision(lineStart,lineEnd,false) then < local blocksX = world.collisionBlocksAlongLine(lineStart, lineEnd, false, -1) --- > if world.lineTileCollision(lineStart,lineEnd,"Any") then > local blocksX = world.collisionBlocksAlongLine(lineStart, lineEnd, "Any", -1)