FILES ----- biomes\surface\alien.biome humanoid\human\hair\male18.png humanoid\human\hair\male28.png humanoid\human\hair\male33.png [NEW] items\armors\decorative\hats\eyepatch\eyepatch.head [NEW] items\armors\decorative\hats\eyepatch\head.png [NEW] items\armors\decorative\hats\eyepatch\icons.png [NEW] items\armors\decorative\hats\eyepatch\mask.png items\armors\human\human-tier3\bsleeve.png items\armors\human\human-tier3\chest.png items\armors\human\human-tier3\fsleeve.png items\armors\human\human-tier3\head.png items\armors\human\human-tier3\icons.png items\armors\human\human-tier3\mask.png items\armors\human\human-tier3\pants.png items\armors\human\human-tier4\bsleeve.png items\armors\human\human-tier4\chestf.png items\armors\human\human-tier4\chestm.png items\armors\human\human-tier4\fsleeve.png items\armors\human\human-tier4\head.png items\armors\human\human-tier4\icons.png items\armors\human\human-tier4\mask.png items\armors\human\human-tier4\pants.png items\armors\human\human-tier9\bsleeve.png items\armors\human\human-tier9\fsleeve.png items\armors\human\human-tier9\head.png items\armors\human\human-tier9\icons.png items\armors\human\human-tier9\pants.png [NEW] items\armors\other\outrider\chestf.png [NEW] items\armors\other\outrider\chestm.png [NEW] items\armors\other\outrider\head.png [NEW] items\armors\other\outrider\icons.png [NEW] items\armors\other\outrider\mask.png [NEW] items\armors\other\outrider\outrider.chest [NEW] items\armors\other\outrider\outrider.head [NEW] items\armors\other\outrider\outrider.legs [NEW] items\armors\other\outrider\pants.png [NEW] items\armors\other\pioneer2\bsleeve.png [NEW] items\armors\other\pioneer2\chest.png [NEW] items\armors\other\pioneer2\fsleeve.png [NEW] items\armors\other\pioneer2\head.png [NEW] items\armors\other\pioneer2\icons.png [NEW] items\armors\other\pioneer2\mask.png [NEW] items\armors\other\pioneer2\pants.png [NEW] items\armors\other\pioneer2\pioneer2.chest [NEW] items\armors\other\pioneer2\pioneer2.head [NEW] items\armors\other\pioneer2\pioneer2.legs items\guns\unsorted\test.lua monsters\boss\bossmonster.lua objects\apex\apexcoolbookcase\apexcoolbookcase.object objects\apex\apexcoolcupboard\apexcoolcupboard.object objects\apex\apexcounter1\apexcounter1.object objects\apex\apexfridge\apexfridge.object objects\apex\apexwardrobe\apexwardrobe.object objects\apex\classiccupboard\classiccupboard.object objects\avian\chestmedavian\chestmedavian1.object objects\avian\chestmedavian2\chestmedavian2.object objects\avian\tribalcounter1\tribalcounter1.object objects\avian\tribalwallcabinet\tribalwallcabinet.object objects\floran\chestfloran2\chestfloran2.object objects\floran\floranbookcase\floranbookcase.object objects\floran\florancabinet1\florancabinet1.object objects\floran\florancabinet3\florancabinet3.object objects\floran\plantcabinet1\plantcabinet1.object objects\generic\woodenbookcase\woodenbookcase.object objects\generic\woodencabinet2\woodencabinet2.object objects\generic\woodenceilingbookcase1\woodenceilingbookcase1.object objects\generic\woodenceilingcabinet1\woodenceilingcabinet1.object objects\generic\woodencrate2\woodencrate2.object objects\generic\woodenendtable\woodenendtable.object objects\glitch\barrel\barrel.object objects\glitch\largewoodencrate\largewoodencrate.object objects\glitch\medievaldresser\medievaldresser.object objects\glitch\royalcabinet\royalcabinet.object objects\glitch\trashbag\trashbag.object objects\glitch\trashcan\trashcan.object objects\hoard\barrelgoldfilled\barrelgoldfilled.object objects\holiday\bigpresent\bigpresent.object objects\holiday\present1\present1.object objects\holiday\present2\present2.object objects\holiday\present3\present3.object objects\holiday\present4\present4.object objects\human\bunkerbookcase\bunkerbookcase.object objects\human\bunkercabinet1\bunkercabinet1.object objects\human\fridge\fridge.object objects\human\prisoncabinet1\prisoncabinet1.object objects\human\prisonfile1\prisonfile1.object objects\human\prisonfile2\prisonfile2.object objects\human\prisonlocker1\prisonlocker1.object objects\human\prisonlocker2\prisonlocker2.object objects\hylotl\hylotlclassicbookcase\hylotlclassicbookcase.object objects\hylotl\hylotlclassicwardrobe1\hylotlclassicwardrobe1.object objects\minibiome\ice\icemachine\icemachine.object objects\minibiome\mushroom\shroomwardrobe\shroomwardrobe.object objects\outpost\bathroomtrash\bathroomtrash.object objects\outpost\customsign\customsign.lua objects\outpost\filingcabinet\filingcabinet.object objects\outpost\outpostcargocrate\outpostcargocrate.object objects\outpost\outpostcargocrateshort\outpostcargocrateshort.object objects\outpost\outpostfridge\outpostfridge.object objects\outpost\outpostlocker\outpostlocker.object objects\outpost\outpostshippingcontainer\outpostshippingcontainer.object [NEW] recipes\spinningwheel\eyepatchhead.recipe DIFFS ----- biomes\surface\alien.biome 4a5,6 > "statusEffects" : [ "biomeradiation" ], > items\guns\unsorted\test.lua 4a5,8 > function update(dt) > world.logInfo("fireableItem: update (dt is %s)", dt) > end > monsters\boss\bossmonster.lua 60a61,62 > util.trackTarget(entity.configParameter("trackTargetDistance"), entity.configParameter("switchTargetDistance")) > 81,83d82 < < util.trackTarget(entity.configParameter("trackTargetDistance"), entity.configParameter("switchTargetDistance")) < 94a94,97 > end > > if not hasTarget() and args.sourceId and args.sourceId ~= 0 then > self.targetId = args.sourceId objects\apex\apexcoolbookcase\apexcoolbookcase.object 33c33 < "slotCount" : 16, --- > "slotCount" : 24, objects\apex\apexcoolcupboard\apexcoolcupboard.object 43c43 < "slotCount" : 16, --- > "slotCount" : 24, objects\apex\apexcounter1\apexcounter1.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\apex\apexfridge\apexfridge.object 33c33 < "slotCount" : 16, --- > "slotCount" : 24, objects\apex\apexwardrobe\apexwardrobe.object 43c43 < "slotCount" : 16, --- > "slotCount" : 24, objects\apex\classiccupboard\classiccupboard.object 35c35 < "slotCount" : 16, --- > "slotCount" : 24, objects\avian\chestmedavian\chestmedavian1.object 32c32 < "slotCount" : 16, --- > "slotCount" : 24, objects\avian\chestmedavian2\chestmedavian2.object 32c32 < "slotCount" : 16, --- > "slotCount" : 24, objects\avian\tribalcounter1\tribalcounter1.object 35c35 < "slotCount" : 16, --- > "slotCount" : 9, objects\avian\tribalwallcabinet\tribalwallcabinet.object 35c35 < "slotCount" : 16, --- > "slotCount" : 9, objects\floran\chestfloran2\chestfloran2.object 32c32 < "slotCount" : 16, --- > "slotCount" : 24, objects\floran\floranbookcase\floranbookcase.object 20c20 < "slotCount" : 16, --- > "slotCount" : 24, objects\floran\florancabinet1\florancabinet1.object 41c41 < "slotCount" : 16, --- > "slotCount" : 24, objects\floran\florancabinet3\florancabinet3.object 41c41 < "slotCount" : 16, --- > "slotCount" : 60, objects\floran\plantcabinet1\plantcabinet1.object 43c43 < "slotCount" : 16, --- > "slotCount" : 9, objects\generic\woodenbookcase\woodenbookcase.object 35c35 < "slotCount" : 16, --- > "slotCount" : 24, objects\generic\woodencabinet2\woodencabinet2.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\generic\woodenceilingbookcase1\woodenceilingbookcase1.object 35c35 < "slotCount" : 16, --- > "slotCount" : 24, objects\generic\woodenceilingcabinet1\woodenceilingcabinet1.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\generic\woodencrate2\woodencrate2.object 51c51 < "slotCount" : 16, --- > "slotCount" : 24, objects\generic\woodenendtable\woodenendtable.object 36c36 < "slotCount" : 16, --- > "slotCount" : 9, objects\glitch\barrel\barrel.object 35c35 < "slotCount" : 16, --- > "slotCount" : 9, objects\glitch\largewoodencrate\largewoodencrate.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\glitch\medievaldresser\medievaldresser.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\glitch\royalcabinet\royalcabinet.object 35c35 < "slotCount" : 16, --- > "slotCount" : 24, objects\glitch\trashbag\trashbag.object 32c32 < "slotCount" : 16, --- > "slotCount" : 9, objects\glitch\trashcan\trashcan.object 32c32 < "slotCount" : 16, --- > "slotCount" : 9, objects\hoard\barrelgoldfilled\barrelgoldfilled.object 35c35 < "slotCount" : 16, --- > "slotCount" : 24, objects\holiday\bigpresent\bigpresent.object 37c37 < "slotCount" : 9, --- > "slotCount" : 16, objects\holiday\present1\present1.object 54c54 < "slotCount" : 16, --- > "slotCount" : 9, objects\holiday\present2\present2.object 54c54 < "slotCount" : 16, --- > "slotCount" : 9, objects\holiday\present3\present3.object 54c54 < "slotCount" : 16, --- > "slotCount" : 9, objects\holiday\present4\present4.object 54c54 < "slotCount" : 16, --- > "slotCount" : 9, objects\human\bunkerbookcase\bunkerbookcase.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\human\bunkercabinet1\bunkercabinet1.object 36c36 < "slotCount" : 16, --- > "slotCount" : 24, objects\human\fridge\fridge.object 38c38 < "slotCount" : 16, --- > "slotCount" : 24, objects\human\prisoncabinet1\prisoncabinet1.object 34c34 < "slotCount" : 16, --- > "slotCount" : 24, objects\human\prisonfile1\prisonfile1.object 12c12 < "slotCount" : 16, --- > "slotCount" : 24, objects\human\prisonfile2\prisonfile2.object 12c12 < "slotCount" : 16, --- > "slotCount" : 60, objects\human\prisonlocker1\prisonlocker1.object 32c32 < "slotCount" : 16, --- > "slotCount" : 60, objects\human\prisonlocker2\prisonlocker2.object 32c32 < "slotCount" : 16, --- > "slotCount" : 24, objects\hylotl\hylotlclassicbookcase\hylotlclassicbookcase.object 20c20 < "slotCount" : 16, --- > "slotCount" : 24, objects\hylotl\hylotlclassicwardrobe1\hylotlclassicwardrobe1.object 43c43 < "slotCount" : 16, --- > "slotCount" : 24, objects\minibiome\ice\icemachine\icemachine.object 44c44 < "slotCount" : 16, --- > "slotCount" : 24, objects\minibiome\mushroom\shroomwardrobe\shroomwardrobe.object 43c43 < "slotCount" : 16, --- > "slotCount" : 24, objects\outpost\bathroomtrash\bathroomtrash.object 33c33 < "slotCount" : 16, --- > "slotCount" : 9, objects\outpost\customsign\customsign.lua 19,20c19,34 < storage.nearSpaces = {{{-1,-1},"bl", nil, "01"},{{-1,0},"ml",nil, "02"},{{-1,1},"ul",nil, "03"},{{0,-1},"b1",nil, "0E"},{{1,-1},"b2",nil, "0D"},{{2,-1},"b3",nil, "0C"}, < {{3,-1},"b4", nil, "0B"},{{4,-1},"br",nil, "0A"},{{0,1},"u1",nil, "04"},{{1,1},"u2",nil, "05"},{{2,1},"u3",nil, "06"},{{3,1},"u4",nil, "07"},{{4,1},"ur",nil, "08"},{{4,0},"mr", nil, "09"}} --- > storage.nearSpaces = { > {{-3,-1},"bl", nil, "01"}, > {{-3,0},"ml",nil, "02"}, > {{-3,1},"ul",nil, "03"}, > {{-2,-1},"b1",nil, "0E"}, > {{-1,-1},"b2",nil, "0D"}, > {{0,-1},"b3",nil, "0C"}, > {{1,-1},"b4", nil, "0B"}, > {{2,-1},"br",nil, "0A"}, > {{-2,1},"u1",nil, "04"}, > {{-1,1},"u2",nil, "05"}, > {{0,1},"u3",nil, "06"}, > {{1,1},"u4",nil, "07"}, > {{2,1},"ur",nil, "08"}, > {{2,0},"mr", nil, "09"} > } 114a129 > local isOccupied = false 116,119c131,142 < if world.tileIsOccupied({entity.position()[1] + v[1][1], entity.position()[2] + v[1][2]}) == true then < if v[3] ~= "tile" then < v[3] = "tile" < needsRedraw = true --- > if world.tileIsOccupied({entity.position()[1] + v[1][1], entity.position()[2] + v[1][2]}) then > local nearObjects = world.entityQuery({entity.position()[1] + v[1][1] + 0.5, entity.position()[2] + v[1][2] + 0.5}, 0.2, { includedTypes = { "object" }, boundMode = "CollisionArea", withoutEntityId = entity.id() }) > for _,objectId in pairs(nearObjects) do > if world.entityName(objectId) == "customsign" then > world.debugPoint({entity.position()[1] + v[1][1] + 0.5, entity.position()[2] + v[1][2] + 0.5}, "red") > if v[3] ~= "tile" then > v[3] = "tile" > needsRedraw = true > end > isOccupied = true > break > end 121c144,145 < else --- > end > if not isOccupied then objects\outpost\filingcabinet\filingcabinet.object 34c34 < "slotCount" : 16, --- > "slotCount" : 9, objects\outpost\outpostcargocrate\outpostcargocrate.object 54c54 < "slotCount" : 16, --- > "slotCount" : 24, objects\outpost\outpostcargocrateshort\outpostcargocrateshort.object 52c52 < "slotCount" : 16, --- > "slotCount" : 24, objects\outpost\outpostfridge\outpostfridge.object 54c54 < "slotCount" : 16, --- > "slotCount" : 24, objects\outpost\outpostlocker\outpostlocker.object 52c52 < "slotCount" : 16, --- > "slotCount" : 60, objects\outpost\outpostshippingcontainer\outpostshippingcontainer.object 54c54 < "slotCount" : 16, --- > "slotCount" : 64,