rewrite some combat rules with \makeAuroRule

combat.tex

@@ -463,6 +463,7 @@ It is quite possible to kill a companion while fighting blind.
 \label{darkness}
 \index{Darkness}
 \index{Combat!Darkness}
+\index{Spelunking!Fighting in darkness}
 
 Fighting in the darkness, or just twilight, can give a distinct advantage to those with sharper senses.
 Those who retain some basic vision while their opponents have none are in a similar situation to fighting a blinded opponent.
@@ -483,28 +484,22 @@ characters Attribute bonuses cannot go beyond the character's \roll{Wits}{Vigila
 (such as a moonless night)
 only gives a -1 penalty to characters with a \roll{Wits}{Vigilance} lower than their roll.
 
-\subsubsection[Enclosed Spaces: Penalty equals weapon's \glsentrytext{ap} cost]{Enclosed Spaces}
-\label{enclosedcombat}
-\index{Enclosed Spaces}
+\makeAutoRule{enclosedcombat}{Enclosed Combat}{penalty equals weapon's \glsentrytext{ap} cost minus 1}
+\index{Spelunking!Enclosed Combat}
 
 Enclosed spaces cause serious problems for people wielding longswords, battle axes, and other large weapons.
 Daggers and shortswords often have an easier time in these locations.
 
-When a character has no space to swing a weapon -- either vertically or horizontally -- their Attack gains a penalty equal to the weapon's \gls{ap} cost.
+When a character has no space to swing a weapon -- either vertically or horizontally -- their Attack gains a penalty equal to the weapon's \gls{ap} cost minus 1.
 
-\subsubsection[Trapped/ Entangled: Character cannot use their Dexterity Bonus, and takes -2 Attack penalty]{Trapped or Entangled}
+\makeAutoRule{enclosedcombat}{Trapped, Entangled, or Prone}{the character loses their Dexterity Bonus, and takes -2 Attack penalty}
 \label{trapped}
 \label{entangled}
-
-Characters caught in mud, who slip over, or get shackled to a spot cannot move or dodge nearly as well as they could.
-They cannot use their Dexterity Bonus in Combat (penalties still apply), and take a -2 penalty to attacks.
-
-\subsubsection[Falling Prone: -2 penalty when on the ground]{Falling Prone}
 \index{Prone}
 \label{prone}
 
-Attacks against a \textit{Prone} target gain a +2 bonus.
-However, they can get up as by spending 1 \gls{ap}.
+Characters caught in mud, who slip over, or get shackled to a spot cannot move or dodge nearly as well as they could.
+They cannot use their Dexterity Bonus in Combat (penalties still apply), and take a -2 penalty to rolls using their Physical Attributes.
 
 \subsubsection[+1 to attack]{Higher Ground}