FILES ----- player.config terrestrial_worlds.config [NEW] universeflags.config [NEW] biomes\surface\tentacle.biome [NEW] biomes\underground\undergroundbrains.biome [NEW] biomes\underground\undergroundtentacles.biome damage\lash.damage dungeons\apex\apexcamp\apexcampendright1.json [NEW] dungeons\apex\apextestfacility\apextestfacility.dungeon [NEW] dungeons\apex\apextestfacility\apextestfacility1a.json [NEW] dungeons\apex\apextestfacility\apextestfacility2a.json [NEW] dungeons\apex\apextestfacility\apextestfacility3a.json [NEW] dungeons\apex\apextestfacility\apextestfacility4a.json [NEW] dungeons\apex\apextestfacility\apextestfacilitybase1.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside1.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside2.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside3.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside4.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside5.json [NEW] dungeons\apex\apextestfacility\apextestfacilityside6.json [NEW] dungeons\apex\apextestfacility\apextestfacilitysidetunnel.json [NEW] dungeons\avian\aviannativevillage\aviannativevillage.dungeon [NEW] dungeons\avian\aviannativevillage\aviannativevillageendleft1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillageendright1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse2.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse3.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse4.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse5.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagehouse6.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetemplate.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetempleground1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetowerentrance1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetowerfloor1.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetowerfloor11.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetowerfloor2.json [NEW] dungeons\avian\aviannativevillage\aviannativevillagetowertop1.json dungeons\microdungeons\biomes\shroom\shroomhouse8.json [NEW] dungeons\missions\tentaclemissions\bossroomtest.json [NEW] dungeons\missions\tentaclemissions\bossroomtest1.json [NEW] dungeons\missions\tentaclemissions\tentacleboss.dungeon interface\inventory\backingimageback.png interface\inventory\backingimagechest.png interface\inventory\backingimagehead.png interface\inventory\backingimagelegs.png interface\inventory\backingimagesocial.png interface\inventory\bigrea.png interface\inventory\inventorybody.png interface\inventory\techempty.png [NEW] interface\statuses\timefreeze.png interface\title\avianfemale.png interface\title\button.png interface\title\buttonover.png interface\title\humanfemale.png interface\title\novakidfemale.png interface\title\novakidmale.png interface\title\sapefemale.png interface\title\sapemale.png interface\title\selected.png interface\title\selectedover.png interface\windowconfig\playerinventory.config items\active\weapons\weapon.lua items\active\weapons\melee\broadsword\timepierce.activeitem items\active\weapons\other\evileye\evileye.activeitem items\active\weapons\other\evileye\evileye.altability items\active\weapons\other\evileye\evileye.lua items\active\weapons\other\evileye\evileye.png [NEW] items\active\weapons\other\evileye\evileyefullbright.png items\active\weapons\other\tentaclegun\tentaclegun.activeitem items\active\weapons\other\tentaclegun\tentaclegun.altability items\active\weapons\other\tentaclegun\tentaclegun.lua items\active\weapons\other\tentaclegun\wormgun.activeitem items\active\weapons\other\tentaclegun\wormgun.png items\armors\backerhats\meercap\head.png items\armors\backerhats\meercap\icons.png [NEW] items\armors\backerhats\multicamhat\head.png [NEW] items\armors\backerhats\multicamhat\icons.png [NEW] items\armors\backerhats\multicamhat\mask.png [NEW] items\armors\backerhats\multicamhat\multicamhat.head [NEW] items\materials\stomachblock.matitem [NEW] items\materials\stomachblock.png [NEW] leveling\evileye.functions monsters\boss\apeboss\apeboss.monstertype monsters\boss\apebossprojector\apebossprojector.monstertype monsters\boss\crystalboss\crystalboss.monstertype monsters\boss\crystalboss\crystal\crystalbossicon.png monsters\boss\cultistboss\cultistboss.monstertype monsters\boss\dragonboss\dragonboss.monstertype monsters\boss\kluexboss\kluexboss.monstertype monsters\boss\kluexbossstatue\kluexbossstatue.monstertype monsters\boss\penguinufo\penguinufo.monstertype monsters\boss\robotboss\robotboss.monstertype monsters\boss\spiderboss\spiderboss.monstertype monsters\crawlers\tentaclecrawler\tentaclecrawler.png monsters\flyers\tentaclebomb\tentaclebomb.png monsters\flyers\tentaclegnat\tentaclegnat.png monsters\flyers\tentaclespawner\tentaclespawner.png monsters\ghosts\tentacleghost\tentacleghost.png monsters\mission\kluextotem\kluextotem.monstertype monsters\walkers\tentacleclam\tentacleclam.png [NEW] npcs\stargazer.npctype objects\apex\apexfridge\apexfridge.object objects\apex\apexstoreshelf\apexstoreshelf.object objects\biome\scorchedcity\scorchedcityarrowsign\scorchedcityarrowsign.object objects\biome\scorchedcity\scorchedcitybed\scorchedcitybed.object objects\biome\scorchedcity\scorchedcitybrokenbed\scorchedcitybrokenbed.object objects\biome\scorchedcity\scorchedcitybrokenchair\scorchedcitybrokenchair.object objects\biome\scorchedcity\scorchedcitybrokenchestdrawerlarge\scorchedcitybrokenchestdrawerlarge.object objects\biome\scorchedcity\scorchedcitybrokenchestdrawersmall\scorchedcitybrokenchestdrawersmall.object objects\biome\scorchedcity\scorchedcitybrokencounter\scorchedcitybrokencounter.object objects\biome\scorchedcity\scorchedcitybrokenfridge\scorchedcitybrokenfridge.object objects\biome\scorchedcity\scorchedcitybrokenstoreshelf\scorchedcitybrokenstoreshelf.object objects\biome\scorchedcity\scorchedcitybrokentable\scorchedcitybrokentable.object objects\biome\scorchedcity\scorchedcitybrokentank\scorchedcitybrokentank.object objects\biome\scorchedcity\scorchedcitybrokentraficlights\scorchedcitybrokentraficlights.object objects\biome\scorchedcity\scorchedcitybrokentv\scorchedcitybrokentv.object objects\biome\scorchedcity\scorchedcitychair\scorchedcitychair.object objects\biome\scorchedcity\scorchedcitychestdrawerlarge\scorchedcitychestdrawerlarge.object objects\biome\scorchedcity\scorchedcitychestdrawersmall\scorchedcitychestdrawersmall.object objects\biome\scorchedcity\scorchedcitycounter\scorchedcitycounter.object objects\biome\scorchedcity\scorchedcitycrate\scorchedcitycrate.object objects\biome\scorchedcity\scorchedcityfridge\scorchedcityfridge.object objects\biome\scorchedcity\scorchedcitysign1\scorchedcitysign1.object objects\biome\scorchedcity\scorchedcitysmallcrate\scorchedcitysmallcrate.object objects\biome\scorchedcity\scorchedcitystoreshelf\scorchedcitystoreshelf.object objects\biome\scorchedcity\scorchedcitytable\scorchedcitytable.object objects\biome\scorchedcity\scorchedcitytv\scorchedcitytv.object objects\biome\scorchedcity\scorchedlandmine\scorchedlandmine.object objects\biome\scorchedcity\vrheadset\vrheadset.object [NEW] objects\biome\tentacle\tentacleexperiment\tentacleexperiment.frames [NEW] objects\biome\tentacle\tentacleexperiment\tentacleexperiment.object [NEW] objects\biome\tentacle\tentacleexperiment\tentacleexperiment.png [NEW] objects\biome\tentacle\tentacleexperiment\tentacleexperimenticon.png [NEW] objects\clues\avian\kluexmap1\kluexmap1.frames [NEW] objects\clues\avian\kluexmap1\kluexmap1.object [NEW] objects\clues\avian\kluexmap1\kluexmap1.png [NEW] objects\clues\avian\kluexmap1\kluexmap1icon.png [NEW] objects\clues\avian\kluexmural1\kluexmural1.frames [NEW] objects\clues\avian\kluexmural1\kluexmural1.object [NEW] objects\clues\avian\kluexmural1\kluexmural1.png [NEW] objects\clues\avian\kluexmural1\kluexmural1icon.png [NEW] objects\clues\avian\kluexmural2\kluexmural2.frames [NEW] objects\clues\avian\kluexmural2\kluexmural2.object [NEW] objects\clues\avian\kluexmural2\kluexmural2.png [NEW] objects\clues\avian\kluexmural2\kluexmural2icon.png [NEW] objects\clues\avian\kluexstatue1\kluexstatue1.frames [NEW] objects\clues\avian\kluexstatue1\kluexstatue1.object [NEW] objects\clues\avian\kluexstatue1\kluexstatue1.png [NEW] objects\clues\avian\kluexstatue1\kluexstatue1icon.png [NEW] objects\clues\avian\kluexstatue2\kluexstatue2.frames [NEW] objects\clues\avian\kluexstatue2\kluexstatue2.object [NEW] objects\clues\avian\kluexstatue2\kluexstatue2.png [NEW] objects\clues\avian\kluexstatue2\kluexstatue2icon.png objects\generic\minifridge\minifridge.object objects\human\fridge\fridge.object objects\hylotl\hylotlstoreshelf\hylotlstoreshelf.object objects\themed\outdoor\outdoorchair\outdoorchair.object objects\wired\landmine\landmine.object [NEW] parallax\images\tile\brainsback\base\1.png [NEW] parallax\images\tile\brainsfront\base\1.png [NEW] parallax\underground\brains.parallax [NEW] projectiles\activeitems\evileyeprojectile\evileyeprojectile.frames [NEW] projectiles\activeitems\evileyeprojectile\evileyeprojectile.png [NEW] projectiles\activeitems\evileyeprojectile\evileyeprojectile.projectile projectiles\guns\tentaclefist\invisibletentaclefist.projectile projectiles\guns\tentaclefist\tentaclefist.projectile projectiles\npcs\eyeball\evileyeball.projectile [NEW] recipes\furniture2\storage\fridge.recipe rendering\opengl20.config [NEW] sfx\gun\evileye1.ogg [NEW] sfx\gun\evileye2.ogg [NEW] sfx\gun\evileye3.ogg [NEW] sfx\gun\evileye4.ogg [NEW] sfx\gun\evileye5.ogg [NEW] sfx\gun\evileye6.ogg [NEW] sfx\gun\evileye_laser1.ogg [NEW] sfx\statuseffects\timefreeze_loop.ogg [NEW] sfx\statuseffects\timefreeze_start.ogg spawntypes\uniques.spawntypes [NEW] stats\effects\timefreeze\timefreeze.animation [NEW] stats\effects\timefreeze\timefreeze.lua [NEW] stats\effects\timefreeze\timefreeze.statuseffect [NEW] tiles\materials\stomachblock.material [NEW] tiles\materials\stomachblock.png tilesets\packed\materials.json tilesets\packed\objects-by-category\decorative.json tilesets\packed\objects-by-category\door.json tilesets\packed\objects-by-category\furniture.json tilesets\packed\objects-by-category\storage.json tilesets\packed\objects-by-category\wire.json tilesets\packed\objects-by-colonytag\ancient.json tilesets\packed\objects-by-colonytag\avian.json tilesets\packed\objects-by-colonytag\aviantemple.json tilesets\packed\objects-by-colonytag\avianvillage.json tilesets\packed\objects-by-colonytag\christmas.json tilesets\packed\objects-by-colonytag\combat.json tilesets\packed\objects-by-colonytag\commerce.json tilesets\packed\objects-by-colonytag\door.json tilesets\packed\objects-by-colonytag\electronic.json tilesets\packed\objects-by-colonytag\hylotl.json tilesets\packed\objects-by-colonytag\hylotloceancity.json tilesets\packed\objects-by-colonytag\light.json tilesets\packed\objects-by-colonytag\mechanical.json tilesets\packed\objects-by-colonytag\pretty.json tilesets\packed\objects-by-colonytag\scorched.json tilesets\packed\objects-by-colonytag\storage.json tilesets\packed\objects-by-race\ancient.json tilesets\packed\objects-by-race\apex.json tilesets\packed\objects-by-race\avian.json tilesets\packed\objects-by-race\generic.json tilesets\packed\objects-by-race\hylotl.json tilesets\packed\objects-by-type\container.json tilesets\packed\objects-by-type\loungeable.json treasure\dungeon.treasurepools DIFFS ----- player.config 215a216 > { "item" : "fridge" }, terrestrial_worlds.config 470,471c470,471 < "tentacles" : { < "threatRange" : [2, 2], --- > "tentacle" : { > "threatRange" : [6, 6], 474c474 < "primaryRegion" : ["tentacles"], --- > "primaryRegion" : ["tentacle"], 476a477,479 > "subsurface" : { > "primaryRegion" : ["tentacleundergroundtentacles"] > }, 477a481 > "primaryRegion" : ["tentacleundergroundtentacles"], 480a485 > "primaryRegion" : ["tentacleundergroundceiling"], 483a489,495 > "primaryRegion" : ["tentacleundergroundfloor"], > "secondaryRegions" : [], > "dungeons" : ["tentacleboss"], > "dungeonCountRange" : [1, 1] > }, > "core" : { > "primaryRegion" : ["tentacleundergroundcore"], 761c773 < "tentacles" : { --- > "tentacle" : { 769c781 < [0, [ "tentacles" ]] --- > [0, [ "tentacle" ]] 1009c1021,1046 < // secondary underground --- > "tentacleundergroundtentacles" : { > "caveLiquid" : [ "poison" ], > "biome" : [ > [1, [ "undergroundtentacles" ] ] > ] > }, > > "tentacleundergroundceiling" : { > "oceanLevelOffset" : -10, > "fgCaveSelector" : [ "coreCaves" ], > "bgCaveSelector" : [ "coreBackgroundCaves" ], > "biome" : [ > [1, [ "undergroundtentacles" ] ] > ] > }, > > "tentacleundergroundfloor" : { > "blockSelector" : [ "remixedFlatsSurface" ], > "fgCaveSelector" : [ "empty" ], > "bgCaveSelector" : [ "empty" ], > "biome" : [ > [1, [ "undergroundbrains" ] ] > ] > }, > > // underground subregions 1103a1141,1149 > ] > }, > > "tentacleundergroundcore" : { > "caveLiquid" : [ "empty" ], > "fgCaveSelector" : [ "empty" ], > "bgCaveSelector" : [ "empty" ], > "biome" : [ > [1, [ "undergroundbrains" ] ] damage\lash.damage 255c255 < "sounds" : [ "/sfx/melee/dagger_hit_metal1.ogg", "/sfx/melee/dagger_hit_metal2.ogg", "/sfx/melee/dagger_hit_metal3.ogg", "/sfx/melee/dagger_hit_metal4.ogg", "/sfx/melee/dagger_hit_metal5.ogg", "/sfx/melee/dagger_hit_metal6.ogg" ], --- > "sounds" : [ "/sfx/melee/fist_hit_metal1.ogg", "/sfx/melee/fist_hit_metal2.ogg", "/sfx/melee/fist_hit_metal3.ogg", "/sfx/melee/fist_hit_metal4.ogg", "/sfx/melee/fist_hit_metal5.ogg", "/sfx/melee/fist_hit_metal6.ogg" ], dungeons\apex\apexcamp\apexcampendright1.json [TMX file differences are left out for huge size.] dungeons\microdungeons\biomes\shroom\shroomhouse8.json [TMX file differences are left out for huge size.] interface\windowconfig\playerinventory.config 13a14,15 > "defaultPetNameLabel" : "PET STATS", > 61c63 < "position" : [185, 251] --- > "position" : [185, 259] 73c75 < "position" : [-50, -2], --- > "position" : [-50, 6], 79c81 < "position" : [30, 110] --- > "position" : [30, 112] 84c86 < "position" : [57, 110] --- > "position" : [57, 112] 89c91 < "position" : [84, 110] --- > "position" : [84, 112] 94c96 < "position" : [111, 110] --- > "position" : [111, 112] 107c109 < "position" : [4, 0], --- > "position" : [4, 2], 117c119 < "position" : [31, 0], --- > "position" : [31, 2], 126c128 < "position" : [58, 0], --- > "position" : [58, 2], 135c137 < "position" : [85, 0], --- > "position" : [85, 2], 143c145 < "position" : [57, 205], --- > "position" : [57, 214], 148c150 < "position" : [6, 27], --- > "position" : [6, 29], 155c157 < "position" : [6, 27], --- > "position" : [6, 29], 162c164 < "position" : [6, 27], --- > "position" : [6, 29], 169c171 < "position" : [6, 27], --- > "position" : [6, 29], 176c178 < "position" : [90, 212], --- > "position" : [90, 220], 181c183 < "position" : [90, 192], --- > "position" : [90, 200], 186c188 < "position" : [90, 172], --- > "position" : [90, 180], 191c193 < "position" : [5, 202], --- > "position" : [5, 210], 196c198 < "position" : [110, 212], --- > "position" : [110, 220], 201c203 < "position" : [110, 192], --- > "position" : [110, 200], 206c208 < "position" : [110, 172], --- > "position" : [110, 180], 211c213 < "position" : [5, 182], --- > "position" : [5, 190], 216c218 < "position" : [10, 136], --- > "position" : [10, 145], 222c224 < "position" : [10, 136], --- > "position" : [10, 145], 227c229 < "position" : [40, 136], --- > "position" : [40, 145], 233c235 < "position" : [40, 136], --- > "position" : [40, 145], 238c240 < "position" : [70, 136], --- > "position" : [70, 145], 244c246 < "position" : [70, 136], --- > "position" : [70, 145], 281c283 < "position" : [158, 223], --- > "position" : [158, 232], 288c290 < "position" : [158, 206], --- > "position" : [158, 214], 295c297 < "position" : [158, 172], --- > "position" : [158, 180], 302c304 < "position" : [158, 189], --- > "position" : [158, 197], 309c311 < "position" : [172, 108], --- > "position" : [172, 110], 325,331d326 < "labelback" : { < "type" : "label", < "position" : [16, 235], < "hAnchor" : "mid", < "value" : "BACK", < "color" : [126, 117, 102] < }, 334,341c329 < "position" : [59, 235], < "hAnchor" : "mid", < "value" : "APPEARANCE", < "color" : [126, 117, 102] < }, < "labelarmor" : { < "type" : "label", < "position" : [110, 235], --- > "position" : [59, 243], 343,344c331,332 < "value" : "ARMOR", < "color" : [126, 117, 102] --- > "value" : "ARMOUR SLOTS", > "color" : [141, 141, 141] 348c336 < "position" : [166, 235], --- > "position" : [166, 243], 351c339 < "color" : [126, 117, 102] --- > "color" : [141, 141, 141] 355c343 < "position" : [150, 160], --- > "position" : [150, 168], 357,358c345,346 < "value" : "PET", < "color" : [126, 117, 102] --- > "value" : "PET STATS", > "color" : [141, 141, 141] 362c350 < "position" : [50, 160], --- > "position" : [50, 168], 364,365c352,360 < "value" : "TECH SLOTS", < "color" : [126, 117, 102] --- > "value" : "ACTIVE TECHS", > "color" : [141, 141, 141] > }, > "labelinventory" : { > "type" : "label", > "position" : [50, 129], > "hAnchor" : "mid", > "value" : "INVENTORY", > "color" : [141, 141, 141] items\active\weapons\weapon.lua 13a14 > newWeapon.handGrip = config.getParameter("handGrip") 55a57,66 > end > > if self.handGrip == "wrap" then > activeItem.setOutsideOfHand(self:isFrontHand()) > elseif self.handGrip == "embed" then > activeItem.setOutsideOfHand(not self:isFrontHand()) > elseif self.handGrip == "outside" then > activeItem.setOutsideOfHand(true) > elseif self.handGrip == "inside" then > activeItem.setOutsideOfHand(false) items\active\weapons\melee\broadsword\timepierce.activeitem 89,90c89,90 < "baseDps" : 7.6, < "energyUsage" : 80.0, --- > "baseDps" : 6.086, > "energyUsage" : 120.0, 93c93 < "statusEffects" : [ "timeslow" ], --- > "statusEffects" : [ "timefreeze" ], items\active\weapons\other\evileye\evileye.activeitem 9c9 < "weaponType" : "Assault Rifle", --- > "weaponType" : "Living Weapon", 11,12c11,12 < "itemTags" : ["weapon","ranged","assaultrifle"], < "level" : 1, --- > "itemTags" : ["weapon","ranged","livingweapon"], > "level" : 4, 21c21 < "muzzleFlash" : "/items/active/weapons/ranged/muzzleflash.png" --- > "muzzleFlash" : "" 31c31 < "cycle" : 3, --- > "cycle" : 10, 37c37 < "cycle" : 0.5, --- > "cycle" : 0.6, 79c79 < "fire" : [ "/sfx/gun/plasma_ar1.ogg", "/sfx/gun/plasma_ar2.ogg", "/sfx/gun/plasma_ar3.ogg", "/sfx/gun/plasma_pistol3.ogg" ] --- > "fire" : [ "/sfx/gun/evileye1.ogg", "/sfx/gun/evileye2.ogg", "/sfx/gun/evileye3.ogg", "/sfx/gun/evileye4.ogg", "/sfx/gun/evileye5.ogg", "/sfx/gun/evileye6.ogg" ] 83c83 < "muzzleOffset" : [0.75, 0.330], --- > "muzzleOffset" : [1, 0.330], 106c106 < "knockback" : 4, --- > "knockback" : 5, items\active\weapons\other\evileye\evileye.altability 14c14,18 < "mode" : "loop" --- > "mode" : "loop", > "properties" : { > "persistentSound" : "/sfx/gun/evileye_laser1.ogg", > "persistentSoundStopTime" : 0.1 > } 27c31,34 < "transition" : "idle" --- > "transition" : "idle", > "properties" : { > "immediateSound" : "/sfx/projectiles/plasma3.ogg" > } 79,80c86,87 < "initialEnergyUsage" : 10, < "energyUsagePerSecond" : 5, --- > "initialEnergyUsage" : 0, > "energyUsagePerSecond" : 22.5, 82c89,90 < "fireTime" : 0.3, --- > "windupTime" : 0.3, > "repeatFireTime" : 0.5, 97,100c105,134 < "projectileType" : "invisibleprojectile", < "projectileParameters" : { < "statusEffects" : [ { "effect" : "paralysis", "duration" : 1 } ] < }, --- > "projectiles" : [ > { > "type" : "evileyeprojectile", > "parameters" : { > "statusEffects" : [ { "effect" : "paralysis", "duration" : 0.75 } ], > "power" : 7.5 > } > }, > /* > { > "type" : "evileyeprojectile", > "parameters" : { > "statusEffects" : [ { "effect" : "frostslow", "duration" : 1 } ], > "power" : 7.5 > } > }, > */ > { > "type" : "evileyeprojectile", > "parameters" : { > "power" : 7.5 > } > }, > { > "type" : "evileyeprojectile", > "parameters" : { > "power" : 7.5 > } > } > ], items\active\weapons\other\evileye\evileye.lua 56c56 < if elapsed > self.fireTime then --- > if elapsed > self.windupTime then 86c86 < local offset = vec2.add(self.weapon.muzzleOffset, beam.offset) --- > local offset = vec2.add(self.weapon.muzzleOffset, beam and beam.offset or {0, 0}) 124a125,138 > function EvilEye:rotateArmTowardsTarget(angularFraction) > local ownerPosition = world.entityPosition(activeItem.ownerEntityId()) > local targetPosition = world.entityPosition(self.targetEntityId) > local toTarget = world.distance(targetPosition, ownerPosition) > local angleToTarget = vec2.angle({math.abs(toTarget[1]), toTarget[2]}) > local directionToTarget = toTarget[1] / math.abs(toTarget[1]) > > self.weapon.aimDirection = directionToTarget > activeItem.setFacingDirection(directionToTarget) > > local angleDiff = angleToTarget - (self.weapon.aimAngle + self.weapon.relativeArmRotation) > self.weapon.relativeArmRotation = self.weapon.relativeArmRotation + angleDiff / (angularFraction or 1) > end > 132,141c146 < local ownerPosition = world.entityPosition(activeItem.ownerEntityId()) < local targetPosition = world.entityPosition(self.targetEntityId) < local toTarget = world.distance(targetPosition, ownerPosition) < local angleToTarget = vec2.angle({math.abs(toTarget[1]), toTarget[2]}) < local directionToTarget = toTarget[1] / math.abs(toTarget[1]) < < activeItem.setFacingDirection(directionToTarget) < < local angleDiff = angleToTarget - (self.weapon.aimAngle + self.weapon.relativeArmRotation) < self.weapon.relativeArmRotation = self.weapon.relativeArmRotation + angleDiff / self.focusRate --- > self:rotateArmTowardsTarget(self.focusRate) 147,149d151 < self.beams = jarray() < self.cooldownTimer = self.cooldownTime < 158,170c160 < local params = { < damageTeam = world.entityDamageTeam(activeItem.ownerEntityId()) < } < util.mergeTable(params, self.projectileParameters) < < world.spawnProjectile( < self.projectileType, < world.entityPosition(self.targetEntityId), < activeItem.ownerEntityId(), < {0, 0}, < false, < params < ) --- > local elapsedTime = 0 172,173c162,195 < while animator.animationState("lance") ~= "idle" do < coroutine.yield() --- > while world.entityExists(self.targetEntityId) and self:fireHeld() and not status.resourceLocked("energy") do > local position = world.entityPosition(self.targetEntityId) > if world.lineCollision(self:beamStartPosition(), position, {"Block"}) then > break > end > > local timeMultiplier = root.evalFunction("evilEyeTimeMultiplier", elapsedTime) > > local projectile = self.projectiles[math.random(#self.projectiles)] > local params = { > damageTeam = world.entityDamageTeam(activeItem.ownerEntityId()), > powerMultiplier = activeItem.ownerPowerMultiplier() * timeMultiplier > } > util.mergeTable(params, projectile.parameters) > > world.spawnProjectile( > projectile.type, > position, > activeItem.ownerEntityId(), > {0, 0}, > false, > params > ) > > util.wait(self.repeatFireTime, function (dt) > elapsedTime = elapsedTime + dt > if not world.entityExists(self.targetEntityId) or not self:fireHeld() then > return true > end > if not status.overConsumeResource("energy", self.energyUsagePerSecond * self.dt) then > return true > end > self:rotateArmTowardsTarget() > end) 174a197,199 > > self.beams = jarray() > self.cooldownTimer = self.cooldownTime items\active\weapons\other\tentaclegun\tentaclegun.activeitem 9c9 < "weaponType" : "Tentacle Gun", --- > "weaponType" : "Living Weapon", 11,12c11,12 < "itemTags" : ["weapon","ranged","pistol"], < "level" : 1, --- > "itemTags" : ["weapon","ranged","livingweapon"], > "level" : 6, 25c25 < "fire" : [ "/sfx/gun/gristlegun3.ogg" ] --- > "fire" : [ "/sfx/gun/evileye1.ogg", "/sfx/gun/evileye2.ogg", "/sfx/gun/evileye3.ogg", "/sfx/gun/evileye4.ogg", "/sfx/gun/evileye5.ogg", "/sfx/gun/evileye6.ogg" ] 30a31 > "handGrip" : "wrap", items\active\weapons\other\tentaclegun\tentaclegun.altability 10c10 < "baseDps" : 2, --- > "baseDps" : 3.25, 21c21 < "power" : 1 --- > "power" : 3.25 items\active\weapons\other\tentaclegun\tentaclegun.lua 65c65,66 < damageTeam = world.entityDamageTeam(activeItem.ownerEntityId()) --- > damageTeam = world.entityDamageTeam(activeItem.ownerEntityId()), > powerMultiplier = activeItem.ownerPowerMultiplier() items\active\weapons\other\tentaclegun\wormgun.activeitem 9c9 < "weaponType" : "Assault Rifle", --- > "weaponType" : "Living Weapon", 11,12c11,12 < "itemTags" : ["weapon","ranged","assaultrifle"], < "level" : 1, --- > "itemTags" : ["weapon","ranged","livingweapon"], > "level" : 4, 25c25 < "fire" : [ "/sfx/gun/plasma_ar1.ogg", "/sfx/gun/plasma_ar2.ogg", "/sfx/gun/plasma_ar3.ogg", "/sfx/gun/plasma_pistol3.ogg" ] --- > "fire" : [ "/sfx/gun/evileye1.ogg", "/sfx/gun/evileye2.ogg", "/sfx/gun/evileye3.ogg", "/sfx/gun/evileye4.ogg", "/sfx/gun/evileye5.ogg", "/sfx/gun/evileye6.ogg" ] 28,29c28,29 < "baseOffset" : [0.03, 0.25], < "muzzleOffset" : [0.75, 0.35], --- > "baseOffset" : [-0.06, 0.2], > "muzzleOffset" : [1.4, 0.15], 46c46 < "baseDps" : 10, --- > "baseDps" : 3.25, 49c49 < "energyUsage" : 2.5, --- > "energyUsage" : 16, 54,56c54 < "knockback" : 8, < "power" : 2, < --- > "knockback" : 5, monsters\boss\apeboss\apeboss.monstertype 106a107,109 > "specialStatusImmunity" : { > "baseValue" : 1.0 > }, monsters\boss\apebossprojector\apebossprojector.monstertype 119a120,122 > }, > "specialStatusImmunity" : { > "baseValue" : 1.0 monsters\boss\crystalboss\crystalboss.monstertype 124a125,133 > "fireStatusImmunity" : { > "baseValue" : 1.0 > }, > "iceStatusImmunity" : { > "baseValue" : 1.0 > }, > "electricStatusImmunity" : { > "baseValue" : 1.0 > }, 128c137 < "fireStatusImmunity" : { --- > "specialStatusImmunity" : { monsters\boss\cultistboss\cultistboss.monstertype 148a149,157 > "fireStatusImmunity" : { > "baseValue" : 1.0 > }, > "iceStatusImmunity" : { > "baseValue" : 1.0 > }, > "electricStatusImmunity" : { > "baseValue" : 1.0 > }, 152c161 < "fireStatusImmunity" : { --- > "specialStatusImmunity" : { monsters\boss\dragonboss\dragonboss.monstertype 91a92,94 > "specialStatusImmunity" : { > "baseValue" : 1.0 > }, monsters\boss\kluexboss\kluexboss.monstertype 153a154,156 > "specialStatusImmunity" : { > "baseValue" : 1.0 > }, monsters\boss\kluexbossstatue\kluexbossstatue.monstertype 112a113,115 > "specialStatusImmunity" : { > "baseValue" : 1.0 > }, monsters\boss\penguinufo\penguinufo.monstertype 104a105,113 > "fireStatusImmunity" : { > "baseValue" : 1.0 > }, > "iceStatusImmunity" : { > "baseValue" : 1.0 > }, > "electricStatusImmunity" : { > "baseValue" : 1.0 > }, 108c117 < "fireStatusImmunity" : { --- > "specialStatusImmunity" : { monsters\boss\robotboss\robotboss.monstertype 120a121,129 > "fireStatusImmunity" : { > "baseValue" : 1.0 > }, > "iceStatusImmunity" : { > "baseValue" : 1.0 > }, > "electricStatusImmunity" : { > "baseValue" : 1.0 > }, 124c133 < "fireStatusImmunity" : { --- > "specialStatusImmunity" : { monsters\boss\spiderboss\spiderboss.monstertype 99a100,108 > "fireStatusImmunity" : { > "baseValue" : 1.0 > }, > "iceStatusImmunity" : { > "baseValue" : 1.0 > }, > "electricStatusImmunity" : { > "baseValue" : 1.0 > }, 103c112 < "fireStatusImmunity" : { --- > "specialStatusImmunity" : { monsters\mission\kluextotem\kluextotem.monstertype 98a99,101 > }, > "specialStatusImmunity" : { > "baseValue" : 1.0 objects\apex\apexfridge\apexfridge.object 9c9 < "description" : "Good for storing bananas.", --- > "description" : "A fridge, good for keeping food cold.", 15,18c15,18 < "floranDescription" : "We Floran musst learn to make cold food maker. Keep meat freshhh, yesss.", < "glitchDescription" : "Determined. We must search this food storage device.", < "humanDescription" : "A fridge! I've only seen ones like this in books.", < "hylotlDescription" : "We have no need for such devices under the ocean. I must adapt to surface life.", --- > "floranDescription" : "Floran lovesss cold food ssstore. Keep meat fresh, yesss.", > "glitchDescription" : "Determined. I must raid this food storage device!", > "humanDescription" : "A fridge! Just what you need to keep food cool.", > "hylotlDescription" : "We have no need for such devices under the ocean.", objects\apex\apexstoreshelf\apexstoreshelf.object 8c8 < "shortdescription" : "Store Shelf", --- > "shortdescription" : "Wooden Store Shelf", 12,13c12,13 < /* todo < "apexDescription" : "There are some healing items on this shelf.", --- > > "apexDescription" : "This shelf contains some useful items.", 15,20c15,20 < "floranDescription" : "There are some healing items on this shelf.", < "glitchDescription" : "There are some healing items on this shelf.", < "humanDescription" : "There are some healing items on this shelf.", < "hylotlDescription" : "There are some healing items on this shelf.", < "novakidDescription" : "There are some healing items on this shelf.", < */ --- > "floranDescription" : "Shelf hasss good itemss.", > "glitchDescription" : "Surprised. There are some useful items on this shelf.", > "humanDescription" : "This shelf is full of items, I bet it can hold even more.", > "hylotlDescription" : "There are some useful items on this shelf.", > "novakidDescription" : "I sure could make good use of these here items.", > objects\biome\scorchedcity\scorchedcityarrowsign\scorchedcityarrowsign.object 6c6 < "shortdescription" : "Scorched Arrow Sign", --- > "shortdescription" : "Tyre Arrow Sign", 15,16c15,16 < "glitchDescription" : "Remark. An arrow sign. Following it is the logical choice.", < "humanDescription" : "An arrow sign, following this can't end badly at all!", --- > "glitchDescription" : "Cunning. An arrow sign. Following it would be all too predictable.", > "humanDescription" : "An arrow sign. Nothing bad could ever come of following a random sign.", 18c18 < "novakidDescription" : "I wonder if I should follow this here arrow?", --- > "novakidDescription" : "What's the point of this here arrow anywho?", objects\biome\scorchedcity\scorchedcitybed\scorchedcitybed.object 7c7 < "shortdescription" : "Clean Industrial Bed", --- > "shortdescription" : "Stylish Bed", 12,15c12,15 < "apexDescription" : "A clean industrial looking bed.", < "avianDescription" : "A simple bed.", < "floranDescription" : "Clean bed isss good for Floran.", < "glitchDescription" : "Observation. A bed.", --- > "apexDescription" : "A fresh, clean looking bed.", > "avianDescription" : "A plain looking bed. The sheets are fresh.", > "floranDescription" : "Clean bed isss good for a resstful sleep.", > "glitchDescription" : "Calm. A bed with an appealingly high level of sterility.", 17,18c17,18 < "hylotlDescription" : "A simple bed, it will serve a purpose.", < "novakidDescription" : "A sturdy lookin' bed.", --- > "hylotlDescription" : "A simple bed, it will serve it's purpose.", > "novakidDescription" : "This bed looks a little too clean, if you ask me.", objects\biome\scorchedcity\scorchedcitybrokenbed\scorchedcitybrokenbed.object 7c7 < "shortdescription" : "Broken Bed", --- > "shortdescription" : "Broken Stylish Bed", 15c15 < "glitchDescription" : "Sadness. This bed is broken.", --- > "glitchDescription" : "Sad. This bed is broken.", objects\biome\scorchedcity\scorchedcitybrokenchair\scorchedcitybrokenchair.object 6c6 < "shortdescription" : "Broken Chair", --- > "shortdescription" : "Broken Stylish Chair", 14c14 < "glitchDescription" : "Surprised. This is a broken chair.", --- > "glitchDescription" : "Surprised. This chair is broken beyond repair.", 16,17c16,17 < "hylotlDescription" : "A broken chair. It is even more useless without a function.", < "novakidDescription" : "This here broken chair ain't fit for purpose.", --- > "hylotlDescription" : "A broken chair. It is no longer fit for purpose.", > "novakidDescription" : "This was a chair, once upon a time.", objects\biome\scorchedcity\scorchedcitybrokenchestdrawerlarge\scorchedcitybrokenchestdrawerlarge.object 6c6 < "shortdescription" : "Broken Large Chest of Drawers", --- > "shortdescription" : "Large Broken Drawers", 14,18c14,18 < "floranDescription" : "A broken large chest drawer.", < "glitchDescription" : "Sadness. A broken large chest of drawers.", < "humanDescription" : "A chest of drawers, minus a few drawers.", < "hylotlDescription" : "A chest of drawers, it is missing a few. It has no function.", < "novakidDescription" : "This sure is broken, its even missing some drawers.", --- > "floranDescription" : "A huge broken chessst of drawerss.", > "glitchDescription" : "Sad. A large chest of drawers, broken to pieces.", > "humanDescription" : "A chest of drawers, it's missing a few.", > "hylotlDescription" : "A chest of drawers, many of the drawers are now missing.", > "novakidDescription" : "This sure is broken, it's even missin' some drawers.", objects\biome\scorchedcity\scorchedcitybrokenchestdrawersmall\scorchedcitybrokenchestdrawersmall.object 6c6 < "shortdescription" : "Broken Small Chest of Drawers", --- > "shortdescription" : "Small Broken Drawers", 14,15c14,15 < "floranDescription" : "A broken large chest drawer.", < "glitchDescription" : "Sadness. A broken large chest of drawers.", --- > "floranDescription" : "A broken chessst of drawerss.", > "glitchDescription" : "Sad. A broken chest of drawers.", 17,18c17,18 < "hylotlDescription" : "A chest of drawers, it is missing one. It has no function.", < "novakidDescription" : "This sure is broken, its even missing a drawer.", --- > "hylotlDescription" : "A chest of drawers, most of the drawers are now missing.", > "novakidDescription" : "This sure is broken, it's even missing a drawer.", objects\biome\scorchedcity\scorchedcitybrokencounter\scorchedcitybrokencounter.object 6,7c6,7 < "description" : "A grimy counter.", < "shortdescription" : "Grimy Counter", --- > "description" : "A counter with added grime.", > "shortdescription" : "Grimy Stylish Counter", 14c14 < "floranDescription" : "Thiss counter iss grimy.", --- > "floranDescription" : "Thiss counter iss dirty.", 16,18c16,18 < "humanDescription" : "How long has this been here to get this grimy?", < "hylotlDescription" : "This counter is covered in grime.", < "novakidDescription" : "This here counter sure is grimy!", --- > "humanDescription" : "How long has this been here?", > "hylotlDescription" : "This counter is unsanitary.", > "novakidDescription" : "This here counter sure is filthy!", objects\biome\scorchedcity\scorchedcitybrokenfridge\scorchedcitybrokenfridge.object 6c6 < "shortdescription" : "Broken Fridge", --- > "shortdescription" : "Rusty Stylish Fridge", 10,18c10,18 < /* todo < "apexDescription" : "A broken fridge.", < "avianDescription" : "A broken fridge.", < "floranDescription" : "A broken fridge.", < "glitchDescription" : "A broken fridge.", < "humanDescription" : "A broken fridge.", < "hylotlDescription" : "A broken fridge.", < "novakidDescription" : "A broken fridge.", < */ --- > > "apexDescription" : "Broken and rusted beyond repair.", > "avianDescription" : "This firdge is useless now.", > "floranDescription" : "Broken and empty.", > "glitchDescription" : "Disappointed. This refrigerator was once such a useful device.", > "humanDescription" : "No good to anyone anymore", > "hylotlDescription" : "A dilapidated refrigerator.", > "novakidDescription" : "Now just a hunk o' junk.", > objects\biome\scorchedcity\scorchedcitybrokenstoreshelf\scorchedcitybrokenstoreshelf.object 7,8c7,8 < "description" : "-todo-", < "shortdescription" : "Broken Store Shelf", --- > "description" : "A rusty metal shelf, some store goods still remain on the shelves.", > "shortdescription" : "Rusty Metal Store Shelf", 10,18c10,18 < /* todo < "apexDescription" : "-todo-", < "avianDescription" : "-todo-", < "floranDescription" : "-todo-", < "glitchDescription" : "-todo-", < "humanDescription" : "-todo-", < "hylotlDescription" : "-todo-", < "novakidDescription" : "-todo-", < */ --- > > "apexDescription" : "This store shelf has seen better days.", > "avianDescription" : "There are still some items rusted onto this shelf.", > "floranDescription" : "Itemss are russsted stuck.", > "glitchDescription" : "Disgusted. There is rust all over this shelf.", > "humanDescription" : "This shelf still has some items on it.", > "hylotlDescription" : "A sad and rusted old shelf.", > "novakidDescription" : "These items are as rusty as the shelf.", > objects\biome\scorchedcity\scorchedcitybrokentable\scorchedcitybrokentable.object 7,8c7,8 < "description" : "A broken table.", < "shortdescription" : "Broken Table", --- > "description" : "A broken wooden table.", > "shortdescription" : "Broken Round Table", 12,16c12,17 < "avianDescription" : "A broken table.", < "floranDescription" : "A broken table.", < "glitchDescription" : "A broken table.", < "humanDescription" : "A broken table.", < "hylotlDescription" : "A broken table.", --- > "avianDescription" : "This table is completely broken.", > "floranDescription" : "Sssomeone sssmash table.", > "glitchDescription" : "Paranoid. Who destroyed this table?", > "humanDescription" : "Looks like someone took a hammer to this table.", > "hylotlDescription" : "How did this table get so badly broken?", > "novakidDescription" : "Junk. No good to anyone.", objects\biome\scorchedcity\scorchedcitybrokentank\scorchedcitybrokentank.object 12c12 < "apexDescription" : "A rusty tank.", --- > "apexDescription" : "A rusty tank, probably used to store water.", 16c16 < "humanDescription" : "A rusty tank. It smells terrible.", --- > "humanDescription" : "This old tank stinks of rust and mildew.", objects\biome\scorchedcity\scorchedcitybrokentraficlights\scorchedcitybrokentraficlights.object 5c5 < "description" : "Some broken traffic light.", --- > "description" : "A set of traffic lights, badly broken.", 13,15c13,15 < "floranDescription" : "Broken traffic lightsss.", < "glitchDescription" : "Alarmed. Broken traffic lights.", < "humanDescription" : "Broken traffic lights are no good at all!", --- > "floranDescription" : "Lightsss don't work anymore.", > "glitchDescription" : "Alarmed. These traffic lights are completely broken.", > "humanDescription" : "Broken traffic lights are no good to anyone!", objects\biome\scorchedcity\scorchedcitybrokentv\scorchedcitybrokentv.object 5,6c5,6 < "description" : "A broken television.", < "shortdescription" : "Broken Television", --- > "description" : "A broken television set.", > "shortdescription" : "Broken Stylish TV", 15,18c15,18 < "glitchDescription" : "Sadness. A broken television.", < "humanDescription" : "The screen is broken. Better than static though.", < "hylotlDescription" : "A broken television.", < "novakidDescription" : "The screen sure is smashed up.", --- > "glitchDescription" : "Sad. A broken television.", > "humanDescription" : "The screen is broken. Even that is better than static, though.", > "hylotlDescription" : "A broken television set.", > "novakidDescription" : "The screen sure is smashed up good.", objects\biome\scorchedcity\scorchedcitychair\scorchedcitychair.object 5,6c5,6 < "description" : "A simple but sturdy chair.", < "shortdescription" : "Sturdy Chair", --- > "description" : "A stylish but sturdy chair.", > "shortdescription" : "Stylish Chair", 11,13c11,13 < "apexDescription" : "A simple but sturdy chair.", < "avianDescription" : "A simple looking chair.", < "floranDescription" : "Sssturdy chair, iss comfortable.", --- > "apexDescription" : "A sylish yet sturdy chair.", > "avianDescription" : "A nice looking chair.", > "floranDescription" : "Fancy chair iss comfortable.", 15,16c15,16 < "humanDescription" : "A solid looking chair.", < "hylotlDescription" : "A chair, simple in design, but not unpleasant.", --- > "humanDescription" : "A nicely designed chair.", > "hylotlDescription" : "A chair, simple in design, but not unpleasant to look at.", objects\biome\scorchedcity\scorchedcitychestdrawerlarge\scorchedcitychestdrawerlarge.object 7,8c7,8 < "description" : "A large chest of drawers.", < "shortdescription" : "Large Chest of Drawers", --- > "description" : "A large contemporary chest of drawers.", > "shortdescription" : "Large Stylish Drawers", 14,15c14,15 < "apexDescription" : "A large chest of drawers.", < "avianDescription" : "A large chest of drawers.", --- > "apexDescription" : "A bulky chest of drawers.", > "avianDescription" : "Quite a large chest of drawers.", 17c17 < "glitchDescription" : "Remark. A large chest of drawers.", --- > "glitchDescription" : "Content. A large chest of drawers.", 19,20c19,20 < "hylotlDescription" : "A large chest of drawers. Useful enough.", < "novakidDescription" : "This sure is useful for storage!", --- > "hylotlDescription" : "A large chest of drawers. An uninspired design.", > "novakidDescription" : "Storage is always useful!", objects\biome\scorchedcity\scorchedcitychestdrawersmall\scorchedcitychestdrawersmall.object 7,8c7,8 < "description" : "A small chest of drawers.", < "shortdescription" : "Small Chest of Drawers", --- > "description" : "A small contemporary chest of drawers.", > "shortdescription" : "Small Stylish Drawers", 16,20c16,20 < "floranDescription" : "Small chessst of drawersss, good for hiding thingss.", < "glitchDescription" : "Remark. A small chest of drawers.", < "humanDescription" : "A small chest of drawers, finally, a place for all my clothes!", < "hylotlDescription" : "A small chest of drawers. Useful enough.", < "novakidDescription" : "This sure is useful for storage!", --- > "floranDescription" : "Small chest of drawersss, good for hiding ssmall thingss.", > "glitchDescription" : "Content. A small chest of drawers.", > "humanDescription" : "A small chest of drawers, useful for storing small things.", > "hylotlDescription" : "A small chest of drawers. Useful if not very beautiful.", > "novakidDescription" : "Storage is always useful!", objects\biome\scorchedcity\scorchedcitycounter\scorchedcitycounter.object 10c10 < "shortdescription" : "Clean Industrial Counter", --- > "shortdescription" : "Stylish Counter", 14,15c14,15 < "avianDescription" : "This counter is a little industrial, but its clean.", < "floranDescription" : "Counter is too clean!", --- > "avianDescription" : "This counter is a little sterile looking, but at least it's clean.", > "floranDescription" : "Counter iss clean. Too clean!", 17,18c17,18 < "humanDescription" : "This counter has a clean industrial look.", < "hylotlDescription" : "An industrial looking counter.", --- > "humanDescription" : "This counter has a clean, clinical look to it.", > "hylotlDescription" : "An sterile looking counter. I wonder how clean it really is.", objects\biome\scorchedcity\scorchedcitycrate\scorchedcitycrate.object 17c17 < "humanDescription" : "It's just a crate.", --- > "humanDescription" : "It's just a crate. A little rusty but still intact.", objects\biome\scorchedcity\scorchedcityfridge\scorchedcityfridge.object 7,8c7,8 < "description" : "A industrial looking fridge.", < "shortdescription" : "Industrial Fridge", --- > "description" : "A contemprary style fridge, capable of extending the shelf life of food.", > "shortdescription" : "Stylish Fridge", 13,14c13,14 < "apexDescription" : "A fridge.", < "avianDescription" : "A fridge, so useful for storing food.", --- > "apexDescription" : "A compact fridge with a freezer compartment on top.", > "avianDescription" : "A fridge, useful for storing food and keeping it fresh.", 16,17c16,17 < "glitchDescription" : "Remark. A fridge.", < "humanDescription" : "I wonder if there's anything good in this fridge?", --- > "glitchDescription" : "Happy. A refrigerator. A convenient food store.", > "humanDescription" : "I wonder if there's anything good in the fridge?", objects\biome\scorchedcity\scorchedcitysign1\scorchedcitysign1.object 7c7 < "description" : "A sign, but what is it warning?", --- > "description" : "A warning sign, but what is it warning of?", 17c17 < "novakidDescription" : "I never paid much attention to signs.", --- > "novakidDescription" : "I never paid much attention to signs. Ain't about to start, either!", objects\biome\scorchedcity\scorchedcitysmallcrate\scorchedcitysmallcrate.object 17c17 < "humanDescription" : "It's just a crate.", --- > "humanDescription" : "It's just a crate. A little rusty but still intact.", 19c19 < "novakidDescription" : "A small rusty lookin' crate.", --- > "novakidDescription" : "A rusty lookin' crate.", objects\biome\scorchedcity\scorchedcitystoreshelf\scorchedcitystoreshelf.object 7,8c7,8 < "description" : "There are plenty of items on this shelf.", < "shortdescription" : "Store Shelf", --- > "description" : "A metal shelf packed with store goods.", > "shortdescription" : "Metal Store Shelf", 16c16 < "glitchDescription" : "Surprised. There are some items on this shelf.", --- > "glitchDescription" : "Surprised. There are some useful items on this shelf.", 19c19 < "novakidDescription" : "I sure could store even more on this shelf.", --- > "novakidDescription" : "I sure could make good use of these here items.", objects\biome\scorchedcity\scorchedcitytable\scorchedcitytable.object 7,8c7,8 < "description" : "A rounded table.", < "shortdescription" : "Rounded Table", --- > "description" : "A rounded wooden table.", > "shortdescription" : "Round Table", 11,12c11,12 < "apexDescription" : "A basic rounded table.", < "avianDescription" : "A simple table, it is delightfully simple.", --- > "apexDescription" : "A basic round table.", > "avianDescription" : "A round table, it is delightfully simple.", 14c14 < "glitchDescription" : "Pleased. A perfectly round table.", --- > "glitchDescription" : "Pleased. The circumference of this table is perfectly circular.", 16,17c16,17 < "hylotlDescription" : "A table. It is almost too simple in design.", < "novakidDescription" : "A good lookin' table.", --- > "hylotlDescription" : "A simple table in terms of design.", > "novakidDescription" : "A good lookin' wooden table.", objects\biome\scorchedcity\scorchedcitytv\scorchedcitytv.object 5,6c5,6 < "description" : "A television.", < "shortdescription" : "Industrial Television", --- > "description" : "A popular style of television set.", > "shortdescription" : "Stylish TV", 12,18c12,18 < "apexDescription" : "A television.", < "avianDescription" : "A scorched city television.", < "floranDescription" : "Iss a televisssion.", < "glitchDescription" : "Surprised. A television.", < "humanDescription" : "A TV! I bet there still isn't anything on.", < "hylotlDescription" : "A scorched city television.", < "novakidDescription" : "One of those televisions, .", --- > "apexDescription" : "A classy television set.", > "avianDescription" : "A television, these are commonly found in city homes.", > "floranDescription" : "Televisssion.", > "glitchDescription" : "Surprised. A modern television.", > "humanDescription" : "A TV! All these channels and still nothing worth watching.", > "hylotlDescription" : "A city-style television set.", > "novakidDescription" : "One of those televisions from the big city.", objects\biome\scorchedcity\scorchedlandmine\scorchedlandmine.object 10,11c10,11 < "description" : "Watch your step!", < "shortdescription" : "Industrial Land Mine", --- > "description" : "An old, forgotten land mine. It may still be active!", > "shortdescription" : "Rusty Land Mine", 13a14,15 > "apexDescription" : "A land mine, it could still be active.", > "avianDescription" : "Uh oh! I do not want to step on this.", 15c17,20 < "glitchDescription" : "Caution. Watch your step.", --- > "glitchDescription" : "Cautious. An active land mine, I had better be careful.", > "humanDescription" : "I don't want to risk it, this thing could still go off.", > "hylotlDescription" : "Land mines, smaller than sea mines but still lethal.", > "novakidDescription" : "This thing could still blow!", objects\biome\scorchedcity\vrheadset\vrheadset.object 11,12c11,12 < "apexDescription" : "When I use this, I can explore anywhere I could dream of. With the right program.", < "avianDescription" : "Using this, I can feel like I'm flying!", --- > "apexDescription" : "With the right programme installed, I could explore anywhere I could dream of.", > "avianDescription" : "Using this headset, I feel like I'm flying!", 14c14 < "glitchDescription" : "Impressed. It is like altering your programming without actually doing so.", --- > "glitchDescription" : "Impressed. Wearing a virtual reality headset is like altering your programming without actually doing so.", 16,17c16,17 < "hylotlDescription" : "Fascinating, I feel like I am right in the middle of the ocean with this.", < "novakidDescription" : "This sure is a nifty bit of equipment.", --- > "hylotlDescription" : "A fascinating device, capable of emulating the experience of being underwater without getting wet.", > "novakidDescription" : "With this nifty bit of equipment, I could see the whole universe without even leavin' home!", objects\generic\minifridge\minifridge.object 8a9 > "printable" : false, 15c16 < "floranDescription" : "Floran can sssmell meat.", --- > "floranDescription" : "Floran can sssmell meat. Maybe meat inssside?", 17c18 < "humanDescription" : "I'm practically vibrating with excitement thinking about the possible contents.", --- > "humanDescription" : "I'm salivating with excitement thinking about the possible contents.", objects\human\fridge\fridge.object 9a10 > "printable" : false, objects\hylotl\hylotlstoreshelf\hylotlstoreshelf.object 9c9 < "shortdescription" : "Store Shelf Unit", --- > "shortdescription" : "Hylotl Store Shelf", objects\themed\outdoor\outdoorchair\outdoorchair.object 13c13 < "avianDescription" : "A outdoor chair, I wonder how comfortable it is?", --- > "avianDescription" : "An outdoor chair, I wonder how comfortable it is?", objects\wired\landmine\landmine.object 11c11 < "shortdescription" : "Land Mine", --- > "shortdescription" : "Military Land Mine", 13a14,15 > "apexDescription" : "A land mine, it could still be active.", > "avianDescription" : "Uh oh! I do not want to step on this.", 15c17,20 < "glitchDescription" : "Caution. Watch your step.", --- > "glitchDescription" : "Cautious. An active land mine, I had better be careful.", > "humanDescription" : "I don't want to risk it, this thing could still go off.", > "hylotlDescription" : "Land mines, smaller than sea mines but still lethal.", > "novakidDescription" : "This thing could still blow!", projectiles\guns\tentaclefist\invisibletentaclefist.projectile 11c11 < "damageKind" : "slash", --- > "damageKind" : "lash", projectiles\guns\tentaclefist\tentaclefist.projectile 11,12c11,12 < "damageKind" : "slash", < "damagePoly" : [ [-1.0, -1.0], [-1.0, 1.0], [1.0, 1.0], [1.0, -1.0] ], --- > "damageKind" : "fist", > "damagePoly" : [ [-2.0, -2.0], [-2.0, 2.0], [2.0, 2.0], [2.0, -2.0] ], projectiles\npcs\eyeball\evileyeball.projectile 9c9 < "timeToLive" : 1.5, --- > "timeToLive" : 2.5, 13c13 < "damageKind" : "default", --- > "damageKind" : "lash", 15a16,19 > "action" : "sound", > "options" : [ "/sfx/projectiles/gnome_impact1.ogg", "/sfx/projectiles/gnome_impact2.ogg", "/sfx/projectiles/gnome_impact3.ogg", "/sfx/projectiles/gnome_impact4.ogg", "/sfx/projectiles/gnome_impact5.ogg", "/sfx/projectiles/gnome_impact6.ogg" ] > }, > { 17c21 < "count" : 6, --- > "count" : 4, 23,26c27,53 < "size" : 3, < "color" : [240, 50, 80, 200], < "initialVelocity" : [0.0, -500.0], < "timeToLive" : 0.25, --- > "size" : 1, > "color" : [226, 195, 68, 255], > "approach" : [5, 30], > "initialVelocity" : [0.0, 0.0], > "finalVelocity" : [0, -30], > "timeToLive" : 5.5, > "fade" : 0.8, > "destructionAction" : "shrink", > "destructionTime" : 0.25, > "layer" : "middle", > "variance" : { > "initialVelocity" : [20, 15], > "finalVelocity" : [0, 5], > "timeToLive" : 0.25 > } > } > }, > { > "action" : "particle", > "specification" : { > "type" : "ember", > "size" : 1, > "color" : [255, 255, 167, 255], > "approach" : [5, 30], > "initialVelocity" : [0.0, 0.0], > "finalVelocity" : [0, -30], > "timeToLive" : 5.5, 30c57,62 < "layer" : "middle" --- > "layer" : "middle", > "variance" : { > "initialVelocity" : [20, 15], > "finalVelocity" : [0, 5], > "timeToLive" : 0.25 > } rendering\opengl20.config 52c52 < fragmentLightMapCoordinate = (screenPosition / lightMapScale) / lightMapSize - lightMapOffset / screenSize; --- > fragmentLightMapCoordinate = (screenPosition / lightMapScale) - lightMapOffset * lightMapSize / screenSize; 63a64 > uniform vec2 lightMapSize; 70a72,109 > vec4 cubic(float v) { > vec4 n = vec4(1.0, 2.0, 3.0, 4.0) - v; > vec4 s = n * n * n; > float x = s.x; > float y = s.y - 4.0 * s.x; > float z = s.z - 4.0 * s.y + 6.0 * s.x; > float w = 6.0 - x - y - z; > return vec4(x, y, z, w); > } > > vec4 bicubicSample(sampler2D texture, vec2 texcoord, vec2 texscale) { > texcoord = texcoord - vec2(0.5, 0.5); > > float fx = fract(texcoord.x); > float fy = fract(texcoord.y); > texcoord.x -= fx; > texcoord.y -= fy; > > vec4 xcubic = cubic(fx); > vec4 ycubic = cubic(fy); > > vec4 c = vec4(texcoord.x - 0.5, texcoord.x + 1.5, texcoord.y - 0.5, texcoord.y + 1.5); > vec4 s = vec4(xcubic.x + xcubic.y, xcubic.z + xcubic.w, ycubic.x + ycubic.y, ycubic.z + ycubic.w); > vec4 offset = c + vec4(xcubic.y, xcubic.w, ycubic.y, ycubic.w) / s; > > vec4 sample0 = texture2D(texture, vec2(offset.x, offset.z) * texscale); > vec4 sample1 = texture2D(texture, vec2(offset.y, offset.z) * texscale); > vec4 sample2 = texture2D(texture, vec2(offset.x, offset.w) * texscale); > vec4 sample3 = texture2D(texture, vec2(offset.y, offset.w) * texscale); > > float sx = s.x / (s.x + s.y); > float sy = s.z / (s.z + s.w); > > return mix( > mix(sample3, sample2, sx), > mix(sample1, sample0, sx), sy); > } > 74c113 < finalColor *= texture2D(lightMap, fragmentLightMapCoordinate) * lightMapMultiplier; --- > finalColor *= bicubicSample(lightMap, fragmentLightMapCoordinate, 1.0 / lightMapSize) * lightMapMultiplier; spawntypes\uniques.spawntypes 4c4 < // TENTACLES BIOME --- > // TENTACLE BIOME tilesets\packed\materials.json 7c7 < "tilecount" : 189, --- > "tilecount" : 190, 607a608,613 > "189" : { > "//description" : "-todo-", > "//name" : "stomachblock", > "//shortdescription" : "Stomach Block", > "material" : "stomachblock" > }, 1440a1447,1449 > }, > "189" : { > "image" : "./../../../../tiled/packed/materials/stomachblock.png" tilesets\packed\objects-by-category\decorative.json 7c7 < "tilecount" : 1227, --- > "tilecount" : 1228, 1158c1158 < "//description" : "A scorched city television.", --- > "//description" : "A television.", 1160c1160 < "//shortdescription" : "Scorched City Television", --- > "//shortdescription" : "Industrial Television", 1176c1176 < "//description" : "A broken small chest drawer.", --- > "//description" : "A chest of drawers, minus a drawer.", 1178c1178 < "//shortdescription" : "Broken Small Chest Drawer", --- > "//shortdescription" : "Broken Small Chest of Drawers", 1239c1239 < "//description" : "A broken large chest drawer.", --- > "//description" : "A chest of drawers, minus a few drawers.", 1241c1241 < "//shortdescription" : "Broken Large Chest Drawer", --- > "//shortdescription" : "Broken Large Chest of Drawers", 1248c1248 < "//description" : "A broken holding tank.", --- > "//description" : "A rusty holding tank.", 1250c1250 < "//shortdescription" : "Broken Holding Tank", --- > "//shortdescription" : "Rusty Holding Tank", 1311c1311 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 1313c1313 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 1320c1320 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 1322c1322 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 1412c1412 < "//description" : "A broken counter.", --- > "//description" : "A grimy counter.", 1414c1414 < "//shortdescription" : "Broken Counter", --- > "//shortdescription" : "Grimy Counter", 1439c1439 < "//description" : "A broken traffic light.", --- > "//description" : "Some broken traffic light.", 1695c1695 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Green Club Lights", 1704c1704 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Red Club Lights", 1713c1713 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Yellow Club Lights", 2191a2192,2200 > "1227" : { > "//description" : "Tick, tock, tick, tock.", > "//name" : "tentacleexperiment", > "//shortdescription" : "Owl Wall Clock", > "imagePositionX" : "0", > "imagePositionY" : "0", > "object" : "tentacleexperiment", > "tilesetDirection" : "right" > }, 7243c7252 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Blue Club Lights", 7521c7530 < "//description" : "This Avian server must contain a vast amount of data. If only I had a USB stick.", --- > "//description" : "This Avian server must contain a vast amount of data.", 10969a10979,10981 > }, > "1227" : { > "image" : "../../../../../tiled/packed/objects/tentacleexperiment.png" tilesets\packed\objects-by-category\door.json 71c71 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 73c73 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", tilesets\packed\objects-by-category\furniture.json 1923c1923 < "//description" : "A scorched city table.", --- > "//description" : "A rounded table.", 1925c1925 < "//shortdescription" : "Scorched City Table", --- > "//shortdescription" : "Rounded Table", 1950c1950 < "//description" : "A scorched city bed.", --- > "//description" : "A clean and sturdy bed.", 1952c1952 < "//shortdescription" : "Scorched City Bed", --- > "//shortdescription" : "Clean Industrial Bed", 2013c2013 < "//description" : "A scorched city chair.", --- > "//description" : "A simple but sturdy chair.", 2015c2015 < "//shortdescription" : "Scorched City Chair", --- > "//shortdescription" : "Sturdy Chair", tilesets\packed\objects-by-category\storage.json 40c40 < "imagePositionX" : "-8.5", --- > "imagePositionX" : "-8", 953c953 < "//description" : "A large chest drawer.", --- > "//description" : "A large chest of drawers.", 955c955 < "//shortdescription" : "Large Chest Drawer", --- > "//shortdescription" : "Large Chest of Drawers", 962c962 < "//description" : "A small chest drawer.", --- > "//description" : "A small chest of drawers.", 964c964 < "//shortdescription" : "small Chest Drawer", --- > "//shortdescription" : "Small Chest of Drawers", 980c980 < "//description" : "A scorched city fridge.", --- > "//description" : "A industrial looking fridge.", 982c982 < "//shortdescription" : "Scorched City Fridge", --- > "//shortdescription" : "Industrial Fridge", 1002c1002 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 1004c1004 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 1011c1011 < "//description" : "A scorched city chest.", --- > "//description" : "A rusty looking chest.", 1013c1013 < "//shortdescription" : "Scorched City Chest", --- > "//shortdescription" : "Rusty Chest", 1020c1020 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 1022c1022 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", 1047c1047 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 1049c1049 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", 1065c1065 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 1067c1067 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", 1823c1823 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", tilesets\packed\objects-by-category\wire.json 637c637 < "//shortdescription" : "Scorched Land Mine", --- > "//shortdescription" : "Industrial Land Mine", tilesets\packed\objects-by-colonytag\ancient.json 208c208 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 210c210 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", tilesets\packed\objects-by-colonytag\avian.json 7c7 < "tilecount" : 184, --- > "tilecount" : 185, 72c72 < "//description" : "This Avian server must contain a vast amount of data. If only I had a USB stick.", --- > "//description" : "This Avian server must contain a vast amount of data.", 672c672 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", 850a851,859 > "184" : { > "//description" : "Tick, tock, tick, tock.", > "//name" : "tentacleexperiment", > "//shortdescription" : "Owl Wall Clock", > "imagePositionX" : "0", > "imagePositionY" : "0", > "object" : "tentacleexperiment", > "tilesetDirection" : "right" > }, 1918a1928,1930 > }, > "184" : { > "image" : "../../../../../tiled/packed/objects/tentacleexperiment.png" tilesets\packed\objects-by-colonytag\aviantemple.json 250c250 < "//description" : "This Avian server must contain a vast amount of data. If only I had a USB stick.", --- > "//description" : "This Avian server must contain a vast amount of data.", tilesets\packed\objects-by-colonytag\avianvillage.json 7c7 < "tilecount" : 29, --- > "tilecount" : 30, 168c168 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", 202a203,211 > "29" : { > "//description" : "Tick, tock, tick, tock.", > "//name" : "tentacleexperiment", > "//shortdescription" : "Owl Wall Clock", > "imagePositionX" : "0", > "imagePositionY" : "0", > "object" : "tentacleexperiment", > "tilesetDirection" : "right" > }, 331a341,343 > }, > "29" : { > "image" : "../../../../../tiled/packed/objects/tentacleexperiment.png" tilesets\packed\objects-by-colonytag\christmas.json 209c209 < "imagePositionX" : "-8.5", --- > "imagePositionX" : "-8", tilesets\packed\objects-by-colonytag\combat.json 92c92 < "//shortdescription" : "Scorched Land Mine", --- > "//shortdescription" : "Industrial Land Mine", tilesets\packed\objects-by-colonytag\commerce.json 65c65 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 67c67 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 570c570 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 572c572 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", 889c889 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 891c891 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", tilesets\packed\objects-by-colonytag\door.json 352c352 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 354c354 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", tilesets\packed\objects-by-colonytag\electronic.json 606c606 < "//description" : "This Avian server must contain a vast amount of data. If only I had a USB stick.", --- > "//description" : "This Avian server must contain a vast amount of data.", tilesets\packed\objects-by-colonytag\hylotl.json 1007c1007 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Green Club Lights", 1016c1016 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Red Club Lights", 1025c1025 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Yellow Club Lights", 1321c1321 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Blue Club Lights", tilesets\packed\objects-by-colonytag\hylotloceancity.json 261c261 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Green Club Lights", 270c270 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Red Club Lights", 279c279 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Yellow Club Lights", 463c463 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Blue Club Lights", tilesets\packed\objects-by-colonytag\light.json 1115c1115 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Blue Club Lights", 2133c2133 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Green Club Lights", 2142c2142 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Red Club Lights", 2151c2151 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Yellow Club Lights", tilesets\packed\objects-by-colonytag\mechanical.json 243c243 < "//description" : "A broken holding tank.", --- > "//description" : "A rusty holding tank.", 245c245 < "//shortdescription" : "Broken Holding Tank", --- > "//shortdescription" : "Rusty Holding Tank", tilesets\packed\objects-by-colonytag\pretty.json 7c7 < "tilecount" : 410, --- > "tilecount" : 411, 3040a3041,3049 > "410" : { > "//description" : "Tick, tock, tick, tock.", > "//name" : "tentacleexperiment", > "//shortdescription" : "Owl Wall Clock", > "imagePositionX" : "0", > "imagePositionY" : "0", > "object" : "tentacleexperiment", > "tilesetDirection" : "right" > }, 4633a4643,4645 > }, > "410" : { > "image" : "../../../../../tiled/packed/objects/tentacleexperiment.png" tilesets\packed\objects-by-colonytag\scorched.json 20c20 < "//description" : "A large chest drawer.", --- > "//description" : "A large chest of drawers.", 22c22 < "//shortdescription" : "Large Chest Drawer", --- > "//shortdescription" : "Large Chest of Drawers", 29c29 < "//description" : "A broken counter.", --- > "//description" : "A grimy counter.", 31c31 < "//shortdescription" : "Broken Counter", --- > "//shortdescription" : "Grimy Counter", 56c56 < "//description" : "A broken holding tank.", --- > "//description" : "A rusty holding tank.", 58c58 < "//shortdescription" : "Broken Holding Tank", --- > "//shortdescription" : "Rusty Holding Tank", 92c92 < "//description" : "A broken small chest drawer.", --- > "//description" : "A chest of drawers, minus a drawer.", 94c94 < "//shortdescription" : "Broken Small Chest Drawer", --- > "//shortdescription" : "Broken Small Chest of Drawers", 110c110 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 112c112 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", 119c119 < "//description" : "A scorched city bed.", --- > "//description" : "A clean and sturdy bed.", 121c121 < "//shortdescription" : "Scorched City Bed", --- > "//shortdescription" : "Clean Industrial Bed", 128c128 < "//description" : "A scorched city chest.", --- > "//description" : "A rusty looking chest.", 130c130 < "//shortdescription" : "Scorched City Chest", --- > "//shortdescription" : "Rusty Chest", 137c137 < "//description" : "A broken large chest drawer.", --- > "//description" : "A chest of drawers, minus a few drawers.", 139c139 < "//shortdescription" : "Broken Large Chest Drawer", --- > "//shortdescription" : "Broken Large Chest of Drawers", 155c155 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 157c157 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 209c209 < "//description" : "A scorched city chair.", --- > "//description" : "A simple but sturdy chair.", 211c211 < "//shortdescription" : "Scorched City Chair", --- > "//shortdescription" : "Sturdy Chair", 218c218 < "//description" : "A scorched city table.", --- > "//description" : "A rounded table.", 220c220 < "//shortdescription" : "Scorched City Table", --- > "//shortdescription" : "Rounded Table", 227c227 < "//description" : "A small chest drawer.", --- > "//description" : "A small chest of drawers.", 229c229 < "//shortdescription" : "small Chest Drawer", --- > "//shortdescription" : "Small Chest of Drawers", 236c236 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 238c238 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", 280c280 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 282c282 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", 289c289 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 291c291 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 298c298 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 300c300 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 316c316 < "//description" : "A scorched city television.", --- > "//description" : "A television.", 318c318 < "//shortdescription" : "Scorched City Television", --- > "//shortdescription" : "Industrial Television", 325c325 < "//description" : "A scorched city fridge.", --- > "//description" : "A industrial looking fridge.", 327c327 < "//shortdescription" : "Scorched City Fridge", --- > "//shortdescription" : "Industrial Fridge", 334c334 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 336c336 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", 343c343 < "//description" : "A broken traffic light.", --- > "//description" : "Some broken traffic light.", 354c354 < "//shortdescription" : "Scorched Land Mine", --- > "//shortdescription" : "Industrial Land Mine", tilesets\packed\objects-by-colonytag\storage.json 750c750 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 752c752 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", 759c759 < "//description" : "A scorched city chest.", --- > "//description" : "A rusty looking chest.", 761c761 < "//shortdescription" : "Scorched City Chest", --- > "//shortdescription" : "Rusty Chest", 1160c1160 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 1162c1162 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 1204c1204 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", 1400c1400 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 1402c1402 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", 1660c1660 < "//description" : "A large chest drawer.", --- > "//description" : "A large chest of drawers.", 1662c1662 < "//shortdescription" : "Large Chest Drawer", --- > "//shortdescription" : "Large Chest of Drawers", 2093c2093 < "//description" : "A scorched city fridge.", --- > "//description" : "A industrial looking fridge.", 2095c2095 < "//shortdescription" : "Scorched City Fridge", --- > "//shortdescription" : "Industrial Fridge", 2147c2147 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 2149c2149 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", tilesets\packed\objects-by-race\ancient.json 73c73 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 75c75 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", tilesets\packed\objects-by-race\apex.json 2354c2354 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 2356c2356 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", tilesets\packed\objects-by-race\avian.json 7c7 < "tilecount" : 294, --- > "tilecount" : 295, 161c161 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", 426c426 < "//description" : "This Avian server must contain a vast amount of data. If only I had a USB stick.", --- > "//description" : "This Avian server must contain a vast amount of data.", 1587a1588,1596 > "294" : { > "//description" : "Tick, tock, tick, tock.", > "//name" : "tentacleexperiment", > "//shortdescription" : "Owl Wall Clock", > "imagePositionX" : "0", > "imagePositionY" : "0", > "object" : "tentacleexperiment", > "tilesetDirection" : "right" > }, 2906a2916,2918 > }, > "294" : { > "image" : "../../../../../tiled/packed/objects/tentacleexperiment.png" tilesets\packed\objects-by-race\generic.json 4363c4363 < "//description" : "A scorched city television.", --- > "//description" : "A television.", 4365c4365 < "//shortdescription" : "Scorched City Television", --- > "//shortdescription" : "Industrial Television", 4453c4453 < "//description" : "A large chest drawer.", --- > "//description" : "A large chest of drawers.", 4455c4455 < "//shortdescription" : "Large Chest Drawer", --- > "//shortdescription" : "Large Chest of Drawers", 4546c4546 < "//description" : "A scorched city table.", --- > "//description" : "A rounded table.", 4548c4548 < "//shortdescription" : "Scorched City Table", --- > "//shortdescription" : "Rounded Table", 4577c4577 < "//description" : "A scorched city bed.", --- > "//description" : "A clean and sturdy bed.", 4579c4579 < "//shortdescription" : "Scorched City Bed", --- > "//shortdescription" : "Clean Industrial Bed", 4617c4617 < "//description" : "A broken small chest drawer.", --- > "//description" : "A chest of drawers, minus a drawer.", 4619c4619 < "//shortdescription" : "Broken Small Chest Drawer", --- > "//shortdescription" : "Broken Small Chest of Drawers", 4689c4689 < "//description" : "A small chest drawer.", --- > "//description" : "A small chest of drawers.", 4691c4691 < "//shortdescription" : "small Chest Drawer", --- > "//shortdescription" : "Small Chest of Drawers", 4707c4707 < "//description" : "A scorched city fridge.", --- > "//description" : "A industrial looking fridge.", 4709c4709 < "//shortdescription" : "Scorched City Fridge", --- > "//shortdescription" : "Industrial Fridge", 4747c4747 < "//description" : "A broken large chest drawer.", --- > "//description" : "A chest of drawers, minus a few drawers.", 4749c4749 < "//shortdescription" : "Broken Large Chest Drawer", --- > "//shortdescription" : "Broken Large Chest of Drawers", 4764c4764 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 4766c4766 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 4773c4773 < "//description" : "A broken holding tank.", --- > "//description" : "A rusty holding tank.", 4775c4775 < "//shortdescription" : "Broken Holding Tank", --- > "//shortdescription" : "Rusty Holding Tank", 4804c4804 < "//description" : "A scorched city chair.", --- > "//description" : "A simple but sturdy chair.", 4806c4806 < "//shortdescription" : "Scorched City Chair", --- > "//shortdescription" : "Sturdy Chair", 4813c4813 < "//description" : "A scorched city chest.", --- > "//description" : "A rusty looking chest.", 4815c4815 < "//shortdescription" : "Scorched City Chest", --- > "//shortdescription" : "Rusty Chest", 4830c4830 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 4832c4832 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", 4841c4841 < "//shortdescription" : "Scorched Land Mine", --- > "//shortdescription" : "Industrial Land Mine", 5035c5035 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 5037c5037 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 5044c5044 < "//description" : "A sign", --- > "//description" : "A sign, but what is it warning?", 5046c5046 < "//shortdescription" : "Scorched City Sign", --- > "//shortdescription" : "Warning Sign", 5254c5254 < "//description" : "A broken counter.", --- > "//description" : "A grimy counter.", 5256c5256 < "//shortdescription" : "Broken Counter", --- > "//shortdescription" : "Grimy Counter", 5281c5281 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 5283c5283 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", 5290c5290 < "//description" : "A broken traffic light.", --- > "//description" : "Some broken traffic light.", 5387c5387 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 5389c5389 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", 5413c5413 < "//description" : "A manhole.", --- > "//description" : "A manhole cover.", 5415c5415 < "//shortdescription" : "Manhole", --- > "//shortdescription" : "Manhole Cover", 10357c10357 < "imagePositionX" : "-8.5", --- > "imagePositionX" : "-8", tilesets\packed\objects-by-race\hylotl.json 81c81 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Blue Club Lights", 1068c1068 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Green Club Lights", 1077c1077 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Red Club Lights", 1086c1086 < "//shortdescription" : "Club Lights", --- > "//shortdescription" : "Yellow Club Lights", tilesets\packed\objects-by-type\container.json 250c250 < "//description" : "I wonder if there's an Avian Narnia..", --- > "//description" : "The crystal on top of this closet appears to be broken.", 1392c1392 < "//description" : "A large chest drawer.", --- > "//description" : "A large chest of drawers.", 1394c1394 < "//shortdescription" : "Large Chest Drawer", --- > "//shortdescription" : "Large Chest of Drawers", 1410c1410 < "//description" : "A small chest drawer.", --- > "//description" : "A small chest of drawers.", 1412c1412 < "//shortdescription" : "small Chest Drawer", --- > "//shortdescription" : "Small Chest of Drawers", 1428c1428 < "//description" : "A scorched city fridge.", --- > "//description" : "A industrial looking fridge.", 1430c1430 < "//shortdescription" : "Scorched City Fridge", --- > "//shortdescription" : "Industrial Fridge", 1446c1446 < "//description" : "A scorched city small crate.", --- > "//description" : "A small rusty looking crate.", 1448c1448 < "//shortdescription" : "Scorched City Small Crate", --- > "//shortdescription" : "Small Rusty Crate", 1455c1455 < "//description" : "A scorched city chest.", --- > "//description" : "A rusty looking chest.", 1457c1457 < "//shortdescription" : "Scorched City Chest", --- > "//shortdescription" : "Rusty Chest", 1464c1464 < "//description" : "A scorched city crate.", --- > "//description" : "A rusty crate.", 1466c1466 < "//shortdescription" : "Scorched City Crate", --- > "//shortdescription" : "Rusty Crate", 1530c1530 < "//description" : "A scorched city counter.", --- > "//description" : "A clean looking counter.", 1532c1532 < "//shortdescription" : "Scorched City Counter", --- > "//shortdescription" : "Clean Industrial Counter", 1548c1548 < "//description" : "There are some healing items on this shelf.", --- > "//description" : "There are plenty of items on this shelf.", 1550c1550 < "//shortdescription" : "Scorched City Shelf", --- > "//shortdescription" : "Store Shelf", tilesets\packed\objects-by-type\loungeable.json 1253c1253 < "//description" : "A scorched city bed.", --- > "//description" : "A clean and sturdy bed.", 1255c1255 < "//shortdescription" : "Scorched City Bed", --- > "//shortdescription" : "Clean Industrial Bed", 1271c1271 < "//description" : "A scorched city chair.", --- > "//description" : "A simple but sturdy chair.", 1273c1273 < "//shortdescription" : "Scorched City Chair", --- > "//shortdescription" : "Sturdy Chair", treasure\dungeon.treasurepools 59a60,77 > "apexfacilitychesttreasure" : [ > [1, { > "pool" : [ > {"weight" : 0.70, "pool" : "money"}, > {"weight" : 0.10, "pool" : "stim"}, > {"weight" : 0.02, "item" : [ "scientistchest", 1]}, > {"weight" : 0.02, "item" : [ "scientistlegs", 1]}, > {"weight" : 0.02, "item" : [ "scientisthead", 1]}, > {"weight" : 0.14, "item" : [ "banana", 2]} > ], > "poolRounds" : [ > [0.50, 1], > [0.50, 2] > ], > "allowDuplication" : false > }] > ], >