Fixed new medit stats menu so that it uses the the Advanced/Standard cedit toggle
This commit is contained in:
@@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)t
|
|||||||
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
|
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
|
||||||
(lots of major bugfixes too)
|
(lots of major bugfixes too)
|
||||||
tbaMUD 3.59
|
tbaMUD 3.59
|
||||||
|
[Feb 25 2009] - Jamdog
|
||||||
|
Fixed new medit stats menu so that it uses the the Advanced/Standard cedit toggle
|
||||||
[Feb 24 2009] - Jamdog
|
[Feb 24 2009] - Jamdog
|
||||||
Bug-Fix: Fixed levels command, so it only shows immortal level if it's in the specified range
|
Bug-Fix: Fixed levels command, so it only shows immortal level if it's in the specified range
|
||||||
Bug-Fix: write_mobile_espec now saves CON and CHA values for mobiles in world files
|
Bug-Fix: write_mobile_espec now saves CON and CHA values for mobiles in world files
|
||||||
|
|||||||
102
src/medit.c
102
src/medit.c
@@ -467,21 +467,23 @@ static void medit_disp_stats_menu(struct descriptor_data *d)
|
|||||||
cyn, nrm, cyn, yel, GET_GOLD(mob), cyn, nrm
|
cyn, nrm, cyn, yel, GET_GOLD(mob), cyn, nrm
|
||||||
);
|
);
|
||||||
|
|
||||||
/* Bottom section - non-standard stats, togglable in cedit */
|
if (CONFIG_MEDIT_ADVANCED) {
|
||||||
write_to_output(d,
|
/* Bottom section - non-standard stats, togglable in cedit */
|
||||||
"(%sF%s) Str: %s[%s%2d/%3d%s]%s Saving Throws\r\n"
|
write_to_output(d,
|
||||||
"(%sG%s) Int: %s[%s%3d%s]%s (%sL%s) Paralysis %s[%s%3d%s]%s\r\n"
|
"(%sF%s) Str: %s[%s%2d/%3d%s]%s Saving Throws\r\n"
|
||||||
"(%sH%s) Wis: %s[%s%3d%s]%s (%sM%s) Rods/Staves %s[%s%3d%s]%s\r\n"
|
"(%sG%s) Int: %s[%s%3d%s]%s (%sL%s) Paralysis %s[%s%3d%s]%s\r\n"
|
||||||
"(%sI%s) Dex: %s[%s%3d%s]%s (%sN%s) Petrification %s[%s%3d%s]%s\r\n"
|
"(%sH%s) Wis: %s[%s%3d%s]%s (%sM%s) Rods/Staves %s[%s%3d%s]%s\r\n"
|
||||||
"(%sJ%s) Con: %s[%s%3d%s]%s (%sO%s) Breath %s[%s%3d%s]%s\r\n"
|
"(%sI%s) Dex: %s[%s%3d%s]%s (%sN%s) Petrification %s[%s%3d%s]%s\r\n"
|
||||||
"(%sK%s) Cha: %s[%s%3d%s]%s (%sP%s) Spells %s[%s%3d%s]%s\r\n\r\n",
|
"(%sJ%s) Con: %s[%s%3d%s]%s (%sO%s) Breath %s[%s%3d%s]%s\r\n"
|
||||||
cyn, nrm, cyn, yel, GET_STR(mob), GET_ADD(mob), cyn, nrm,
|
"(%sK%s) Cha: %s[%s%3d%s]%s (%sP%s) Spells %s[%s%3d%s]%s\r\n\r\n",
|
||||||
cyn, nrm, cyn, yel, GET_INT(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_PARA), cyn, nrm,
|
cyn, nrm, cyn, yel, GET_STR(mob), GET_ADD(mob), cyn, nrm,
|
||||||
cyn, nrm, cyn, yel, GET_WIS(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_ROD), cyn, nrm,
|
cyn, nrm, cyn, yel, GET_INT(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_PARA), cyn, nrm,
|
||||||
cyn, nrm, cyn, yel, GET_DEX(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_PETRI), cyn, nrm,
|
cyn, nrm, cyn, yel, GET_WIS(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_ROD), cyn, nrm,
|
||||||
cyn, nrm, cyn, yel, GET_CON(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_BREATH), cyn, nrm,
|
cyn, nrm, cyn, yel, GET_DEX(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_PETRI), cyn, nrm,
|
||||||
cyn, nrm, cyn, yel, GET_CHA(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_SPELL), cyn, nrm
|
cyn, nrm, cyn, yel, GET_CON(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_BREATH), cyn, nrm,
|
||||||
);
|
cyn, nrm, cyn, yel, GET_CHA(mob), cyn, nrm, cyn, nrm, cyn, yel, GET_SAVE(mob, SAVING_SPELL), cyn, nrm
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/* Quit to previous menu option */
|
/* Quit to previous menu option */
|
||||||
write_to_output(d, "(%sQ%s) Quit to main menu\r\nEnter choice : ", cyn, nrm);
|
write_to_output(d, "(%sQ%s) Quit to main menu\r\nEnter choice : ", cyn, nrm);
|
||||||
@@ -695,56 +697,100 @@ void medit_parse(struct descriptor_data *d, char *arg)
|
|||||||
break;
|
break;
|
||||||
case 'f':
|
case 'f':
|
||||||
case 'F':
|
case 'F':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_STR;
|
OLC_MODE(d) = MEDIT_STR;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'g':
|
case 'g':
|
||||||
case 'G':
|
case 'G':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_INT;
|
OLC_MODE(d) = MEDIT_INT;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
case 'H':
|
case 'H':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_WIS;
|
OLC_MODE(d) = MEDIT_WIS;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
case 'I':
|
case 'I':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_DEX;
|
OLC_MODE(d) = MEDIT_DEX;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'j':
|
case 'j':
|
||||||
case 'J':
|
case 'J':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_CON;
|
OLC_MODE(d) = MEDIT_CON;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'k':
|
case 'k':
|
||||||
case 'K':
|
case 'K':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_CHA;
|
OLC_MODE(d) = MEDIT_CHA;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'l':
|
case 'l':
|
||||||
case 'L':
|
case 'L':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_PARA;
|
OLC_MODE(d) = MEDIT_PARA;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
case 'M':
|
case 'M':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_ROD;
|
OLC_MODE(d) = MEDIT_ROD;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'n':
|
case 'n':
|
||||||
case 'N':
|
case 'N':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_PETRI;
|
OLC_MODE(d) = MEDIT_PETRI;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'o':
|
case 'o':
|
||||||
case 'O':
|
case 'O':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_BREATH;
|
OLC_MODE(d) = MEDIT_BREATH;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
case 'p':
|
case 'p':
|
||||||
case 'P':
|
case 'P':
|
||||||
|
if (!CONFIG_MEDIT_ADVANCED) {
|
||||||
|
write_to_output(d, "Invalid Choice!\r\nEnter Choice : ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
OLC_MODE(d) = MEDIT_SPELL;
|
OLC_MODE(d) = MEDIT_SPELL;
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
@@ -1049,16 +1095,20 @@ void medit_autoroll_stats(struct descriptor_data *d)
|
|||||||
GET_GOLD(OLC_MOB(d)) = (mob_lev*10);
|
GET_GOLD(OLC_MOB(d)) = (mob_lev*10);
|
||||||
GET_AC(OLC_MOB(d)) = (100-(mob_lev*6)); /* AC 94 to -80 */
|
GET_AC(OLC_MOB(d)) = (100-(mob_lev*6)); /* AC 94 to -80 */
|
||||||
|
|
||||||
GET_STR(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18); /* 2/3 level in range 11 to 18 */
|
/* 'Advanced' stats are only rolled if advanced options are enabled */
|
||||||
GET_INT(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
if (CONFIG_MEDIT_ADVANCED) {
|
||||||
GET_WIS(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
GET_STR(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18); /* 2/3 level in range 11 to 18 */
|
||||||
GET_DEX(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
GET_INT(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
||||||
GET_CON(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
GET_WIS(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
||||||
GET_CHA(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
GET_DEX(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
||||||
|
GET_CON(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
||||||
|
GET_CHA(OLC_MOB(d)) = LIMIT((mob_lev*2)/3, 11, 18);
|
||||||
|
|
||||||
|
GET_SAVE(OLC_MOB(d), SAVING_PARA) = mob_lev / 4; /* All Saving throws */
|
||||||
|
GET_SAVE(OLC_MOB(d), SAVING_ROD) = mob_lev / 4; /* set to a quarter */
|
||||||
|
GET_SAVE(OLC_MOB(d), SAVING_PETRI) = mob_lev / 4; /* of the mobs level */
|
||||||
|
GET_SAVE(OLC_MOB(d), SAVING_BREATH) = mob_lev / 4;
|
||||||
|
GET_SAVE(OLC_MOB(d), SAVING_SPELL) = mob_lev / 4;
|
||||||
|
}
|
||||||
|
|
||||||
GET_SAVE(OLC_MOB(d), SAVING_PARA) = mob_lev / 4; /* All Saving throws */
|
|
||||||
GET_SAVE(OLC_MOB(d), SAVING_ROD) = mob_lev / 4; /* set to a quarter */
|
|
||||||
GET_SAVE(OLC_MOB(d), SAVING_PETRI) = mob_lev / 4; /* of the mobs level */
|
|
||||||
GET_SAVE(OLC_MOB(d), SAVING_BREATH) = mob_lev / 4;
|
|
||||||
GET_SAVE(OLC_MOB(d), SAVING_SPELL) = mob_lev / 4;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user