From 97c423db5f201eec5022640c30a0736242bef587 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sun, 2 Jul 2023 15:57:37 +0200 Subject: [PATCH 1/5] fixes merge errors. --- data/mods/MindOverMatter/README.md | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/data/mods/MindOverMatter/README.md b/data/mods/MindOverMatter/README.md index 693265f731680..ffff8e34c43a1 100644 --- a/data/mods/MindOverMatter/README.md +++ b/data/mods/MindOverMatter/README.md @@ -1,52 +1,52 @@ -# Mind Over Matter -A Psionics mod for Cataclysm: Dark Days Ahead - -This mod adds (currently) seven separate psionic power paths to Cataclysm, including: - -1) Biokinesis - Control of the body. Biokinetics can become stronger and faster than an ordinary human, and even change their form in limited ways. (starting profession: Star Athlete) -2) Clairsentience - Extending the senses beyond the body. Clairsentients can see in the dark and through walls, and eventually gain a bird's eye view of their surroundings, as well as perform in combat by anticipating their enemies' movements. (starting profession: Doomseer) -3) Pyrokinesis - Manipulating fire and heat. Pyrokinetics can start fires and protect themselves from heat, and even cover their whole body in raging flames to discourage attack (starting profession: Firestarter) -4) Telekinesis - Moving objects at a distance. Telekinetics can pull objects to them and hurl their enemies away, and even collapse buildings or shield themselves with a barrier of telekinetic force. (starting profession: Test Subject, Project ONYX LIGHTNING) -5) Telepathy - Control of the mind. Telepaths can become more persuasive and shield their presence from their enemies, and a powerful one can seize control of their enemies' minds. (starting profession: Government Interrogater (DECEASED)) -6) Teleportation - Moving without crossing the intervening distance. Teleporters can escape danger and move quickly, and at higher levels they can travel long distances across the ravaged earth or hurl their enemies away to the space between dimensions. (starting profession: Itzcuauhtli Corps Liaison, Yohualli Èhecatl Division) -7) Vitakinesis - Control of health and injury. Vitakinetics can bind their own wounds and speed healing, eventually recovering from even near-crippling injuries. (starting profession: Faith Healer) - -If you would like a random power path, pick the profession "Awakening Psion." - -The goal is for each path to be upgraded through usage, since sitting and studying a book for hours doesn't really fit the fiction of improving psychic powers. Powers are gained progressively, with increasing mastery of lower-tier powers unlocking new ones. Powers are based on a new skill called "metaphysics" which you can learn through recipes found from appropriate books in the world. - -ADVANTAGES - -1) Psionic powers are fast. Many powers take less than 100 moves to use, with high-level powers sometimes taking much less (a level 10 Telekinetic Hand takes only 10 moves!), reflecting that they are as fast as thought. - -2) Powers use Stamina as their power source, meaning that a fully-charged psychic is only a five-minute breather away. -3) Powers are generally very quiet (generally. Pyrokinesis is very loud) - -DISADVANTAGES - -1) Powers use Stamina as their power source. This is also a disadvantage because every power use reduces your ability to run away. -2) All powers require concentration and thus are affected by Focus. It's very difficult to concentrate enough to lift a pursuing boomer if you've just fought off a grappler in close range and there's blood all around you. - -3) Long-term power use is debilitating--powers have a chance to cause Drain, which will gradually reduce your maximum Stamina, Strength, Dexterity, and Perception as well as make you hungry and tired. Drain goes away naturally on its own with rest. (I would have used weariness but that's impossible) - -LORE - -When the government began noticing that some XEDRA explorers of alternate dimensions returned with anomalous capabilities, Project PHAVIAN was founded to study these in full. Within the year, this led to the discover of latent psychic powers in a portion of humanity. On Earth these were minor, almost trivial--the ability to always find your lost keys or know the next sentence someone is going to say moments before they do are useful powers but not lifechanging--but exposure to extra-dimensional energy seemed to increase psionic power. A PHAVIAN test subject who on Earth could manipulate a quarter to make sure it always landed heads up could sometimes throw large objects on the other side of a portal, or even lift a person. Soon after, it was discovered that specific crystalline formations found in extra-dimensional locations had the effect of amplifying psionic power even further, and that exposure to these crystals could awaken powers in previously mundane individuals. - -Soon after that, the world ended. The weakening of dimensional barriers has made psionic power much stronger on Earth, but there's no longer anyone around to conduct any experiments on it. It's just one more method that survivors use in the wake of the Cataclysm. - -GAINING POWERS - -The easiest way to gain psionics is to pick a profession that starts with them (or debug them in). There are also some strange crystals you might find in places with a strong connection with the Nether, or which are carried by psychic ferals. Or you could walk out into a portal storm unprotected. - -Listen to the voices. - -Bathe in the energies of the Nether. - -We have such sights to show you. - -WAIT, STAMINA? - -I realize it's a bit counterintuitive that taking Indefatiguable or mutating mouse will make you a better psychic, but this was the best solution I could think of for compatibility. There's no way to implement cooldowns for individual powers and I don't want to use mana and make it regenerate very fast for psychics because that breaks compatibility with every single magic mod out there. Fatigue or Weariness would also fit but it's not currently possible to use Fatigue as a spell power source without adding a custom extra effect for every single power, and not possible to interact with Weariness at all, so until that's an option or there's a way to make a custom power pool, Stamina it is. - +# Mind Over Matter +A Psionics mod for Cataclysm: Dark Days Ahead + +This mod adds (currently) seven separate psionic power paths to Cataclysm, including: + +1) Biokinesis - Control of the body. Biokinetics can become stronger and faster than an ordinary human, and even change their form in limited ways. (starting profession: Star Athlete) +2) Clairsentience - Extending the senses beyond the body. Clairsentients can see in the dark and through walls, and eventually gain a bird's eye view of their surroundings, as well as perform in combat by anticipating their enemies' movements. (starting profession: Doomseer) +3) Pyrokinesis - Manipulating fire and heat. Pyrokinetics can start fires and protect themselves from heat, and even cover their whole body in raging flames to discourage attack (starting profession: Firestarter) +4) Telekinesis - Moving objects at a distance. Telekinetics can pull objects to them and hurl their enemies away, and even collapse buildings or shield themselves with a barrier of telekinetic force. (starting profession: Test Subject, Project ONYX LIGHTNING) +5) Telepathy - Control of the mind. Telepaths can become more persuasive and shield their presence from their enemies, and a powerful one can seize control of their enemies' minds. (starting profession: Government Interrogater (DECEASED)) +6) Teleportation - Moving without crossing the intervening distance. Teleporters can escape danger and move quickly, and at higher levels they can travel long distances across the ravaged earth or hurl their enemies away to the space between dimensions. (starting profession: Itzcuauhtli Corps Liaison, Yohualli Èhecatl Division) +7) Vitakinesis - Control of health and injury. Vitakinetics can bind their own wounds and speed healing, eventually recovering from even near-crippling injuries. (starting profession: Faith Healer) + +If you would like a random power path, pick the profession "Awakening Psion." + +The goal is for each path to be upgraded through usage, since sitting and studying a book for hours doesn't really fit the fiction of improving psychic powers. Powers are gained progressively, with increasing mastery of lower-tier powers unlocking new ones. Powers are based on a new skill called "metaphysics" which you can learn through recipes found from appropriate books in the world. + +ADVANTAGES + +1) Psionic powers are fast. Many powers take less than 100 moves to use, with high-level powers sometimes taking much less (a level 10 Telekinetic Hand takes only 10 moves!), reflecting that they are as fast as thought. + +2) Powers use Stamina as their power source, meaning that a fully-charged psychic is only a five-minute breather away. +3) Powers are generally very quiet (generally. Pyrokinesis is very loud) + +DISADVANTAGES + +1) Powers use Stamina as their power source. This is also a disadvantage because every power use reduces your ability to run away. +2) All powers require concentration and thus are affected by Focus. It's very difficult to concentrate enough to lift a pursuing boomer if you've just fought off a grappler in close range and there's blood all around you. + +3) Long-term power use is debilitating--powers have a chance to cause Drain, which will gradually reduce your maximum Stamina, Strength, Dexterity, and Perception as well as make you hungry and tired. Drain goes away naturally on its own with rest. (I would have used weariness but that's impossible) + +LORE + +When the government began noticing that some XEDRA explorers of alternate dimensions returned with anomalous capabilities, Project PHAVIAN was founded to study these in full. Within the year, this led to the discover of latent psychic powers in a portion of humanity. On Earth these were minor, almost trivial--the ability to always find your lost keys or know the next sentence someone is going to say moments before they do are useful powers but not lifechanging--but exposure to extra-dimensional energy seemed to increase psionic power. A PHAVIAN test subject who on Earth could manipulate a quarter to make sure it always landed heads up could sometimes throw large objects on the other side of a portal, or even lift a person. Soon after, it was discovered that specific crystalline formations found in extra-dimensional locations had the effect of amplifying psionic power even further, and that exposure to these crystals could awaken powers in previously mundane individuals. + +Soon after that, the world ended. The weakening of dimensional barriers has made psionic power much stronger on Earth, but there's no longer anyone around to conduct any experiments on it. It's just one more method that survivors use in the wake of the Cataclysm. + +GAINING POWERS + +The easiest way to gain psionics is to pick a profession that starts with them (or debug them in). There are also some strange crystals you might find in places with a strong connection with the Nether, or which are carried by psychic ferals. Or you could walk out into a portal storm unprotected. + +Listen to the voices. + +Bathe in the energies of the Nether. + +We have such sights to show you. + +WAIT, STAMINA? + +I realize it's a bit counterintuitive that taking Indefatiguable or mutating mouse will make you a better psychic, but this was the best solution I could think of for compatibility. There's no way to implement cooldowns for individual powers and I don't want to use mana and make it regenerate very fast for psychics because that breaks compatibility with every single magic mod out there. Fatigue or Weariness would also fit but it's not currently possible to use Fatigue as a spell power source without adding a custom extra effect for every single power, and not possible to interact with Weariness at all, so until that's an option or there's a way to make a custom power pool, Stamina it is. + Weariness is still my goal here, but until it's possible to use it in spells Drain (described above) is the substitute. \ No newline at end of file From 54ee618588b6bd4258f7825bfd4bdb015129f3a9 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:25:11 +0200 Subject: [PATCH 2/5] adds the uncrafts. --- data/json/items/resources/tailoring.json | 15 +++++++++ data/json/requirements/tailoring.json | 4 +-- data/json/uncraft/armor/headwear.json | 12 ++++++++ data/json/uncraft/armor/legs.json | 17 +++++++++++ data/json/uncraft/armor/storage.json | 10 ++++++ data/json/uncraft/armor/torso.json | 39 ++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 data/json/uncraft/armor/headwear.json diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 03a9e08039f48..a8de4c8f0d34e 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -774,5 +774,20 @@ "material": [ "canvas" ], "symbol": "=", "color": "dark_gray" + }, + { + "id": "strap_cotton", + "type": "GENERIC", + "category": "spare_parts", + "name": { "str": "fabric strap" }, + "description": "A strip of broad, flat cotton, 42 inches in length, with a metal adjustment buckle threaded in the centre. Normally used as a shoulder strap for bags, its ends are usually sown about a corresponding container’s D-rings.", + "weight": "59 g", + "volume": "52 ml", + "//": "Medium weight cotton fabric with a GSM of 203", + "price": "0 USD", + "price_postapoc": "5 cent", + "material": [ { "type": "cotton", "portion": 6 }, { "type": "steel", "portion": 1 } ], + "symbol": "=", + "color": "dark_gray" } ] diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json index 7e648edf2aae1..ccd9b3e1685e5 100644 --- a/data/json/requirements/tailoring.json +++ b/data/json/requirements/tailoring.json @@ -113,14 +113,14 @@ "type": "requirement", "//": "A small piece of fabric or leather to strap something firmly to the body. Stronger than a bit of string.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] + "components": [ [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ], [ "strap_cotton", 1 ] ] ] }, { "id": "strap_large", "type": "requirement", "//": "A long piece of fabric or leather to strap something firmly to the body. Stronger than a bit of string.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "cordage_short", 1, "LIST" ], [ "leather", 4 ], [ "fur", 4 ] ] ] + "components": [ [ [ "cordage_short", 1, "LIST" ], [ "leather", 4 ], [ "fur", 4 ], [ "strap_cotton", 1 ] ] ] }, { "id": "dye_cloth", diff --git a/data/json/uncraft/armor/headwear.json b/data/json/uncraft/armor/headwear.json new file mode 100644 index 0000000000000..f34783a04a9a5 --- /dev/null +++ b/data/json/uncraft/armor/headwear.json @@ -0,0 +1,12 @@ +[ + { + "result": "cowboy_hat", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "tailor", + "difficulty": 1, + "time": "4 m", + "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "CUT", "level": 2 } ], + "components": [ [ [ "leather", 14 ] ], [ [ "thread", 40 ] ] ] + } +] diff --git a/data/json/uncraft/armor/legs.json b/data/json/uncraft/armor/legs.json index ed9ff68a28584..4043ae50c9bab 100644 --- a/data/json/uncraft/armor/legs.json +++ b/data/json/uncraft/armor/legs.json @@ -1,4 +1,21 @@ [ + { + "result": "pants_tactical", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "tailor", + "difficulty": 2, + "time": "5 m", + "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "zipper_short_plastic", 1 ] ], + [ [ "snapfastener_steel", 6 ] ], + [ [ "button_steel", 1 ] ], + [ [ "sheet_nylon", 10 ] ], + [ [ "nylon", 15 ] ], + [ [ "cotton_patchwork", 6 ] ] + ] + }, { "result": "pants_leather", "type": "uncraft", diff --git a/data/json/uncraft/armor/storage.json b/data/json/uncraft/armor/storage.json index cd99ae9009283..a708861fb9716 100644 --- a/data/json/uncraft/armor/storage.json +++ b/data/json/uncraft/armor/storage.json @@ -56,5 +56,15 @@ "time": "35 m", "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ], "components": [ [ [ "sheet_lycra_patchwork", 9 ] ], [ [ "button_plastic", 1 ] ], [ [ "plastic_sheet_small", 38 ] ] ] + }, + { + "result": "gas_mask_pouch", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "tailor", + "difficulty": 1, + "time": "2 m 30 s", + "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ], + "components": [ [ [ "strap_cotton", 1 ] ], [ [ "snapfastener_steel", 2 ] ], [ [ "sheet_nylon", 3 ] ], [ [ "nylon", 11 ] ] ] } ] diff --git a/data/json/uncraft/armor/torso.json b/data/json/uncraft/armor/torso.json index c872cf222fab1..9c87daf3571e0 100644 --- a/data/json/uncraft/armor/torso.json +++ b/data/json/uncraft/armor/torso.json @@ -1,4 +1,43 @@ [ + { + "result": "tacjacket", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "tailor", + "difficulty": 2, + "time": "4 m 30 s", + "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "zipper_short_plastic", 3 ] ], + [ [ "zipper_long_plastic", 1 ] ], + [ [ "snapfastener", 5 ] ], + [ [ "sheet_nylon", 16 ] ], + [ [ "nylon", 18 ] ], + [ [ "cotton_patchwork", 4 ] ] + ] + }, + { + "result": "jacket_army", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "tailor", + "difficulty": 2, + "time": "6 m ", + "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ], + "//": "Extra 4 plastic buttons, on top of the 4 present to cover the pockets, represent the interior buttons for securing the liner. 2 more plastic buttons represent the epaulettes. 2 additional buttons represent the sleave closures.", + "//2": "The short plastic zipper represents the closure for the compartment designed to retain the concealable hood.", + "//3": "Snap fasteners represent the pop-closure buttons present on the storm flap.", + "components": [ + [ [ "button_plastic", 12 ] ], + [ [ "zipper_short_plastic", 1 ] ], + [ [ "zipper_long_plastic", 1 ] ], + [ [ "snapfastener", 5 ] ], + [ [ "sheet_nylon", 20 ] ], + [ [ "sheet_cotton", 4 ] ], + [ [ "nylon", 10 ] ], + [ [ "cotton_patchwork", 8 ] ] + ] + }, { "result": "tank_top", "type": "uncraft", From 3410aa5ea548c4e40f2917812f7d35dd229375d7 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:28:02 +0200 Subject: [PATCH 3/5] =?UTF-8?q?replaces=20=E2=80=99=20with=20'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/json/items/resources/tailoring.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index a8de4c8f0d34e..e5cf8371aca62 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -780,7 +780,7 @@ "type": "GENERIC", "category": "spare_parts", "name": { "str": "fabric strap" }, - "description": "A strip of broad, flat cotton, 42 inches in length, with a metal adjustment buckle threaded in the centre. Normally used as a shoulder strap for bags, its ends are usually sown about a corresponding container’s D-rings.", + "description": "A strip of broad, flat cotton, 42 inches in length, with a metal adjustment buckle threaded in the centre. Normally used as a shoulder strap for bags, its ends are usually sown about a corresponding container's D-rings.", "weight": "59 g", "volume": "52 ml", "//": "Medium weight cotton fabric with a GSM of 203", From 67343c7c6f4eacac12cc1c96768c596697def988 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:10:11 +0200 Subject: [PATCH 4/5] Update data/json/uncraft/armor/torso.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --- data/json/uncraft/armor/torso.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/armor/torso.json b/data/json/uncraft/armor/torso.json index 702c498c7b6b0..a88f6315f72af 100644 --- a/data/json/uncraft/armor/torso.json +++ b/data/json/uncraft/armor/torso.json @@ -10,7 +10,7 @@ "components": [ [ [ "zipper_short_plastic", 3 ] ], [ [ "zipper_long_plastic", 1 ] ], - [ [ "snapfastener", 5 ] ], + [ [ "snapfastener_steel", 5 ] ], [ [ "sheet_nylon", 16 ] ], [ [ "nylon", 18 ] ], [ [ "cotton_patchwork", 4 ] ] From af23b1bd6975057b564b59cb3599dee5f85fc91c Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:10:33 +0200 Subject: [PATCH 5/5] Update data/json/uncraft/armor/torso.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --- data/json/uncraft/armor/torso.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/armor/torso.json b/data/json/uncraft/armor/torso.json index a88f6315f72af..0b60a3c1028c8 100644 --- a/data/json/uncraft/armor/torso.json +++ b/data/json/uncraft/armor/torso.json @@ -31,7 +31,7 @@ [ [ "button_plastic", 12 ] ], [ [ "zipper_short_plastic", 1 ] ], [ [ "zipper_long_plastic", 1 ] ], - [ [ "snapfastener", 5 ] ], + [ [ "snapfastener_steel", 5 ] ], [ [ "sheet_nylon", 20 ] ], [ [ "sheet_cotton", 4 ] ], [ [ "nylon", 10 ] ],