From f59d45fae632a44404265658958cf3538cb7bafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E6=9C=88=E6=B1=90?= <109664829+PoppyLoveU@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:00:06 +0800 Subject: [PATCH 1/5] Update Weapons_Melee.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added recipeMaker for MeleeWeaponUltratech, increasing its marketvalue。 --- .../ThingDefs_Misc/Weapons/Weapons_Melee.xml | 482 ++++++++++++++++++ 1 file changed, 482 insertions(+) diff --git a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml index 271afc833b..bfd75272d8 100644 --- a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml +++ b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml @@ -489,6 +489,488 @@
  • SharpMelee
    • + + + Defs/ThingDef[@Name="MeleeWeaponUltratech"]/statBases/MarketValue + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costList + + 18 + 4 + 1 + 12 + 2 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSword"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 18 + + UnfinishedWeapon +     +     + + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costList + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 20 + + UnfinishedWeapon +     +     + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costList + + 18 + 4 + 1 + 12 + 2 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 18 + + UnfinishedWeapon +     +     + + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costList + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 20 + + UnfinishedWeapon +     +     + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costList + + 18 + 4 + 1 + 12 + 2 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 18 + + UnfinishedWeapon +     +     + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costStuffCount + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] + + 120 + +
    • +     +     + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costList + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costList + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + + + + + Always + +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/recipeMaker + Invert +
    • +
  • + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] + + + +
    • +     +     + + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/recipeMaker + + Melee_D1 + SmithingSpeed + Crafting + Smith + Recipe_Machining + +
  • MechWeaponCraftingWorkTable
    • +     + + 20 + + UnfinishedWeapon +     From 03f8c9df2829307f92c62437796a9c80c5babb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E6=9C=88=E6=B1=90?= <109664829+PoppyLoveU@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:05:08 +0800 Subject: [PATCH 2/5] Update Weapons_Melee.xml --- .../Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml index bfd75272d8..b03ff8c344 100644 --- a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml +++ b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml @@ -489,6 +489,7 @@
  • SharpMelee
    • + Defs/ThingDef[@Name="MeleeWeaponUltratech"]/statBases/MarketValue From ff5a8c7dca1c3ad6737ae8ca237634dcf2488348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E6=9C=88=E6=B1=90?= <109664829+PoppyLoveU@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:17:33 +0800 Subject: [PATCH 3/5] Update Weapons_Melee.xml --- .../Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml index b03ff8c344..c729c99cd7 100644 --- a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml +++ b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml @@ -575,6 +575,9 @@ + + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/statBases/MarketValue + Always @@ -735,6 +738,9 @@ + + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/statBases/MarketValue + Always @@ -894,6 +900,9 @@ + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/statBases/MarketValue + Always From ccb9f65902ec76456ac92945c8aedd2b34c3cfc2 Mon Sep 17 00:00:00 2001 From: Manifold Paradox Date: Fri, 2 Aug 2024 07:33:15 +0900 Subject: [PATCH 4/5] Remove link with crafting tables, merge patch --- .../ThingDefs_Misc/Weapons/Weapons_Melee.xml | 433 ++++++------------ 1 file changed, 128 insertions(+), 305 deletions(-) diff --git a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml index c729c99cd7..34dee73030 100644 --- a/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml +++ b/Mods/Core_SK/Royalty/Patches/ThingDefs_Misc/Weapons/Weapons_Melee.xml @@ -1,4 +1,4 @@ - + @@ -177,8 +177,8 @@ 0.60 0.90 - 0.47 - + 0.47 + @@ -195,8 +195,7 @@ Defs/ThingDef[defName="MeleeWeapon_PsyfocusStaff"] - - + @@ -222,13 +221,13 @@
  • Stab
    •  - 20 + 20 1.15 1.33 1.173 13.47 Point - +
  • @@ -240,7 +239,7 @@ 2.42 9.68 Edge -
    • +     @@ -265,7 +264,7 @@ Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/statBases 4 - 0.40 + 0.40     @@ -279,7 +278,7 @@ 0.80 0.40 - 0.27 + 0.27
  • SharpMelee
    • @@ -338,12 +337,12 @@ EMP 5 - + 1.3 2.2 45.5 - Head - + Head +     @@ -382,7 +381,7 @@ 1.10 0.20 - 0.10 + 0.10
  • HeavyMelee
    • @@ -420,8 +419,8 @@ 5 0.2 - - 0.3 + + 0.3 1.3 3.24 25.4 @@ -438,7 +437,7 @@ 8 0.3 - + 1.45 1.0 3.20 @@ -483,63 +482,41 @@ 0.85 0.50 - 0.40 + 0.40
  • SharpMelee
    •  - - - Defs/ThingDef[@Name="MeleeWeaponUltratech"]/statBases/MarketValue - - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSword"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSword"] - - - -
    • -     -     - - - Defs/ThingDef[defName="MeleeWeapon_MonoSword"]/costList + + Defs/ThingDef[@Name="MeleeWeaponUltratech" or + defName="MeleeWeapon_MonoSword" or + defName="MeleeWeapon_MonoSwordBladelink" or + defName="MeleeWeapon_ZeusHammer" or + defName="MeleeWeapon_ZeusHammerBladelink" or + defName="MeleeWeapon_PlasmaSword" or + defName="MeleeWeapon_PlasmaSwordBladelink"] + /statBases/MarketValue + + + + + Defs/ThingDef[defName="MeleeWeapon_MonoSword"] - 18 - 4 - 1 - 12 - 2 + 120 + + 18 + 4 + 1 + 12 + 2 + - - + + - - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/statBases/MarketValue - - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] - - - -
    • -     -     +     --> - - Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"]/costList + + + + + Defs/ThingDef[defName="MeleeWeapon_MonoSwordBladelink"] - 18 - 4 - 2 - 10 - 4 - 50 - 1 + 120 + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + - - + + - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] - - - -
    • -     -     +     --> - - Defs/ThingDef[defName="MeleeWeapon_Zeushammer"]/costList + + + Defs/ThingDef[defName="MeleeWeapon_Zeushammer"] - 18 - 4 - 1 - 12 - 2 + 120 + + 18 + 4 + 1 + 12 + 2 + - - + + - - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/statBases/MarketValue - - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] - - - -
    • -     -     + --> - - Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"]/costList + + + + Defs/ThingDef[defName="MeleeWeapon_ZeusHammerBladelink"] - 18 - 4 - 2 - 10 - 4 - 50 - 1 + 120 + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + - - + + - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] - - - -
    • -     -     +     --> - - Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"]/costList + + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSword"] - 18 - 4 - 1 - 12 - 2 + 120 + + 18 + 4 + 1 + 12 + 2 + - - + + + - - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/statBases/MarketValue - - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costStuffCount - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] - - 120 - -
    • -     -     - - - Always - -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costList - Invert -
    • -
  • - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] - - - -
    • -     -     - - Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"]/costList + + Defs/ThingDef[defName="MeleeWeapon_PlasmaSwordBladelink"] - 18 - 4 - 2 - 10 - 4 - 50 - 1 + 120 + + 18 + 4 + 2 + 10 + 4 + 50 + 1 + - - + + - + \ No newline at end of file From 13bc1a5440d5371dc6ec1aa9ea201934c45303de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E6=9C=88=E6=B1=90?= <109664829+PoppyLoveU@users.noreply.github.com> Date: Sun, 4 Aug 2024 15:33:47 +0800 Subject: [PATCH 5/5] Update PawnKinds.xml Patch their weapon money,I increased weapons money from 4500 to 11000, but I don't know if this will result in more weapons being held by the enemy --- .../Royalty/Patches/PawnKindDefs_Royalty/PawnKinds.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mods/Core_SK/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds.xml b/Mods/Core_SK/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds.xml index 11ab9dd1b0..75ed14f3d2 100644 --- a/Mods/Core_SK/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds.xml +++ b/Mods/Core_SK/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds.xml @@ -506,7 +506,7 @@ Good 350 - 4500~6500 + 11000~15000 16500~18000 21500~26500 @@ -539,4 +539,4 @@ - \ No newline at end of file +