update more patches for new SRD alignment and similar

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>

Makefile

@@ -1,5 +1,5 @@
 TMPDIR			:= ./_tmp
-CSRD			:= ./srd/Cypher-System-Reference-Document-2024-09-26.docx
+CSRD			:= ./srd/Cypher-System-Reference-Document-2025-05-05-fixed.docx
 MD_CSRD			:= $(TMPDIR)/csrd.md
 CCSRD			:= $(TMPDIR)/ccsrd.md
 WEBDIR			:= ./incorporealcms-instance

patches/base/002-legal-information.patch

@@ -1,6 +1,6 @@
---- _tmp/ccsrd.md	2025-04-04 09:20:46.693232640 -0500
+--- _tmp/ccsrd.md	2025-06-18 23:54:34.521487819 -0500
-+++ _tmp/ccsrd.new.md	2025-04-04 09:19:34.606777172 -0500
++++ _tmp/ccsrd.new.md	2025-06-18 23:55:16.636732890 -0500
-@@ -77148,3 +77148,23 @@
+@@ -81356,3 +81356,23 @@
  It’s not hard to imagine how you could modify this scenario slightly for the science fiction genre using a space station
  rather than a skyscraper. You could also have one of the PCs be an undercover FBI agent on the lookout for the
  terrorist, or even an undercover foreign agent working for the terrorist

patches/base/011-level-1-and-2-headers.patch

@@ -1,5 +1,5 @@
---- _tmp/ccsrd.md	2025-04-04 13:18:16.704716294 -0500
+--- _tmp/ccsrd.md	2025-06-18 23:59:14.771123436 -0500
-+++ _tmp/ccsrd.new.md	2025-04-04 13:18:51.822929454 -0500
++++ _tmp/ccsrd.new.md	2025-06-18 23:59:36.615251031 -0500
 @@ -1,8 +1,8 @@
 -COMMONS CYPHER SYSTEM REFERENCE DOCUMENT v0.0.1
 +# COMMONS CYPHER SYSTEM REFERENCE DOCUMENT v0.0.1
@@ -137,7 +137,7 @@
  
  Setting Difficulty Ratings
  
-@@ -77149,7 +77149,7 @@
+@@ -81357,7 +81357,7 @@
  rather than a skyscraper. You could also have one of the PCs be an undercover FBI agent on the lookout for the
  terrorist, or even an undercover foreign agent working for the terrorist
  

patches/base/016-core-reorg-part-1.patch

@@ -1,11 +1,23 @@
---- _tmp/ccsrd.md	2025-05-05 01:24:30.339956224 -0500
+--- _tmp/ccsrd.md	2025-06-19 00:09:54.480860045 -0500
-+++ _tmp/ccsrd.new.md	2025-05-05 01:28:47.164387736 -0500
++++ _tmp/ccsrd.new.md	2025-06-19 00:13:20.014059321 -0500
-@@ -45,6 +45,23 @@
+@@ -69,20 +69,20 @@
  
- If you can ease a task so its difficulty is reduced to 0, you automatically succeed and don't need to make a roll.
+ ### TASK DIFFICULTY
  
-+### TASK DIFFICULTY
+-|                 |              |            |                                                                                               |
-+
+-|-----------------|--------------|------------|-----------------------------------------------------------------------------------------------|
+-| Task Difficulty | Description  | Target No. | Guidance                                                                                      |
+-| 0               | Routine      | 0          | Anyone can do this basically every time.                                                      |
+-| 1               | Simple       | 3          | Most people can do this most of the time.                                                     |
+-| 2               | Standard     | 6          | Typical task requiring focus, but most people can usually do this.                            |
+-| 3               | Demanding    | 9          | Requires full attention; most people have a 50/50 chance to succeed.                          |
+-| 4               | Difficult    | 12         | Trained people have a 50/50 chance to succeed.                                                |
+-| 5               | Challenging  | 15         | Even trained people often fail.                                                               |
+-| 6               | Intimidating | 18         | Normal people almost never succeed.                                                           |
+-| 7               | Formidable   | 21         | Impossible without skills or great effort.                                                    |
+-| 8               | Heroic       | 24         | A task worthy of tales told for years afterward.                                              |
+-| 9               | Immortal     | 27         | A task worthy of legends that last lifetimes.                                                 |
+-| 10              | Impossible   | 30         | A task that normal humans couldn't consider (but one that doesn't break the laws of physics). |
 +|                     |                 |                |                                                                                               |
 +|---------------------|-----------------|----------------|-----------------------------------------------------------------------------------------------|
 +| **Task Difficulty** | **Description** | **Target No.** | **Guidance**                                                                                  |
