diff --git a/_FUversioning.config b/_FUversioning.config index a4f68c25fad..9ad4fe88752 100644 --- a/_FUversioning.config +++ b/_FUversioning.config @@ -30,6 +30,12 @@ * Energy Lobber - now deals electric instead of poison * corrected hellfireprojectile images to have correct frames file dimensions and image dimensions * the Crusader's Set is now properly marked as a Melee set rather than Ranged +* Shoji Lattice now has a proper ID +* Floran Needler and Spike Launcher have had recipe edits. +* Renamed some fungal decorative objects +* added pus and poison effects to blister gun/pistol explosion projectiles rather than just the liquid spawning +* added pus effect to ocucannon projectile hits +* adds new lilodon and lumoth variants ^cyan;6.4.4^reset; ------------------ diff --git a/items/generic/crafting/starbooze/applejuice.consumable b/items/generic/crafting/starbooze/applejuice.consumable index 576cdd2a01e..31e4fa9d87d 100644 --- a/items/generic/crafting/starbooze/applejuice.consumable +++ b/items/generic/crafting/starbooze/applejuice.consumable @@ -1,7 +1,7 @@ { "itemName" : "applejuice", "rarity" : "Common", - "price" : 115, + "price" : 64, "category" : "drink", "inventoryIcon" : "applejuice.png", "description" : "A sweet juice made from apples.\n^green;Heal ^white;50% ^green;HP ^gray;(^white;30s^gray;)^reset; \n^green;Type: Fruit^reset;", diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.monsterpart new file mode 100644 index 00000000000..1627d19623f --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth1", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth1.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.png new file mode 100644 index 00000000000..b0a6275038a Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth1.png differ diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.monsterpart new file mode 100644 index 00000000000..571f7719763 --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth2", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth2.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.png new file mode 100644 index 00000000000..5aeaca5cef5 Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth2.png differ diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.monsterpart new file mode 100644 index 00000000000..c3a1272d0eb --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth3", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth3.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.png new file mode 100644 index 00000000000..2fd3327b86c Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth3.png differ diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.monsterpart new file mode 100644 index 00000000000..0287ed9648e --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth4", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth4.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.png new file mode 100644 index 00000000000..7957f8d4dfd Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth4.png differ diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.monsterpart new file mode 100644 index 00000000000..67cd4baab8d --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth5", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth5.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.png new file mode 100644 index 00000000000..bb97e4d3352 Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth5.png differ diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.monsterpart b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.monsterpart new file mode 100644 index 00000000000..982f7df1558 --- /dev/null +++ b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lumoth6", + "category" : "lumoth", + "type" : "body", + + "frames" : { + "body" : "lumoth6.png" + } +} diff --git a/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.png b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.png new file mode 100644 index 00000000000..2e56c80292f Binary files /dev/null and b/monsters/ghosts/lumoth/pandorasboxaltcolors/lumoth6.png differ diff --git a/monsters/walkers/lilodon/body/lilodon1.monsterpart b/monsters/walkers/lilodon/body/lilodon1.monsterpart new file mode 100644 index 00000000000..d9ffc9df8cf --- /dev/null +++ b/monsters/walkers/lilodon/body/lilodon1.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lilodon1", + "category" : "lilodon", + "type" : "body", + + "frames" : { + "body" : "lilodon1.png" + } +} diff --git a/monsters/walkers/lilodon/body/lilodon1.png b/monsters/walkers/lilodon/body/lilodon1.png new file mode 100644 index 00000000000..20fd574c8c3 Binary files /dev/null and b/monsters/walkers/lilodon/body/lilodon1.png differ diff --git a/monsters/walkers/lilodon/body/lilodon2.monsterpart b/monsters/walkers/lilodon/body/lilodon2.monsterpart new file mode 100644 index 00000000000..f4b9f88a87d --- /dev/null +++ b/monsters/walkers/lilodon/body/lilodon2.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lilodon2", + "category" : "lilodon", + "type" : "body", + + "frames" : { + "body" : "lilodon2.png" + } +} diff --git a/monsters/walkers/lilodon/body/lilodon2.png b/monsters/walkers/lilodon/body/lilodon2.png new file mode 100644 index 00000000000..f18b0754965 Binary files /dev/null and b/monsters/walkers/lilodon/body/lilodon2.png differ diff --git a/monsters/walkers/lilodon/body/lilodon3.monsterpart b/monsters/walkers/lilodon/body/lilodon3.monsterpart new file mode 100644 index 00000000000..953e7aa2269 --- /dev/null +++ b/monsters/walkers/lilodon/body/lilodon3.monsterpart @@ -0,0 +1,9 @@ +{ + "name" : "lilodon3", + "category" : "lilodon", + "type" : "body", + + "frames" : { + "body" : "lilodon3.png" + } +} diff --git a/monsters/walkers/lilodon/body/lilodon3.png b/monsters/walkers/lilodon/body/lilodon3.png new file mode 100644 index 00000000000..34012b4b418 Binary files /dev/null and b/monsters/walkers/lilodon/body/lilodon3.png differ diff --git a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil1.png b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil1.png index ca6f7048a15..99ab9950980 100644 Binary files a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil1.png and b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil1.png differ diff --git a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil2.png b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil2.png index b68871818c7..55352379eab 100644 Binary files a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil2.png and b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil2.png differ diff --git a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil3.png b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil3.png index aeca78854b6..1dbdc0d0d63 100644 Binary files a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil3.png and b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil3.png differ diff --git a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil4.png b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil4.png index 2048710236e..6932c6b2b41 100644 Binary files a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil4.png and b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil4.png differ diff --git a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil5.png b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil5.png index 0e564575894..4e5b7410a43 100644 Binary files a/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil5.png and b/objects/fossils/largefossils/ancientpoptopfossil/ancientpoptopfossil5.png differ diff --git a/objects/fossils/largefossils/stegofossil/steggofossil5.png b/objects/fossils/largefossils/stegofossil/steggofossil5.png new file mode 100644 index 00000000000..3a8a77d8d0a Binary files /dev/null and b/objects/fossils/largefossils/stegofossil/steggofossil5.png differ diff --git a/objects/fossils/largefossils/stegofossil/stegofossil1.png b/objects/fossils/largefossils/stegofossil/stegofossil1.png index c5d912bd4bd..ee6bec5f306 100644 Binary files a/objects/fossils/largefossils/stegofossil/stegofossil1.png and b/objects/fossils/largefossils/stegofossil/stegofossil1.png differ diff --git a/objects/fossils/largefossils/stegofossil/stegofossil2.png b/objects/fossils/largefossils/stegofossil/stegofossil2.png index 315b77d807f..b2d8786abe6 100644 Binary files a/objects/fossils/largefossils/stegofossil/stegofossil2.png and b/objects/fossils/largefossils/stegofossil/stegofossil2.png differ diff --git a/objects/fossils/largefossils/stegofossil/stegofossil3.png b/objects/fossils/largefossils/stegofossil/stegofossil3.png index e99d1982dfe..f096dc919e8 100644 Binary files a/objects/fossils/largefossils/stegofossil/stegofossil3.png and b/objects/fossils/largefossils/stegofossil/stegofossil3.png differ diff --git a/objects/fossils/largefossils/stegofossil/stegofossil4.png b/objects/fossils/largefossils/stegofossil/stegofossil4.png index 0d1c5940664..783050874e1 100644 Binary files a/objects/fossils/largefossils/stegofossil/stegofossil4.png and b/objects/fossils/largefossils/stegofossil/stegofossil4.png differ diff --git a/objects/fossils/largefossils/stegofossil/stegofossil5.png b/objects/fossils/largefossils/stegofossil/stegofossil5.png deleted file mode 100644 index d87ca36ebd8..00000000000 Binary files a/objects/fossils/largefossils/stegofossil/stegofossil5.png and /dev/null differ diff --git a/recipes/cookingtable1/drinks/applejuice.recipe b/recipes/cookingtable1/drinks/applejuice.recipe index 89c08d3a13c..2c60bda9e27 100644 --- a/recipes/cookingtable1/drinks/applejuice.recipe +++ b/recipes/cookingtable1/drinks/applejuice.recipe @@ -1,6 +1,6 @@ { "input" : [ - { "item" : "redapple", "count" : 1 } + { "item" : "redapple", "count" : 6 } ], "output" : { "item" : "applejuice", "count" : 1 }, "groups" : [ "craftingfood", "drinks", "winepress" ]