From afae49b7282817a9bbc607d0f5a9dbe312cc40f4 Mon Sep 17 00:00:00 2001
From: pubby <pubby8@gmail.com>
Date: Tue, 2 Jun 2015 23:19:27 -0500
Subject: [PATCH 1/3] Buff shafting.

Taking known shafts now has a 2/3 chance of shafting one floor and 1/3 chance
of shafting two. Unknown shafts still have an equal chance of shafting one,
two, or three floors. Note that shafting is still unreliable/risky with
this commit.
---
 crawl-ref/source/traps.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 6e0aa3e..3b2ad59 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1777,11 +1777,9 @@ static level_id _generic_shaft_dest(level_pos lpos, bool known = false)
 
     if (known)
     {
-        // Chances are 5/8s for 1 level, 2/8s for 2 levels, 1/8 for 3 levels
-        int s = random2(8) + 1;
-        if (s == 1)
-            lid.depth += 3;
-        else if (s <= 3)
+        // Chances are 2/3 for 1 level, 1/3 for 2 levels
+        int s = random2(3);
+        if (s == 0)
             lid.depth += 2;
         else
             lid.depth += 1;
-- 
2.4.2

From d12c614a9d5860ec6b19f56ca7e8f73bdf909231 Mon Sep 17 00:00:00 2001
From: pubby <pubby8@gmail.com>
Date: Tue, 2 Jun 2015 23:31:35 -0500
Subject: [PATCH 2/3] Change Fo throwing aptitude from -2 to 0.

The original implementation of Formicids were able to throw large rocks.
For balance reasons they had -2 throwing to balance this ability.
Now that Formicids can't throw large rocks, it makes sense for them to
have 0 throwing.
---
 crawl-ref/source/aptitudes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index f562249..c4b2a6f 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -1418,7 +1418,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_FORMICID,        SK_SLINGS,          1),
     APT(SP_FORMICID,        SK_BOWS,           -2),
     APT(SP_FORMICID,        SK_CROSSBOWS,       0),
-    APT(SP_FORMICID,        SK_THROWING,       -2),
+    APT(SP_FORMICID,        SK_THROWING,        0),
     APT(SP_FORMICID,        SK_ARMOUR,          1),
     APT(SP_FORMICID,        SK_DODGING,        -1),
     APT(SP_FORMICID,        SK_STEALTH,         3),
-- 
2.4.2

From f1a106569abeac6a7e8464d69e9eabd1213aea2c Mon Sep 17 00:00:00 2001
From: pubby <pubby8@gmail.com>
Date: Wed, 3 Jun 2015 00:00:17 -0500
Subject: [PATCH 3/3] Remove Formicid UC shield penalty.

Tasonir wrote:

Proposal: Remove the 50% chance of 1 aut penalty to unarmed attacks when using
a shield as a formicid.

Background: There are two different attack delay penalties imposed by shields.
The first applies to all weapons and is reduced to zero when you have enough
shield skill for the type of shield and your size. The second penalty applies
to only unarmed and adds a 50% chance of +1 aut delay, regardless of size or
shield skill. This is to mimic unarmed behaving as a 1h weapon, with a lower
damage output (per time) than the 2h version. It also loses the offhand punch,
unless you're an octopode. I am only referring to removing the second penalty.

Rationale for the change: Since Formicids can wield any 2h weapon (minus giant
weapons) as a 1h weapon, allow them to keep the "2h" version of unarmed. They
are designed to use shields in combination with the heaviest weapons without
penalty, so having a shield impact your unarmed attacks is inconsistent. It
is, to my knowledge, the only time that having a shield can penalize your
weapon's attack/impact your weapon choice that you cannot remove by training
shield skill. Unarmed is generally not the most powerful weapon, so nerfing it
further for them, compared to what the race can do with 2h weapons, limits
their choices for melee weapons. If the penalty is removed, it would be more
viable for them to use unarmed, allowing monk/transmuter playstyles to take
advantage of their relatively good aptitudes (0 unarmed, +1 transmutations,
+1 fighting) and benefit from their strong abilities to use shields (treated
as a large race, +2 aptitude).
---
 crawl-ref/source/player-act.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index 56be6f8..e4c162d 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -330,7 +330,7 @@ random_var player::attack_delay(const item_def *weap,
                            DELAY_SCALE);
     }
     // Give unarmed shield-users a slight penalty always.
-    if (!weap && shield())
+    if (!weap && shield() && you.species != SP_FORMICID)
         shield_penalty += rv::random2(2);
 
     if (!do_shield)
-- 
2.4.2