@@ -20,34 +32,9 @@
 +| 8                   | Heroic          | 24             | A task worthy of tales told for years afterward.                                              |
 +| 9                   | Immortal        | 27             | A task worthy of legends that last lifetimes.                                                 |
 +| 10                  | Impossible      | 30             | A task that normal humans couldn't consider (but one that doesn't break the laws of physics). |
-+
- ### WHEN DO YOU ROLL?
  
- Any time your character attempts a task, the GM assigns a difficulty to that task, and you roll a d20 against the
-@@ -67,23 +84,6 @@
- System, that usually means rolling a 19 or 20, which are called special rolls; the Rules of the Game chapter also
- discusses special rolls).
- 
--### TASK DIFFICULTY
--
--|                     |                 |                |                                                                                               |
--|---------------------|-----------------|----------------|-----------------------------------------------------------------------------------------------|
--| **Task Difficulty** | **Description** | **Target No.** | **Guidance**                                                                                  |
--| 0                   | Routine         | 0              | Anyone can do this basically every time.                                                      |
--| 1                   | Simple          | 3              | Most people can do this most of the time.                                                     |
--| 2                   | Standard        | 6              | Typical task requiring focus, but most people can usually do this.                            |
--| 3                   | Demanding       | 9              | Requires full attention; most people have a 50/50 chance to succeed.                          |
--| 4                   | Difficult       | 12             | Trained people have a 50/50 chance to succeed.                                                |
--| 5                   | Challenging     | 15             | Even trained people often fail.                                                               |
--| 6                   | Intimidating    | 18             | Normal people almost never succeed.                                                           |
--| 7                   | Formidable      | 21             | Impossible without skills or great effort.                                                    |
--| 8                   | Heroic          | 24             | A task worthy of tales told for years afterward.                                              |
--| 9                   | Immortal        | 27             | A task worthy of legends that last lifetimes.                                                 |
--| 10                  | Impossible      | 30             | A task that normal humans couldn't consider (but one that doesn't break the laws of physics). |
--
  ### COMBAT
  
- Making an attack in combat works the same way as any other roll: the GM assigns a difficulty to the task, and you roll a
 @@ -124,29 +124,6 @@
  great hammers, massive axes, halberds, heavy crossbows, blaster rifles, and so on. Anything that must be used in two
  hands is a heavy weapon.
@@ -2697,7 +2684,7 @@
  ### MANIFEST CYPHERS
  
  Because manifest cyphers are physical objects, and people are familiar with the idea of finding "treasure" as part of
-@@ -48625,6 +48038,161 @@
+@@ -49666,6 +49079,161 @@
  
  ### FANTASY RULES MODULES
  
@@ -2859,7 +2846,7 @@
  ### AWARDING TREASURE
  
  It's best to think of gold and magic as two different kinds of currencies that characters have access to.
-@@ -49089,6 +48657,411 @@
+@@ -50130,6 +49698,411 @@
  (1 point of ambient damage per 10 feet fallen). The destination is dangerous, such as a tiny room lined with spikes, a
  shark tank, or a boulder in a lava lake.
  
@@ -3270,4 +3257,4 @@
 +
  ### CHARACTER OPTIONS
  
- ### MODERN MAGIC CHARACTER OPTIONS
+ ### WEIRD WEST CHARACTER OPTIONS

patches/base/060-remove-stray-whitespace.patch

