FILES ----- [NEW] instance_worlds.config universe_server.config npcs\meleeattackstate.lua npcs\rangedattackstate.lua objects\human\bunkerheater1\bunkerheater1.object objects\human\bunkerheater1\bunkerheater1.png objects\human\bunkerheater1\bunkerheater1icon.png objects\human\bunkerlighth\bunkerlighth.frames objects\human\bunkerlighth\bunkerlighth.object [NEW] objects\human\bunkerlighth\bunkerlighthlit.frames [NEW] objects\human\bunkerlighth\bunkerlighthlit.png objects\human\bunkerlightv\bunkerlightv.frames objects\human\bunkerlightv\bunkerlightv.object [NEW] objects\human\bunkerlightv\bunkerlightvlit.frames [NEW] objects\human\bunkerlightv\bunkerlightvlit.png [NEW] objects\human\bunkermotiondetector\bunkermotiondetector.frames [NEW] objects\human\bunkermotiondetector\bunkermotiondetector.object [NEW] objects\human\bunkermotiondetector\bunkermotiondetector.png [NEW] objects\human\bunkermotiondetector\bunkermotiondetectoricon.png [NEW] objects\human\bunkerpanel1\bunkerpanel1.animation objects\human\bunkerpanel1\bunkerpanel1.frames objects\human\bunkerpanel1\bunkerpanel1.object objects\human\bunkerpanel1\bunkerpanel1.png [NEW] objects\human\bunkerpanel1\bunkerpanel1lit.frames [NEW] objects\human\bunkerpanel1\bunkerpanel1lit.png [NEW] objects\human\bunkerpanel2\bunkerpanel2.animation objects\human\bunkerpanel2\bunkerpanel2.frames objects\human\bunkerpanel2\bunkerpanel2.object objects\human\bunkerpanel2\bunkerpanel2.png [NEW] objects\human\bunkerpanel2\bunkerpanel2lit.frames [NEW] objects\human\bunkerpanel2\bunkerpanel2lit.png [NEW] objects\human\bunkerpanel3\bunkerpanel3.animation objects\human\bunkerpanel3\bunkerpanel3.frames objects\human\bunkerpanel3\bunkerpanel3.object objects\human\bunkerpanel3\bunkerpanel3.png [NEW] objects\human\bunkerpanel3\bunkerpanel3lit.frames [NEW] objects\human\bunkerpanel3\bunkerpanel3lit.png objects\human\bunkerposter1\bunkerposter1.object quests\outpost\phase1optional\radardish1.questtemplate recipes\teleporter\scienceteleporter.recipe scripts\pathing.lua species\glitchfemalenamegen.config species\glitchmalenamegen.config species\hylotl.species [NEW] species\hylotlfemalenamegen.config [NEW] species\hylotlmalenamegen.config DIFFS ----- universe_server.config 15a16 > "tempWorldDelete" : 600000, npcs\meleeattackstate.lua 36a37 > movePosition = targetPosition, 113c114,115 < local groundPosition = findGroundPosition(targetPosition, -5, 2) --- > stateData.targetPosition = targetPosition > local groundPosition = findGroundPosition(targetPosition, -15, 2, true) 115c117 < stateData.targetPosition = groundPosition --- > stateData.movePosition = groundPosition 148c150 < local tokenEntityPosition = findGroundPosition(world.entityPosition(stateData.awaitingAttackToken), -2, 2) --- > local tokenEntityPosition = world.entityPosition(stateData.awaitingAttackToken) 152,158c154,160 < < local running = world.magnitude(position, tokenEntityPosition) > entity.configParameter("meleeAttack.runThreshold") < moveTo(tokenEntityPosition, dt, { run = running }) < controlFace(toTarget[1]) < return false < else < stateData.awaitingAttackToken = nil --- > local groundPosition = findGroundPosition(tokenEntityPosition, -2, 2) > if groundPosition then > local running = world.magnitude(position, groundPosition) > entity.configParameter("meleeAttack.runThreshold") > moveTo(groundPosition, dt, { run = running }) > controlFace(toTarget[1]) > return false > end 159a162,163 > > stateData.awaitingAttackToken = nil 225,226c229 < if distance > entity.configParameter("meleeAttack.swingDistance") then < local movementTargetPosition = stateData.targetPosition --- > if distance > entity.configParameter("meleeAttack.swingDistance") and math.abs(toTarget[1]) > 3 then 234,237c237,239 < local moved = moveTo(movementTargetPosition, dt, { run = running }) < if moved == "running" then < controlFace(self.pathing.deltaX or toTarget[1]) < elseif moved == false and self.pathing.stuck then --- > local moved = moveTo(stateData.movePosition, dt, { run = running }) > controlFace(self.pathing.deltaX) > if moved == false and self.pathing.stuck then npcs\rangedattackstate.lua 32c32 < targetGroundPosition = findGroundPosition(targetPosition, -10, 3), --- > targetGroundPosition = findGroundPosition(targetPosition, -10, 3, true), 61c61 < stateData.targetGroundPosition = findGroundPosition(stateData.targetPosition, -10, 3) --- > stateData.targetGroundPosition = findGroundPosition(stateData.targetPosition, -10, 3, true) objects\human\bunkerheater1\bunkerheater1.object 5c5 < "price" : 500, --- > "price" : 350, objects\human\bunkerlighth\bunkerlighth.frames 7,15c7,15 < [ "default.0", "default.off" ], < [ "red.0", "red.off" ], < [ "blue.0", "blue.off" ], < [ "green.0", "green.off" ], < [ "yellow.0", "yellow.off" ], < [ "orange.0", "orange.off" ], < [ "pink.0", "pink.off" ], < [ "black.0", "black.off" ], < [ "white.0", "white.off" ] --- > [ "default.on", "default.off" ], > [ "red.on", "red.off" ], > [ "blue.on", "blue.off" ], > [ "green.on", "green.off" ], > [ "yellow.on", "yellow.off" ], > [ "orange.on", "orange.off" ], > [ "pink.on", "pink.off" ], > [ "black.on", "black.off" ], > [ "white.on", "white.off" ] 20,28c20,28 < "default.default" : "default.off", < "red.default" : "red.off", < "blue.default" : "blue.off", < "green.default" : "green.off", < "yellow.default" : "yellow.off", < "orange.default" : "orange.off", < "pink.default" : "pink.off", < "black.default" : "black.off", < "white.default" : "white.off" --- > "default.default" : "default.on", > "red.default" : "red.on", > "blue.default" : "blue.on", > "green.default" : "green.on", > "yellow.default" : "yellow.on", > "orange.default" : "orange.on", > "pink.default" : "pink.on", > "black.default" : "black.on", > "white.default" : "white.on" objects\human\bunkerlighth\bunkerlighth.object 5c5 < "price" : 400, --- > "price" : 425, 17,28c17 < "fullbright" : true, < "lightColors" : { < "default" : [125, 153, 179], < "red" : [179, 125, 125], < "pink" : [179, 125, 170], < "blue" : [125, 153, 179], < "green" : [129, 179, 125], < "yellow" : [179, 178, 125], < "orange" : [179, 156, 125], < "black" : [50, 50, 50], < "white" : [179, 179, 179] < }, --- > "lightColor" : [108, 134, 166], 34d22 < "frames" : 1, 35a24 > "direction" : "right", 40a30,42 > > "animation" : "/objects/wired/light/lighttogglebgfullbright.animation", > "animationParts" : { > "bg" : "bunkerlighth.png", > "fg" : "bunkerlighthlit.png" > }, > "animationPosition" : [-16, 0], > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > "interactive" : false, objects\human\bunkerlightv\bunkerlightv.frames 7,15c7,15 < [ "default.0", "default.off" ], < [ "red.0", "red.off" ], < [ "blue.0", "blue.off" ], < [ "green.0", "green.off" ], < [ "yellow.0", "yellow.off" ], < [ "orange.0", "orange.off" ], < [ "pink.0", "pink.off" ], < [ "black.0", "black.off" ], < [ "white.0", "white.off" ] --- > [ "default.on", "default.off" ], > [ "red.on", "red.off" ], > [ "blue.on", "blue.off" ], > [ "green.on", "green.off" ], > [ "yellow.on", "yellow.off" ], > [ "orange.on", "orange.off" ], > [ "pink.on", "pink.off" ], > [ "black.on", "black.off" ], > [ "white.on", "white.off" ] 20,28c20,28 < "default.default" : "default.off", < "red.default" : "red.off", < "blue.default" : "blue.off", < "green.default" : "green.off", < "yellow.default" : "yellow.off", < "orange.default" : "orange.off", < "pink.default" : "pink.off", < "black.default" : "black.off", < "white.default" : "white.off" --- > "default.default" : "default.on", > "red.default" : "red.on", > "blue.default" : "blue.on", > "green.default" : "green.on", > "yellow.default" : "yellow.on", > "orange.default" : "orange.on", > "pink.default" : "pink.on", > "black.default" : "black.on", > "white.default" : "white.on" objects\human\bunkerlightv\bunkerlightv.object 5c5 < "price" : 400, --- > "price" : 425, 17,28c17 < "fullbright" : true, < "lightColors" : { < "default" : [125, 153, 179], < "red" : [179, 125, 125], < "pink" : [179, 125, 170], < "blue" : [125, 153, 179], < "green" : [129, 179, 125], < "yellow" : [179, 178, 125], < "orange" : [179, 156, 125], < "black" : [50, 50, 50], < "white" : [179, 179, 179] < }, --- > "lightColor" : [108, 134, 166], 34d22 < "frames" : 1, 35a24 > "direction" : "right", 40a30,42 > > "animation" : "/objects/wired/light/lighttogglebgfullbright.animation", > "animationParts" : { > "bg" : "bunkerlightv.png", > "fg" : "bunkerlightvlit.png" > }, > "animationPosition" : [0, -16], > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > "interactive" : false, objects\human\bunkerpanel1\bunkerpanel1.frames 4c4 < "dimensions" : [20, 9], --- > "dimensions" : [21, 9], 6,14c6,14 < [ "default.0", "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19" ], < [ "red.0", "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19" ], < [ "blue.0", "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19" ], < [ "green.0", "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19" ], < [ "yellow.0", "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19" ], < [ "orange.0", "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19" ], < [ "pink.0", "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19" ], < [ "black.0", "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19" ], < [ "white.0", "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19" ] --- > [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.off" ], > [ "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19", "red.20", "red.off" ], > [ "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19", "blue.20", "blue.off" ], > [ "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19", "green.20", "green.off" ], > [ "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19", "yellow.20", "yellow.off" ], > [ "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19", "orange.20", "orange.off" ], > [ "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19", "pink.20", "pink.off" ], > [ "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19", "black.20", "black.off" ], > [ "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19", "white.20", "white.off" ] 19,27c19,28 < "default.default" : "default.0", < "red.default" : "red.0", < "blue.default" : "blue.0", < "green.default" : "green.0", < "yellow.default" : "yellow.0", < "orange.default" : "orange.0", < "pink.default" : "pink.0", < "black.default" : "black.0", < "white.default" : "white.0" --- > "default.default" : "default.1", > "default.on" : "default.1", > "red.default" : "red.off", > "blue.default" : "blue.off", > "green.default" : "green.off", > "yellow.default" : "yellow.off", > "orange.default" : "orange.off", > "pink.default" : "pink.off", > "black.default" : "black.off", > "white.default" : "white.off" objects\human\bunkerpanel1\bunkerpanel1.object 17c17 < "lightColor" : [0, 40, 100], --- > "lightColor" : [32, 70, 128], 24,25c24,33 < "frames" : 20, < "animationCycle" : 1.75, --- > "direction" : "left", > "flipImages" : true, > > "spaceScan" : 0.1, > "anchors" : [ "background" ] > }, > { > "image" : "bunkerpanel1.png:.", > "imagePosition" : [-16, -16], > "direction" : "right", 30a39,52 > > "animation" : "bunkerpanel1.animation", > "animationParts" : { > "bg" : "bunkerpanel1.png", > "fg" : "bunkerpanel1lit.png" > }, > "animationPosition" : [-16, -16], > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > > "interactive" : false, objects\human\bunkerpanel2\bunkerpanel2.frames 4c4 < "dimensions" : [24, 9], --- > "dimensions" : [25, 9], 6,14c6,14 < [ "default.0", "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23" ], < [ "red.0", "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19", "red.20", "red.21", "red.22", "red.23" ], < [ "blue.0", "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19", "blue.20", "blue.21", "blue.22", "blue.23" ], < [ "green.0", "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19", "green.20", "green.21", "green.22", "green.23" ], < [ "yellow.0", "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19", "yellow.20", "yellow.21", "yellow.22", "yellow.23" ], < [ "orange.0", "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19", "orange.20", "orange.21", "orange.22", "orange.23" ], < [ "pink.0", "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19", "pink.20", "pink.21", "pink.22", "pink.23" ], < [ "black.0", "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19", "black.20", "black.21", "black.22", "black.23" ], < [ "white.0", "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19", "white.20", "white.21", "white.22", "white.23" ] --- > [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ], > [ "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19", "red.20", "red.21", "red.22", "red.23", "red.24", "red.off" ], > [ "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19", "blue.20", "blue.21", "blue.22", "blue.23", "blue.24", "blue.off" ], > [ "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19", "green.20", "green.21", "green.22", "green.23", "green.24", "green.off" ], > [ "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19", "yellow.20", "yellow.21", "yellow.22", "yellow.23", "yellow.24", "yellow.off" ], > [ "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19", "orange.20", "orange.21", "orange.22", "orange.23", "orange.24", "orange.off" ], > [ "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19", "pink.20", "pink.21", "pink.22", "pink.23", "pink.24", "pink.off" ], > [ "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19", "black.20", "black.21", "black.22", "black.23", "black.24", "black.off" ], > [ "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19", "white.20", "white.21", "white.22", "white.23", "white.24", "white.off" ] 19,27c19,28 < "default.default" : "default.0", < "red.default" : "red.0", < "blue.default" : "blue.0", < "green.default" : "green.0", < "yellow.default" : "yellow.0", < "orange.default" : "orange.0", < "pink.default" : "pink.0", < "black.default" : "black.0", < "white.default" : "white.0" --- > "default.default" : "default.1", > "default.on" : "default.1", > "red.default" : "red.off", > "blue.default" : "blue.off", > "green.default" : "green.off", > "yellow.default" : "yellow.off", > "orange.default" : "orange.off", > "pink.default" : "pink.off", > "black.default" : "black.off", > "white.default" : "white.off" objects\human\bunkerpanel2\bunkerpanel2.object 17c17 < "lightColor" : [0, 40, 100], --- > "lightColor" : [32, 70, 128], 24,25c24,33 < "frames" : 24, < "animationCycle" : 2.0, --- > "direction" : "left", > "flipImages" : true, > > "spaceScan" : 0.1, > "anchors" : [ "background" ] > }, > { > "image" : "bunkerpanel2.png:.", > "imagePosition" : [-16, -16], > "direction" : "right", 31a40,53 > "animation" : "bunkerpanel2.animation", > "animationParts" : { > "bg" : "bunkerpanel2.png", > "fg" : "bunkerpanel2lit.png" > }, > "animationPosition" : [-16, -16], > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > > "interactive" : false, > 34c56 < } --- > } \ No newline at end of file objects\human\bunkerpanel3\bunkerpanel3.frames 4c4 < "dimensions" : [24, 9], --- > "dimensions" : [25, 9], 6,14c6,14 < [ "default.0", "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23" ], < [ "red.0", "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19", "red.20", "red.21", "red.22", "red.23" ], < [ "blue.0", "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19", "blue.20", "blue.21", "blue.22", "blue.23" ], < [ "green.0", "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19", "green.20", "green.21", "green.22", "green.23" ], < [ "yellow.0", "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19", "yellow.20", "yellow.21", "yellow.22", "yellow.23" ], < [ "orange.0", "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19", "orange.20", "orange.21", "orange.22", "orange.23" ], < [ "pink.0", "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19", "pink.20", "pink.21", "pink.22", "pink.23" ], < [ "black.0", "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19", "black.20", "black.21", "black.22", "black.23" ], < [ "white.0", "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19", "white.20", "white.21", "white.22", "white.23" ] --- > [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.6", "default.7", "default.8", "default.9", "default.10", "default.11", "default.12", "default.13", "default.14", "default.15", "default.16", "default.17", "default.18", "default.19", "default.20", "default.21", "default.22", "default.23", "default.24", "default.off" ], > [ "red.1", "red.2", "red.3", "red.4", "red.5", "red.6", "red.7", "red.8", "red.9", "red.10", "red.11", "red.12", "red.13", "red.14", "red.15", "red.16", "red.17", "red.18", "red.19", "red.20", "red.21", "red.22", "red.23", "red.24", "red.off" ], > [ "blue.1", "blue.2", "blue.3", "blue.4", "blue.5", "blue.6", "blue.7", "blue.8", "blue.9", "blue.10", "blue.11", "blue.12", "blue.13", "blue.14", "blue.15", "blue.16", "blue.17", "blue.18", "blue.19", "blue.20", "blue.21", "blue.22", "blue.23", "blue.24", "blue.off" ], > [ "green.1", "green.2", "green.3", "green.4", "green.5", "green.6", "green.7", "green.8", "green.9", "green.10", "green.11", "green.12", "green.13", "green.14", "green.15", "green.16", "green.17", "green.18", "green.19", "green.20", "green.21", "green.22", "green.23", "green.24", "green.off" ], > [ "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.5", "yellow.6", "yellow.7", "yellow.8", "yellow.9", "yellow.10", "yellow.11", "yellow.12", "yellow.13", "yellow.14", "yellow.15", "yellow.16", "yellow.17", "yellow.18", "yellow.19", "yellow.20", "yellow.21", "yellow.22", "yellow.23", "yellow.24", "yellow.off" ], > [ "orange.1", "orange.2", "orange.3", "orange.4", "orange.5", "orange.6", "orange.7", "orange.8", "orange.9", "orange.10", "orange.11", "orange.12", "orange.13", "orange.14", "orange.15", "orange.16", "orange.17", "orange.18", "orange.19", "orange.20", "orange.21", "orange.22", "orange.23", "orange.24", "orange.off" ], > [ "pink.1", "pink.2", "pink.3", "pink.4", "pink.5", "pink.6", "pink.7", "pink.8", "pink.9", "pink.10", "pink.11", "pink.12", "pink.13", "pink.14", "pink.15", "pink.16", "pink.17", "pink.18", "pink.19", "pink.20", "pink.21", "pink.22", "pink.23", "pink.24", "pink.off" ], > [ "black.1", "black.2", "black.3", "black.4", "black.5", "black.6", "black.7", "black.8", "black.9", "black.10", "black.11", "black.12", "black.13", "black.14", "black.15", "black.16", "black.17", "black.18", "black.19", "black.20", "black.21", "black.22", "black.23", "black.24", "black.off" ], > [ "white.1", "white.2", "white.3", "white.4", "white.5", "white.6", "white.7", "white.8", "white.9", "white.10", "white.11", "white.12", "white.13", "white.14", "white.15", "white.16", "white.17", "white.18", "white.19", "white.20", "white.21", "white.22", "white.23", "white.24", "white.off" ] 19,27c19,28 < "default.default" : "default.0", < "red.default" : "red.0", < "blue.default" : "blue.0", < "green.default" : "green.0", < "yellow.default" : "yellow.0", < "orange.default" : "orange.0", < "pink.default" : "pink.0", < "black.default" : "black.0", < "white.default" : "white.0" --- > "default.default" : "default.1", > "default.on" : "default.1", > "red.default" : "red.off", > "blue.default" : "blue.off", > "green.default" : "green.off", > "yellow.default" : "yellow.off", > "orange.default" : "orange.off", > "pink.default" : "pink.off", > "black.default" : "black.off", > "white.default" : "white.off" objects\human\bunkerpanel3\bunkerpanel3.object 17c17 < "lightColor" : [0, 40, 100], --- > "lightColor" : [32, 70, 128], 24,25c24 < "frames" : 24, < "animationCycle" : 2.0, --- > "direction" : "right", 31a31,44 > "animation" : "bunkerpanel3.animation", > "animationParts" : { > "bg" : "bunkerpanel3.png", > "fg" : "bunkerpanel3lit.png" > }, > "animationPosition" : [-16, -16], > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > > "interactive" : false, > 34c47 < } --- > } \ No newline at end of file objects\human\bunkerposter1\bunkerposter1.object 23c23 < "imagePosition" : [-16, -16], --- > "imagePosition" : [-8, -16], quests\outpost\phase1optional\radardish1.questtemplate 6c6 < "completionText" : "This is for the radar dish? Thank you! This radar detects potential asteroid impacts and I didn't even know it was broken! Here take this... it's not much, but it's something.", --- > "completionText" : "This is for the radar dish? Thank you! This radar detects potential asteroid impacts and I didn't even know it was broken! Take this down to the 2-Stop Teleshop; I think you'll find it very useful!", 12c12 < [ [ "blanktechcard", 1 ] ] --- > [ [ "teleportercore", 1 ] ] recipes\teleporter\scienceteleporter.recipe 3c3 < { "item" : "money", "count" : 3000 }, --- > { "item" : "money", "count" : 2000 }, scripts\pathing.lua 25a26 > if self.pathing.deltaX == nil then self.pathing.deltaX = 1 end 61c62 < local path = updatePath(pathOptions) --- > local path = updatePath(targetPosition, pathOptions) 140c141 < if not mcontroller.onGround() then --- > if mcontroller.liquidMovement() or not mcontroller.onGround() then 165c166,167 < jump({0, currentEdge.jumpVelocity[2]}) --- > local padding = 1 > jump({0, currentEdge.jumpVelocity[2] + padding}) 196a199,200 > elseif delta[2] > 0.5 then > self.pathing.path = nil 204a209 > liquidFriction = 0, 211c216,218 < if currentEdge.target.velocity then --- > if currentEdge.source.velocity then > mcontroller.setXVelocity(currentEdge.source.velocity[1]) > elseif currentEdge.target.velocity then 216,217c223,229 < if currentEdge.source.velocity and mcontroller.liquidPercentage() > mcontroller.baseParameters().minimumLiquidPercentage then < mcontroller.setYVelocity(currentEdge.source.velocity[2]) --- > > if mcontroller.liquidPercentage() > 0 then > if currentEdge.source.velocity and currentEdge.source.velocity[2] ~= 0 then > mcontroller.setYVelocity(currentEdge.source.velocity[2]) > else > advancePath() > end 223a236,242 > elseif action == "Land" then > if delta[2] > 0.5 then > self.pathing.path = nil > end > moveX(delta[1], options.run) > > return "running" 244,248c263 < < -- Avoid accidentally walking up platform stairs when possible < if delta[2] < 0.1 and onSolidGround() then < mcontroller.controlDown() < end --- > 302,303c317,318 < function updatePath(options) < --Update path, pruning nodes --- > function updatePath(targetPosition, options) > -- Update path, pruning nodes 306d320 < --Find a new path if we need to 308,309c322,333 < if not path then < return findPath(self.pathing.targetPosition, options) --- > if path then > -- If on the last node and the target position is farther away, find an updated path > -- This removes the delay between reaching the end of a path and starting a new one > local nextEdge = path.path[path.currentEdgeIndex+2] > if path.currentEdge and not nextEdge and world.magnitude(path.currentEdge.target.position, targetPosition) > 1 then > self.pathing.expirationTime = nil > path = findPath(targetPosition, options) or path > world.logInfo("Update path because we're all out") > end > else > -- Find a new path if the old path is invalid > path = findPath(self.pathing.targetPosition, options) 310a335 > 425c450 < function findGroundPosition(position, minHeight, maxHeight) --- > function findGroundPosition(position, minHeight, maxHeight, avoidLiquid) 430c455,456 < for y = 0, maxHeight do --- > local groundPosition > for y = maxHeight, minHeight, -1 do 433c459,460 < return validPosition --- > groundPosition = validPosition > break; 436,440c463,468 < --Check downward < for y = -1, minHeight, -1 do < local validPosition = validStandingPosition({position[1], position[2] + y}) < if validPosition then < return validPosition --- > > if groundPosition and avoidLiquid then > local tileLevel = groundPosition[2] % 1 > local liquidLevel = world.liquidAt(groundPosition) > if liquidLevel and liquidLevel[2] >= tileLevel then > return nil 444c472 < return nil --- > return groundPosition species\glitchfemalenamegen.config 7c7 < [ "Duchess ", "Princess ", "Vicereine ", "Marchioness ", "Countess ", "Viscountess ", "Baroness ", "Baronetess ", "Dame ", "Lady " ], --- > [ "Duchess ", "Princess ", "Vicereine ", "Marchioness ", "Countess ", "Viscountess ", "Baroness ", "Dame ", "Lady " ], 11,12c11,12 < [ "Clock", "Bolt", "Cog", "Gear", "Screw", "Wire", "Spring", "Latch", "Lock", "Pin", "Shaft", "Coil", "Pump", "Lamp", "Case", "Belt", "Cable", "Truss", "Steel", "Iron", "Gold", "Lead", "Brass", "Kernel", "Oil", "Robo", "Dome" ], < [ "zap", "clank", "tick", "tock", "beep", "boop", "ding", "grind", "crunch", "snap", "twist", "slip", "chip", "tank", "wrench", "sink", "stop", "catch", "crank", "grip", "shanks", "clamp", "weld", "sight", "swing", "face", "tooth", "foot", "trace", "wind", "blink", "flip" ] --- > [ "Clock", "Bolt", "Cog", "Gear", "Screw", "Wire", "Spring", "Latch", "Lock", "Pin", "Shaft", "Coil", "Pump", "Lamp", "Case", "Belt", "Cable", "Truss", "Steel", "Iron", "Gold", "Lead", "Brass", "Kernel", "Oil", "Robo", "Dome", "Chain", "Rivet", "Sprocket", "Key", "Nut", "Brake", "Clip", "Clutch", "Cam", "Hook", "Axle" ], > [ "zap", "clank", "tick", "tock", "beep", "boop", "ding", "grind", "crunch", "snap", "twist", "slip", "chip", "tank", "wrench", "sink", "stop", "catch", "crank", "grip", "shanks", "clamp", "weld", "sight", "swing", "face", "tooth", "foot", "trace", "wind", "blink", "flip", "crimp", "pop", "trim" ] species\glitchmalenamegen.config 7c7 < [ "Duke ", "Prince ", "Viceroy ", "Marquess ", "Earl ", "Count ", "Viscount ", "Baron ", "Baronet ", "Knight ", "Lord ", "Sir " ], --- > [ "Duke ", "Prince ", "Viceroy ", "Marquess ", "Earl ", "Count ", "Viscount ", "Baron ", "Knight ", "Lord ", "Sir " ], 11,12c11,12 < [ "Clock", "Bolt", "Cog", "Gear", "Screw", "Wire", "Spring", "Latch", "Lock", "Pin", "Shaft", "Coil", "Pump", "Lamp", "Case", "Belt", "Cable", "Truss", "Steel", "Iron", "Gold", "Lead", "Brass", "Kernel", "Oil", "Robo", "Dome" ], < [ "zap", "clank", "tick", "tock", "beep", "boop", "ding", "grind", "crunch", "snap", "twist", "slip", "chip", "tank", "wrench", "sink", "stop", "catch", "crank", "grip", "shanks", "clamp", "weld", "sight", "swing", "face", "tooth", "foot", "trace", "wind", "blink", "flip" ] --- > [ "Clock", "Bolt", "Cog", "Gear", "Screw", "Wire", "Spring", "Latch", "Lock", "Pin", "Shaft", "Coil", "Pump", "Lamp", "Case", "Belt", "Cable", "Truss", "Steel", "Iron", "Gold", "Lead", "Brass", "Kernel", "Oil", "Robo", "Dome", "Chain", "Rivet", "Sprocket", "Key", "Nut", "Brake", "Clip", "Clutch", "Cam", "Hook", "Axle" ], > [ "zap", "clank", "tick", "tock", "beep", "boop", "ding", "grind", "crunch", "snap", "twist", "slip", "chip", "tank", "wrench", "sink", "stop", "catch", "crank", "grip", "shanks", "clamp", "weld", "sight", "swing", "face", "tooth", "foot", "trace", "wind", "blink", "flip", "crimp", "pop", "trim" ] species\hylotl.species 3c3 < "nameGen" : [ "/species/hylotlnamegen.config:names", "/species/hylotlnamegen.config:names" ], --- > "nameGen" : [ "/species/hylotlmalenamegen.config:names", "/species/hylotlfemalenamegen.config:names" ],