diff --git a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml index 30a11d8..1b90f8f 100644 --- a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml +++ b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml @@ -1,12 +1,12 @@ - + \ No newline at end of file diff --git a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml index 71e1769..53add90 100644 --- a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml +++ b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml @@ -157,7 +157,7 @@
  • Gunsmithing
  • 1.0 - 2.1 + 2.8 @@ -172,7 +172,7 @@
  • GasOperation
  • 2.0 - 2.8 + 3.5
    @@ -187,7 +187,7 @@
  • Mortars
  • 2.0 - 3.5 + 4.2
    @@ -205,7 +205,7 @@
  • PNRP_BrainCasing
  • 5.0 - 3.5 + 4.2
    @@ -220,6 +220,6 @@
  • ChargedShot
  • 5.0 - 2.1 + 2.8
    \ No newline at end of file diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml index 028b550..7327a36 100644 --- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml +++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml @@ -33,6 +33,9 @@
  • PNHeadgear
  • + + true + @@ -892,6 +895,9 @@
  • PNRoyalHeadgear
  • + + true + diff --git a/1.3/Defs/ThingDef/ThingDef_Module.xml b/1.3/Defs/ThingDef/ThingDef_Module.xml index 45aa520..560a00b 100644 --- a/1.3/Defs/ThingDef/ThingDef_Module.xml +++ b/1.3/Defs/ThingDef/ThingDef_Module.xml @@ -9,7 +9,7 @@ PNApparelModule - ApparelUtility + PNApparel @@ -76,7 +76,7 @@ - 14000 + @@ -85,7 +85,7 @@ - ShieldBelt + 6 diff --git a/Content/Textures/UI/Abilities/PNOfficerCommand.png b/Content/Textures/UI/Abilities/PNOfficerCommand.png new file mode 100644 index 0000000..3f9c04d Binary files /dev/null and b/Content/Textures/UI/Abilities/PNOfficerCommand.png differ diff --git a/Ideology/Defs/AbilityDefs.xml b/Ideology/Defs/Ideo_AbilityDefs.xml similarity index 93% rename from Ideology/Defs/AbilityDefs.xml rename to Ideology/Defs/Ideo_AbilityDefs.xml index b25f92c..2f17109 100644 --- a/Ideology/Defs/AbilityDefs.xml +++ b/Ideology/Defs/Ideo_AbilityDefs.xml @@ -10,8 +10,8 @@ CastAbilityOnThing False False - UI/Abilities/CombatCommand - UI/Abilities/CombatCommand + UI/Abilities/PNOfficerCommand + UI/Abilities/PNOfficerCommand True False True diff --git a/Ideology/Defs/Hediffs_Module.xml b/Ideology/Defs/Ideo_Hediffs_Module.xml similarity index 100% rename from Ideology/Defs/Hediffs_Module.xml rename to Ideology/Defs/Ideo_Hediffs_Module.xml diff --git a/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml new file mode 100644 index 0000000..b7b4977 --- /dev/null +++ b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml @@ -0,0 +1,34 @@ + + + + + + + PNRP_TierB_Module + + ... + PN_technology + 1000 + Industrial + +
  • PNRP_TierB_Apparel
  • +
    + 4.0 + 2.1 +
    + + + PNRP_TierC_Module + + ... + PN_technology + 3250 + Spacer + +
  • PNRP_TierC_Apparel
  • +
    + 6.0 + 2.1 +
    + +
    \ No newline at end of file diff --git a/Ideology/Defs/ThingDef_Module.xml b/Ideology/Defs/Ideo_ThingDef_Module.xml similarity index 60% rename from Ideology/Defs/ThingDef_Module.xml rename to Ideology/Defs/Ideo_ThingDef_Module.xml index 40c5374..5085b2d 100644 --- a/Ideology/Defs/ThingDef_Module.xml +++ b/Ideology/Defs/Ideo_ThingDef_Module.xml @@ -1,14 +1,30 @@ + + + PN_OfficerModule ... + + 14000 + - 3 - 80 - 10 + 5 + 2 + + PNRP_TierC_Module + + 6 + + + + + + +
  • PN_OfficerModuleHediff diff --git a/Royalty/Defs/Hediffs_BodyParts_Psychic.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml similarity index 100% rename from Royalty/Defs/Hediffs_BodyParts_Psychic.xml rename to Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml diff --git a/Royalty/Defs/Hediffs_BodyParts_Vanilla.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml similarity index 100% rename from Royalty/Defs/Hediffs_BodyParts_Vanilla.xml rename to Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml diff --git a/Royalty/Defs/Reserch_ProjectDefs.xml b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml similarity index 92% rename from Royalty/Defs/Reserch_ProjectDefs.xml rename to Royalty/Defs/Royal_Reserch_ProjectDefs.xml index ac8b8e2..b5c216b 100644 --- a/Royalty/Defs/Reserch_ProjectDefs.xml +++ b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml @@ -11,7 +11,7 @@
  • PNRP_Production
  • 1.0 - 3.5 + 0.7
  • PanielStart
  • diff --git a/Royalty/Defs/ThingDef_Weapon.xml b/Royalty/Defs/Royal_ThingDef_Weapon.xml similarity index 100% rename from Royalty/Defs/ThingDef_Weapon.xml rename to Royalty/Defs/Royal_ThingDef_Weapon.xml