diff --git a/Patches/Kaiser Armory/105x155mmR.xml b/Patches/Kaiser Armory/105x155mmR.xml
index e3c3dd3517..d028ae8190 100644
--- a/Patches/Kaiser Armory/105x155mmR.xml
+++ b/Patches/Kaiser Armory/105x155mmR.xml
@@ -4,7 +4,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
Defs
diff --git a/Patches/Kaiser Armory/77x230mmR.xml b/Patches/Kaiser Armory/77x230mmR.xml
index 3f892eb3db..a7f06210e7 100644
--- a/Patches/Kaiser Armory/77x230mmR.xml
+++ b/Patches/Kaiser Armory/77x230mmR.xml
@@ -4,7 +4,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
Defs
diff --git a/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml b/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
index f9669298d6..00f0feef5a 100644
--- a/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
+++ b/Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
@@ -3,7 +3,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
diff --git a/Patches/Kaiser Armory/KaiserArmory_Guns.xml b/Patches/Kaiser Armory/KaiserArmory_Guns.xml
index b21f6feb1d..f93f644b5b 100644
--- a/Patches/Kaiser Armory/KaiserArmory_Guns.xml
+++ b/Patches/Kaiser Armory/KaiserArmory_Guns.xml
@@ -3,7 +3,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
diff --git a/Patches/Kaiser Armory/KaiserArmory_Melee.xml b/Patches/Kaiser Armory/KaiserArmory_Melee.xml
index d846d43230..68ff756d49 100644
--- a/Patches/Kaiser Armory/KaiserArmory_Melee.xml
+++ b/Patches/Kaiser Armory/KaiserArmory_Melee.xml
@@ -3,7 +3,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
diff --git a/Patches/Kaiser Armory/KaiserArmory_Turrets.xml b/Patches/Kaiser Armory/KaiserArmory_Turrets.xml
index 83e058d163..73d1a6280a 100644
--- a/Patches/Kaiser Armory/KaiserArmory_Turrets.xml
+++ b/Patches/Kaiser Armory/KaiserArmory_Turrets.xml
@@ -3,7 +3,7 @@
- Kaiser Armory [1.2]
+ Kaiser Armory [1.3]
diff --git a/Patches/Orassans/PawnKinds_Orassans.xml b/Patches/Orassans/PawnKinds_Orassans.xml
index 378ccec003..9deebb9000 100644
--- a/Patches/Orassans/PawnKinds_Orassans.xml
+++ b/Patches/Orassans/PawnKinds_Orassans.xml
@@ -9,8 +9,11 @@
/Defs/PawnKindDef[
defName = "Orassan" or
+ defName = "HumanVillager" or
+ defName = "HybridVillager" or
defName = "OrassanVillager" or
defName = "OrassanSlave" or
+ defName = "HybridRefugee" or
defName = "OrassanRefugee" or
defName = "OrassanTownCouncilman" or
defName = "OrassanTrader" or
@@ -23,6 +26,8 @@
defName = "OrassanMercenaryGunner" or
defName = "OrassanGrenadier" or
defName = "OrassanSoldier" or
+ defName = "HybridSoldier" or
+ defName = "HumanSoldier" or
defName = "OrassanMercenarySoldier" or
defName = "OrassanPirate"
]
diff --git a/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml b/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
index 04fa44858d..24181d7847 100644
--- a/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
+++ b/Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
@@ -75,10 +75,9 @@
25
-
+
-
-
+
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml b/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
index f690866bc8..25deae516b 100644
--- a/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
+++ b/Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
@@ -7,7 +7,7 @@
-
+
/Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases
@@ -54,6 +54,52 @@
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases
+
+ 70
+ 5
+
+
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/equippedStatOffsets
+
+ 100
+ 22.5
+
+
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/Mass
+
+ 25
+
+
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Sharp
+
+ 20
+
+
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Blunt
+
+ 50
+
+
+
+
+ /Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
/Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases
@@ -74,7 +120,7 @@
/Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/Mass
- 25
+ 3
diff --git a/Patches/Orassans/ThingDefs_Races/Desiri.xml b/Patches/Orassans/ThingDefs_Races/Desiri.xml
index 683e7424b5..e313cfbef6 100644
--- a/Patches/Orassans/ThingDefs_Races/Desiri.xml
+++ b/Patches/Orassans/ThingDefs_Races/Desiri.xml
@@ -16,7 +16,6 @@
-
/Defs/ThingDef[@Name="ThingBaseDesiri"]/tools
@@ -28,7 +27,7 @@
Scratch
4
- 0.91
+ 0.91
FrontLeftPaw
@@ -93,7 +92,7 @@
-
+
Defs/ThingDef[defName="Animal_Desiri"]/statBases
@@ -108,4 +107,3 @@
-
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Gryphon.xml b/Patches/Orassans/ThingDefs_Races/Gryphon.xml
index dc48447763..5c57a33889 100644
--- a/Patches/Orassans/ThingDefs_Races/Gryphon.xml
+++ b/Patches/Orassans/ThingDefs_Races/Gryphon.xml
@@ -16,9 +16,8 @@
-
-
+
/Defs/ThingDef[defName="Gryphon"]/tools
@@ -93,7 +92,7 @@
-
+
Defs/ThingDef[defName="Gryphon"]/statBases
@@ -107,5 +106,4 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml b/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
index e5547eaf5e..db83fc0c22 100644
--- a/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
+++ b/Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
@@ -97,7 +97,7 @@
-
+
diff --git a/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml b/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
index 39356c6cc9..dfaef42d28 100644
--- a/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
+++ b/Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
@@ -97,7 +97,7 @@
-
+
diff --git a/Patches/Orassans/ThingDefs_Races/Ori.xml b/Patches/Orassans/ThingDefs_Races/Ori.xml
index 65d3a5e8f0..6f044bc7e3 100644
--- a/Patches/Orassans/ThingDefs_Races/Ori.xml
+++ b/Patches/Orassans/ThingDefs_Races/Ori.xml
@@ -65,7 +65,7 @@
-
+
Defs/ThingDef[defName="Ori"]/statBases/MoveSpeed
@@ -80,5 +80,4 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Patches/Orassans/ThingDefs_Weapons/Weapons.xml b/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
index 9ed1bbad21..74303df833 100644
--- a/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
+++ b/Patches/Orassans/ThingDefs_Weapons/Weapons.xml
@@ -132,7 +132,6 @@
Bullet_6x18mmCharged
0.55
10
- 2
10
Opistol
GunTail_Light
@@ -143,7 +142,6 @@
AmmoSet_6x18mmCharged
- 2
AimedShot
@@ -322,7 +320,7 @@
1.16
CombatExtended.Verb_ShootCE
true
- Bullet_6x24mmCharged
+ Bullet_8x35mmCharged
1.2
62
5
@@ -338,7 +336,7 @@
90
5
- AmmoSet_6x24mmCharged
+ AmmoSet_8x35mmCharged
FALSE
@@ -398,7 +396,7 @@
1.60
CombatExtended.Verb_ShootCE
true
- Bullet_6x24mmCharged
+ Bullet_8x35mmCharged
1
64
OTFalcon
@@ -407,7 +405,7 @@
10
4
- AmmoSet_6x24mmCharged
+ AmmoSet_8x35mmCharged
AimedShot
diff --git a/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml b/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml
index 0f41b5b313..f5c06c22e6 100644
--- a/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml
+++ b/Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml
@@ -4,7 +4,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/Bodies/Bodies_Mech.xml b/Patches/Silkiera Race/Bodies/Bodies_Mech.xml
index 01f73caf05..b11e737afc 100644
--- a/Patches/Silkiera Race/Bodies/Bodies_Mech.xml
+++ b/Patches/Silkiera Race/Bodies/Bodies_Mech.xml
@@ -3,7 +3,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml b/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
index 732818362b..93d5a3c030 100644
--- a/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
+++ b/Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
@@ -7,7 +7,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml b/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml
index f5e1c75a1d..bb7db741a3 100644
--- a/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml
+++ b/Patches/Silkiera Race/PawnKindDefs/Silkiera_PawnKind.xml
@@ -1,86 +1,87 @@
-
-
-
-
- [1.2]Silkiera Race
-
-
+
+
-
-
-
- Defs/PawnKindDef[
- defName="HAR_Silkiera_Player"
+
+
+
+ [1.3]Silkiera Race
+
+
+
+
+
+
+
+ Defs/PawnKindDef[ defName="HAR_Silkiera_Player"
]
-
-
-
- 0
- 2
-
-
-
-
-
-
- Defs/PawnKindDef[
- @Name="HAR_Silkiera_KindBase_NPC"
+
+
+
+ 0
+ 2
+
+
+
+
+
+
+ Defs/PawnKindDef[ @Name="HAR_Silkiera_KindBase_NPC"
]
-
-
-
- 2
- 6
-
-
-
-
-
-
- Defs/PawnKindDef[
- @Name="HAR_SK_Mechanoid_Kind_Base"
+
+
+
+ 2
+ 6
+
+
+
+
+
+
+ Defs/PawnKindDef[ @Name="HAR_SK_Mechanoid_Kind_Base"
]
-
-
-
- 10
- 10
-
-
-
-
-
-
-
-
- Defs/ThingDef[defName="Apparel_Backpack"]/apparel/tags
-
- HAR_SK_Apparel
-
-
-
-
- /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired
-
- /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]
-
-
- Apparel_Backpack
-
-
-
-
- /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired
-
-
+
+
+
+ 10
+ 10
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Apparel_Backpack"]/apparel/tags
+
+ HAR_SK_Apparel
+
+
+
+
+ /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired
+
+ /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]
+
+
+ Apparel_Backpack
+
+
+
+
+ /Defs/PawnKindDef[@Name="HAR_Silkiera_KindBase"]/apparelRequired
+
+
+
+
+
+
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml b/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml
index 81356f9bc5..e9241bee56 100644
--- a/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml
+++ b/Patches/Silkiera Race/Scenario/Silkiera_Scenario.xml
@@ -4,7 +4,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml b/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml
index 061558de60..6a67ca0851 100644
--- a/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml
+++ b/Patches/Silkiera Race/ThingDefs_Misc/Silkiera_Apparel.xml
@@ -4,7 +4,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml b/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml
index f8ac17a0a1..ce122ccc50 100644
--- a/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml
+++ b/Patches/Silkiera Race/ThingDefs_Misc/Weapons.xml
@@ -4,7 +4,7 @@
- [1.2]Silkiera Race
+ [1.3]Silkiera Race
diff --git a/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml b/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml
index c2ae400e68..ae0ad4d13a 100644
--- a/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml
+++ b/Patches/Silkiera Race/ThingDefs_Races/AlienRace_Silkiera.xml
@@ -1,112 +1,113 @@
-
-
-
-
- [1.2]Silkiera Race
-
-
+
-
-
- /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]
-
- CombatExtended.ITab_Inventory
-
-
+
+
+ [1.3]Silkiera Race
+
-
- /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
-
-
- CombatExtended.CompPawnGizmo
-
-
-
-
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]
-
-
- Humanoid
-
-
-
+
+
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/statBases
-
- 1
- 1.2
-
-
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/tools
-
-
-
- left fist
-
- Blunt
-
- 1
- 1.26
- LeftHand
- 0.250
+
+ /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/inspectorTabs/li[.="ITab_Pawn_Gear"]
+
+ CombatExtended.ITab_Inventory
+
-
- right fist
-
- Blunt
-
- 1
- 1.26
- RightHand
- 0.250
+
+
+ /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
+
+
+
-
- head
-
- Blunt
-
- 2
- 4.49
- HeadAttackTool
- 0.2
- 0.625
+
+
+ /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
+
+
+ CombatExtended.CompPawnGizmo
+
+
+
-
-
-
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/alienRace/raceRestriction/whiteApparelList
-
- Apparel_TacVest
- Apparel_Backpack
- Apparel_TribalBackpack
- Apparel_BallisticShield
- Apparel_MeleeShield
- Apparel_GasMask
- Apparel_ImprovGasMask
-
+
+
+ /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]
+
+
+ Humanoid
+
+
+
+
+
+
+ /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/statBases
+
+ 1
+ 1.2
+
+
+
+
+ /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 1
+ 1.26
+ LeftHand
+ 0.250
+
+
+ right fist
+
+ Blunt
+
+ 1
+ 1.26
+ RightHand
+ 0.250
+
+
+ head
+
+ Blunt
+
+ 2
+ 4.49
+ HeadAttackTool
+ 0.2
+ 0.625
+
+
+
+
+
+
+ /Defs/AlienRace.ThingDef_AlienRace[defName="HAR_Silkiera"]/alienRace/raceRestriction/whiteApparelList
+
+ Apparel_TacVest
+ Apparel_Backpack
+ Apparel_TribalBackpack
+ Apparel_BallisticShield
+ Apparel_MeleeShield
+ Apparel_GasMask
+ Apparel_ImprovGasMask
+
+
+
+
+
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml b/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml
index 1b09d95eca..dfd6212659 100644
--- a/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml
+++ b/Patches/Silkiera Race/ThingDefs_Races/Race_Mech.xml
@@ -1,366 +1,367 @@
-
-
-
-
- [1.2]Silkiera Race
-
-
+
+
-
-
- /Defs/ThingDef[@Name="HAR_SK_Mechanoid_race_Base"]/statBases/ArmorRating_Heat
-
- 0
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_a"]/combatPower
-
- 100
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]
-
-
- Humanoid
-
-
-
+
+
+ [1.3]Silkiera Race
+
+
+
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases
-
- 0
- 0
- 0.19
- 0.22
- 0.09
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Sharp
-
- 4
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Blunt
-
- 6
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/tools
-
-
-
- left blade
-
- Cut
-
- 36
- 1.65
- LeftBlade
- 2.07
- 5.4
- true
+
+ /Defs/ThingDef[@Name="HAR_SK_Mechanoid_race_Base"]/statBases/ArmorRating_Heat
+
+ 0
+
-
- left blade
-
- Stab
-
- 12
- 1.33
- LeftBlade
- 40
- 20
- true
+
+
+
+
+ /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_a"]/combatPower
+
+ 100
+
-
- right blade
-
- Cut
-
- 36
- 2.07
- RightBlade
- 2.16
- 5.4
- true
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]
+
+
+ Humanoid
+
+
-
- right blade
-
- Stab
-
- 12
- 1.33
- RightBlade
- 40
- 20
- true
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases
+
+ 0
+ 0
+ 0.19
+ 0.22
+ 0.09
+
-
- head
-
- Blunt
-
- 6
- 5.9
- HeadAttackTool
- 0.2
- 0
- 1.875
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Sharp
+
+ 4
+
-
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_b"]/combatPower
-
- 130
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]
-
-
- QuadrupedLow
-
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases
-
- 0
- 0
- 0.02
- 0.15
- 0.41
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Sharp
-
- 6
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Blunt
-
- 9
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/tools
-
-
-
- left blade
-
- Cut
-
- 65
- 3.97
- LeftBlade
- 6.4
- 14.5
- true
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/statBases/ArmorRating_Blunt
+
+ 6
+
-
- right blade
-
- Cut
-
- 65
- 3.97
- RightBlade
- 6.4
- 14.5
- true
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_a"]/tools
+
+
+
+ left blade
+
+ Cut
+
+ 36
+ 1.65
+ LeftBlade
+ 2.07
+ 5.4
+ true
+
+
+ left blade
+
+ Stab
+
+ 12
+ 1.33
+ LeftBlade
+ 40
+ 20
+ true
+
+
+ right blade
+
+ Cut
+
+ 36
+ 2.07
+ RightBlade
+ 2.16
+ 5.4
+ true
+
+
+ right blade
+
+ Stab
+
+ 12
+ 1.33
+ RightBlade
+ 40
+ 20
+ true
+
+
+ head
+
+ Blunt
+
+ 6
+ 5.9
+ HeadAttackTool
+ 0.2
+ 0
+ 1.875
+
+
+
-
- head
-
- Blunt
-
- 35
- 3.51
- HeadAttackTool
- 0
- 15
- true
+
+
+
+
+ /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_b"]/combatPower
+
+ 130
+
-
-
-
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]
-
-
- Birdlike
-
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases
-
- 0
- 0
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Sharp
-
- 1
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Blunt
-
- 1.5
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/tools
-
-
-
- head
-
- Blunt
-
- 6
- 2.25
- HeadAttackTool
- 0.2
- 0
- 1.875
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]
+
+
+ QuadrupedLow
+
+
-
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_e"]/combatPower
-
- 140
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]
-
-
- Humanoid
-
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases
-
- 0
- 0
- 0.19
- 0.22
- 0.09
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Sharp
-
- 4
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Blunt
-
- 6
-
-
-
-
- /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/tools
-
-
-
- left blade
-
- Cut
-
- 12
- 1.65
- LeftBlade
- 2.07
- 5.4
- true
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases
+
+ 0
+ 0
+ 0.02
+ 0.15
+ 0.41
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Sharp
+
+ 6
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/statBases/ArmorRating_Blunt
+
+ 9
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_b"]/tools
+
+
+
+ left blade
+
+ Cut
+
+ 65
+ 3.97
+ LeftBlade
+ 6.4
+ 14.5
+ true
+
+
+ right blade
+
+ Cut
+
+ 65
+ 3.97
+ RightBlade
+ 6.4
+ 14.5
+ true
+
+
+ head
+
+ Blunt
+
+ 35
+ 3.51
+ HeadAttackTool
+ 0
+ 15
+ true
+
+
+
+
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]
+
+
+ Birdlike
+
+
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases
+
+ 0
+ 0
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Sharp
+
+ 1
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/statBases/ArmorRating_Blunt
+
+ 1.5
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_c"]/tools
+
+
+
+ head
+
+ Blunt
+
+ 6
+ 2.25
+ HeadAttackTool
+ 0.2
+ 0
+ 1.875
+
+
+
+
+
+
+
+
+ /Defs/PawnKindDef[defName="HAR_SK_Mechanoid_Kind_e"]/combatPower
+
+ 140
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]
+
+
+ Humanoid
+
+
-
- right blade
-
- Cut
-
- 12
- 2.07
- RightBlade
- 2.16
- 5.4
- true
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases
+
+ 0
+ 0
+ 0.19
+ 0.22
+ 0.09
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Sharp
+
+ 4
+
-
- head
-
- Blunt
-
- 6
- 5.9
- HeadAttackTool
- 0.2
- 0
- 1.875
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/statBases/ArmorRating_Blunt
+
+ 6
+
+
+
+
+ /Defs/ThingDef[defName="HAR_SK_Mechanoid_race_e"]/tools
+
+
+
+ left blade
+
+ Cut
+
+ 12
+ 1.65
+ LeftBlade
+ 2.07
+ 5.4
+ true
+
+
+ right blade
+
+ Cut
+
+ 12
+ 2.07
+ RightBlade
+ 2.16
+ 5.4
+ true
+
+
+ head
+
+ Blunt
+
+ 6
+ 5.9
+ HeadAttackTool
+ 0.2
+ 0
+ 1.875
+
+
+
-
-
+
+
+
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml b/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml
index 8ed9e3cc13..bb04e07bac 100644
--- a/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml
+++ b/Patches/Soviet Armory/SovietArmory_CE_Patch_Turrets.xml
@@ -2,7 +2,7 @@
- Soviet Armory [1.2]
+ Soviet Armory [1.3]
diff --git a/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml b/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml
index 21d9c2356b..e728615f0e 100644
--- a/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml
+++ b/Patches/Soviet Armory/SovietArmory_CE_Patch_Weapons.xml
@@ -2,7 +2,7 @@
- Soviet Armory [1.2]
+ Soviet Armory [1.3]
diff --git a/Patches/Tsar Armory/TsarArmory_Guns.xml b/Patches/Tsar Armory/TsarArmory_Guns.xml
index 3da4ff5062..aa4bf43581 100644
--- a/Patches/Tsar Armory/TsarArmory_Guns.xml
+++ b/Patches/Tsar Armory/TsarArmory_Guns.xml
@@ -3,7 +3,7 @@
- Tsar Armory [1.2]
+ Tsar Armory [1.3]
diff --git a/Patches/Tsar Armory/TsarArmory_Recipes.xml b/Patches/Tsar Armory/TsarArmory_Recipes.xml
index 458487c37c..3b52641c8a 100644
--- a/Patches/Tsar Armory/TsarArmory_Recipes.xml
+++ b/Patches/Tsar Armory/TsarArmory_Recipes.xml
@@ -3,7 +3,7 @@
- Tsar Armory [1.2]
+ Tsar Armory [1.3]
diff --git a/Patches/Tsar Armory/TsarArmory_Turrets.xml b/Patches/Tsar Armory/TsarArmory_Turrets.xml
index b0a425bafd..c636db0211 100644
--- a/Patches/Tsar Armory/TsarArmory_Turrets.xml
+++ b/Patches/Tsar Armory/TsarArmory_Turrets.xml
@@ -3,7 +3,7 @@
- Tsar Armory [1.2]
+ Tsar Armory [1.3]
diff --git a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/Patch_Musketman.xml b/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/Patch_Musketman.xml
deleted file mode 100644
index 2051c216e8..0000000000
--- a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/Patch_Musketman.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
- Vanilla Factions Expanded - Medieval
-
-
-
- Vanilla Weapons Expanded
-
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Musketeer"]
-
-
-
- 8
- 10
-
-
-
- 120
- 250
-
-
- NeolithicMeleeBasic
- MedievalMeleeDecent
-
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Musketeer"]
-
-
- Apparel_TribalBackpack
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml b/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml
index 0e3d2d38e6..b62ccefb38 100644
--- a/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml
+++ b/Patches/Vanilla Factions Expanded - Medieval/PawnKindDefs/VanillaMedieval_PawnKinds.xml
@@ -6,92 +6,92 @@
Vanilla Factions Expanded - Medieval
-
-
-
+
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldMoney
-
+
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldTags
-
-
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier"]
-
-
-
- 100
- 350
-
-
- KiteShield
- HeaterShield
-
- 0.6
-
-
-
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldMoney
+
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Knight"]
-
-
-
- 200
- 600
-
-
- HeaterShield
- KiteShield
-
- 0.8
-
-
-
-
-
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]
-
-
-
- 14
- 26
-
-
-
- 120
- 250
-
-
- NeolithicMeleeBasic
- MedievalMeleeDecent
-
-
-
-
-
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier" or defName="VFEM_Medieval_Knight"]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]/shieldTags
+
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]
-
-
- Apparel_TribalBackpack
-
-
-
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Footsoldier"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+
+ 0.6
+
+
+
+
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Knight"]
+
+
+
+ 200
+ 600
+
+
+ HeaterShield
+ KiteShield
+
+ 0.8
+
+
+
+
+
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]
+
+
+
+ 14
+ 26
+
+
+
+ 120
+ 250
+
+
+ NeolithicMeleeBasic
+ MedievalMeleeDecent
+
+
+
+
+
+
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Bowman"]
+
+
+ Apparel_TribalBackpack
+
+
+
+
+
+
+ /Defs/PawnKindDef[defName="VFEM_Medieval_Squire"]/weaponMoney/min
+
+ 120
+
+
-
-
- /Defs/PawnKindDef[defName="VFEM_Medieval_Squire"]/weaponMoney/min
-
- 120
-
-
-
diff --git a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml
index 9b8e84dbd8..8fc3460bb4 100644
--- a/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml
+++ b/Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Apparel.xml
@@ -1,22 +1,21 @@
-
-
- Vanilla Factions Expanded - Medieval
-
+
+ Vanilla Factions Expanded - Medieval
+
-
+
/Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases
3
- 1
+ 1
-
+
/Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetLight"]/statBases/StuffEffectMultiplierArmor
@@ -30,9 +29,9 @@
/Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases
5
- 1
+ 1
-
+
/Defs/ThingDef[defName="VFEM_Apparel_PlateHelmetHeavy"]/statBases/StuffEffectMultiplierArmor
@@ -41,6 +40,46 @@
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Sharp |
+ /Defs/ThingDef[defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/ArmorRating_Blunt
+
+
+
+
+ /Defs/ThingDef[ defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases
+
+ 2
+ 1
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_JesterHat" or defName="VFEM_Apparel_KingsCrown" or defName="VFEM_Apparel_PlagueMask"]/statBases/StuffEffectMultiplierArmor
+
+ 2
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]
+
+ 25
+
+ Leathery
+
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_PlagueMask"]/apparel/layers/li[.="Overhead"]
+
+ StrappedHead
+
+
+
/Defs/ThingDef[defName="VFEM_Apparel_PlateArmorHeavy"]/statBases
@@ -81,7 +120,7 @@
/Defs/ThingDef[defName="VFEM_Apparel_Tabard"]/statBases
4
- 1
+ 1
@@ -92,7 +131,40 @@
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases
+
+ 2
+ 1
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_JesterOutfit" or defName="VFEM_Apparel_DameDress"]/statBases/StuffEffectMultiplierArmor
+
+ 1
+
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases
+
+ 2
+ 1.5
+
+
+
+
+ /Defs/ThingDef[defName="VFEM_Apparel_KingsRobes"]/statBases/StuffEffectMultiplierArmor
+
+ 2.5
+
+
+
+