From 1fd7a5b460977dff7833a688bd6d69f25bbaa215 Mon Sep 17 00:00:00 2001 From: Cocopomel <79386233+Cocopomel@users.noreply.github.com> Date: Thu, 27 Oct 2022 00:52:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=A8=EA=B0=84=EC=A4=84=201=EC=B0=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.4 Ideology/Defs/MemeDefs/Memes_PnL.xml | 111 ++++++++++++++++++ .../Defs/PnLCareerLevel/Royal_TraderKinds.xml | 7 +- 1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml | 11 +- .../AutomataRaceSettings/AutomataRaceDef.xml | 8 +- .../ThingDef/ThingDef_Weapons_Industrial.xml | 18 ++- 1.4/Defs/TraderKindDefs/TraderKinds_Base.xml | 22 ++-- .../TraderKindDefs/TraderKinds_OrbitalPnL.xml | 5 +- LoadFolders.xml | 6 +- 8 files changed, 165 insertions(+), 23 deletions(-) create mode 100644 1.4 Ideology/Defs/MemeDefs/Memes_PnL.xml diff --git a/1.4 Ideology/Defs/MemeDefs/Memes_PnL.xml b/1.4 Ideology/Defs/MemeDefs/Memes_PnL.xml new file mode 100644 index 0000000..e3c3fa3 --- /dev/null +++ b/1.4 Ideology/Defs/MemeDefs/Memes_PnL.xml @@ -0,0 +1,111 @@ + + + + + + + PN_Structure + + Bylaws of PnL industry. An exemplary PnL employee would not break bylaws. + Structure + Icon/Paniel_bylaw + 0 + Conference room + 0 + + +
  • memeLeaderNoun->CEO
    • +
  • memeMoralist->Personnel Manager
    • +     +     + + + +
  • episode(tag=meme_PN_Structure) ->...PnL Industry, founded by Paul and Lauren, has evolved from a small industrial company in Glitterworld to a giant interstellar company.\n\n...\n\nEven though we were kicked out of Rimworld for an "unfortunate incident," we're going back to Glitterworld.
    • +     +     + +
  • + PN_IdeoStoryPattern +
    • +     + +
  • + PN_Structure + true +
    • +     +     + +
  • + PnL bylaws + PnL + PnL + PnL Employee +
    • +     + +
  • +
  • BodyMod_Approved
    • + +
  • +
  • OrganUse_Acceptable
    • + +
  • +
  • DrugUse_MedicalOrSocial
    • + +
  • +
  • Apostasy_Abhorrent
    • + +
  • +
  • IdeoDiversity_Abhorrent
    • + +
  • +
  • Nudity_Female_UncoveredGroinOrChestDisapproved
    • + +
  • +
  • Nudity_Male_UncoveredGroinOrChestDisapproved
    • + +
  • +
  • Execution_DontCare
    • + +
  • +
  • Scarification_Horrible
    • + +
  • +
  • Slavery_Abhorrent
    • + +
  • +
  • HAR_AlienSlavery_Abhorrent
    • + +
  • +
  • Cannibalism_Horrible
    • + +
  • +
  • NutrientPasteEating_DontMind
    • + + +     +     + + + PN_IdeoStoryPattern + +
  • episode
    • +     + + +
  • IdeoDescriptionGlobal
    • +     +     +     + + + PN_IdeoIcon + Icon/Paniel_Icon + +
  • PN_Structure
    • +     +     + +     \ No newline at end of file diff --git a/1.4 Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml b/1.4 Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml index f11a488..951ec0f 100644 --- a/1.4 Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml +++ b/1.4 Royalty/Defs/PnLCareerLevel/Royal_TraderKinds.xml @@ -138,9 +138,10 @@ PN_PrototypeRailGun 1 -
  • - PN_Bladelink - 1~2 +
  • + PN_WeaponsMeleeBladelink + 1 + 1
    • diff --git a/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml b/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml index 6d3a221..d304e38 100644 --- a/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml +++ b/1.4 Royalty/Defs/Royal_ThingDef_Weapon.xml @@ -26,6 +26,13 @@ + + PN_WeaponsMeleeBladelink + + PN_WeaponsMelee + Icon/Paniel_HQ + + Ultra @@ -46,7 +53,7 @@ true true -
  • WeaponsMelee
    • +
  • PN_WeaponsMelee
    •
  • PN_UltratechMelee
    • @@ -82,7 +89,7 @@ true true -
  • WeaponsMeleeBladelink
    • +
  • PN_WeaponsMeleeBladelink
    •  diff --git a/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml b/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml index 334bc3c..428e5cc 100644 --- a/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml +++ b/1.4/Defs/AutomataRaceSettings/AutomataRaceDef.xml @@ -217,7 +217,7 @@ -
  • +
  • 1 @@ -701,7 +701,7 @@
  • PN_EliteSecurityHat
    • -
  • PN_OfficerModule
    • + diff --git a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml index d37ae35..aa6d6fc 100644 --- a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml +++ b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml @@ -31,13 +31,27 @@ 0     + + PN_WeaponsRanged + + WeaponsRanged + Icon/Paniel_HQ + + + + PN_WeaponsMelee + + WeaponsMelee + Icon/Paniel_HQ + + Industrial true true -
  • WeaponsMelee
    • +
  • PN_WeaponsMelee
    •  GeneralLaborSpeed @@ -120,7 +134,7 @@ Industrial true -
  • WeaponsRanged
    • +
  • PN_WeaponsRanged
    •
  • ITab_Art
    • diff --git a/1.4/Defs/TraderKindDefs/TraderKinds_Base.xml b/1.4/Defs/TraderKindDefs/TraderKinds_Base.xml index e85b04b..7078b28 100644 --- a/1.4/Defs/TraderKindDefs/TraderKinds_Base.xml +++ b/1.4/Defs/TraderKindDefs/TraderKinds_Base.xml @@ -136,15 +136,22 @@ -
  • - 10~16 +
  • + BasicClothing + 7~15
    • -
  • - 2~4 +
  • + Clothing + 3~5 +
    • +
  • + Armor + 8~10
    • -
  • +
  • + WeaponRanged 3~6
  • @@ -170,8 +177,9 @@ 3~4 1~2
    • -
  • - 5~10 +
  • + Art + 4~8
  • Television diff --git a/1.4/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.4/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml index 4a9445f..8f80cee 100644 --- a/1.4/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml +++ b/1.4/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml @@ -98,8 +98,9 @@ PN_PrototypeRailGun -3~1
    • -
  • - PN_Bladelink +
  • + PN_WeaponsMeleeBladelink + 1 -4~1
    • diff --git a/LoadFolders.xml b/LoadFolders.xml index 6599bec..ed141b2 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -3,14 +3,14 @@
  • 1.3
  • Content
    • -
  • 1.3 Royalty
    • -
  • 1.3 Ideology
    • +
  • 1.3_Royalty
    • +
  • 1.3_Ideology
    •
  • 1.4
  • Content
  • 1.4 Royalty
    • - +
  • 1.4 Ideology
    •  \ No newline at end of file