Applying my two latest commits (Xom changes or the small

part that applies to 0.3, and net descriptions) to 0.3.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2386 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 13 insertions, 13 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 8b1621583b..b9e5edec48 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1390,17 +1390,17 @@ static std::string describe_ammo( const item_def &item )
         {
             std::string how;
             if (item.plus > -3)
-                how = "a little";
+                how = "a little worn";
             else if (item.plus > -5)
-                how = "somewhat";
+                how = "slightly damaged";
             else if (item.plus > -7)
-                how = "very";
+                how = "damaged";
             else
-                how = "extremely";
+                how = "heavily frayed";
 
             description += "It looks ";
             description += how;
-            description += " worn.";
+            description += ".";
         }
         else if (item.plus > 1)
             description += "The net looks brand-new!";
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 012fdc81ec..ebb4ff3e8d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -855,13 +855,13 @@ enum dungeon_feature_type
     DNGN_STONE_STAIRS_DOWN_I,
     DNGN_STONE_STAIRS_DOWN_II,
     DNGN_STONE_STAIRS_DOWN_III,
-    DNGN_ROCK_STAIRS_DOWN,   //  85 - now escape hatch (Stonesoup 0.3)
+    DNGN_ROCK_STAIRS_DOWN,             //  85 - now escape hatch (Stonesoup 0.3)
 
     // corresponding up stairs (same order as above)
     DNGN_STONE_STAIRS_UP_I,
     DNGN_STONE_STAIRS_UP_II,
     DNGN_STONE_STAIRS_UP_III,
-    DNGN_ROCK_STAIRS_UP,    //   89 - now escape hatch (Stonesoup 0.3)
+    DNGN_ROCK_STAIRS_UP,               //  89 - now escape hatch (Stonesoup 0.3)
 
     // Various gates
     DNGN_ENTER_DIS = 92,               //   92
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index cbd3b50ea8..3cecf3db4c 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2909,7 +2909,7 @@ void zap_wand(void)
         {
             // Xom loves it when you use a Wand of Random Effects and
             // there is a dangerous monster nearby...
-            xom_is_stimulated(256);
+            xom_is_stimulated(255);
         }
     }
 
@@ -2959,7 +2959,7 @@ void zap_wand(void)
     {
         // Xom loves it when you use an unknown wand and there is a
         // dangerous monster nearby...
-        xom_is_stimulated(256);
+        xom_is_stimulated(255);
     }
 
     you.turn_is_over = true;
@@ -3081,7 +3081,7 @@ void drink(void)
     {
         // Xom loves it when you drink an unknown potion and there is
         // a dangerous monster nearby...
-        xom_is_stimulated(256);
+        xom_is_stimulated(255);
     }
 
     dec_inv_item_quantity( item_slot, 1 );
@@ -3884,7 +3884,7 @@ void read_scroll(void)
     {
          // Xom loves it when you read an unknown scroll and there is
          // a dangerous monster nearby...
-        xom_is_stimulated(256);
+        xom_is_stimulated(255);
     }
 }                               // end read_scroll()
 
@@ -3973,7 +3973,7 @@ void use_randart(const item_def &item)
     {
         // Xom loves it when you use an unknown random artefact and
         // there is a dangerous monster nearby...
-        xom_is_stimulated(256);
+        xom_is_stimulated(255);
     }
 }
 
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index cc4638c842..f8b77fd996 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -636,7 +636,7 @@ void free_self_from_net()
     }
 
     int do_what = damage_or_escape_net(mitm[net].plus);
-#ifdef DEBUG
+#ifdef DEBUG_DIAGNOSTICS
     mprf(MSGCH_DIAGNOSTICS, "net.plus: %d, ATTR_HELD: %d, do_what: %d",
          mitm[net].plus, you.attribute[ATTR_HELD], do_what);
 #endif