diff --git a/_metadata b/_metadata index 5237a7d4a..6e80dce3f 100644 --- a/_metadata +++ b/_metadata @@ -7,5 +7,5 @@ "priority" : 9000, "steamContentId" : "2359135864", "tags" : "Crafting and Building|Planets and Environments|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|Species|Furniture and Objects|Food and Farming|Mechanics|Armor and Clothes", - "version" : "0.8.0.9" + "version" : "0.8.0.10" } \ No newline at end of file diff --git a/celestial.config.patch b/celestial.config.patch index 0bd42ee41..333e2069c 100644 --- a/celestial.config.patch +++ b/celestial.config.patch @@ -8,7 +8,7 @@ "op": "add", "path": "/systemTypeBins/-", "value": [ - 0.12, + 0.1, "arcana_star_arcane" ] }, @@ -16,7 +16,7 @@ "op": "add", "path": "/systemTypeBins/-", "value": [ - 0.12, + 0.14, "arcana_star_illuminated" ] }, @@ -24,7 +24,7 @@ "op": "add", "path": "/systemTypeBins/-", "value": [ - 0.12, + 0.18, "arcana_star_superstorm" ] }, @@ -32,7 +32,7 @@ "op": "add", "path": "/systemTypeBins/-", "value": [ - 0.12, + 0.20, "arcana_star_polar" ] }, diff --git a/items/armors/arcana_armor_aegis/arcana_armor_aegis.chest b/items/armors/arcana_armor_aegis/arcana_armor_aegis.chest index 72946d940..fc7f5181b 100644 --- a/items/armors/arcana_armor_aegis/arcana_armor_aegis.chest +++ b/items/armors/arcana_armor_aegis/arcana_armor_aegis.chest @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Legendary", "category" : "chestwear", - "description" : "A haken-stahlite forged heavy armor.", + "description" : "A heavy armor forged from haken-stahlite.", "shortdescription" : "Aegis Chestplate", "tooltipKind" : "armor", diff --git a/items/armors/arcana_armor_aegis/arcana_armor_aegis.head b/items/armors/arcana_armor_aegis/arcana_armor_aegis.head index 2b21a6fd6..42bbe6161 100644 --- a/items/armors/arcana_armor_aegis/arcana_armor_aegis.head +++ b/items/armors/arcana_armor_aegis/arcana_armor_aegis.head @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Legendary", "category" : "headarmour", - "description" : "A haken-stahlite forged heavy armor.", + "description" : "A heavy armor forged from haken-stahlite.", "shortdescription" : "Aegis Helmet", "tooltipKind" : "armor", diff --git a/items/armors/arcana_armor_aegis/arcana_armor_aegis.legs b/items/armors/arcana_armor_aegis/arcana_armor_aegis.legs index 7f248d892..36febf9b5 100644 --- a/items/armors/arcana_armor_aegis/arcana_armor_aegis.legs +++ b/items/armors/arcana_armor_aegis/arcana_armor_aegis.legs @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Legendary", "category" : "legwear", - "description" : "A haken-stahlite forged heavy armor.", + "description" : "A heavy armor forged from haken-stahlite.", "shortdescription" : "Aegis Leggings", "tooltipKind" : "armor", diff --git a/items/armors/arcana_armor_anima/arcana_armor_anima.head b/items/armors/arcana_armor_anima/arcana_armor_anima.head index faaa9e53f..f31c5608e 100644 --- a/items/armors/arcana_armor_anima/arcana_armor_anima.head +++ b/items/armors/arcana_armor_anima/arcana_armor_anima.head @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Rare", "category" : "headarmour", - "description" : "A spooky looking masked helm.", + "description" : "A spooky-looking masked helm.", "shortdescription" : "Anima Mask", "tooltipKind" : "armor", diff --git a/items/armors/arcana_armor_anima/arcana_armor_anima.legs b/items/armors/arcana_armor_anima/arcana_armor_anima.legs index 80b3e2873..d721b9f57 100644 --- a/items/armors/arcana_armor_anima/arcana_armor_anima.legs +++ b/items/armors/arcana_armor_anima/arcana_armor_anima.legs @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Rare", "category" : "legwear", - "description" : "A piece of leggings, crafted from anima bars.", + "description" : "A pair of leggings, crafted from anima bars.", "shortdescription" : "Anima Leggings", "tooltipKind" : "armor", diff --git a/items/armors/arcana_armor_architect/arcana_armor_architect.legs b/items/armors/arcana_armor_architect/arcana_armor_architect.legs index 338e5db76..f36f8174c 100644 --- a/items/armors/arcana_armor_architect/arcana_armor_architect.legs +++ b/items/armors/arcana_armor_architect/arcana_armor_architect.legs @@ -5,7 +5,7 @@ "maxStack" : 1, "rarity" : "Rare", "category" : "legwear", - "description" : "A piece of dark leggings, worn by the Workshop's engineers.", + "description" : "A pair of dark leggings, worn by the Workshop's engineers.", "shortdescription" : "Architect's Leggings", "tooltipKind" : "armor", diff --git a/items/generic/arcana_misc/arcana_misc_sceantine.item b/items/generic/arcana_misc/arcana_misc_sceantine.item index 21cb18f1f..3b0168b02 100644 --- a/items/generic/arcana_misc/arcana_misc_sceantine.item +++ b/items/generic/arcana_misc/arcana_misc_sceantine.item @@ -4,7 +4,7 @@ "rarity" : "Rare", "category" : "craftingMaterial", "inventoryIcon" : "arcana_misc_sceantine.png", - "description" : "A rare metal found in the Draco Ridge and Daybroken biomes, it can withstand most heat sources such as fire and lava.", + "description" : "A rare metal found in the Draco Ridge and Daybroken biomes that can withstand most heat sources such as fire and lava.", "shortdescription" : "Sceantine", "itemTags" : [ "reagent" ] } diff --git a/items/generic/arcana_misc_bossdrops/arcana_misc_morphosisEgg.item b/items/generic/arcana_misc_bossdrops/arcana_misc_morphosisEgg.item index c4392c87d..e8c5340fa 100644 --- a/items/generic/arcana_misc_bossdrops/arcana_misc_morphosisEgg.item +++ b/items/generic/arcana_misc_bossdrops/arcana_misc_morphosisEgg.item @@ -4,7 +4,7 @@ "rarity" : "Legendary", "category" : "craftingMaterial", "inventoryIcon" : "arcana_misc_morphosisEgg.png", - "description" : "A grenn, glowing egg. Dropped from the Evolapis.", + "description" : "A green, glowing egg. Dropped from the Evolapis.", "shortdescription" : "Morphosis Egg", "itemTags" : [ "reagent" ] } diff --git a/items/generic/arcana_ores/arcana_ore_luminariumOre.item b/items/generic/arcana_ores/arcana_ore_luminariumOre.item index 296540ffc..8bba48302 100644 --- a/items/generic/arcana_ores/arcana_ore_luminariumOre.item +++ b/items/generic/arcana_ores/arcana_ore_luminariumOre.item @@ -4,7 +4,7 @@ "rarity" : "Legendary", "category" : "craftingMaterial", "inventoryIcon" : "arcana_ore_luminariumOre.png", - "description" : "A luminarium ore, can be used to craft azurium bars.", + "description" : "A luminarium ore, can be used to craft luminarium bars.", "shortdescription" : "^#8f82e9;Luminarium Ore^reset;", "itemTags" : [ "reagent" ] } diff --git a/items/materials/exousia_tile10.png b/items/materials/exousia_tile10.png index 2d1eae7b1..e6b7a8766 100644 Binary files a/items/materials/exousia_tile10.png and b/items/materials/exousia_tile10.png differ diff --git a/items/materials/exousia_tile27.matitem b/items/materials/exousia_tile27.matitem new file mode 100644 index 000000000..19ebbe19d --- /dev/null +++ b/items/materials/exousia_tile27.matitem @@ -0,0 +1,11 @@ +{ + "itemName" : "exousia_tile27", + "price" : 0, + "category" : "block", + "rarity" : "Rare", + "inventoryIcon" : "exousia_tile27.png", + "description" : "A glass window.", + "shortdescription" : "Unlit Window", + + "materialId" : 16887 +} diff --git a/items/materials/exousia_tile27.png b/items/materials/exousia_tile27.png new file mode 100644 index 000000000..bdfa2cac7 Binary files /dev/null and b/items/materials/exousia_tile27.png differ diff --git a/items/materials/exousia_tile28.matitem b/items/materials/exousia_tile28.matitem new file mode 100644 index 000000000..e7896006b --- /dev/null +++ b/items/materials/exousia_tile28.matitem @@ -0,0 +1,11 @@ +{ + "itemName" : "exousia_tile28", + "price" : 0, + "category" : "block", + "rarity" : "Rare", + "inventoryIcon" : "exousia_tile28.png", + "description" : "A glass window.", + "shortdescription" : "Lit Window", + + "materialId" : 16888 +} diff --git a/items/materials/exousia_tile28.png b/items/materials/exousia_tile28.png new file mode 100644 index 000000000..00360042e Binary files /dev/null and b/items/materials/exousia_tile28.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/arcana_exousia_modern_deco_3.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/arcana_exousia_modern_deco_3.object new file mode 100644 index 000000000..69a760dcd --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/arcana_exousia_modern_deco_3.object @@ -0,0 +1,37 @@ +{ + "objectName" : "arcana_exousia_modern_deco_3", + "colonyTags" : ["misc"], + "rarity" : "Rare", + "description" : "A couple of bottles and some towels.", + "shortdescription" : "Decorative Bottles", + "race" : "generic", + "category" : "decorative", + "price" : 80, + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + } + ] +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/body.png new file mode 100644 index 000000000..9d4bb0363 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/default.frames new file mode 100644 index 000000000..c2a0747a5 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [16, 8], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/fullbright.png new file mode 100644 index 000000000..9d4bb0363 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/icon.png new file mode 100644 index 000000000..c14a443b6 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_3/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/arcana_exousia_modern_deco_4.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/arcana_exousia_modern_deco_4.object new file mode 100644 index 000000000..8d7dc6122 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/arcana_exousia_modern_deco_4.object @@ -0,0 +1,37 @@ +{ + "objectName" : "arcana_exousia_modern_deco_4", + "colonyTags" : ["misc"], + "rarity" : "Rare", + "description" : "An ultramodern door.", + "shortdescription" : "Background Modern Door", + "race" : "generic", + "category" : "decorative", + "price" : 160, + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-8, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + } + ] +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/body.png new file mode 100644 index 000000000..67b51fd3a Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/default.frames new file mode 100644 index 000000000..59cd316cd --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [24, 40], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/fullbright.png new file mode 100644 index 000000000..e18e3c6a9 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/icon.png new file mode 100644 index 000000000..ec8b1c0ac Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_deco_4/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/animation.animation b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/animation.animation new file mode 100644 index 000000000..ec0e6fe0d --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/animation.animation @@ -0,0 +1,81 @@ +{ + "globalTagDefaults" : { + "doorDirection" : "Right" + }, + + "animatedParts" : { + "stateTypes" : { + "doorState" : { + "default" : "closed", + "states" : { + "open" : { + "frames" : 4, + "cycle" : 0.2 + }, + "closing" : { + "frames" : 4, + "cycle" : 0.2, + "mode" : "transition", + "transition" : "closed" + }, + "closed" : { }, + "locking" : { + "frames" : 4, + "cycle" : 0.2, + "mode" : "transition", + "transition" : "locked" + }, + "locked" : { } + } + } + }, + + "parts" : { + "door" : { + "properties" : { + "centered" : false + }, + + "partStates" : { + "doorState" : { + "open" : { + "properties" : { + "image" : ":open." + } + }, + + "closing" : { + "properties" : { + "image" : ":close." + } + }, + + "closed" : { + "properties" : { + "image" : ":close.4" + } + }, + + "locking" : { + "properties" : { + "image" : ":close." + } + }, + + "locked" : { + "properties" : { + "image" : ":close.4" + } + } + } + } + } + } + }, + + "sounds" : { + "open" : [], + "close" : [], + "locked" : [ "/sfx/interface/clickon_error.ogg" ] + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/arcana_exousia_modern_door_1.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/arcana_exousia_modern_door_1.object new file mode 100644 index 000000000..e5f3e4e3f --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/arcana_exousia_modern_door_1.object @@ -0,0 +1,47 @@ +{ + "objectName" : "arcana_exousia_modern_door_1", + "colonyTags" : ["misc","door"], + "rarity" : "Rare", + + "category" : "door", + "price" : 120, + "description" : "A white sleek door.", + "shortdescription" : "Ultramodern Door", + "race" : "generic", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "dualImage" : "body.png:default", + "imagePosition" : [0, 0], + "renderLayer" : "Object+5", + + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ] + } + ], + + "scripts" : [ "/objects/wired/door/door.lua" ], + "scriptDelta" : 5, + + "animation" : "animation.animation", + "animationCustom" : { + "sounds" : { + "open" : { + "pool" : [ "/sfx/objects/apexcooldoor_open.ogg" ], + "rangeMultiplier" : 0.5 + }, + "close" : { + "pool" : [ "/sfx/objects/apexcooldoor_close.ogg" ], + "rangeMultiplier" : 0.5 + } + } + }, + "animationParts" : { + "door" : "body.png" + }, + "animationPosition" : [0, 0], + + "inputNodes" : [ [0, 0] ], + "outputNodes" : [ [1, 0] ] +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/body.png new file mode 100644 index 000000000..6594b07a2 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/default.frames new file mode 100644 index 000000000..18bb3643e --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/default.frames @@ -0,0 +1,30 @@ +{ + + "frameGrid" : { + "size" : [8, 40], + "dimensions" : [5, 1], + "names" : [ + [ "0", "1", "2", "3", "4" ] + ] + }, + + "aliases" : { + "default" : "0", + "closeLeft.1" : "3", + "closeLeft.2" : "2", + "closeLeft.3" : "1", + "closeLeft.4" : "0", + "closeRight.1" : "3", + "closeRight.2" : "2", + "closeRight.3" : "1", + "closeRight.4" : "0", + "openLeft.1" : "1", + "openLeft.2" : "2", + "openLeft.3" : "3", + "openLeft.4" : "4", + "openRight.1" : "1", + "openRight.2" : "2", + "openRight.3" : "3", + "openRight.4" : "4" + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/icon.png new file mode 100644 index 000000000..12bb94107 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_1/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/animation.animation b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/animation.animation new file mode 100644 index 000000000..ec0e6fe0d --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/animation.animation @@ -0,0 +1,81 @@ +{ + "globalTagDefaults" : { + "doorDirection" : "Right" + }, + + "animatedParts" : { + "stateTypes" : { + "doorState" : { + "default" : "closed", + "states" : { + "open" : { + "frames" : 4, + "cycle" : 0.2 + }, + "closing" : { + "frames" : 4, + "cycle" : 0.2, + "mode" : "transition", + "transition" : "closed" + }, + "closed" : { }, + "locking" : { + "frames" : 4, + "cycle" : 0.2, + "mode" : "transition", + "transition" : "locked" + }, + "locked" : { } + } + } + }, + + "parts" : { + "door" : { + "properties" : { + "centered" : false + }, + + "partStates" : { + "doorState" : { + "open" : { + "properties" : { + "image" : ":open." + } + }, + + "closing" : { + "properties" : { + "image" : ":close." + } + }, + + "closed" : { + "properties" : { + "image" : ":close.4" + } + }, + + "locking" : { + "properties" : { + "image" : ":close." + } + }, + + "locked" : { + "properties" : { + "image" : ":close.4" + } + } + } + } + } + } + }, + + "sounds" : { + "open" : [], + "close" : [], + "locked" : [ "/sfx/interface/clickon_error.ogg" ] + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/arcana_exousia_modern_door_2.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/arcana_exousia_modern_door_2.object new file mode 100644 index 000000000..e3c57232a --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/arcana_exousia_modern_door_2.object @@ -0,0 +1,47 @@ +{ + "objectName" : "arcana_exousia_modern_door_2", + "colonyTags" : ["misc","door"], + "rarity" : "Rare", + + "category" : "door", + "price" : 160, + "description" : "A large modern door.", + "shortdescription" : "Modern Large Door", + "race" : "generic", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "dualImage" : "body.png:default", + "imagePosition" : [0, 0], + "renderLayer" : "Object+5", + + "spaceScan" : 0.1, + "anchors" : [ "bottom", "top" ] + } + ], + + "scripts" : [ "/objects/wired/door/door.lua" ], + "scriptDelta" : 5, + + "animation" : "animation.animation", + "animationCustom" : { + "sounds" : { + "open" : { + "pool" : [ "/sfx/objects/apexcooldoor_open.ogg" ], + "rangeMultiplier" : 0.5 + }, + "close" : { + "pool" : [ "/sfx/objects/apexcooldoor_close.ogg" ], + "rangeMultiplier" : 0.5 + } + } + }, + "animationParts" : { + "door" : "body.png" + }, + "animationPosition" : [0, 0], + + "inputNodes" : [ [0, 0] ], + "outputNodes" : [ [1, 0] ] +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/body.png new file mode 100644 index 000000000..8709ca40b Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/default.frames new file mode 100644 index 000000000..bb6b8fa80 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/default.frames @@ -0,0 +1,30 @@ +{ + + "frameGrid" : { + "size" : [16, 40], + "dimensions" : [5, 1], + "names" : [ + [ "0", "1", "2", "3", "4" ] + ] + }, + + "aliases" : { + "default" : "0", + "closeLeft.1" : "3", + "closeLeft.2" : "2", + "closeLeft.3" : "1", + "closeLeft.4" : "0", + "closeRight.1" : "3", + "closeRight.2" : "2", + "closeRight.3" : "1", + "closeRight.4" : "0", + "openLeft.1" : "1", + "openLeft.2" : "2", + "openLeft.3" : "3", + "openLeft.4" : "4", + "openRight.1" : "1", + "openRight.2" : "2", + "openRight.3" : "3", + "openRight.4" : "4" + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/icon.png new file mode 100644 index 000000000..849ce6ca6 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_door_2/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/arcana_exousia_modern_storage_10.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/arcana_exousia_modern_storage_10.object new file mode 100644 index 000000000..445d05697 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/arcana_exousia_modern_storage_10.object @@ -0,0 +1,49 @@ +{ + "objectName" : "arcana_exousia_modern_storage_10", + "colonyTags" : ["misc","storage","exousian_modern"], + "rarity" : "Rare", + "description" : "A simple black shelf with books and bottles stored within.", + "shortdescription" : "Modern Tall Shelf", + "race" : "generic", + "price" : 320, + + "category" : "storage", + "objectType" : "container", + "tooltipKind" : "container", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ], + + "openSounds" : [ "/sfx/objects/chest_medium_open.ogg" ], + "closeSounds" : [ "/sfx/objects/chest_medium_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/body.png new file mode 100644 index 000000000..fe1b72211 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/default.frames new file mode 100644 index 000000000..2c8702b97 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 40], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/fullbright.png new file mode 100644 index 000000000..fe1b72211 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/icon.png new file mode 100644 index 000000000..511060f91 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_10/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/arcana_exousia_modern_storage_11.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/arcana_exousia_modern_storage_11.object new file mode 100644 index 000000000..53fe51967 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/arcana_exousia_modern_storage_11.object @@ -0,0 +1,49 @@ +{ + "objectName" : "arcana_exousia_modern_storage_11", + "colonyTags" : ["misc","storage","exousian_modern"], + "rarity" : "Rare", + "description" : "A bunch of mini cabinets.", + "shortdescription" : "Modern Tall Shelf", + "race" : "generic", + "price" : 320, + + "category" : "storage", + "objectType" : "container", + "tooltipKind" : "container", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ], + + "openSounds" : [ "/sfx/objects/chest_medium_open.ogg" ], + "closeSounds" : [ "/sfx/objects/chest_medium_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/body.png new file mode 100644 index 000000000..0fc0b4e10 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/default.frames new file mode 100644 index 000000000..2c8702b97 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 40], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/fullbright.png new file mode 100644 index 000000000..0fc0b4e10 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/icon.png new file mode 100644 index 000000000..74933c0d4 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_11/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_5/arcana_exousia_modern_storage_5.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_5/arcana_exousia_modern_storage_5.object index cebaee524..2b70bef0f 100644 --- a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_5/arcana_exousia_modern_storage_5.object +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_5/arcana_exousia_modern_storage_5.object @@ -42,13 +42,13 @@ "animationCycle" : 0.5, "spaces" : [ - [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], - [3, 1] + [3, 1], + [4, 1] ], "anchors" : [], "collision" : "platform" diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_7/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_7/icon.png index ad09519c2..1d29c08e5 100644 Binary files a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_7/icon.png and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_7/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/arcana_exousia_modern_storage_8.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/arcana_exousia_modern_storage_8.object new file mode 100644 index 000000000..a65e18380 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/arcana_exousia_modern_storage_8.object @@ -0,0 +1,65 @@ +{ + "objectName" : "arcana_exousia_modern_storage_8", + "colonyTags" : ["misc","storage","exousian_modern"], + "rarity" : "Rare", + "description" : "A sleek wall cabinet, designed for a fridge to fit below.", + "shortdescription" : "Modern Fridge Cabinet", + "race" : "generic", + "price" : 220, + + "category" : "storage", + "objectType" : "container", + "tooltipKind" : "container", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaces" : [ + [-2, 1], + [-1, 1], + [0, 1], + [1, 1], + [2, 1], + [3, 1], + [4, 1] + ], + "anchors" : [], + "collision" : "platform" + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaces" : [ + [-2, 1], + [-1, 1], + [0, 1], + [1, 1], + [2, 1], + [3, 1], + [4, 1] + ], + "anchors" : [], + "collision" : "platform" + + } + ], + + "openSounds" : [ "/sfx/objects/chest_medium_open.ogg" ], + "closeSounds" : [ "/sfx/objects/chest_medium_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/body.png new file mode 100644 index 000000000..24ff897b5 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/default.frames new file mode 100644 index 000000000..bdd872251 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [56, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/fullbright.png new file mode 100644 index 000000000..24ff897b5 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/icon.png new file mode 100644 index 000000000..abffc3faf Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_8/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/arcana_exousia_modern_storage_9.object b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/arcana_exousia_modern_storage_9.object new file mode 100644 index 000000000..07c81a88b --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/arcana_exousia_modern_storage_9.object @@ -0,0 +1,49 @@ +{ + "objectName" : "arcana_exousia_modern_storage_9", + "colonyTags" : ["misc","storage","exousian_modern"], + "rarity" : "Rare", + "description" : "A simple black floor-shelf.", + "shortdescription" : "Modern Short Shelf", + "race" : "generic", + "price" : 300, + + "category" : "storage", + "objectType" : "container", + "tooltipKind" : "container", + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "left", + "flipImages" : true, + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + }, + { + "imageLayers" : [ { "image" : "body.png:", "fullbright" : true }, { "image" : "fullbright.png:"} ], + "direction" : "right", + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ], + + "openSounds" : [ "/sfx/objects/chest_medium_open.ogg" ], + "closeSounds" : [ "/sfx/objects/chest_medium_close.ogg" ], + "slotCount" : 16, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/body.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/body.png new file mode 100644 index 000000000..b55e2aab0 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/default.frames b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/default.frames new file mode 100644 index 000000000..cb91bdba9 --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/default.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/fullbright.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/fullbright.png new file mode 100644 index 000000000..b55e2aab0 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/icon.png b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/icon.png new file mode 100644 index 000000000..7841e3d28 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_modern/arcana_exousia_modern_storage_9/icon.png differ diff --git a/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/arcana_exousia_tech_wireddeco_5.object b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/arcana_exousia_tech_wireddeco_5.object new file mode 100644 index 000000000..0568d1e7e --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/arcana_exousia_tech_wireddeco_5.object @@ -0,0 +1,76 @@ +{ + "objectName" : "arcana_exousia_tech_wireddeco_5", + "colonyTags" : ["light", "exousia_tech"], + "rarity" : "Rare", + "description" : "A small desktop monitor in a minimal design.", + "shortdescription" : "Exoslate Small Monitor", + "race" : "generic", + + "category" : "light", + "price" : 200, + "lightColor" : [10, 30, 30], + "flickerDistance" : 0.2, + "flickerStrength" : 0.05, + "flickerTiming" : 4, + + "inventoryIcon" : "icon.png", + "orientations" : [ + { + "image" : "body.png:.on", + "imagePosition" : [0, 0], + "lightPosition" : [0, 0], + + "direction" : "left", + + "flipImages" : true, + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + }, + { + "image" : "body.png:.on", + "imagePosition" : [0, 0], + "lightPosition" : [0, 0], + + "direction" : "right", + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + } + ], + + "soundEffect" : "/sfx/objects/fluorescent_light_quiet.ogg", + "soundEffectRangeMultiplier" : 0.5, + + "animation" : "/objects/arcana_light_fullbright_animated.animation", + "animationCustom" : { + "animatedParts" : { + "stateTypes" : { + "light" : { + "states" : { + "on" : { + "frames" : 1, + "cycle" : 0.4, + "mode" : "loop" + } + } + } + } + }, + "sounds" : { + "on" : [ "/sfx/objects/tinywallswitch.ogg" ], + "off" : [ "/sfx/objects/tinywallswitch.ogg" ] + } + }, + "animationParts" : { + "bg" : "body.png", + "fg" : "fullbright.png" + }, + "animationPosition" : [0, 0], + + "scripts" : [ "/objects/wired/light/light.lua" ], + "scriptDelta" : 60, + + "interactive" : true, + + "inputNodes" : [ [0, 0] ] +} diff --git a/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/body.png b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/body.png new file mode 100644 index 000000000..5fcb673a5 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/body.png differ diff --git a/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/default.frames b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/default.frames new file mode 100644 index 000000000..016fe58eb --- /dev/null +++ b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/default.frames @@ -0,0 +1,18 @@ +{ + + "frameGrid" : { + "size" : [24, 16], + "dimensions" : [2, 1], + "names" : [ + [ + "default.1", + "default.off" + ] + ] + }, + + "aliases" : { + "default.default" : "default.off", + "default.on" : "default.1" + } +} diff --git a/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/fullbright.png b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/fullbright.png new file mode 100644 index 000000000..141d288f1 Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/fullbright.png differ diff --git a/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/icon.png b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/icon.png new file mode 100644 index 000000000..5a9c94c1d Binary files /dev/null and b/objects/arcana_exousia/arcana_exousia_tech/arcana_exousia_tech_wireddeco_5/icon.png differ diff --git a/tiles/materials/exousia/exousia_tile10.png b/tiles/materials/exousia/exousia_tile10.png index ef67d6a0f..256720f3d 100644 Binary files a/tiles/materials/exousia/exousia_tile10.png and b/tiles/materials/exousia/exousia_tile10.png differ diff --git a/tiles/materials/exousia/exousia_tile27.material b/tiles/materials/exousia/exousia_tile27.material new file mode 100644 index 000000000..c16508c26 --- /dev/null +++ b/tiles/materials/exousia/exousia_tile27.material @@ -0,0 +1,21 @@ +{ + "materialId" : 16887, + "materialName" : "exousia_tile27", + "particleColor" : [110, 110, 110, 255], + "itemDrop" : "exousia_tile27", + "description" : "A glass window.", + "shortdescription" : "Unlit Window", + "footstepSound" : "/sfx/blocks/footstep_composite.ogg", + "health" : 6, + "category" : "materials", + + "renderTemplate" : "/tiles/slopedmaterialtemplate.config", + "renderParameters" : { + "texture" : "exousia_tile27.png", + "variants" : 1, + "lightTransparent" : false, + "occludesBelow" : true, + "multiColored" : false, + "zLevel" : 1 + } +} diff --git a/tiles/materials/exousia/exousia_tile27.png b/tiles/materials/exousia/exousia_tile27.png new file mode 100644 index 000000000..919ef3ed1 Binary files /dev/null and b/tiles/materials/exousia/exousia_tile27.png differ diff --git a/tiles/materials/exousia/exousia_tile28.material b/tiles/materials/exousia/exousia_tile28.material new file mode 100644 index 000000000..5f5cb6532 --- /dev/null +++ b/tiles/materials/exousia/exousia_tile28.material @@ -0,0 +1,22 @@ +{ + "materialId" : 16888, + "materialName" : "exousia_tile28", + "particleColor" : [110, 110, 110, 255], + "itemDrop" : "exousia_tile28", + "description" : "A glass window.", + "shortdescription" : "Lit Window", + "footstepSound" : "/sfx/blocks/footstep_composite.ogg", + "health" : 6, + "category" : "materials", + + "renderTemplate" : "/tiles/slopedmaterialtemplate.config", + "renderParameters" : { + "texture" : "exousia_tile28.png", + "variants" : 1, + "lightTransparent" : false, + "occludesBelow" : true, + "multiColored" : false, + "zLevel" : 1, + "radiantLight" : [180, 180, 140] + } +} diff --git a/tiles/materials/exousia/exousia_tile28.png b/tiles/materials/exousia/exousia_tile28.png new file mode 100644 index 000000000..08a024f58 Binary files /dev/null and b/tiles/materials/exousia/exousia_tile28.png differ diff --git a/tiles/materials/exousia/exousia_tile9.png b/tiles/materials/exousia/exousia_tile9.png index 817da47fe..f8342208e 100644 Binary files a/tiles/materials/exousia/exousia_tile9.png and b/tiles/materials/exousia/exousia_tile9.png differ diff --git a/tiles/mods/arcana_mod_corrodiumOre.matmod b/tiles/mods/arcana_mod_corrodiumOre.matmod index b9b4dd3f3..c88ee57e8 100644 --- a/tiles/mods/arcana_mod_corrodiumOre.matmod +++ b/tiles/mods/arcana_mod_corrodiumOre.matmod @@ -16,6 +16,6 @@ "variants" : 8, "multiColored" : false, "zLevel" : 0, - "radiantLight" : [20, 70, 10] + "radiantLight" : [20, 110, 10] } } diff --git a/tiles/mods/arcana_mod_verrostinOre.matmod b/tiles/mods/arcana_mod_verrostinOre.matmod index 5c9363f9b..54209cae2 100644 --- a/tiles/mods/arcana_mod_verrostinOre.matmod +++ b/tiles/mods/arcana_mod_verrostinOre.matmod @@ -16,6 +16,6 @@ "variants" : 8, "multiColored" : false, "zLevel" : 0, - "radiantLight" : [40, 30, 10] + "radiantLight" : [80, 60, 10] } }