diff --git a/binaries/data/mods/public/art/actors/units/athenians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/athenians/citizen_female.xml
new file mode 100644
index 0000000000..f3b6bf2cd3
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/athenians/citizen_female.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/athenians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/athenians/citizen_male.xml
new file mode 100644
index 0000000000..482b25526f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/athenians/citizen_male.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/m_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/britons/citizen_female.xml b/binaries/data/mods/public/art/actors/units/britons/citizen_female.xml
new file mode 100644
index 0000000000..0ac9152472
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/britons/citizen_female.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/britons/citizen_male.xml b/binaries/data/mods/public/art/actors/units/britons/citizen_male.xml
new file mode 100644
index 0000000000..6b9ce73b50
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/britons/citizen_male.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_female.xml
new file mode 100644
index 0000000000..5e2f5c346b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_female.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml
new file mode 100644
index 0000000000..1470ce6789
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/citizen_male.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/celts/citizen_female.xml b/binaries/data/mods/public/art/actors/units/celts/citizen_female.xml
new file mode 100644
index 0000000000..1caca57bd6
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/celts/citizen_female.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/celts/citizen_male.xml b/binaries/data/mods/public/art/actors/units/celts/citizen_male.xml
new file mode 100644
index 0000000000..47cc51b50c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/celts/citizen_male.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+ skeletal/new/m_pants_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/han/citizen_female.xml b/binaries/data/mods/public/art/actors/units/han/citizen_female.xml
new file mode 100644
index 0000000000..eaa2ea8ac4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/han/citizen_female.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/han/citizen_male.xml b/binaries/data/mods/public/art/actors/units/han/citizen_male.xml
new file mode 100644
index 0000000000..64c2ea54b5
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/han/citizen_male.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/citizen_female.xml b/binaries/data/mods/public/art/actors/units/hellenes/citizen_female.xml
new file mode 100644
index 0000000000..fe899aa7fa
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/hellenes/citizen_female.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/citizen_male.xml b/binaries/data/mods/public/art/actors/units/hellenes/citizen_male.xml
new file mode 100644
index 0000000000..b639ac37f6
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/hellenes/citizen_male.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+ skeletal/new/m_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml
new file mode 100644
index 0000000000..d65c21676f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/citizen_female.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/iberians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/iberians/citizen_male.xml
new file mode 100644
index 0000000000..e475df42e0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/iberians/citizen_male.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/kushites/citizen_female.xml b/binaries/data/mods/public/art/actors/units/kushites/citizen_female.xml
new file mode 100644
index 0000000000..05c6c94344
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/kushites/citizen_female.xml
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/kushites/citizen_male.xml b/binaries/data/mods/public/art/actors/units/kushites/citizen_male.xml
new file mode 100644
index 0000000000..043cf99654
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/kushites/citizen_male.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml b/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml
new file mode 100644
index 0000000000..cbf41e3742
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/mauryas/citizen_female.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/citizen_male.xml b/binaries/data/mods/public/art/actors/units/mauryas/citizen_male.xml
new file mode 100644
index 0000000000..8ee22c36a1
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/mauryas/citizen_male.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/m_tunic_long.dae
+
+
+
+
+
+
+ skeletal/new/m_tunic_long.dae
+
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+ skeletal/new/m_naked.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/persians/citizen_female.xml b/binaries/data/mods/public/art/actors/units/persians/citizen_female.xml
new file mode 100644
index 0000000000..5977d62581
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/persians/citizen_female.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_armor_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/persians/citizen_male.xml b/binaries/data/mods/public/art/actors/units/persians/citizen_male.xml
new file mode 100644
index 0000000000..3742436af9
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/persians/citizen_male.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/m_tunic_long.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/citizen_female.xml b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_female.xml
new file mode 100644
index 0000000000..4781eccd36
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_female.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml
new file mode 100644
index 0000000000..0671dabe15
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/citizen_male.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/m_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/romans/citizen_female.xml b/binaries/data/mods/public/art/actors/units/romans/citizen_female.xml
new file mode 100644
index 0000000000..28e6ab482e
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/citizen_female.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/romans/citizen_male.xml b/binaries/data/mods/public/art/actors/units/romans/citizen_male.xml
new file mode 100644
index 0000000000..482b25526f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/romans/citizen_male.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ skeletal/new/m_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/citizen_female.xml b/binaries/data/mods/public/art/actors/units/seleucids/citizen_female.xml
new file mode 100644
index 0000000000..671ea849e9
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/seleucids/citizen_female.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml b/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml
new file mode 100644
index 0000000000..393f18e130
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/seleucids/citizen_male.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/spartans/citizen_female.xml b/binaries/data/mods/public/art/actors/units/spartans/citizen_female.xml
new file mode 100644
index 0000000000..613f257978
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/spartans/citizen_female.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+ skeletal/new/f_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skeletal/new/f_dress.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/actors/units/spartans/citizen_male.xml b/binaries/data/mods/public/art/actors/units/spartans/citizen_male.xml
new file mode 100644
index 0000000000..7701a69dd2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/spartans/citizen_male.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+ skeletal/new/m_tunic_short.dae
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ player_trans_norm_spec.xml
+
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_01.png
new file mode 100644
index 0000000000..e2e38fe612
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267ac42e32147b311d4c56c9751037c68020f33d9e4d49a29e24a2080f0fd66b
+size 105911
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_02.png
new file mode 100644
index 0000000000..c417435f50
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb3f5af264f9171f38304ca238e22604eeae86e90057c251c9bb13c4d437a9fc
+size 101115
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_03.png
new file mode 100644
index 0000000000..bbfcfdb9bc
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/dress_female_02_03.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e049edae892b4512357e7114c13c132a3179e35d2c8ffee4721ab30ac455d43
+size 91972
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_01.png
new file mode 100644
index 0000000000..ae519bb205
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecc303986b2869d04569eac151202742ba8e20ac92112ad48da8129b0000584d
+size 148224
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_02.png
new file mode 100644
index 0000000000..8188a9f990
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da2a81f4ff858856727cb85e465f5bfbba6e2ddcfc687dfe497fd72ad8b78b6b
+size 135519
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_03.png
new file mode 100644
index 0000000000..93ecf891da
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/germ/tunic_pants_01_03.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91e9b10e2d137ff3d614bdfff309f689536543f2d108b93654110eae7dc9e4ca
+size 125292
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_full_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_full_01.png
new file mode 100644
index 0000000000..7812904443
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers/dress_female_full_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb4578756411cffc4678b8c9de053afafb98f59206df7eacde718f3e708f3a78
+size 130174
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_norm.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_norm.png
new file mode 100644
index 0000000000..3a24ddef4b
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers/scale_01_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d989ca8d01e2ef4f60af74aeffc8876c17cb6328985506488fe0020f585560e1
+size 112389
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_slave_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_slave_01_01.png
new file mode 100644
index 0000000000..f1091a6101
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers/tunic_slave_01_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23616e63d80cd4c8a7147afe39f99f429075fc5551a0fb9057400937031b57cd
+size 120442
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/support_civilian.png
new file mode 100644
index 0000000000..7398d435b1
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/athen/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14b7fc39002ae14c07ffb3c1c1894c52e9b61654a469905a7742a07cef71c2a9
+size 104589
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_civilian.png
new file mode 100644
index 0000000000..a5e98f3a38
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/cart/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6114cc5819fbe72a6378de11f7376901826c46b81dd5d21947e37b7a2195c38
+size 103940
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_civilian.png
new file mode 100644
index 0000000000..427286fa82
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:624490b91d1514b12981e3f384dbe2d5329e480383b75e3d93d3b4226b7f850b
+size 114382
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/han/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/han/support_civilian.png
new file mode 100644
index 0000000000..23d08d55ca
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/han/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25929ffa0792a41a0cda12d7757e9f0dec5ad26b4dfa4695d572a2e114bd2737
+size 101657
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_civilian.png
new file mode 100644
index 0000000000..1d50a1c953
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/iber/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7ef6fce8663e5edb5530b8e8fb9325b71f1f57ab4017211288cbfe01415a933
+size 101487
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_civilian.png
new file mode 100644
index 0000000000..f113ad214d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39e7f0babe08ba9f542b10a033277e946b6002d8e9626e3e30441f70d9eb6c16
+size 103328
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_civilian.png
new file mode 100644
index 0000000000..71227b0854
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/maur/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a12628bb3528e6b34dff02016466ac56232509d989e40b8d5cfcff3f1ccbc923
+size 97064
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_civilian.png
new file mode 100644
index 0000000000..df89439c2b
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebaf591891d13fdf1cdf85576d85823a3cd1caec0a066bb7f8a500d2c19303e0
+size 98323
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/support_civilian.png
new file mode 100644
index 0000000000..14d8b173ca
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95c7272ab58f5627c0240612695886f6112d28de0ff6b6c2f9e713f33a79d0b1
+size 103014
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/support_civilian.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/support_civilian.png
new file mode 100644
index 0000000000..4156c8105f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/spart/support_civilian.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c2617ff7b9ce9013e42c91e5829bd598c9996879fb7bb3f4c63ea9698b5e22a
+size 100252
diff --git a/binaries/data/mods/public/art/variants/biped/base_peasant_male.xml b/binaries/data/mods/public/art/variants/biped/base_peasant_male.xml
new file mode 100644
index 0000000000..ebfeab62e5
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_peasant_male.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/binaries/data/mods/public/globalscripts/tests/test_Technologies_reqs.js b/binaries/data/mods/public/globalscripts/tests/test_Technologies_reqs.js
index b3676b98ac..39e19118f3 100644
--- a/binaries/data/mods/public/globalscripts/tests/test_Technologies_reqs.js
+++ b/binaries/data/mods/public/globalscripts/tests/test_Technologies_reqs.js
@@ -518,19 +518,19 @@ template = {
"value": "ResourceGatherer/Rates/food.meat",
"multiply": 10
}],
- "affects": ["FemaleCitizen", "CitizenSoldier Melee"]
+ "affects": ["Civilian", "CitizenSoldier Melee"]
};
let techMods = {
"ResourceGatherer/Rates/food.grain": [{
"affects": [
- ["FemaleCitizen", "Spearman", "Swordsman"],
+ ["Civilian", "Spearman", "Swordsman"],
["CitizenSoldier", "Melee", "Spearman", "Swordsman"]
],
"multiply": 15
}],
"ResourceGatherer/Rates/food.meat": [{
"affects": [
- ["FemaleCitizen"],
+ ["Civilian"],
["CitizenSoldier", "Melee"]
],
"multiply": 10
@@ -553,26 +553,26 @@ template = {
"value": "ResourceGatherer/Rates/food.meat",
"multiply": 10
}],
- "affects": ["FemaleCitizen", "CitizenSoldier Melee"]
+ "affects": ["Civilian", "CitizenSoldier Melee"]
};
techMods = {
"ResourceGatherer/Rates/food.grain": [{
"affects": [
- ["FemaleCitizen", "Spearman"],
+ ["Civilian", "Spearman"],
["CitizenSoldier", "Melee", "Spearman"]
],
"multiply": 15
},
{
"affects": [
- ["FemaleCitizen", "Swordsman"],
+ ["Civilian", "Swordsman"],
["CitizenSoldier", "Melee", "Swordsman"]
],
"multiply": 15
}],
"ResourceGatherer/Rates/food.meat": [{
"affects": [
- ["FemaleCitizen"],
+ ["Civilian"],
["CitizenSoldier", "Melee"]
],
"multiply": 10
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/civic_center.txt b/binaries/data/mods/public/gui/reference/tips/texts/civic_center.txt
index 108f35eb88..f2bff87b0e 100644
--- a/binaries/data/mods/public/gui/reference/tips/texts/civic_center.txt
+++ b/binaries/data/mods/public/gui/reference/tips/texts/civic_center.txt
@@ -1,4 +1,4 @@
CIVIC CENTER
The foundation of your new colony.
Claim large tracts of land by building them in previously unclaimed territory.
-Trains all Citizens: Female Citizens, Citizen Infantry, and Citizen Cavalry.
+Trains all Workers: Civilians, Citizen Infantry, and Citizen Cavalry.
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/gathering.txt b/binaries/data/mods/public/gui/reference/tips/texts/gathering.txt
index 8e0d2957ac..cec39d02d6 100644
--- a/binaries/data/mods/public/gui/reference/tips/texts/gathering.txt
+++ b/binaries/data/mods/public/gui/reference/tips/texts/gathering.txt
@@ -1,5 +1,5 @@
RESOURCE GATHERING
-Use Citizens to gather resources.
-Female citizens are best at gathering fruit and grain.
+Use Workers to gather resources.
+Civilians are best at gathering fruit and grain.
Citizen Infantry excel at gathering wood, stone, and metal.
Citizen Cavalry can only gather meat, but do so very quickly.
diff --git a/binaries/data/mods/public/gui/reference/tips/texts/storehouse.txt b/binaries/data/mods/public/gui/reference/tips/texts/storehouse.txt
index 0dec0d85e7..08cdf3ad22 100644
--- a/binaries/data/mods/public/gui/reference/tips/texts/storehouse.txt
+++ b/binaries/data/mods/public/gui/reference/tips/texts/storehouse.txt
@@ -1,3 +1,3 @@
STOREHOUSE
A cheap dropsite for non-food resources (wood, stone, and metal).
-Research technologies to improve the gathering rates of your Citizens.
+Research technologies to improve the gathering rates of your Workers.
diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index 3f1baf391b..bb772dab3d 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -65,8 +65,8 @@ g_SelectionPanels.Alert = {
case "raise":
data.icon.sprite = "stretched:session/icons/bell_level1.png";
data.button.tooltip = translate("Raise an alert!");
- if (data.unitEntStates.every(state => MatchesClassList(["FemaleCitizen"], state.alertRaiser?.classes)))
- data.button.tooltip += "\n" + bodyFont(translate("Alert nearby Female Citizens to seek refuge."));
+ if (data.unitEntStates.every(state => MatchesClassList(["Civilian"], state.alertRaiser?.classes)))
+ data.button.tooltip += "\n" + bodyFont(translate("Alert nearby Civilians to seek refuge."));
else if (data.unitEntStates.every(state => MatchesClassList(["Trader"], state.alertRaiser?.classes)))
data.button.tooltip += "\n" + bodyFont(translate("Alert nearby Traders to seek refuge."));
else
@@ -75,8 +75,8 @@ g_SelectionPanels.Alert = {
case "end":
data.icon.sprite = "stretched:session/icons/bell_level0.png";
data.button.tooltip = translate("End the alert.");
- if (data.unitEntStates.every(state => MatchesClassList(["FemaleCitizen"], state.alertRaiser?.classes)))
- data.button.tooltip += "\n" + bodyFont(translate("Unload nearby Female Citizens."));
+ if (data.unitEntStates.every(state => MatchesClassList(["Civilian"], state.alertRaiser?.classes)))
+ data.button.tooltip += "\n" + bodyFont(translate("Unload nearby Civilians."));
else if (data.unitEntStates.every(state => MatchesClassList(["Trader"], state.alertRaiser?.classes)))
data.button.tooltip += "\n" + bodyFont(translate("Unload nearby Traders."));
else
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 70f403fdb5..ac7248de48 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -172,7 +172,7 @@ var g_PanelEntityOrder = ["Hero", "Relic"];
/**
* Unit classes to be checked for the idle-worker-hotkey.
*/
-var g_WorkerTypes = ["FemaleCitizen", "Trader", "FishingBoat", "Citizen"];
+var g_WorkerTypes = ["Civilian", "Trader", "FishingBoat", "Citizen"];
/**
* Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey.
diff --git a/binaries/data/mods/public/gui/summary/counters.js b/binaries/data/mods/public/gui/summary/counters.js
index 9de8bd23c3..8652f86059 100644
--- a/binaries/data/mods/public/gui/summary/counters.js
+++ b/binaries/data/mods/public/gui/summary/counters.js
@@ -97,7 +97,7 @@ function calculateTeamCounterDataHelper()
if (!g_TeamHelperData[playerState.team])
{
g_TeamHelperData[playerState.team] = {};
- for (const value of ["food", "vegetarianFood", "femaleCitizen", "worker", "enemyUnitsKilled",
+ for (const value of ["food", "vegetarianFood", "civilian", "worker", "enemyUnitsKilled",
"unitsLost", "mapControl", "mapControlPeak",
"mapExploration", "totalBought", "totalSold"])
g_TeamHelperData[playerState.team][value] = new Array(playerState.sequences.time.length).fill(0);
@@ -106,7 +106,7 @@ function calculateTeamCounterDataHelper()
summaryAddObject(g_TeamHelperData[playerState.team].food, playerState.sequences.resourcesGathered.food);
summaryAddObject(g_TeamHelperData[playerState.team].vegetarianFood, playerState.sequences.resourcesGathered.vegetarianFood);
- summaryAddObject(g_TeamHelperData[playerState.team].femaleCitizen, playerState.sequences.unitsTrained.FemaleCitizen);
+ summaryAddObject(g_TeamHelperData[playerState.team].civilian, playerState.sequences.unitsTrained.Civilian);
summaryAddObject(g_TeamHelperData[playerState.team].worker, playerState.sequences.unitsTrained.Worker);
summaryAddObject(g_TeamHelperData[playerState.team].enemyUnitsKilled, playerState.sequences.enemyUnitsKilled.Unit);
@@ -315,10 +315,10 @@ function calculateVegetarianRatio(playerState, index)
playerState.sequences.resourcesGathered.food[index]);
}
-function calculateFeminization(playerState, index)
+function calculateCivilianization(playerState, index)
{
return calculatePercent(
- playerState.sequences.unitsTrained.FemaleCitizen[index],
+ playerState.sequences.unitsTrained.Civilian[index],
playerState.sequences.unitsTrained.Worker[index]);
}
@@ -354,8 +354,8 @@ function calculateMiscellaneousTeam(team, index, type, counters, headings)
if (type == "vegetarianRatio")
return calculatePercent(g_TeamHelperData[team].vegetarianFood[index], g_TeamHelperData[team].food[index]);
- if (type == "feminization")
- return calculatePercent(g_TeamHelperData[team].femaleCitizen[index], g_TeamHelperData[team].worker[index]);
+ if (type == "civilianization")
+ return calculatePercent(g_TeamHelperData[team].civilian[index], g_TeamHelperData[team].worker[index]);
if (type == "killDeath")
return calculateRatio(g_TeamHelperData[team].enemyUnitsKilled[index], g_TeamHelperData[team].unitsLost[index]);
diff --git a/binaries/data/mods/public/gui/summary/layout.js b/binaries/data/mods/public/gui/summary/layout.js
index a44ce6d07f..4216d70f1e 100644
--- a/binaries/data/mods/public/gui/summary/layout.js
+++ b/binaries/data/mods/public/gui/summary/layout.js
@@ -195,7 +195,7 @@ var getScorePanelsData = () => [
{ "identifier": "mapControl", "caption": translate("Map control (finish)"), "yStart": 0, "width": 110, "format": "PERCENTAGE" },
{ "identifier": "mapExploration", "caption": translate("Map exploration"), "yStart": 0, "width": 110, "format": "PERCENTAGE" },
{ "identifier": "vegetarianRatio", "caption": translate("Vegetarian ratio"), "yStart": 0, "width": 110, "format": "PERCENTAGE" },
- { "identifier": "feminization", "caption": translate("Feminization"), "yStart": 0, "width": 110, "format": "PERCENTAGE" },
+ { "identifier": "civilianization", "caption": translate("Civilianization"), "yStart": 0, "width": 110, "format": "PERCENTAGE" },
{
"identifier": "bribes",
"caption": translate("Bribes"),
@@ -216,7 +216,7 @@ var getScorePanelsData = () => [
{ "width": 110, "fn": calculateMapFinalControl },
{ "width": 110, "fn": calculateMapExploration },
{ "width": 110, "fn": calculateVegetarianRatio },
- { "width": 110, "fn": calculateFeminization },
+ { "width": 110, "fn": calculateCivilianization },
{ "width": 110, "fn": calculateBribes }
],
"teamCounterFn": calculateMiscellaneousTeam
diff --git a/binaries/data/mods/public/maps/random/danubius.js b/binaries/data/mods/public/maps/random/danubius.js
index 4207c14ae5..577ff07e37 100644
--- a/binaries/data/mods/public/maps/random/danubius.js
+++ b/binaries/data/mods/public/maps/random/danubius.js
@@ -81,7 +81,7 @@ export function* generateMap(mapSettings)
const oPalisadeGate = "uncapturable|structures/palisades_gate";
const oPalisadePillar = "uncapturable|structures/palisades_tower";
- const oFemale = "units/gaul/support_female_citizen";
+ const oCivilian = "units/gaul/support_civilian";
const oHealer = "units/gaul/support_healer_b";
const oSkirmisher = "units/gaul/infantry_javelineer_b";
const oNakedFanatic = "units/gaul/champion_fanatic";
@@ -183,7 +183,7 @@ export function* generateMap(mapSettings)
const ritualParticipants = [
{
"radius": 0.6,
- "templates": [oFemale],
+ "templates": [oCivilian],
"count": 9,
"angle": Math.PI
},
diff --git a/binaries/data/mods/public/maps/random/danubius_triggers.js b/binaries/data/mods/public/maps/random/danubius_triggers.js
index ba509faae1..35c2591dc8 100644
--- a/binaries/data/mods/public/maps/random/danubius_triggers.js
+++ b/binaries/data/mods/public/maps/random/danubius_triggers.js
@@ -15,7 +15,7 @@ const showDebugLog = false;
const danubiusAttackerTemplates = deepfreeze({
"ships": TriggerHelper.GetTemplateNamesByClasses("Trireme", "gaul", undefined, undefined, true),
"siege": TriggerHelper.GetTemplateNamesByClasses("Siege", "gaul", undefined, undefined, true),
- "females": TriggerHelper.GetTemplateNamesByClasses("FemaleCitizen", "gaul", undefined, undefined, true),
+ "civilians": TriggerHelper.GetTemplateNamesByClasses("Civilian", "gaul", undefined, undefined, true),
"healers": TriggerHelper.GetTemplateNamesByClasses("Healer", "gaul", undefined, undefined, true),
"champions": TriggerHelper.GetTemplateNamesByClasses("Champion", "gaul", undefined, undefined, true),
"champion_infantry": TriggerHelper.GetTemplateNamesByClasses("Champion+Infantry", "gaul", undefined, undefined, true),
@@ -33,14 +33,14 @@ var ccDefenders = [
{ "count": 8, "templates": danubiusAttackerTemplates.citizen_soldiers },
{ "count": 13, "templates": danubiusAttackerTemplates.champions },
{ "count": 4, "templates": danubiusAttackerTemplates.healers },
- { "count": 5, "templates": danubiusAttackerTemplates.females },
+ { "count": 5, "templates": danubiusAttackerTemplates.civilians },
{ "count": 10, "templates": ["gaia/fauna_sheep"] }
];
var gallicBuildingGarrison = [
{
"buildingClasses": ["House"],
- "unitTemplates": danubiusAttackerTemplates.females.concat(danubiusAttackerTemplates.healers)
+ "unitTemplates": danubiusAttackerTemplates.civilians.concat(danubiusAttackerTemplates.healers)
},
{
"buildingClasses": ["CivCentre", "Temple"],
@@ -170,8 +170,8 @@ var ritualProbability = 0.75;
* if idle and switch back when becoming idle again.
*/
var ritualAnimations = {
- "female": ["attack_slaughter"],
- "male": ["attack_capture", "promotion", "attack_slaughter"],
+ "civilian": ["attack_slaughter"],
+ "soldier": ["attack_capture", "promotion", "attack_slaughter"],
"healer": ["attack_capture", "promotion", "heal"]
};
@@ -308,7 +308,7 @@ Trigger.prototype.UpdateCelticRitual = function()
const animations = ritualAnimations[
cmpIdentity.HasClass("Healer") ? "healer" :
- cmpIdentity.HasClass("Female") ? "female" : "male"];
+ cmpIdentity.HasClass("Civilian") ? "civilian" : "soldier"];
const cmpVisual = Engine.QueryInterface(ent, IID_Visual);
if (!cmpVisual)
diff --git a/binaries/data/mods/public/maps/random/elephantine_triggers.js b/binaries/data/mods/public/maps/random/elephantine_triggers.js
index 8fa1c71fd2..b567fc30a2 100644
--- a/binaries/data/mods/public/maps/random/elephantine_triggers.js
+++ b/binaries/data/mods/public/maps/random/elephantine_triggers.js
@@ -15,7 +15,7 @@ Trigger.prototype.InitElephantine_DefenderStance = function()
Trigger.prototype.InitElephantine_GarrisonBuildings = function()
{
const kushInfantryUnits = TriggerHelper.GetTemplateNamesByClasses("CitizenSoldier+Infantry", "kush", undefined, "Elite", true);
- const kushSupportUnits = TriggerHelper.GetTemplateNamesByClasses("FemaleCitizen Healer", "kush", undefined, "Elite", true);
+ const kushSupportUnits = TriggerHelper.GetTemplateNamesByClasses("Civilian Healer", "kush", undefined, "Elite", true);
TriggerHelper.SpawnAndGarrisonAtClasses(elephantinePlayerID, "Tower", kushInfantryUnits, 1);
TriggerHelper.SpawnAndGarrisonAtClasses(elephantinePlayerID, "Wonder Temple Pyramid", kushInfantryUnits.concat(kushSupportUnits), 1);
diff --git a/binaries/data/mods/public/maps/random/fields_of_meroe.js b/binaries/data/mods/public/maps/random/fields_of_meroe.js
index 9d948e904c..7cdb4d841a 100644
--- a/binaries/data/mods/public/maps/random/fields_of_meroe.js
+++ b/binaries/data/mods/public/maps/random/fields_of_meroe.js
@@ -38,7 +38,7 @@ export function* generateMap(mapSettings)
const oPyramid = "structures/kush/pyramid_small";
const oPyramidLarge = "structures/kush/pyramid_large";
const oKushUnits = mapSettings.Nomad ?
- "units/kush/support_female_citizen" :
+ "units/kush/support_civilian" :
"units/kush/infantry_javelineer_merc_e";
const aRain = g_Decoratives.rain;
diff --git a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
index b995233bb7..249045700b 100644
--- a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
+++ b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
@@ -43,7 +43,7 @@ var jebelBarkal_templateClasses = deepfreeze({
"citizenSoldier_cavalry": "CitizenSoldier+Cavalry",
"citizenSoldier_cavalry_melee": "CitizenSoldier+Cavalry+Melee",
"healers": "Healer",
- "females": "FemaleCitizen"
+ "civilians": "Civilian"
});
var jebelBarkal_templates = deepfreeze(Object.keys(jebelBarkal_templateClasses).reduce((templates, name) => {
@@ -186,7 +186,7 @@ var jebelBarkal_buildingGarrison = difficulty => [
},
{
"buildingClasses": ["House"],
- "unitTemplates": [...jebelBarkal_templates.females, ...jebelBarkal_templates.healers],
+ "unitTemplates": [...jebelBarkal_templates.civilians, ...jebelBarkal_templates.healers],
"capacityRatio": 0.5
},
diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.js b/binaries/data/mods/public/maps/random/survivalofthefittest.js
index 48c9b38adb..4f35f937d9 100644
--- a/binaries/data/mods/public/maps/random/survivalofthefittest.js
+++ b/binaries/data/mods/public/maps/random/survivalofthefittest.js
@@ -41,7 +41,7 @@ export function* generateMap(mapSettings)
tForestFloor1
];
- const oTreasureSeeker = "nonbuilder|undeletable|skirmish/units/default_support_female_citizen";
+ const oTreasureSeeker = "nonbuilder|undeletable|skirmish/units/default_support_civilian";
const oObstruction = "obstructors/placement_24x24";
const triggerPointAttacker = "trigger/trigger_point_A";
@@ -66,7 +66,7 @@ export function* generateMap(mapSettings)
const clDirt = g_Map.createTileClass();
const clBaseResource = g_Map.createTileClass();
const clLand = g_Map.createTileClass();
- const clWomen = g_Map.createTileClass();
+ const clCivilians = g_Map.createTileClass();
g_Map.log("Creating central area");
createArea(
@@ -110,11 +110,11 @@ export function* generateMap(mapSettings)
new SmoothElevationPainter(ELEVATION_SET, heightLand, 4)
]);
- // Treasure seeker woman
- const femaleLocation = findLocationInDirectionBasedOnHeight(playerPosition[i], mapCenter, -3,
+ // Treasure seeker civilian
+ const civilianLocation = findLocationInDirectionBasedOnHeight(playerPosition[i], mapCenter, -3,
3.5, 3).round();
- clWomen.add(femaleLocation);
- g_Map.placeEntityPassable(oTreasureSeeker, playerIDs[i], femaleLocation,
+ clCivilians.add(civilianLocation);
+ g_Map.placeEntityPassable(oTreasureSeeker, playerIDs[i], civilianLocation,
playerAngle[i] + Math.PI);
// Attacker spawn point
@@ -138,7 +138,7 @@ export function* generateMap(mapSettings)
for (const triggerPointTreasure of triggerPointTreasures)
createObjectGroupsDeprecated(
- new SimpleGroup([new SimpleObject(triggerPointTreasure, 1, 1, 0, 0)], true, clWomen),
+ new SimpleGroup([new SimpleObject(triggerPointTreasure, 1, 1, 0, 0)], true, clCivilians),
0,
[avoidClasses(clPlayer, 5, clHill, 5), landConstraint],
scaleByMapSize(40, 140),
@@ -151,7 +151,7 @@ export function* generateMap(mapSettings)
const hillConstraint = new AndConstraint(
[
avoidClasses(clHill, 5),
- new StaticConstraint(avoidClasses(clPlayer, 20, clBaseResource, 3, clWomen, 5))
+ new StaticConstraint(avoidClasses(clPlayer, 20, clBaseResource, 3, clCivilians, 5))
]);
if (randBool())
createHills([tMainTerrain, tCliff, tHill],
@@ -182,7 +182,7 @@ export function* generateMap(mapSettings)
[tMainTerrain, tForestFloor1, tForestFloor2, pForest1, pForest2],
[avoidClasses(clForest, 5), new StaticConstraint(
[
- avoidClasses(clPlayer, 20, clHill, 0, clBaseResource, 2, clWomen, 5),
+ avoidClasses(clPlayer, 20, clHill, 0, clBaseResource, 2, clCivilians, 5),
stayClasses(clLand, 4)
])],
clForest,
@@ -195,7 +195,7 @@ export function* generateMap(mapSettings)
[scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)],
[[tMainTerrain, tTier1Terrain], [tTier1Terrain, tTier2Terrain], [tTier2Terrain, tTier3Terrain]],
[1, 1],
- [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12, clWomen, 5), landConstraint],
+ [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12, clCivilians, 5), landConstraint],
scaleByMapSize(15, 45),
clDirt);
yield 70;
@@ -204,7 +204,7 @@ export function* generateMap(mapSettings)
createPatches(
[scaleByMapSize(2, 4), scaleByMapSize(3, 7), scaleByMapSize(5, 15)],
tTier4Terrain,
- [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12, clWomen, 5), landConstraint],
+ [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12, clCivilians, 5), landConstraint],
scaleByMapSize(15, 45),
clDirt);
yield 80;
diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.json b/binaries/data/mods/public/maps/random/survivalofthefittest.json
index b12be29113..41541983e1 100644
--- a/binaries/data/mods/public/maps/random/survivalofthefittest.json
+++ b/binaries/data/mods/public/maps/random/survivalofthefittest.json
@@ -2,7 +2,7 @@
"settings" : {
"Name" : "Survival of the Fittest",
"Script" : "survivalofthefittest.js",
- "Description" : "[color=\"red\"]IMPORTANT NOTE: AI PLAYERS DO NOT WORK WITH THIS MAP[/color]\n\nProtect your base against endless waves of enemies. Use your woman citizen to collect the treasures at the center of the map before others do, and try to build your base up. The last player remaining will be the winner!",
+ "Description" : "[color=\"red\"]IMPORTANT NOTE: AI PLAYERS DO NOT WORK WITH THIS MAP[/color]\n\nProtect your base against endless waves of enemies. Use your civilian to collect the treasures at the center of the map before others do, and try to build your base up. The last player remaining will be the winner!",
"Keywords": ["trigger"],
"Preview" : "survivalofthefittest.png",
"SupportedBiomes": "generic/",
diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
index 5f8b2bf9be..55f87e8f08 100644
--- a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
+++ b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
@@ -141,15 +141,15 @@ Trigger.prototype.SetDisableTemplates = function()
};
/**
- * Remember civic centers and make women invincible.
+ * Remember civic centers and make civilians invincible.
*/
Trigger.prototype.InitStartingUnits = function()
{
for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID)
{
this.playerCivicCenter[playerID] = TriggerHelper.GetPlayerEntitiesByClass(playerID, "CivilCentre")[0];
- this.treasureFemale[playerID] = TriggerHelper.GetPlayerEntitiesByClass(playerID, "FemaleCitizen")[0];
- Engine.QueryInterface(this.treasureFemale[playerID], IID_Resistance).SetInvulnerability(true);
+ this.treasureCivilian[playerID] = TriggerHelper.GetPlayerEntitiesByClass(playerID, "Civilian")[0];
+ Engine.QueryInterface(this.treasureCivilian[playerID], IID_Resistance).SetInvulnerability(true);
}
};
@@ -288,9 +288,9 @@ Trigger.prototype.OnOwnershipChanged = function(data)
data.from,
markForTranslation("%(player)s has been defeated (lost civic center)."));
}
- else if (data.entity == this.treasureFemale[data.from])
+ else if (data.entity == this.treasureCivilian[data.from])
{
- this.treasureFemale[data.from] = undefined;
+ this.treasureCivilian[data.from] = undefined;
Engine.DestroyEntity(data.entity);
}
};
@@ -299,7 +299,7 @@ Trigger.prototype.OnOwnershipChanged = function(data)
{
const cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
- cmpTrigger.treasureFemale = [];
+ cmpTrigger.treasureCivilian = [];
cmpTrigger.playerCivicCenter = [];
cmpTrigger.gaiaHeroes = [];
diff --git a/binaries/data/mods/public/maps/scenarios/arcadia.xml b/binaries/data/mods/public/maps/scenarios/arcadia.xml
index be66d12862..0d59f49f05 100644
--- a/binaries/data/mods/public/maps/scenarios/arcadia.xml
+++ b/binaries/data/mods/public/maps/scenarios/arcadia.xml
@@ -22444,19 +22444,19 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
@@ -22492,19 +22492,19 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
index 5db2c3c288..4be18a0f57 100644
--- a/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
+++ b/binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml
@@ -6480,25 +6480,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -21767,25 +21767,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
@@ -21839,61 +21839,61 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
@@ -21935,37 +21935,37 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -22019,31 +22019,31 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -32623,25 +32623,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -48403,25 +48403,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
index dfa9a722af..b64f1eafab 100644
--- a/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
+++ b/binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml
@@ -6500,25 +6500,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -21787,25 +21787,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
@@ -21859,61 +21859,61 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
@@ -21955,37 +21955,37 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -22039,31 +22039,31 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
@@ -32643,25 +32643,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
@@ -48423,25 +48423,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml b/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
index b77cf7809e..59bae763c6 100644
--- a/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
+++ b/binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml
@@ -6552,25 +6552,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
@@ -21843,25 +21843,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
8
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
8
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
8
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
8
@@ -21915,61 +21915,61 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
7
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
7
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
7
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
7
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
7
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
@@ -22011,37 +22011,37 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -22095,31 +22095,31 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
@@ -32700,25 +32700,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
@@ -48480,25 +48480,25 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
5
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
5
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
5
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
5
diff --git a/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml b/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
index 7ea61bea8c..421d964798 100644
--- a/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
+++ b/binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml
@@ -43634,37 +43634,37 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
4
@@ -43676,37 +43676,37 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/bridge_demo.xml b/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
index 166eea15c2..dcfc44026a 100644
--- a/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/bridge_demo.xml
@@ -21389,7 +21389,7 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
index 465fc62c42..0e36930daf 100644
--- a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
@@ -117,25 +117,25 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
@@ -11365,28 +11365,28 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
@@ -13789,42 +13789,42 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml b/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
index 508f7d8845..55c331e99a 100644
--- a/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
+++ b/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
@@ -16635,19 +16635,19 @@
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
@@ -16695,19 +16695,19 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/gold_rush.xml b/binaries/data/mods/public/maps/scenarios/gold_rush.xml
index 361ff3183b..c27e725fe1 100644
--- a/binaries/data/mods/public/maps/scenarios/gold_rush.xml
+++ b/binaries/data/mods/public/maps/scenarios/gold_rush.xml
@@ -5574,19 +5574,19 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
@@ -5622,19 +5622,19 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
@@ -5808,19 +5808,19 @@
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
@@ -5850,19 +5850,19 @@
- units/brit/support_female_citizen
+ units/brit/support_civilian
2
- units/brit/support_female_citizen
+ units/brit/support_civilian
2
- units/brit/support_female_citizen
+ units/brit/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/laconia.xml b/binaries/data/mods/public/maps/scenarios/laconia.xml
index 8d61968744..b7d2d682b2 100644
--- a/binaries/data/mods/public/maps/scenarios/laconia.xml
+++ b/binaries/data/mods/public/maps/scenarios/laconia.xml
@@ -5402,61 +5402,61 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/miletus.xml b/binaries/data/mods/public/maps/scenarios/miletus.xml
index ff7a493415..d853b8f276 100644
--- a/binaries/data/mods/public/maps/scenarios/miletus.xml
+++ b/binaries/data/mods/public/maps/scenarios/miletus.xml
@@ -2023,37 +2023,37 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml b/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml
index ddabf390fb..2c9daccd8a 100644
--- a/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml
@@ -3451,7 +3451,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -3487,7 +3487,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
8
@@ -3505,7 +3505,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
@@ -3535,7 +3535,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
6
@@ -3565,13 +3565,13 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
7
@@ -3601,7 +3601,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
@@ -3631,7 +3631,7 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
5
diff --git a/binaries/data/mods/public/maps/scenarios/necropolis.xml b/binaries/data/mods/public/maps/scenarios/necropolis.xml
index 4bb598f130..062cda9639 100644
--- a/binaries/data/mods/public/maps/scenarios/necropolis.xml
+++ b/binaries/data/mods/public/maps/scenarios/necropolis.xml
@@ -49361,121 +49361,121 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
@@ -49487,61 +49487,61 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
@@ -49553,61 +49553,61 @@
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
- units/mace/support_female_citizen
+ units/mace/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/peloponnese.xml b/binaries/data/mods/public/maps/scenarios/peloponnese.xml
index d3f78e2fe2..b6fc6c6579 100644
--- a/binaries/data/mods/public/maps/scenarios/peloponnese.xml
+++ b/binaries/data/mods/public/maps/scenarios/peloponnese.xml
@@ -7015,25 +7015,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
- units/athen/support_female_citizen
+ units/athen/support_civilian
3
@@ -7087,49 +7087,49 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
4
- units/athen/support_female_citizen
+ units/athen/support_civilian
5
- units/athen/support_female_citizen
+ units/athen/support_civilian
5
- units/athen/support_female_citizen
+ units/athen/support_civilian
5
- units/athen/support_female_citizen
+ units/athen/support_civilian
5
@@ -7183,25 +7183,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
6
- units/athen/support_female_citizen
+ units/athen/support_civilian
6
- units/athen/support_female_citizen
+ units/athen/support_civilian
6
- units/athen/support_female_citizen
+ units/athen/support_civilian
6
@@ -30483,25 +30483,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
@@ -30591,25 +30591,25 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
2
- units/spart/support_female_citizen
+ units/spart/support_civilian
2
- units/spart/support_female_citizen
+ units/spart/support_civilian
2
- units/spart/support_female_citizen
+ units/spart/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/polynesia.xml b/binaries/data/mods/public/maps/scenarios/polynesia.xml
index 1139664aff..e7b33eaf4b 100644
--- a/binaries/data/mods/public/maps/scenarios/polynesia.xml
+++ b/binaries/data/mods/public/maps/scenarios/polynesia.xml
@@ -2245,37 +2245,37 @@
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
index 312a90ac84..5d8355a81b 100644
--- a/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
+++ b/binaries/data/mods/public/maps/scenarios/saharan_oases.xml
@@ -12975,19 +12975,19 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
@@ -13504,19 +13504,19 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
4
- units/cart/support_female_citizen
+ units/cart/support_civilian
4
- units/cart/support_female_citizen
+ units/cart/support_civilian
4
@@ -13528,19 +13528,19 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
2
- units/pers/support_female_citizen
+ units/pers/support_civilian
2
- units/pers/support_female_citizen
+ units/pers/support_civilian
2
@@ -14819,19 +14819,19 @@
- units/brit/support_female_citizen
+ units/brit/support_civilian
3
- units/brit/support_female_citizen
+ units/brit/support_civilian
3
- units/brit/support_female_citizen
+ units/brit/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/sahel.xml b/binaries/data/mods/public/maps/scenarios/sahel.xml
index f67b4c068e..b5ccffd9ce 100644
--- a/binaries/data/mods/public/maps/scenarios/sahel.xml
+++ b/binaries/data/mods/public/maps/scenarios/sahel.xml
@@ -5542,56 +5542,56 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
@@ -5633,28 +5633,28 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
@@ -5696,28 +5696,28 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
2
- units/cart/support_female_citizen
+ units/cart/support_civilian
2
- units/cart/support_female_citizen
+ units/cart/support_civilian
2
- units/cart/support_female_citizen
+ units/cart/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml b/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
index dd437bbf8e..ac3435c2f7 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
@@ -22161,182 +22161,182 @@
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
- units/brit/support_female_citizen
+ units/brit/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
index 8570ec36dd..7c0d13296a 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -689,19 +689,19 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml b/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
index 0fab57f846..20ece9d695 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
@@ -22210,182 +22210,182 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
index 9ba598f797..542d2f4005 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
@@ -612,19 +612,19 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
- units/iber/support_female_citizen
+ units/iber/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
index 9d7cdff5ec..a1d931bf9b 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -587,70 +587,70 @@
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
- units/kush/support_female_citizen
+ units/kush/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
index a9d9f8b544..d6a4fb3319 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4828,77 +4828,77 @@
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
- units/mace/support_female_citizen
+ units/mace/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml b/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
index 993a217f4d..74b36b3868 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
@@ -942,42 +942,42 @@
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
@@ -1040,119 +1040,119 @@
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
- units/maur/support_female_citizen
+ units/maur/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
index 0fe180734e..f07cc6ce12 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
@@ -669,21 +669,21 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
- units/pers/support_female_citizen
+ units/pers/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
index d6bcfedc6a..2a9deb2ce0 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
@@ -1390,28 +1390,28 @@
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
- units/maur/support_female_citizen
+ units/maur/support_civilian
2
@@ -8519,28 +8519,28 @@
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
index 27b7cab362..e7c729d877 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
@@ -13408,28 +13408,28 @@
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml b/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
index 490096b598..b49318ac27 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
@@ -330,42 +330,42 @@
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
- units/rome/support_female_citizen
+ units/rome/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml b/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
index ba2f514ca3..87362f5f69 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
@@ -10218,28 +10218,28 @@
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
2
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
2
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
2
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
2
@@ -10869,91 +10869,91 @@
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen_house
+ units/sele/support_civilian_house
1
- units/sele/support_female_citizen_house
+ units/sele/support_civilian_house
1
- units/sele/support_female_citizen_house
+ units/sele/support_civilian_house
1
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml b/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
index cebe4cadbc..3ab64f631a 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
@@ -1058,98 +1058,98 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/serengeti.xml b/binaries/data/mods/public/maps/scenarios/serengeti.xml
index d08cc5bf1c..4410d8950d 100644
--- a/binaries/data/mods/public/maps/scenarios/serengeti.xml
+++ b/binaries/data/mods/public/maps/scenarios/serengeti.xml
@@ -15162,37 +15162,37 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
- units/iber/support_female_citizen
+ units/iber/support_civilian
2
@@ -15228,37 +15228,37 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
@@ -15294,37 +15294,37 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
@@ -15586,37 +15586,37 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
- units/spart/support_female_citizen
+ units/spart/support_civilian
3
diff --git a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
index 3e5855108f..7c0673c8dc 100644
--- a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
@@ -13934,19 +13934,19 @@
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
- units/iber/support_female_citizen
+ units/iber/support_civilian
4
@@ -14438,19 +14438,19 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
@@ -15026,19 +15026,19 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
- units/pers/support_female_citizen
+ units/pers/support_civilian
3
@@ -15275,19 +15275,19 @@
- units/mace/support_female_citizen
+ units/mace/support_civilian
2
- units/mace/support_female_citizen
+ units/mace/support_civilian
2
- units/mace/support_female_citizen
+ units/mace/support_civilian
2
diff --git a/binaries/data/mods/public/maps/scenarios/territory_demo.xml b/binaries/data/mods/public/maps/scenarios/territory_demo.xml
index ee454542ae..fd16ab8b55 100644
--- a/binaries/data/mods/public/maps/scenarios/territory_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/territory_demo.xml
@@ -412,7 +412,7 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml b/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
index d0f6ca29ab..dc5bfecdb5 100644
--- a/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
+++ b/binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml
@@ -450,37 +450,37 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
@@ -16907,37 +16907,37 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
index 4050e0e3dd..3b94ae9d4f 100644
--- a/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
+++ b/binaries/data/mods/public/maps/scenarios/treasure_islands.xml
@@ -15314,28 +15314,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -15384,28 +15384,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/triggers_demo.xml b/binaries/data/mods/public/maps/scenarios/triggers_demo.xml
index cc105c1ffe..673ca80aa6 100644
--- a/binaries/data/mods/public/maps/scenarios/triggers_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/triggers_demo.xml
@@ -80,25 +80,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
diff --git a/binaries/data/mods/public/maps/scenarios/unit_chasing_test_triggers.js b/binaries/data/mods/public/maps/scenarios/unit_chasing_test_triggers.js
index 031adeb532..c72c5a587a 100644
--- a/binaries/data/mods/public/maps/scenarios/unit_chasing_test_triggers.js
+++ b/binaries/data/mods/public/maps/scenarios/unit_chasing_test_triggers.js
@@ -166,20 +166,20 @@ experiments.fast_on_muskox_2 = {
// Women flee
experiments.fast_on_women_flee = {
- "spawn": straight_line(false, FAST_UNIT_TEMPLATE, "units/mace/support_female_citizen", false)
+ "spawn": straight_line(false, FAST_UNIT_TEMPLATE, "units/mace/support_civilian", false)
};
experiments.fast_on_women_flee_2 = {
- "spawn": straight_line(true, FAST_UNIT_TEMPLATE, "units/mace/support_female_citizen", false)
+ "spawn": straight_line(true, FAST_UNIT_TEMPLATE, "units/mace/support_civilian", false)
};
// Women flee
experiments.slow_on_women_flee = {
- "spawn": straight_line(false, "units/athen/infantry_spearman_b", "units/mace/support_female_citizen", false)
+ "spawn": straight_line(false, "units/athen/infantry_spearman_b", "units/mace/support_civilian", false)
};
experiments.slow_on_women_flee_2 = {
- "spawn": straight_line(true, "units/athen/infantry_spearman_b", "units/mace/support_female_citizen", false)
+ "spawn": straight_line(true, "units/athen/infantry_spearman_b", "units/mace/support_civilian", false)
};
experiments.straight_line_garrison = {
@@ -223,11 +223,11 @@ experiments.fast_on_semi_2 = {
};
experiments.fast_on_flee = {
- "spawn": straight_line(false, FAST_UNIT_TEMPLATE_2, "units/mace/support_female_citizen", false)
+ "spawn": straight_line(false, FAST_UNIT_TEMPLATE_2, "units/mace/support_civilian", false)
};
experiments.fast_on_flee_2 = {
- "spawn": straight_line(true, FAST_UNIT_TEMPLATE_2, "units/mace/support_female_citizen", false)
+ "spawn": straight_line(true, FAST_UNIT_TEMPLATE_2, "units/mace/support_civilian", false)
};
diff --git a/binaries/data/mods/public/maps/scenarios/walls.xml b/binaries/data/mods/public/maps/scenarios/walls.xml
index 9526e38c9c..84bc6bc2e3 100644
--- a/binaries/data/mods/public/maps/scenarios/walls.xml
+++ b/binaries/data/mods/public/maps/scenarios/walls.xml
@@ -6349,49 +6349,49 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
- units/cart/support_female_citizen
+ units/cart/support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
index e288e349f8..083b3108af 100644
--- a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml
@@ -27267,56 +27267,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
index 074a5622ad..6b4601d908 100644
--- a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
@@ -1417,28 +1417,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -1494,28 +1494,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -1592,28 +1592,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
index 3e2ca28046..9530d893d3 100644
--- a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -13324,56 +13324,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
index d78cad5da5..dc6c895b99 100644
--- a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml
@@ -13295,56 +13295,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
index 226c32d740..8a3a28c755 100644
--- a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
@@ -6656,28 +6656,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -6698,21 +6698,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -6761,7 +6761,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -6775,21 +6775,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
8
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
8
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
8
@@ -6838,7 +6838,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
8
@@ -6852,21 +6852,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -6915,7 +6915,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -6929,21 +6929,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
@@ -6992,7 +6992,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
@@ -7006,21 +7006,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -7069,7 +7069,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -7083,21 +7083,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
7
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
7
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
7
@@ -7146,7 +7146,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
7
@@ -7160,21 +7160,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -7223,7 +7223,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
index 45296f26c3..2988ab39b9 100644
--- a/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml
@@ -18857,56 +18857,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml
index 37ec74bf68..8cadbef876 100644
--- a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml
@@ -5796,127 +5796,127 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml b/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
index 6a66950104..93bb144fbe 100644
--- a/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml
@@ -28781,56 +28781,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
index 556e1b3283..376a0b407d 100644
--- a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -12558,56 +12558,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml b/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
index 40bd25e2f0..c90e123de1 100644
--- a/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/caspian_sea_2pv2p.xml
@@ -25939,112 +25939,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml b/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml
index dbf9a133b0..0ad4e51c41 100644
--- a/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml
@@ -15789,56 +15789,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
index 6191520219..ed771b31e5 100644
--- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml
@@ -41,7 +41,7 @@
"AISeed": 0,
"AllyView": false,
"CircularMap": true,
- "Description": "Two Mediterranean land masses connected by a narrow spit of land, called an 'Isthmus'.",
+ "Description": "Two Mediterranean land masses connected by a narrow spit of land, called an 'Isthmus.'",
"Keywords": [],
"LockTeams": false,
"Name": "Corinthian Isthmus (2)",
@@ -4727,28 +4727,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -4762,28 +4762,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
index bfa9fd13da..8944fafcb4 100644
--- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_4p.xml
@@ -600,25 +600,25 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -1276,28 +1276,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -1988,28 +1988,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -2949,25 +2949,25 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -7886,25 +7886,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
0
- units/athen/support_female_citizen
+ units/athen/support_civilian
0
- units/athen/support_female_citizen
+ units/athen/support_civilian
0
- units/athen/support_female_citizen
+ units/athen/support_civilian
0
diff --git a/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml b/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml
index 6aa9349fdf..244120667d 100644
--- a/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/corsica_and_sardinia_4p.xml
@@ -70117,28 +70117,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -70229,56 +70229,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -70327,28 +70327,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
index b199783a36..06e8c257b9 100644
--- a/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml
@@ -38314,112 +38314,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml
index 5b63e55b20..43f6b11e5e 100644
--- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml
@@ -18424,56 +18424,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml
index ac9547ca71..4ccb1b6c8a 100644
--- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml
@@ -23164,84 +23164,84 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml b/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
index cc0681d77b..4c18ca59ec 100644
--- a/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/death_canyon_2p.xml
@@ -17730,28 +17730,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -17800,28 +17800,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
index 3172e8fee0..ea361ef430 100644
--- a/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/deccan_plateau_2p.xml
@@ -29418,56 +29418,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
index e19007e4d6..9da6ac3a4f 100644
--- a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
@@ -18123,28 +18123,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -18235,56 +18235,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -18333,28 +18333,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -18403,28 +18403,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -18473,28 +18473,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
diff --git a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
index b70e9ad605..efe88bb0a6 100644
--- a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -1437,7 +1437,7 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
6
@@ -93992,28 +93992,28 @@
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
- units/sele/support_female_citizen
+ units/sele/support_civilian
1
@@ -94359,42 +94359,42 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
@@ -94722,42 +94722,42 @@
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
- units/rome/support_female_citizen
+ units/rome/support_civilian
6
@@ -94988,28 +94988,28 @@
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
5
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
5
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
5
- units/ptol/support_female_citizen
+ units/ptol/support_civilian
5
@@ -95737,42 +95737,42 @@
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
- units/maur/support_female_citizen
+ units/maur/support_civilian
0
@@ -98966,7 +98966,7 @@
- units/cart/support_female_citizen
+ units/cart/support_civilian
3
@@ -104000,28 +104000,28 @@
- units/kush/support_female_citizen
+ units/kush/support_civilian
2
- units/kush/support_female_citizen
+ units/kush/support_civilian
2
- units/kush/support_female_citizen
+ units/kush/support_civilian
2
- units/kush/support_female_citizen
+ units/kush/support_civilian
2
@@ -114401,35 +114401,35 @@
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
- units/pers/support_female_citizen
+ units/pers/support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml b/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml
index 3f282a3d70..5540d759d2 100644
--- a/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/farmland_2p.xml
@@ -18224,35 +18224,35 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -18287,35 +18287,35 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
index 457b35c073..0ae2e77c29 100644
--- a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -2360,7 +2360,7 @@
- units/brit/support_female_citizen_house
+ units/brit/support_civilian_house
0
@@ -5747,42 +5747,42 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -5838,21 +5838,21 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -5908,7 +5908,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -16065,14 +16065,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml b/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
index 784cd41381..44cdb5f359 100644
--- a/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/gallic_fields_3p.xml
@@ -21092,28 +21092,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -21169,28 +21169,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -21246,28 +21246,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
index a20ce27c9f..243214b666 100644
--- a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml
@@ -36264,56 +36264,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
index e8d69874bc..e2325d10af 100644
--- a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
@@ -15883,28 +15883,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -15960,28 +15960,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -16058,28 +16058,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml b/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
index 6adb6efb27..7b520b0a38 100644
--- a/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/golden_island_2p.xml
@@ -10796,28 +10796,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -10894,28 +10894,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml
index cea71281a2..0cd72b30b5 100644
--- a/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/golden_oasis_2p.xml
@@ -11456,28 +11456,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -11526,28 +11526,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
index 2ba241889f..2bfdd3e8c4 100644
--- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_2p.xml
@@ -23550,28 +23550,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -23620,28 +23620,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
index 5d78d7c719..af49f1f1a2 100644
--- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_4p.xml
@@ -37332,28 +37332,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -37416,28 +37416,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -37472,28 +37472,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -37570,28 +37570,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
index 0ae49e8908..95be518588 100644
--- a/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/greek_acropolis_night_2p.xml
@@ -23514,28 +23514,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -23584,28 +23584,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml b/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
index 044589d305..84d41d57d7 100644
--- a/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml
@@ -9873,56 +9873,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml b/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml
index 039184b15a..136df8c2dd 100644
--- a/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml
@@ -53465,112 +53465,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
index 203ec7e799..9882779ed4 100644
--- a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml
@@ -37197,56 +37197,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
index c745789cc8..b513350292 100644
--- a/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/libyan_oases_4p.xml
@@ -15651,112 +15651,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
index 8c8af2cd8f..bad3a2ffb7 100644
--- a/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/libyan_oasis_2p.xml
@@ -11489,56 +11489,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml b/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
index 3aba8d4328..9042d0ba91 100644
--- a/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/lorraine_plain_2p.xml
@@ -17262,28 +17262,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -17381,28 +17381,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml b/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
index b15ff89006..21096fee01 100644
--- a/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml
@@ -11057,56 +11057,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
index 09c8c11937..d3043332ae 100644
--- a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml
@@ -13939,28 +13939,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -14044,28 +14044,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
index 22bb790cc4..315352b75b 100644
--- a/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_4p.xml
@@ -14453,28 +14453,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -14635,56 +14635,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -14845,28 +14845,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml b/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
index f556a6002a..52f21aeee1 100644
--- a/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/mediterranean_cove_2p.xml
@@ -12966,28 +12966,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -13043,28 +13043,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
index 6c857608cf..cc824de9c5 100644
--- a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml
@@ -29381,56 +29381,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
index 8b5fb95a10..46ac63ee29 100644
--- a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_2p.xml
@@ -11864,28 +11864,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -11976,28 +11976,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
index 0be727dbd9..4a6eb7c632 100644
--- a/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/neareastern_badlands_4p.xml
@@ -14419,28 +14419,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -14489,28 +14489,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -14559,28 +14559,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -14643,28 +14643,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
index d9c08b76c8..599a563dd5 100644
--- a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
@@ -8042,28 +8042,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -8126,28 +8126,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -8210,28 +8210,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -8294,28 +8294,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml b/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
index 7d8e60c397..6a2ce86c7a 100644
--- a/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/northern_island_2p.xml
@@ -5487,28 +5487,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -5890,28 +5890,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml b/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml
index 129c6fe9d7..113f721f02 100644
--- a/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml
@@ -12197,56 +12197,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml b/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml
index a1e158de81..c3c15735ba 100644
--- a/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml
@@ -71416,28 +71416,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -71514,28 +71514,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -71591,28 +71591,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -71668,28 +71668,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml b/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml
index 433aacf224..a286a32932 100644
--- a/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/obedska_bog_night_4p.xml
@@ -71416,28 +71416,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -71514,28 +71514,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -71591,28 +71591,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -71668,28 +71668,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml b/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
index 1ba4ba16a8..6de6656d61 100644
--- a/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
@@ -10378,70 +10378,70 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml b/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml
index 5a2109ef15..2962ab6aba 100644
--- a/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/persian_highlands_4p.xml
@@ -12125,28 +12125,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -12209,28 +12209,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -12307,56 +12307,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml b/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
index ead4784fe3..9d0e5b3cc2 100644
--- a/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/punjab_2p.xml
@@ -29348,28 +29348,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -29460,28 +29460,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
index ed56f77411..0d96524718 100644
--- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml
@@ -19067,56 +19067,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
index 71f646f0f2..62dc869e0e 100644
--- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -25592,112 +25592,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml b/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
index 9ed8ebee71..39abc18ef9 100644
--- a/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sahel_4p.xml
@@ -21519,28 +21519,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -21631,56 +21631,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -21743,28 +21743,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml b/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml
index 835bd094a2..1262f65b49 100644
--- a/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml
@@ -99893,140 +99893,140 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/savanna_river_2p.xml b/binaries/data/mods/public/maps/skirmishes/savanna_river_2p.xml
index 4f09757b7e..551bd46069 100644
--- a/binaries/data/mods/public/maps/skirmishes/savanna_river_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/savanna_river_2p.xml
@@ -26375,28 +26375,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -26487,28 +26487,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml b/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
index 984225d919..0f35b2c8e0 100644
--- a/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml
@@ -39791,112 +39791,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
diff --git a/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml b/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml
index 765435920c..327f9df583 100644
--- a/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sicilia_2p.xml
@@ -14712,28 +14712,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -14789,28 +14789,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
index 37e68f3232..f52484ef4e 100644
--- a/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sicilia_nomad_2p.xml
@@ -15590,14 +15590,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -15642,28 +15642,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -15736,28 +15736,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -15806,14 +15806,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/skirmish_demo_2p.xml b/binaries/data/mods/public/maps/skirmishes/skirmish_demo_2p.xml
index ffd91b5756..a4dbd91a87 100644
--- a/binaries/data/mods/public/maps/skirmishes/skirmish_demo_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/skirmish_demo_2p.xml
@@ -2922,35 +2922,35 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
index 009387cca9..ccaa2d7583 100644
--- a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml
@@ -89,56 +89,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
index 865dfddbe7..3ccb41a245 100644
--- a/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/syria_2p.xml
@@ -23088,28 +23088,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -23172,28 +23172,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml b/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml
index b867db8e46..03c737b725 100644
--- a/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml
@@ -10250,56 +10250,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml b/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml
index ed7bbc8776..80efbed2d8 100644
--- a/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml
@@ -11815,112 +11815,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
index 0c20e3c00c..a7e836994e 100644
--- a/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/team_oasis_2pv2p.xml
@@ -10963,28 +10963,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -11061,56 +11061,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -11187,28 +11187,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml b/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
index 701a7e5813..30e78cc1f3 100644
--- a/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/temperate_roadway_2p.xml
@@ -8927,70 +8927,70 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml b/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
index 31c8d88baa..afb0aaff78 100644
--- a/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/thessalian_plains_4p.xml
@@ -43679,28 +43679,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -43791,56 +43791,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -43931,28 +43931,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
index e877871874..895280515a 100644
--- a/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/tuscan_acropolis_4p.xml
@@ -15887,28 +15887,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -15957,28 +15957,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -16027,28 +16027,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -16097,28 +16097,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
index 80923161e3..570cf66bab 100644
--- a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
@@ -54958,56 +54958,56 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -55049,28 +55049,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -55112,28 +55112,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -55175,28 +55175,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -55238,28 +55238,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
diff --git a/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml b/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml
index 7ade01e0e3..78a6fdee2d 100644
--- a/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml
@@ -3693,28 +3693,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -3897,28 +3897,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -3960,28 +3960,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -4023,28 +4023,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -4086,28 +4086,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -4149,28 +4149,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
6
diff --git a/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml b/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
index 2e51311ed4..ca9c622bfd 100644
--- a/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/via_augusta_4p.xml
@@ -11308,28 +11308,28 @@
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
0
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
0
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
0
- units/gaul/support_female_citizen
+ units/gaul/support_civilian
0
@@ -13793,35 +13793,35 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -13877,70 +13877,70 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -13989,35 +13989,35 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
index d878415f40..38efd3a739 100644
--- a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml
@@ -12314,112 +12314,112 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
diff --git a/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml b/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
index 9d6c8e434f..61bac61a69 100644
--- a/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml
@@ -3727,70 +3727,70 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -22442,28 +22442,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
@@ -22484,7 +22484,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -22498,14 +22498,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -22526,7 +22526,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
4
@@ -22554,7 +22554,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -22568,14 +22568,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -22596,7 +22596,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
3
@@ -22624,7 +22624,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -22638,14 +22638,14 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
@@ -22666,7 +22666,7 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
5
diff --git a/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml b/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml
index d86dcd192c..9394fd8ed1 100644
--- a/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml
@@ -15619,28 +15619,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -15703,28 +15703,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
index 56eda8c824..da1aa19d12 100644
--- a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml
@@ -8248,28 +8248,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
1
@@ -8318,28 +8318,28 @@
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
- skirmish/units/default_support_female_citizen
+ skirmish/units/default_support_civilian
2
diff --git a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
index 621f2bc85f..91b794018e 100644
--- a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
+++ b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
@@ -3,7 +3,7 @@ Trigger.prototype.tutorialGoals = [
"instructions": markForTranslation("Welcome to the 0\xa0A.D. tutorial."),
},
{
- "instructions": markForTranslation("Left-click on a Female Citizen and then right-click on a berry bush to make that Female Citizen gather food. Female Citizens gather vegetables faster than other units."),
+ "instructions": markForTranslation("Left-click on a Civilian and then right-click on a berry bush to make that Civilian gather food. Civilians gather vegetables faster than other units."),
"OnPlayerCommand": function(msg)
{
if (msg.cmd.type == "gather" && msg.cmd.target &&
@@ -12,7 +12,7 @@ Trigger.prototype.tutorialGoals = [
}
},
{
- "instructions": markForTranslation("Select the Citizen Soldier, right-click on a tree near the Civic Center to begin gathering wood. Citizen Soldiers gather wood faster than Female Citizens."),
+ "instructions": markForTranslation("Select the Citizen Soldier, right-click on a tree near the Civic Center to begin gathering wood. Citizen Soldiers gather wood faster than Civilians."),
"OnPlayerCommand": function(msg)
{
if (msg.cmd.type == "gather" && msg.cmd.target &&
@@ -43,7 +43,7 @@ Trigger.prototype.tutorialGoals = [
}
},
{
- "instructions": markForTranslation("Select the two idle Female Citizens and build a House nearby by selecting the House icon. Place the House by left-clicking on a piece of land."),
+ "instructions": markForTranslation("Select the two idle Civilians and build a House nearby by selecting the House icon. Place the House by left-clicking on a piece of land."),
"OnPlayerCommand": function(msg)
{
if (msg.cmd.type == "repair" && TriggerHelper.EntityMatchesClassList(msg.cmd.target, "House"))
@@ -225,7 +225,7 @@ Trigger.prototype.tutorialGoals = [
}
},
{
- "instructions": markForTranslation("Start training a batch of Female Citizens in the Civic Center and set its rally point to the Field (right click on it)."),
+ "instructions": markForTranslation("Start training a batch of Civilians in the Civic Center and set its rally point to the Field (right click on it)."),
"Init": function()
{
this.rallyPointSet = false;
@@ -237,13 +237,13 @@ Trigger.prototype.tutorialGoals = [
},
"OnTrainingQueued": function(msg)
{
- if (msg.unitTemplate != "units/spart/support_female_citizen" || +msg.count == 1)
+ if (msg.unitTemplate != "units/spart/support_civilian" || +msg.count == 1)
{
const cmpProductionQueue = Engine.QueryInterface(msg.trainerEntity, IID_ProductionQueue);
cmpProductionQueue.ResetQueue();
const txt = +msg.count == 1 ?
markForTranslation("Do not forget to press the batch training hotkey while clicking to produce multiple units.") :
- markForTranslation("Click on the Female Citizen icon.");
+ markForTranslation("Click on the Civilian icon.");
this.WarningMessage(txt);
return;
}
@@ -365,7 +365,7 @@ Trigger.prototype.tutorialGoals = [
{
"instructions": [
markForTranslation("Stop all your soldiers gathering resources and instead task small groups to find the enemy Civic Center on the map. Once the enemy's base has been spotted, send your Siege Engines and all remaining soldiers to destroy it.\n"),
- markForTranslation("Female Citizens should continue to gather resources.")
+ markForTranslation("Civilians should continue to gather resources.")
],
"OnOwnershipChanged": function(msg)
{
diff --git a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
index 7497ceb427..deab4cefad 100644
--- a/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
+++ b/binaries/data/mods/public/maps/tutorials/introductory_tutorial.xml
@@ -109,19 +109,19 @@
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
- units/spart/support_female_citizen
+ units/spart/support_civilian
1
@@ -689,85 +689,85 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
- units/athen/support_female_citizen
+ units/athen/support_civilian
2
diff --git a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
index eb8dde02a0..65a1a2f51c 100644
--- a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
+++ b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
@@ -27,7 +27,7 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("You have two main types of starting units: Female Citizens and Citizen Soldiers. Female Citizens are purely economic units; they have low health and little to no attack. Citizen Soldiers are workers by default, but in times of need, can utilize a weapon to fight. You have two categories of Citizen Soldiers: Infantry and Cavalry. Female Citizens and Infantry Citizen Soldiers can gather any land resources while Cavalry Citizen Soldiers can only gather meat from animals.\n")
+ markForTranslation("You have two main types of starting units: Civilians and Citizen Soldiers. Civilians are purely economic units; they have low health and little to no attack. Citizen Soldiers are workers by default, but in times of need, can utilize a weapon to fight. You have two categories of Citizen Soldiers: Infantry and Cavalry. Civilians and Infantry Citizen Soldiers can gather any land resources while Cavalry Citizen Soldiers can only gather meat from animals.\n")
]
},
{
@@ -37,7 +37,7 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("At this point, food and wood are the most important resources for developing your economy, so let's start with gathering food. Female Citizens gather vegetables faster than other units.\n"),
+ markForTranslation("At this point, food and wood are the most important resources for developing your economy, so let's start with gathering food. Civilians gather vegetables faster than other units.\n"),
markForTranslation("There are primarily three ways to select units:\n"),
markForTranslation("1) Hold the left mouse button and drag a selection rectangle that encloses the units you want to select.\n"),
markForTranslation("2) Click on one of them and then add additional units to your selection by holding Shift and clicking each additional unit (or also via the above selection rectangle).\n"),
@@ -45,7 +45,7 @@ Trigger.prototype.tutorialGoals = [
"text": markForTranslation("3) Double-click on a unit. This will select every unit of the same type as the specified unit in your visible window. %(hotkey)s+double-click will select all units of the same type on the entire map.\n"),
"hotkey": "selection.offscreen"
},
- markForTranslation("You can click on an empty space on the map to reset the selection. Try each of these methods before tasking all of your Female Citizens to gather the berries to the southeast of your Civic Center by right-clicking on the berries when you have all the Female Citizens selected.")
+ markForTranslation("You can click on an empty space on the map to reset the selection. Try each of these methods before tasking all of your Civilians to gather the berries to the southeast of your Civic Center by right-clicking on the berries when you have all the Civilians selected.")
],
"OnPlayerCommand": function(msg)
{
@@ -98,7 +98,7 @@ Trigger.prototype.tutorialGoals = [
{
"instructions": [
markForTranslation("Now that the rally point is set, we can produce additional units and they will do their assigned task automatically.\n"),
- markForTranslation("Citizen Soldiers gather wood faster than Female Citizens. Select the Civic Center and, while holding Shift, click on the second unit icon, the Hoplites (holding Shift trains a batch of five units). You can also train units individually by simply clicking, but training 5 units together takes less time than training 5 units individually.")
+ markForTranslation("Citizen Soldiers gather wood faster than Civilians. Select the Civic Center and, while holding Shift, click on the second unit icon, the Hoplites (holding Shift trains a batch of five units). You can also train units individually by simply clicking, but training 5 units together takes less time than training 5 units individually.")
],
"OnTrainingQueued": function(msg)
{
@@ -153,7 +153,7 @@ Trigger.prototype.tutorialGoals = [
{
"instructions": [
markForTranslation("When construction finishes, the builders default to gathering wood automatically.\n"),
- markForTranslation("Let's train some Female Citizens to gather more food. Select the Civic Center, hold Shift and click on the Female Citizen icon to train five Female Citizens.")
+ markForTranslation("Let's train some Civilians to gather more food. Select the Civic Center, hold Shift and click on the Civilian icon to train five Civilians.")
],
"Init": function()
{
@@ -161,14 +161,14 @@ Trigger.prototype.tutorialGoals = [
},
"OnTrainingQueued": function(msg)
{
- if (msg.unitTemplate != "units/athen/support_female_citizen" || +msg.count == 1)
+ if (msg.unitTemplate != "units/athen/support_civilian" || +msg.count == 1)
{
const entity = msg.trainerEntity;
const cmpProductionQueue = Engine.QueryInterface(entity, IID_ProductionQueue);
cmpProductionQueue.ResetQueue();
const txt = +msg.count == 1 ?
markForTranslation("Do not forget to hold Shift and click to train several units.") :
- markForTranslation("Hold shift and click on the Female Citizen icon.");
+ markForTranslation("Hold shift and click on the Civilian icon.");
this.WarningMessage(txt);
return;
}
@@ -212,8 +212,8 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("Select two of your newly-trained Female Citizens and ask them to build these Houses in the empty space to the east of the Civic Center. To do so, after selecting the Female Citizens, click on the House icon in the bottom right panel and, while holding Shift, click first on the position in the map where you want to build the first House, and then click on the position where you want to build the second House (when you give a command while holding Shift, you put the command in a queue; units automatically switch to the next command in their queue when they finish their current command). Press Escape to get rid of the House cursor so you don't spam Houses all over the map.\n"),
- markForTranslation("Reminder: to select only two Female Citizens, click on the first one and then hold Shift and click on the second one.")
+ markForTranslation("Select two of your newly-trained Civilians and ask them to build these Houses in the empty space to the east of the Civic Center. To do so, after selecting the Civilians, click on the House icon in the bottom right panel and, while holding Shift, click first on the position in the map where you want to build the first House, and then click on the position where you want to build the second House (when you give a command while holding Shift, you put the command in a queue; units automatically switch to the next command in their queue when they finish their current command). Press Escape to get rid of the House cursor so you don't spam Houses all over the map.\n"),
+ markForTranslation("Reminder: to select only two Civilians, click on the first one and then hold Shift and click on the second one.")
],
"Init": function()
{
@@ -258,9 +258,9 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("Select the three remaining (idle) Female Citizens and order them to build a Farmstead in the center of the large open area to the west of the Civic Center.\n"),
+ markForTranslation("Select the three remaining (idle) Civilians and order them to build a Farmstead in the center of the large open area to the west of the Civic Center.\n"),
markForTranslation("We will need a decent chunk of space around the Farmstead to build Fields. In addition, we can see goats on the west side to further improve our food gathering efficiency should we ever decide to hunt them.\n"),
- markForTranslation("If you try to select the three idle Female Citizens by clicking and dragging a selection rectangle over them, you might accidentally select additional units. To avoid that, hold the I key while selecting so that only idle units are selected. If you accidentally select a cavalry unit, hold Ctrl and click on the cavalry unit icon of the selection panel at the bottom of the screen to remove the cavalry unit from the current selection.")
+ markForTranslation("If you try to select the three idle Civilians by clicking and dragging a selection rectangle over them, you might accidentally select additional units. To avoid that, hold the I key while selecting so that only idle units are selected. If you accidentally select a cavalry unit, hold Ctrl and click on the cavalry unit icon of the selection panel at the bottom of the screen to remove the cavalry unit from the current selection.")
],
"OnPlayerCommand": function(msg)
{
@@ -292,7 +292,7 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("When both Houses are built, select your two Female Citizens and order them to build a Field as close as possible to the Farmstead, which is a dropsite for all types of food.")
+ markForTranslation("When both Houses are built, select your two Civilians and order them to build a Field as close as possible to the Farmstead, which is a dropsite for all types of food.")
],
"OnPlayerCommand": function(msg)
{
@@ -330,7 +330,7 @@ Trigger.prototype.tutorialGoals = [
},
{
"instructions": [
- markForTranslation("Now click three times on the Female Citizen icon in the bottom right panel to train three additional farmers.")
+ markForTranslation("Now click three times on the Civilian icon in the bottom right panel to train three additional farmers.")
],
"Init": function(msg)
{
@@ -338,14 +338,14 @@ Trigger.prototype.tutorialGoals = [
},
"OnTrainingQueued": function(msg)
{
- if (msg.unitTemplate != "units/athen/support_female_citizen" || +msg.count != 1)
+ if (msg.unitTemplate != "units/athen/support_civilian" || +msg.count != 1)
{
const entity = msg.trainerEntity;
const cmpProductionQueue = Engine.QueryInterface(entity, IID_ProductionQueue);
cmpProductionQueue.ResetQueue();
const txt = +msg.count != 1 ?
markForTranslation("Click without holding Shift to train a single unit.") :
- markForTranslation("Click on the Female Citizen icon.");
+ markForTranslation("Click on the Civilian icon.");
this.WarningMessage(txt);
return;
}
diff --git a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml
index d20ae60e4e..40d1e6d70d 100644
--- a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml
+++ b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml
@@ -379,25 +379,25 @@
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
- units/athen/support_female_citizen
+ units/athen/support_civilian
1
diff --git a/binaries/data/mods/public/simulation/ai/petra/attackPlan.js b/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
index 1d8fec1be6..23c026f8ff 100644
--- a/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
+++ b/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
@@ -1593,7 +1593,7 @@ AttackPlan.prototype.update = function(gameState, events)
else if (attackedByStructure[ent.id()] && target.hasClass("Field"))
maybeUpdate = true;
else if (!ent.hasClass("FastMoving") && !ent.hasClass("Ranged") &&
- target.hasClass("FemaleCitizen") && target.unitAIState().split(".")[1] == "FLEEING")
+ target.hasClass("Civilian") && target.unitAIState().split(".")[1] == "FLEEING")
maybeUpdate = true;
}
@@ -1685,7 +1685,7 @@ AttackPlan.prototype.update = function(gameState, events)
return false;
if (enemy.hasClass("Animal"))
return false;
- if (nearby && enemy.hasClass("FemaleCitizen") && enemy.unitAIState().split(".")[1] == "FLEEING")
+ if (nearby && enemy.hasClass("Civilian") && enemy.unitAIState().split(".")[1] == "FLEEING")
return false;
const dist = SquareVectorDistance(enemy.position(), ent.position());
if (dist > range)
diff --git a/binaries/data/mods/public/simulation/ai/petra/baseManager.js b/binaries/data/mods/public/simulation/ai/petra/baseManager.js
index 54adf13824..4e208a096d 100644
--- a/binaries/data/mods/public/simulation/ai/petra/baseManager.js
+++ b/binaries/data/mods/public/simulation/ai/petra/baseManager.js
@@ -653,7 +653,7 @@ BaseManager.prototype.setWorkersIdleByPriority = function(gameState)
/**
* Switch some gatherers (limited to number) from resource "from" to resource "to"
* and return remaining number of possible switches.
- * Prefer FemaleCitizen for food and CitizenSoldier for other resources.
+ * Prefer Civilian for food and CitizenSoldier for other resources.
*/
BaseManager.prototype.switchGatherer = function(gameState, from, to, number)
{
@@ -662,8 +662,8 @@ BaseManager.prototype.switchGatherer = function(gameState, from, to, number)
const gatherers = this.gatherersByType(gameState, from);
if (from == "food" && gatherers.filter(filters.byClass("CitizenSoldier")).hasEntities())
only = "CitizenSoldier";
- else if (to == "food" && gatherers.filter(filters.byClass("FemaleCitizen")).hasEntities())
- only = "FemaleCitizen";
+ else if (to == "food" && gatherers.filter(filters.byClass("Civilian")).hasEntities())
+ only = "Civilian";
for (const ent of gatherers.values())
{
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index e711b3449e..a9e75cfe21 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@ Identity.prototype.Schema =
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
@@ -65,7 +65,7 @@ Identity.prototype.Schema =
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
diff --git a/binaries/data/mods/public/simulation/components/StatisticsTracker.js b/binaries/data/mods/public/simulation/components/StatisticsTracker.js
index 9254c800e1..a42a4a2622 100644
--- a/binaries/data/mods/public/simulation/components/StatisticsTracker.js
+++ b/binaries/data/mods/public/simulation/components/StatisticsTracker.js
@@ -3,7 +3,7 @@ function StatisticsTracker() {}
StatisticsTracker.prototype.Schema =
"This component records statistics over the course of the match, such as the number of trained, lost, captured and destroyed units and buildings The statistics are consumed by the summary screen and lobby rankings." +
"" +
- "Infantry FemaleCitizen" +
+ "Infantry Civilian" +
"House Wonder" +
"" +
"" +
diff --git a/binaries/data/mods/public/simulation/components/Trainer.js b/binaries/data/mods/public/simulation/components/Trainer.js
index 8bbaabdd66..dd625651e1 100644
--- a/binaries/data/mods/public/simulation/components/Trainer.js
+++ b/binaries/data/mods/public/simulation/components/Trainer.js
@@ -5,7 +5,7 @@ Trainer.prototype.Schema =
"" +
"0.7" +
"" +
- "\n units/{civ}/support_female_citizen\n units/{native}/support_trader\n units/athen/infantry_spearman_b\n " +
+ "\n units/{civ}/support_civilian\n units/{native}/support_trader\n units/athen/infantry_spearman_b\n " +
"" +
"" +
"" +
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Attack.js b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
index 4c9e8267e6..a28838efb3 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -74,7 +74,7 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
"MinRange": 3,
"MaxRange": 5,
"PreferredClasses": {
- "_string": "FemaleCitizen"
+ "_string": "Civilian"
},
"RestrictedClasses": {
"_string": "Elephant Archer"
@@ -198,7 +198,7 @@ attackComponentTest(undefined, true, (attacker, cmpAttack, defender) => {
TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackTypes(["Capture", "!Ranged"]), ["Capture"]);
TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackTypes(["Capture", "Melee", "!Ranged"]), ["Melee", "Capture"]);
- TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetPreferredClasses("Melee"), ["FemaleCitizen"]);
+ TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetPreferredClasses("Melee"), ["Civilian"]);
TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetRestrictedClasses("Melee"), ["Elephant", "Archer"]);
TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetFullAttackRange(), { "min": 0, "max": 80 });
TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackEffectsData("Capture"), { "Capture": 8 });
@@ -360,7 +360,7 @@ function testGetBestAttackAgainst(defenderClass, bestAttack, bestAllyAttack, isB
});
}
-testGetBestAttackAgainst("FemaleCitizen", "Melee", undefined);
+testGetBestAttackAgainst("Civilian", "Melee", undefined);
testGetBestAttackAgainst("Archer", "Ranged", undefined);
testGetBestAttackAgainst("Domestic", "Slaughter", "Slaughter");
testGetBestAttackAgainst("Structure", "Capture", "Capture", true);
@@ -379,7 +379,7 @@ function testAttackPreference()
"MinRange": 3,
"MaxRange": 5,
"PreferredClasses": {
- "_string": "FemaleCitizen Unit+!Ship"
+ "_string": "Civilian Unit+!Ship"
},
"RestrictedClasses": {
"_string": "Elephant Archer"
@@ -388,7 +388,7 @@ function testAttackPreference()
});
AddMock(attacker+1, IID_Identity, {
- "GetClassesList": () => ["FemaleCitizen", "Unit"]
+ "GetClassesList": () => ["Civilian", "Unit"]
});
AddMock(attacker+2, IID_Identity, {
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Trainer.js b/binaries/data/mods/public/simulation/components/tests/test_Trainer.js
index c867984d58..d7abe08814 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Trainer.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Trainer.js
@@ -30,7 +30,7 @@ AddMock(SYSTEM_ENTITY, IID_TemplateManager, {
let cmpTrainer = ConstructComponent(entityID, "Trainer", {
"Entities": { "_string": "units/{civ}/cavalry_javelineer_b " +
"units/{civ}/infantry_swordsman_b " +
- "units/{native}/support_female_citizen" }
+ "units/{native}/support_civilian" }
});
cmpTrainer.GetUpgradedTemplate = (template) => template;
@@ -60,7 +60,7 @@ Engine.RegisterGlobal("GetUpgradedTemplate", GetUpgradedTemplate);
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/iber/cavalry_javelineer_a", "units/iber/infantry_swordsman_b", "units/iber/support_female_citizen"]
+ ["units/iber/cavalry_javelineer_a", "units/iber/infantry_swordsman_b", "units/iber/support_civilian"]
);
GetUpgradedTemplate = (_, template) => template;
@@ -68,16 +68,16 @@ Engine.RegisterGlobal("GetUpgradedTemplate", GetUpgradedTemplate);
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_female_citizen"]
+ ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_civilian"]
);
AddMock(SYSTEM_ENTITY, IID_TemplateManager, {
- "TemplateExists": name => name == "units/iber/support_female_citizen",
+ "TemplateExists": name => name == "units/iber/support_civilian",
"GetTemplate": name => ({})
});
cmpTrainer.CalculateEntitiesMap();
-TS_ASSERT_UNEVAL_EQUALS(cmpTrainer.GetEntitiesList(), ["units/iber/support_female_citizen"]);
+TS_ASSERT_UNEVAL_EQUALS(cmpTrainer.GetEntitiesList(), ["units/iber/support_civilian"]);
AddMock(SYSTEM_ENTITY, IID_TemplateManager, {
"TemplateExists": () => true,
@@ -92,7 +92,7 @@ AddMock(playerEntityID, IID_Player, {
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_female_citizen"]
+ ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_civilian"]
);
AddMock(playerEntityID, IID_Player, {
@@ -103,7 +103,7 @@ AddMock(playerEntityID, IID_Player, {
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/iber/cavalry_javelineer_b", "units/iber/support_female_citizen"]
+ ["units/iber/cavalry_javelineer_b", "units/iber/support_civilian"]
);
AddMock(playerEntityID, IID_Player, {
@@ -118,7 +118,7 @@ AddMock(playerEntityID, IID_Identity, {
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/athen/cavalry_javelineer_b", "units/iber/support_female_citizen"]
+ ["units/athen/cavalry_javelineer_b", "units/iber/support_civilian"]
);
AddMock(playerEntityID, IID_Player, {
@@ -133,7 +133,7 @@ AddMock(playerEntityID, IID_Identity, {
cmpTrainer.CalculateEntitiesMap();
TS_ASSERT_UNEVAL_EQUALS(
cmpTrainer.GetEntitiesList(),
- ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_female_citizen"]
+ ["units/iber/cavalry_javelineer_b", "units/iber/infantry_swordsman_b", "units/iber/support_civilian"]
);
@@ -315,7 +315,7 @@ cmpTrainer.OnValueModification({
});
TS_ASSERT_UNEVAL_EQUALS(
- cmpTrainer.GetEntitiesList(), ["units/iber/c", "units/iber/support_female_citizen", "units/iber/d"]
+ cmpTrainer.GetEntitiesList(), ["units/iber/c", "units/iber/support_civilian", "units/iber/d"]
);
TS_ASSERT_EQUALS(cmpTrainer.queue.size, 1);
TS_ASSERT_EQUALS(cmpTrainer.GetBatch(id1), undefined);
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/kush_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/kush_catafalque_1.json
index f5a4e2fa39..c15746d8be 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/kush_catafalque_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/kush_catafalque_1.json
@@ -1,10 +1,10 @@
{
"type": "global",
- "affects": ["FemaleCitizen"],
+ "affects": ["Civilian"],
"affectedPlayers": ["Enemy"],
"modifications": [
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.85 }
],
"auraName": "Earliest Nubian Queen",
- "auraDescription": "Ruling with full power in the Meroë Empire and also playing a significant role in the Meroitic religion, Shanakdakheto represented the might of Kush, something not to be taken lightly.\nEnemy Female Citizens −15% gather speed."
+ "auraDescription": "Ruling with full power in the Meroë Empire and also playing a significant role in the Meroitic religion, Shanakdakheto represented the might of Kush, something not to be taken lightly.\nEnemy Civilians −15% gather speed."
}
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json
index 5befc9577c..725e8f07fb 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_1.json
@@ -1,10 +1,10 @@
{
"type": "global",
- "affects": ["FemaleCitizen"],
+ "affects": ["Civilian"],
"modifications": [
{ "value": "Cost/Resources/food", "multiply": 0.8 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 1.1 }
],
"auraName": "Avenger of Lucretia",
- "auraDescription": "After the rape of Lucretia by the son of King Tarquinius Superbus and her subsequent suicide, Brutus vowed to avenge her and overthrow the monarchy.\nFemale Citizens −20% food cost and +10% gather speed."
+ "auraDescription": "After the rape of Lucretia by the son of King Tarquinius Superbus and her subsequent suicide, Brutus vowed to avenge her and overthrow the monarchy.\nCivilians −20% food cost and +10% gather speed."
}
diff --git a/binaries/data/mods/public/simulation/data/civs/athen.json b/binaries/data/mods/public/simulation/data/civs/athen.json
index eb6c829af5..8597f01c19 100644
--- a/binaries/data/mods/public/simulation/data/civs/athen.json
+++ b/binaries/data/mods/public/simulation/data/civs/athen.json
@@ -40,7 +40,7 @@
"Template": "structures/athen/civil_centre"
},
{
- "Template": "units/athen/support_female_citizen",
+ "Template": "units/athen/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/brit.json b/binaries/data/mods/public/simulation/data/civs/brit.json
index 61ca275039..60a930f9cf 100644
--- a/binaries/data/mods/public/simulation/data/civs/brit.json
+++ b/binaries/data/mods/public/simulation/data/civs/brit.json
@@ -51,7 +51,7 @@
"Template": "structures/brit/civil_centre"
},
{
- "Template": "units/brit/support_female_citizen",
+ "Template": "units/brit/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/cart.json b/binaries/data/mods/public/simulation/data/civs/cart.json
index 80d82a208e..19db79ade6 100644
--- a/binaries/data/mods/public/simulation/data/civs/cart.json
+++ b/binaries/data/mods/public/simulation/data/civs/cart.json
@@ -41,7 +41,7 @@
"Template": "structures/cart/civil_centre"
},
{
- "Template": "units/cart/support_female_citizen",
+ "Template": "units/cart/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/gaul.json b/binaries/data/mods/public/simulation/data/civs/gaul.json
index e8d7938caf..ae234cde8a 100644
--- a/binaries/data/mods/public/simulation/data/civs/gaul.json
+++ b/binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -43,7 +43,7 @@
"Template": "structures/gaul/civil_centre"
},
{
- "Template": "units/gaul/support_female_citizen",
+ "Template": "units/gaul/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/han.json b/binaries/data/mods/public/simulation/data/civs/han.json
index a6866eb0f1..1a68eeb397 100644
--- a/binaries/data/mods/public/simulation/data/civs/han.json
+++ b/binaries/data/mods/public/simulation/data/civs/han.json
@@ -20,7 +20,7 @@
"Template": "structures/han/civil_centre"
},
{
- "Template": "units/han/support_female_citizen",
+ "Template": "units/han/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/iber.json b/binaries/data/mods/public/simulation/data/civs/iber.json
index a7c8a62a6d..57da27a3be 100644
--- a/binaries/data/mods/public/simulation/data/civs/iber.json
+++ b/binaries/data/mods/public/simulation/data/civs/iber.json
@@ -44,7 +44,7 @@
"Template": "structures/iber/civil_centre"
},
{
- "Template": "units/iber/support_female_citizen",
+ "Template": "units/iber/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/kush.json b/binaries/data/mods/public/simulation/data/civs/kush.json
index 36975571d6..c91f95ee7b 100644
--- a/binaries/data/mods/public/simulation/data/civs/kush.json
+++ b/binaries/data/mods/public/simulation/data/civs/kush.json
@@ -43,7 +43,7 @@
"Template": "structures/kush/civil_centre"
},
{
- "Template": "units/kush/support_female_citizen",
+ "Template": "units/kush/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/mace.json b/binaries/data/mods/public/simulation/data/civs/mace.json
index 0da50ada38..ce2f1e7716 100644
--- a/binaries/data/mods/public/simulation/data/civs/mace.json
+++ b/binaries/data/mods/public/simulation/data/civs/mace.json
@@ -41,7 +41,7 @@
"Template": "structures/mace/civil_centre"
},
{
- "Template": "units/mace/support_female_citizen",
+ "Template": "units/mace/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/maur.json b/binaries/data/mods/public/simulation/data/civs/maur.json
index ef1d00bc7f..ba77839d6b 100644
--- a/binaries/data/mods/public/simulation/data/civs/maur.json
+++ b/binaries/data/mods/public/simulation/data/civs/maur.json
@@ -33,7 +33,7 @@
"Template": "structures/maur/civil_centre"
},
{
- "Template": "units/maur/support_female_citizen",
+ "Template": "units/maur/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/pers.json b/binaries/data/mods/public/simulation/data/civs/pers.json
index 79805aea97..a515942116 100644
--- a/binaries/data/mods/public/simulation/data/civs/pers.json
+++ b/binaries/data/mods/public/simulation/data/civs/pers.json
@@ -50,7 +50,7 @@
"Template": "structures/pers/civil_centre"
},
{
- "Template": "units/pers/support_female_citizen",
+ "Template": "units/pers/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/ptol.json b/binaries/data/mods/public/simulation/data/civs/ptol.json
index c7dcf01685..68a2142634 100644
--- a/binaries/data/mods/public/simulation/data/civs/ptol.json
+++ b/binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -48,7 +48,7 @@
"Template": "structures/ptol/civil_centre"
},
{
- "Template": "units/ptol/support_female_citizen",
+ "Template": "units/ptol/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/rome.json b/binaries/data/mods/public/simulation/data/civs/rome.json
index 6631b5df04..4462644ea8 100644
--- a/binaries/data/mods/public/simulation/data/civs/rome.json
+++ b/binaries/data/mods/public/simulation/data/civs/rome.json
@@ -53,7 +53,7 @@
"Template": "structures/rome/civil_centre"
},
{
- "Template": "units/rome/support_female_citizen",
+ "Template": "units/rome/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/sele.json b/binaries/data/mods/public/simulation/data/civs/sele.json
index 3a78a5267c..91d9d12904 100644
--- a/binaries/data/mods/public/simulation/data/civs/sele.json
+++ b/binaries/data/mods/public/simulation/data/civs/sele.json
@@ -37,7 +37,7 @@
"Template": "structures/sele/civil_centre"
},
{
- "Template": "units/sele/support_female_citizen",
+ "Template": "units/sele/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/civs/spart.json b/binaries/data/mods/public/simulation/data/civs/spart.json
index 02a180e346..5790667873 100644
--- a/binaries/data/mods/public/simulation/data/civs/spart.json
+++ b/binaries/data/mods/public/simulation/data/civs/spart.json
@@ -25,9 +25,9 @@
],
"CivBonuses": [
{
- "Name": "Spartan Women",
+ "Name": "Ritualistic Exercise",
"History": "",
- "Description": "Female Citizens +40% health and +50% melee attack hack damage."
+ "Description": "Citizen-Soldiers +40% health and +50% melee attack hack damage."
},
{
"Name": "Laws of Lycurgus",
@@ -49,7 +49,7 @@
"Template": "structures/spart/civil_centre"
},
{
- "Template": "units/spart/support_female_citizen",
+ "Template": "units/spart/support_civilian",
"Count": 4
},
{
diff --git a/binaries/data/mods/public/simulation/data/technologies/health_civilians_01.json b/binaries/data/mods/public/simulation/data/technologies/health_civilians_01.json
new file mode 100644
index 0000000000..0f2878f918
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/health_civilians_01.json
@@ -0,0 +1,17 @@
+{
+ "genericName": "The Loom",
+ "description": "The loom allowed the creation of finer clothing for settlers. Women of the household were taught from a young age how to weave on the loom, and subsequently spent a large share of their lives working with it.",
+ "cost": {
+ "food": 200
+ },
+ "requirements": { "tech": "phase_village" },
+ "requirementsTooltip": "Unlocked in Village Phase.",
+ "icon": "loom.png",
+ "researchTime": 40,
+ "tooltip": "Civilians +100% health.",
+ "modifications": [
+ { "value": "Health/Max", "multiply": 2 }
+ ],
+ "affects": ["Civilian"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_generic.json b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_generic.json
new file mode 100644
index 0000000000..f940b213b6
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_generic.json
@@ -0,0 +1,27 @@
+{
+ "genericName": "Fertility Festival",
+ "specificName": {
+ "athen": "Thesmophoria",
+ "mace": "Thesmophoria",
+ "ptol": "Thesmophoria",
+ "rome": "Bona Dea",
+ "sele": "Thesmophoria",
+ "spart": "Thesmophoria"
+ },
+ "description": "A festival to celebrate fertility.",
+ "cost": {
+ "food": 250,
+ "wood": 100,
+ "metal": 100
+ },
+ "requirements": {
+ "all": [
+ { "tech": "phase_village" },
+ { "notciv": "kush" }
+ ]
+ },
+ "icon": "wives_festival.png",
+ "researchTime": 60,
+ "tooltip": "Unlock the ability to train Civilians from houses.",
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json
new file mode 100644
index 0000000000..1a8e8c3896
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/unlock_civilians_house_kush.json
@@ -0,0 +1,31 @@
+{
+ "genericName": "Fertility Festival",
+ "description": "A festival to celebrate fertility.",
+ "cost": {
+ "food": 250,
+ "wood": 100,
+ "metal": 100
+ },
+ "requirements": {
+ "all": [
+ { "tech": "phase_village" },
+ { "notciv": "athen" },
+ { "notciv": "brit" },
+ { "notciv": "cart" },
+ { "notciv": "gaul" },
+ { "notciv": "han" },
+ { "notciv": "iber" },
+ { "notciv": "mace" },
+ { "notciv": "maur" },
+ { "notciv": "pers" },
+ { "notciv": "ptol" },
+ { "notciv": "rome" },
+ { "notciv": "sele" },
+ { "notciv": "spart" }
+ ]
+ },
+ "icon": "wives_festival_african.png",
+ "researchTime": 60,
+ "tooltip": "Unlock the ability to train Civilians from houses.",
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
index dae0047f73..20322ddd33 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
@@ -33,7 +33,7 @@
- -units/{civ}/support_female_citizen
+ -units/{civ}/support_civilian
campaigns/army_mace_hero_alexander
campaigns/army_mace_standard
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
index 4f2f2c4ba6..07f6071e6b 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
@@ -33,7 +33,7 @@
- -units/{civ}/support_female_citizen
+ -units/{civ}/support_civilian
campaigns/army_mace_hero_alexander
campaigns/army_mace_standard
units/{civ}/support_trader
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_civilian.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_civilian.xml
new file mode 100644
index 0000000000..d52383a38c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_support_civilian.xml
@@ -0,0 +1,13 @@
+
+
+
+ skirm
+ units/athen/support_civilian.png
+
+
+ units/{civ}/support_civilian
+
+
+ units/athenians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
index aa7a9554de..a5c3032c13 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml
@@ -12,7 +12,7 @@
brit
Island Settlement
Cranogion
- Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Train Citizens, construct Ships, and research civil technologies. Garrison Soldiers for additional arrows.
+ Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Train Civilians, construct Ships, and research civil technologies. Garrison Soldiers for additional arrows.
CivSpecific
Naval
structures/crannog.png
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml
index 5e6aa6cd0b..2662d7489f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol/military_colony.xml
@@ -14,7 +14,6 @@
- units/{civ}/support_female_citizen
units/{civ}/infantry_spearman_merc_b
units/{civ}/infantry_swordsman_merc_b
units/{civ}/cavalry_spearman_merc_b
diff --git a/binaries/data/mods/public/simulation/templates/template_player.xml b/binaries/data/mods/public/simulation/templates/template_player.xml
index f99da23958..ccbab253cb 100644
--- a/binaries/data/mods/public/simulation/templates/template_player.xml
+++ b/binaries/data/mods/public/simulation/templates/template_player.xml
@@ -118,8 +118,8 @@
Cavalry
Champion
+ Civilian
Domestic
- FemaleCitizen
Hero
Infantry
Ship
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index a5eab452be..77b018f5dd 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -1,7 +1,7 @@
- FemaleCitizen
+ Civilian
120
180
100
@@ -74,7 +74,7 @@
Civic Center
template_structure_civic_civil_centre
- Build in own or neutral territory. Acquire large tracts of territory. Territory root. Train Citizens and research technologies. Garrison Soldiers for additional arrows.
+ Build in own or neutral territory. Acquire large tracts of territory. Territory root. Train Civilians and research technologies. Garrison Soldiers for additional arrows.
CivCentre
Defensive CivilCentre
structures/civic_centre.png
@@ -139,7 +139,7 @@
0.8
- units/{civ}/support_female_citizen
+ units/{native}/support_civilian
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
index eda75c3ff1..899485c9f5 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
@@ -43,10 +43,11 @@
- health_females_01
+ health_civilians_01
pop_house_01
pop_house_02
- unlock_females_house
+ unlock_civilians_house_generic
+ unlock_civilians_house_kush
@@ -65,7 +66,7 @@
- units/{civ}/support_female_citizen_house
+ units/{civ}/support_civilian_house
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
index 310632a825..0f311efa8f 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -1,7 +1,7 @@
- FemaleCitizen
+ Civilian
50
100
100
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
index e952e0386d..5fc8d3f3ec 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
@@ -1,7 +1,7 @@
- FemaleCitizen
+ Civilian
50
100
100
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
index 1311f18208..4af44185f3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -13,9 +13,9 @@
10
- FemaleCitizen Infantry Healer Dog
+ Civilian Infantry Healer Dog
0
- FemaleCitizen Infantry Healer Dog
+ Civilian Infantry Healer Dog
0
10
true
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_arrow.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_arrow.xml
index 664dd90918..4e0b2c2976 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_arrow.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_arrow.xml
@@ -28,7 +28,7 @@
30
- FemaleCitizen Infantry Dog
+ Civilian Infantry Dog
Siege
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_ram.xml
index 2ff4eb904f..7ebcb2ff8a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_ram.xml
@@ -35,7 +35,7 @@
30
- FemaleCitizen Infantry Dog
+ Civilian Infantry Dog
Siege
10
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_civilian.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_civilian.xml
new file mode 100644
index 0000000000..b0516c5e23
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_civilian.xml
@@ -0,0 +1,100 @@
+
+
+
+
+ Dagger
+
+ 2
+
+ 3
+ 500
+ 1000
+
+
+ Slaughter
+
+ 1000
+
+ 2
+ 900
+ 1000
+ !Domestic
+
+
+
+ 10
+
+ 50
+
+
+
+ 25
+
+
+ Civilian
+
+ female
+ male
+
+ template_unit_support_civilian
+ Civilian Worker
+
+
+ 3
+ 5
+
+
+ 2.0
+ 1.0
+
+ 1
+ 0.5
+ 1
+ 0.7
+ 5
+ 0.35
+ 2
+ 0.35
+ 2
+
+
+ 10
+ 10
+ 10
+ 10
+
+
+
+
+ interface/alarm/alarm_create_infantry.xml
+
+ voice/{lang}/civ/civ_{phenotype}_walk.xml
+ voice/{lang}/civ/civ_{phenotype}_attack.xml
+ voice/{lang}/civ/civ_{phenotype}_gather.xml
+ voice/{lang}/civ/civ_{phenotype}_repair.xml
+ voice/{lang}/civ/civ_{phenotype}_build.xml
+ voice/{lang}/civ/civ_{phenotype}_garrison.xml
+ interface/alarm/alarm_invalid_building_placement.xml
+ actor/human/movement/walk.xml
+ actor/human/movement/run.xml
+ attack/weapon/knife_attack.xml
+ attack/weapon/knife_attack.xml
+ actor/human/death/{phenotype}_death.xml
+ resource/construction/con_wood.xml
+ resource/foraging/forage_leaves.xml
+ resource/farming/farm.xml
+ resource/gathering/gather_meat.xml
+ resource/lumbering/lumbering.xml
+ resource/mining/pickaxe.xml
+ resource/mining/mining.xml
+ resource/mining/mining.xml
+
+
+
+ false
+
+
+
+ 32
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_civilian.xml
new file mode 100644
index 0000000000..b96add5e4f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_civilian.xml
@@ -0,0 +1,12 @@
+
+
+
+ athen
+ Athenian Artisan
+ Thēs
+ units/athen/support_civilian.png
+
+
+ units/athenians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_civilian_house.xml
new file mode 100644
index 0000000000..d71cba3aec
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_civilian.xml
new file mode 100644
index 0000000000..404c6e40b3
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_civilian.xml
@@ -0,0 +1,12 @@
+
+
+
+ brit
+ Briton Countryman
+ Brogiacos
+ units/celt/support_civilian.png
+
+
+ units/britons/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_civilian_house.xml
new file mode 100644
index 0000000000..e08cf27a70
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_civilian.xml
new file mode 100644
index 0000000000..786be7d31e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart/support_civilian.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ structures/cart/super_dock
+ structures/cart/embassy_celtic
+ structures/cart/embassy_iberian
+ structures/cart/embassy_italic
+
+
+
+ cart
+ Carthaginian Artisan
+ Ḥaroš
+ units/cart/support_civilian.png
+
+
+ units/carthaginians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_civilian_house.xml
new file mode 100644
index 0000000000..0884f247c4
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian.xml
new file mode 100644
index 0000000000..f286e526ce
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ structures/gaul/assembly
+
+
+
+ gaul
+ Gallic Laborer
+ Tegesacos
+ units/celt/support_civilian.png
+
+
+ units/celts/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian_house.xml
new file mode 100644
index 0000000000..c8aabe77e7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/han/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/han/support_civilian.xml
new file mode 100644
index 0000000000..87af38d8db
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/support_civilian.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ -structures/wallset_palisade
+
+
+
+ han
+ Han Farmer
+ Nóng
+ units/han/support_civilian.png
+
+
+ units/han/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/han/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/han/support_civilian_house.xml
new file mode 100644
index 0000000000..01f7e44810
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/han/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_civilian.xml
new file mode 100644
index 0000000000..59d3e2f816
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/iber/support_civilian.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ structures/iber/monument
+
+
+
+ iber
+ Iberian Townsperson
+ Iltiŕse
+ units/iber/support_civilian.png
+
+
+ units/iberians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_civilian_house.xml
new file mode 100644
index 0000000000..15bdaa9dc2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/iber/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_civilian.xml
new file mode 100644
index 0000000000..e9ce4b64da
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/kush/support_civilian.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ structures/kush/pyramid_large
+ structures/kush/temple_amun
+ structures/kush/camp_blemmye
+ structures/kush/camp_noba
+
+
+
+ kush
+ napatan
+ Kushite Laborer
+ Sḫtj
+ units/kush/support_civilian.png
+
+
+ units/kushites/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_civilian_house.xml
new file mode 100644
index 0000000000..0b52eff452
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/kush/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_kush
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_civilian.xml
new file mode 100644
index 0000000000..93e424a19e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace/support_civilian.xml
@@ -0,0 +1,13 @@
+
+
+
+ mace
+ greek
+ Macedonian Laborer
+ Geōrgos Makedonikos
+ units/athen/support_civilian.png
+
+
+ units/athenians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_civilian_house.xml
new file mode 100644
index 0000000000..d6540be824
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_civilian.xml
new file mode 100644
index 0000000000..438cbb1fe7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_civilian.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ structures/maur/palace
+ structures/maur/pillar_ashoka
+
+
+
+ maur
+ Indian Laborer
+ Kammakara
+ units/maur/support_civilian.png
+
+
+ units/mauryas/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_civilian_house.xml
new file mode 100644
index 0000000000..807267da01
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml
new file mode 100644
index 0000000000..21b6615864
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/pers/support_civilian.xml
@@ -0,0 +1,13 @@
+
+
+
+ pers
+ persian
+ Persian Laborer
+ Martiyā
+ units/pers/support_civilian.png
+
+
+ units/persians/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml
new file mode 100644
index 0000000000..89a1463cd3
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/pers/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian.xml
new file mode 100644
index 0000000000..03b44ad84e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ structures/ptol/lighthouse
+ structures/ptol/library
+ structures/ptol/temple_2
+
+
+
+ ptol
+ greek
+ Egyptian Laborer
+ Geōrgos Aigyptios
+ units/athen/support_civilian.png
+
+
+ units/ptolemies/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian_house.xml
new file mode 100644
index 0000000000..a458bffa2d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_civilian.xml
new file mode 100644
index 0000000000..e7b53a2743
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome/support_civilian.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ structures/rome/army_camp
+ structures/rome/temple_vesta
+
+
+
+ rome
+ latin
+ Plebeian
+ Plebeius
+ units/athen/support_civilian.png
+
+
+ units/romans/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_civilian_house.xml
new file mode 100644
index 0000000000..8033176364
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/rome/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_civilian.xml
new file mode 100644
index 0000000000..1bb37da854
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_civilian.xml
@@ -0,0 +1,13 @@
+
+
+
+ sele
+ greek
+ Syrian Laborer
+ Geōrgos Syrikos
+ units/sele/support_civilian.png
+
+
+ units/seleucids/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_civilian_house.xml
new file mode 100644
index 0000000000..97165d8b05
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/sele/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_civilian.xml
new file mode 100644
index 0000000000..dc73144ee2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart/support_civilian.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+ 1.5
+
+
+
+
+
+ structures/spart/gerousia
+ structures/spart/syssiton
+ -structures/{civ}/wallset_stone
+
+
+
+ 1.4
+
+
+ 1
+
+
+ spart
+ greek
+ Helot
+ Heilōs
+ units/spart/support_civilian.png
+
+
+ units/spartans/citizen_{phenotype}.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_civilian_house.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_civilian_house.xml
new file mode 100644
index 0000000000..dc87bf22ed
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/spart/support_civilian_house.xml
@@ -0,0 +1,11 @@
+
+
+
+ 30
+
+
+
+ unlock_civilians_house_generic
+
+
+