Add patch to make plastic scraps stackable.

4 files changed, 185 insertions, 82 deletions

diff --git a/bionics-01_npc-can-use-more-bionics.patch b/bionics-01_npc-can-use-more-bionics.patch
deleted file mode 100644
index b32fe0c..0000000
--- a/bionics-01_npc-can-use-more-bionics.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/data/json/bionics.json
-+++ b/data/json/bionics.json
-@@ -338,7 +338,7 @@
-     "name": { "str": "Enhanced Hearing" },
-     "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person.  Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
-     "occupied_bodyparts": [ [ "head", 3 ] ],
--    "flags": [ "BIONIC_TOGGLED" ],
-+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-     "included_bionics": [ "bio_earplugs" ]
-   },
-   {
-@@ -1200,6 +1200,6 @@
-     "name": { "str": "Soporific Induction" },
-     "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
-     "occupied_bodyparts": [ [ "head", 1 ] ],
--    "flags": [ "BIONIC_TOGGLED" ]
-+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
-   },
-   {
-     "id": "bn_bio_solar",
---- a/data/json/items/bionics.json
-+++ b/data/json/items/bionics.json
-@@ -268,7 +268,7 @@
-   },
-   {
-     "id": "bio_ears",
--    "copy-from": "bionic_general",
-+    "copy-from": "bionic_general_npc_usable",
-     "type": "BIONIC_ITEM",
-     "name": { "str": "Enhanced Hearing CBM" },
-     "looks_like": "bio_int_enhancer",
-@@ -743,7 +743,7 @@
-   },
-   {
-     "id": "bio_fuel_cell_gasoline",
--    "copy-from": "bionic_general",
-+    "copy-from": "bionic_general_npc_usable",
-     "type": "BIONIC_ITEM",
-     "name": { "str": "Gasoline Fuel Cell CBM" },
-     "looks_like": "bio_int_enhancer",
-@@ -841,7 +841,7 @@
-   },
-   {
-     "id": "bio_surgical_razor",
--    "copy-from": "bionic_general",
-+    "copy-from": "bionic_general_npc_usable",
-     "type": "BIONIC_ITEM",
-     "name": { "str": "Autonomous Surgical Scalpels CBM" },
-     "looks_like": "bio_int_enhancer",
diff --git a/revert-04_telescopic-lenses.patch b/bionics-01_restore-telescopic-eyes.patch
index 6a31edb..5451a33 100644
--- a/revert-04_telescopic-lenses.patch
+++ b/bionics-01_restore-telescopic-eyes.patch
@@ -1,38 +1,38 @@
 --- a/data/json/bionics.json
 +++ b/data/json/bionics.json
-@@ -394,32 +394,10 @@
+@@ -394,10 +394,32 @@
    {
      "id": "bio_eye_optic",
      "type": "bionic",
--    "name": { "str": "Telescopic Eyes" },
--    "description": "Much of the material in your inner eye has been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any vision problems you might have had are now gone.",
-+    "name": { "str": "Telescopic Lenses" },
-+    "description": "The lenses in your eyes have been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any mundane vision problems you might have had are now gone.",
++    "name": { "str": "Telescopic Eyes" },
++    "description": "Much of the material in your inner eye has been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any vision problems you might have had are now gone.",
+-    "name": { "str": "Telescopic Lenses" },
+-    "description": "The lenses in your eyes have been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any mundane vision problems you might have had are now gone.",
      "occupied_bodyparts": [ [ "eyes", 2 ] ],
--    "canceled_mutations": [
--      "HYPEROPIC",
--      "MYOPIC",
--      "URSINE_EYE",
--      "NIGHTVISION3",
--      "NIGHTVISION2",
--      "NIGHTVISION",
--      "BIRD_EYE",
--      "COMPOUND_EYES",
--      "LIZ_IR",
--      "EAGLEEYED",
--      "CEPH_VISION",
--      "CEPH_EYES",
--      "ELFA_FNV",
--      "ELFA_NV",
--      "ELFAEYES",
--      "FEL_NV",
--      "FEL_EYE",
--      "INFRARED",
--      "LIZ_EYE",
--      "EYEBULGE",
--      "SEESLEEP"
--    ]
-+    "canceled_mutations": [ "HYPEROPIC", "MYOPIC" ]
++    "canceled_mutations": [
++      "HYPEROPIC",
++      "MYOPIC",
++      "URSINE_EYE",
++      "NIGHTVISION3",
++      "NIGHTVISION2",
++      "NIGHTVISION",
++      "BIRD_EYE",
++      "COMPOUND_EYES",
++      "LIZ_IR",
++      "EAGLEEYED",
++      "CEPH_VISION",
++      "CEPH_EYES",
++      "ELFA_FNV",
++      "ELFA_NV",
++      "ELFAEYES",
++      "FEL_NV",
++      "FEL_EYE",
++      "INFRARED",
++      "LIZ_EYE",
++      "EYEBULGE",
++      "SEESLEEP"
++    ]
+-    "canceled_mutations": [ "HYPEROPIC", "MYOPIC" ]
    },
    {
      "id": "bio_face_mask",
@@ -43,11 +43,11 @@
      "id": "bio_eye_optic",
      "copy-from": "bionic_general",
      "type": "BIONIC_ITEM",
--    "name": { "str": "Telescopic Eyes CBM" },
-+    "name": { "str": "Telescopic Lenses CBM" },
++    "name": { "str": "Telescopic Eyes CBM" },
+-    "name": { "str": "Telescopic Lenses CBM" },
      "looks_like": "bio_int_enhancer",
--    "description": "An array of high-powered, auto-focusing lenses that replaces much of the material in the inner eye.  This fixes any vision problems and allows for an increased vision range akin to binoculars.",
-+    "description": "An array of high-powered, auto-focusing lenses that replaces your natural lenses.  This fixes any mundane vision problems and allows for an increased vision range akin to binoculars.  Once installed they will be impossible to remove, having replaced part of your eyes.",
++    "description": "An array of high-powered, auto-focusing lenses that replaces much of the material in the inner eye.  This fixes any vision problems and allows for an increased vision range akin to binoculars.",
+-    "description": "An array of high-powered, auto-focusing lenses that replaces your natural lenses.  This fixes any mundane vision problems and allows for an increased vision range akin to binoculars.  Once installed they will be impossible to remove, having replaced part of your eyes.",
      "price": "5 kUSD",
      "weight": "100 g",
      "difficulty": 5
diff --git a/bionics-02_npc-can-use-more-bionics.patch b/bionics-02_npc-can-use-more-bionics.patch
new file mode 100644
index 0000000..ddeac6a
--- /dev/null
+++ b/bionics-02_npc-can-use-more-bionics.patch
@@ -0,0 +1,132 @@
+--- a/data/json/bionics.json
++++ b/data/json/bionics.json
+@@ -188,7 +188,7 @@
+     "occupied_bodyparts": [ [ "torso", 16 ], [ "arm_l", 4 ], [ "arm_r", 4 ] ],
+     "act_cost": "100 kJ",
+     "fake_item": "bio_lightning",
+-    "flags": [ "BIONIC_GUN" ]
++    "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
+   },
+   {
+     "id": "bio_claws",
+@@ -321,7 +321,7 @@
+     "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person.  Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
+     "occupied_bodyparts": [ [ "head", 3 ] ],
+-    "flags": [ "BIONIC_TOGGLED" ],
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+     "included_bionics": [ "bio_earplugs" ]
+   },
+   {
+     "type": "bionic",
+@@ -393,7 +393,8 @@
+       "LIZ_EYE",
+       "EYEBULGE",
+       "SEESLEEP"
+-    ]
++    ],
++    "flags": [ "BIONIC_NPC_USABLE" ]
+   },
+   {
+     "id": "bio_face_mask",
+@@ -483,7 +484,7 @@
+     "name": { "str": "Respirator" },
+     "description": "A complex respiration augmentation system.  Improves respiration ability in air and allows breathing water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
+     "occupied_bodyparts": [ [ "torso", 8 ], [ "head", 2 ], [ "mouth", 2 ] ],
+-    "flags": [ "BIONIC_TOGGLED" ],
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+     "trigger_cost": "25 kJ"
+   },
+   {
+@@ -634,7 +657,7 @@
+     "name": { "str": "Enhanced Memory Banks" },
+     "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you can't forget skills you've already learned.",
+     "occupied_bodyparts": [ [ "head", 3 ] ],
+-    "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
+     "act_cost": "2 J",
+     "react_cost": "2 J",
+     "trigger_cost": "25 J",
+@@ -1228,7 +1230,7 @@
+     "name": { "str": "Soporific Induction" },
+     "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
+     "occupied_bodyparts": [ [ "head", 1 ] ],
+-    "flags": [ "BIONIC_TOGGLED" ]
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+   },
+   {
+     "id": "bn_bio_solar",
+@@ -1257,7 +1259,8 @@
+     "type": "bionic",
+     "name": { "str": "Linguistic Coprocessor" },
+     "description": "The left hemisphere of your brain has been augmented with a microcomputer that moderately increases the speed that language and written words are processed, granting a 25% increase to reading speed.",
+-    "occupied_bodyparts": [ [ "head", 2 ] ]
++    "occupied_bodyparts": [ [ "head", 2 ] ],
++    "flags": [ "BIONIC_NPC_USABLE" ]
+   },
+   {
+     "id": "afs_bio_dopamine_stimulators",
+--- a/data/json/items/bionics.json
++++ b/data/json/items/bionics.json
+@@ -277,7 +277,7 @@
+   },
+   {
+     "id": "bio_ears",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Enhanced Hearing CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -329,7 +329,7 @@
+   },
+   {
+     "id": "bio_eye_optic",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Telescopic Eyes CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -420,7 +420,7 @@
+   },
+   {
+     "id": "bio_gills",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Respirator CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -574,7 +574,7 @@
+   },
+   {
+     "id": "bio_memory",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Enhanced Memory Banks CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -752,7 +752,7 @@
+   },
+   {
+     "id": "bio_fuel_cell_gasoline",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Gasoline Fuel Cell CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -889,7 +889,7 @@
+   },
+   {
+     "id": "bio_surgical_razor",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Autonomous Surgical Scalpels CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -1259,7 +1259,7 @@
+   },
+   {
+     "id": "afs_bio_linguistic_coprocessor",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Linguistic Coprocessor CBM" },
+     "description": "A microcomputer installed into the left hemisphere of your brain to increase the speed that it processes language.  When installed, it provides a passive boost to reading speed.",
diff --git a/etc-04_plastic-scrap-is-stackable.patch b/etc-04_plastic-scrap-is-stackable.patch
new file mode 100644
index 0000000..c5f27e4
--- /dev/null
+++ b/etc-04_plastic-scrap-is-stackable.patch
@@ -0,0 +1,20 @@
+--- a/data/json/items/resources/plastic.json
++++ b/data/json/items/resources/plastic.json
+@@ -63,7 +63,7 @@
+   },
+   {
+     "id": "plastic_scrap",
+-    "type": "TOOL",
++    "type": "GENERIC",
+     "category": "spare_parts",
+     "name": { "str": "plastic scrap" },
+     "description": "This is a tiny piece of plastic.  Useless on its own, but could be melted down if you gather enough.",
+@@ -74,6 +74,7 @@
+     "material": "plastic",
+     "symbol": ",",
+     "color": "light_blue",
+-    "flags": [ "NO_SALVAGE" ]
++    "flags": [ "NO_SALVAGE" ],
++    "stackable": true
+   }
+ ]