Changeset 933

Timestamp:

05/18/08 11:36:22 (6 months ago)

Author:

takkaria

Message:

(#603) Fix birth items after the object list reorder, and move to textual tval/sval names.

Files:

• trunk/lib/edit/p_class.txt (modified) (7 diffs)
• trunk/src/init1.c (modified) (4 diffs)

trunk/lib/edit/p_class.txt

@@ -73 +73 @@
-A:6:30:5
-M:0:0:0:0
-75:33
-23:16
-37:4
+potion:Berserk Strength
+sword:Broad Sword~
+hard armour:Chain Mail~
-F:BRAVERY_30 | PSEUDO_ID_HEAVY | PSEUDO_ID_IMPROV
-T:Rookie
@@ -95 +95 @@
-A:4:40:2
-M:90:1:1:300
-90:0
-23:4
-70:11
+magic book:[Magic for Beginners]
+sword:Dagger~
+scroll:Word of Recall
-F:CUMBER_GLOVE | ZERO_FAIL | BEAM | CHOOSE_SPELLS
-T:Novice
@@ -180 +180 @@
-A:4:35:3
-M:91:2:1:350
-
-
-
+
+
+
+
-F:BLESS_WEAPON | ZERO_FAIL | PSEUDO_ID_IMPROV
-T:Believer
@@ -266 +267 @@
-A:5:30:4
-M:90:1:5:350
-90:0
-23:8
-36:4
+magic book:[Magic for Beginners]
+sword:Short Sword~
+soft armour:Soft Leather Armour~
-F:CUMBER_GLOVE | CHOOSE_SPELLS | PSEUDO_ID_HEAVY | PSEUDO_ID_IMPROV
-T:Vagabond
@@ -351 +352 @@
-A:5:35:4
-M:90:1:3:400
-90:0
-23:16
-19:13
-17:1
+magic book:[Magic for Beginners]
+sword:Broad Sword~
+bow:Long Bow~
+arrow:Arrow~
-F:CUMBER_GLOVE | EXTRA_SHOT | CHOOSE_SPELLS | PSEUDO_ID_IMPROV
-T:Runner
@@ -437 +438 @@
-A:5:30:5
-M:91:2:1:400
-91:0
-23:16
-70:37
+prayer book:[Beginners Handbook]
+sword:Broad Sword~
+scroll:Protection from Evil
-F:PSEUDO_ID_HEAVY | PSEUDO_ID_IMPROV
-T:Gallant
@@ -515 +516 @@
-B:62:99:0:0:0
-B:63:99:0:0:0
-

trunk/src/init1.c

@@ -2906 +2906 @@
-                if (!add_text(&pc_ptr->title[cur_title], head, s))
-                        return (PARSE_ERROR_OUT_OF_MEMORY);
-
+
-                /* Next title */
-                cur_title++;
@@ -2918 +2918 @@
-        else if (buf[0] == 'E')
-        {
-
+
+
+
-
-                start_item *e_ptr;
@@ -2928 +2930 @@
-                e_ptr = &pc_ptr->start_items[cur_equip];
-
+                /* Find the beginning of the tval field */
+                tval_s = strchr(buf, ':');
+                if (!tval_s) return PARSE_ERROR_MISSING_COLON;
+                *tval_s++ = '\0';
+                if (!*tval_s) return PARSE_ERROR_MISSING_FIELD;
+
+                /* Now find the beginning of the sval field */
+                sval_s = strchr(tval_s, ':');
+                if (!sval_s) return PARSE_ERROR_MISSING_COLON;
+                *sval_s++ = '\0';
+                if (!*sval_s) return PARSE_ERROR_MISSING_FIELD;
+
+                /* Now find the beginning of the pval field */
+                end_s = strchr(sval_s, ':');
+                if (!end_s) return PARSE_ERROR_MISSING_COLON;
+                *end_s++ = '\0';
+                if (!*end_s) return PARSE_ERROR_MISSING_FIELD;
+
+                /* Now convert the tval into its numeric equivalent */
+                if (1 != sscanf(tval_s, "%d", &tval))
+                {
+                        tval = tval_find_idx(tval_s);
+                        if (tval == -1) return PARSE_ERROR_UNRECOGNISED_TVAL;
+                }
+
+                /* Now find the sval */
+                if (1 != sscanf(sval_s, "%d", &sval))
+                {
+                        sval = lookup_sval(tval, sval_s);
+                        if (sval == -1) return PARSE_ERROR_UNRECOGNISED_SVAL;
+                }
+
+
-                /* Scan for the values */
-
-
+
-
-                if ((min < 0) || (max < 0) || (min > 99) || (max > 99))
@@ -2946 +2980 @@
-                /* Limit number of starting items */
-                if (cur_equip > MAX_START_ITEMS)
-GENERIC
+TOO_MANY_ENTRIES
-        }
-