diff --git a/actions.tex b/actions.tex
index 847b3f47b4d93eed5ef671dd6e970fbebbba4323..b1967d7b7a76eec0d77ac1dc6fb70a169d3d736f 100644
--- a/actions.tex
+++ b/actions.tex
@@ -190,7 +190,7 @@ When characters can work together, one person rolls with their Bonus, then adds
\footnote{Always round up on half, so $4 + \frac{1}{2} = 5$, but $5 + \frac{1}{4} = 5$.}
\begin{exampletext}
- Convincing the townsfolk that they need to rebel against the \gls{warden}, the troupe work together on a \roll{Charisma}{Tactics} roll.
+ Convincing the townsfolk that they need to rebel against the \gls{warden}, the troupe work together on a \roll{Charisma}{Combat} roll.
Pikerudd has the highest Bonus, so he adds the full Bonus, then Snowblight adds half of his, and Chatrik, a quarter.
\end{exampletext}
@@ -198,7 +198,7 @@ When characters can work together, one person rolls with their Bonus, then adds
& Pikerudd & Snowblight & Chatrik \\
\hline
\raggedright
-\roll{Charisma}{Tactics} & +4 & +2 & +2 \\
+\roll{Charisma}{Combat} & +4 & +2 & +2 \\
Multiplier & 1 & $\frac{1}{2}$ & $\frac{1}{4}$ \\
Value: & 4 & $1$ & $\frac{1}{2}$ \\
Running Total: & 4 & $5$ & $5+\frac{1}{2}$ \\
@@ -221,7 +221,7 @@ With a \gls{tn} of 12, rolling 14 means a margin of 2.
The \gls{gm} might use a Margin for some variable, for example a bard attempting to charm a crowd into giving him money might gain $2D6$ copper pieces plus the Margin, so if the Margin is 3 then he would get $2D6+3$ copper pieces.
Margins might also be used to gain bonuses on later rolls.
-Someone attempting to impress a noble court might roll Charisma with the Tactics Skill; the bigger the Margin the more troops they will be trusted with.
+Someone attempting to impress a noble court might roll Charisma with the Combat Skill; the bigger the Margin the more troops they will be trusted with.
\subsection{What the Dice Mean}
diff --git a/combat.tex b/combat.tex
index a6f9ad951d5812beeac9c3ac94ee75759fcc0544..fabafe966526d17b0539a16716a7db29d68fdf2e 100644
--- a/combat.tex
+++ b/combat.tex
@@ -533,6 +533,13 @@ They take a penalty to Speed (the default is -2), which reduces their \glspl{ap}
These additional actions cover different ways to engage with enemies.
Anyone can use them at any point, if they use the right weapons.
+\subsubsection{\Glsfmtplural{ambush}}
+\glsdesc{ambush}
+
+If a player has a plan, they describe it, and make a roll.
+On a success, the scene plays out as planned.
+On a failure, the \gls{gm} describes how this plan goes wrong.
+
\makeAutoRule{closeMagic}{Close Magic}{roll vs enemy's Attack as usual}
\index{Melee!Magic}
\index{Magic!Close}
diff --git a/config b/config
index 12a891ebbfa4042cfd064c4787023d116879681c..3c99070c7997982fa3b4a46995f354565a3db8e2 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 12a891ebbfa4042cfd064c4787023d116879681c
+Subproject commit 3c99070c7997982fa3b4a46995f354565a3db8e2
diff --git a/knacks.tex b/knacks.tex
index b665cac4d3d624ebb080adeda42d059810cc7ed8..4d6d8b9c6800036726f62581871374a717942b1c 100644
--- a/knacks.tex
+++ b/knacks.tex
@@ -237,7 +237,7 @@ For example, ambush specialists could focus on nocturnal guerilla raids, awaitin
This Knack would grant a +2 Bonus when using one of these exact specialization, or a +1 Bonus when attempting any kind of ambush, relating the history of ambushes, drawing an ambush, or writing poetry about ambushes.
-While a focus on `ambushes' naturally lends itself to the Tactics Skill more than others, specializations can cut across Skill-boundaries, adding to any roll.
+While a focus on `ambushes' naturally lends itself to the Combat Skill more than others, specializations can cut across Skill-boundaries, adding to any roll.
Suggested specializations include:
diff --git a/traits.tex b/traits.tex
index a2f350545bafbcfa142d0b9148a19a2750ba8c8c..5a51fd07d344b221496d995b519d1bb4afdda572 100644
--- a/traits.tex
+++ b/traits.tex
@@ -764,67 +764,6 @@ While sneaking, players can say anything about what their character does, but an
\end{exampletext}
-\subsection{Tactics}
-
-Tactics allows people to plan concise victories.
-The utility quickly fades when battles become drawn-out and unpredictable, but the initial benefits from going into battle with a good plan are great.
-It can be used to understand why people are employing apparently odd battle-tactics, or uses Charisma to impress people concerning one's military ability.
-
-\begin{description}
- \item[\roll{Strength}{Tactics}]
- to cobble together the right kind of wall to hide behind with a bow.
- \item[\roll{Intelligence}{Tactics}]
- means planning battles.
- \item[\roll{Wits}{Tactics}]
- lets someone notice an ambush.
- \item[\roll{Charisma}{Tactics}]
- dictates with the drawn-out negotiations, dances, and dinners of the wardens.
-\end{description}
-
-When going into combat, someone who has time to prepare for a battle by running through instructions with receptive troops gains a bonus to their \glspl{ap} equal to their Tactics Skill.
-This bonus only ever counts for the first \gls{round}.
-
-The enemy resist with \roll{Wits}{Tactics}.
-
-\begin{exampletext}
-
- ``\ldots I realize this unfortunate news comes as a shock.
- Disloyalty may be the worst of all crimes.''
-
- ``Did you get all that?'', the Overseer asked.
-
- ``Yes, sir'', said the ranger.
-
- ``Yours eternally, \ldots Overseer Coreolis''
-
- ``Let me see what you've written.
- Okay\ldots yes\ldots
- Is this meant be my name at the end?''
-
- ``Signatures should look like that, sir, so it looks official.''
-
- ``Do the double seaman's knot.
- I don't want anyone to even think he can open this without clearly breaking the seal upon the king's messages.''
-
- ``Yes, sir.
- Double seaman's knot, sir''
-
- The ranger cut the paper's edge with a knife, punctured it in the centre, rolled it up, and looped the stray paper-edges through the hole.
- Nobody could open the scroll without breaking the paper.
-
- The ranger applied the wax, and handed it to his Overseer to push his seal into the wax.
-
- ``Now run along, and send it to the messenger-crew, quick man!''
-
- ``Yes sir'', and out the door he went, pressing the scroll into a button on his chest.
- The wax seal would be his.
- The handwriting, also his.
-
- He would be the natural successor to the post of Overseer.
- That left only one more thing to take care of\ldots
-
-\end{exampletext}
-
\subsection{Vigilance}
Everyone in the \gls{guard} practices paranoia daily.