Changeset 912

Timestamp:

05/17/08 08:28:47 (2 months ago)

Author:

takkaria

Message:

(#275) Rejig social status a bit. Social status depends entirely on character background, levels gained and is displayed as a textual name now.

Files:

• trunk/src/birth.c (modified) (1 diff)
• trunk/src/files.c (modified) (4 diffs)
• trunk/src/xtra2.c (modified) (2 diffs)

trunk/src/birth.c

@@ -391 +391 @@
-
-        /* Verify social class */
-100) social_class = 100
+75) social_class = 75
-        else if (social_class < 1) social_class = 1;
-

trunk/src/files.c

@@ -999 +999 @@
-}
-
-
-/*
- * Returns a "rating" of x depending on y, and sets "attr" to the
@@ -1471 +1470 @@
-static const region boundaries [] =
-{
-{ 0,   0,              0,              0 },
-1,   2,              40,             8 }, /* Name, Class, ... */
-   10,             22,             8 }, /* Cur Exp, Max Exp
-26,  10,             17,             8 }, /* AC, melee
-48,  10,             24,             8 }, /* skills
-26,  3,              13,             5 }, /* Age, ht, wt, ...
-
+/* x   y     width, rows */
+0,   0,              0,              0 },
+   2,              40,             8 }, /* Name, Class
+1,  10,              22,             8 }, /* Cur Exp, Max Exp
+26, 10,              17,             8 }, /* AC, melee, ...
+48, 10,              24,             8 }, /* skills
+
-};
-
@@ -1563 +1562 @@
-{
-        return val < max ? TERM_YELLOW : TERM_L_GREEN;
+}
+
+
+static const char *show_status(void)
+{
+        int sc = p_ptr->sc;
+        sc /= 10;
+
+        switch (sc)
+        {
+                case 0:
+                case 1:
+                        return "Pariah";
+
+                case 2:
+                        return "Outcast";
+
+                case 3:
+                case 4:
+                        return "Unknown";
+
+                case 5:
+                        return "Known";
+
+                case 6:
+                /* Maximum status by birth 75 = 7 */
+                case 7:
+                        return "Liked";
+
+                case 8:
+                        return "Well-liked";
+
+                case 9:
+                case 10:
+                        return "Respected";
+
+                case 11:
+                case 12:
+                        return "Role model";
+
+                case 13:
+                        return "Feared";
+
+                case 14:
+                case 15:
+                        return "Lordly";
+        }
+
+        return format("%d", sc);
-}
-
@@ -1663 +1711 @@
-        P_I(TERM_L_BLUE, "Height",              "%y",   i2u(p_ptr->ht), END  );
-        P_I(TERM_L_BLUE, "Weight",              "%y",   i2u(p_ptr->wt), END  );
-tatus",             "%y",   i2u(p_ptr->sc
+ocial",             "%y",   s2u(show_status()
-        P_I(TERM_L_BLUE, "Maximize",    "%y",   c2u(adult_maximize ? 'Y' : 'N'), END);
-#if 0

trunk/src/xtra2.c

@@ -1049 +1049 @@
-        {
-                char buf[80];
-
+
-                /* Gain a level */
-                p_ptr->lev++;
-
-                /* Save the highest level */
- 
+
-                {
-                        p_ptr->max_lev = p_ptr->lev;
@@ -1061 +1061 @@
-                        strnfmt(buf, sizeof(buf), "Reached level %d", p_ptr->lev);
-                        history_add(buf, HISTORY_GAIN_LEVEL, 0);
-
-
-
+
+
-                /* Message */
-                message_format(MSG_LEVEL, p_ptr->lev, "Welcome to level %d.", p_ptr->lev);
+
+                /* Add to social class */
+                p_ptr->sc += randint1(2);
+                if (p_ptr->sc > 150) p_ptr->sc = 150;
-
-                /* Update some stuff */