From e99fab63d145f656722aca4cc08ca3e7309025e1 Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Thu, 5 Oct 2023 00:54:49 +0000
Subject: [PATCH] [Gameplay] Celtic female warrior upgrade

Celtic women were famous for their ferocity and aggressiveness against
enemies and it was common for them to fight alongside men in battles,
especially if the battle had been lost, the women being a strong last
line of defense.


Patch by: @borg-
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5125
This was SVN commit r27870.
---
 .../units/britons/female_citizen_warrior.xml  | 109 ++++++++++++++++++
 .../units/gauls/female_citizen_warrior.xml    | 104 +++++++++++++++++
 .../portraits/technologies/women_warrior.png  |   3 +
 .../data/technologies/women_warrior.json      |  24 ++++
 .../structures/brit/civil_centre.xml          |   5 +
 .../structures/gaul/civil_centre.xml          |   5 +
 .../units/brit/support_female_citizen.xml     |   4 +
 .../brit/support_female_citizen_warrior.xml   |  50 ++++++++
 .../units/gaul/support_female_citizen.xml     |   4 +
 .../gaul/support_female_citizen_warrior.xml   |  50 ++++++++
 10 files changed, 358 insertions(+)
 create mode 100644 binaries/data/mods/public/art/actors/units/britons/female_citizen_warrior.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/gauls/female_citizen_warrior.xml
 create mode 100644 binaries/data/mods/public/art/textures/ui/session/portraits/technologies/women_warrior.png
 create mode 100644 binaries/data/mods/public/simulation/data/technologies/women_warrior.json
 create mode 100644 binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_warrior.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_warrior.xml

