Remove option TREATIES
TREATIES has issues: * Treaties can cover attack, assault, paradrop, board, lboard, fire, build (s|p|l|n) and enlist, but not bomb, launch, torpedo and enlistment centers. * Usability is very poor. While a treaty is in effect, every player action that violates a treaty condition triggers a prompt like this: This action is in contravention of treaty #0 (with Curmudgeon) Do you wish to go ahead anyway? [yn] If you decline, the action is not executed. If you accept, it is. In both cases, your decision is reported in the news. You cannot get rid of these prompts until the treaty expires. * Virtually nobody uses them. * Virtually unused code is buggy code. There is at least one race condition: multifire() reads the firing sector, ship or land unit before the treaty prompt, and writes it back after, triggering a generation oops. Any updates made by other threads while trechk() waits for input are wiped out, triggering a seqno mismatch oops. * The treaty prompts could confuse smart clients that aren't prepared for them. WinACE isn't, but is reported to work anyway at least common usage. Ron Koenderink (the WinACE maintainer) suspects there could be a few situations where it will fail. This feature is not earning its keep. Remove it. Drop command treaty, consider treaty, offer treaty, xdump treaty, reject treaties. Output of accept changed, obviously. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
b2090ed34f
commit
a109de948b
60 changed files with 415 additions and 1300 deletions
|
@ -55,8 +55,7 @@ struct rptstr rpt[] = {
|
|||
"spy captured and shot by %s" } },
|
||||
{ N_SENT_TEL, 1, N_TELE, { "sends a telegram to %s",
|
||||
"telexes %s" } },
|
||||
{ N_SIGN_TRE, 3, N_FOR, { "diplomats sign a treaty with %s",
|
||||
"ambassador agrees to a treaty with %s" } },
|
||||
{ 5, 0, 0, { no_news, no_news } },
|
||||
{ N_MAKE_LOAN, 2, N_ECON, { "bankers make a loan to %s",
|
||||
"Ministry of Finance lends money to %s" } },
|
||||
{ N_REPAY_LOAN, 1, N_ECON, { "repays a loan from %s",
|
||||
|
@ -88,10 +87,8 @@ struct rptstr rpt[] = {
|
|||
{ 20, 0, 0, { no_news, no_news } },
|
||||
{ N_SEIZE_SECT, -2, N_ECON, { "seizes a sector from %s to collect on a loan",
|
||||
"collects one of %s's sectors in repayment of a loan" } },
|
||||
{ N_HONOR_TRE, -1, N_FOR, { "considers an action which would violate a treaty with %s",
|
||||
"decides not to violate treaty with %s (yet)" } },
|
||||
{ N_VIOL_TRE, -4, N_FOR, { "violates a treaty with %s",
|
||||
"actions violate treaty with %s" } },
|
||||
{ 22, 0, 0, { no_news, no_news } },
|
||||
{ 23, 0, 0, { no_news, no_news } },
|
||||
{ 24, 0, 0, { no_news, no_news } },
|
||||
{ N_HIT_MINE, 0, N_SEA, { "ship hits a mine",
|
||||
"ship severely damaged in mine field" } },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue