Changeset 907 for trunk/src

Timestamp:

05/16/08 21:11:36 (7 months ago)

Author:

takkaria

Message:

This is the big object list reordering. Savefile compat broken for sanity's sake. Graphics also broken, but will be fixed before release -- don't worry!

First off, this is an attempt to make the item list have a decent order, such that similar items are grouped together. Second, it's an attempt to make the object list more interesting; to remove needless duplication, purely bad items, and to add more variety. This involves a lot of things, which are summarised below. This is not a full changelog.

• The mushrooms have been redesigned mostly from scratch. One mushroom (Sprinting) doesn't have an implementation right now.
  
• Per suggestions on r.g.r.a, healing potions now have significant nutritional content.
  
• Use enums in tvalsval.h rather than #defines.
  

#312:

• Make scrolls appear in piles sometimes.
  

#313:

• Changes here have been made already; the three temporary new mentioned have not been added but will be.
  

#316:

• Tone down Rods of Fire Bolts a little.
  
• Make rods start at dlev8 at the earliest.
  
• Object/Treasure detection merged some time ago now.
  
• Don't remove staff of CLW or steal anything from OAngband.
  

#320: (Rings)

• Sustain rings combined
  
• Bad rings removed
  
• Give elemental rings brands, though currently non-functional
  
• Add a whole bunch of rings based mostly on suggestions from the forum and r.g.r.a
  

#321: (Amulets)

• DOOM removed
  
• Adornment made rarer
  
• Resistance kept
  
• Amulet of Inertia kept (FA, but -3 speed)
  

#350: (Scrolls)

• ?Deep descent added.
  
• Redundant scrolls can stay; not too much of an issue.
  

#445: (Combat gear)

• Body armour changes:
  
  • There are now only 17 types of body armour.
    
  • Body armour ACs are even-numbered until you reach the very top-end.
    
• Footwear changes:
  
  • Footwear now goes: leather sandals -> boots -> iron shod -> steel shod -> mithril shod.
    
  • Add some Ethereal Slippers. (weightless, no AC, ignore elements)
    
• Handwear changes:
  
  • Gauntlets now base AC of 3
    
  • Mithril Gauntlets with IGNORE_ACID, base AC 5
    
  • Cesti -> Caestus, now base AC 2 but +3 to-dam (brass knuckles)
    
  • Add Alchemist's Gloves, which ignore the elements and have only magical AC
    
  • Add commented-out Mining Gloves
    
• Shield changes:
  
  • Shields now go: Wicker -> Small Metal -> Leather -> Large Metal -> Mithril
    
  • ACs of the above are 2, 4, 6, 8, 10
    
  • Weights adjusted so they go from 3lbs to 15lbs.
    
• Cloak changes:
  
  • Shadow Cloak -> Elven Cloak, add stealth.
    
  • Add Ethereal Cloak, ignores elements and weighs nothing (but also 0 AC).
    
  • Add Fur Cloak, base AC of 3 but heavy.
    
• Weapon changes:
  
  • Remove Gnomish Shovel, Dwarven Shovel, Pick, Dwarven Pick.
    
  • Remove the Sabre; tweak artifacts to use rapier.
    
  • Remove broken daggers/swords (and Narsil).
    
  • Return the Great in Two-Handed "Great" Flail. Rename Two-Handed to Zweihander. (Moria)
    
  • Merge short + small swords. Remove damage duplication between swords.
    
  • Add a Great Hammer (8d1), and a Maul (4d4).
    
  • Make Tridents 1d10.
    

#540: (Tweak the Elven rings again)

• give Narya back resist fear
  
• give Nenya sustain con
  
• remove sust str/wis from Vilya but add sust con. (based on a suggestion by Timo)
  

Files:

• trunk/src/defines.h (modified) (2 diffs)
• trunk/src/load.c (modified) (16 diffs)
• trunk/src/obj-info.c (modified) (3 diffs)
• trunk/src/obj-make.c (modified) (5 diffs)
• trunk/src/obj-util.c (modified) (1 diff)
• trunk/src/randart.c (modified) (11 diffs)
• trunk/src/tvalsval.h (modified) (5 diffs)

