Merge remote-tracking branch 'upstream/master'

sayterdarkwynd · Oct 19, 2023 · 043c791 · 043c791
2 parents 52d4a86 + 49fe41f
commit 043c791
Show file tree

Hide file tree

Showing 58 changed files with 1,794 additions and 8,665 deletions.
diff --git a/.metadata b/.metadata
@@ -8,5 +8,5 @@
   "requires" : [],
   "steamContentId" : "729480149",
   "tags" : "Crafting and Building|Miscellaneous|Planets and Environments|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|Species|User Interface|Furniture and Objects|Food and Farming|Mechanics|Vehicles and Mounts|Armor and Clothes",
-  "version" : "6.3.7"
+  "version" : "6.3.8"
 }
diff --git a/_FUversioning.config b/_FUversioning.config
@@ -1,9 +1,15 @@
 {
-"version" : "Version 6.3.7",
+"version" : "Version 6.3.8",
 "changelog" : "
 
 ^orange;Official Wiki^reset;: frackinuniverse.miraheze.org^reset;
 
+^cyan;6.3.8^reset;
+------------------
+* Devils Bargain now properly applies Cosmic and Shadow resistance
+* Cold penalty of Pharitu displays as red, not green, in the character creation menu.
+* Changed value on several resources and items to balance pixel gain
+
 ^cyan;6.3.8^reset;
 ------------------
 * erchius converter now outputs production state to wire node
@@ -15,6 +21,16 @@
 * Fixed incorrect/confusing description of Lightning Quiver (it improves Draw Speed by +250%)
 * adds Sloped variants of Copper and Silver Panel tiles.
 * Ghost-Spore and Telk Death-Stick now give +30/+20 Energy (was: +12)
+* genesiberry tooltip fix - drain rate is -40%, not -20%
+* Necrontir Armour is now dropped as a single schematic, rather than three.
+* Removed item value from some missed tiles.
+* Sulphuric Dirt can now be tilled.
+* Fixed the description of Banana Pudding.
+* Changed the name of Precursor robot monsters.
+* Updated the generator tutorial codex.
+* Fixed some stray pixels in the Huge Fossil Display.
+* Updated the spaces occupied by the Hydraulic Dynamo.
+* Added error messages to the Protocite Scanner for Droden.
 
 ^cyan;6.3.7^reset;
 ------------------

diff --git a/codex/documents/ffguidepower.codex b/codex/documents/ffguidepower.codex
@@ -40,14 +40,15 @@ It is always beneficial to use a battery in any power setup, no matter how small
   ^#B7E3E5;Small Fusion Reactors^reset;
   ^cyan;Large Fusion Reactors^reset;
 
-
+",
+"
    ^blue;------------------------^reset;
    ^green;Renewable Power^reset;
    ^blue;------------------------^reset;
 
 Green energy. Low-powered, situational, inconsistent but completely free to operate, renewable energy is suitable for low-power setups or where power is needed infrequently enough that it can be left to build up in a battery for later use.
 
-If intending to explore renewable energy sources it's recommended to craft the Weather Beacon, researched in the initial node of the ^orange;Electronics tree^reset;. It can be used to determine the power that renewable energy sources would output at that location, to determine whether a planet is suitable for renewable energy.
+If intending to explore renewable energy sources it's recommended to craft the Weather Beacon, researched in the initial node of the ^orange;Electronics tree^reset;. It can be used to determine the power output of renewable energy sources placed at that location, to determine the suitability of the planet.
 
 
 ^#F9F193;Solar Panels^reset;
@@ -66,11 +67,12 @@ Nocturn Panels are the product of ^orange;maddened research^reset;, and function
 
 ^#BBE5E8;Wind Turbines^reset;
 
-Wind Turbines come in one variety, which can produce up to ^#BBE5E8;12W^reset; in ideal conditions. The amount of power produced depends on how windy the current weather is, and the weathers available depend on the planet and how it generates. Some planets have eternally windy weather and will produce a constant ^#BBE5E8;12W^reset; of power, while some will never produce any power at all, and others will vary. Experimentation and the Weather Beacon will help identify the best planets to use Wind Turbines on.
+Wind Turbines come in one variety, which can produce up to ^#BBE5E8;12W^reset; in ideal conditions. The amount of power produced depends on how windy the current weather is, and the types of weather available depend on the planet. Some planet types have eternally windy weather and will produce a constant ^#BBE5E8;12W^reset; of power, while some will never produce any power at all, and others will vary. Experimentation and the Weather Beacon will help identify the best planets for wind power.
 
 Wind Turbines do not function on ships, space stations, and in asteroid belts.
 
-
+",
+"
    ^blue;------------------------^reset;
    ^#FF612F;Fuel-Based Generators^reset;
    ^blue;------------------------^reset;
@@ -84,7 +86,7 @@ When a fuel-based generator is turned off, by supplying an 'off' signal to its f
 
 ^#BA893F;Alternator Generators^reset;
 
-The first generator a player will gain access to. The Alternator Generator can only consume wood and coal, though these materials are abundant on Lush and Forest worlds and so it is trivial to fuel. The Alternator Generator will only produce ^#BA893F;4W^reset; at full heat (reached after 18s), and so it should be quickly replaced by the ^gray;Combustion Generator^reset; or another power source.
+The first generator a player will gain access to. The Alternator Generator can only consume wood and coal, though these materials are abundant on most worlds. The Alternator Generator will only produce ^#BA893F;4W^reset; at full heat (reached after 18s), and so it should be quickly replaced by the ^gray;Combustion Generator^reset; or another power source.
 
 Accepted fuels (burn time):
 ----------
@@ -93,7 +95,7 @@ Wooden Log (10s), Coal (16s), Golden Wood (20s), Redwood Bark (20s), Penumbral B
 
 ^gray;Combustion Generator^reset;
 
-A serious power source for a growing industrialist, the Combustion Generator accepts the greatest variety of fuels of any generator in the game and can produce a respectable amount of power from both solid and liquid fuels, including wood, erchius and fuel canisters. The Combustion Generator produces ^gray;12W^reset; of power at full heat (reached after 18s).
+A serious power source for a growing industrialist, the Combustion Generator accepts the greatest variety of fuels of any generator and can produce a respectable amount of power from both solid and liquid fuels, including wood, erchius and fuel canisters. The Combustion Generator produces ^gray;12W^reset; of power at full heat (reached after 18s).
 
 Accepted fuels (burn time):
 ----------
@@ -126,7 +128,8 @@ Accepted fuels (power, burn time):
 ----------
 Poop (135W, 40s), Crunchy Chick (195W, 100s), Essentia Obscura (315W, 220s), Quantum Fluid (515W, 420s), Ultronium Rod (745W, 650s), Dimensional Cell (1055W, 960s)
 
-
+",
+"
    ^blue;------------------------^reset;
    ^yellow;Decay-Based Generators^reset;
    ^blue;------------------------^reset;

diff --git a/items/active/randomblueprint/necrontirblueprint.activeitem b/items/active/randomblueprint/necrontirblueprint.activeitem
@@ -0,0 +1,24 @@
+{
+  "itemName" : "necrontirblueprint",
+  "price" : 7683,
+  "rarity" : "legendary",
+  "description" : "The knowledge to create malign, shadowy armour.",
+  "shortdescription" : "Necrontir Schematics",
+  "tooltipKind" : "base",
+  "category" : "Blueprint",
+  "twoHanded" : true,
+  "maxStack" : 1,
+
+  "inventoryIcon" : "necrontirblueprint.png",
+
+  "animation" : "randomblueprint.animation",
+
+  "scripts" : ["furacialblueprint.lua"],
+  "failMessage" : "These secrets are already known to you.",
+
+  "swingTime" : 0.15,
+
+  "recipes" : [
+    "fubonearmor3head", "fubonearmor3chest", "fubonearmor3legs"
+  ]
+}
diff --git a/items/active/randomblueprint/necrontirblueprint.png b/items/active/randomblueprint/necrontirblueprint.png
diff --git a/items/active/weapons/bow/hellfirebow/hellfirebow.activeitem b/items/active/weapons/bow/hellfirebow/hellfirebow.activeitem
@@ -47,25 +47,23 @@
   "scripts" : ["/items/active/weapons/bow/bow.lua"],
 
   "elementalType" : "hellfire",
-  //"collectablesOnPickup" : { "fu_weaponbow" : "hellfirebow" },
+
   "primaryAbilityType" : "rngbows_enhancedbowshot",
   "primaryAbility" : {
     "drawTime" : 0.75,        //Time to fully draw the bow
-  "powerProjectileTime" : 0.30,  //After fully drawing, the bow is super-charged for this long
-  "dynamicDamageMultiplier" : 1.0,  //All damage is multiplied by this value. Useful for modifying damage using alt ability special arrows
-  "energyPerShot" : 55,
-  "holdEnergyUsage" : 12,
-  "airborneBonus" : 1.12,
+    "powerProjectileTime" : 0.30,  //After fully drawing, the bow is super-charged for this long
+    "dynamicDamageMultiplier" : 1.0,  //All damage is multiplied by this value. Useful for modifying damage using alt ability special arrows
+    "energyPerShot" : 55,
+    "holdEnergyUsage" : 12,
+    "airborneBonus" : 1.12,
     "projectileType" : "flamearrow",
     "powerProjectileType" : "hellfirearrow",
     "projectileParameters" : {
       "power" : 6.25,
-      "piercing" : false
-    },
+      "piercing" : false},
     "powerProjectileParameters" : {
       "power" : 7.65,
-      "piercing" : false
-    }
+      "piercing" : false}
   },
 
   "altAbilityType" : "rngbows_enhancedbowshot",

