Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add floran appliances #17

Merged
merged 17 commits into from
Jun 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions items/generic/crafting/bone.item.patch
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 objects/floran/bakingstation/floranbakingstationCNYC.animation
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"}]
}
}
}
9 changes: 9 additions & 0 deletions objects/floran/bakingstation/floranbakingstationCNYC.frames
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 objects/floran/bakingstation/floranbakingstationCNYC.object
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
}
Loading
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.
Loading
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"frameGrid" : {
"size" : [32, 26],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
]
}
}
Loading
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.
72 changes: 72 additions & 0 deletions objects/floran/blendingstation/floranblendingstationCNYC.animation
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"}]
}
}
}
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 objects/floran/blendingstation/floranblendingstationCNYC.object
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
}
Loading
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.
Loading