diff --git a/1.3/Defs/AbilityDef/AbilityDefs_Base.xml b/1.3/Defs/AbilityDef/AbilityDefs_Base.xml index 130a46a..00f01b8 100644 --- a/1.3/Defs/AbilityDef/AbilityDefs_Base.xml +++ b/1.3/Defs/AbilityDef/AbilityDefs_Base.xml @@ -32,13 +32,26 @@ <cooldownTicks>120</cooldownTicks> </AbilityGroupDef> - <HediffDef Name="PN_ApparelModuleHediffBase" Abstract="True"> + <HediffDef Name="PN_ApparelIndustrialModuleHediffBase" Abstract="True"> <hediffClass>HediffWithComps</hediffClass> <comps> <li Class="HediffCompProperties_RemoveIfApparelDropped" /> <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd"> <triggeredHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + </triggeredHediff> + </li> + </comps> + <isBad>false</isBad> + </HediffDef> + + <HediffDef Name="PN_ApparelSpacerModuleHediffBase" Abstract="True"> + <hediffClass>HediffWithComps</hediffClass> + <comps> + <li Class="HediffCompProperties_RemoveIfApparelDropped" /> + <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd"> + <triggeredHediff> + <li>PN_ModuleUnstable_Spacer</li> </triggeredHediff> </li> </comps> @@ -62,7 +75,43 @@ <!--불안정--> <HediffDef> - <defName>PN_ModuleUnstable</defName> + <defName>PN_ModuleUnstable_Industrial</defName> + <label>module system unstable</label> + <labelNoun>module overloaded</labelNoun> + <description>module overloaded</description> + <hediffClass>HediffWithComps</hediffClass> + <comps> + <li Class="HediffCompProperties_Disappears"> + <disappearsAfterTicks>20000</disappearsAfterTicks> + <showRemainingTime>True</showRemainingTime> + </li> + <li Class="HediffCompProperties_DisappearsOnDeath"/> + </comps> + <stages> + <li> + <capMods> + <li> + <capacity>Consciousness</capacity> + <offset>-0.10</offset> + </li> + <li> + <capacity>Moving</capacity> + <offset>-0.20</offset> + </li> + <li> + <capacity>Sight</capacity> + <offset>-0.20</offset> + </li> + <li> + <capacity>Manipulation</capacity> + <offset>-0.20</offset> + </li> + </capMods> + </li> + </stages> + </HediffDef> + <HediffDef> + <defName>PN_ModuleUnstable_Spacer</defName> <label>module system unstable</label> <labelNoun>module overloaded</labelNoun> <description>module overloaded</description> @@ -73,31 +122,25 @@ <showRemainingTime>True</showRemainingTime> </li> <li Class="HediffCompProperties_DisappearsOnDeath"/> - <li Class="MoharHediffs.HediffCompProperties_HediffNullifier"> - <hediffToNullify> - <li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li> - </hediffToNullify> - <showMessage>false</showMessage> - </li> </comps> <stages> <li> <capMods> <li> <capacity>Consciousness</capacity> - <offset>-0.20</offset> + <offset>-0.30</offset> </li> <li> <capacity>Moving</capacity> - <offset>-0.30</offset> + <offset>-0.50</offset> </li> <li> <capacity>Sight</capacity> - <offset>-0.30</offset> + <offset>-0.50</offset> </li> <li> <capacity>Manipulation</capacity> - <offset>-0.30</offset> + <offset>-0.50</offset> </li> </capMods> </li> diff --git a/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml b/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml index fb70760..e55ee43 100644 --- a/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml +++ b/1.3/Defs/AutomataRaceSettings/AutomataRaceDef.xml @@ -649,8 +649,15 @@ <li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterModule</li> <li MayRequire="Ludeon.RimWorld.Ideology">PN_IntensiveMedicalModule</li> <li MayRequire="Ludeon.RimWorld.Ideology">PN_FieldMedicModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_TriggerHappyModule</li> <li MayRequire="Ludeon.RimWorld.Ideology">PN_CQCModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_MinerModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_ArchitectModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_SkilledWorkerModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_FarmerModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_ChefModule</li> + <li MayRequire="Ludeon.RimWorld.Ideology">PN_NurseModule</li> </apparelList> <whiteApparelList> diff --git a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml index e97abc8..6a773fe 100644 --- a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml +++ b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml @@ -15,12 +15,14 @@ <li>PN_SyncLegendary_Combat</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> @@ -35,12 +37,14 @@ <li>PN_SyncLegendary_Engineer</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> @@ -55,12 +59,14 @@ <li>PN_SyncLegendary_Domestic</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> @@ -76,12 +82,14 @@ <li>PN_SyncLegendary_Domestic</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> @@ -98,12 +106,14 @@ <li>PN_SyncExcellent_Combat</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> @@ -120,12 +130,158 @@ <li>PN_SyncExcellent_Combat</li> </orHediffDef> <forbiddenHediffDef> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forbiddenHediffDef> </condition> <cantReason>PN_CantReason_orhediff</cantReason> <forceDropHediff> - <li>PN_ModuleUnstable</li> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--광부 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_MinerModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Engineer</li> + <li>PN_SyncMasterwork_Engineer</li> + <li>PN_SyncExcellent_Engineer</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--건축 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_ArchitectModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Engineer</li> + <li>PN_SyncMasterwork_Engineer</li> + <li>PN_SyncExcellent_Engineer</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--제작 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_SkilledWorkerModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Engineer</li> + <li>PN_SyncMasterwork_Engineer</li> + <li>PN_SyncExcellent_Engineer</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--농부 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_FarmerModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Domestic</li> + <li>PN_SyncMasterwork_Domestic</li> + <li>PN_SyncExcellent_Domestic</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--셰프 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_ChefModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Domestic</li> + <li>PN_SyncMasterwork_Domestic</li> + <li>PN_SyncExcellent_Domestic</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forceDropHediff> + <forceDrop>true</forceDrop> + </li> + + <!--간호 모듈--> + <li MayRequire="Ludeon.RimWorld.Ideology"> + <wearList> + <li>PN_NurseModule</li> + </wearList> + <condition> + <orHediffDef> + <li>PN_SyncLegendary_Domestic</li> + <li>PN_SyncMasterwork_Domestic</li> + <li>PN_SyncExcellent_Domestic</li> + </orHediffDef> + <forbiddenHediffDef> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> + </forbiddenHediffDef> + </condition> + <cantReason>PN_CantReason_orhediff</cantReason> + <forceDropHediff> + <li>PN_ModuleUnstable_Industrial</li> + <li>PN_ModuleUnstable_Spacer</li> </forceDropHediff> <forceDrop>true</forceDrop> </li> diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml index 5193409..9aa7de6 100644 --- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml +++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml @@ -742,7 +742,6 @@ <EquipDelay>7</EquipDelay> </statBases> <equippedStatOffsets> - <GeneralLaborSpeed>0.10</GeneralLaborSpeed> <ButcheryFleshEfficiency>0.10</ButcheryFleshEfficiency> <PlantHarvestYield>0.10</PlantHarvestYield> <MedicalTendQuality>0.15</MedicalTendQuality> @@ -826,7 +825,6 @@ <EquipDelay>1</EquipDelay> </statBases> <equippedStatOffsets> - <GeneralLaborSpeed>0.05</GeneralLaborSpeed> <ButcheryFleshEfficiency>0.05</ButcheryFleshEfficiency> <PlantHarvestYield>0.05</PlantHarvestYield> <MedicalTendQuality>0.10</MedicalTendQuality> diff --git a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml index e0690c6..03dd2c1 100644 --- a/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml +++ b/Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Spacer.xml @@ -9,7 +9,7 @@ <AbilityDef> <defName>PN_OfficerCommandAbility</defName> <label>officer command</label> - <description>Create an aura that boosts the combat skills of everyone nearby. The effect lasts 24 hours and remains attached to the leader for the duration.</description> + <description>Create an aura that boosts the combat skills of everyone nearby. The effect lasts 6 hours and remains attached to the user for the duration.</description> <jobDef>CastAbilityOnThing</jobDef> <targetRequired>False</targetRequired> <canUseAoeToGetTargets>False</canUseAoeToGetTargets> @@ -57,32 +57,37 @@ <AbilityDef> <defName>PN_MeisterAdviceAbility</defName> <label>meister's advice</label> - <description>Call on person and give advice on the work.</description> - <jobDef>CastAbilityOnThingMelee</jobDef> + <description>Create an aura that boosts the engineer skills of everyone nearby. The effect lasts 12 hours and remains attached to the user for the duration.</description> + <jobDef>CastAbilityOnThing</jobDef> + <targetRequired>False</targetRequired> + <canUseAoeToGetTargets>False</canUseAoeToGetTargets> <iconPath>UI/Abilities/PNMeisterAdvice</iconPath> <warmupMoteSocialSymbol>UI/Abilities/PNMeisterAdvice</warmupMoteSocialSymbol> <stunTargetWhileCasting>True</stunTargetWhileCasting> <showPsycastEffects>False</showPsycastEffects> <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted> <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted> - <groupDef>PNModule_3hour</groupDef> + <groupDef>PNModule_2day</groupDef> <hotKey>Misc12</hotKey> - <uiOrder>2</uiOrder> - <warmupStartSound>WorkDrive_Warmup</warmupStartSound> + <uiOrder>3</uiOrder> + <warmupStartSound>CombatCommand_Warmup</warmupStartSound> <statBases> - <Ability_Duration>42</Ability_Duration> + <Ability_Duration>500</Ability_Duration> + <Ability_EffectRadius>9.9</Ability_EffectRadius> </statBases> <verbProperties> - <verbClass>Verb_CastAbilityTouch</verbClass> + <verbClass>Verb_CastAbility</verbClass> + <warmupTime>0.5</warmupTime> + <range>9.9</range> <drawAimPie>False</drawAimPie> - <range>-1</range> - <warmupTime>3.0</warmupTime> + <requireLineOfSight>False</requireLineOfSight> <targetParams> - <canTargetAnimals>false</canTargetAnimals> - <canTargetSelf>false</canTargetSelf> + <canTargetSelf>true</canTargetSelf> + <canTargetPawns>false</canTargetPawns> <canTargetBuildings>false</canTargetBuildings> + <canTargetAnimals>false</canTargetAnimals> + <canTargetHumans>false</canTargetHumans> <canTargetMechs>false</canTargetMechs> - <onlyTargetColonists>true</onlyTargetColonists> </targetParams> </verbProperties> <comps> @@ -90,7 +95,8 @@ <compClass>CompAbilityEffect_GiveHediff</compClass> <hediffDef>PN_MeisterAdvice</hediffDef> <onlyBrain>True</onlyBrain> - <applicableToMechs>False</applicableToMechs> + <onlyApplyToSelf>True</onlyApplyToSelf> + <replaceExisting>true</replaceExisting> </li> </comps> </AbilityDef> diff --git a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml index ee0e6de..14fb3ca 100644 --- a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml +++ b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml @@ -16,7 +16,7 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_TriggerHappy</defName> <label>module active (rapid fire)</label> - <description>rapid fire</description> + <description>The hediff created by activating rapid fire ability.</description> <hediffClass>HediffWithComps</hediffClass> <stages> <li> @@ -77,7 +77,7 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_CQC</defName> <label>module active (CQC)</label> - <description>close quarters combat</description> + <description>The hediff created by activating close quarters combat ability.</description> <hediffClass>HediffWithComps</hediffClass> <stages> <li> diff --git a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml index 30d88ae..f03a703 100644 --- a/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml +++ b/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml @@ -32,18 +32,18 @@ </comps> <stages> <li> - <capMods> - <li> - <capacity>Consciousness</capacity> - <offset>-0.20</offset> - </li> - </capMods> <statOffsets> - + <ShootingAccuracyPawn>2</ShootingAccuracyPawn> </statOffsets> <statFactors> - + <AimingDelayFactor>0.80</AimingDelayFactor> </statFactors> + <capMods> + <li> + <capacity>Moving</capacity> + <offset>0.20</offset> + </li> + </capMods> </li> </stages> <isBad>false</isBad> @@ -127,7 +127,7 @@ <hediffClass>HediffWithComps</hediffClass> <comps> <li Class="HediffCompProperties_Disappears"> - <disappearsAfterTicks>100000</disappearsAfterTicks> + <disappearsAfterTicks>60000</disappearsAfterTicks> <showRemainingTime>True</showRemainingTime> </li> <li Class="HediffCompProperties_DisappearsOnDeath"/> @@ -160,24 +160,83 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_MeisterAdvice</defName> <label>meister's advice</label> - <description>The sense of being got advice from the meister.</description> + <description>By encouraging and advising nearby allies, this person can enhance their focus in engineer work performance.</description> <hediffClass>HediffWithComps</hediffClass> <comps> <li Class="HediffCompProperties_Disappears"> <showRemainingTime>True</showRemainingTime> </li> <li Class="HediffCompProperties_DisappearsOnDeath"/> + <li Class="HediffCompProperties_GiveHediffsInRange"> + <range>9.9</range> + <mote>Mote_WorkCommand</mote> + <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted> + <targetingParameters> + <canTargetBuildings>false</canTargetBuildings> + <canTargetAnimals>false</canTargetAnimals> + <canTargetMechs>false</canTargetMechs> + <onlyTargetColonists>true</onlyTargetColonists> + </targetingParameters> + <hediff>PN_MeisterAdviceBuff</hediff> + </li> + <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd"> + <triggeredHediff> + <li>PN_OfficerCommandOverload</li> + </triggeredHediff> + </li> + </comps> + <stages> + <li> + <capMods> + + </capMods> + <statOffsets> + + </statOffsets> + <statFactors> + <MiningSpeed>1.25</MiningSpeed> + <DeepDrillingSpeed>1.25</DeepDrillingSpeed> + <GeneralLaborSpeed>1.25</GeneralLaborSpeed> + <ConstructionSpeed>1.25</ConstructionSpeed> + <DrugCookingSpeed>1.25</DrugCookingSpeed> + </statFactors> + </li> + </stages> + <isBad>false</isBad> + </HediffDef> + + <HediffDef ParentName="RoleStatBuff"> + <defName>PN_MeisterAdviceBuff</defName> + <label>meister's advice</label> + <description>The sense of being got advice from the meister.</description> + <hediffClass>HediffWithComps</hediffClass> + <comps> + <li Class="HediffCompProperties_Disappears"> + <showRemainingTime>false</showRemainingTime> + </li> + <li Class="HediffCompProperties_DisappearsOnDeath"/> + <li Class="HediffCompProperties_Link"> + <requireLinkOnOtherPawn>false</requireLinkOnOtherPawn> + <maxDistance>10</maxDistance> + <customMote>Mote_WorkCommandLinkLine</customMote> + </li> </comps> <isBad>false</isBad> <stages> <li> <statFactors> - <GeneralLaborSpeed>1.20</GeneralLaborSpeed> - <MiningSpeed>1.20</MiningSpeed> - <DeepDrillingSpeed>1.20</DeepDrillingSpeed> - <SmoothingSpeed>1.20</SmoothingSpeed> - <ConstructionSpeed>1.20</ConstructionSpeed> + <MiningSpeed>1.25</MiningSpeed> + <DeepDrillingSpeed>1.25</DeepDrillingSpeed> + <GeneralLaborSpeed>1.25</GeneralLaborSpeed> + <ConstructionSpeed>1.25</ConstructionSpeed> + <DrugCookingSpeed>1.25</DrugCookingSpeed> </statFactors> + <capMods> + <li> + <capacity>Moving</capacity> + <offset>0.20</offset> + </li> + </capMods> </li> </stages> </HediffDef> @@ -185,7 +244,7 @@ <ThoughtDef> <defName>PN_MeisterAdviceThought</defName> <workerClass>ThoughtWorker_Hediff</workerClass> - <hediff>PN_MeisterAdvice</hediff> + <hediff>PN_MeisterAdviceBuff</hediff> <validWhileDespawned>true</validWhileDespawned> <stages> <li> @@ -200,7 +259,7 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_IntensiveMedical</defName> <label>module active (intensive medical)</label> - <description>...</description> + <description>The hediff created by activating intensive medical ability.</description> <hediffClass>HediffWithComps</hediffClass> <stages> <li> @@ -208,10 +267,10 @@ <MoveSpeed>0.2</MoveSpeed> </statOffsets> <statFactors> - <MedicalTendSpeed>1.15</MedicalTendSpeed> - <MedicalTendQuality>1.15</MedicalTendQuality> - <MedicalOperationSpeed>1.15</MedicalOperationSpeed> - <MedicalSurgerySuccessChance>1.15</MedicalSurgerySuccessChance> + <MedicalTendSpeed>1.20</MedicalTendSpeed> + <MedicalTendQuality>1.20</MedicalTendQuality> + <MedicalOperationSpeed>1.20</MedicalOperationSpeed> + <MedicalSurgerySuccessChance>1.20</MedicalSurgerySuccessChance> </statFactors> </li> </stages> @@ -222,7 +281,7 @@ <li Class="HediffCompProperties_DisappearsOnDeath"/> <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd"> <triggeredHediff> - <li>PN_IntensiveMedicalOverload</li> + <li>PN_OfficerCommandOverload</li> </triggeredHediff> </li> <li Class="HediffCompProperties_GiveAbility"> @@ -232,43 +291,6 @@ <isBad>false</isBad> </HediffDef> - <HediffDef> - <defName>PN_IntensiveMedicalOverload</defName> - <label>module overloaded</label> - <labelNoun>module overloaded</labelNoun> - <description>module overloaded</description> - <hediffClass>HediffWithComps</hediffClass> - <comps> - <li Class="HediffCompProperties_Disappears"> - <disappearsAfterTicks>52500</disappearsAfterTicks> - <showRemainingTime>True</showRemainingTime> - </li> - <li Class="HediffCompProperties_DisappearsOnDeath"/> - </comps> - <stages> - <li> - <capMods> - <li> - <capacity>Consciousness</capacity> - <offset>-0.30</offset> - </li> - <li> - <capacity>Moving</capacity> - <offset>-0.50</offset> - </li> - <li> - <capacity>Sight</capacity> - <offset>-0.50</offset> - </li> - <li> - <capacity>Manipulation</capacity> - <offset>-0.50</offset> - </li> - </capMods> - </li> - </stages> - </HediffDef> - <!--면역증진--> <HediffDef ParentName="RoleStatBuff"> <defName>PN_ImmunityDrive</defName> @@ -294,7 +316,7 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_FieldMedic</defName> <label>module active (field medic)</label> - <description>...</description> + <description>The hediff created by activating field medic ability.</description> <hediffClass>HediffWithComps</hediffClass> <stages> <li> @@ -327,7 +349,7 @@ <HediffDef ParentName="RoleStatBuff"> <defName>PN_StimPack</defName> <label>stim pack injected</label> - <description>....</description> + <description>stim pack injected</description> <hediffClass>HediffWithComps</hediffClass> <stages> <li> diff --git a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml index 404bf58..3d1920e 100644 --- a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml +++ b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Industrial.xml @@ -34,10 +34,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> <defName>PN_TriggerHappyModuleHediff</defName> <label>rapid fire module</label> - <description>rapid fire module</description> + <description>The hediff created by installing rapid fire module.</description> + <descriptionHyperlinks> + <ThingDef>PN_TriggerHappyModule</ThingDef> + </descriptionHyperlinks> <stages> </stages> @@ -82,10 +85,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> <defName>PN_CQCModuleHediff</defName> <label>CQC module</label> - <description>close quarters combat module</description> + <description>The hediff created by installing close quarters combat module.</description> + <descriptionHyperlinks> + <ThingDef>PN_CQCModule</ThingDef> + </descriptionHyperlinks> <stages> <li> <statOffsets> @@ -101,4 +107,340 @@ </li> </comps> </HediffDef> + + <!--==================================== 채굴 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_MinerModule</defName> + <label>miner module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nEngineer model (legd), (mast), (exc)\n\nThis module increases the automaton's miner speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_MinerModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_MinerModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_MinerModuleHediff</defName> + <label>miner module</label> + <description>The hediff created by installing miner module.</description> + <descriptionHyperlinks> + <ThingDef>PN_MinerModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <MiningSpeed>1.20</MiningSpeed> + <DeepDrillingSpeed>1.20</DeepDrillingSpeed> + <GeneralLaborSpeed>0.70</GeneralLaborSpeed> + <ConstructionSpeed>0.70</ConstructionSpeed> + <DrugCookingSpeed>0.70</DrugCookingSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> + + <!--==================================== 건설 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_ArchitectModule</defName> + <label>architect module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nEngineer model (legd), (mast), (exc)\n\nThis module increases the automaton's construction speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_ArchitectModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_ArchitectModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_ArchitectModuleHediff</defName> + <label>architect module</label> + <description>The hediff created by installing architect module.</description> + <descriptionHyperlinks> + <ThingDef>PN_ArchitectModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <MiningSpeed>0.70</MiningSpeed> + <DeepDrillingSpeed>0.70</DeepDrillingSpeed> + <GeneralLaborSpeed>0.70</GeneralLaborSpeed> + <ConstructionSpeed>1.20</ConstructionSpeed> + <DrugCookingSpeed>0.70</DrugCookingSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> + + <!--==================================== 제작 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_SkilledWorkerModule</defName> + <label>skilled worker module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nEngineer model (legd), (mast), (exc)\n\nThis module increases the automaton's general labor speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_SkilledWorkerModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_SkilledWorkerModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_SkilledWorkerModuleHediff</defName> + <label>skilled worker module</label> + <description>The hediff created by installing skilled worker module.</description> + <descriptionHyperlinks> + <ThingDef>PN_SkilledWorkerModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <MiningSpeed>0.70</MiningSpeed> + <DeepDrillingSpeed>0.70</DeepDrillingSpeed> + <GeneralLaborSpeed>1.20</GeneralLaborSpeed> + <ConstructionSpeed>0.70</ConstructionSpeed> + <DrugCookingSpeed>1.20</DrugCookingSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> + + <!--==================================== 농부 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_FarmerModule</defName> + <label>farmer module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nDomestic model (legd), (mast), (exc)\n\nThis module increases the automaton's plant work speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_FarmerModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_FarmerModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_FarmerModuleHediff</defName> + <label>Farmer module</label> + <description>The hediff created by installing farmer module.</description> + <descriptionHyperlinks> + <ThingDef>PN_FarmerModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <PlantWorkSpeed>1.20</PlantWorkSpeed> + <MedicalTendSpeed>0.70</MedicalTendSpeed> + <MedicalOperationSpeed>0.70</MedicalOperationSpeed> + <ButcheryFleshSpeed>0.70</ButcheryFleshSpeed> + <CookSpeed>0.70</CookSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> + + <!--==================================== 셰프 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_ChefModule</defName> + <label>chef module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nDomestic model (legd), (mast), (exc)\n\nThis module increases the automaton's cooking speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_ChefModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_ChefModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_ChefModuleHediff</defName> + <label>chef module</label> + <description>The hediff created by installing chef module.</description> + <descriptionHyperlinks> + <ThingDef>PN_ChefModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <PlantWorkSpeed>0.70</PlantWorkSpeed> + <MedicalTendSpeed>0.70</MedicalTendSpeed> + <MedicalOperationSpeed>0.70</MedicalOperationSpeed> + <ButcheryFleshSpeed>1.20</ButcheryFleshSpeed> + <CookSpeed>1.20</CookSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> + + <!--==================================== 간호 모듈 ====================================--> + <ThingDef ParentName="PN_ApparelModuleIndustrial"> + <defName>PN_NurseModule</defName> + <label>nurse module</label> + <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nDomestic model (legd), (mast), (exc)\n\nThis module increases the automaton's medical speed stat.</description> + <descriptionHyperlinks> + <HediffDef>PN_NurseModuleHediff</HediffDef> + </descriptionHyperlinks> + <costList> + <Steel>45</Steel> + <ComponentIndustrial>5</ComponentIndustrial> + <ComponentSpacer>2</ComponentSpacer> + <PN_ComponentRoyal>1</PN_ComponentRoyal> + </costList> + <recipeMaker> + <researchPrerequisite>PNRP_TierB_Module</researchPrerequisite> + <skillRequirements> + <Crafting>6</Crafting> + </skillRequirements> + </recipeMaker> + <apparel> + <tags> + + </tags> + </apparel> + <comps> + <li Class="CompProperties_CauseHediff_Apparel"> + <hediff>PN_NurseModuleHediff</hediff> + <part>PNTorso</part> + </li> + </comps> + </ThingDef> + + <HediffDef ParentName="PN_ApparelIndustrialModuleHediffBase"> + <defName>PN_NurseModuleHediff</defName> + <label>nurse module</label> + <description>The hediff created by installing nurse module.</description> + <descriptionHyperlinks> + <ThingDef>PN_NurseModule</ThingDef> + </descriptionHyperlinks> + <stages> + <li> + <statFactors> + <PlantWorkSpeed>0.70</PlantWorkSpeed> + <MedicalTendSpeed>1.20</MedicalTendSpeed> + <MedicalOperationSpeed>1.00</MedicalOperationSpeed> + <ButcheryFleshSpeed>0.70</ButcheryFleshSpeed> + <CookSpeed>0.70</CookSpeed> + </statFactors> + </li> + </stages> + <comps> + + </comps> + </HediffDef> </Defs> \ 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 c86d08f..4da2ce0 100644 --- a/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml +++ b/Ideology/Defs/ThingDefs/Ideo_ThingDef_Module_Spacer.xml @@ -36,10 +36,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelSpacerModuleHediffBase"> <defName>PN_OfficerModuleHediff</defName> <label>officer module</label> - <description>...</description> + <description>The hediff created by installing officer module.</description> + <descriptionHyperlinks> + <ThingDef>PN_OfficerModule</ThingDef> + </descriptionHyperlinks> <stages> </stages> @@ -89,10 +92,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelSpacerModuleHediffBase"> <defName>PN_MeisterModuleHediff</defName> <label>meister module</label> - <description>...</description> + <description>The hediff created by installing meister module.</description> + <descriptionHyperlinks> + <ThingDef>PN_MeisterModule</ThingDef> + </descriptionHyperlinks> <stages> </stages> @@ -100,6 +106,10 @@ <li Class="HediffCompProperties_GiveAbility"> <abilityDef>PN_MeisterAdviceAbility</abilityDef> </li> + <li Class="HediffCompProperties_ReactOnDamage"> + <damageDefIncoming>EMP</damageDefIncoming> + <createHediff>PN_EMPShock</createHediff> + </li> </comps> </HediffDef> @@ -109,8 +119,8 @@ <label>intensive medical module</label> <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nDomestic model (legd)\n\nThis module allows automaton to use intensive medical mode ability.\nAnd if automaton activates intensive medical mode, immunity drive ability can be used.</description> <descriptionHyperlinks> - <AbilityDef>PN_IntensiveMedicalAbility</AbilityDef> - <AbilityDef>PN_ImmunityDriveAbility</AbilityDef> + <AbilityDef>PN_IntensiveMedicalAbility</AbilityDef> + <AbilityDef>PN_ImmunityDriveAbility</AbilityDef> </descriptionHyperlinks> <statBases> <WorkToMake>75000</WorkToMake> @@ -139,10 +149,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelSpacerModuleHediffBase"> <defName>PN_IntensiveMedicalModuleHediff</defName> <label>intensive medical module</label> - <description>...</description> + <description>The hediff created by installing intensive medical module.</description> + <descriptionHyperlinks> + <ThingDef>PN_IntensiveMedicalModule</ThingDef> + </descriptionHyperlinks> <stages> </stages> @@ -190,10 +203,13 @@ </comps> </ThingDef> - <HediffDef ParentName="PN_ApparelModuleHediffBase"> + <HediffDef ParentName="PN_ApparelSpacerModuleHediffBase"> <defName>PN_FieldMedicModuleHediff</defName> - <label>intensive medical module</label> - <description>...</description> + <label>field medical module</label> + <description>The hediff created by installing intensive field medical module.</description> + <descriptionHyperlinks> + <ThingDef>PN_FieldMedicModule</ThingDef> + </descriptionHyperlinks> <stages> </stages>