[crawl-ref-commits] master branch updated: 0.13-a0-2546-g92a6f35

[<gi...@cr...>]

       via  92a6f35f339cb52a0fd7ec4ad2014142fb80e110 (commit)
       via  d8946ff53f7fd1392c8296f534a2cd896ff994ff (commit)
      from  cce9a79def4c052420329fcce7c2a3035f7aeb9f (commit)

-----------------------------------------------------------------------
commit 92a6f35f339cb52a0fd7ec4ad2014142fb80e110
Author: Chris Oelmueller <chr...@gm...>
Date:   Sun Jul 28 00:32:46 2013 +0200

    Do not generate hammers unless defined in a vault
    
    This sets their item rarity to 0 and disallows monsters to spawn with a
    hammer as weapon. Yiuf was not harmed in the process.
    
    Their weight of 20 has been redistributed to 19 as follows:
    - hand axes (+6) which have the exact same stats
    - clubs (+5)
    - whips (+5)
    - flails (+3)
    
    I also considered a mapping like clubs (+10), maces (+5), flails (+3),
    whips (+2) instead but ultimately went for hand axes as suitable filler
    because of the exact same stats.

commit d8946ff53f7fd1392c8296f534a2cd896ff994ff
Author: Chris Oelmueller <chr...@gm...>
Date:   Sat Jul 27 23:29:36 2013 +0200

    Make a cantrip message substantially less confusing
    
    The monster "looks stronger" actually has a meaning in crawl too, and
    many players have asked about what it would mean when used as cantrip.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/itemprop.cc |    2 +-
 crawl-ref/source/mon-cast.cc |    2 +-
 crawl-ref/source/mon-gear.cc |    8 ++++----
 crawl-ref/source/ng-setup.cc |    3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 8271bf1..f21dc08 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1336,7 +1336,6 @@ int weapon_rarity(int w_type)
 
     case WPN_BOW:
     case WPN_FLAIL:
-    case WPN_HAMMER:
     case WPN_SABRE:
     case WPN_SHORT_SWORD:
     case WPN_SLING:
@@ -1399,6 +1398,7 @@ int weapon_rarity(int w_type)
     case WPN_TRISHULA:
     case WPN_STAFF:
     case WPN_ROD:
+    case WPN_HAMMER:
         // Zero value weapons must be placed specially -- see make_item() {dlb}
         return 0;
 
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index ea4b409..4b241c9 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -4507,7 +4507,7 @@ void mons_cast(monster* mons, bolt &pbolt, spell_type spell_cast,
         {
             // Messages about the monster influencing itself.
             const char* buff_msgs[] = { " glows brightly for a moment.",
-                                        " looks stronger.",
+                                        " looks braver.",
                                         " becomes somewhat translucent.",
                                         "'s eyes start to glow." };
 
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index 5490e16..d27e96c 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -504,10 +504,10 @@ static item_make_species_type _give_weapon(monster* mon, int level,
         {
             item.base_type = OBJ_WEAPONS;
             item.sub_type  = random_choose_weighted(
-                30, WPN_DAGGER,      30, WPN_CLUB,
-                27, WPN_FLAIL,       24, WPN_HAND_AXE,
-                20, WPN_HAMMER,      20, WPN_SHORT_SWORD,
-                20, WPN_MACE,        10, WPN_WHIP,
+                35, WPN_CLUB,        30, WPN_DAGGER,
+                30, WPN_FLAIL,       30, WPN_HAND_AXE,
+                20, WPN_SHORT_SWORD,
+                20, WPN_MACE,        15, WPN_WHIP,
                 10, WPN_TRIDENT,     10, WPN_FALCHION,
                 6, WPN_WAR_AXE,      3, WPN_MORNINGSTAR,
                 0);
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 96a321d..1ebae53 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -925,8 +925,7 @@ static void _give_items_skills(const newgame_def& ng)
         // This is meant to match the En/As start change-up, but Trolls have
         // claws, so they don't get a starting melee weapon (see above).
         // The +1 is meant to make this less sucky; it could be a better
-        // base type, but whips don't seem very hunter-ish and hammers are
-        // used almost nowhere.
+        // base type, but whips don't seem very hunter-ish.
         if (you.species == SP_OGRE)
         {
             you.inv[0].sub_type = WPN_CLUB;


-- 
Dungeon Crawl Stone Soup