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/3] 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 bf875391a246120e075537adc11e46bd959991ac Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:55:20 +0100 Subject: [PATCH 2/3] removes the silly books. --- data/json/itemgroups/books.json | 103 +++++++++++++++----------------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 39c54da637363..0456a2f882436 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -124,9 +124,8 @@ "//": "Books found in school library", "items": [ { "group": "novels", "prob": 50 }, - { "group": "manuals_school", "prob": 40 }, - { "group": "textbooks_school", "prob": 30 }, - { "group": "kids_books", "prob": 30 }, + { "group": "kids_books", "prob": 40 }, + { "group": "manuals_school", "prob": 30 }, { "group": "literature", "prob": 30 } ] }, @@ -480,75 +479,57 @@ "type": "item_group", "id": "manuals_school", "//": "Same as manuals, but without inappropriate books, like weapons or traps.", + "//2": "The autobiography of a mountain man is included as, while an advanced survival book, it’s also a story novel in its current form. Should it be expanded with variants to include books that are not novels, then it should be removed.", + "//3": "While a rather high-level fabrication book, this could conceivably be something that a craft shop/design and technology class would use in its current form: Plastics and Polymers: Projects for the Classroom. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.", + "//4": "While it has the potential to be a high-level tailoring book, its current form, Friendly, Humane Fashion, can be passed off as an educational library book. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.", + "//5": "While a high-level speech book, Principles of Effective Communication, a public speaking book, isn’t unrealistic for a school library to possess,. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.", + "//6": "Bit of a stretch, but The Wonderful World of Arthropodology could feasibly exist as a library encyclopaedia.", "subtype": "distribution", "entries": [ - { "item": "manual_brawl", "prob": 30 }, - { "item": "manual_dodge", "prob": 1 }, - { "item": "manual_throw", "prob": 12 }, - { "item": "manual_mechanics", "prob": 35 }, - { "item": "manual_speech", "prob": 50 }, + { "item": "manual_swimming", "prob": 5 }, + { "item": "manual_dodge", "variant": "manual_dodge", "prob": 5 }, + { "item": "manual_dodge", "variant": "manual_dodge_1", "prob": 5 }, + { "item": "manual_throw", "variant": "manual_throw", "prob": 6 }, + { "item": "manual_throw", "variant": "manual_throw_4", "prob": 6 }, + { "item": "manual_mechanics", "prob": 25 }, + { "item": "book_pneumatics", "prob": 5 }, + { "item": "manual_speech", "prob": 40 }, + { "item": "textbook_speech", "prob": 10 }, { "item": "manual_business", "prob": 40 }, - { "item": "manual_first_aid", "prob": 40 }, + { "item": "manual_first_aid", "prob": 30 }, + { "item": "pocket_firstaid", "prob": 30 }, { "item": "manual_computer", "prob": 20 }, + { "item": "howto_computer", "prob": 10 }, { "item": "webbasics_computer", "prob": 20 }, { "item": "hackerman_computer", "prob": 10 }, - { "item": "howto_computer", "prob": 10 }, - { "item": "cookbook", "prob": 35 }, - { "item": "offalcooking", "prob": 8 }, - { "item": "cookbook_italian", "prob": 25 }, + { "item": "cookbook", "prob": 25 }, + { "item": "offalcooking", "prob": 5 }, + { "item": "cookbook_italian", "prob": 10 }, { "item": "cookbook_indian", "prob": 10 }, - { "item": "cookbook_native", "prob": 5 }, { "item": "cookbook_mexican", "prob": 10 }, { "item": "sweets_book", "prob": 10 }, - { "item": "manual_electronics", "prob": 20 }, + { "item": "cookbook_native", "prob": 5 }, + { "item": "manual_electronics", "prob": 25 }, + { "item": "arduino_experiments", "prob": 15 }, { "item": "manual_tailor", "prob": 15 }, + { "item": "recipe_fauxfur", "prob": 5 }, { "item": "manual_carpentry", "prob": 10 }, - { "item": "101_carpentry", "prob": 6 }, - { "item": "manual_fabrication", "prob": 20 }, - { "item": "manual_driving", "prob": 15 }, - { "item": "manual_survival", "prob": 20 }, + { "item": "101_carpentry", "prob": 10 }, + { "item": "manual_fabrication", "prob": 10 }, + { "item": "plastics_book", "prob": 10 }, + { "item": "manual_survival", "prob": 10 }, + { "item": "pocket_survival", "prob": 10 }, + { "item": "survival_book", "prob": 2 }, + { "item": "textbook_arthropod", "prob": 2 }, + { "item": "basic_chemistry", "prob": 30 }, { "item": "dnd_handbook", "prob": 2 }, - { "item": "reference_cooking", "prob": 1 }, - { "item": "reference_fabrication1", "prob": 1 }, - { "item": "reference_firstaid1", "prob": 1 }, - { "item": "reference_firstaid2", "prob": 1 }, - { "item": "basic_chemistry", "prob": 10 }, - { "item": "survnote", "prob": 3 }, - { "item": "manual_canning", "prob": 8 }, - { "item": "manual_sealing", "prob": 9 }, - { "item": "vacuum_sealing", "prob": 5 }, - { "item": "arduino_experiments", "prob": 5 }, - { "item": "fermenting_book", "prob": 8 }, - { "item": "book_pneumatics", "prob": 3 } + { "item": "survnote", "prob": 3 } ] }, { "type": "item_group", "id": "textbooks", "subtype": "distribution", - "entries": [ - { "group": "textbooks_school", "prob": 228 }, - { "item": "textbook_gaswarfare", "prob": 5 }, - { "item": "recipe_bullets", "prob": 8 }, - { "item": "book_pneumatics", "prob": 8 }, - { "item": "text_gunsmith", "prob": 4 }, - { "item": "pocket_firearms", "prob": 2 }, - { "item": "textbook_traps", "prob": 4 }, - { "item": "reference_cooking", "prob": 2 }, - { "item": "reference_fabrication1", "prob": 6 }, - { "item": "reference_firstaid1", "prob": 2 }, - { "item": "reference_firstaid2", "prob": 1 }, - { "item": "textbook_toxicology", "prob": 2 }, - { "item": "alloy_book", "prob": 5 }, - { "item": "metal_casting_book", "prob": 5 }, - { "item": "bronze_book", "prob": 6 } - ] - }, - { - "type": "item_group", - "id": "textbooks_school", - "//": "Same as textbooks, but without inappropriate books, like weapons or traps. Contains archery and armors/melee weapons as sport and historical information sources.", - "subtype": "distribution", "entries": [ { "item": "textbook_computer", "prob": 4 }, { "item": "computer_science", "prob": 8 }, @@ -609,7 +590,19 @@ { "item": "textbook_arthropod", "prob": 5 }, { "item": "textbook_botany", "prob": 5 }, { "item": "theater_props", "prob": 2 }, - { "item": "ballista_book", "prob": 3 } + { "item": "ballista_book", "prob": 3 }, + { "item": "textbook_gaswarfare", "prob": 5 }, + { "item": "recipe_bullets", "prob": 8 }, + { "item": "text_gunsmith", "prob": 4 }, + { "item": "pocket_firearms", "prob": 2 }, + { "item": "textbook_traps", "prob": 4 }, + { "item": "reference_cooking", "prob": 2 }, + { "item": "reference_fabrication1", "prob": 6 }, + { "item": "reference_firstaid1", "prob": 2 }, + { "item": "reference_firstaid2", "prob": 1 }, + { "item": "textbook_toxicology", "prob": 2 }, + { "item": "alloy_book", "prob": 5 }, + { "item": "metal_casting_book", "prob": 5 } ] }, { From da9459b78e761c1b5ccb645dc9f54a4eb5629669 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Thu, 22 Feb 2024 13:49:39 +0100 Subject: [PATCH 3/3] removes the last use of textbooks_school. --- data/json/npcs/campus/great_library_librarian_goods.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/npcs/campus/great_library_librarian_goods.json b/data/json/npcs/campus/great_library_librarian_goods.json index adbb73c76b0b8..5756ab5edfbce 100644 --- a/data/json/npcs/campus/great_library_librarian_goods.json +++ b/data/json/npcs/campus/great_library_librarian_goods.json @@ -35,7 +35,6 @@ "items": [ { "group": "novels", "count": [ 9, 12 ] }, { "group": "manuals_school", "count": [ 9, 12 ] }, - { "group": "textbooks_school", "count": [ 9, 12 ] }, { "group": "literature", "count": [ 9, 12 ] }, { "group": "games", "count": [ 5, 6 ] } ]