Skip to content
Permalink
Browse files

Merged PR 550: Merge 626_domain_tweaks to master

Related work items: #626
  • Loading branch information...
realms-mud committed Aug 9, 2019
1 parent 8f1c030 commit 60a9f5e06d6d79fc02ee48bb4b5c607db83ba156
Showing with 51 additions and 0 deletions.
  1. +4 −0 modules/domains/sectionSelector.c
  2. +47 −0 tests/modules/domains/buildComponentSelectorTest.c
@@ -182,6 +182,10 @@ protected nomask int processSelection(string selection)
setUpUserForSelection();
}
}
else
{
SectionData = ([]);
}
}
return ret;
}
@@ -848,3 +848,50 @@ void CompletionTimeIsUpdated()
"X is the option about which you would like further details.\n",
Player->caughtMessage());
}

/////////////////////////////////////////////////////////////////////////////
void CancelClearsSectionSelection()
{
Selector->initiateSelector(Player);
command("1", Player);
command("10", Player);
command("14", Player);

ExpectEq("Building Projects - Stone Keep:\n"
"From this menu, you can initiate, modify, or abort projects in your holdings\n"
"at Argalach Castle.\n\n"
"Layout: +=======+ \n"
" | +---+ | ...... ......... ...... \n"
" | | | | . .............. .............. . \n"
" | +---+ | . .?. ......... .?. . \n"
" +=======+ .. ... ... .. \n"
"Completion time: 1000 . .. ...... ... ...... .. . \n"
" . ?. . ........ ........ . .? . \n"
"Stone Battlement: . .. . .?. .?. . .. . \n"
" <select> . .. ... ... .. . \n"
"Central Stone Tower: . . .. .. . . \n"
" <select> .... . ?. ......... .? . .... \n"
"Main Stone Keep: . . . .. . . .. . . . \n"
" <select> . . ... . . ... . . \n"
" . . ... . . ... . . \n"
"Needed workers: . . . .. ......... .. . . . \n"
" Architect - 0/1 .... . ?. .? . .... \n"
" Blacksmith - 0/1 . . .. .. . . \n"
" Carpenter - 0/3 . .. ... ... .. . \n"
" Foreman - 0/1 . .. . .?. .?. . .. . \n"
" Stonemason - 0/10 . ?. . ........ ........ . .? . \n"
" . .. ...... ... ...... .. . \n"
" .. ... ... .. \n"
"Select building options for: . .?. ......... .?. . \n"
"[1] - Central Stone Tower . .............. .............. . \n"
"[2] - Main Stone Keep ...... ......... ...... \n"
"[3] - Stone Battlement \n"
"[4] - Select Workers \n"
"[5] - Create Building N/A\n"
"[6] - Exit Building Menu \n"
"You must select a number from 1 to 6.\n"
"Type 'exit' if you do not wish to make a selection at this time.\n"
"For details on a given choice, type 'describe X' (or '? X') where\n"
"X is the option about which you would like further details.\n",
Player->caughtMessage());
}

0 comments on commit 60a9f5e

Please sign in to comment.
You can’t perform that action at this time.