Changeset 856

Timestamp:

04/28/08 22:51:05 (3 months ago)

Author:

takkaria

Message:

#433:

• Remove individual-shopkeeper and race-based price changes from the store code, to make it easier to balance pricing.
  
• Adjust adj_chr_gold[] values upwards to represent the average-110% inflation usually applied by the individual-shopkeeper greed values. This should really be applied to the object.txt file, though.
  

Files:

• trunk/lib/edit/cost_adj.txt (deleted)
• trunk/src/init1.c (modified) (2 diffs)
• trunk/src/init2.c (modified) (2 diffs)
• trunk/src/store.c (modified) (5 diffs)
• trunk/src/tables.c (modified) (1 diff)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/variable.c (modified) (1 diff)

trunk/src/init1.c

@@ -2972 +2972 @@
-
-                /* Scan for the values */
-:%d
-, &inflate
+
+
-
-                /* Save the values */
-                ot_ptr->owner_race = idx;
-                ot_ptr->max_cost = gld;
-                ot_ptr->inflate = inflate;
-        }
-        else
@@ -2991 +2990 @@
-
-
-
-
-/*
- * Initialize the "g_info" array, by parsing an ascii "template" file
- */
-errr parse_g_info(char *buf, header *head)
-{
-        int i, j;
-
-        char *s;
-
-        /* Current entry */
-        static byte *g_ptr;
-
-
-        /* Process 'A' for "Adjustments" */
-        if (buf[0] == 'A')
-        {
-                int adj;
-
-                /* Start the string */
-                s = buf+1;
-
-                /* Initialize the counter to max races */
-                j = z_info->p_max;
-
-                /* Repeat */
-                while (j-- > 0)
-                {
-                        /* Hack - get the index */
-                        i = error_idx + 1;
-
-                        /* Verify information */
-                        if (i <= error_idx) return (PARSE_ERROR_NON_SEQUENTIAL_RECORDS);
-
-                        /* Verify information */
-                        if (i >= head->info_num) return (PARSE_ERROR_TOO_MANY_ENTRIES);
-
-                        /* Save the index */
-                        error_idx = i;
-
-                        /* Point at the "info" */
-                        g_ptr = (byte*)head->info_ptr + i;
-
-                        /* Find the colon before the subindex */
-                        s = strchr(s, ':');
-
-                        /* Verify that colon */
-                        if (!s) return (PARSE_ERROR_GENERIC);
-
-                        /* Nuke the colon, advance to the subindex */
-                        *s++ = '\0';
-
-                        /* Get the value */
-                        adj = atoi(s);
-
-                        /* Save the value */
-                        *g_ptr = adj;
-                }
-        }
-        else
-        {
-                /* Oops */
-                return (PARSE_ERROR_UNDEFINED_DIRECTIVE);
-        }
-
-        /* Success */
-        return (0);
-}
-
-

trunk/src/init2.c

@@ -877 +877 @@
-
-/*
- * Initialize the "g_info" array
- */
-static errr init_g_info(void)
-{
-        errr err;
-
-        /* Init the header */
-        init_header(&g_head, (u16b)(z_info->p_max * z_info->p_max), sizeof(byte));
-
-#ifdef ALLOW_TEMPLATES
-
-        /* Save a pointer to the parsing function */
-        g_head.parse_info_txt = parse_g_info;
-
-#endif /* ALLOW_TEMPLATES */
-
-        err = init_info("cost_adj", &g_head);
-
-        /* Set the global variables */
-        g_info = g_head.info_ptr;
-        g_name = g_head.name_ptr;
-        g_text = g_head.text_ptr;
-
-        return (err);
-}
-
-
-/*
- * Initialize the "flavor_info" array
- */
@@ -1465 +1437 @@
-        event_signal_string(EVENT_INITSTATUS, "Initializing arrays... (owners)");
-        if (init_b_info()) quit("Cannot initialize owners");
-
-        /* Initialize price info */
-        event_signal_string(EVENT_INITSTATUS, "Initializing arrays... (prices)");
-        if (init_g_info()) quit("Cannot initialize prices");
-
-        /* Initialize flavor info */

trunk/src/store.c

@@ -393 +393 @@
- *               == FALSE means the shop is selling, player buying
- *
-
-
+
- * never lets a shop-keeper lose money in a transaction.
- *
@@ -401 +400 @@
- *
- * Hack -- the black market always charges twice as much as it should.
- *
- * Charisma adjustment runs from 80 to 130
- * Racial adjustment runs from 95 to 130
- *
- * Since greed/charisma/racial adjustments are centered at 100, we need
- * to adjust (by 200) to extract a usable multiplier.  Note that the
- * "greed" value is always something (?).
- */
-s32b price_item(const object_type *o_ptr, bool store_buying, int qty)
-{
-        int factor;
-        int adjust;
-        s32b price;
-
-        owner_type *ot_ptr = store_owner(store_current);
-
-        /* The greed value is always of the current store's owner */
-        int greed = ot_ptr->inflate;
-
-
@@ -431 +419 @@
-
-
-        /* Compute the racial factor */
-        factor = g_info[(ot_ptr->owner_race * z_info->p_max) + p_ptr->prace];
-
-        /* Add in the charisma factor */
-
+
+
+
+
-
-
@@ -441 +429 @@
-        if (store_buying)
-        {
-
-
-
-
+
+
-                if (adjust > 100) adjust = 100;
-
@@ -454 +440 @@
-        else
-        {
-
-
-
-
+
-                if (adjust < 100) adjust = 100;
-

trunk/src/tables.c

@@ -246 +246 @@
-const byte adj_chr_gold[] =
-{
-30
-25
-22
-20
-18
-16
-14
-1
-10
-0
-0
-04
-0
-0
-0
-0
-99
-98
-97
-96
-95
-94
-93
-92
-91
-0
-89
-88
-87
-86
-85
-84
-83
-82
-81
-8
-8
-8
+43
+37
+34
+32
+29
+27
+23
+2
+21
+1
+1
+13
+1
+1
+1
+1
+108
+107
+106
+105
+104
+103
+102
+101
+100
+9
+97
+96
+95
+94
+93
+92
+91
+90
+90
+9
+9
+9
-};
-

trunk/src/types.h

@@ -579 +579 @@
-        s32b max_cost;          /* Purse limit */
-
-        byte inflate;           /* Inflation */
-
-        byte owner_race;        /* Owner race */
-};

trunk/src/variable.c

@@ -640 +640 @@
-
-/*
- * The racial price adjustment arrays
- */
-byte *g_info;
-char *g_name;
-char *g_text;
-
-
-/*
- * The object flavor arrays
- */