Question Repeating Zone Reset Commands

diff -BbuprN -x '*.o' src_original/db.c src/db.c --- src_original/db.c 2018-04-24 09:25:34.721850300 +0100 +++ src/db.c 2018-05-14 21:58:03.788546000 +0100 @@ -2041,7 +2038,7 @@ static void load_zones(FILE *fl, char *z * a new zone command is added to reset_zone(), this string will need to be * updated to suit. - ae. */ while (get_line(fl, buf)) - if ((strchr("MOPGERDTV", buf[0]) && buf[1] == ' ') || (buf[0] == 'S' && buf[1] == '\0')) + if ((strchr("MOPGERDTVX", buf[0]) && buf[1] == ' ') || (buf[0] == 'S' && buf[1] == '\0')) num_of_cmds++; rewind(fl); diff -BbuprN -x '*.o' src_original/genzon.c src/genzon.c --- src_original/genzon.c 2018-04-24 08:22:13.616324000 +0100 +++ src/genzon.c 2018-05-15 09:29:23.384691700 +0100 @@ -408,6 +408,7 @@ int save_zone(zone_rnum zone_num) * R (Remove) Room-Vnum Obj-Vnum Unused * T (Trigger) Trig-type Trig-Vnum Room-Vnum * V (var) Trig-type Context Room-Vnum Varname Value + * X (Repeat) # of Commands #of Repeats * ------------------------------------------------- */ for (subcmd = 0; ZCMD(zone_num, subcmd).command != 'S'; subcmd++) { @@ -465,6 +466,12 @@ int save_zone(zone_rnum zone_num) arg2 = ZCMD(zone_num, subcmd).arg2; /* context */ arg3 = world[ZCMD(zone_num, subcmd).arg3].number; break; + case 'X': + arg1 = ZCMD(zone_num, subcmd).arg1; /* number of repeated commands */ + arg2 = ZCMD(zone_num, subcmd).arg2; /* times to repeat */ + snprintf(zbuf1, sizeof(zbuf1), "Repeat previous %d commands x %d", arg1, arg2); + comment = zbuf1; + break; case '*': /* Invalid commands are replaced with '*' - Ignore them. */ continue; diff -BbuprN -x '*.o' src_original/zedit.c src/zedit.c --- src_original/zedit.c 2018-04-24 08:22:18.736941800 +0100 +++ src/zedit.c 2018-05-15 09:22:22.492881800 +0100 @@ -528,6 +528,14 @@ static void zedit_disp_menu(struct descr ((MYCMD.arg1 == WLD_TRIGGER)? "room" : "????"))), MYCMD.sarg2); break; + case 'X': + /* Bounds check here as counting commands elsewhere is awkward */ + if (MYCMD.arg1 > counter - 1) + MYCMD.arg1 = counter - 1; + write_to_output(d, "%sRepeat the previous %s%d%s commands, %s%d%s times", + MYCMD.if_flag ? " then " : "!ERROR!", + cyn, MYCMD.arg1, yel, cyn, MYCMD.arg2, yel); + break; default: write_to_output(d, "<Unknown Command>"); break; @@ -560,10 +568,11 @@ static void zedit_disp_comtype(struct de "%sP%s) Put object in another object %sD%s) Open/Close/Lock a Door\r\n" "%sR%s) Remove an object from the room\r\n" "%sT%s) Assign a trigger %sV%s) Set a global variable\r\n" + "%sX%s) Repeat a set of commands\r\n" "\r\n" "What sort of command will this be? : ", grn, nrm, grn, nrm, grn, nrm, grn, nrm, grn, nrm, - grn, nrm, grn, nrm, grn, nrm, grn, nrm + grn, nrm, grn, nrm, grn, nrm, grn, nrm, grn, nrm ); OLC_MODE(d) = ZEDIT_COMMAND_TYPE; } @@ -597,6 +606,11 @@ static void zedit_disp_arg1(struct descr write_to_output(d, "Input trigger type (0:mob, 1:obj, 2:room) :"); OLC_MODE(d) = ZEDIT_ARG1; break; + case 'x': + case 'X': + write_to_output(d, "How many previous commands? : "); + OLC_MODE(d) = ZEDIT_ARG1; + break; default: /* We should never get here. */ cleanup_olc(d, CLEANUP_ALL); @@ -637,6 +651,9 @@ static void zedit_disp_arg2(struct descr case 'V': write_to_output(d, "Global's context (0 for none) : "); break; + case 'X': + write_to_output(d, "How many times to repeat? : "); + break; default: /* We should never get here, but just in case. */ cleanup_olc(d, CLEANUP_ALL); @@ -932,11 +949,11 @@ void zedit_parse(struct descriptor_data case ZEDIT_COMMAND_TYPE: /* Parse the input for which type of command this is, and goto next quiz. */ OLC_CMD(d).command = toupper(*arg); - if (!OLC_CMD(d).command || (strchr("MOPEDGRTV", OLC_CMD(d).command) == NULL)) { + if (!OLC_CMD(d).command || (strchr("MOPEDGRTVX", OLC_CMD(d).command) == NULL)) { write_to_output(d, "Invalid choice, try again : "); } else { if (OLC_VAL(d)) { /* If there was a previous command. */ - if (OLC_CMD(d).command == 'T' || OLC_CMD(d).command == 'V') { + if (OLC_CMD(d).command == 'T' || OLC_CMD(d).command == 'V' || OLC_CMD(d).command == 'X') { OLC_CMD(d).if_flag = 1; zedit_disp_arg1(d); } else { @@ -1003,6 +1020,11 @@ void zedit_parse(struct descriptor_data zedit_disp_arg2(d); } break; + case 'X': + /* Error checking happens in zedit_disp_menu */ + OLC_CMD(d).arg1 = atoi(arg); + zedit_disp_arg2(d); + break; case 'D': case 'R': default: @@ -1068,6 +1090,11 @@ void zedit_parse(struct descriptor_data } else write_to_output(d, "That object does not exist, try again : "); break; + case 'X': + /* Set limits to the number of repeats, 1 to 100 */ + OLC_CMD(d).arg2 = MIN(100, MAX(1, atoi(arg))); + zedit_disp_menu(d); + break; default: /* We should never get here, but just in case. */ cleanup_olc(d, CLEANUP_ALL);