Changeset 677

Timestamp:

02/01/08 05:16:06 (7 months ago)

Author:

takkaria

Message:

Slightly experimental changes regarding pseudo-ID:

• remove "good" pseudo-ID, replace with "magical"
  
• add "strange" pseudo-ID, for when items have mixed blessings
  
• stop automaetically cursing all bad weaponry
  
• make weak pseudo-id notice the difference between magical and excellent
  
• tweak squelch accordingly
  

Files:

• trunk/src/obj-make.c (modified) (7 diffs)
• trunk/src/object.h (modified) (1 diff)
• trunk/src/squelch.c (modified) (7 diffs)
• trunk/src/tables.c (modified) (1 diff)

trunk/src/obj-make.c

@@ -532 +532 @@
-                        o_ptr->to_d -= todam2;
-                }
-
-                /* Cursed (if "bad") */
-                if (o_ptr->to_h < 0 || o_ptr->to_d < 0)
-                    o_ptr->flags3 |= TR3_LIGHT_CURSE;
-        }
-
@@ -647 +643 @@
-                        o_ptr->to_a -= toac2;
-                }
-
-                /* Cursed (if "bad") */
-                if (o_ptr->to_a < 0)
-                    o_ptr->flags3 |= TR3_LIGHT_CURSE;
-        }
-
@@ -1531 +1523 @@
-                        return (FALSE);
-                }
-
+
-                /* Potions -- Potions of life, healing, *healing* are good,
-                 * restore mana for spell casters are good,
@@ -1537 +1529 @@
-                 * as is augmentation (acts as a potion of 'restoration' if all
-                 * stats are maximised).
- 
+
-                 * XXX If we make too many useful items 'good' we may want to
-                 * consider limiting the total number of good drops to uniques
@@ -1702 +1694 @@
-}
-
+
+
-/*
- * Return a "feeling" (or NULL) about an item.  Method 1 (Heavy).
@@ -1727 +1721 @@
-        else if (broken_p(o_ptr))
-                return INSCRIP_BROKEN;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -1748 +1746 @@
-
-        /* Artifacts -- except cursed/broken ones */
-GOOD
+EXCELLENT
-
-        /* Ego-Items -- except cursed/broken ones */
-GOOD
+EXCELLENT
-
-        /* Good armor bonus */
-
-
-
-
+
+
-
-        /* No feeling */

trunk/src/object.h

@@ -36 +36 @@
-        INSCRIP_BROKEN = 4,          /*!< Cursed ego-item */
-        INSCRIP_AVERAGE = 5,         /*!< Item with no interesting features */
-GOOD = 6,            /*!< Item with some
+MAGICAL = 6,         /*!< Item with
-        INSCRIP_EXCELLENT = 7,       /*!< Ego-item */
-        INSCRIP_SPECIAL = 8,         /*!< Artifact */
-        INSCRIP_UNCURSED = 9,        /*!< Item previous cursed, now uncursed */
-        INSCRIP_INDESTRUCTIBLE = 10, /*!< Artifact that was tried to be destroyed */
+        INSCRIP_STRANGE = 12,        /*!< Item that has mixed combat bonuses */
-
-        INSCRIP_MAX                  /*!< Maximum number of pseudo-ID markers */
-} obj_pseudo_t;
-
-
-

trunk/src/squelch.c

@@ -110 +110 @@
-{
-        SQUELCH_NONE,
-CURSE
+BA
-        SQUELCH_AVERAGE,
-_STRONG
-GOOD_WEAK
+
+EXCELLENT
-        SQUELCH_ALL,
-
@@ -124 +124 @@
-static const char *quality_names[SQUELCH_MAX] =
-{
-                                                        
-cursed",                                              /* SQUELCH_CURSE
-                                             
- (strong pseudo-ID)",             /* SQUELCH_GOOD_STRONG
-good (weak pseudo-ID)",               /* SQUELCH_GOOD_WEAK
- 
+                        
+bad",                         /* SQUELCH_BA
+                     
+",                        /* SQUELCH_GOOD
+excellent",                   /* SQUELCH_EXCELLENT
+ 
-};
-
@@ -388 +388 @@
-        switch (squelch_level[num])
-        {
-CURSE
+BA
-                {
-                        if ((feel == INSCRIP_BROKEN) || (feel == INSCRIP_TERRIBLE) ||
@@ -395 +395 @@
-                                return TRUE;
-                        }
+
+                        if (fullid &&
+                                 (o_ptr->to_a <= 0 && o_ptr->to_h <= 0 && o_ptr->to_d <= 0))
+                                return TRUE;
-
-                        break;
@@ -411 +415 @@
-                }
-
-_WEAK
+
-                {
-                        if ((feel == INSCRIP_BROKEN) || (feel == INSCRIP_TERRIBLE) ||
-                            (feel == INSCRIP_WORTHLESS) || (feel == INSCRIP_CURSED) ||
- || (feel == INSCRIP_GOOD)
+
-                        {
-                                return TRUE;
-                        }
-
+                        if (fullid && !o_ptr->name2 && !o_ptr->name1 &&
+                                 (o_ptr->to_a >= 0 && o_ptr->to_h >= 0 && o_ptr->to_d >= 0))
+                                return TRUE;
+
-                        break;
-                }
-
-GOOD_STRONG
+EXCELLENT
-                {
-                        if ((feel == INSCRIP_BROKEN) || (feel == INSCRIP_TERRIBLE) ||
-                            (feel == INSCRIP_WORTHLESS) || (feel == INSCRIP_CURSED) ||
-
-
-
+
-                        {
-                                return TRUE;
-                        }
-
-                        break;
-                }
-
@@ -449 +453 @@
-
-
- 
+
- * Returns TRUE if an item should be hidden due to the player's
- * current settings.
@@ -619 +623 @@
-        menu.count = SQUELCH_MAX;
-        if (oid == TYPE_JEWELRY)
-CURSE
+BA
-
-        menu_init2(&menu, find_menu_skin(MN_SCROLL), &menu_f, &area);

trunk/src/tables.c

@@ -1407 +1407 @@
-        "broken",
-        "average",
-good
+magical
-        "excellent",
-        "special",
-        "uncursed",
-
+
+
-};
-