diff --git a/items/active/weapons/melee/dagger/zerchesiumknife.activeitem b/items/active/weapons/melee/dagger/zerchesiumknife.activeitem
@@ -1,6 +1,6 @@
 {
   "itemName" : "zerchesiumdagger",
-  "price" : 640,
+  "price" : 240,
   "maxStack" : 1,
   "level" : 3,
   "rarity" : "uncommon",

diff --git a/items/active/weapons/melee/hammer/fucarbonhammer.activeitem b/items/active/weapons/melee/hammer/fucarbonhammer.activeitem
@@ -1,6 +1,6 @@
 {
   "itemName" : "fucarbonhammer",
-  "price" : 900,
+  "price" : 400,
   "maxStack" : 1,
   "rarity" : "uncommon",
   "description" : "A heavy, reliable carbon hammer.",

diff --git a/items/active/weapons/melee/katana/carbonkatana.activeitem b/items/active/weapons/melee/katana/carbonkatana.activeitem
@@ -1,6 +1,6 @@
 {
   "itemName" : "carbonkatana",
-  "price" : 800,
+  "price" : 400,
   "level" : 3,
   "maxStack" : 1,
   "rarity" : "uncommon",

diff --git a/items/active/weapons/melee/quarterstaff/carbonquarterstaff.activeitem b/items/active/weapons/melee/quarterstaff/carbonquarterstaff.activeitem
@@ -1,6 +1,6 @@
 {
   "itemName" : "carbonquarterstaff",
-  "price" : 800,
+  "price" : 400,
   "maxStack" : 1,
   "level" : 3,
   "rarity" : "uncommon",

diff --git a/items/active/weapons/ranged/unique/theblackmarket/razorneedler/crystallineneedler.activeitem b/items/active/weapons/ranged/unique/theblackmarket/razorneedler/crystallineneedler.activeitem
@@ -1,6 +1,6 @@
 {
   "itemName" : "crystallineneedler",
-  "price" : 500,
+  "price" : 200,
   "inventoryIcon" : "crystallineneedler.png",
     "maxStack" : 1,
     "rarity" : "common",

diff --git a/items/generic/crafting/bone.item.patch b/items/generic/crafting/bone.item.patch
@@ -13,7 +13,7 @@
     //{ "op" : "add", "path" : "/learnBlueprintsOnPickup/-", "value" : "bonematerial" },
     //{ "op" : "add", "path" : "/learnBlueprintsOnPickup/-", "value" : "throwingbones" },
     //{ "op" : "add", "path" : "/learnBlueprintsOnPickup/-", "value" : "floranneedler" },
-
+    { "op": "replace", "path": "/price", "value": 2 },
     {
       "op": "add",
       "path": "/radioMessagesOnPickup",

diff --git a/items/generic/crafting/ff_plastic.item b/items/generic/crafting/ff_plastic.item
@@ -1,7 +1,7 @@
 {
   "itemName": "ff_plastic",
   "rarity": "Common",
-  "price": 20,
+  "price": 12,
   "category": "craftingMaterial",
   "inventoryIcon": "ff_plastic.png",
   "description": "By the power of science, behold Polyetheretherketone! This synthetic compound is strong, heat-resistant, and bio-compatible.",

diff --git a/items/generic/crafting/fuelcatalyst.item b/items/generic/crafting/fuelcatalyst.item
@@ -1,6 +1,6 @@
 {
   "itemName" : "fuelcatalyst",
-  "price" : 120,
+  "price" : 5,
   "rarity" : "Rare",
   "category" : "craftingMaterial",
   "inventoryIcon" : "fuelcatalyst.png",

diff --git a/items/generic/crafting/leather.item.patch b/items/generic/crafting/leather.item.patch
@@ -1,3 +1,5 @@
 [
-
+  [
+    { "op": "replace", "path": "/price", "value": 22 }
+  ]
 ]
diff --git a/items/generic/food/bananapudding.consumable b/items/generic/food/bananapudding.consumable
@@ -4,7 +4,7 @@
   "price" : 125,
   "category" : "preparedFood",
   "inventoryIcon" : "bananapudding.png",
-  "description" : "Sweet, creamy and delicious.\n^cyan;+^white;10% ^cyan;Crit Chance ^gray;(^white;1m^gray;)^reset; \n^orange;Type: Fruit Dairy Dessert^reset;",
+  "description" : "Sweet, creamy and delicious.\n^cyan;+^white;20% ^cyan;Crit Chance ^gray;(^white;1m^gray;)^reset; \n^orange;Type: Fruit Dairy Dessert^reset;",
   "shortdescription" : "Banana Pudding",
   "effects" : [ [
   { "effect": "critchance2" },

diff --git a/items/materials/avalipaneling.matitem b/items/materials/avalipaneling.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avalipaneling",
   "category" : "block",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avalipaneling.png",
   "description" : "Light and airy panels.",
   "shortdescription" : "Horizontal Panels",

diff --git a/items/materials/avalipaneling2.matitem b/items/materials/avalipaneling2.matitem
@@ -2,10 +2,10 @@
   "itemName" : "avalipaneling2",
   "category" : "block",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avalipaneling2.png",
   "description" : "Light and airy panels.",
   "shortdescription" : "Vertical Panels",
 //  "learnBlueprintsOnPickup" : [ "avalipaneling2" ],
   "materialId" : 12523
-}
+}
diff --git a/items/materials/avaliplain.matitem b/items/materials/avaliplain.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avaliplain",
   "category" : "block",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avaliplain.png",
   "description" : "Plain paneling, because sometimes less is more.",
   "shortdescription" : "Plain Panels",

diff --git a/items/materials/avaliplatform.matitem b/items/materials/avaliplatform.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avaliplatform",
   "category" : "platform",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avaliplatform.png",
   "description" : "A platform of Avali design.",
   "shortdescription" : "Avali Platform",

diff --git a/items/materials/avalistairs.matitem b/items/materials/avalistairs.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avalistairs",
   "category" : "platform",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avalistairs.png",
   "description" : "Stairs of Avali Design.",
   "shortdescription" : "Avali Stair Platform",

diff --git a/items/materials/avalitechpanel.matitem b/items/materials/avalitechpanel.matitem
@@ -2,7 +2,7 @@
     "itemName": "avalitechpanel",
     "category": "block",
     "rarity": "Common",
-    "price": 10,
+    "price": 0,
     "inventoryIcon": "avalitechpanel.png",
     "description": "Polymer panels used to hide and protect electronics.\n^green;Extractable^reset;.",
     "shortdescription": "Tech Panel",

diff --git a/items/materials/avalitechplatform.matitem b/items/materials/avalitechplatform.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avalitechplatform",
   "category" : "platform",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avalitechplatform.png",
   "description" : "Polymer panels used to protect and hide sensitive electronics.",
   "shortdescription" : "Tech Platform",

diff --git a/items/materials/avalitiles.matitem b/items/materials/avalitiles.matitem
@@ -2,7 +2,7 @@
   "itemName" : "avalitiles",
   "category" : "block",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "avalitiles.png",
   "description" : "Easy wipe-clean tiles... perfect for places prone to mess.",
   "shortdescription" : "Composite Tiles",

diff --git a/items/materials/fulabscreen.matitem b/items/materials/fulabscreen.matitem
@@ -2,7 +2,7 @@
   "itemName" : "fulabscreen",
   "category" : "block",
   "rarity" : "Common",
-  "price" : 10,
+  "price" : 0,
   "inventoryIcon" : "fulabscreen.png",
   "description" : "A touch-screen interface.",
   "shortdescription" : "Lab Screen",

diff --git a/items/tools/inspectiontool/scantoolproto.inspectiontool b/items/tools/inspectiontool/scantoolproto.inspectiontool
@@ -77,6 +77,12 @@
       "See nothing. Move closer?",
       "Scanner weak. Should move.",
       "Can't see. Scanner broken?"
+    ],
+    "droden" : [
+      "Scanner error. Out of range.",
+      "Error. Maximum scanner range exceeded.",
+      "Error. Signal strength insufficient.",
+      "No signal. Please reduce distance to target."
     ]
   },
 
@@ -116,7 +122,12 @@
       "See nothing. Why look?",
       "Nothing there?",
       "Watch nothing? See nothing."
+    ],
+    "droden" : [
+      "Error. Invalid target.",
+      "Error. No item of interest.",
+      "Unable to read target.",
+      "Error. Empty."
     ]
   }
 }
-
diff --git a/monsters/space/fuchiropterror/fuchiropterror.monstertype b/monsters/space/fuchiropterror/fuchiropterror.monstertype
@@ -1,7 +1,7 @@
 {
   "type" : "fuchiropterror",
-  "shortdescription" : "Chiropterror",
-  "description" : "It's a chiropterror",
+  "shortdescription" : "Precursor Chiropterror",
+  "description" : "It's a chiropterror!",
 
   "categories" : [ "fuchiropterror" ],
   "parts" : [ "body" ],

diff --git a/monsters/space/fuheavydrone/fuheavydrone.monstertype b/monsters/space/fuheavydrone/fuheavydrone.monstertype
@@ -1,6 +1,6 @@
 {
   "type" : "fuheavydrone",
-  "shortdescription" : "War Drone",
+  "shortdescription" : "Precursor War Drone",
   "description" : "Designed specifically to kill you. You in particular.",
 
   "categories" : [ "fuheavydrone" ],

diff --git a/monsters/space/futrifangle/futrifangle.monstertype b/monsters/space/futrifangle/futrifangle.monstertype
@@ -1,7 +1,7 @@
 {
   "type" : "futrifangle",
-  "shortdescription" : "Trifangle",
-  "description" : "50% better than a bifangle.",
+  "shortdescription" : "Precursor Trifangle",
+  "description" : "Six times better than a semifangle.",
 
   "categories" : [ "futrifangle" ],
   "parts" : [ "body" ],

diff --git a/monsters/space/futwigun/futwigunpet.monstertype b/monsters/space/futwigun/futwigunpet.monstertype
@@ -1,6 +1,6 @@
 {
   "type" : "futwigunpet",
-  "shortdescription" : "Cannon",
+  "shortdescription" : "Precursor Twigun",
   "description" : "Ready and able to kill you.",
 
   "categories" : [ "twigun" ],