trunk/src/defines.h

@@ -46 +46 @@
-#define VERSION_MAJOR   3
-#define VERSION_MINOR   0
-3
+4
-#define VERSION_EXTRA   0
-
@@ -54 +54 @@
-#define OLD_VERSION_MAJOR       3
-#define OLD_VERSION_MINOR       0
-
+4
-
-

trunk/src/load.c

@@ -191 +191 @@
-
-
-/* A wonderful savefile conversion function. Temporary only. */
-void convert_kind(byte *tval, byte *sval)
-{
-        switch (*tval)
-        {
-                case TV_GOLD:
-                {
-                        if (*sval > SV_GOLD_MAX)
-                                *sval = SV_GOLD_MAX;
-                        return;
-                }
-
-                case TV_FOOD:
-                {
-                        /* Cure Paranoia + Cure Confusion -> Clear Mind */
-                        if (*sval == 15) *sval = 16;
-
-                        /* Sickness -> Weakness */
-                        if (*sval == 7) *sval = 6;
-
-                        /* LoseWis -> Stupidity */
-                        if (*sval == 9) *sval = 8;
-
-                        /* Paralysis -> Poison */
-                        if (*sval == 5) *sval = 0;
-
-                        /* Disease -> Unhealth */
-                        if (*sval == 11) *sval = 10;
-
-                        break;
-                }
-
-                /* Some staffs removed, replace with rods */
-                case TV_STAFF:
-                {
-                        int new_sval = *sval;
-
-                        /* Treasure location */
-                        if (*sval == 10) new_sval = 28;
-
-                        /* Object location */
-                        if (*sval == 11) new_sval = 29;
-
-                        /* Door/stair location */
-                        if (*sval == 13) new_sval = 1;
-
-                        /* Probing */
-                        if (*sval == 23) new_sval = 7;
-
-                        if (new_sval != *sval)
-                        {
-                                *tval = TV_ROD;
-                                *sval = new_sval;
-                        }
-                }
-        }
-}
-
-
-/*
@@ -410 +352 @@
-        rd_u16b(&o_ptr->origin_xtra);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        /* Monster holding object */
-        rd_s16b(&o_ptr->held_m_idx);
-
-        /* (Old) special powers */
-        if (older_than(3, 0, 12))
-        {
-                byte xtra1;
-                byte xtra2;
-                ego_item_type *e_ptr = NULL;
-
-                if (o_ptr->name2) e_ptr = &e_info[o_ptr->name2];
-
-                rd_byte(&xtra1);
-                rd_byte(&xtra2);
-
-                /* Extra powers */
-                switch (xtra1)
-                {
-                        case OBJECT_XTRA_TYPE_SUSTAIN:
-                        {
-                                o_ptr->flags2 |= ego_sustains[xtra2];
-                                break;
-                        }
-
-                        case OBJECT_XTRA_TYPE_RESIST:
-                        {
-                                o_ptr->flags2 |= ego_resists[xtra2];
-                                break;
-                        }
-
-                        case OBJECT_XTRA_TYPE_POWER:
-                        {
-                                o_ptr->flags3 |= ego_powers[xtra2];
-                                break;
-                        }
-                }
-        }
-
-        /* Inscription */
-        rd_string(buf, sizeof(buf));
-
@@ -467 +365 @@
-
-
-        /* Convert tval/sval */
-        convert_kind(&o_ptr->tval, &o_ptr->sval);
-
-        /* Lookup item kind */
-        o_ptr->k_idx = lookup_kind(o_ptr->tval, o_ptr->sval);
-
-        switch (o_ptr->k_idx)
-        {
-                case 158:
-                        o_ptr->k_idx = 157;
-                        break;
-
-                case 159:
-                case 160:
-                        o_ptr->k_idx = 156;
-                        break;
-        }
-
-        k_ptr = &k_info[o_ptr->k_idx];
-
@@ -495 +378 @@
-
-
-
-        /*
-         * Ensure that rods and wands get the appropriate pvals,
-         * and transfer rod charges to timeout.
-         * this test should only be passed once, the first
-         * time the file is open with ROD/WAND stacking code
-         * It could change the timeout improperly if the PVAL (time a rod
-         * takes to charge after use) is changed in object.txt.
-         * But this is nothing a little resting won't solve.
-         *
-         * -JG-
-         */
-        if ((o_ptr->tval == TV_ROD) &&
-            (o_ptr->pval - (k_ptr->pval * o_ptr->number) != 0))
-        {
-                o_ptr->timeout = o_ptr->pval;
-                o_ptr->pval = k_ptr->pval * o_ptr->number;
-        }
-
-        if (older_than(3, 0, 4))
-        {
-                /* Recalculate charges of stacked wands and staves */
-                if ((o_ptr->tval == TV_WAND) || (o_ptr->tval == TV_STAFF))
-                {
-                        o_ptr->pval = o_ptr->pval * o_ptr->number;
-                }
-        }
-
-        /* Repair non "wearable" items */
@@ -642 +498 @@
-                        o_ptr->ds = 0;
-                }
-        }
-
-        if (older_than(3, 0, 9) &&
-            o_ptr->tval == TV_LITE &&
-            !artifact_p(o_ptr) &&
-            !ego_item_p(o_ptr) &&
-            o_ptr->pval)
-        {
-                o_ptr->timeout = o_ptr->pval;
-                o_ptr->pval = 0;
-        }
-
@@ -712 +558 @@
-        rd_byte(&l_ptr->ignore);
-
-        if (older_than(3, 0, 12)) strip_bytes(2);
-
-        /* Count drops */
-        rd_byte(&l_ptr->drop_gold);
@@ -799 +643 @@
-                        note("Error reading item");
-                        return (-1);
-                }
-
-                /* Pre-3.0.2 objects in store inventories need to be marked */
-                if (older_than(3, 0, 2))
-                {
-                        if (n != STORE_HOME) i_ptr->ident |= IDENT_STORE;
-                }
-
@@ -926 +764 @@
-        }
-
-        /* Load savefiles pre-reorganisation */
-        if (older_than(3, 0, 8))
-        {
-                /* 
-                 * Slot Old layout:     New layout:
-                 * 0    xxx                     maximise
-                 * 1    xxx                     randarts
-                 * 2    maximise        xxx
-                 * 3    preserve        ironman
-                 * 4    ironman         no_stores
-                 * 5    no_stores       no_artifacts
-                 * 6    no_artifats     no_stacking
-                 * 7    randarts        no_preserve
-                 * 8    no_stacking     no_stairs
-                 */
-
-                /* We #define this so it's obvious what we're doing */
-                #define OLD_OPT(n)      op_ptr->opt[n]
-
-                bool old_birth[9];
-                for (i = 0; i <= 8; i++)
-                        old_birth[i] = OLD_OPT(OPT_BIRTH + i);
-
-                if (arg_fiddle) note("Loading pre-3.0.7 options...");
-
-                birth_maximize = adult_maximize = old_birth[2];
-                birth_no_preserve = adult_no_preserve = !old_birth[3];
-                birth_ironman = adult_ironman = old_birth[4];
-                birth_no_stores = adult_no_stores = old_birth[5];
-                birth_no_artifacts = adult_no_artifacts = old_birth[6];
-                birth_randarts = adult_randarts = old_birth[7];
-                birth_no_stacking = adult_no_stacking = old_birth[8];
-
-                birth_no_stairs = adult_no_stairs = !OLD_OPT(41);
-                birth_ai_sound = adult_ai_sound = OLD_OPT(42);
-                birth_ai_smell = adult_ai_smell = OLD_OPT(43);
-                birth_ai_packs = adult_ai_packs = OLD_OPT(73);
-                birth_ai_learn = adult_ai_learn = OLD_OPT(46);
-                birth_ai_cheat = adult_ai_cheat = OLD_OPT(47);
-                birth_ai_smart = adult_ai_smart = OLD_OPT(72);
-
-                #undef OLD_OPT
-        }
-
-        /*** Window Options ***/
-
@@ -1073 +867 @@
-        byte tmp8u = 24;
-
-        /* Handle old versions, and Pete Mack's patch */
-        if (older_than(3, 0, 6))
-                return 0;
-
-
-        /* Read how many squelch bytes we have */
-
-
+
-
-        /* Check against current number */
@@ -1142 +930 @@
-        int i;
-
+        byte num;
+
-        byte tmp8u;
-        u16b tmp16u;
@@ -1233 +1023 @@
-
-        /* Read the flags */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -1390 +1133 @@
-
-
-1
+4
-        {
-                /*
@@ -1730 +1473 @@
-
-        /* Load the dungeon data */
-if (!older_than(3, 0, 11)) 
+
-        {
-                /* Grab RLE info */
@@ -2061 +1804 @@
-                k_ptr->squelch = (tmp8u & 0x04) ? TRUE : FALSE;
-                k_ptr->everseen = (tmp8u & 0x08) ? TRUE : FALSE;
-
-                /* Read the (old) squelch bit */
-                if (older_than(3, 0, 9) && !older_than(3, 0, 6))
-                {
-                        rd_byte(&tmp8u);
-
-                        if (tmp8u == 3)
-                                k_ptr->squelch = TRUE;
-                        else
-                                k_ptr->squelch = FALSE;
-                }
-        }
-
@@ -2334 +2066 @@
-                        err = -1;
-                        what = "Savefile is too old";
+                        goto end;
-                }
-                else if (!older_than(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH + 1))
@@ -2385 +2118 @@
-        }
-
-
+
-        /* Message */
-        msg_format("Error (%s) reading %d.%d.%d savefile.",

trunk/src/obj-info.c

@@ -97 +97 @@
-        { TR2_IM_FIRE, "fire" },
-        { TR2_IM_COLD, "cold" },
+};
+
+static const flag_type f2_vuln[] =
+{
+        { TR2_VULN_ACID, "acid" },
+        { TR2_VULN_ELEC, "electricity" },
+        { TR2_VULN_FIRE, "fire" },
+        { TR2_VULN_COLD, "cold" },
-};
-
@@ -139 +147 @@
-static const flag_type f3_misc[] =
-{
-    
+
-        { TR3_SLOW_DIGEST, "Slows your metabolism" },
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -199 +210 @@
-        {
-                text_out("Provides resistance to ");
+                info_out_list(descs, count);
+                prev = TRUE;
+        }
+
+        /* Resistances */
+        count = info_collect(f2_vuln, N_ELEMENTS(f2_vuln), f2, descs);
+        if (count)
+        {
+                text_out("Makes you vulnerable to ");
-                info_out_list(descs, count);
-                prev = TRUE;

trunk/src/obj-make.c

@@ -681 +681 @@
-                        {
-                                /* Strength, Constitution, Dexterity, Intelligence */
-
-
-
-
+ENGTH
+STITUTION
+TERITY
+ELLIGENCE
-                                {
-                                        /* Stat bonus */
@@ -736 +736 @@
-                                }
-
+                                /* Light, Dark */
+                                case SV_RING_LIGHT:
+                                case SV_RING_DARK:
+                                {
+                                        /* Searching bonus */
+                                        o_ptr->pval = 1 + m_bonus(5, level);
+
+                                        break;
+                                }
+
-                                /* Flames, Acid, Ice, Lightning */
-                                case SV_RING_FLAMES:
@@ -744 +754 @@
-                                        /* Bonus to armor class */
-                                        o_ptr->to_a = 5 + randint1(5) + m_bonus(10, level);
+
-                                        break;
-                                }
@@ -799 +810 @@
-                                                o_ptr->to_d = -o_ptr->to_d;
-                                        }
+
+                                        break;
+                                }
+
+                                case SV_RING_RECKLESS_ATTACKS:
+                                {
+                                        int amt = rand_range(3, 5);
+
+                                        o_ptr->to_d = o_ptr->to_h = amt;
+                                        o_ptr->to_a = -4 * amt;
+
+                                        break;
+                                }
+
+                                case SV_RING_OF_THE_MOUSE:
+                                {
+                                        int amt = randint1(4);
+
+                                        /* Dex bonus, dam penalty */
+                                        o_ptr->pval = amt;
+                                        o_ptr->to_d = -3 * amt;
+
+                                        break;
+                                }
+
+                                case SV_RING_DELVING:
+                                {
+                                        /* Digging bonus */
+                                        o_ptr->pval = rand_range(3, 5);
-
-                                        break;
@@ -901 +941 @@
-                                        /* Mention the item */
-                                        if (cheat_peek) object_mention(o_ptr);
-
-                                        break;
-                                }
-
-                                /* Amulet of Doom -- always cursed */
-                                case SV_AMULET_DOOM:
-                                {
-                                        /* Cursed */
-                                        o_ptr->flags3 |= TR3_LIGHT_CURSE;
-
-                                        /* Penalize */
-                                        o_ptr->pval = 0 - (randint1(5) + m_bonus(5, level));
-                                        o_ptr->to_a = 0 - (randint1(5) + m_bonus(5, level));
-
-                                        break;

trunk/src/obj-util.c

@@ -77 +77 @@
-
-                /* HACK - Ordinary food is "boring" */
->= SV_FOOD_MIN_FOOD
+< SV_FOOD_MIN_SHROOM
-                        continue;
-

trunk/src/randart.c

@@ -438 +438 @@
-                tval = TV_DIGGING;
-                r2 = Rand_normal(target_level * 2, target_level);
-
-
-
-
-
-
+
+
+
-        }
-        else if (r < 19)
@@ -454 +451 @@
-                else if (r2 < 20) sval = SV_WAR_HAMMER;
-                else if (r2 < 30) sval = SV_QUARTERSTAFF;
-                else if (r2 < 34) sval = SV_LUCERN_HAMMER;
-                else if (r2 < 38) sval = SV_MORNING_STAR;
-                else if (r2 < 45) sval = SV_FLAIL;
-                else if (r2 < 55) sval = SV_LEAD_FILLED_MACE;
-                else if (r2 < 80) sval = SV_BALL_AND_CHAIN;
-
+
+
+
-                else sval = SV_MACE_OF_DISRUPTION;
-        }
@@ -467 +465 @@
-                tval = TV_SWORD;
-                r2 = Rand_normal(target_level * 2, target_level);
-
-
-
+
-                else if (r2 < 9) sval = SV_MAIN_GAUCHE;
-
-
+
-                else if (r2 < 14) sval = SV_SHORT_SWORD;
-                else if (r2 < 16) sval = SV_SABRE;
-                else if (r2 < 18) sval = SV_CUTLASS;
-                else if (r2 < 20) sval = SV_TULWAR;
-                else if (r2 < 23) sval = SV_BROAD_SWORD;
@@ -482 +475 @@
-                else if (r2 < 45) sval = SV_BASTARD_SWORD;
-                else if (r2 < 60) sval = SV_KATANA;
-TWO_HANDED_SWORD
+ZWEIHANDER
-                else if (r2 < 120) sval = SV_EXECUTIONERS_SWORD;
-                else sval = SV_BLADE_OF_CHAOS;
@@ -500 +493 @@
-                else if (r2 < 60) sval = SV_BATTLE_AXE;
-                else if (r2 < 65) sval = SV_GLAIVE;
+                else if (r2 < 72) sval = SV_LUCERNE_HAMMER;
-                else if (r2 < 80) sval = SV_HALBERD;
-                else if (r2 < 120) sval = SV_GREAT_AXE;
@@ -513 +507 @@
-
-                /* Soft stuff. */
-
-
-
-
-
-
+
+
+
+
-                else if (r2 < 45) sval = SV_LEATHER_SCALE_MAIL;
-
-                /* Hard stuff. */
-
-
+
-                else if (r2 < 75) sval = SV_CHAIN_MAIL;
-                else if (r2 < 85) sval = SV_AUGMENTED_CHAIN_MAIL;
-
-
+
-                else if (r2 < 105) sval = SV_METAL_BRIGANDINE_ARMOUR;
-                else if (r2 < 115) sval = SV_PARTIAL_PLATE_ARMOUR;
@@ -542 +532 @@
-                tval = TV_BOOTS;
-                r2 = Rand_normal(target_level * 2, target_level);
-
-
-
+
+
+
+
+
+
-        }
-        else if (r < 78)
@@ -552 +545 @@
-                r2 = Rand_normal(target_level * 2, target_level);
-                if (r2 < 10) sval = SV_SET_OF_LEATHER_GLOVES;
-
-
+
+
+
+
-        }
-        else if (r < 87)
@@ -568 +563 @@
-                else if (r2 < 60) sval = SV_IRON_CROWN;
-                else if (r2 < 90) sval = SV_GOLDEN_CROWN;
-
+_ENCRUST
-        }
-        else if (r < 94)
@@ -575 +570 @@
-                tval = TV_SHIELD;
-                r2 = Rand_normal(target_level * 2, target_level);
-
+
+
-                else if (r2 < 20) sval = SV_SMALL_METAL_SHIELD;
-ARGE_L
+
-                else if (r2 < 60) sval = SV_LARGE_METAL_SHIELD;
-SHIELD_OF_DEFLECTION
+MITHRIL_SHIELD
-        }
-        else
@@ -586 +582 @@
-                tval = TV_CLOAK;
-                r2 = Rand_normal(target_level * 2, target_level);
-
-
+
+
+
+
-        }
-

