Massive rewrite of makeitem.cc. Might be buggy.

Fixed some old bugs, e.g. double reroll of =oCT.
items() now respects force_type more often. As a side effect, acquirement is
less likely to give randart jewellery or armour.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2777 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 7 deletions

diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 352f8aac9b..07848add5e 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -119,7 +119,7 @@ enum brand_type // equivalent to (you.inv[].special or mitm[].special) % 30
     SPWPN_KNIFE_OF_ACCURACY,
     SPWPN_STAFF_OF_OLGREB,
     SPWPN_VAMPIRES_TOOTH,
-    SPWPN_STAFF_OF_WUCAD_MU             //  195
+    SPWPN_STAFF_OF_WUCAD_MU            //  195, must be last (see randart.cc)
 };
 
 enum corpse_type
@@ -339,12 +339,7 @@ enum special_armour_type
     SPARM_RESISTANCE,                  //   15
     SPARM_POSITIVE_ENERGY,
     SPARM_ARCHMAGI,
-    SPARM_PRESERVATION,                //   18
-    SPARM_RANDART_I = 25, // must remain at 25 for now - how high do they go? {dlb}
-    SPARM_RANDART_II = 26,             //   26
-    SPARM_RANDART_III = 27,            //   27
-    SPARM_RANDART_IV = 28,             //   28
-    SPARM_RANDART_V = 29 //   29 - highest value found thus far {dlb}
+    SPARM_PRESERVATION                //   18
 };
 
 enum special_missile_type // to separate from weapons in general {dlb}