Author: sveinung
Date: Fri May 19 12:38:15 2017
New Revision: 35658
URL: http://svn.gna.org/viewcvs/freeciv?rev=35658&view=rev
Log:
"Incite City Escape" is a reason for war.
When "Incite City" was split in hrm Feature #660927 the Casus Belli weren't
given to "Incite City Escape" too. Do it.
See hrm Bug #661539
Modified:
branches/S3_0/data/civ2/effects.ruleset
branches/S3_0/data/civ2civ3/effects.ruleset
branches/S3_0/data/classic/effects.ruleset
branches/S3_0/data/experimental/effects.ruleset
branches/S3_0/data/multiplayer/effects.ruleset
branches/S3_0/data/sandbox/effects.ruleset
branches/S3_0/data/webperimental/effects.ruleset
branches/S3_0/server/rscompat.c
Modified: branches/S3_0/data/civ2/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/civ2/effects.ruleset (original)
+++ branches/S3_0/data/civ2/effects.ruleset Fri May 19 12:38:15 2017
@@ -2405,6 +2405,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2civ3/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/civ2civ3/effects.ruleset (original)
+++ branches/S3_0/data/civ2civ3/effects.ruleset Fri May 19 12:38:15 2017
@@ -4297,6 +4297,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/classic/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/classic/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/classic/effects.ruleset (original)
+++ branches/S3_0/data/classic/effects.ruleset Fri May 19 12:38:15 2017
@@ -2472,6 +2472,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/experimental/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/experimental/effects.ruleset (original)
+++ branches/S3_0/data/experimental/effects.ruleset Fri May 19 12:38:15 2017
@@ -2855,6 +2855,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/multiplayer/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/multiplayer/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/multiplayer/effects.ruleset (original)
+++ branches/S3_0/data/multiplayer/effects.ruleset Fri May 19 12:38:15 2017
@@ -2507,6 +2507,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/sandbox/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/sandbox/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/sandbox/effects.ruleset (original)
+++ branches/S3_0/data/sandbox/effects.ruleset Fri May 19 12:38:15 2017
@@ -4357,6 +4357,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/data/webperimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/effects.ruleset?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/data/webperimental/effects.ruleset (original)
+++ branches/S3_0/data/webperimental/effects.ruleset Fri May 19 12:38:15 2017
@@ -2542,6 +2542,15 @@
"DiplRel", "War", "Local", FALSE
}
+[effect_incident_success_incite_esc]
+type = "Casus_Belli_Success"
+value = 1
+reqs =
+ { "type", "name", "range", "present"
+ "Action", "Incite City Escape", "Local", TRUE
+ "DiplRel", "War", "Local", FALSE
+ }
+
[effect_incident_success_poison]
type = "Casus_Belli_Success"
value = 1
Modified: branches/S3_0/server/rscompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/rscompat.c?rev=35658&r1=35657&r2=35658&view=diff
==============================================================================
--- branches/S3_0/server/rscompat.c (original)
+++ branches/S3_0/server/rscompat.c Fri May 19 12:38:15 2017
@@ -1141,6 +1141,11 @@
TRUE, TRUE, "Incite City"));
effect_req_append(peffect, req_from_str("DiplRel", "Local", FALSE,
FALSE, TRUE, "War"));
+ peffect = effect_new(EFT_CASUS_BELLI_SUCCESS, 1, NULL);
+ effect_req_append(peffect, req_from_str("Action", "Local", FALSE,
+ TRUE, TRUE, "Incite City
Escape"));
+ effect_req_append(peffect, req_from_str("DiplRel", "Local", FALSE,
+ FALSE, TRUE, "War"));
/* Poisoning a city during peace causes an incident. */
peffect = effect_new(EFT_CASUS_BELLI_SUCCESS, 1, NULL);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
