diff --git a/1.3/Defs/AbilityDef/AbilityDefs_Base.xml b/1.3/Defs/AbilityDef/AbilityDefs_Base.xml index b9fcdd4..130a46a 100644 --- a/1.3/Defs/AbilityDef/AbilityDefs_Base.xml +++ b/1.3/Defs/AbilityDef/AbilityDefs_Base.xml @@ -27,6 +27,10 @@ PNModule_3hour 7500 + + PNModule_rightoff + 120 + HediffWithComps diff --git a/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml b/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml index bc308e0..fd70e17 100644 --- a/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml +++ b/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml @@ -614,6 +614,7 @@
  • PN_OfficerCommandThought
  • +
  • PN_MeisterAdviceThought
  • diff --git a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml index 878f94a..0afb1c5 100644 --- a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml +++ b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml @@ -4,6 +4,8 @@ PN_WearSetting_OfficerModule Paniel_Race + +
  • PN_OfficerModule
  • @@ -20,6 +22,9 @@ true ForceDropHediff + + +
    \ No newline at end of file diff --git a/1.3/Defs/HediffDefs/Hediffs_AutomatonGrade.xml b/1.3/Defs/HediffDefs/Hediffs_AutomatonGrade.xml index 943a8ab..f1bc1f3 100644 --- a/1.3/Defs/HediffDefs/Hediffs_AutomatonGrade.xml +++ b/1.3/Defs/HediffDefs/Hediffs_AutomatonGrade.xml @@ -309,6 +309,7 @@ -0.15 + -0.04 @@ -352,6 +353,7 @@ -0.30 + -0.08 @@ -451,6 +453,7 @@ 0.10 + -0.04 @@ -494,6 +497,7 @@ 0.20 + -0.08 @@ -593,6 +597,7 @@ 0.10 + -0.04 @@ -636,6 +641,7 @@ 0.20 + -0.08 diff --git a/Content/Textures/UI/Abilities/PNFieldMedic.png b/Content/Textures/UI/Abilities/PNFieldMedic.png new file mode 100644 index 0000000..d5214f8 Binary files /dev/null and b/Content/Textures/UI/Abilities/PNFieldMedic.png differ diff --git a/Content/Textures/UI/Abilities/PNImmunityDrive.png b/Content/Textures/UI/Abilities/PNImmunityDrive.png new file mode 100644 index 0000000..935ca11 Binary files /dev/null and b/Content/Textures/UI/Abilities/PNImmunityDrive.png differ diff --git a/Content/Textures/UI/Abilities/PNIntensiveMedical.png b/Content/Textures/UI/Abilities/PNIntensiveMedical.png new file mode 100644 index 0000000..8e297fe Binary files /dev/null and b/Content/Textures/UI/Abilities/PNIntensiveMedical.png differ diff --git a/Content/Textures/UI/Abilities/PNStimPack.png b/Content/Textures/UI/Abilities/PNStimPack.png new file mode 100644 index 0000000..18441fe Binary files /dev/null and b/Content/Textures/UI/Abilities/PNStimPack.png differ diff --git a/Content/Textures/UI/Abilities/PNTriggerhappy.png b/Content/Textures/UI/Abilities/PNTriggerhappy.png index b90aeb7..05d9225 100644 Binary files a/Content/Textures/UI/Abilities/PNTriggerhappy.png and b/Content/Textures/UI/Abilities/PNTriggerhappy.png differ diff --git a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml new file mode 100644 index 0000000..99ca48e --- /dev/null +++ b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml @@ -0,0 +1,54 @@ + + + + + + + + + + PN_TriggerHappyAbility + + ... + CastAbilityOnThing + False + False + UI/Abilities/PNTriggerHappy + UI/Abilities/PNTriggerHappy + True + False + True + False + PNModule_2day + Misc12 + 3 + CombatCommand_Warmup + + 84 + + + Verb_CastAbility + 0.5 + -1 + False + False + + true + false + false + false + false + false + + + +
  • + CompAbilityEffect_GiveHediff + PN_TriggerHappy + True + true +
  • +
    +
    + +
    \ No newline at end of file diff --git a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Legd.xml b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Legd.xml deleted file mode 100644 index 00fdc14..0000000 --- a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Legd.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - PN_OfficerCommandAbility - - ... - CastAbilityOnThing - False - False - UI/Abilities/PNOfficerCommand - UI/Abilities/PNOfficerCommand - True - False - True - False - PNModule_2day - Misc12 - 3 - CombatCommand_Warmup - - 334 - 9.9 - - - Verb_CastAbility - 0.5 - 9.9 - False - False - - true - false - false - false - false - false - - - -
  • - CompAbilityEffect_GiveHediff - PN_OfficerCommand - True - True - true -
  • -
    -
    - - - - PN_meisteradviceAbility - - ... - CastAbilityOnThingMelee - UI/Abilities/PNMeisteradvice - UI/Abilities/PNMeisteradvice - True - False - True - False - PNModule_3hour - Misc12 - 2 - WorkDrive_Warmup - - 42 - - - Verb_CastAbilityTouch - False - -1 - 3.0 - - false - false - false - false - true - - - -
  • - CompAbilityEffect_GiveHediff - PN_meisteradvice - True - False -
  • -
    -
    - -
    \ No newline at end of file diff --git a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml index f07551d..ab4313d 100644 --- a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml +++ b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml @@ -5,16 +5,106 @@ - + - PN_TriggerhappyAbility - + PN_OfficerCommandAbility + ... CastAbilityOnThing False False - UI/Abilities/PNTriggerhappy - UI/Abilities/PNTriggerhappy + UI/Abilities/PNOfficerCommand + UI/Abilities/PNOfficerCommand + True + False + True + False + PNModule_2day + Misc12 + 3 + CombatCommand_Warmup + + 334 + 9.9 + + + Verb_CastAbility + 0.5 + 9.9 + False + False + + true + false + false + false + false + false + + + +
  • + CompAbilityEffect_GiveHediff + PN_OfficerCommand + True + True + true +
  • +
    +
    + + + + PN_MeisterAdviceAbility + + ... + CastAbilityOnThingMelee + UI/Abilities/PNMeisterAdvice + UI/Abilities/PNMeisterAdvice + True + False + True + False + PNModule_3hour + Misc12 + 2 + WorkDrive_Warmup + + 42 + + + Verb_CastAbilityTouch + False + -1 + 3.0 + + false + false + false + false + true + + + +
  • + CompAbilityEffect_GiveHediff + PN_MeisterAdvice + True + False +
  • +
    +
    + + + + PN_IntensiveMedicalAbility + + ... + CastAbilityOnThing + False + False + UI/Abilities/PNIntensiveMedical + UI/Abilities/PNIntensiveMedical True False True @@ -44,11 +134,131 @@
  • CompAbilityEffect_GiveHediff - PN_Triggerhappy + PN_IntensiveMedical True true
  • + + + PN_ImmunityDriveAbility + + Offer moral support that energizes the body, boosting someone's immunity gain for one day. + PNModule_rightoff + UI/Abilities/PNImmunityDrive + UI/Abilities/PNImmunityDrive + Misc12 + CastAbilityOnThingMelee + True + False + True + False + ImmunityDrive_Resolve + + 1000 + + +
  • + CompAbilityEffect_GiveHediff + PN_ImmunityDrive + true +
  • +
    + + Verb_CastAbilityTouch + False + -1 + 1.5 + + False + True + + +
    + + + + PN_FieldMedicAbility + + ... + CastAbilityOnThing + False + False + UI/Abilities/PNFieldMedic + UI/Abilities/PNFieldMedic + True + False + True + False + PNModule_2day + Misc12 + 3 + CombatCommand_Warmup + + 334 + + + Verb_CastAbility + 0.5 + -1 + False + False + + true + false + false + false + false + false + + + +
  • + CompAbilityEffect_GiveHediff + PN_FieldMedic + True + true +
  • +
    +
    + + + + PN_StimPackAbility + + ... + PNModule_rightoff + UI/Abilities/PNStimPack + UI/Abilities/PNStimPack + Misc12 + CastAbilityOnThingMelee + True + False + True + False + ImmunityDrive_Resolve + + 250 + + +
  • + CompAbilityEffect_GiveHediff + PN_StimPack + true +
  • +
    + + Verb_CastAbilityTouch + False + -1 + 1.5 + + False + True + + +
    + \ No newline at end of file diff --git a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml new file mode 100644 index 0000000..b211e7d --- /dev/null +++ b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml @@ -0,0 +1,88 @@ + + + + + + + + PN_TriggerHappy + + ... + HediffWithComps + +
  • + + -6 + + + 0.60 + +
  • +
    + +
  • + True +
  • +
  • +
  • + +
  • PN_TriggerHappyOverload
  • + + +
    + false +
    + + + PN_TriggerHappyOverload + + module overloaded + module overloaded + HediffWithComps + +
  • + 112500 + True +
  • +
  • + + +
  • + +
  • + Consciousness + -0.10 +
  • +
  • + Moving + -0.10 +
  • +
  • + Sight + -0.10 +
  • +
  • + Manipulation + -0.10 +
  • + + + -3 + + + 1.3 + + + +
    + +
    \ No newline at end of file diff --git a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Legd.xml b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Legd.xml deleted file mode 100644 index e7cc5db..0000000 --- a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Legd.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - PN_OfficerCommand - - By encouraging and commanding nearby allies, this person can enhance their focus in combat and thus their battle performance. - HediffWithComps - -
  • - True -
  • -
  • -
  • - 9.9 - Mote_CombatCommand - true - - false - false - false - true - - PN_OfficerCommandBuff -
  • -
  • - -
  • PN_OfficerCommandOverload
  • - - -
    - -
  • - -
  • - Consciousness - -0.40 -
  • - - - - - - - - -
    - false -
    - - - PN_OfficerCommandBuff - - Combat abilities are boosted thanks to being near someone who is using the officer command ability. - HediffWithComps - -
  • - false -
  • -
  • -
  • -
    - false - -
  • - - 2 - - - 0.80 - -
  • -
    -
    - - - PN_OfficerCommandThought - ThoughtWorker_Hediff - PN_OfficerCommandBuff - true - -
  • - - I can't believe I have to follow the commands of an automaton. - -5 -
  • -
    -
    - - - PN_OfficerCommandThoughtforPN - MoharThoughts.RaceBPHediff - -
  • - - The officer is with us. We will be able to win this battle under the officer's command. - 5 -
  • -
    -
    - - - PNMTW_OfficerCommandThoughtforPN - PN_OfficerCommandThoughtforPN - Paniel_Race - PN_OfficerCommandBuff - PNBrain - 1 - - - - PN_OfficerCommandOverload - - module overloaded - module overloaded - HediffWithComps - -
  • - 97500 - True -
  • -
  • - - -
  • - -
  • - Consciousness - -0.40 -
  • -
  • - Moving - -0.20 -
  • -
  • - Sight - -0.20 -
  • -
  • - Manipulation - -0.20 -
  • - - - -
    - - - - PN_meisteradvice - - The sense of being got advice from the meister. - HediffWithComps - -
  • - True -
  • -
  • - - false - -
  • - - 1.30 - 1.30 - 1.30 - 1.30 - 1.30 - -
  • - -
    - -
    \ No newline at end of file diff --git a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml index 91deb88..c72e7b3 100644 --- a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml +++ b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml @@ -1,30 +1,217 @@ - - - + - PN_Triggerhappy - + PN_OfficerCommand + + By encouraging and commanding nearby allies, this person can enhance their focus in combat and thus their battle performance. + HediffWithComps + +
  • + True +
  • +
  • +
  • + 9.9 + Mote_CombatCommand + true + + false + false + false + true + + PN_OfficerCommandBuff +
  • +
  • + +
  • PN_OfficerCommandOverload
  • + + +
    + +
  • + +
  • + Consciousness + -0.20 +
  • + + + + + + + + +
    + false +
    + + + PN_OfficerCommandBuff + + Combat abilities are boosted thanks to being near someone who is using the officer command ability. + HediffWithComps + +
  • + false +
  • +
  • +
  • +
    + false + +
  • + + 2 + + + 0.80 + + +
  • + Moving + 0.20 +
  • + + +
    +
    + + + PN_OfficerCommandThought + ThoughtWorker_Hediff + PN_OfficerCommandBuff + true + +
  • + + I can't believe I have to follow the commands of an automaton. + -5 +
  • +
    +
    + + + PN_OfficerCommandThoughtforPN + MoharThoughts.RaceBPHediff + +
  • + + The officer is with us. We will be able to win this battle under the officer's command. + 5 +
  • +
    +
    + + + PNMTW_OfficerCommandThoughtforPN + PN_OfficerCommandThoughtforPN + Paniel_Race + PN_OfficerCommandBuff + PNBrain + 1 + + + + PN_OfficerCommandOverload + + module overloaded + module overloaded + HediffWithComps + +
  • + 97500 + True +
  • +
  • + + +
  • + +
  • + Consciousness + -0.30 +
  • +
  • + Moving + -0.50 +
  • +
  • + Sight + -0.50 +
  • +
  • + Manipulation + -0.50 +
  • + + + +
    + + + + PN_MeisterAdvice + + The sense of being got advice from the meister. + HediffWithComps + +
  • + True +
  • +
  • + + false + +
  • + + 1.20 + 1.20 + 1.20 + 1.20 + 1.20 + +
  • + +
    + + + PN_MeisterAdviceThought + ThoughtWorker_Hediff + PN_MeisterAdvice + true + +
  • + + I can't believe I have to follow the advice of an automaton. + -5 +
  • +
    +
    + + + + PN_IntensiveMedical + ... HediffWithComps
  • - -5 + 0.2 - 0.5 + 1.15 + 1.15 + 1.15 + 1.15
  • @@ -35,22 +222,25 @@
  • -
  • PN_TriggerhappyOverload
  • +
  • PN_IntensiveMedicalOverload
  • +
  • + PN_ImmunityDriveAbility +
  • false
    - PN_TriggerhappyOverload + PN_IntensiveMedicalOverload module overloaded module overloaded HediffWithComps
  • - 112500 + 97500 True
  • @@ -60,29 +250,229 @@
  • Consciousness - -0.20 + -0.30
  • Moving - -0.30 + -0.50
  • Sight - -0.30 + -0.50
  • Manipulation - -0.30 + -0.50
  • - - -3 - - - 1.3 -
    + + + PN_ImmunityDrive + + ... + HediffWithComps + +
  • + + 1.5 + +
  • +
    + +
  • + True +
  • +
    + false +
    + + + + PN_FieldMedic + + ... + HediffWithComps + +
  • + + 0.4 + + + 1.30 + +
  • +
    + +
  • + True +
  • +
  • +
  • + +
  • PN_IntensiveMedicalOverload
  • + + +
  • + PN_StimPackAbility +
  • +
    + false +
    + + + + PN_StimPack + + .... + HediffWithComps + +
  • + 0.2 + 0.25 + +
  • + Consciousness + 0.15 +
  • +
  • + Sight + 0.25 +
  • +
  • + Moving + 0.40 +
  • + + + -0.12 + + +
    + +
  • + True +
  • +
  • + +
  • PN_StimPackSideEffect
  • + + +
  • + +
  • PN_StimPackSideEffect
  • + + +
    + false +
    + + + PN_StimPackThought + ThoughtWorker_Hediff + PN_StimPack + true + +
  • + + Feeling pumped! Let's do this! + 20 +
  • +
    +
    + + + PN_StimPackSideEffect + + stim pack side effect + stim pack side effect + HediffWithComps + 1.0 + 1.0 + +
  • + -1 + true +
  • +
  • + + +
  • + + 0 + 2 + 0.3 + 0.5 + +
  • + Consciousness + -0.15 +
  • +
  • + Moving + -0.40 +
  • +
  • + Sight + -0.20 +
  • +
  • + BloodPumping + -0.20 +
  • +
  • + Manipulation + -0.10 +
  • + + +
  • + + 0.80 + +
  • + Consciousness + -0.15 +
  • +
  • + Moving + -0.20 +
  • +
  • + Sight + -0.10 +
  • +
  • + BloodPumping + -0.10 +
  • +
  • + Manipulation + -0.05 +
  • + + +
  • + + 0.90 +
  • + +
    + + + PN_StimPackSideEffectThought + ThoughtWorker_Hediff + PN_StimPackSideEffect + true + +
  • + + I'm all fuzzy and can't think straight. My limbs feel heavy, I'm tired and hungry, everything hurts. And why won't my eyes focus properly? + -15 +
  • +
    +
    \ No newline at end of file diff --git a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml new file mode 100644 index 0000000..39e3c5a --- /dev/null +++ b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml @@ -0,0 +1,46 @@ + + + + + + PN_TriggerHappyModule + + CAUTION: This module can only be installed on (exc), (mast), (legd) combat model. + + 45 + 3 + 1 + + + PNRP_TierC_Module + + 6 + + + + + + + + +
  • + PN_TriggerHappyModuleHediff + PNTorso +
  • +
    +
    + + + PN_TriggerHappyModuleHediff + + ... + + + + +
  • + PN_TriggerHappyAbility +
  • +
    +
    +
    \ No newline at end of file diff --git a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Legd.xml b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Legd.xml deleted file mode 100644 index fecaa15..0000000 --- a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Legd.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - PN_OfficerModule - - CAUTION: This module can only be installed on (legd) combat model. - - 75000 - - - 5 - 3 - - - PNRP_TierC_Module - - 6 - - - - - - - - -
  • - PN_OfficerModuleHediff - PNTorso -
  • -
    -
    - - - PN_OfficerModuleHediff - - ... - - - - -
  • - PN_OfficerCommandAbility -
  • -
  • - EMP - PN_EMPShock -
  • -
    -
    - - - - PN_MeisterModule - - CAUTION: This module can only be installed on (legd) engineer model. - - 75000 - - - 5 - 3 - - - PNRP_TierC_Module - - 6 - - - - - - - - -
  • - PN_MeisterModuleHediff - PNTorso -
  • -
    -
    - - - PN_MeisterModuleHediff - - ... - - - - -
  • - PN_meisteradviceAbility -
  • -
    -
    -
    \ No newline at end of file diff --git a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml index bde49db..fef0109 100644 --- a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml +++ b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml @@ -1,14 +1,18 @@ - + - PN_TriggerhappyModule - - CAUTION: This module can only be installed on (exc), (mast), (legd) combat model. + PN_OfficerModule + + CAUTION: This module can only be installed on (legd) combat model. + + 75000 + - 3 - 1 + 45 + 5 + 3 PNRP_TierC_Module @@ -23,22 +27,164 @@
  • - PN_TriggerhappyModuleHediff + PN_OfficerModuleHediff PNTorso
  • - PN_TriggerhappyModuleHediff - + PN_OfficerModuleHediff + ...
  • - PN_TriggerhappyAbility + PN_OfficerCommandAbility +
  • +
  • + EMP + PN_EMPShock +
  • +
    +
    + + + + PN_MeisterModule + + CAUTION: This module can only be installed on (legd) engineer model. + + 75000 + + + 45 + 5 + 3 + + + PNRP_TierC_Module + + 6 + + + + + + + + +
  • + PN_MeisterModuleHediff + PNTorso +
  • +
    +
    + + + PN_MeisterModuleHediff + + ... + + + + +
  • + PN_MeisterAdviceAbility +
  • +
    +
    + + + + PN_IntensiveMedicalModule + + CAUTION: This module can only be installed on (legd) domestic model. + + 75000 + + + 45 + 5 + 3 + + + PNRP_TierC_Module + + 6 + + + + + + + + +
  • + PN_IntensiveMedicalModuleHediff + PNTorso +
  • +
    +
    + + + PN_IntensiveMedicalModuleHediff + + ... + + + + +
  • + PN_IntensiveMedicalAbility +
  • +
    +
    + + + + PN_FieldMedicModule + + CAUTION: This module can only be installed on (legd) combat or domestic model. + + 75000 + + + 45 + 5 + 3 + + + PNRP_TierC_Module + + 6 + + + + + + + + +
  • + PN_FieldMedicModuleHediff + PNTorso +
  • +
    +
    + + + PN_FieldMedicModuleHediff + + ... + + + + +
  • + PN_FieldMedicAbility