From 5fdd546eb3af1fbdb53b02ac1a3ad4836a78040f Mon Sep 17 00:00:00 2001 From: Cocopomel <79386233+Cocopomel@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:21:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EB=8B=A8=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.3/Defs/FactionDefs/Factions_PnL.xml | 2 +- 1.3/Defs/ThingDef/ThingDef_Item.xml | 4 +- 1.3/Defs/ThingDef/ThingDef_Shell.xml | 15 ++ 1.3/Defs/TraderKindDefs/TraderKinds_Base.xml | 241 ++++++++---------- .../TraderKindDefs/TraderKinds_CaravanPnL.xml | 25 +- .../TraderKindDefs/TraderKinds_OrbitalPnL.xml | 53 ++-- 1.3/Patches/Royalty.xml | 28 ++ .../Defs/PnLCareerLevel/Royal_TraderKinds.xml | 141 ++++++++++ 8 files changed, 323 insertions(+), 186 deletions(-) diff --git a/1.3/Defs/FactionDefs/Factions_PnL.xml b/1.3/Defs/FactionDefs/Factions_PnL.xml index 38b9f77..7034662 100644 --- a/1.3/Defs/FactionDefs/Factions_PnL.xml +++ b/1.3/Defs/FactionDefs/Factions_PnL.xml @@ -101,7 +101,7 @@
  • Visitor_Outlander_Standard
    • -
  • Base_Outlander_Standard
    • +
  • PN_Base_PnLindustry
    •  -40~45 PN_SubsidiaryRaidLootMaker diff --git a/1.3/Defs/ThingDef/ThingDef_Item.xml b/1.3/Defs/ThingDef/ThingDef_Item.xml index 0072c8b..e1953ac 100644 --- a/1.3/Defs/ThingDef/ThingDef_Item.xml +++ b/1.3/Defs/ThingDef/ThingDef_Item.xml @@ -440,8 +440,8 @@ false 70 - 1000 - 0.6 + 1500 + 0.1 0.6 2.0 diff --git a/1.3/Defs/ThingDef/ThingDef_Shell.xml b/1.3/Defs/ThingDef/ThingDef_Shell.xml index 9e3715d..e6304ed 100644 --- a/1.3/Defs/ThingDef/ThingDef_Shell.xml +++ b/1.3/Defs/ThingDef/ThingDef_Shell.xml @@ -104,6 +104,9 @@ 20 1 + +
  • PN_Shell
    • +     @@ -248,6 +251,9 @@ 20 1 + +
  • PN_Shell
    • +     @@ -321,6 +327,9 @@ 20 1 + +
  • PN_Shell
    • +     @@ -402,6 +411,9 @@ 20 1 + +
  • PN_Shell
    • +     @@ -483,6 +495,9 @@ 20 1 + +
  • PN_Shell
    • +     diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_Base.xml b/1.3/Defs/TraderKindDefs/TraderKinds_Base.xml index 8863dea..e85b04b 100644 --- a/1.3/Defs/TraderKindDefs/TraderKinds_Base.xml +++ b/1.3/Defs/TraderKindDefs/TraderKinds_Base.xml @@ -4,11 +4,10 @@ PN_Base_PnLindustry -
  • Silver - 8000~30000 + 2000~4000
  • ComponentIndustrial @@ -22,63 +21,33 @@ Steel 500~800
    • -
  • - WoodLog - 400~700 -
  • Plasteel - 100~250 + 100~400
  • Uranium 40~200
  • - Cloth - 400~600 -
    • -
  • - Gold - 100~200 + Chemfuel + 200~600
  • Neutroamine - 50~200 -
    • -
  • - Chemfuel - 300~500 -
    • -
  • - Chocolate - -30~70 -
    • -
  • - Beer - -40~100 + 50~100
  • MedicineIndustrial 25~50
    • -
  • - 1~4 +
  • + Hyperweave + 10~25
    • -
  • - MortarShell - 1~2 - 20~40 -
    • -
  • - Textiles - 1~2 - 400~800 -
    • -
  • - ResourcesRaw - 2~4 - 400~800 +
  • + DevilstrandCloth + 10~25
  • FoodRaw @@ -93,32 +62,85 @@ 1~2 12~50
    • -
  • - -
  • Kibble
    • -
  • Pemmican
    • - +
  • + ResourcesRaw + 2~4 + 400~800 +
    • +
  • + Textiles + 1~2 + 400~800 +
    • +
  • + 1~4 +
    • +
  • + MortarShell + 1~2 + 20~40 +
    • +
  • + PN_Shell + 1~2 + 3~6 +
    • +
  • + Chocolate + -30~70 +
    • +
  • + Beer + -40~100
    • -
  • - Drugs - 3~4 - 700~1500 +
  • + PN_AutomatonFuel + 200~600 +
    • +
  • + PN_antibiotics + 2~6
    • - -
  • - -
  • - 2 - 0.5 -
    • -
  • - 3 - 0.5 -
    • - + +
  • + PN_RepairKit + 10~20 +
    • +
  • + PN_BrainCasing + 3~6 +
    • +
  • + Leather_Automaton + 50~200 +
    • +
  • + PN_Component + 4~8 +
    • + +
  • + Packaged_NormalAutomatonSoldier + 0~1 +
    • +
  • + Packaged_NormalAutomatonWorker + 0~1 +
    • +
  • + Packaged_NormalAutomatonMaid + 0~1 +
    • + + +
  • + 10~16 +
    • +
  • + 2~4
    • @@ -131,15 +153,11 @@ 1~2 - -
  • - 10~16 -
    • -
  • - 2~4 -
    • - +
  • + PN_ResurrectModule + -1~1 +
  • TechHediff 2~4 @@ -165,6 +183,21 @@ 0~1
    • + +
  • + +
  • + 2 + 0.5 +
    • +
  • + 3 + 0.5 +
    • + + + +
  • Artifact @@ -176,21 +209,15 @@ 1~4 1~2 -
  • Luciferium
  • ComponentSpacer
    • 2~15 50~200 + 3~4 - -
  • - true - -1~2 -
    • -
  • @@ -210,64 +237,6 @@
  • -
  • - Art -
    • -
  • - ImplantEmpireCommon -
    • -
  • - ImplantEmpireRoyal -
    • -
  • - MusicalInstrument -
    • - - - -
  • - Hyperweave - 10~15 -
    • -
  • - DevilstrandCloth - 20~30 -
    • -
  • - PN_AutomatonFuel - 200~300 -
    • -
  • - PN_antibiotics - 2~6 -
    • - -
  • - PN_RepairKit - 10~20 -
    • -
  • - PN_SelfRepairKit - 0~1 -
    • -
  • - PN_BrainCasing - 2~6 -
    • -
  • - Leather_Automaton - 50~200 -
    • -
  • - PN_Component - 3~5 -
    • - -
  • - PN_TMPackagedCatagory - -1~2 - 3000~4000 -
    • diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml index a48287f..0e29345 100644 --- a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml +++ b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml @@ -26,14 +26,6 @@ Chemfuel 50~150 -
  • - Hyperweave - 10~15 -
    • -
  • - DevilstrandCloth - 20~30 -
  • @@ -50,27 +42,18 @@ PN_RepairKit 2~6
    • -
  • - PN_SelfRepairKit - -8~1 -
  • PN_BrainCasing - 2~4 + 1~3
  • Leather_Automaton 20~60
    • -
  • - PN_Component - 1~3 -
    • -
  • - PN_TMPackagedCatagory - -2~1 - 3000~4000 +
  • + PN_OTPCard + -2~1
    • diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml index 3fa0ad5..e981381 100644 --- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml +++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml @@ -2,7 +2,7 @@ PN_Orbital_PnLindustry - + true PN_SubsidiaryFaction @@ -18,7 +18,7 @@
  • ComponentSpacer - 8~16 + 1~2
  • Steel @@ -29,20 +29,28 @@ 100~400
  • - Gold - 50~70 + Uranium + 40~200
  • Chemfuel 200~600
    • +
  • + Neutroamine + 50~100 +
    • +
  • + MedicineIndustrial + 10~15 +
  • Hyperweave - 25~50 + 10~25
  • DevilstrandCloth - 50~75 + 10~25
    • @@ -60,13 +68,9 @@ PN_RepairKit 10~20 -
  • - PN_SelfRepairKit - 1~3 -
  • PN_BrainCasing - 6~10 + 3~6
  • Leather_Automaton @@ -74,31 +78,27 @@
  • PN_Component - 8~16 + 4~8
    • -
  • - PN_TMPackagedCatagory - 1~3 - 3000~4000 -
    • - -
  • - PN_PrototypeRailGun - -2~1 + Packaged_NormalAutomatonSoldier + 0~1
    • -
  • - PN_Bladelink - -2~1 +
  • + Packaged_NormalAutomatonWorker + 0~1 +
    • +
  • + Packaged_NormalAutomatonMaid + 0~1
    • -
  • PN_ResurrectModule - 1~1 + -1~1
    • @@ -106,6 +106,7 @@ +
  • diff --git a/1.3/Patches/Royalty.xml b/1.3/Patches/Royalty.xml index 5c3b469..1fd7061 100644 --- a/1.3/Patches/Royalty.xml +++ b/1.3/Patches/Royalty.xml @@ -60,6 +60,34 @@
    • +
  • + /Defs/TraderKindDef[defName = "PN_Base_PnLindustry"]/stockGenerators + +
  • + Techprint_CataphractArmor + -1~1 +
    • +
  • + PN_Orbital_PnLbenefit + -1~1 +
    • + + + +
  • + /Defs/TraderKindDef[defName = "PN_Orbital_PnLindustry"]/stockGenerators + +
  • + Techprint_CataphractArmor + 1 +
    • +
  • + Techprint_BrainWiring + 1 +
    • + + +
  • /Defs/FactionDef[defName = "PN_SubsidiaryFaction"] diff --git a/Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml b/Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml index f5397f6..610efcd 100644 --- a/Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml +++ b/Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml @@ -16,4 +16,145 @@
    • + + + + + PN_Orbital_PnLbenefit + + true + PN_SubsidiaryFaction + PN_TradeBenefit + + + +
  • + Silver + 2000~4000 +
    • +
  • + ComponentIndustrial + 30~60 +
    • +
  • + ComponentSpacer + 8~16 +
    • +
  • + Steel + 500~800 +
    • +
  • + Plasteel + 200~600 +
    • +
  • + Uranium + 60~300 +
    • +
  • + Chemfuel + 200~600 +
    • +
  • + MedicineUltratech + 5~30 +
    • +
  • + Neutroamine + 100~500 +
    • +
  • + Hyperweave + 50~200 +
    • +
  • + DevilstrandCloth + 50~200 +
    • + + +
  • + PN_AutomatonFuel + 200~600 +
    • +
  • + PN_antibiotics + 6~18 +
    • + + +
  • + PN_RepairKit + 20~40 +
    • +
  • + PN_SelfRepairKit + 2~5 +
    • +
  • + PN_BrainCasing + 6~10 +
    • +
  • + Leather_Automaton + 50~200 +
    • +
  • + PN_Component + 8~16 +
    • + +
  • + Packaged_NormalAutomatonSoldier + 1~3 +
    • +
  • + Packaged_NormalAutomatonWorker + 1~3 +
    • +
  • + Packaged_NormalAutomatonMaid + 1~3 +
    • + +
  • + Packaged_PremiumAutomatonSoldier + 1 +
    • +
  • + Packaged_PremiumAutomatonWorker + 1 +
    • +
  • + Packaged_PremiumAutomatonMaid + 1 +
    • + + +
  • + PN_PrototypeRailGun + 0~1 +
    • +
  • + PN_Bladelink + 1~2 +
    • + + + + +
  • + PN_ResurrectModule + 1~3 +
    • + + + + + + + +     +     \ No newline at end of file