diff --git a/binaries/data/mods/public/art/actors/units/britons/female_citizen_warrior.xml b/binaries/data/mods/public/art/actors/units/britons/female_citizen_warrior.xml
new file mode 100644
index 0000000000..6c6f0ba746
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/britons/female_citizen_warrior.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/f_armor_dress.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_female_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Celt-Shield-01">
+      <props>
+        <prop actor="props/units/shields/brit_shield_spear_oval_e_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Celt-Shield-02">
+      <props>
+        <prop actor="props/units/shields/brit_shield_spear_oval_f_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Celt-Shield-03">
+      <props>
+        <prop actor="props/units/shields/brit_shield_spear_oval_g_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Celt-Shield-04">
+      <props>
+        <prop actor="props/units/shields/brit_shield_spear_oval_h_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="celt-female-1a">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-1b">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-1c">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2a">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2b">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2c">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/base_swordsman_shield_relax_celt.xml" name="Swordsman-Shield-Relax"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/approach_tree.xml"/>
+    <variant file="biped/approach_grain.xml"/>
+    <variant file="biped/approach_fruit.xml"/>
+    <variant file="biped/approach_meat.xml"/>
+    <variant file="biped/approach_rock.xml"/>
+    <variant file="biped/approach_ore.xml"/>
+    <variant file="biped/approach_ruins.xml"/>
+    <variant file="biped/approach_praise.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_melee_female.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/female_death.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/build_farm.xml"/>
+  </group>
+  <group>
+    <variant>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/gauls/female_citizen_warrior.xml b/binaries/data/mods/public/art/actors/units/gauls/female_citizen_warrior.xml
new file mode 100644
index 0000000000..833035d61c
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/gauls/female_citizen_warrior.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/f_armor_dress.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_female_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Celt-Shield-A-Boss">
+      <props>
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Celt-Shield-B-Boss">
+      <props>
+        <prop actor="props/units/shields/gaul_shield_spear_oval_b_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Celt-Shield-C-Boss">
+      <props>
+        <prop actor="props/units/shields/gaul_shield_spear_oval_c_01.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="celt-female-1a">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-1b">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-1c">
+      <textures>
+        <texture file="skeletal/celt/dress_female_01_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2a">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2b">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="celt-female-2c">
+      <textures>
+        <texture file="skeletal/celt/dress_female_02_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/base_swordsman_shield_relax_celt.xml" name="Swordsman-Shield-Relax"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/approach_tree.xml"/>
+    <variant file="biped/approach_grain.xml"/>
+    <variant file="biped/approach_fruit.xml"/>
+    <variant file="biped/approach_meat.xml"/>
+    <variant file="biped/approach_rock.xml"/>
+    <variant file="biped/approach_ore.xml"/>
+    <variant file="biped/approach_ruins.xml"/>
+    <variant file="biped/approach_praise.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_melee_female.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/female_death.xml"/>
+    <variant file="biped/gather_tree.xml"/>
+    <variant file="biped/gather_grain.xml"/>
+    <variant file="biped/gather_fruit.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/gather_rock.xml"/>
+    <variant file="biped/gather_ore.xml"/>
+    <variant file="biped/gather_ruins.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant file="biped/build.xml"/>
+    <variant file="biped/build_farm.xml"/>
+  </group>
+  <group>
+    <variant>
+      <textures>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="null_black.dds" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/women_warrior.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/women_warrior.png
new file mode 100644
index 0000000000..d37325b02e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/women_warrior.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab613aed50890ba9cb67792d36a9168dfb5110f49a22df31264673ae40508bfa
+size 30189
diff --git a/binaries/data/mods/public/simulation/data/technologies/women_warrior.json b/binaries/data/mods/public/simulation/data/technologies/women_warrior.json
new file mode 100644
index 0000000000..331cd0606c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/women_warrior.json
@@ -0,0 +1,24 @@
+{
+	"genericName": "Women Warrior",
+	"description": "Celtic women could fight in battles; they were known for their ferocity and aggressiveness.",
+	"cost": {
+		"food": 200,
+		"metal": 100
+	},
+	"requirements": {
+		"all": [
+			{ "tech": "phase_village" },
+			{ "civ": "brit" },
+			{ "civ": "gaul" }
+		]
+	},
+	"icon": "women_warrior.png",
+	"researchTime": 40,
+	"tooltip": "Female Citizens +3.5 melee attack damage, +10% movement speed, +100% vision range, but −25% grain gather rate.",
+	"modifications": [
+		{ "value": "Promotion/RequiredXp", "replace": 0 },
+		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 0.75 }
+	],
+	"affects": ["FemaleCitizen"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
index 0ec0ecd3bb..251aea62c7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit/civil_centre.xml
@@ -14,6 +14,11 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
+  <Researcher>
+    <Technologies datatype="tokens">
+      women_warrior
+    </Technologies>
+  </Researcher>
   <Trainer>
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
index 68108ffe4c..a10c314659 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul/civil_centre.xml
@@ -14,6 +14,11 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
+  <Researcher>
+    <Technologies datatype="tokens">
+      women_warrior
+    </Technologies>
+  </Researcher>
   <Trainer>
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
index 790e5fd407..976122e975 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen.xml
@@ -6,6 +6,10 @@
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt/support_female_citizen.png</Icon>
   </Identity>
+  <Promotion>
+    <Entity>units/brit/support_female_citizen_warrior</Entity>
+    <RequiredXp>2000</RequiredXp>
+  </Promotion>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_warrior.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_warrior.xml
new file mode 100644
index 0000000000..fdf2a99d1e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_warrior.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/brit/support_female_citizen">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
+      <Damage>
+        <Hack op="add">3.5</Hack>
+      </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>375</PrepareTime>
+      <RepeatTime>750</RepeatTime>
+      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
+    </Melee>
+    <Capture>
+      <AttackName>Capture</AttackName>
+      <Capture>2.5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+  </Attack>
+  <Promotion disable=""/>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <Acceleration op="mul">1.1</Acceleration>
+  </UnitMotion>
+  <UnitAI>
+    <Formations datatype="tokens">
+      special/formations/null
+      special/formations/box
+      special/formations/column_closed
+      special/formations/line_closed
+      special/formations/column_open
+      special/formations/line_open
+      special/formations/flank
+      special/formations/battle_line
+    </Formations>
+  </UnitAI>
+  <Vision>
+    <Range>64</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/britons/female_citizen_warrior.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
index f2c0f25843..b880baf350 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
@@ -11,6 +11,10 @@
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt/support_female_citizen.png</Icon>
   </Identity>
+  <Promotion>
+    <Entity>units/gaul/support_female_citizen_warrior</Entity>
+    <RequiredXp>2000</RequiredXp>
+  </Promotion>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_warrior.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_warrior.xml
new file mode 100644
index 0000000000..0ba08874a8
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_warrior.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/gaul/support_female_citizen">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
+      <Damage>
+        <Hack op="add">3.5</Hack>
+      </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>375</PrepareTime>
+      <RepeatTime>750</RepeatTime>
+      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
+    </Melee>
+    <Capture>
+      <AttackName>Capture</AttackName>
+      <Capture>2.5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+  </Attack>
+  <Promotion disable=""/>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <Acceleration op="mul">1.1</Acceleration>
+  </UnitMotion>
+  <UnitAI>
+    <Formations datatype="tokens">
+      special/formations/null
+      special/formations/box
+      special/formations/column_closed
+      special/formations/line_closed
+      special/formations/column_open
+      special/formations/line_open
+      special/formations/flank
+      special/formations/battle_line
+    </Formations>
+  </UnitAI>
+  <Vision>
+    <Range>64</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/gauls/female_citizen_warrior.xml</Actor>
+  </VisualActor>
+</Entity>