trunk/src/tvalsval.h

@@ -1 @@
-
-
+
+
+
-
-/*** Object "tval" and "sval" codes ***/
+
+/*
+ * PS: to regenerate the inside of an sval enum, do this:
+ * $ grep --context 2 I:<TVAL> object.txt | grep ^[NI] |
+ *   perl -pe 'y/[a-z]\- /[A-Z]__/' | perl -pe 's/(&_|~|')//g' | cut -d: -f3 |
+ *   perl -00 -pe 's/([^\n]*)\n([^\n]*)\n/\tSV_\1\ =\ \2,\n/g'
+ */
-
-/*
@@ -69 +77 @@
-#define SV_HEAVY_XBOW           24      /* (x4) */
-
-/* The "sval" codes for TV_DIGGING */
-#define SV_SHOVEL                       1
-#define SV_GNOMISH_SHOVEL       2
-#define SV_DWARVEN_SHOVEL       3
-#define SV_PICK                         4
-#define SV_ORCISH_PICK          5
-#define SV_DWARVEN_PICK         6
-#define SV_MATTOCK                      7
-
-/* The "sval" values for TV_HAFTED */
-#define SV_WHIP                                 2       /* 1d6 */
-#define SV_QUARTERSTAFF                 3       /* 1d9 */
-#define SV_MACE                                 5       /* 2d4 */
-#define SV_BALL_AND_CHAIN               6       /* 2d4 */
-#define SV_WAR_HAMMER                   8       /* 3d3 */
-#define SV_LUCERN_HAMMER                10      /* 2d5 */
-#define SV_MORNING_STAR                 12      /* 2d6 */
-#define SV_FLAIL                                13      /* 2d6 */
-#define SV_LEAD_FILLED_MACE             15      /* 3d4 */
-#define SV_TWO_HANDED_FLAIL             18      /* 3d6 */
-#define SV_MACE_OF_DISRUPTION   20      /* 5d8 */
-#define SV_GROND                                50      /* 3d4 */
-
-/* The "sval" values for TV_POLEARM */
-#define SV_SPEAR                                2       /* 1d6 */
-#define SV_AWL_PIKE                             4       /* 1d8 */
-#define SV_TRIDENT                              5       /* 1d9 */
-#define SV_PIKE                                 8       /* 2d5 */
-#define SV_BEAKE