Add database entry for "martial arts" the skill

diff --git a/dat/data.base b/dat/data.base
index b18af14efba8f398d04d2685da6b1c94cd17cd62..9f2e6433a57ba17ca4188f2cc9dc943fed62c8b4 100644 (file)
--- a/dat/data.base
+++ b/dat/data.base
@@ -426,8 +426,8 @@ barbed devil
        Barbed devils lack any real special abilities, though they
        are quite difficult to kill.
 # takes "bat or bird" when specifying 'B'
-~combat
-~wombat
+~*combat
+~*wombat
 *bat
 bat or bird
        A bat, flitting in the darkness outside, took the wrong turn
@@ -3179,6 +3179,15 @@ mars
        explain why he became a god of death and finally a god of war.
        He is the son of Jupiter and Juno.
                [ Encyclopedia Mythica, ed. M.F. Lindemans ]
+martial arts
+unarmed combat
+bare*handed combat
+        "What else can we do? None of this is fast enough." "It will have
+        to be." He stood up, a tall, broad wall of a man.  "Why don't you
+        ask around, see if anyone in the neighborhoods knows anything
+        about martial arts.  You need more than a book or two to learn
+        good dependable unarmed combat."
+                [ Parable of the Sower, by Octavia Butler ]
 master assassin
        He strolled down the stairs, followed by a number of assassins.
        When he was directly in front of Ymor he said: "I've come for

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index a4f90a550a94fe82fd6fc21e7fb68c91640386e0..6b25341be6d1363f7e3290e9ede1d560cd02fa89 100644 (file)
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -418,6 +418,7 @@ surviving a gas spore's explosion would leave that explosion as a stale reason
        for death which might show up strangely ("crushed to death by a gas
        spore's explosion" when killed by an opening drawbridge)
 blessed scroll of fire lets you choose explosion location like stinking cloud
+add database entry for "martial arts"
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository