FILES ----- client.config server.config terrestrial_worlds.config universe_server.config items\armors\other\hazmat\icons.png npcs\merchant.npctype npcs\merchantpools.config objects\apex\apexlamp2\apexlamp2.object objects\colony\colonydeed\colonydeed.lua objects\generic\stepladder\stepladder.object objects\outpost\frogfurnishing\frogfurnishing.object objects\themed\astronaut\earthmodel\earthmodel.object [NEW] objects\themed\astronaut\earthmodel\icon.png [NEW] objects\themed\astronaut\jupitermodel\icon.png objects\themed\astronaut\jupitermodel\jupitermodel.object [NEW] objects\themed\astronaut\liftoffseat\icon.png objects\themed\astronaut\liftoffseat\liftoffseat.object [NEW] objects\themed\astronaut\marsmodel\icon.png objects\themed\astronaut\marsmodel\marsmodel.object [NEW] objects\themed\astronaut\mercurymodel\icon.png objects\themed\astronaut\mercurymodel\mercurymodel.object [NEW] objects\themed\astronaut\neptunemodel\icon.png objects\themed\astronaut\neptunemodel\neptunemodel.object [NEW] objects\themed\astronaut\plutomodel\icon.png objects\themed\astronaut\plutomodel\plutomodel.object [NEW] objects\themed\astronaut\satellite\icon.png objects\themed\astronaut\satellite\satellite.object [NEW] objects\themed\astronaut\saturnmodel\icon.png objects\themed\astronaut\saturnmodel\saturnmodel.object [NEW] objects\themed\astronaut\spaceshuttlebed\icon.png objects\themed\astronaut\spaceshuttlebed\spaceshuttlebed.object [NEW] objects\themed\astronaut\sunmodel\icon.png objects\themed\astronaut\sunmodel\sunmodel.object [NEW] objects\themed\astronaut\uranusmodel\icon.png objects\themed\astronaut\uranusmodel\uranusmodel.object [NEW] objects\themed\astronaut\venusmodel\icon.png objects\themed\astronaut\venusmodel\venusmodel.object [NEW] objects\themed\cabin\cabinbunkbed\cabinbunkbed.frames [NEW] objects\themed\cabin\cabinbunkbed\cabinbunkbed.object [NEW] objects\themed\cabin\cabinbunkbed\cabinbunkbed.png [NEW] objects\themed\cabin\cabinbunkbed\cabinbunkbedcover.png [NEW] objects\themed\cabin\cabinbunkbed\cabinbunkbedicon.png [NEW] objects\themed\cabin\cabinchair\cabinchair.frames [NEW] objects\themed\cabin\cabinchair\cabinchair.object [NEW] objects\themed\cabin\cabinchair\cabinchair.png [NEW] objects\themed\cabin\cabinlamp\cabinlamp.frames [NEW] objects\themed\cabin\cabinlamp\cabinlamp.object [NEW] objects\themed\cabin\cabinlamp\cabinlamp.png [NEW] objects\themed\cabin\cabinlamp\cabinlampicon.png [NEW] objects\themed\cabin\cabinlamp\cabinlamplit.frames [NEW] objects\themed\cabin\cabinlamp\cabinlamplit.png [NEW] objects\themed\cabin\cabinornament\cabinornament.png [NEW] objects\themed\cabin\cabinstooltable\cabinstooltable.png [NEW] objects\themed\cabin\cabinstove\cabinstove.frames [NEW] objects\themed\cabin\cabinstove\cabinstove.object [NEW] objects\themed\cabin\cabinstove\cabinstove.png [NEW] objects\themed\cabin\cabinstove\cabinstoveicon.png [NEW] objects\themed\cabin\cabinstove\cabinstovelit.frames [NEW] objects\themed\cabin\cabinstove\cabinstovelit.png [NEW] objects\themed\cabin\cabintable\cabintable.png [NEW] objects\themed\retroscifi\retroscifibed\cover.png [NEW] objects\themed\retroscifi\retroscifibed\cryochamber.png [NEW] objects\themed\retroscifi\retroscificabinet\cabinet.png [NEW] objects\themed\retroscifi\retroscifichair\chair.png [NEW] objects\themed\retroscifi\retroscifidresser\dresser.png [NEW] objects\themed\retroscifi\retroscifilight\lightdown.png [NEW] objects\themed\retroscifi\retroscifilight\lightdownleft.png [NEW] objects\themed\retroscifi\retroscifilight\lightdownright.png [NEW] objects\themed\retroscifi\retroscifilight\lightleft.png [NEW] objects\themed\retroscifi\retroscifilight\lightright.png [NEW] objects\themed\retroscifi\retroscifilight\lightup.png [NEW] objects\themed\retroscifi\retroscifilight\lightupleft.png [NEW] objects\themed\retroscifi\retroscifilight\lightupright.png [NEW] objects\themed\retroscifi\retroscifitable\table.png [NEW] objects\themed\retroscifi\retroscifitv\tv.png [NEW] objects\themed\sea\coralmirror\coralmirror.frames [NEW] objects\themed\sea\coralmirror\coralmirror.object [NEW] objects\themed\sea\coralmirror\coralmirror.png [NEW] objects\themed\sea\coralmirror\coralmirroricon.png objects\themed\sea\seabed\seabed.object [NEW] objects\themed\sea\seachair\seachair.frames [NEW] objects\themed\sea\seachair\seachair.object [NEW] objects\themed\sea\seachair\seachair.png [NEW] objects\themed\sea\seachair\seachairicon.png [NEW] objects\themed\sea\sealamp2\sealamp.frames [NEW] objects\themed\sea\sealamp2\sealamp.object [NEW] objects\themed\sea\sealamp2\sealamp.png [NEW] objects\themed\sea\sealamp2\sealampicon.png [NEW] objects\themed\sea\sealamp2\sealamplit.frames [NEW] objects\themed\sea\sealamp2\sealamplit.png [NEW] objects\themed\sea\seaweedpot\seaweedpot.frames [NEW] objects\themed\sea\seaweedpot\seaweedpot.object [NEW] objects\themed\sea\seaweedpot\seaweedpot.png [NEW] objects\themed\sea\seaweedpot\seaweedpoticon.png recipes\furniture\tier1\tier1bed.recipe recipes\furniture\tier1\tier1chair.recipe recipes\furniture\tier1\tier1door.recipe recipes\furniture\tier1\tier1light.recipe recipes\furniture\tier1\tier1switch.recipe recipes\furniture\tier1\tier1table.recipe recipes\furniture\tier10\tier10bed.recipe recipes\furniture\tier10\tier10chair.recipe recipes\furniture\tier10\tier10door.recipe recipes\furniture\tier10\tier10switch.recipe recipes\furniture\tier10\tier10table.recipe recipes\furniture\tier2\tier2bed.recipe recipes\furniture\tier2\tier2chair.recipe recipes\furniture\tier2\tier2door.recipe recipes\furniture\tier2\tier2light.recipe recipes\furniture\tier2\tier2switch.recipe recipes\furniture\tier2\tier2table.recipe recipes\furniture\tier3\tier3bed.recipe recipes\furniture\tier3\tier3chair.recipe recipes\furniture\tier3\tier3door.recipe recipes\furniture\tier3\tier3light.recipe recipes\furniture\tier3\tier3switch.recipe recipes\furniture\tier3\tier3table.recipe recipes\furniture\tier4\tier4bed.recipe recipes\furniture\tier4\tier4chair.recipe recipes\furniture\tier4\tier4door.recipe recipes\furniture\tier4\tier4light.recipe recipes\furniture\tier4\tier4switch.recipe recipes\furniture\tier4\tier4table.recipe recipes\furniture\tier5\tier5bed.recipe recipes\furniture\tier5\tier5chair.recipe recipes\furniture\tier5\tier5door.recipe recipes\furniture\tier5\tier5light.recipe recipes\furniture\tier5\tier5switch.recipe recipes\furniture\tier5\tier5table.recipe recipes\furniture\tier6\tier6bed.recipe recipes\furniture\tier6\tier6chair.recipe recipes\furniture\tier6\tier6door.recipe recipes\furniture\tier6\tier6switch.recipe recipes\furniture\tier6\tier6table.recipe recipes\furniture\tier7\tier7bed.recipe recipes\furniture\tier7\tier7chair.recipe recipes\furniture\tier7\tier7door.recipe recipes\furniture\tier7\tier7switch.recipe recipes\furniture\tier7\tier7table.recipe recipes\furniture\tier8\tier8bed.recipe recipes\furniture\tier8\tier8chair.recipe recipes\furniture\tier8\tier8door.recipe recipes\furniture\tier8\tier8light.recipe recipes\furniture\tier8\tier8switch.recipe recipes\furniture\tier8\tier8table.recipe recipes\furniture\tier9\tier9bed.recipe recipes\furniture\tier9\tier9chair.recipe recipes\furniture\tier9\tier9door.recipe recipes\furniture\tier9\tier9light.recipe recipes\furniture\tier9\tier9switch.recipe recipes\furniture\tier9\tier9table.recipe scripts\actions\merchant.lua [NEW] terrain\disperse\commonbackgroundveins.ridgeblocks treasure\common.treasurepools DIFFS ----- client.config 118c118,122 < "storageTriggerInterval" : 30000 --- > "storageTriggerInterval" : 30000, > > "luaGcPause" : 1.2, > "luaGcStepMultiplier" : 1.6, > "luaGcFrameSteps" : 100 server.config 39c39,43 < "spawnDungeonRetries" : 20 --- > "spawnDungeonRetries" : 20, > > "luaGcPause" : 1.0, > "luaGcStepMultiplier" : 1.6, > "luaGcFrameSteps" : 400 terrestrial_worlds.config 321c321 < "secondaryRegion" : [ "garden", "volcanic", "savannah", "alien", "scorched", "moon", "spring", "mushroom" ], --- > "secondaryRegion" : [ "spring", "mushroom" ], 350c350 < "secondaryRegion" : [ "forest", "savannah", "jungle", "volcanic", "scorched", "moon", "oasis", "tar" ], --- > "secondaryRegion" : [ "oasis", "tar" ], 413c413 < "secondaryRegion" : [ "garden", "forest", "jungle", "volcanic", "scorched", "moon", "colourful", "bones" ], --- > "secondaryRegion" : [ "colourful", "bones" ], 442c442 < "secondaryRegion" : [ "bioluminescence" ], --- > "secondaryRegion" : [ "bioluminescence", "alpine" ], 472c472 < "secondaryRegion" : [ "giantflowers", "garden", "forest", "volcanic", "savannah", "alien", "scorched", "moon", "swamp" ], --- > "secondaryRegion" : [ "giantflowers", "swamp" ], 693c693 < "bgOreSelector" : [ "empty" ], --- > "bgOreSelector" : [ "commonBackgroundVeins" ], universe_server.config 36c36 < "terrestrialBiome" : "toxic", --- > "terrestrialBiome" : "garden", npcs\merchant.npctype 27,34c27,34 < "default" : ["randomguns", "randomswords", "humaningredients", "musicalinstruments" ], < "apex" : ["randomguns", "randomswords", "apexarmorblueprints", "apexingredients", "musicalinstruments" ], < "avian" : ["randomguns", "randomswords", "avianarmorblueprints", "avianingredients", "musicalinstruments" ], < "floran" : ["randomguns", "randomswords", "floranarmorblueprints", "floraningredients", "musicalinstruments" ], < "glitch" : ["randomguns", "randomswords", "glitcharmorblueprints", "glitchingredients", "musicalinstruments" ], < "human" : ["randomguns", "randomswords", "humanarmorblueprints", "humaningredients", "musicalinstruments" ], < "hylotl" : ["randomguns", "randomswords", "hylotlarmorblueprints", "hylotlingredients", "musicalinstruments" ], < "novakid" : ["randomguns", "randomswords", "novakidarmorblueprints", "novakidingredients", "musicalinstruments" ] --- > "default" : ["randomguns", "randomswords", "humaningredients" ], > "apex" : ["basicmerchant", "randomguns", "randomswords", "apexarmorblueprints", "apexingredients", "apexfurniture" ], > "avian" : ["basicmerchant", "randomguns", "randomswords", "avianarmorblueprints" ], > "floran" : ["basicmerchant", "randomguns", "randomswords", "floranarmorblueprints" ], > "glitch" : ["basicmerchant", "randomguns", "randomswords", "glitcharmorblueprints" ], > "human" : ["basicmerchant", "randomguns", "randomswords", "humanarmorblueprints" ], > "hylotl" : ["basicmerchant", "randomguns", "randomswords", "hylotlarmorblueprints" ], > "novakid" : ["basicmerchant", "randomguns", "randomswords", "novakidarmorblueprints" ] 36c36 < "buyFactorRange" : [ 0.9, 1.1 ], --- > "buyFactorRange" : [ 0.9, 1.2 ], npcs\merchantpools.config 10a11,23 > "basicmerchant" : [ > [0, [ > { "item" : { "name" : "torch" }, "rarity" : 0.3 }, > { "item" : { "name" : "flare" }, "rarity" : 0.3 }, > { "item" : { "name" : "climbingrope" }, "rarity" : 0.3 }, > { "item" : { "name" : "bandage" }, "rarity" : 0.3 }, > { "item" : { "name" : "medkit" }, "rarity" : 0.3 }, > { "item" : { "name" : "redstim" }, "rarity" : 0.05 }, > { "item" : { "name" : "bluestim" }, "rarity" : 0.05 }, > { "item" : { "name" : "yellowstim" }, "rarity" : 0.05 } > ]] > ], > 301,315c314,318 < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonassaultrifle" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonassaultrifle" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonassaultrifle" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonpistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonpistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonpistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonmachinepistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonmachinepistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonmachinepistol" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonshotgun" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonshotgun" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonshotgun" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonsniperrifle" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonsniperrifle" } } }, < { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonsniperrifle" } } } --- > { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonassaultrifle" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonpistol" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonmachinepistol" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonshotgun" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedgun", "parameters" : { "definition" : "commonsniperrifle" } }, "rarity" : 0.1 } 320,337c323,328 < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonaxe" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonaxe" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonaxe" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commondagger" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commondagger" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commondagger" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonshortsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonshortsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonshortsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonbroadsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonbroadsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonbroadsword" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonhammer" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonhammer" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonhammer" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonspear" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonspear" } } }, < { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonspear" } } } --- > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonaxe" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commondagger" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonshortsword" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonbroadsword" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonhammer" } }, "rarity" : 0.1 }, > { "item" : { "name" : "generatedsword", "parameters" : { "definition" : "commonspear" } }, "rarity" : 0.1 } 342,344c333,335 < { "item" : { "name" : "apextier1chest-recipe" }, "rarity" : 0.5 }, < { "item" : { "name" : "apextier1head-recipe" }, "rarity" : 0.5 }, < { "item" : { "name" : "apextier1pants-recipe" }, "rarity" : 0.5 } --- > { "item" : { "name" : "apextier1chest" }, "rarity" : 0.1 }, > { "item" : { "name" : "apextier1head" }, "rarity" : 0.1 }, > { "item" : { "name" : "apextier1pants" }, "rarity" : 0.1 } 445a437,450 > > "apexfurniture" : [ > [0, [ > { "item" : { "name" : "apexbed" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexcomfychair" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexofficechair" }, "rarity" : 0.05 }, > { "item" : { "name" : "classictable" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexpainting4" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexfridge" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexcounter1" }, "rarity" : 0.05 }, > { "item" : { "name" : "apexoven" }, "rarity" : 0.05 } > ]] > ], > 448,463c453,468 < { "item" : { "name" : "potato" } }, < { "item" : { "name" : "avesmingo" } }, < { "item" : { "name" : "banana" } }, < { "item" : { "name" : "wheat" } }, < { "item" : { "name" : "eggshoot" } }, < { "item" : { "name" : "rawbacon" } }, < { "item" : { "name" : "grapes" } }, < { "item" : { "name" : "kiwi" } }, < { "item" : { "name" : "meatchunks" } }, < { "item" : { "name" : "redapple" } }, < { "item" : { "name" : "sugar" } }, < { "item" : { "name" : "carrot" } }, < { "item" : { "name" : "neonmelon" } }, < { "item" : { "name" : "pineapple" } }, < { "item" : { "name" : "bottledwater" } }, < { "item" : { "name" : "milk" } } --- > { "item" : { "name" : "potato" }, "rarity" : 0.05 }, > { "item" : { "name" : "avesmingo" }, "rarity" : 0.05 }, > { "item" : { "name" : "banana" }, "rarity" : 0.05 }, > { "item" : { "name" : "wheat" }, "rarity" : 0.05 }, > { "item" : { "name" : "eggshoot" }, "rarity" : 0.05 }, > { "item" : { "name" : "rawbacon" }, "rarity" : 0.05 }, > { "item" : { "name" : "grapes" }, "rarity" : 0.05 }, > { "item" : { "name" : "kiwi" }, "rarity" : 0.05 }, > { "item" : { "name" : "meatchunks" }, "rarity" : 0.05 }, > { "item" : { "name" : "redapple" }, "rarity" : 0.05 }, > { "item" : { "name" : "sugar" }, "rarity" : 0.05 }, > { "item" : { "name" : "carrot" }, "rarity" : 0.05 }, > { "item" : { "name" : "neonmelon" }, "rarity" : 0.05 }, > { "item" : { "name" : "pineapple" }, "rarity" : 0.05 }, > { "item" : { "name" : "bottledwater" }, "rarity" : 0.05 }, > { "item" : { "name" : "milk" }, "rarity" : 0.05 } 1291a1297,1317 > > "hats" : [ > [0, [ > { "item" : { "name" : "tomato" } }, > { "item" : { "name" : "meatchunks" } }, > { "item" : { "name" : "chili" } }, > { "item" : { "name" : "bread" } }, > { "item" : { "name" : "potato" } }, > { "item" : { "name" : "wheat" } }, > { "item" : { "name" : "carrot" } }, > { "item" : { "name" : "eggshoot" } }, > { "item" : { "name" : "corn" } }, > { "item" : { "name" : "sugar" } }, > { "item" : { "name" : "redapple" } }, > { "item" : { "name" : "grapes" } }, > { "item" : { "name" : "kiwi" } }, > { "item" : { "name" : "pineapple" } }, > { "item" : { "name" : "bottledwater" } }, > { "item" : { "name" : "milk" } } > ]] > ], 1295,1322c1321,1348 < { "item" : { "name" : "accordion" }, "rarity" : 0.5 }, < { "item" : { "name" : "acousticguitar" }, "rarity" : 0.5 }, < { "item" : { "name" : "banjo" }, "rarity" : 0.5 }, < { "item" : { "name" : "bassguitar" }, "rarity" : 0.5 }, < { "item" : { "name" : "bones" }, "rarity" : 0.5 }, < { "item" : { "name" : "clarinet" }, "rarity" : 0.5 }, < { "item" : { "name" : "drumkit" }, "rarity" : 0.5 }, < { "item" : { "name" : "dulcimer" }, "rarity" : 0.5 }, < { "item" : { "name" : "electricbass" }, "rarity" : 0.5 }, < { "item" : { "name" : "flute" }, "rarity" : 0.5 }, < { "item" : { "name" : "harmonica" }, "rarity" : 0.5 }, < { "item" : { "name" : "harp" }, "rarity" : 0.5 }, < { "item" : { "name" : "koto" }, "rarity" : 0.5 }, < { "item" : { "name" : "leadguitar" }, "rarity" : 0.5 }, < { "item" : { "name" : "microphone" }, "rarity" : 0.5 }, < { "item" : { "name" : "microphonefem" }, "rarity" : 0.5 }, < { "item" : { "name" : "musicbox" }, "rarity" : 0.5 }, < { "item" : { "name" : "nylonguitar" }, "rarity" : 0.5 }, < { "item" : { "name" : "oboe" }, "rarity" : 0.5 }, < { "item" : { "name" : "ocarina" }, "rarity" : 0.5 }, < { "item" : { "name" : "overdriveguitar" }, "rarity" : 0.5 }, < { "item" : { "name" : "piano" }, "rarity" : 0.5 }, < { "item" : { "name" : "reedorgan" }, "rarity" : 0.5 }, < { "item" : { "name" : "rockorgan" }, "rarity" : 0.5 }, < { "item" : { "name" : "saxophone" }, "rarity" : 0.5 }, < { "item" : { "name" : "steeldrum" }, "rarity" : 0.5 }, < { "item" : { "name" : "trumpet" }, "rarity" : 0.5 }, < { "item" : { "name" : "violin" }, "rarity" : 0.5 } --- > { "item" : { "name" : "accordion" }, "rarity" : 0.001 }, > { "item" : { "name" : "acousticguitar" }, "rarity" : 0.001 }, > { "item" : { "name" : "banjo" }, "rarity" : 0.001 }, > { "item" : { "name" : "bassguitar" }, "rarity" : 0.001 }, > { "item" : { "name" : "bones" }, "rarity" : 0.001 }, > { "item" : { "name" : "clarinet" }, "rarity" : 0.001 }, > { "item" : { "name" : "drumkit" }, "rarity" : 0.001 }, > { "item" : { "name" : "dulcimer" }, "rarity" : 0.001 }, > { "item" : { "name" : "electricbass" }, "rarity" : 0.001 }, > { "item" : { "name" : "flute" }, "rarity" : 0.001 }, > { "item" : { "name" : "harmonica" }, "rarity" : 0.001 }, > { "item" : { "name" : "harp" }, "rarity" : 0.001 }, > { "item" : { "name" : "koto" }, "rarity" : 0.001 }, > { "item" : { "name" : "leadguitar" }, "rarity" : 0.001 }, > { "item" : { "name" : "microphone" }, "rarity" : 0.001 }, > { "item" : { "name" : "microphonefem" }, "rarity" : 0.001 }, > { "item" : { "name" : "musicbox" }, "rarity" : 0.001 }, > { "item" : { "name" : "nylonguitar" }, "rarity" : 0.001 }, > { "item" : { "name" : "oboe" }, "rarity" : 0.001 }, > { "item" : { "name" : "ocarina" }, "rarity" : 0.001 }, > { "item" : { "name" : "overdriveguitar" }, "rarity" : 0.001 }, > { "item" : { "name" : "piano" }, "rarity" : 0.001 }, > { "item" : { "name" : "reedorgan" }, "rarity" : 0.001 }, > { "item" : { "name" : "rockorgan" }, "rarity" : 0.001 }, > { "item" : { "name" : "saxophone" }, "rarity" : 0.001 }, > { "item" : { "name" : "steeldrum" }, "rarity" : 0.001 }, > { "item" : { "name" : "trumpet" }, "rarity" : 0.001 }, > { "item" : { "name" : "violin" }, "rarity" : 0.001 } objects\apex\apexlamp2\apexlamp2.object 56c56 < "inboundNodes" : [ [0, 0] ] --- > "inboundNodes" : [ [0, 3] ] objects\colony\colonydeed\colonydeed.lua 138d137 < -- TODO base this on happiness 267c266 < local level = tenant.level or world.threatLevel() or 1 --- > local level = tenant.level or world.getProperty("ship.level") or world.threatLevel() or 1 objects\generic\stepladder\stepladder.object 22c22,24 < "imagePosition" : [-8, 0], --- > "imagePosition" : [-10, 0], > "direction" : "left", > "flipImages" : true, 31c33,34 < "imagePosition" : [-8, 0], --- > "imagePosition" : [-10, 0], > "direction" : "right", objects\outpost\frogfurnishing\frogfurnishing.object 80c80 < [ "hulagirl", "islandcabinet", "islandchair", "islandhammock", "islandlight", "islandtable" ], --- > [ "hulagirl", "islandcabinet", "islandchair", "islandhammock", "islandlamp", "islandtable" ], objects\themed\astronaut\earthmodel\earthmodel.object 20c20 < "inventoryIcon" : "earthmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\jupitermodel\jupitermodel.object 20c20 < "inventoryIcon" : "jupitermodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\liftoffseat\liftoffseat.object 20c20 < "inventoryIcon" : "liftoffseat.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\marsmodel\marsmodel.object 20c20 < "inventoryIcon" : "marsmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\mercurymodel\mercurymodel.object 20c20 < "inventoryIcon" : "mercurymodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\neptunemodel\neptunemodel.object 20c20 < "inventoryIcon" : "neptunemodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\plutomodel\plutomodel.object 20c20 < "inventoryIcon" : "plutomodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\satellite\satellite.object 20c20 < "inventoryIcon" : "satellite.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\saturnmodel\saturnmodel.object 20c20 < "inventoryIcon" : "saturnmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\spaceshuttlebed\spaceshuttlebed.object 32c32 < "inventoryIcon" : "spaceshuttlebed.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\sunmodel\sunmodel.object 23c23 < "inventoryIcon" : "sunmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\uranusmodel\uranusmodel.object 20c20 < "inventoryIcon" : "uranusmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\astronaut\venusmodel\venusmodel.object 20c20 < "inventoryIcon" : "venusmodel.png", --- > "inventoryIcon" : "icon.png", objects\themed\sea\seabed\seabed.object 6,7c6,7 < "description" : "-todo-", < "shortdescription" : "Sea Shell Bed", --- > "description" : "A seashell-shaped bed.", > "shortdescription" : "Seashell Bed", recipes\furniture\tier1\tier1bed.recipe 3c3 < { "item" : "ironbar", "count" : 10 }, --- > { "item" : "ironbar", "count" : 3 }, recipes\furniture\tier1\tier1chair.recipe 3c3 < { "item" : "ironbar", "count" : 6 } --- > { "item" : "ironbar", "count" : 2 } recipes\furniture\tier1\tier1door.recipe 3c3 < { "item" : "ironbar", "count" : 8 } --- > { "item" : "ironbar", "count" : 2 } recipes\furniture\tier1\tier1light.recipe 3c3 < { "item" : "ironbar", "count" : 2 } --- > { "item" : "ironbar", "count" : 1 } recipes\furniture\tier1\tier1switch.recipe 3c3 < { "item" : "ironbar", "count" : 6 } --- > { "item" : "ironbar", "count" : 1 } recipes\furniture\tier1\tier1table.recipe 3c3 < { "item" : "ironbar", "count" : 8 } --- > { "item" : "ironbar", "count" : 3 } recipes\furniture\tier10\tier10bed.recipe 3c3 < { "item" : "imperviumcompound", "count" : 5 }, --- > { "item" : "imperviumcompound", "count" : 3 }, recipes\furniture\tier10\tier10chair.recipe 3c3 < { "item" : "imperviumcompound", "count" : 3 } --- > { "item" : "imperviumcompound", "count" : 2 } recipes\furniture\tier10\tier10door.recipe 3c3 < { "item" : "imperviumcompound", "count" : 4 } --- > { "item" : "imperviumcompound", "count" : 2 } recipes\furniture\tier10\tier10switch.recipe 3c3 < { "item" : "imperviumcompound", "count" : 3 } --- > { "item" : "imperviumcompound", "count" : 1 } recipes\furniture\tier10\tier10table.recipe 3c3 < { "item" : "imperviumcompound", "count" : 4 } --- > { "item" : "imperviumcompound", "count" : 3 } recipes\furniture\tier2\tier2bed.recipe 3c3 < { "item" : "steelbar", "count" : 10 }, --- > { "item" : "steelbar", "count" : 3 }, recipes\furniture\tier2\tier2chair.recipe 3c3 < { "item" : "steelbar", "count" : 6 } --- > { "item" : "steelbar", "count" : 2 } recipes\furniture\tier2\tier2door.recipe 3c3 < { "item" : "steelbar", "count" : 8 } --- > { "item" : "steelbar", "count" : 2 } recipes\furniture\tier2\tier2light.recipe 3c3 < { "item" : "steelbar", "count" : 2 } --- > { "item" : "steelbar", "count" : 1 } recipes\furniture\tier2\tier2switch.recipe 3c3 < { "item" : "steelbar", "count" : 6 } --- > { "item" : "steelbar", "count" : 1 } recipes\furniture\tier2\tier2table.recipe 3c3 < { "item" : "steelbar", "count" : 8 } --- > { "item" : "steelbar", "count" : 3 } recipes\furniture\tier3\tier3bed.recipe 3c3 < { "item" : "titaniumbar", "count" : 10 }, --- > { "item" : "titaniumbar", "count" : 3 }, recipes\furniture\tier3\tier3chair.recipe 3c3 < { "item" : "titaniumbar", "count" : 6 } --- > { "item" : "titaniumbar", "count" : 2 } recipes\furniture\tier3\tier3door.recipe 3c3 < { "item" : "titaniumbar", "count" : 8 } --- > { "item" : "titaniumbar", "count" : 2 } recipes\furniture\tier3\tier3light.recipe 3c3 < { "item" : "titaniumbar", "count" : 2 } --- > { "item" : "titaniumbar", "count" : 1 } recipes\furniture\tier3\tier3switch.recipe 3c3 < { "item" : "titaniumbar", "count" : 6 } --- > { "item" : "titaniumbar", "count" : 1 } recipes\furniture\tier3\tier3table.recipe 3c3 < { "item" : "titaniumbar", "count" : 8 } --- > { "item" : "titaniumbar", "count" : 3 } recipes\furniture\tier4\tier4bed.recipe 3c3 < { "item" : "durasteelbar", "count" : 10 }, --- > { "item" : "durasteelbar", "count" : 3 }, recipes\furniture\tier4\tier4chair.recipe 3c3 < { "item" : "durasteelbar", "count" : 6 } --- > { "item" : "durasteelbar", "count" : 2 } recipes\furniture\tier4\tier4door.recipe 3c3 < { "item" : "durasteelbar", "count" : 8 } --- > { "item" : "durasteelbar", "count" : 2 } recipes\furniture\tier4\tier4light.recipe 3c3 < { "item" : "durasteelbar", "count" : 2 } --- > { "item" : "durasteelbar", "count" : 1 } recipes\furniture\tier4\tier4switch.recipe 3c3 < { "item" : "durasteelbar", "count" : 6 } --- > { "item" : "durasteelbar", "count" : 1 } recipes\furniture\tier4\tier4table.recipe 3c3 < { "item" : "durasteelbar", "count" : 8 } --- > { "item" : "durasteelbar", "count" : 3 } recipes\furniture\tier5\tier5bed.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 10 }, --- > { "item" : "refinedaegisalt", "count" : 3 }, recipes\furniture\tier5\tier5chair.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 6 } --- > { "item" : "refinedaegisalt", "count" : 2 } recipes\furniture\tier5\tier5door.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 8 } --- > { "item" : "refinedaegisalt", "count" : 2 } recipes\furniture\tier5\tier5light.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 2 } --- > { "item" : "refinedaegisalt", "count" : 1 } recipes\furniture\tier5\tier5switch.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 6 } --- > { "item" : "refinedaegisalt", "count" : 1 } recipes\furniture\tier5\tier5table.recipe 3c3 < { "item" : "refinedaegisalt", "count" : 8 } --- > { "item" : "refinedaegisalt", "count" : 3 } recipes\furniture\tier6\tier6bed.recipe 3c3 < { "item" : "feroziumcompound", "count" : 5 }, --- > { "item" : "feroziumcompound", "count" : 3 }, recipes\furniture\tier6\tier6chair.recipe 3c3 < { "item" : "feroziumcompound", "count" : 3 } --- > { "item" : "feroziumcompound", "count" : 2 } recipes\furniture\tier6\tier6door.recipe 3c3 < { "item" : "feroziumcompound", "count" : 4 } --- > { "item" : "feroziumcompound", "count" : 2 } recipes\furniture\tier6\tier6switch.recipe 3c3 < { "item" : "feroziumcompound", "count" : 3 } --- > { "item" : "feroziumcompound", "count" : 1 } recipes\furniture\tier6\tier6table.recipe 3c3 < { "item" : "feroziumcompound", "count" : 4 } --- > { "item" : "feroziumcompound", "count" : 3 } recipes\furniture\tier7\tier7bed.recipe 3c3 < { "item" : "ceruliumcompound", "count" : 5 }, --- > { "item" : "ceruliumcompound", "count" : 3 }, recipes\furniture\tier7\tier7chair.recipe 3c3 < { "item" : "ceruliumcompound", "count" : 3 } --- > { "item" : "ceruliumcompound", "count" : 2 } recipes\furniture\tier7\tier7door.recipe 3c3 < { "item" : "ceruliumcompound", "count" : 4 } --- > { "item" : "ceruliumcompound", "count" : 2 } recipes\furniture\tier7\tier7switch.recipe 3c3 < { "item" : "ceruliumcompound", "count" : 3 } --- > { "item" : "ceruliumcompound", "count" : 1 } recipes\furniture\tier7\tier7table.recipe 3c3 < { "item" : "ceruliumcompound", "count" : 4 } --- > { "item" : "ceruliumcompound", "count" : 3 } recipes\furniture\tier8\tier8bed.recipe 3c3 < { "item" : "refinedviolium", "count" : 10 }, --- > { "item" : "refinedviolium", "count" : 3 }, recipes\furniture\tier8\tier8chair.recipe 3c3 < { "item" : "refinedviolium", "count" : 6 } --- > { "item" : "refinedviolium", "count" : 2 } recipes\furniture\tier8\tier8door.recipe 3c3 < { "item" : "refinedviolium", "count" : 8 } --- > { "item" : "refinedviolium", "count" : 2 } recipes\furniture\tier8\tier8light.recipe 3c3 < { "item" : "refinedviolium", "count" : 2 } --- > { "item" : "refinedviolium", "count" : 1 } recipes\furniture\tier8\tier8switch.recipe 3c3 < { "item" : "refinedviolium", "count" : 6 } --- > { "item" : "refinedviolium", "count" : 1 } recipes\furniture\tier8\tier8table.recipe 3c3 < { "item" : "refinedviolium", "count" : 8 } --- > { "item" : "refinedviolium", "count" : 3 } recipes\furniture\tier9\tier9bed.recipe 3c3 < { "item" : "refinedrubium", "count" : 10 }, --- > { "item" : "refinedrubium", "count" : 3 }, recipes\furniture\tier9\tier9chair.recipe 3c3 < { "item" : "refinedrubium", "count" : 6 } --- > { "item" : "refinedrubium", "count" : 2 } recipes\furniture\tier9\tier9door.recipe 3c3 < { "item" : "refinedrubium", "count" : 8 } --- > { "item" : "refinedrubium", "count" : 2 } recipes\furniture\tier9\tier9light.recipe 3c3 < { "item" : "refinedrubium", "count" : 2 } --- > { "item" : "refinedrubium", "count" : 1 } recipes\furniture\tier9\tier9switch.recipe 3c3 < { "item" : "refinedrubium", "count" : 6 } --- > { "item" : "refinedrubium", "count" : 1 } recipes\furniture\tier9\tier9table.recipe 3c3 < { "item" : "refinedrubium", "count" : 8 } --- > { "item" : "refinedrubium", "count" : 3 } scripts\actions\merchant.lua 42c42 < if item.rarity == nil or math.random() > item.rarity then --- > if item.rarity == nil or math.random() < item.rarity then treasure\common.treasurepools 13c13,14 < {"pool" : "valuableTreasure"} --- > {"pool" : "valuableTreasure"}, > {"pool" : "maybeWeaponTreasure"} 16,18c17,19 < [0.15, 2], < [0.45, 3], < [0.25, 4], --- > [0.10, 2], > [0.40, 3], > [0.35, 4], 31d31 < [0.1, 0], 34c34 < [0.1, 3] --- > [0.2, 3] 49d48 < [0.2, 1], 51,52c50,51 < [0.2, 3], < [0.1, 4] --- > [0.3, 3], > [0.2, 4] 63,67c62,65 < {"weight" : 0.3, "pool" : "weapon"}, < {"weight" : 0.25, "pool" : "chestMoney"}, < {"weight" : 0.1, "pool" : "healingItem"}, < {"weight" : 0.1, "pool" : "ore"}, < {"weight" : 0.1, "pool" : "food"}, --- > {"weight" : 0.4, "pool" : "chestMoney"}, > {"weight" : 0.2, "pool" : "healingItem"}, > {"weight" : 0.15, "pool" : "ore"}, > {"weight" : 0.15, "pool" : "food"}, 69d66 < {"weight" : 0.045, "pool" : "shield"}, 72a70,79 > ] > }] > ], > > "maybeWeaponTreasure" : [ > [0, { > "pool" : [ > {"weight" : 0.35, "pool" : "weapon"}, > {"weight" : 0.1, "pool" : "shield"}, > {"weight" : 0.55, "pool" : "basicTreasure"}