cap otaku mpcp to 2x REAL int, plus some cleanup

Author: jdevnull

src/cf_create.cpp

@@ -159,7 +159,7 @@ void cfedit_parse(struct descriptor_data *d, const char *arg)
     if (option_n > GET_SKILL(CH, SKILL_COMPUTER)) {
       send_to_char(CH, "You can't create a complex form of a higher rating than your computer skill.\r\n"
                    "Enter Rating: ");
-    } else if (option_n > GET_OTAKU_MPCP(CH)) {
+    } else if (option_n > get_otaku_mpcp(CH)) {
       send_to_char(CH, "You can't create a complex form of a higher rating than your living persona's MPCP rating.\r\n"
                    "Enter Rating: ");
     } else if (option_n <= 0) {

src/otaku.cpp

@@ -154,6 +154,20 @@ int get_otaku_rea(struct char_data *ch) {
   return rea_stat;
 }
 
+int get_otaku_mpcp(struct char_data *ch) {
+  int mpcp = (get_otaku_int(ch) + get_otaku_wil(ch) + get_otaku_cha(ch) + 2) / 3
+             + GET_ECHO(ch, ECHO_IMPROVED_MPCP);
+
+  // HOUSERULE: cap otaku MPCP to 2x REAL int
+#ifdef DIES_IRAE
+  return MIN(GET_REAL_INT(ch) * 2, mpcp);
+#else
+  // human/elf/dwarf otaku have 7 max real int, so cap 14
+  // let troll/ork otaku reach the same mpcp cap
+  return MIN(14, mpcp);
+#endif
+}
+
 extern struct obj_data *make_new_finished_part(int part_type, int mpcp, int rating=0);
 struct obj_data *make_otaku_deck(struct char_data *ch) {
   if (!ch) {
@@ -169,7 +183,7 @@ struct obj_data *make_otaku_deck(struct char_data *ch) {
   struct obj_data *new_deck = read_object(OBJ_CUSTOM_CYBERDECK_SHELL, VIRTUAL, OBJ_LOAD_REASON_OTAKU_RESONANCE);
 
   // Add parts.
-  int mpcp = GET_OTAKU_MPCP(ch);
+  int mpcp = get_otaku_mpcp(ch);
 
   // Real values are assigned in update_otaku_deck()
   obj_to_obj(make_new_finished_part(PART_MPCP, mpcp, mpcp), new_deck);
@@ -264,9 +278,9 @@ void _update_living_persona(struct char_data *ch, struct obj_data *cyberdeck, in
 }
 
 void update_otaku_deck(struct char_data *ch, struct obj_data *cyberdeck) {
-  int mpcp = GET_OTAKU_MPCP(ch);
+  int mpcp = get_otaku_mpcp(ch);
 
-  GET_CYBERDECK_MPCP(cyberdeck) = MIN(12, mpcp);
+  GET_CYBERDECK_MPCP(cyberdeck) = mpcp;
   GET_CYBERDECK_HARDENING(cyberdeck) = (get_otaku_wil(ch) + 1) / 2 + GET_ECHO(ch, ECHO_IMPROVED_HARD);
   GET_CYBERDECK_HARDENING(cyberdeck) = MIN(get_otaku_wil(ch), GET_CYBERDECK_HARDENING(cyberdeck));
   GET_CYBERDECK_ACTIVE_MEMORY(cyberdeck) = 0; // Otaku do not have active memory.

src/otaku.hpp

@@ -7,11 +7,7 @@ struct otaku_echo {
   bool nerps;
 };
 
-int     get_otaku_cha(struct char_data *ch);
-int     get_otaku_wil(struct char_data *ch);
-int     get_otaku_int(struct char_data *ch);
-int     get_otaku_qui(struct char_data *ch);
-int     get_otaku_rea(struct char_data *ch);
+int     get_otaku_mpcp(struct char_data *ch);
 
 void    update_otaku_deck(struct char_data *ch, struct obj_data *cyberdeck);
 
@@ -23,13 +19,4 @@ void    update_otaku_deck(struct char_data *ch, struct obj_data *cyberdeck);
 
 extern int complex_form_programs[COMPLEX_FORM_TYPES];
 
-#define GET_OTAKU_MPCP(ch)           \
-  (({ \
-    int mpcp = (get_otaku_int(ch) + get_otaku_wil(ch) + get_otaku_cha(ch) + 2) / 3; \
-    if (GET_ECHO(ch, ECHO_IMPROVED_MPCP)) { \
-      mpcp = MIN(get_otaku_int(ch) * 2, mpcp + GET_ECHO(ch, ECHO_IMPROVED_MPCP)); \
-    } \
-    mpcp; \
-  }))
-
 #endif