Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17 from ColonolNutty/add-floran-appliances
Add floran appliances
- Loading branch information
Showing
92 changed files
with
972 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| [ | ||
| [ | ||
| { "op": "test", "path": "/learnBlueprintsOnPickup", "inverse" : true }, | ||
| { "op": "add", "path": "/learnBlueprintsOnPickup", "value": [] } | ||
| ], | ||
| [ | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranbakingstationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranblendingstationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranstove" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranchoppingstationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "florancoffeestationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranfreezingstationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranfryingstationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "florankettlestationCNYC" | ||
| }, | ||
| { | ||
| "op" : "add", | ||
| "path" : "/learnBlueprintsOnPickup/-", | ||
| "value" : "floranwaterstationCNYC" | ||
| } | ||
| ] | ||
| ] |
91 changes: 91 additions & 0 deletions
91
objects/floran/bakingstation/floranbakingstationCNYC.animation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "animatedParts" : { | ||
| "stateTypes" : { | ||
| "baseState" : { | ||
| "default" : "on", | ||
| "states" : { | ||
| "on" : { | ||
| "frames" : 1 | ||
| } | ||
| } | ||
| }, | ||
| "coalState" : { | ||
| "default" : "on", | ||
| "states" : { | ||
| "on" : { | ||
| "frames" : 16, | ||
| "cycle" : 3, | ||
| "mode" : "loop", | ||
| "properties" : { | ||
| "lightsOn" : [ "coalglow" ], | ||
| "persistentSound" : "/sfx/objects/campfire.ogg", | ||
| "persistentSoundRangeMultiplier" : 0.5 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "parts" : { | ||
| "base" : { | ||
| "properties" : { | ||
| "zLevel" : 1, | ||
| "offset" : [0.0, 0.0], | ||
| "centered" : false | ||
| }, | ||
| "partStates" : { | ||
| "baseState" : { | ||
| "on" : { | ||
| "properties" : { | ||
| "image" : "floranbakingstationCNYC.png:default" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "coals" : { | ||
| "properties" : { | ||
| "zLevel" : 0, | ||
| "offset" : [1.1, 0.0], | ||
| "centered" : false, | ||
| "fullbright" : true | ||
| }, | ||
| "partStates" : { | ||
| "coalState" : { | ||
| "on" : { | ||
| "properties" : { | ||
| "image" : "/objects/floran/coals/coalsCNYC.png:default.<frame>" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "sounds" : { | ||
| }, | ||
|
|
||
| "lights" : { | ||
| "coalglow" : { | ||
| "active" : false, | ||
| "position" : [0, 1], | ||
| "color" : [153, 128, 92], | ||
| "flickerPeriod" : 0.3, | ||
| "flickerMinIntensity" : 0.95, | ||
| "flickerMaxIntensity" : 1, | ||
| "flickerPeriodVariance" : 0.075, | ||
| "flickerIntensityVariance" : 0.025 | ||
| } | ||
| }, | ||
|
|
||
| "particleEmitters" : { | ||
| "dust" : { | ||
| "emissionRate" : 0.0, | ||
| "burstCount" : 10, | ||
| "offsetRegion" : [-2, -2, 2, 2], | ||
| "particles" : [{ "particle" : "dust2"}] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [32, 26], | ||
| "dimensions" : [1, 1], | ||
| "names" : [ | ||
| [ "default" ] | ||
| ] | ||
| } | ||
| } |
73 changes: 73 additions & 0 deletions
73
objects/floran/bakingstation/floranbakingstationCNYC.object
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "objectName" : "floranbakingstationCNYC", | ||
| "retainObjectParametersInItem" : true, | ||
| "printable" : false, | ||
| "rarity" : "Common", | ||
| "description" : "A bone coal oven!", | ||
| "shortdescription" : "^orange;Floran Bone Oven^white;", | ||
| "subtitle" : "Bake Food!", | ||
| "race" : "generic", | ||
| "category" : "Cookware", | ||
| "price" : 75, | ||
| "objectType" : "container", | ||
|
|
||
| "apexDescription" : "Suprisingly warm!", | ||
| "avianDescription" : "Smells wonderful, I feel at home.", | ||
| "floranDescription" : "Smellss like dinner", | ||
| "glitchDescription" : "Inspect. Very hot firing kiln.", | ||
| "humanDescription" : "Smells like spices.. I LOVE SPICES!", | ||
| "hylotlDescription" : "It retains it's heat for hours, perfect for evening cooking.", | ||
| "novakidDescription" : "Primitive lookin' oven. I suppose it does the job.", | ||
|
|
||
| "lightColor" : [218, 83, 2, 5], | ||
|
|
||
| "flickerPeriod" : 0.8, | ||
| "flickerMinIntensity" : 0.2, | ||
| "flickerMaxIntensity" : 0.3, | ||
| "flickerPeriodVariance" : 0.075, | ||
| "flickerIntensityVariance" : 0.025, | ||
|
|
||
| "inventoryIcon" : "floranbakingstationCNYCicon.png", | ||
| "orientations" : [ | ||
| { | ||
| "dualImage" : "floranbakingstationCNYCplacementpreview.png:default", | ||
|
|
||
| "spaceScan" : 0.1, | ||
| "anchors" : [ "bottom" ] | ||
| } | ||
| ], | ||
|
|
||
| "scripts" : [ "/scripts/npcToyObject.lua" ], | ||
|
|
||
| "animation" : "floranbakingstationCNYC.animation", | ||
| "animationPosition" : [0, 0], | ||
|
|
||
| "npcToy" : { | ||
| "influence" : [ | ||
| "furnace", | ||
| "furnace", | ||
| "furnaceComplete" | ||
| ], | ||
| "defaultReactions" : { | ||
| "furnace" : [ | ||
| [1.0, "warmhands"], | ||
| [1.0, "crouchwarm"] | ||
| ], | ||
| "furnaceComplete" : [ | ||
| [1.0, "warmhands"], | ||
| [1.0, "crouchwarm"], | ||
| [1.0, "pokefire"] | ||
| ] | ||
| }, | ||
| "preciseStandPositionLeft" : [-1.5, 0.0], | ||
| "preciseStandPositionRight" : [2.5, 0.0], | ||
| "maxNpcs" : 1 | ||
| }, | ||
|
|
||
| "recipeGroup" : "baking", | ||
| "openSounds" : [ "/sfx/objects/campfire_use.ogg" ], | ||
| "slotCount" : 2, | ||
| "uiConfig" : "/interface/objectcrafting/bakestation.config", | ||
| "frameCooldown" : 67, | ||
| "autoCloseCooldown" : 3600 | ||
| } |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
objects/floran/bakingstation/floranbakingstationCNYCplacementpreview.frames
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [32, 26], | ||
| "dimensions" : [1, 1], | ||
| "names" : [ | ||
| [ "default" ] | ||
| ] | ||
| } | ||
| } |
Binary file added
BIN
+620 Bytes
objects/floran/bakingstation/floranbakingstationCNYCplacementpreview.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.3 KB
objects/floran/bakingstation/floranbakingstationCNYCplacementpreview.xcf
Binary file not shown.
72 changes: 72 additions & 0 deletions
72
objects/floran/blendingstation/floranblendingstationCNYC.animation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "animatedParts" : { | ||
| "stateTypes" : { | ||
| "baseState" : { | ||
| "default" : "on", | ||
| "states" : { | ||
| "on" : { | ||
| "frames" : 1 | ||
| } | ||
| } | ||
| }, | ||
| "spinnerState" : { | ||
| "default" : "on", | ||
| "states" : { | ||
| "on" : { | ||
| "frames" : 3, | ||
| "cycle" : 0.5, | ||
| "mode" : "loop" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "parts" : { | ||
| "base" : { | ||
| "properties" : { | ||
| "zLevel" : 0, | ||
| "offset" : [0.0, 0.0], | ||
| "centered" : false | ||
| }, | ||
| "partStates" : { | ||
| "baseState" : { | ||
| "on" : { | ||
| "properties" : { | ||
| "image" : "floranblendingstationCNYC.png:default" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "spinner" : { | ||
| "properties" : { | ||
| "zLevel" : 1, | ||
| "offset" : [0.8, 0.7], | ||
| "centered" : false | ||
| }, | ||
| "partStates" : { | ||
| "spinnerState" : { | ||
| "on" : { | ||
| "properties" : { | ||
| "image" : "floranblendingstationCNYCbonespinner.png:default.<frame>" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "sounds" : { | ||
| }, | ||
|
|
||
| "particleEmitters" : { | ||
| "dust" : { | ||
| "emissionRate" : 0.0, | ||
| "burstCount" : 10, | ||
| "offsetRegion" : [-2, -2, 2, 2], | ||
| "particles" : [{ "particle" : "dust2"}] | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
objects/floran/blendingstation/floranblendingstationCNYC.frames
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [32, 32], | ||
| "dimensions" : [1, 1], | ||
| "names" : [ | ||
| [ "default" ] | ||
| ] | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
objects/floran/blendingstation/floranblendingstationCNYC.object
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| { | ||
| "objectName" : "floranblendingstationCNYC", | ||
| "retainObjectParametersInItem" : true, | ||
| "printable" : false, | ||
| "rarity" : "Common", | ||
| "description" : "A bone blender, look at it spin!", | ||
| "shortdescription" : "^orange;Floran Bone Blender^white;", | ||
| "subtitle" : "Blend Food!", | ||
| "race" : "generic", | ||
| "category" : "Cookware", | ||
| "price" : 75, | ||
| "objectType" : "container", | ||
|
|
||
| "lightColor" : [218, 83, 2, 5], | ||
|
|
||
| "flickerPeriod" : 0.8, | ||
| "flickerMinIntensity" : 0.2, | ||
| "flickerMaxIntensity" : 0.3, | ||
| "flickerPeriodVariance" : 0.075, | ||
| "flickerIntensityVariance" : 0.025, | ||
|
|
||
| "inventoryIcon" : "floranblendingstationCNYCicon.png", | ||
| "orientations" : [ | ||
| { | ||
| "dualImage" : "floranblendingstationCNYCplacementpreview.png:default", | ||
|
|
||
| "spaceScan" : 0.1, | ||
| "anchors" : [ "bottom" ] | ||
| } | ||
| ], | ||
|
|
||
| "scripts" : [ "/scripts/npcToyObject.lua" ], | ||
|
|
||
| "animation" : "floranblendingstationCNYC.animation", | ||
| "animationPosition" : [0, 0], | ||
|
|
||
| "npcToy" : { | ||
| "influence" : [ | ||
| "furnace", | ||
| "furnace", | ||
| "furnaceComplete" | ||
| ], | ||
| "defaultReactions" : { | ||
| "furnace" : [ | ||
| [1.0, "warmhands"], | ||
| [1.0, "crouchwarm"] | ||
| ], | ||
| "furnaceComplete" : [ | ||
| [1.0, "warmhands"], | ||
| [1.0, "crouchwarm"], | ||
| [1.0, "pokefire"] | ||
| ] | ||
| }, | ||
| "preciseStandPositionLeft" : [-1.5, 0.0], | ||
| "preciseStandPositionRight" : [2.5, 0.0], | ||
| "maxNpcs" : 1 | ||
| }, | ||
|
|
||
| "recipeGroup" : "blending", | ||
| "openSounds" : [ "/sfx/objects/campfire_use.ogg" ], | ||
| "slotCount" : 3, | ||
| "uiConfig" : "/interface/objectcrafting/blendstation.config", | ||
| "frameCooldown" : 67, | ||
| "autoCloseCooldown" : 3600 | ||
| } |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Oops, something went wrong.