diff --git a/arms.sty b/arms.sty
index 67b90467321f396bb813fe14725171860aa93fd3..e0ac96335ceed1d94250f5996c7a3f3d29aeb3e9 100644
--- a/arms.sty
+++ b/arms.sty
@@ -43,6 +43,19 @@
   #1 & \arabic{weaponBonus} & \arabic{damage} & \arabic{heft} & \arabic{weight}
 }
 
+\newcommand\rangedWeapon[4][0]{%
+  \setcounter{track}{7}%
+  \addtocounter{track}{#1}%
+  \addtocounter{track}{\value{Dexterity}}%
+  \addtocounter{track}{\value{Projectiles}}%
+  \setcounter{enc}{#3}%
+  #2 (\glsentrytext{tn}~\arabic{track}, \dmg{enc}, \glsentrytext{ap}~{#4})%
+}
+
+\newcommand\smolCrossBow{%
+  \rangedWeapon{Crossbow}{6}{1}%
+}
+
 % Shields work much like weapons, except that their Bonus is high, their initiative cost is low, but their attack is poor.
 
 \newcommand\shield[3][]{%
diff --git a/monsters.sty b/monsters.sty
index 3d4658b58a5239a893ef53eef21cce7735d97725..77bf32db7e00b99c36549d86037e9fa2d3be4ea8 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -564,39 +564,57 @@
 }
 
 \newcommand{\gnomishsoldier}[1][\npc{\T[\arabic{r12}]\Gn\M}{Gnomish Soldiers}]{
-  \randomdozen
-  #1
-  \randomtwo
-  \addtocounter{enc}{-2}
-  \randomtwoB
-  \randomtwoC
-  \addtocounter{r2b}{-1}
-  \randomthree
-  \randomthreeB
-\person{\arabic{enc}}% STRENGTH
-{\arabic{r2}}% DEXTERITY 
-{\arabic{r2b}}% SPEED
-{{\arabic{age}}% INTELLIGENCE
-{\arabic{r2}}% WITS
-{\arabic{r2b}}}% CHARISMA
-{0}% DR
-{\arabic{r2}}% COMBAT
-{\ifnum\value{enc}<0%
-  Projectiles \arabic{r2c}, 
-\fi%
-Academics~1, \ifodd\value{r12} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\value{r2} \else Larceny~\arabic{r2c}, \fi Stealth~\arabic{r2c}
-}% SKILLS
-{\ifnum\value{enc}=0%
-  \shortsword
-\else%
-  Shortbow, \Dagger%
-\fi%
-\ifnum\value{r3c}=2%
-  , \partialelvish%
-\fi%
-, \lootMedium
-}% EQUIPMENT
-{}
+    \randomdozen
+    #1
+    \randomtwo
+    \addtocounter{enc}{-2}
+    \randomtwoB
+    \randomtwoC
+    \addtocounter{r2b}{-1}
+    \randomthree
+    \randomthreeB
+  \person{\arabic{enc}}% STRENGTH
+  {\arabic{r2}}% DEXTERITY 
+  {\arabic{r2b}}% SPEED
+  {{\arabic{age}}% INTELLIGENCE
+  {\arabic{r2}}% WITS
+  {\arabic{r2b}}}% CHARISMA
+  {0}% DR
+  {\arabic{r2}}% COMBAT
+  {}% SKILLS
+  {%
+    \ifnum\value{Projectiles}>1%
+      \smolCrossBow%
+    \else%
+      \shortsword%
+    \fi%
+  \ifnum\value{r3c}=2%
+    , \partialelvish%
+  \fi%
+  , \lootMedium
+  }% EQUIPMENT
+  {
+    \setcounter{Academics}{1}
+    \ifodd\value{r12}
+      \setcounter{Crafts}{\value{r2}}
+    \else
+      \setcounter{Deceit}{\value{r2}}
+    \fi
+    \ifodd\value{r2}
+      \setcounter{Larceny}{\value{r2c}}
+    \fi
+    \setcounter{Stealth}{\value{r2c}}
+    \setcounter{Projectiles}{0}
+    \ifodd\value{r3}
+      \stepcounter{Projectiles}
+    \fi
+    \ifodd\value{r3b}
+      \stepcounter{Projectiles}
+    \fi
+    \ifodd\value{r3c}
+      \stepcounter{Projectiles}
+    \fi
+  }
 }
 
 \newcommand{\gnomishillusionist}[1][\npc{\Gn\M}{Gnomish Illusionist}]{