diff --git a/dungeons/other/outpost/scienceoutpost.json b/dungeons/other/outpost/scienceoutpost.json index 09ff187ca08..1dc5fa2c166 100644 --- a/dungeons/other/outpost/scienceoutpost.json +++ b/dungeons/other/outpost/scienceoutpost.json @@ -223,7 +223,7 @@ "y":1040 }, { - "gid":5141, + "gid":2147488789, "height":40, "id":5264, "name":"", @@ -235,8 +235,8 @@ "type":"", "visible":true, "width":40, - "x":1576, - "y":920 + "x":1288, + "y":1032 }, { "gid":5132, @@ -382,22 +382,6 @@ "x":1720, "y":1032 }, - { - "gid":2147488353, - "height":16, - "id":5278, - "name":"", - "properties": - { - - }, - "rotation":0, - "type":"", - "visible":true, - "width":42, - "x":1480, - "y":920 - }, { "gid":2147487492, "height":40, @@ -1726,22 +1710,6 @@ "x":1856, "y":728 }, - { - "gid":2147485427, - "height":16, - "id":5378, - "name":"", - "properties": - { - - }, - "rotation":0, - "type":"", - "visible":true, - "width":40, - "x":1656, - "y":920 - }, { "gid":1751, "height":32, @@ -1934,22 +1902,6 @@ "x":1416, "y":1064 }, - { - "gid":5138, - "height":24, - "id":5391, - "name":"", - "properties": - { - - }, - "rotation":0, - "type":"", - "visible":true, - "width":24, - "x":1624, - "y":920 - }, { "gid":3703, "height":96, @@ -2046,22 +1998,6 @@ "x":1432, "y":904 }, - { - "gid":2147488730, - "height":15, - "id":5399, - "name":"", - "properties": - { - - }, - "rotation":0, - "type":"", - "visible":true, - "width":33, - "x":1656, - "y":904 - }, { "gid":1636, "height":56, @@ -2687,7 +2623,7 @@ "y":808 }, { - "gid":2147484014, + "gid":366, "height":40, "id":5443, "name":"", @@ -2699,7 +2635,7 @@ "type":"", "visible":true, "width":32, - "x":1272, + "x":1240, "y":1032 }, { @@ -2878,22 +2814,6 @@ "x":2840, "y":1032 }, - { - "gid":2147488895, - "height":16, - "id":5458, - "name":"", - "properties": - { - - }, - "rotation":0, - "type":"", - "visible":true, - "width":24, - "x":1488, - "y":904 - }, { "gid":3568, "height":8, @@ -3307,8 +3227,8 @@ "type":"", "visible":true, "width":32, - "x":1792, - "y":904 + "x":1584, + "y":896 }, { "gid":4917, @@ -4111,7 +4031,7 @@ "y":784 }, { - "gid":5483, + "gid":5485, "height":16, "id":5555, "name":"", @@ -4127,7 +4047,7 @@ "y":752 }, { - "gid":2147489131, + "gid":2147489133, "height":16, "id":5557, "name":"", @@ -4143,7 +4063,7 @@ "y":752 }, { - "gid":5483, + "gid":5485, "height":16, "id":5558, "name":"", @@ -4159,7 +4079,7 @@ "y":752 }, { - "gid":2147489131, + "gid":2147489133, "height":16, "id":5559, "name":"", @@ -4175,7 +4095,7 @@ "y":752 }, { - "gid":5483, + "gid":5485, "height":16, "id":5560, "name":"", @@ -4191,7 +4111,7 @@ "y":792 }, { - "gid":2147489131, + "gid":2147489133, "height":16, "id":5561, "name":"", @@ -4207,7 +4127,7 @@ "y":792 }, { - "gid":5483, + "gid":5485, "height":16, "id":5562, "name":"", @@ -4223,7 +4143,7 @@ "y":792 }, { - "gid":2147489131, + "gid":2147489133, "height":16, "id":5563, "name":"", @@ -4735,7 +4655,7 @@ "y":960 }, { - "gid":2147489347, + "gid":2147489349, "height":24, "id":5951, "name":"", @@ -4751,7 +4671,7 @@ "y":960 }, { - "gid":2147489348, + "gid":2147489350, "height":24, "id":5952, "name":"", @@ -5361,7 +5281,7 @@ { "gid":2147488901, "height":56, - "id":6084, + "id":6085, "name":"", "properties": { @@ -5371,13 +5291,13 @@ "type":"", "visible":true, "width":56, - "x":1224, - "y":1000 + "x":1200, + "y":920 }, { - "gid":2147488901, - "height":56, - "id":6085, + "gid":2147488882, + "height":46, + "id":6086, "name":"", "properties": { @@ -5386,14 +5306,30 @@ "rotation":0, "type":"", "visible":true, - "width":56, - "x":1208, + "width":88, + "x":1728, "y":920 }, { - "gid":2147488882, - "height":46, - "id":6086, + "gid":2147488947, + "height":34, + "id":6091, + "name":"", + "properties": + { + + }, + "rotation":0, + "type":"", + "visible":true, + "width":43, + "x":1472, + "y":920 + }, + { + "gid":2147488946, + "height":48, + "id":6093, "name":"", "properties": { @@ -5403,7 +5339,7 @@ "type":"", "visible":true, "width":88, - "x":1704, + "x":1632, "y":920 }], "opacity":1, @@ -6214,8 +6150,8 @@ "type":"", "visible":true, "width":8, - "x":1632, - "y":880 + "x":1592, + "y":896 }, { "height":8, @@ -6452,8 +6388,8 @@ "type":"", "visible":true, "width":8, - "x":1312, - "y":984 + "x":1368, + "y":992 }, { "height":8, @@ -6741,7 +6677,7 @@ "x":0, "y":0 }], - "nextobjectid":6088, + "nextobjectid":6094, "orientation":"orthogonal", "properties": { @@ -6855,19 +6791,19 @@ "source":"..\/..\/..\/tilesets\/frackinuniverse-custom\/fu_stations.json" }, { - "firstgid":5298, + "firstgid":5300, "source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-category\/wire.json" }, { - "firstgid":5483, + "firstgid":5485, "source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-colonytag\/ancient.json" }, { - "firstgid":5588, + "firstgid":5590, "source":"..\/..\/..\/tilesets\/frackinuniverse-custom\/fumaterials2.json" }, { - "firstgid":5683, + "firstgid":5685, "source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-colonytag\/outpost.json" }], "tilewidth":8, diff --git a/items/active/weapons/ranged/abilities/lunarishrapnelbomb/lunarishrapnelbomb.weaponability b/items/active/weapons/ranged/abilities/lunarishrapnelbomb/lunarishrapnelbomb.weaponability index e9d495b0625..e9928c0a55d 100644 --- a/items/active/weapons/ranged/abilities/lunarishrapnelbomb/lunarishrapnelbomb.weaponability +++ b/items/active/weapons/ranged/abilities/lunarishrapnelbomb/lunarishrapnelbomb.weaponability @@ -14,7 +14,7 @@ "projectileType" : "starburst", "projectileParameters" : { "speed" : 25 }, - "baseDamage" : 6, + "baseDamage" : 7, "energyUsage" : 40, "fireTime" : 2.0, diff --git a/items/active/weapons/ranged/unique/lunaririfle.activeitem b/items/active/weapons/ranged/unique/lunaririfle.activeitem index c76c57ee17d..386835cce42 100644 --- a/items/active/weapons/ranged/unique/lunaririfle.activeitem +++ b/items/active/weapons/ranged/unique/lunaririfle.activeitem @@ -30,17 +30,17 @@ "scripts" : ["/items/active/weapons/ranged/gun.lua"], - "elementalType" : "physical", + "elementalType" : "electric", "primaryAbility" : { "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], "class" : "GunFire", - "fireTime" : 0.36, + "fireTime" : 0.35, "baseDps" : 8, "energyUsage" : 24.7, - "inaccuracy" : 0.085, + "inaccuracy" : 0.035, - "projectileCount" : 4, + "projectileCount" : 2, "fireType" : "auto", "projectileType" : "lunarishot", diff --git a/items/armors/bees/fubeewings/fubeewings.back b/items/armors/bees/fubeewings/fubeewings.back index ea54923e7cd..ad7c1e28ce3 100644 --- a/items/armors/bees/fubeewings/fubeewings.back +++ b/items/armors/bees/fubeewings/fubeewings.back @@ -3,13 +3,13 @@ "inventoryIcon" : "icon.png", "dropCollision" : [-4.0, -3.0, 4.0, 3.0], "rarity" : "uncommon", - "description" : "A pair of giant bee wings.", + "description" : "A pair of giant bee wings. Increases air agility, reduces fall speed.", "shortdescription" : "Bee Wings", "maleFrames" : "back.png", "femaleFrames" : "back.png", "statusEffects" : [ - "runboost25", "jumpboost25", "nofalldamage" + "slowfall3" ] } \ No newline at end of file diff --git a/items/armors/ffwizardhat/ffwizardhat.head b/items/armors/ffwizardhat/ffwizardhat.head index 1733a4d3efe..d105571c802 100644 --- a/items/armors/ffwizardhat/ffwizardhat.head +++ b/items/armors/ffwizardhat/ffwizardhat.head @@ -4,7 +4,7 @@ "dropCollision" : [-4.0, -3.0, 4.0, 3.0], "maxStack" : 1, "rarity" : "legendary", - "description" : "Amazing energy production!", + "description" : "Amazing energy production! Also lowers your rate of descent during falls.", "shortdescription" : "Wizards Cap", "tooltipKind" : "armornew2", @@ -15,7 +15,8 @@ { "stat" : "maxEnergy", "amount" : 60 - } + }, + "slowfall" ] } diff --git a/objects/bees/honeycooking/honeytable.object b/objects/bees/honeycooking/honeytable.object index 37511ced9a2..952ddbd3f6a 100644 --- a/objects/bees/honeycooking/honeytable.object +++ b/objects/bees/honeycooking/honeytable.object @@ -1,12 +1,18 @@ { "objectName" : "honeytable", - "colonyTags" : [ "bees" ], + "colonyTags" : [ "bees", "cooking" ], "printable" : false, "rarity" : "rare", "interactAction" : "OpenCraftingInterface", "interactData" : { - "config" : "/interface/windowconfig/kitchen.config", - "filter" : [ "honeytable" ] + "config" : "/interface/windowconfig/craftingfood.config", + "filter" : [ "honeytable" ], + "paneLayoutOverride" : { + "windowtitle" : { + "title" : " Honey Cooking Table", + "subtitle" : " ^#b9b5b2;Prepare and cook honey!" + } + } }, "description" : "Cook honey based food on this!", "shortdescription" : "^orange;Honey Cooking Table^white;", diff --git a/objects/generic/medbaybed/medbaybed.png b/objects/generic/medbaybed/medbaybed.png index 0cb4ce7dca1..919a5fcfcae 100644 Binary files a/objects/generic/medbaybed/medbaybed.png and b/objects/generic/medbaybed/medbaybed.png differ diff --git a/objects/generic/medbaybed/medbaycover.png b/objects/generic/medbaybed/medbaycover.png index 919a5fcfcae..0cb4ce7dca1 100644 Binary files a/objects/generic/medbaybed/medbaycover.png and b/objects/generic/medbaybed/medbaycover.png differ diff --git a/objects/minibiome/elder/dungeondeco/elderblood1.object b/objects/minibiome/elder/dungeondeco/elderblood1.object index 86e15fdbfec..5c61bd0e51c 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood1.object +++ b/objects/minibiome/elder/dungeondeco/elderblood1.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood1.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood10.object b/objects/minibiome/elder/dungeondeco/elderblood10.object index a822e8a2fce..f42d485e7e9 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood10.object +++ b/objects/minibiome/elder/dungeondeco/elderblood10.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood10.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood2.object b/objects/minibiome/elder/dungeondeco/elderblood2.object index dbf81fc332c..97b967bd241 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood2.object +++ b/objects/minibiome/elder/dungeondeco/elderblood2.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood2.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood3.object b/objects/minibiome/elder/dungeondeco/elderblood3.object index 103491767c2..c4c370f905b 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood3.object +++ b/objects/minibiome/elder/dungeondeco/elderblood3.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood3.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood4.object b/objects/minibiome/elder/dungeondeco/elderblood4.object index 76e3fd6aa06..7830db5fd57 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood4.object +++ b/objects/minibiome/elder/dungeondeco/elderblood4.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood4.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood5.object b/objects/minibiome/elder/dungeondeco/elderblood5.object index 93d75721962..22c9a08e544 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood5.object +++ b/objects/minibiome/elder/dungeondeco/elderblood5.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood5.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood6.object b/objects/minibiome/elder/dungeondeco/elderblood6.object index 2545634b8f0..1820eb350a6 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood6.object +++ b/objects/minibiome/elder/dungeondeco/elderblood6.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood6.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood7.object b/objects/minibiome/elder/dungeondeco/elderblood7.object index 8a63edeb93c..ae0eb43f205 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood7.object +++ b/objects/minibiome/elder/dungeondeco/elderblood7.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood7.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood8.object b/objects/minibiome/elder/dungeondeco/elderblood8.object index 8b5c86d2cde..305faa02a07 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood8.object +++ b/objects/minibiome/elder/dungeondeco/elderblood8.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood8.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderblood9.object b/objects/minibiome/elder/dungeondeco/elderblood9.object index ac0fc36f429..ca8b105906b 100644 --- a/objects/minibiome/elder/dungeondeco/elderblood9.object +++ b/objects/minibiome/elder/dungeondeco/elderblood9.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderblood9.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderbloodychunks.object b/objects/minibiome/elder/dungeondeco/elderbloodychunks.object index de77ca1a88d..207f170fa0e 100644 --- a/objects/minibiome/elder/dungeondeco/elderbloodychunks.object +++ b/objects/minibiome/elder/dungeondeco/elderbloodychunks.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderbloodychunks.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderleggore.object b/objects/minibiome/elder/dungeondeco/elderleggore.object index 8a25b273e4f..93115f9568a 100644 --- a/objects/minibiome/elder/dungeondeco/elderleggore.object +++ b/objects/minibiome/elder/dungeondeco/elderleggore.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderleggore.png", "orientations" : [ { diff --git a/objects/minibiome/elder/dungeondeco/elderskullgore.object b/objects/minibiome/elder/dungeondeco/elderskullgore.object index cbd90f8a9a2..2c2bb41be9c 100644 --- a/objects/minibiome/elder/dungeondeco/elderskullgore.object +++ b/objects/minibiome/elder/dungeondeco/elderskullgore.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderskullgore.png", "orientations" : [ { diff --git a/objects/minibiome/elder/eldercarving1.object b/objects/minibiome/elder/eldercarving1.object index bc094ac64ca..eaaf36ccc6e 100644 --- a/objects/minibiome/elder/eldercarving1.object +++ b/objects/minibiome/elder/eldercarving1.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving1.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving1.png:", diff --git a/objects/minibiome/elder/eldercarving2.object b/objects/minibiome/elder/eldercarving2.object index 68c75638a43..52fe1b3ff53 100644 --- a/objects/minibiome/elder/eldercarving2.object +++ b/objects/minibiome/elder/eldercarving2.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving2.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving2.png:", diff --git a/objects/minibiome/elder/eldercarving3.object b/objects/minibiome/elder/eldercarving3.object index c4600d631bb..d9744270d4b 100644 --- a/objects/minibiome/elder/eldercarving3.object +++ b/objects/minibiome/elder/eldercarving3.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving3.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving3.png:", diff --git a/objects/minibiome/elder/eldercarving4.object b/objects/minibiome/elder/eldercarving4.object index 0ff8a581f98..80155ade17d 100644 --- a/objects/minibiome/elder/eldercarving4.object +++ b/objects/minibiome/elder/eldercarving4.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving4.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving4.png:", diff --git a/objects/minibiome/elder/eldercarving5.object b/objects/minibiome/elder/eldercarving5.object index f19fcb0851a..3e5a735fbb0 100644 --- a/objects/minibiome/elder/eldercarving5.object +++ b/objects/minibiome/elder/eldercarving5.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving5.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving5.png:", diff --git a/objects/minibiome/elder/eldercarving6.object b/objects/minibiome/elder/eldercarving6.object index b7fbb2ce5ae..039bbefede4 100644 --- a/objects/minibiome/elder/eldercarving6.object +++ b/objects/minibiome/elder/eldercarving6.object @@ -8,7 +8,7 @@ "description" : "Their age is beyond knowing.", "shortdescription" : "Ancient Carvings", "inventoryIcon" : "eldercarving6.png", - "health" : 575, + "health" : 20, "orientations" : [ { "image" : "eldercarving6.png:", diff --git a/objects/minibiome/elder/elderpillar1.object b/objects/minibiome/elder/elderpillar1.object index e3c8067e92b..58d5e791af6 100644 --- a/objects/minibiome/elder/elderpillar1.object +++ b/objects/minibiome/elder/elderpillar1.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 1500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderpillar1.png", "orientations" : [ { diff --git a/objects/minibiome/elder/elderpillar2.object b/objects/minibiome/elder/elderpillar2.object index d6c87fb9de3..9ac9e4cd144 100644 --- a/objects/minibiome/elder/elderpillar2.object +++ b/objects/minibiome/elder/elderpillar2.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 1500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderpillar2.png", "orientations" : [ { diff --git a/objects/minibiome/elder/elderpillar3.object b/objects/minibiome/elder/elderpillar3.object index 726884dfc26..76145bb71ef 100644 --- a/objects/minibiome/elder/elderpillar3.object +++ b/objects/minibiome/elder/elderpillar3.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 1500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderpillar3.png", "orientations" : [ { diff --git a/objects/minibiome/elder/elderstatue.object b/objects/minibiome/elder/elderstatue.object index b42c31bffda..008fd4ea4cb 100644 --- a/objects/minibiome/elder/elderstatue.object +++ b/objects/minibiome/elder/elderstatue.object @@ -8,7 +8,7 @@ "description" : "Even looking at this feels unclean...", "shortdescription" : "Cthulhu Statue", "inventoryIcon" : "elderstatue.png", - "health" : 500, + "health" : 20, "orientations" : [ { "image" : "elderstatue.png:", diff --git a/objects/minibiome/elder/elderthingstatue2.object b/objects/minibiome/elder/elderthingstatue2.object index f83051629c8..8ff69f55d75 100644 --- a/objects/minibiome/elder/elderthingstatue2.object +++ b/objects/minibiome/elder/elderthingstatue2.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 1500, - "health" : 500, + "health" : 20, "inventoryIcon" : "elderthingstatue2.png", "orientations" : [ { diff --git a/objects/minibiome/elder/tentaclestatue.object b/objects/minibiome/elder/tentaclestatue.object index 9e796354984..1f1be076f30 100644 --- a/objects/minibiome/elder/tentaclestatue.object +++ b/objects/minibiome/elder/tentaclestatue.object @@ -8,7 +8,7 @@ "race" : "generic", "category" : "furniture", "price" : 500, - "health" : 500, + "health" : 20, "inventoryIcon" : "tentaclestatue.png", "orientations" : [ { diff --git a/objects/minibiome/metallic/metallicceiling3.object b/objects/minibiome/metallic/metallicceiling3.object index 65bf09babb7..6ed86bd1b8a 100644 --- a/objects/minibiome/metallic/metallicceiling3.object +++ b/objects/minibiome/metallic/metallicceiling3.object @@ -8,7 +8,7 @@ "description" : "A small but efficient reactor.", "shortdescription" : "Reactor", "inventoryIcon" : "metallicceiling3.png", - "health" : 100, + "health" : 20, "orientations" : [ { "image" : "metallicceiling3.png:", diff --git a/objects/minibiome/metallic/metallicceiling4.object b/objects/minibiome/metallic/metallicceiling4.object index 61f98d34bd5..b7e51664761 100644 --- a/objects/minibiome/metallic/metallicceiling4.object +++ b/objects/minibiome/metallic/metallicceiling4.object @@ -8,7 +8,7 @@ "description" : "A precursor power junction. It's broken.", "shortdescription" : "Precursor Artifact", "inventoryIcon" : "metallicceiling4.png", - "health" : 60, + "health" : 20, "orientations" : [ { "image" : "metallicceiling4.png:", diff --git a/objects/minibiome/metallic/metallicmachine1.object b/objects/minibiome/metallic/metallicmachine1.object index 87051b6f74a..829723e0f2c 100644 --- a/objects/minibiome/metallic/metallicmachine1.object +++ b/objects/minibiome/metallic/metallicmachine1.object @@ -8,7 +8,7 @@ "description" : "A device that aids in transmissions.", "shortdescription" : "Signal Relay", "inventoryIcon" : "metallicmachine1.png", - "health" : 160, + "health" : 40, "orientations" : [ { "image" : "metallicmachine1.png:", diff --git a/objects/minibiome/metallic/metallicmachine2.object b/objects/minibiome/metallic/metallicmachine2.object index c3975b6f6ac..eed565dfe36 100644 --- a/objects/minibiome/metallic/metallicmachine2.object +++ b/objects/minibiome/metallic/metallicmachine2.object @@ -8,7 +8,7 @@ "description" : "This looks like an ancient fusion conduit.", "shortdescription" : "Fusion Conduit", "inventoryIcon" : "metallicmachine2.png", - "health" : 160, + "health" : 40, "orientations" : [ { "image" : "metallicmachine2.png:", diff --git a/objects/minibiome/metallic/metallicmachine3.object b/objects/minibiome/metallic/metallicmachine3.object index 8fac9c03571..fd292b80191 100644 --- a/objects/minibiome/metallic/metallicmachine3.object +++ b/objects/minibiome/metallic/metallicmachine3.object @@ -8,7 +8,7 @@ "description" : "A massive, barely functional data storage of unknown design.", "shortdescription" : "Data Storage", "inventoryIcon" : "metallicmachine3.png", - "health" : 70, + "health" : 40, "orientations" : [ { "image" : "metallicmachine3.png:", diff --git a/objects/minibiome/metallic/metallicmachine4.object b/objects/minibiome/metallic/metallicmachine4.object index a3ad868e9e2..0be93ad87b1 100644 --- a/objects/minibiome/metallic/metallicmachine4.object +++ b/objects/minibiome/metallic/metallicmachine4.object @@ -8,7 +8,7 @@ "description" : "A portion of a particle accelerator.", "shortdescription" : "Particle Accelerator", "inventoryIcon" : "metallicmachine4.png", - "health" : 360, + "health" : 80, "orientations" : [ { "image" : "metallicmachine4.png:", diff --git a/objects/minibiome/metallic/metallicmachine6.object b/objects/minibiome/metallic/metallicmachine6.object index a2d29062145..68f467c386d 100644 --- a/objects/minibiome/metallic/metallicmachine6.object +++ b/objects/minibiome/metallic/metallicmachine6.object @@ -8,7 +8,7 @@ "description" : "This looks like an ancient fusion conduit.", "shortdescription" : "Fusion Conduit", "inventoryIcon" : "metallicmachine6.png", - "health" : 160, + "health" : 80, "orientations" : [ { "image" : "metallicmachine6.png:", diff --git a/objects/minibiome/metallic/metallicmachine7.object b/objects/minibiome/metallic/metallicmachine7.object index 9f63b2baf37..cbe5d4e1b8f 100644 --- a/objects/minibiome/metallic/metallicmachine7.object +++ b/objects/minibiome/metallic/metallicmachine7.object @@ -8,7 +8,7 @@ "description" : "This looks like an ancient fusion conduit.", "shortdescription" : "Fusion Conduit", "inventoryIcon" : "metallicmachine7.png", - "health" : 160, + "health" : 80, "orientations" : [ { "image" : "metallicmachine7.png:", diff --git a/objects/minibiome/metallic/tech2.object b/objects/minibiome/metallic/tech2.object index 13a02cbefe1..66ebb683745 100644 --- a/objects/minibiome/metallic/tech2.object +++ b/objects/minibiome/metallic/tech2.object @@ -11,7 +11,7 @@ "shortdescription" : "^purple;Precursor Artifact^white;", "race" : "generic", "lightColor" : [135, 126, 50], - "health" : 3500, + "health" : 200, "inventoryIcon" : "tech2.png", "orientations" : [ diff --git a/objects/minibiome/metallic/tetrapod.object b/objects/minibiome/metallic/tetrapod.object index e79686b8bad..400ca041428 100644 --- a/objects/minibiome/metallic/tetrapod.object +++ b/objects/minibiome/metallic/tetrapod.object @@ -8,7 +8,7 @@ "description" : "What is inside of this?.", "shortdescription" : "Strange Pod", "inventoryIcon" : "tetrapod.png", - "health" : 360, + "health" : 30, "orientations" : [ { "image" : "tetrapod.png:", diff --git a/objects/minibiome/wasteland/mechruin.object b/objects/minibiome/wasteland/mechruin.object index 12368480aab..5fb028ef474 100644 --- a/objects/minibiome/wasteland/mechruin.object +++ b/objects/minibiome/wasteland/mechruin.object @@ -8,7 +8,7 @@ "description" : "This was once some sort of mobile weapons platform.", "shortdescription" : "Ruined Mech", "inventoryIcon" : "mechruin.png", - "health" : 1220, + "health" : 100, "orientations" : [ { "image" : "mechruin.png:", diff --git a/objects/minibiome/wasteland/populationsign.object b/objects/minibiome/wasteland/populationsign.object index 2dec3285b0e..4579783aac6 100644 --- a/objects/minibiome/wasteland/populationsign.object +++ b/objects/minibiome/wasteland/populationsign.object @@ -8,7 +8,7 @@ "description" : "I wonder what sort of people once lived here?", "shortdescription" : "Ruined Population Sign", "inventoryIcon" : "populationsign.png", - "health" : 10, + "health" : 5, "orientations" : [ { "image" : "populationsign.png:", diff --git a/objects/minibiome/wasteland/ruinslamppost.object b/objects/minibiome/wasteland/ruinslamppost.object index d850e026b76..f060dacb517 100644 --- a/objects/minibiome/wasteland/ruinslamppost.object +++ b/objects/minibiome/wasteland/ruinslamppost.object @@ -9,7 +9,7 @@ "shortdescription" : "Lamp Post", "lightColor" : [171, 177, 147], "inventoryIcon" : "ruinslamppost.png", - "health" : 40, + "health" : 12, "orientations" : [ { "image" : "ruinslamppost.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle1.object b/objects/minibiome/wasteland/ruinsvehicle1.object index e69c496972a..5ab39ec0b40 100644 --- a/objects/minibiome/wasteland/ruinsvehicle1.object +++ b/objects/minibiome/wasteland/ruinsvehicle1.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle1.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle1.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle2.object b/objects/minibiome/wasteland/ruinsvehicle2.object index ec09a141c32..5f051c82107 100644 --- a/objects/minibiome/wasteland/ruinsvehicle2.object +++ b/objects/minibiome/wasteland/ruinsvehicle2.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle2.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle2.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle2a.object b/objects/minibiome/wasteland/ruinsvehicle2a.object index a2367a06c4e..7f2b3da9048 100644 --- a/objects/minibiome/wasteland/ruinsvehicle2a.object +++ b/objects/minibiome/wasteland/ruinsvehicle2a.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle2a.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle2a.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle2b.object b/objects/minibiome/wasteland/ruinsvehicle2b.object index ede448856e7..0b5c28ad2dd 100644 --- a/objects/minibiome/wasteland/ruinsvehicle2b.object +++ b/objects/minibiome/wasteland/ruinsvehicle2b.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle2b.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle2b.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle3.object b/objects/minibiome/wasteland/ruinsvehicle3.object index 2a50387ccc9..aa63db5bfe6 100644 --- a/objects/minibiome/wasteland/ruinsvehicle3.object +++ b/objects/minibiome/wasteland/ruinsvehicle3.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle3.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle3.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle3a.object b/objects/minibiome/wasteland/ruinsvehicle3a.object index 52502682e93..ca22ca7af8a 100644 --- a/objects/minibiome/wasteland/ruinsvehicle3a.object +++ b/objects/minibiome/wasteland/ruinsvehicle3a.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle3a.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle3a.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle3b.object b/objects/minibiome/wasteland/ruinsvehicle3b.object index 9f77bb68553..c9f78c639f0 100644 --- a/objects/minibiome/wasteland/ruinsvehicle3b.object +++ b/objects/minibiome/wasteland/ruinsvehicle3b.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle3b.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle3b.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle3c.object b/objects/minibiome/wasteland/ruinsvehicle3c.object index 27ab4abdef3..71710082475 100644 --- a/objects/minibiome/wasteland/ruinsvehicle3c.object +++ b/objects/minibiome/wasteland/ruinsvehicle3c.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle3c.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle3c.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle4.object b/objects/minibiome/wasteland/ruinsvehicle4.object index d49f4ae891e..304e36b5b71 100644 --- a/objects/minibiome/wasteland/ruinsvehicle4.object +++ b/objects/minibiome/wasteland/ruinsvehicle4.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle4.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle4.png:", diff --git a/objects/minibiome/wasteland/ruinsvehicle5.object b/objects/minibiome/wasteland/ruinsvehicle5.object index cdbee59cc40..f4a8d8780fc 100644 --- a/objects/minibiome/wasteland/ruinsvehicle5.object +++ b/objects/minibiome/wasteland/ruinsvehicle5.object @@ -8,7 +8,7 @@ "description" : "A vehicle.", "shortdescription" : "Abandoned Vehicle", "inventoryIcon" : "ruinsvehicle5.png", - "health" : 200, + "health" : 50, "orientations" : [ { "image" : "ruinsvehicle5.png:", diff --git a/objects/scenery/monolith1.object b/objects/scenery/monolith1.object index bbc238b2660..e4ffc92c312 100644 --- a/objects/scenery/monolith1.object +++ b/objects/scenery/monolith1.object @@ -6,7 +6,7 @@ "printable" : false, "description" : "Who could have built this?", "shortdescription" : "Strange Monument", - "health" : 275, + "health" : 100, "inventoryIcon" : "monolith1.png", "orientations" : [ { diff --git a/objects/scenery/monolith2.object b/objects/scenery/monolith2.object index bb1959ee814..4d4c1de6533 100644 --- a/objects/scenery/monolith2.object +++ b/objects/scenery/monolith2.object @@ -8,7 +8,7 @@ "shortdescription" : "Strange Monument", "lightColor" : [171, 177, 39], "inventoryIcon" : "monolith2.png", - "health" : 275, + "health" : 100, "orientations" : [ { "image" : "monolith2.png:", diff --git a/objects/scenery/monolith3.object b/objects/scenery/monolith3.object index 613ae6cab07..854f26a1180 100644 --- a/objects/scenery/monolith3.object +++ b/objects/scenery/monolith3.object @@ -6,7 +6,7 @@ "printable" : false, "description" : "Who could have built this?", "shortdescription" : "Strange Monument", - "health" : 275, + "health" : 100, "inventoryIcon" : "monolith3.png", "orientations" : [ { diff --git a/objects/scenery/monolith4.object b/objects/scenery/monolith4.object index f4e5945c938..bdbd2cea8a8 100644 --- a/objects/scenery/monolith4.object +++ b/objects/scenery/monolith4.object @@ -8,7 +8,7 @@ "shortdescription" : "Strange Monument", "lightColor" : [171, 177, 39], "inventoryIcon" : "monolith4.png", - "health" : 275, + "health" : 100, "orientations" : [ { "image" : "monolith4.png:", diff --git a/objects/scenery/mound3.object b/objects/scenery/mound3.object index f1228105e6e..9ae0060df36 100644 --- a/objects/scenery/mound3.object +++ b/objects/scenery/mound3.object @@ -6,7 +6,7 @@ "printable" : false, "description" : "I should stick my @#$@ing hand in there!", "shortdescription" : "Insect Mound", - "health" : 500, + "health" : 100, "inventoryIcon" : "mound3.png", "orientations" : [ { diff --git a/objects/scenery/mound4.object b/objects/scenery/mound4.object index 717ba9518e1..a22cfd777cf 100644 --- a/objects/scenery/mound4.object +++ b/objects/scenery/mound4.object @@ -6,7 +6,7 @@ "printable" : false, "description" : "I should stick my @#$@ing hand in there!", "shortdescription" : "Insect Mound", - "health" : 500, + "health" : 100, "inventoryIcon" : "mound4.png", "orientations" : [ { diff --git a/objects/scenery/plynth1.object b/objects/scenery/plynth1.object index 357076fda1f..ccbd474f98d 100644 --- a/objects/scenery/plynth1.object +++ b/objects/scenery/plynth1.object @@ -6,7 +6,7 @@ "printable" : false, "description" : "Who, or what, made this?", "shortdescription" : "Monolith", - "health" : 340, + "health" : 100, "inventoryIcon" : "plynth1.png", "orientations" : [ { diff --git a/objects/scenery/plynth2.object b/objects/scenery/plynth2.object index b0fa955ee66..f0371b5ddb0 100644 --- a/objects/scenery/plynth2.object +++ b/objects/scenery/plynth2.object @@ -7,7 +7,7 @@ "description" : "Yep. That's creepy.", "shortdescription" : "Glowing Monolith", "lightColor" : [200, 25, 25], - "health" : 346, + "health" : 100, "inventoryIcon" : "plynth2.png", "orientations" : [ { diff --git a/projectiles/explosions/densiniumboom/densiniumboom.projectile b/projectiles/explosions/densiniumboom/densiniumboom.projectile index 34cb53f1035..2c88d234b90 100644 --- a/projectiles/explosions/densiniumboom/densiniumboom.projectile +++ b/projectiles/explosions/densiniumboom/densiniumboom.projectile @@ -12,6 +12,6 @@ "pointLight" : true, "lightColor" : [0,0,155], "universalDamage" : true, - "damageKind" : "default", + "damageKind" : "electric", "statusEffects" : [] } diff --git a/projectiles/guns/densiniumrifleshot/densiniumrifleshot.projectile b/projectiles/guns/densiniumrifleshot/densiniumrifleshot.projectile index 7b3ab1ba866..446e87316e1 100644 --- a/projectiles/guns/densiniumrifleshot/densiniumrifleshot.projectile +++ b/projectiles/guns/densiniumrifleshot/densiniumrifleshot.projectile @@ -12,7 +12,7 @@ "animationLoops" : false, "power" : 0, "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], - "piercing" : true, + "piercing" : false, "supportsProcessing" : true, "actionOnReap" : [ { @@ -20,6 +20,6 @@ "file" : "/projectiles/explosions/densiniumboom/densiniumboom.config" } ], - "damageKind" : "plasma", + "damageKind" : "electric", "emitters" : [ "iceplasma" ] } diff --git a/projectiles/guns/starburst/starburst.projectile b/projectiles/guns/starburst/starburst.projectile index bf72ccad179..710d5c04d28 100644 --- a/projectiles/guns/starburst/starburst.projectile +++ b/projectiles/guns/starburst/starburst.projectile @@ -11,7 +11,7 @@ "bounces" : 0, "lightColor" : [155, 147, 27], "piercing" : false, - "damageKind" : "ice", + "damageKind" : "electric", "periodicActions" : [ { "time" : 0.1, diff --git a/recipes/starter/applehoneystraw.recipe b/recipes/bees/applehoneystraw.recipe similarity index 74% rename from recipes/starter/applehoneystraw.recipe rename to recipes/bees/applehoneystraw.recipe index 860530b3852..f4cfe6fa478 100644 --- a/recipes/starter/applehoneystraw.recipe +++ b/recipes/bees/applehoneystraw.recipe @@ -6,5 +6,5 @@ "item" : "applehoneystraw", "count" : 5 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "snacks" ] } diff --git a/recipes/starter/grapehoneystraw.recipe b/recipes/bees/grapehoneystraw.recipe similarity index 74% rename from recipes/starter/grapehoneystraw.recipe rename to recipes/bees/grapehoneystraw.recipe index 9882641d48b..6234d452e19 100644 --- a/recipes/starter/grapehoneystraw.recipe +++ b/recipes/bees/grapehoneystraw.recipe @@ -6,5 +6,5 @@ "item" : "grapehoneystraw", "count" : 5 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "snacks" ] } diff --git a/recipes/starter/kitchen/honeybread.recipe b/recipes/bees/honeybread.recipe similarity index 69% rename from recipes/starter/kitchen/honeybread.recipe rename to recipes/bees/honeybread.recipe index 95da0ead778..89717b22138 100644 --- a/recipes/starter/kitchen/honeybread.recipe +++ b/recipes/bees/honeybread.recipe @@ -6,5 +6,5 @@ "item" : "honeybread", "count" : 3 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "mains" ] } diff --git a/recipes/starter/kitchen/honeyham.recipe b/recipes/bees/honeyham.recipe similarity index 70% rename from recipes/starter/kitchen/honeyham.recipe rename to recipes/bees/honeyham.recipe index e5dbef1545c..04b444768c4 100644 --- a/recipes/starter/kitchen/honeyham.recipe +++ b/recipes/bees/honeyham.recipe @@ -6,5 +6,5 @@ "item" : "honeyham", "count" : 1 }, - "groups" : [ "mod", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "mains" ] } diff --git a/recipes/starter/kitchen/honeynutboltos.recipe b/recipes/bees/honeynutboltos.recipe similarity index 70% rename from recipes/starter/kitchen/honeynutboltos.recipe rename to recipes/bees/honeynutboltos.recipe index a13a7effa31..7ed2c4c3079 100644 --- a/recipes/starter/kitchen/honeynutboltos.recipe +++ b/recipes/bees/honeynutboltos.recipe @@ -6,5 +6,5 @@ "item" : "honeynutboltos", "count" : 6 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "mains" ] } diff --git a/recipes/starter/honeystraw.recipe b/recipes/bees/honeystraw.recipe similarity index 70% rename from recipes/starter/honeystraw.recipe rename to recipes/bees/honeystraw.recipe index c8479cfe053..90340aef486 100644 --- a/recipes/starter/honeystraw.recipe +++ b/recipes/bees/honeystraw.recipe @@ -6,5 +6,5 @@ "item" : "honeystraw", "count" : 5 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "snacks" ] } diff --git a/recipes/starter/neonhoneystraw.recipe b/recipes/bees/neonhoneystraw.recipe similarity index 74% rename from recipes/starter/neonhoneystraw.recipe rename to recipes/bees/neonhoneystraw.recipe index 3a4fdf6e253..2ddfeee690b 100644 --- a/recipes/starter/neonhoneystraw.recipe +++ b/recipes/bees/neonhoneystraw.recipe @@ -6,5 +6,5 @@ "item" : "neonhoneystraw", "count" : 5 }, - "groups" : [ "kitchen", "honeytable", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "snacks" ] } diff --git a/recipes/starter/orangehoneystraw.recipe b/recipes/bees/orangehoneystraw.recipe similarity index 74% rename from recipes/starter/orangehoneystraw.recipe rename to recipes/bees/orangehoneystraw.recipe index 9eed1ec67ea..08107b71301 100644 --- a/recipes/starter/orangehoneystraw.recipe +++ b/recipes/bees/orangehoneystraw.recipe @@ -6,5 +6,5 @@ "item" : "orangehoneystraw", "count" : 5 }, - "groups" : [ "honeytable", "kitchen", "consumables", "foodhealing" ] + "groups" : [ "craftingfood", "honeytable", "snacks" ] } diff --git a/recipes/starter/sciencebrochure.recipe b/recipes/sciencebrochure.recipe similarity index 100% rename from recipes/starter/sciencebrochure.recipe rename to recipes/sciencebrochure.recipe diff --git a/stats/effects/slowfall/slowfall.lua b/stats/effects/slowfall/slowfall.lua new file mode 100644 index 00000000000..0c72c645bbc --- /dev/null +++ b/stats/effects/slowfall/slowfall.lua @@ -0,0 +1,26 @@ +function init() + effect.addStatModifierGroup({{stat = "fallDamageMultiplier", baseMultiplier = 0.10}}) + self.movementParams = mcontroller.baseParameters() + local bounds = mcontroller.boundBox() + self.liquidMovementParameter = { + airJumpProfile = { + jumpSpeed = 30 + } + } + script.setUpdateDelta(5) + +end + +function update(dt) +mcontroller.controlParameters(self.liquidMovementParameter) + if mcontroller.falling() then + mcontroller.controlParameters(config.getParameter("fallingParameters")) + mcontroller.setYVelocity(math.max(mcontroller.yVelocity(), config.getParameter("maxFallSpeed"))) + end +end + +function uninit() + +end + + diff --git a/stats/effects/slowfall/slowfall.statuseffect b/stats/effects/slowfall/slowfall.statuseffect new file mode 100644 index 00000000000..0cd6a2e86a5 --- /dev/null +++ b/stats/effects/slowfall/slowfall.statuseffect @@ -0,0 +1,19 @@ +{ + "name" : "slowfall", + "effectConfig" : { + + "fallingParameters" : { + "airForce" : 30, + "runSpeed" : 14, + "walkSpeed" : 14 + }, + "maxFallSpeed" : -39 + + }, + "defaultDuration" : 3, + + "scripts" : [ + "slowfall.lua" + ] + +} diff --git a/stats/effects/slowfall/slowfall2.statuseffect b/stats/effects/slowfall/slowfall2.statuseffect new file mode 100644 index 00000000000..ad0617d4861 --- /dev/null +++ b/stats/effects/slowfall/slowfall2.statuseffect @@ -0,0 +1,19 @@ +{ + "name" : "slowfall2", + "effectConfig" : { + + "fallingParameters" : { + "airForce" : 30, + "runSpeed" : 18, + "walkSpeed" : 18 + }, + "maxFallSpeed" : -32 + + }, + "defaultDuration" : 3, + + "scripts" : [ + "slowfall.lua" + ] + +} diff --git a/stats/effects/slowfall/slowfall3.statuseffect b/stats/effects/slowfall/slowfall3.statuseffect new file mode 100644 index 00000000000..6e52dddfdcd --- /dev/null +++ b/stats/effects/slowfall/slowfall3.statuseffect @@ -0,0 +1,19 @@ +{ + "name" : "slowfall3", + "effectConfig" : { + + "fallingParameters" : { + "airForce" : 60, + "runSpeed" : 24, + "walkSpeed" : 24 + }, + "maxFallSpeed" : -32 + + }, + "defaultDuration" : 3, + + "scripts" : [ + "slowfall.lua" + ] + +} diff --git a/tiles/materials/honey/fu_honeycombblock.matitem b/tiles/materials/honey/fu_honeycombblock.matitem index e3f90a3da13..611057835a4 100644 --- a/tiles/materials/honey/fu_honeycombblock.matitem +++ b/tiles/materials/honey/fu_honeycombblock.matitem @@ -6,8 +6,14 @@ "shortdescription" : "Honeycomb Block", "description" : "A block of honeycomb.", "materialId" : 6517, -"learnBlueprintsOnPickup" : [ "honeyham", "fubeekeeperhead", "honeyplatform", "goldenplank", "honeystonebrick", "honeybread" , -"fuhoneycombchest", +"learnBlueprintsOnPickup" : [ +"honeyham", +"fubeekeeperhead", +"honeyplatform", +"goldenplank", +"honeystonebrick", +"honeybread" , +"fucombchest", "fuhoneycombchair", "fuhoneycombchair", "fuhoneycomblight", diff --git a/tiles/materials/tilesandgreebles/hitechmetalblock.material b/tiles/materials/tilesandgreebles/hitechmetalblock.material index 95dae758d49..5dda726d7d3 100644 --- a/tiles/materials/tilesandgreebles/hitechmetalblock.material +++ b/tiles/materials/tilesandgreebles/hitechmetalblock.material @@ -5,7 +5,7 @@ "itemDrop" : "hitechmetalblock", "description" : "Advanced metals form a fantastic building alloy.", "shortdescription" : "Hi-Tech Block", - "health" : 64, + "health" : 12, "category": "materials", "renderTemplate" : "/tiles/classicmaterialtemplate.config", diff --git a/tiles/materials/tilesandgreebles/labbeam.material b/tiles/materials/tilesandgreebles/labbeam.material index 9f5dce863a9..10ecbb77d74 100644 --- a/tiles/materials/tilesandgreebles/labbeam.material +++ b/tiles/materials/tilesandgreebles/labbeam.material @@ -5,7 +5,7 @@ "itemDrop" : "labbeam", "description" : "Advanced metals form a fantastic building alloy.", "shortdescription" : "Plasteel Beam", - "health" : 20, + "health" : 12, "category": "materials", "renderTemplate" : "/tiles/classicmaterialtemplate.config", diff --git a/tiles/materials/tilesandgreebles/veinblock.material b/tiles/materials/tilesandgreebles/veinblock.material index 6d981f9e8c4..bec59415c16 100644 --- a/tiles/materials/tilesandgreebles/veinblock.material +++ b/tiles/materials/tilesandgreebles/veinblock.material @@ -6,7 +6,7 @@ "description" : "Strange veins course through this stone.", "shortdescription" : "Bloodvein Block", "footstepSound" : "/sfx/blocks/footstep_composite.ogg", - "health" : 24, + "health" : 12, "category": "materials", "renderTemplate" : "/tiles/classicmaterialtemplate.config", diff --git a/tilesets/frackinuniverse-custom/fu_stations.json b/tilesets/frackinuniverse-custom/fu_stations.json index 6a699188d1d..a592392d95f 100644 --- a/tilesets/frackinuniverse-custom/fu_stations.json +++ b/tilesets/frackinuniverse-custom/fu_stations.json @@ -3,7 +3,7 @@ "properties": {}, "spacing":0, - "tilecount":64, + "tilecount":66, "tileheight":279, "tileproperties" : { "0" : { @@ -325,6 +325,16 @@ "object" : "guidestorage", "imagePositionX" : "-16", "imagePositionY" : "0" + }, + "64" : { + "object" : "powerstation", + "imagePositionX" : "0", + "imagePositionY" : "0" + }, + "65" : { + "object" : "fissionfurnacenew", + "imagePositionX" : "0", + "imagePositionY" : "0" } }, @@ -585,6 +595,14 @@ "63": { "image":"./../../../../tiled/frackinuniverse-custom/objects/stations/guidestorage.png" + }, + "64": + { + "image":"./../../../../tiled/frackinuniverse-custom/objects/stations/powerstation.png" + }, + "65": + { + "image":"./../../../../tiled/frackinuniverse-custom/objects/stations/fissionfurnacenew.png" } }, "tilewidth":285 diff --git a/weather/gasgiantstorm.weather b/weather/gasgiantstorm.weather index 3146229697a..8068b5950b9 100644 --- a/weather/gasgiantstorm.weather +++ b/weather/gasgiantstorm.weather @@ -56,7 +56,19 @@ } } ], - "projectiles" : [ ], + "projectiles" : [ + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 + } + ], "duration" : [120, 1220], "maximumWind" : 92.0, diff --git a/weather/gasgiantstorm2.weather b/weather/gasgiantstorm2.weather index 299e88388b1..091e51c16d7 100644 --- a/weather/gasgiantstorm2.weather +++ b/weather/gasgiantstorm2.weather @@ -56,7 +56,19 @@ } } ], - "projectiles" : [ ], + "projectiles" : [ + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 + } + ], "duration" : [120, 1220], "maximumWind" : 92.0, diff --git a/weather/gasgiantstorm3.weather b/weather/gasgiantstorm3.weather index 35924d662e9..6d342fd71ed 100644 --- a/weather/gasgiantstorm3.weather +++ b/weather/gasgiantstorm3.weather @@ -56,7 +56,19 @@ } } ], - "projectiles" : [ ], + "projectiles" : [ + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 + } + ], "duration" : [120, 1220], "maximumWind" : 92.0, diff --git a/weather/hurricane.weather b/weather/hurricane.weather index 067ad0c3c9f..86eb4298168 100644 --- a/weather/hurricane.weather +++ b/weather/hurricane.weather @@ -179,6 +179,17 @@ "spawnAboveRegion" : 15, "spawnHorizontalPad" : 30, "windAffectAmount" : 1.0 + }, + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 } ], diff --git a/weather/sulphurstorm.weather b/weather/sulphurstorm.weather index 0f3ab2b09a7..2706f2aabfa 100644 --- a/weather/sulphurstorm.weather +++ b/weather/sulphurstorm.weather @@ -111,6 +111,17 @@ "spawnAboveRegion" : 20, "spawnHorizontalPad" : 120, "windAffectAmount" : 1.0 + }, + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 } ], diff --git a/weather/sulphurstormlesser.weather b/weather/sulphurstormlesser.weather index 474d164c8c6..ef48246d0a9 100644 --- a/weather/sulphurstormlesser.weather +++ b/weather/sulphurstormlesser.weather @@ -100,6 +100,17 @@ "spawnAboveRegion" : 20, "spawnHorizontalPad" : 100, "windAffectAmount" : 1.0 + }, + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 } ], diff --git a/weather/sulphurstormsevere.weather b/weather/sulphurstormsevere.weather index 11411e26beb..6c97a42a7a0 100644 --- a/weather/sulphurstormsevere.weather +++ b/weather/sulphurstormsevere.weather @@ -111,6 +111,17 @@ "spawnAboveRegion" : 20, "spawnHorizontalPad" : 120, "windAffectAmount" : 1.0 + }, + { + "projectile" : "sandstormslow", + "parameters" : { + "power" : 0 + }, + "velocity" : [0, -100], + "ratePerX" : 0.1, + "spawnAboveRegion" : 30, + "spawnHorizontalPad" : 10, + "windAffectAmount" : 1 } ],