Filled out the combat section

rules.md

@@ -20,6 +20,8 @@ It is from here that your game begins.
 
 ## Tier, the Sacred Mountain
 
+:warning: **Attention:** Names, including the name of the mountain, are subject to change, depending on how the IRL language research works out.
+
 The mountain's slopes are traditionally divided into seven distinct areas, known as tiers. These are:
 
 * [Vorland, The City Below](#vorland-the-city-below)
@@ -130,13 +132,25 @@ The core gameplay of this game is a combination of role play scenarios, combat a
 
 ## Combat and Skill Challenges
 
-At certain points during the campaign, you will be presented with an obstacle or series of obstacles that require rolling a d20, and scoring above a certain target value - these are called "Skill Challenges". When performing a Skill Challenge, you may select a skill your character knows that could reasonably contribute towards overcoming that obstacle.
+At certain points during the campaign, you will be presented with an obstacle or series of obstacles that requires rolling a d20, and scoring above a certain target value - these are called "Skill Challenges". When performing a Skill Challenge, you may select a skill your character knows that could reasonably contribute towards overcoming that obstacle; either adding the current level of that skill to your roll, or using some listed effect.
 
-Unless otherwise stated, add the current level of that skill to your roll - on a success, you succeed in overcoming whatever task you were attempting; on a failure, you lose your choice of either one point of Stamina, or one point from that skill's linked attribute. You cannot use a skill if the linked attribute has already been reduced to 0.
+On a success, you succeed in overcoming whatever task you were attempting; on a failure, you lose your choice of either one point of Stamina, or one point from that skill's linked attribute. You cannot use a skill if the linked attribute has already been reduced to 0.
 
-When you fail a Skill Challenge, you may choose to "exert" your character once by spending one point of their Stamina to re-roll that attempt - if you do, you must take the new result, even if a loss costs an additional point from your attributes. If your Stamina ever reaches 0 (either by accident or deliberately), you become [Fatigued](#resting-and-fatigue).
+When you fail a Skill Challenge, you may choose to "exert" your character once by spending one point of Stamina to re-roll that attempt - if you do, you must take the new result. If your Stamina ever reaches 0 (either by accident or deliberately), you become [Fatigued](#resting-and-fatigue).
 
-:question: **TODO:** combat is missing - critical hits do fancy things, based on the weapon
+When you find yourself fending off an attacker, or as an attacker, all participating creatures are said to be in combat. Combat is broken down into a series of rounds, during which each combatant will have the opportunity to act.
+
+At the beginning of each round, all combatants must roll a d20 to determine what order they take their turns in, re-rolling to break ties. Then, starting from the first combatant in the turn order, they may either attack with a melee or ranged weapon, maneuver around the environment for a better vantage point, or they may attempt to flee the battle.
+
+If attacking a target, you must first perform a hit roll by rolling a d20, with the target's current Fortitude as the target value. On a success, you may perform a wound roll by rolling dice based on the weapon or item you are using (attacking while unarmed has a wound roll of 1d6).
+
+When you succeed a hit roll, if you rolled a 20 (the maximum value), this is called a critical hit. Unless the effects of a critical hit are listed for the weapon or item you used, the damage dealt by this attack is doubled. When you fail a hit roll, you may choose to "exert" your character once by spending one point of Stamina to re-roll that attempt - if you do, you must take the new result.
+
+The damage dealt by the wound roll is subtracted from the target's Health, and the target's Fortitude is reduced by 1. Just as with Skill Challenges, if a combatant's Stamina or Fortitude ever reaches 0, they become [Fatigued](#resting-and-fatigue). Likewise, if their Health reaches 0, they [die](#dying-and-death).
+
+If you decide to maneuver around the environment on your turn, you can position yourself somewhere that is easier to attack from next round, or places you somewhere out of danger. Ranged weapons normally cannot be used on a target adjacent to an attacker, and using a ranged weapon while an enemy is adjacent to you will grant that enemy an additional 1d6 to their wound roll if they attack you this turn.
+
+If you're in a safe position, with no adjacent enemies, and not within the line of sight of a ranged enemy, you may spend one Stamina and one Fortitude to rapidly flee from the battlefield, safely abandoning the fight. Once again, if your Stamina or Fortitude ever reaches 0, you become [Fatigued](#resting-and-fatigue).
 
 ## Resting and Fatigue