Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Verlasse-zu-spät-in-Befehlsreihenfolge' 

Conflicts:
	src/laws.c
This commit is contained in:
CTD 2014-08-14 00:14:51 +02:00
parent d546065bfd db6179ddeb
commit dfec8d8001
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/laws.c
View File

@ -4605,7 +4605,7 @@ void init_processor(void)
add_proc_order(p, K_MAIL, &mail_cmd, 0, "Botschaften"); add_proc_order(p, K_MAIL, &mail_cmd, 0, "Botschaften");
p += 10; /* all claims must be done before we can USE */ p += 10; /* all claims must be done before we can USE */
add_proc_region(p, &enter_1, "Betreten (1. Versuch)"); add_proc_region(p, &enter_1, "Betreten (1. Versuch)"); /* for GIVE CONTROL */
add_proc_order(p, K_USE, &use_cmd, 0, "Benutzen"); add_proc_order(p, K_USE, &use_cmd, 0, "Benutzen");
p += 10; /* in case it has any effects on alliance victories */ p += 10; /* in case it has any effects on alliance victories */
@ -4614,6 +4614,10 @@ void init_processor(void)
p += 10; /* in case it has any effects on alliance victories */ p += 10; /* in case it has any effects on alliance victories */
add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen"); add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen");
p += 10;
add_proc_region(p, &enter_1, "Betreten (2. Versuch)"); /* to allow a buildingowner to enter the castle pre combat */
p += 10;
add_proc_region(p, &do_battle, "Attackieren"); add_proc_region(p, &do_battle, "Attackieren");
if (!keyword_disabled(K_BESIEGE)) { if (!keyword_disabled(K_BESIEGE)) {
@ -4622,11 +4626,11 @@ void init_processor(void)
} }
p += 10; /* can't allow reserve before siege (weapons) */ p += 10; /* can't allow reserve before siege (weapons) */
add_proc_region(p, &enter_1, "Betreten (2. Versuch)");
if (get_param_int(global.parameters, "rules.reserve.twophase", 0)) { if (get_param_int(global.parameters, "rules.reserve.twophase", 0)) {
add_proc_order(p, K_RESERVE, &reserve_self, 0, "Selbst_Reservieren"); add_proc_order(p, K_RESERVE, &reserve_self, 0, "Selbst_Reservieren");
p += 10; p += 10;
} }
add_proc_region(p, &enter_1, "Betreten (3. Versuch)"); /* to claim a castle after a victory and to be able to DESTROY it in the same turn */
add_proc_order(p, K_RESERVE, &reserve_cmd, 0, "Reservieren"); add_proc_order(p, K_RESERVE, &reserve_cmd, 0, "Reservieren");
add_proc_order(p, K_CLAIM, &claim_cmd, 0, NULL); add_proc_order(p, K_CLAIM, &claim_cmd, 0, NULL);
add_proc_unit(p, &follow_unit, "Folge auf Einheiten setzen"); add_proc_unit(p, &follow_unit, "Folge auf Einheiten setzen");
@ -4663,7 +4667,7 @@ void init_processor(void)
add_proc_postregion(p, &split_allocations, "Produktion II"); add_proc_postregion(p, &split_allocations, "Produktion II");
p += 10; p += 10;
add_proc_region(p, &enter_2, "Betreten (3. Versuch)"); add_proc_region(p, &enter_2, "Betreten (4. Versuch)"); /* Once again after QUIT */
p += 10; p += 10;
add_proc_region(p, &sinkships, "Schiffe sinken"); add_proc_region(p, &sinkships, "Schiffe sinken");