FILES ----- dungeons\floran\floranhell\key with grid.png dungeons\floran\floranhell\key.png dungeons\floran\floranhuntinggrounds\key with grid.png dungeons\floran\floranhuntinggrounds\key.png dungeons\floran\floranvillagetower\1a-objects.png dungeons\floran\floranvillagetower\1b-objects.png dungeons\floran\floranvillagetower\2a-objects.png dungeons\floran\floranvillagetower\2b-objects.png dungeons\floran\floranvillagetower\3b-objects.png dungeons\floran\floranvillagetower\4a-objects.png dungeons\floran\floranvillagetower\floranvillagetower.dungeon dungeons\floran\floranvillagetower\groundhut1a-objects.png dungeons\floran\floranvillagetower\groundhut2a-objects.png dungeons\floran\floranvillagetower\groundhut4a-objects.png dungeons\floran\floranvillagetower\groundhut5a-objects.png dungeons\floran\floranvillagetower\groundhut5b-objects.png dungeons\floran\floranvillagetower\groundhut6a-objects.png dungeons\floran\floranvillagetower\key with grid.png dungeons\floran\floranvillagetower\key.png dungeons\floran\floranvillagetower\roof2a-objects.png dungeons\floran\floranvillagetower\roof3a-objects.png dungeons\floran\floranvillagetower\roof4b-objects.png dungeons\floran\floranvillagetower\treebase1-objects.png dungeons\floran\floranvillagetower\treebase2-objects.png dungeons\floran\floranvillagetower\treebase3-objects.png dungeons\microdungeons\randomencounter\undergroundapex\apexundergroundencounter.dungeon [NEW] dungeons\microdungeons\randomencounter\undergroundapex\lab3-objects.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\lab3-wires.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\lab3.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\trap2-objects.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\trap2.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\trap3-liquids.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\trap3-objects.png [NEW] dungeons\microdungeons\randomencounter\undergroundapex\trap3.png [NEW] items\armors\human\human-military\bsleeve.png [NEW] items\armors\human\human-military\chestf.png [NEW] items\armors\human\human-military\chestm.png [NEW] items\armors\human\human-military\fsleeve.png [NEW] items\armors\human\human-military\head.png [NEW] items\armors\human\human-military\humanmilitary.chest [NEW] items\armors\human\human-military\humanmilitary.head [NEW] items\armors\human\human-military\humanmilitary.legs [NEW] items\armors\human\human-military\icons.png [NEW] items\armors\human\human-military\mask.png [NEW] items\armors\human\human-military\pants.png objects\avian\birdgroundlantern\birdgroundlantern.animation objects\avian\birdgroundlantern\birdgroundlantern.object objects\avian\crystaltorch\crystaltorch.object objects\avian\crystaltorch\crystaltorchlit.png [NEW] objects\avian\triballamp\triballamp.animation objects\avian\triballamp\triballamp.frames objects\avian\triballamp\triballamp.object [NEW] objects\avian\triballamp\triballamplit.frames [NEW] objects\avian\triballamp\triballamplit.png [NEW] objects\floran\floranchandelier\floranchandelier.animation objects\floran\floranchandelier\floranchandelier.frames objects\floran\floranchandelier\floranchandelier.object [NEW] objects\floran\floranchandelier\floranchandelierlit.frames [NEW] objects\floran\floranchandelier\floranchandelierlit.png objects\floran\floranlamp1\floranlamp1.frames objects\floran\floranlamp1\floranlamp1.object objects\floran\floranlamp1\floranlamp1lit.frames objects\floran\floranlight\floranlight.object objects\generic\campfire\campfire.object objects\wired\standingturret\standingturret.object species\human.species DIFFS ----- dungeons\floran\floranvillagetower\floranvillagetower.dungeon 676,677c676,683 < "comment" : "floranlight", < "brush" : [ [ "clear" ], [ "object", "floranlight" ] ] --- > "comment" : "floranlight facing left", > "brush" : [ [ "clear" ], [ "object", "floranlight", { "direction" : "left" } ] ] > }, > > { > "value" : [83, 29, 191, 255], > "comment" : "floranlight facing right", > "brush" : [ [ "clear" ], [ "object", "floranlight", { "direction" : "right" } ] ] dungeons\microdungeons\randomencounter\undergroundapex\apexundergroundencounter.dungeon 7c7 < "anchor" : [ "lab1", "lab2", "trap1" ], --- > "anchor" : [ "lab1", "lab2", "lab3", "trap1", "trap2", "trap3" ], 1334a1335,1340 > "name" : "lab3", > "rules" : [ ], > "def" : [ "image", [ "lab3.png", "lab3-objects.png", "lab3-wires.png" ] ] > }, > > { 1337a1344,1355 > }, > > { > "name" : "trap2", > "rules" : [ ], > "def" : [ "image", [ "trap2.png", "trap2-objects.png" ] ] > }, > > { > "name" : "trap3", > "rules" : [ ], > "def" : [ "image", [ "trap3.png", "trap3-objects.png", "trap3-liquids.png" ] ] objects\avian\birdgroundlantern\birdgroundlantern.animation 9c9 < "particleEmittersOff" : [ "torch" ] --- > "particleEmittersOff" : [ "birdgroundlantern" ] 17c17 < "particleEmittersOn" : [ "torch" ] --- > "particleEmittersOn" : [ "birdgroundlantern" ] 73c73 < "torch" : { --- > "birdgroundlantern" : { objects\avian\birdgroundlantern\birdgroundlantern.object 66c66 < "inboundNodes" : [ [0, 0] ], --- > "inboundNodes" : [ [0, 1] ], objects\avian\crystaltorch\crystaltorch.object 63,64d62 < < "interactive" : false, objects\avian\triballamp\triballamp.frames 7,15c7,15 < [ "default.0", "default.1", "default.2", "default.3", "default.off" ], < [ "red.0", "red.1", "red.2", "red.3", "red.off" ], < [ "blue.0", "blue.1", "blue.2", "blue.3", "blue.off" ], < [ "green.0", "green.1", "green.2", "green.3", "green.off" ], < [ "yellow.0", "yellow.1", "yellow.2", "yellow.3", "yellow.off" ], < [ "orange.0", "orange.1", "orange.2", "orange.3", "orange.off" ], < [ "pink.0", "pink.1", "pink.2", "pink.3", "pink.off" ], < [ "black.0", "black.1", "black.2", "black.3", "black.off" ], < [ "white.0", "white.1", "white.2", "white.3", "white.off" ] --- > [ "default.1", "default.2", "default.3", "default.4", "default.off" ], > [ "red.1", "red.2", "red.3", "red.4", "red.off" ], > [ "blue.1", "blue.2", "blue.3", "blue.4", "blue.off" ], > [ "green.1", "green.2", "green.3", "green.4", "green.off" ], > [ "yellow.1", "yellow.2", "yellow.3", "yellow.4", "yellow.off" ], > [ "orange.1", "orange.2", "orange.3", "orange.4", "orange.off" ], > [ "pink.1", "pink.2", "pink.3", "pink.4", "pink.off" ], > [ "black.1", "black.2", "black.3", "black.4", "black.off" ], > [ "white.1", "white.2", "white.3", "white.4", "white.off" ] 20a21 > "default.on" : "default.1", objects\avian\triballamp\triballamp.object 10,11d9 < "hydrophobic" : true, < 26c24 < "lightColor" : [135, 17, 50], --- > "lightColor" : [217, 65, 54], 29,50c27 < < "particleEmitter" : { < "emissionRate" : 1.0, < "emissionVariance" : 0.5, < < "particle" : { < "type" : "ember", < "size" : 1.0, < "color" : [135, 17, 50, 255], < "light" : [135, 17, 50], < "fade" : 0.9, < "initialVelocity" : [0.0, 10.0], < "finalVelocity" : [0.0, 3.0], < "approach" : [0, 20], < "timeToLive" : 0.2, < "layer" : "middle" < }, < < "particleVariance" : { < "initialVelocity" : [10, -5] < } < }, --- > "flickerTiming" : 3, 55c32,39 < "dualImage" : "triballamp.png:.", --- > "image" : "triballamp.png:.", > "imagePosition" : [0, 0], > > "spaceScan" : 0.1, > "anchors" : [ "bottom" ] > }, > { > "image" : "triballamp.png:.", 57,58d40 < "frames" : 4, < "animationCycle" : 1, 62a45,54 > ], > > "animation" : "triballamp.animation", > "animationParts" : { > "bg" : "triballamp.png", > "fg" : "triballamplit.png" > }, > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, 64c56 < ] --- > "inboundNodes" : [ [0, 0] ] objects\floran\floranchandelier\floranchandelier.frames 2d1 < 7c6 < [ "default.0", "default.1", "default.2", "default.3", "default.off" ] --- > [ "default.1", "default.2", "default.3", "default.4", "default.off" ] 12c11,12 < "default.default" : "default.0" --- > "default.default" : "default.off", > "default.on" : "default.1" objects\floran\floranchandelier\floranchandelier.object 30,53d29 < < < "particleEmitter" : { < "emissionRate" : 1.0, < "emissionVariance" : 0.5, < < "particle" : { < "type" : "ember", < "size" : 1.0, < "color" : [255, 100, 0, 255], < "light" : [150, 50, 50], < "fade" : 0.9, < "initialVelocity" : [0.0, 5.0], < "finalVelocity" : [0.0, -50.0], < "approach" : [0, 20], < "timeToLive" : 0.6, < "layer" : "middle" < }, < < "particleVariance" : { < "initialVelocity" : [1.5, 2.0] < } < }, < 57c33 < "dualImage" : "floranchandelier.png:.", --- > "image" : "floranchandelier.png:.", 59,60c35,38 < "frames" : 4, < "animationCycle" : 0.5, --- > > "direction" : "left", > "flipImages" : true, > "animationPosition" : [-16, -16], 62c40,50 < "spaceScan" : 0.1, --- > "spaces" : [ [-1, 0], [0, 0], [-2, -1], [-1, -1], [0, -1], [1, -1], [-2, -2], [-1, -2], [0, -2], [1, -2] ], > "anchors" : [ "top" ] > }, > { > "image" : "floranchandelier.png:.", > "imagePosition" : [-16, -16], > > "direction" : "right", > "animationPosition" : [-16, -16], > > "spaces" : [ [-1, 0], [0, 0], [-2, -1], [-1, -1], [0, -1], [1, -1], [-2, -2], [-1, -2], [0, -2], [1, -2] ], 65c53,69 < ] --- > ], > > "soundEffect" : "/sfx/objects/torch.wav", > > "animation" : "floranchandelier.animation", > "animationParts" : { > "bg" : "floranchandelier.png", > "fg" : "floranchandelierlit.png" > }, > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 0] ], > > "interactive" : false > objects\floran\floranlamp1\floranlamp1.frames 6c6 < [ "default.0", "default.off" ] --- > [ "default.1", "default.off" ] 11c11,12 < "default.default" : "default.0" --- > "default.default" : "default.off", > "default.on" : "default.1" objects\floran\floranlamp1\floranlamp1.object 22,25c22,25 < "imageLayers" : [ { "image" : "floranlamp1.png:.", "fullbright" : true }, { "image" : "floranlamp1lit.png:." } ], < "flipImages" : true, < "imagePosition" : [-8, 0], < "spaceScan" : 0.1, --- > "image" : "floranlamp1.png:.", > "flipImages" : true, > "imagePosition" : [-16, 0], > "spaces" : [ [-2, 1], [-2, 2], [-2, 3], [-1, 1], [-1, 2], [-1, 3], [0, 0], [0, 1], [0, 2], [0, 3] ], 28c28,29 < "lightPosition" : [-1, 1] --- > "animationPosition" : [-16, 0], > "lightPosition" : [-2, 1] 31,33c32,34 < "imageLayers" : [ { "image" : "floranlamp1.png:.", "fullbright" : true }, { "image" : "floranlamp1lit.png:." } ], < "imagePosition" : [-8, 0], < "spaceScan" : 0.1, --- > "image" : "floranlamp1.png:.", > "imagePosition" : [0, 0], > "spaces" : [ [0, 0], [0, 1], [0, 2], [0, 3], [1, 1], [1, 2], [1, 3], [2, 1], [2, 2], [2, 3] ], 36c37,38 < "lightPosition" : [1, 1] --- > "animationPosition" : [0, 0], > "lightPosition" : [2, 1] 38c40,53 < ] --- > ], > > "animation" : "/objects/wired/light/lighttogglebgfullbright.animation", > "animationParts" : { > "bg" : "floranlamp1.png", > "fg" : "floranlamp1lit.png" > }, > > "scripts" : [ "/objects/wired/light/light.lua" ], > "scriptDelta" : 60, > > "inboundNodes" : [ [0, 1] ], > > "interactive" : false objects\floran\floranlamp1\floranlamp1lit.frames 6c6 < [ "default.0", "default.off" ] --- > [ "default.1", "default.off" ] 11c11,12 < "default.default" : "default.0" --- > "default.default" : "default.off", > "default.on" : "default.1" objects\floran\floranlight\floranlight.object 26a27,37 > "direction" : "left", > "flipImages" : true, > "anchors" : [ "background" ] > }, > { > "imageLayers" : [ { "image" : "floranlightback1.png:.", "fullbright" : true }, { "image" : "floranlightback2.png:." } ], > "imagePosition" : [0, 0], > "frames" : 1, > "animationCycle" : 0.3, > "spaceScan" : 0.1, > "direction" : "right", 34c45,46 < --- > "direction" : "left", > "flipImages" : true, 38,40c50,52 < { < "imageLayers" : [ { "image" : "floranlightground1.png:.", "fullbright" : true }, { "image" : "floranlightground2.png:." } ], < "imagePosition" : [-8, 8], --- > { > "imageLayers" : [ { "image" : "floranlightceiling1.png:.", "fullbright" : true }, { "image" : "floranlightceiling2.png:." } ], > "imagePosition" : [0, 0], 43c55 < --- > "direction" : "right", 45c57 < "anchors" : [ "bottom" ] --- > "anchors" : [ "top" ] 52c64 < --- > "direction" : "left", 58c70 < "imagePosition" : [-8, 0], --- > "imagePosition" : [0, 0], 61c73 < --- > "direction" : "right", objects\generic\campfire\campfire.object 31a32 > "position" : [0.5, 0.3], 44c45,46 < "initialVelocity" : [0.5, 2.0] --- > "initialVelocity" : [0.5, 2.0], > "position" : [0.4, 0] 57c59 < "spaceScan" : 0.1, --- > "spaces" : [ [0, 0], [0, 1], [1, 0], [1, 1] ], objects\wired\standingturret\standingturret.object 4a5 > "price" : 2500, species\human.species 137a138 > "altOptionAsHairColor" : true, //(yeah boi)