-
Notifications
You must be signed in to change notification settings - Fork 354
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 #1 from sayterdarkwynd/master
f
- Loading branch information
Showing
62 changed files
with
276 additions
and
222 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
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
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
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
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,11 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [72, 32], | ||
| "dimensions" : [11, 1], | ||
| "names" : [ | ||
| [ "off","powerup.1","powerup.2","powerup.3", "powered.1", "powered.2", "powered.3", "powered.4", "powerdown.1","powerdown.2","powerdown.3" ] | ||
| ]}, | ||
| "aliases" : { | ||
| "default.default" : "off" | ||
| } | ||
| } |
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
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,17 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [56, 96], | ||
| "dimensions" : [5, 2], | ||
| "names" : [ | ||
| [ "powered.1", "powered.2", "powered.3", "powered.4", "off" ], | ||
| [ "powerup.5", "powerup.4", "powerup.3", "powerup.2", "powerup.1" ] | ||
| ] | ||
| }, | ||
| "aliases" : { | ||
| "powerdown.1" : "powerup.5", | ||
| "powerdown.2" : "powerup.4", | ||
| "powerdown.3" : "powerup.3", | ||
| "powerdown.4" : "powerup.2", | ||
| "powerdown.5" : "powerup.1" | ||
| } | ||
| } |
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
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,13 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [64, 113], | ||
| "dimensions" : [5, 2], | ||
| "names" : [ | ||
| [ "powered.1", "powered.2", "powered.3", "powered.4", "off" ] | ||
| ] | ||
| }, | ||
| "aliases" : { | ||
| "powerdown.1" : "off", | ||
| "powerup.1" : "off" | ||
| } | ||
| } |
File renamed without changes
File renamed without changes
File renamed without changes.
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,13 @@ | ||
| { | ||
| "frameGrid" : { | ||
| "size" : [88, 41], | ||
| "dimensions" : [1, 1], | ||
| "names" : [ | ||
| [ "off" ] | ||
| ]}, | ||
| "aliases" : { | ||
| "powerup.1" : "off", | ||
| "powered.1" : "off", | ||
| "powerdown.1" : "off" | ||
| } | ||
| } |
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
104 changes: 52 additions & 52 deletions
104
.../fu_ftldrivesmall/fu_ftldrivesmall.object → .../ship/fu_ftldrive/fu_ftldrivesmall.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 |
|---|---|---|
| @@ -1,52 +1,52 @@ | ||
| { | ||
| "objectName" : "fu_ftldrivesmall", | ||
| "rarity" : "essential", | ||
| "colonyTags" : [ "science" ], | ||
| "category" : "furniture", | ||
| "description" : "An ftl drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +3, Ship Mass: +1^reset;. ^red;BYOS Only^reset;", | ||
| "shortdescription" : "^cyan;Small FTL Drive^white;", | ||
| "race" : "generic", | ||
| "printable" : false, | ||
| "learnBlueprintsOnPickup" : [ "fu_ftldrivemk1a", "fu_ftldrivemk1b", "fu_ftldrivemk1c" ], | ||
| "apexDescription" : "Smaller than most models, but it works. For now.", | ||
| "avianDescription" : "This small device gathers electricity and converts it into motion.", | ||
| "floranDescription" : "FTL drive sssmall, but Floran make do.", | ||
| "glitchDescription" : "Content. This FTL drive works enough for space travel.", | ||
| "humanDescription" : "Small, but an FTL drive is a must have for any ship.", | ||
| "hylotlDescription" : "A smaller model FTL drive for intergalactic travel.", | ||
| "novakidDescription" : "This faster'n 'light machine is workin' fine, though it's quite small.", | ||
| "inventoryIcon" : "/objects/ship/fu_ftldriveicon.png", | ||
| "orientations" : [ | ||
| { | ||
| "dualImage" : "fu_ftldrivesmall.png", | ||
| "imagePosition" : [-30, 0], | ||
| "spaceScan" : 0.1, | ||
| "anchors" : [ "bottom" ] | ||
| } | ||
| ], | ||
| "animation" : "fu_ftldrivesmall.animation", | ||
| "animationParts" : { | ||
| "base" : "fu_ftldrivesmall.png", | ||
| "fullbright" : "fu_ftldrivesmallfullbright.png" | ||
| }, | ||
| "animationPosition" : [-30, 0], | ||
| "scripts" : [ "/objects/ship/fu_shipstatmodifier.lua", "/objects/ship/fu_ftldriveanimation.lua" ], | ||
| "scriptDelta" : 60, | ||
| "stats" : { | ||
| "shipSpeed" : 3, | ||
| "shipMass" : 1 | ||
| }, | ||
| "capabilities" : [ | ||
| "systemTravel", | ||
| "planetTravel" | ||
| ], | ||
| "maxAmountGroups" : { | ||
| "ftlDrive" : 1 | ||
| }, | ||
| "byosOnly" : true | ||
| } | ||
| { | ||
| "objectName" : "fu_ftldrivesmall", | ||
| "rarity" : "essential", | ||
| "colonyTags" : [ "science" ], | ||
| "category" : "furniture", | ||
| "description" : "An ftl drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +3, Ship Mass: +1^reset;. ^red;BYOS Only^reset;", | ||
| "shortdescription" : "^cyan;Small FTL Drive^white;", | ||
| "race" : "generic", | ||
| "printable" : false, | ||
| "learnBlueprintsOnPickup" : [ "fu_ftldrivemk1a", "fu_ftldrivemk1b", "fu_ftldrivemk1c" ], | ||
|
|
||
| "apexDescription" : "Smaller than most models, but it works. For now.", | ||
| "avianDescription" : "This small device gathers electricity and converts it into motion.", | ||
| "floranDescription" : "FTL drive sssmall, but Floran make do.", | ||
| "glitchDescription" : "Content. This FTL drive works enough for space travel.", | ||
| "humanDescription" : "Small, but an FTL drive is a must have for any ship.", | ||
| "hylotlDescription" : "A smaller model FTL drive for intergalactic travel.", | ||
| "novakidDescription" : "This faster'n 'light machine is workin' fine, though it's quite small.", | ||
|
|
||
| "inventoryIcon" : "/objects/ship/fu_ftldriveicon.png", | ||
| "orientations" : [ | ||
| { | ||
| "dualImage" : "fu_ftldrivesmall.png", | ||
| "imagePosition" : [-30, 0], | ||
| "spaceScan" : 0.1, | ||
| "anchors" : [ "bottom" ] | ||
| } | ||
| ], | ||
|
|
||
| "animation" : "fu_ftldrivesmall.animation", | ||
| "animationParts" : { | ||
| "base" : "fu_ftldrivesmall.png", | ||
| "fullbright" : "fu_ftldrivesmallfullbright.png" | ||
| }, | ||
| "animationPosition" : [-30, 0], | ||
|
|
||
| "scripts" : [ "/objects/ship/fu_shipstatmodifier.lua", "/objects/ship/fu_ftldriveanimation.lua" ], | ||
| "scriptDelta" : 60, | ||
|
|
||
| "stats" : { | ||
| "shipSpeed" : 3, | ||
| "shipMass" : 1 | ||
| }, | ||
| "capabilities" : [ | ||
| "systemTravel", | ||
| "planetTravel" | ||
| ], | ||
| "maxAmountGroups" : { | ||
| "ftlDrive" : 1 | ||
| }, | ||
| "byosOnly" : true | ||
| } |
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
94 changes: 47 additions & 47 deletions
94
..._ftldrivesmall/fu_ftldrivesmall.animation → ...ftldrive/fu_ftldrivesmallbroken.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 |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| { | ||
| "animatedParts" : { | ||
| "stateTypes" : { | ||
| "base" : { | ||
| "default" : "off", | ||
| "states" : { | ||
| "off" : {"frames" : 1, "mode" : "loop"}, | ||
| "powerup" : {"frames" : 1, "mode" : "transition", "transition" : "powered"}, | ||
| "powered" : {"frames" : 1, "mode" : "loop"}, | ||
| "powerdown" : {"frames" : 1, "mode" : "transition", "transition" : "off"} | ||
| } | ||
| } | ||
| }, | ||
| "parts" : { | ||
| "base" : { | ||
| "properties" : { | ||
| "zLevel" : 2, | ||
| "centered" : false, | ||
| "fullbright" : true | ||
| }, | ||
| "partStates" : { | ||
| "base" : { | ||
| "off" : {"properties" : {"image" : "<partImage>:off"}}, | ||
| "powerup" : {"properties" : {"image" : "<partImage>:powerup.<frame>"}}, | ||
| "powered" : {"properties" : {"image" : "<partImage>:powered.<frame>"}}, | ||
| "powerdown" : {"properties" : {"image" : "<partImage>:powerdown.<frame>"}} | ||
| } | ||
| } | ||
| }, | ||
| "fullbright" : { | ||
| "properties" : { | ||
| "zLevel" : 3, | ||
| "centered" : false | ||
| }, | ||
| "partStates" : { | ||
| "base" : { | ||
| "off" : {"properties" : {"image" : "<partImage>:off"}}, | ||
| "powerup" : {"properties" : {"image" : "<partImage>:powerup.<frame>"}}, | ||
| "powered" : {"properties" : {"image" : "<partImage>:powered.<frame>"}}, | ||
| "powerdown" : {"properties" : {"image" : "<partImage>:powerdown.<frame>"}} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| { | ||
| "animatedParts" : { | ||
| "stateTypes" : { | ||
| "base" : { | ||
| "default" : "off", | ||
| "states" : { | ||
| "off" : {"frames" : 1, "mode" : "loop"}, | ||
| "powerup" : {"frames" : 1, "mode" : "transition", "transition" : "powered"}, | ||
| "powered" : {"frames" : 1, "mode" : "loop"}, | ||
| "powerdown" : {"frames" : 1, "mode" : "transition", "transition" : "off"} | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "parts" : { | ||
| "base" : { | ||
| "properties" : { | ||
| "zLevel" : 2, | ||
| "centered" : false, | ||
| "fullbright" : true | ||
| }, | ||
| "partStates" : { | ||
| "base" : { | ||
| "off" : {"properties" : {"image" : "<partImage>:off"}}, | ||
| "powerup" : {"properties" : {"image" : "<partImage>:powerup.<frame>"}}, | ||
| "powered" : {"properties" : {"image" : "<partImage>:powered.<frame>"}}, | ||
| "powerdown" : {"properties" : {"image" : "<partImage>:powerdown.<frame>"}} | ||
| } | ||
| } | ||
| }, | ||
| "fullbright" : { | ||
| "properties" : { | ||
| "zLevel" : 3, | ||
| "centered" : false | ||
| }, | ||
| "partStates" : { | ||
| "base" : { | ||
| "off" : {"properties" : {"image" : "<partImage>:off"}}, | ||
| "powerup" : {"properties" : {"image" : "<partImage>:powerup.<frame>"}}, | ||
| "powered" : {"properties" : {"image" : "<partImage>:powered.<frame>"}}, | ||
| "powerdown" : {"properties" : {"image" : "<partImage>:powerdown.<frame>"}} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.