@@ -0,0 +1,327 @@
+--- _tmp/ccsrd.md	2025-06-13 08:17:50.099270702 -0500
++++ _tmp/ccsrd.new.md	2025-06-13 08:44:51.451717294 -0500
+@@ -10510,7 +10510,7 @@
+ rather than to ease the task, you deal 2 additional points of damage per level of Effort (instead of 3 points); targets
+ in the area take 1 point of damage even if you fail the attack roll. Action.
+ 
+- Bolster Illusion (2+ Intellect points): You give one of your visual illusions a limited physical reality that viewers
++Bolster Illusion (2+ Intellect points): You give one of your visual illusions a limited physical reality that viewers
+ can smell, taste, hear, and feel. This effect is bound to that illusion and acts appropriate to the illusion itself. For
+ example, it can make the illusion of a brick wall feel like brick, the illusion of a person smell like perfume and able
+ to open a door, and the illusion of a fireplace hot to the touch.
+@@ -19791,7 +19791,7 @@
+ falls from a higher position onto the character. Sometimes the falling block is made to exactly fit a trapped corridor
+ so that triggering the trap makes the area impassible.
+ 
+- A less lethal variant drops a large amount of sand or dirt, inflicting 3 points of ambient damage (ignores Armor).
++A less lethal variant drops a large amount of sand or dirt, inflicting 3 points of ambient damage (ignores Armor).
+ Another variant releases oil (perhaps burning) or marbles, inflicting 3 points of ambient damage and making the area
+ difficult terrain.
+ 
+@@ -19852,7 +19852,7 @@
+ A floor variant is a small trapdoor over a closed compartment, which mangles the character's foot when they step on the
+ trapdoor, reducing their movement speed by half.
+ 
+- Another variant is a needle trap attached to a small peephole or spyhole in a door or wall. The trap springs when the
++Another variant is a needle trap attached to a small peephole or spyhole in a door or wall. The trap springs when the
+ character touches the area around the hole (even a slight touch with their face as they look is sufficient), inflicting
+ lasting damage to the character's eye and partially blinding them. A gentler variant traps the character's limb in glue
+ instead of inflicting damage. The character's extremity might be glued to the hole, or they may be able to pull free but
+@@ -21204,7 +21204,7 @@
+ These modifiers are cumulative, so trying to view a level 4 target who the user knows only by name (+1 step), is
+ unwilling (+1 step), and is 20 miles away (+2 steps) is a difficulty 8 task.
+ 
+- The crystal shows the creature or area for one minute before the image becomes muddled and the artifact must be
++The crystal shows the creature or area for one minute before the image becomes muddled and the artifact must be
+ activated again.
+ 
+ In addition to the normal options for using Effort, the user can choose to apply a level of Effort to open two-way
+@@ -21290,7 +21290,7 @@
+ 
+ Form: Burlap bag containing a handful of large reptilian teeth
+ 
+- Effect: If a tooth is drawn from the bag and cast upon the earth, a dragontooth warrior appears, ready to fight for the
++Effect: If a tooth is drawn from the bag and cast upon the earth, a dragontooth warrior appears, ready to fight for the
+ user for up to ten minutes before going their own way. The user can draw several teeth at once from the bag, but each
+ tooth drawn requires a separate depletion roll.
+ 
+@@ -24073,7 +24073,7 @@
+ 
+ ###### Graser array
+ 
+- level 5 (15)
++level 5 (15)
+ 
+ Exorbitant
+ 
+@@ -24512,7 +24512,7 @@
+ 
+ level 4 (12)
+ 
+- Very Expensive
++Very Expensive
+ 
+ Not armor; belt generates an almost transparent force field to surround the user for up to one hour, providing +1 Armor.
+ Once used, must be recharged for several hours.
+@@ -24598,7 +24598,7 @@
+ 
+ level 1 (3)
+ 
+- Inexpensive
++Inexpensive
+ 
+ Provides light where pointed within short range for a few hours before requiring new batteries/a charge.
+ 
+@@ -25112,7 +25112,7 @@
+ 
+ ###### Auton
+ 
+- level 1 (3)
++level 1 (3)
+ 
+ Moderate
+ 
+@@ -25128,7 +25128,7 @@
+ 
+ level 2 (6)
+ 
+- Expensive
++Expensive
+ 
+ Treat as a level 2 follower, which allows the auton modifications in up to two tasks, depending on the particular aide.
+ 
+@@ -25163,7 +25163,7 @@
+ 
+ Exorbitant
+ 
+- As auton, but one modification is always in attacks, which means when helping a target to make an attack, the target
++As auton, but one modification is always in attacks, which means when helping a target to make an attack, the target
+ eases the task by two steps. However, warrior autons usually attack autonomously as level 3 entities with a ranged or
+ melee weapon that inflicts 5 points of damage.
+ 
+@@ -25523,7 +25523,7 @@
+ 
+ ###### Shotgun
+ 
+- level 3 (9)
++level 3 (9)
+ 
+ Expensive
+ 
+@@ -25533,7 +25533,7 @@
+ 
+ level 3 (9)
+ 
+- Very Expensive
++Very Expensive
+ 
+ Heavy weapon (6 damage, both hands), long range.
+ 
+@@ -25567,7 +25567,7 @@
+ 
+ level 3 (9)
+ 
+- Very Expensive
++Very Expensive
+ 
+ Handheld device that fires attached probe at target within 9 m (30 feet); medium weapon (4 points of electrical damage
+ and on a failed Might defense roll, target is stunned for 1 round, losing their next action).
+@@ -25594,7 +25594,7 @@
+ 
+ ###### Laser/photon pistol
+ 
+-  level 3 (9)
++level 3 (9)
+ 
+ Expensive
+ 
+@@ -25620,7 +25620,7 @@
+ 
+ ###### Vacuum rifle, assault
+ 
+-  level 3 (9)
++level 3 (9)
+ 
+ Very Expensive
+ 
+@@ -25944,7 +25944,7 @@
+ 
+ ##### DRIVERLESS VEHICLES
+ 
+- If the rider, driver, or pilot activates self-driving as part of another action, riding, driving, and piloting tasks
++If the rider, driver, or pilot activates self-driving as part of another action, riding, driving, and piloting tasks
+ are automatically completed (or failed) according to the vehicle's level, though all such self-driving tasks are
+ hindered. However, the pilot is free to engage in other actions as the vehicle maneuvers to the best of its ability.
+ 
+@@ -25954,7 +25954,7 @@
+ 
+ ##### LOOKING FOR MORE VEHICLE OPTIONS
+ 
+- A representative cross section of vehicles is provided. If you're looking for something that isn't noted, use something
++A representative cross section of vehicles is provided. If you're looking for something that isn't noted, use something
+ close and adapt the listing.
+ 
+ Also note that unless a particular listing is already indicated as a luxury or sport version, most vehicles can be
+@@ -26157,7 +26157,7 @@
+ 
+ level 5 (15)
+ 
+- Exorbitant
++Exorbitant
+ 
+ Treaded, all-terrain wheels support a completely enclosed interior habitat with five to ten interior chambers arranged
+ either to house one or more families, support scientific research, exploration, spying, or configured for some other
+@@ -26510,7 +26510,7 @@
+ 
+ ###### Tank
+ 
+- level 4 (12)
++level 4 (12)
+ 
+ Exorbitant
+ 
+@@ -26890,7 +26890,7 @@
+ 
+ level 5 (15)
+ 
+- Priceless As corvette spacecraft, but four times as large, allowing four times the crew and ten weapon systems
++Priceless As corvette spacecraft, but four times as large, allowing four times the crew and ten weapon systems
+ (including two superior weapon systems). Possesses superior defenses. Often utilized to escort larger vessels in a space
+ fleet or battle group and defend them against swarms of smaller attackers. Includes bays for two fireteams of six
+ microcapsule fighters (darts).
+@@ -26962,7 +26962,7 @@
+ 
+ level 2 (6)
+ 
+- Exorbitant
++Exorbitant
+ 
+ A small double-occupant starship with two weapon systems that fire blasters. Minimum size vehicle capable of FTL
+ travel.
+@@ -27485,12 +27485,12 @@
+ Immediate Posthuman Upgrades: As part of character creation, PCs are given the options presented hereafter because the
+ setting demands it. Narrative options include (but are not limited to):
+ 
+- • PCs are part of a program designed to adapt them to being able to survive and thrive in conditions other than the 1
++• PCs are part of a program designed to adapt them to being able to survive and thrive in conditions other than the 1
+ G, 1 atmosphere, oxygenated, Goldilocks environment of the Earth.
+ 
+ • PCs begin their career as super-soldiers to fight aliens or to serve as corporate spies.
+ 
+- • PCs serve as long-lived guardians to watch over a generation ship hurtling at slower-than-light speeds between the
++• PCs serve as long-lived guardians to watch over a generation ship hurtling at slower-than-light speeds between the
+ stars.
+ 
+ • PCs are children of a far-future civilization that routinely upgrades its citizens.
+@@ -27505,7 +27505,7 @@
+ • PCs are kidnapped by aliens or conglomerate operatives, and upgraded—with some command-andcontrol circuits also
+ installed—to serve some specific purpose.
+ 
+- • PCs learn a "new science," allowing them to tap cosmic energies other creatures are unaware of.
++• PCs learn a "new science," allowing them to tap cosmic energies other creatures are unaware of.
+ 
+ ##### POSTHUMAN PACKAGES
+ 
+@@ -29816,7 +29816,7 @@
+ 
+ • Stands Like a Bastion
+ 
+- • Throws With Deadly Accuracy
++• Throws With Deadly Accuracy
+ 
+ • Travels Through Time
+ 
+@@ -30406,7 +30406,7 @@
+ 
+ ###### Very Expensive
+ 
+-  Elegant cloak or coat
++Elegant cloak or coat
+ 
+ Royal ensemble
+ 
+@@ -45068,7 +45068,7 @@
+ 
+ A corrupt mage knows many spells, such as the following:
+ 
+- • Armor: Covers a creature with ugly scales, granting them +3 to Armor for an hour.
++• Armor: Covers a creature with ugly scales, granting them +3 to Armor for an hour.
+ 
+ • Madness: Wracks the brain of one creature within short range for one hour, reducing them to a babbling catatonic state
+ in which they can't recognize friend or foe. If disturbed or harmed, the creature is likely to lash out with lethal
+@@ -45183,7 +45183,7 @@
+ focuses on a single target, treat the attack as a level 10 attack that inflicts 14 points of damage, or 6 points even on
+ a successful Speed defense roll.
+ 
+- Self-repair mechanisms allow the creature to regain 2 points of health per round.
++Self-repair mechanisms allow the creature to regain 2 points of health per round.
+ 
+ Interaction: If communication can be opened up through a cybrid's haze of pain, it might be possible to temporarily wake
+ the consciousness of the human remnant inside. However, that remnant consciousness might not be happy to discover what
+@@ -45505,7 +45505,7 @@
+ They can also call on a variety of other magical abilities that mimic the effect of any cypher of level 5 or
+ lower—usually destructive, painful, and transformative effects.
+ 
+- A demon lord automatically regains 3 points of health per round. They typically have the following abilities:
++A demon lord automatically regains 3 points of health per round. They typically have the following abilities:
+ 
+ • Change Shape: The demon lord can take the form of a human or similar humanoid as its action, or return to its regular
+ shape. When so changed, its disguise is nearly impenetrable without special knowledge. As a human, the demon lord is a
+@@ -47604,7 +47604,7 @@
+ or make a Might defense roll. On a failure, they take 5 points of ambient damage as their flesh partly mineralizes. If
+ the character is killed by this damage, they are turned to stone.
+ 
+- Some gorgons carry a couple of cyphers and perhaps an artifact that they can use in combat.
++Some gorgons carry a couple of cyphers and perhaps an artifact that they can use in combat.
+ 
+ Interaction: Bitterness consumes gorgons. They lead lonely lives, cut off from everyone they have loved. Negotiating
+ with one would be something of a feat.
+@@ -48131,7 +48131,7 @@
+ through the crumbling structure at a considerable distance, waiting for them to take a rest or become otherwise
+ distracted before attacking.
+ 
+- Loot: Hydras sometimes collect cyphers and artifacts in their lair, or failing that, they guard something of value.
++Loot: Hydras sometimes collect cyphers and artifacts in their lair, or failing that, they guard something of value.
+ 
+ GM intrusion: The character reacts poorly to the poison in the air or a bite and goes intonhelpless convulsions for one
+ round if they fail a Might defense task.
+@@ -48688,10 +48688,10 @@
+ Combat: A lich can shoot blasts of necromantic energy that inflict 8 points of damage on a target and 4 points on any
+ creature within immediate range of the target. A lich knows many spells, such as the following:
+ 
+- • Animate guards: Animate ten corpses as skeletons or zombies, which obey the lich for one hour before turning back
++• Animate guards: Animate ten corpses as skeletons or zombies, which obey the lich for one hour before turning back
+ into corpses.
+ 
+- • Armor: Gain +5 Armor for one hour.
++• Armor: Gain +5 Armor for one hour.
+ 
+ • Death: Inflict 8 points of damage on a creature within short range; if the creature fails a Might defense roll, it
+ also moves two steps down the damage track.
+@@ -52733,7 +52733,7 @@
+ of crafty bandits has managed to train a couple of wyverns as mounts and use them as flying cavalry for their troops on
+ the ground.
+ 
+- Loot: Wyverns do not collect treasure, but their nest might have a few cyphers from previous victims. If carefully
++Loot: Wyverns do not collect treasure, but their nest might have a few cyphers from previous victims. If carefully
+ extracted, an intact venom gland from a dead wyvern can be used to poison one weapon (if sold, it is the equivalent of
+ an expensive item).
+ 
+@@ -53214,7 +53214,7 @@
+ relying on strength (such as climbing and jumping) are eased by two steps. However, their Speed defense is hindered. A
+ raging berserker fights only with melee weapons and won't retreat from battle.
+ 
+- Interaction: Berserkers are the elites of some warrior cultures and enjoy physical competitions such as wrestling,
++Interaction: Berserkers are the elites of some warrior cultures and enjoy physical competitions such as wrestling,
+ throwing heavy items, and feasting. They dislike weak and cowardly folk, and do not tolerate insults to their strength
+ or honor.
+ 
+@@ -53569,7 +53569,7 @@
+ 
+ Dwarf leaders are usually officers or priests.
+ 
+- Interaction: Dwarves are proud and hardworking, but they tend to be stubborn, gruff, and unforgiving of offenses to
++Interaction: Dwarves are proud and hardworking, but they tend to be stubborn, gruff, and unforgiving of offenses to
+ them or their clan. It takes time to gain their trust, but they respect a fair deal, a hard bargain, a sharp axe, and a
+ sturdy hammer.
+