From eae5431bafc514598af152e5f090c51ea3f4276f Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 02:17:39 -0500 Subject: [PATCH 1/6] Remove Duplicate node --- .../ThingDefs_Buildings/TurretGatlingGun.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml index e6127f76d6..604ae94975 100644 --- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml +++ b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml @@ -77,8 +77,8 @@ -
  • - Defs/ThingDef[defName="Turret_GatlingGun"] +
  • + Defs/ThingDef[defName="Turret_GatlingGun"]/costList 325 From f0260fe28f03436e69172681fe358b1d24363f5e Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 02:17:55 -0500 Subject: [PATCH 2/6] Remove duplicate recipe base --- .../Explosives_Smart_CE.xml | 15 ---------- .../Core/Weapons_Explosives.xml | 15 ---------- .../Core/Weapons_ExplosivesRecipeBase.xml | 30 +++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml diff --git a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml index 1b479abf60..78d9352a2d 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml @@ -180,21 +180,6 @@ Defs - - GeneralLaborSpeed - Cook - Recipe_Smith - Crafting - UnfinishedGun - - -
  • Plasteel
    • -
  • ComponentIndustrial
    • -
  • FSX
    • - - - - diff --git a/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml b/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml index f0c6ebdef7..ae2e43fefe 100644 --- a/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml +++ b/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml @@ -493,21 +493,6 @@ Defs - - GeneralLaborSpeed - Cook - Recipe_Smith - Crafting - UnfinishedGun - - -
  • Plasteel
    • -
  • ComponentIndustrial
    • -
  • FSX
    • -     -     -     - Craft_10_BaegYa diff --git a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml new file mode 100644 index 0000000000..1706866a45 --- /dev/null +++ b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml @@ -0,0 +1,30 @@ + + + + + +
  • Rimsenal - Core
    • +     + + + + + GeneralLaborSpeed + Cook + Recipe_Smith + Crafting + UnfinishedGun + + +
  • Plasteel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     +     + +     + +     +     +     \ No newline at end of file From f27f1791db5304ef93a6a2b3e5f9991a5068e9f6 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 03:25:44 -0500 Subject: [PATCH 3/6] Fix typo --- .../Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml index 1706866a45..167c4bb292 100644 --- a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml +++ b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml @@ -4,8 +4,10 @@
  • Rimsenal - Core
    • +
  • Rimsenal - Spacer Faction Pack
    •  + Defs From a8332f03babf8fd8c36d42bf4ec7865997f1c716 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 03:25:55 -0500 Subject: [PATCH 4/6] Load VFE - Tribals before CE --- About/About.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/About/About.xml b/About/About.xml index 29459200e3..24539d449b 100644 --- a/About/About.xml +++ b/About/About.xml @@ -83,6 +83,7 @@
  • Killathon.MechHumanlikes.MechanicalBiomimetics
  • botchjob.divineorder
  • OskarPotocki.VFE.Deserters
    • +
  • OskarPotocki.VFE.Tribals
    • From 8d6015a1df997ae35acd1a9f38e31be942d5067b Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 04:19:16 -0500 Subject: [PATCH 5/6] wip --- .../StyleCategoryDefs/StyleCategoryDefs.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml diff --git a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml new file mode 100644 index 0000000000..faa3a114bf --- /dev/null +++ b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml @@ -0,0 +1,21 @@ + + + + + +
  • Alpha Memes
    • +     + + + + + +
  • + Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Flamebow"] +
    • + +     +     +     + +     \ No newline at end of file From e69ae5bc79fe0a071e5784a6529aaa296a7b95f2 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 29 Jan 2024 19:15:07 -0500 Subject: [PATCH 6/6] Resolve AM style errors --- About/About.xml | 1 + .../StyleCategoryDefs/StyleCategoryDefs.xml | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/About/About.xml b/About/About.xml index 24539d449b..60e5a14658 100644 --- a/About/About.xml +++ b/About/About.xml @@ -84,6 +84,7 @@
  • botchjob.divineorder
  • OskarPotocki.VFE.Deserters
  • OskarPotocki.VFE.Tribals
    • +
  • Sarg.AlphaMemes
    • diff --git a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml index faa3a114bf..230dc1ceb8 100644 --- a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml +++ b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml @@ -14,6 +14,18 @@ Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Flamebow"] +
  • + Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_EmpLauncher"] +
    • + +
  • + Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_ToxbombLauncher"] +
    • + +
  • + Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_SmokeLauncher"] +
    • +