diff --git a/1.4/Assemblies/ProjectJedi.dll b/1.4/Assemblies/ProjectJedi.dll new file mode 100644 index 0000000..562dc3c Binary files /dev/null and b/1.4/Assemblies/ProjectJedi.dll differ diff --git a/1.4/Defs/AbilityAIDefs/AbilityUserAI_StarWars.xml b/1.4/Defs/AbilityAIDefs/AbilityUserAI_StarWars.xml new file mode 100644 index 0000000..6bc1204 --- /dev/null +++ b/1.4/Defs/AbilityAIDefs/AbilityUserAI_StarWars.xml @@ -0,0 +1,737 @@ + + + + + ProjectJedi.CompForceUser + + +
  • StarWars_ForcePull_Lv1
    • +
  • StarWars_ForcePull_Lv2
    • +
  • StarWars_ForcePull_Lv3
    • +
  • StarWars_ForcePush_Lv1
    • +
  • StarWars_ForcePush_Lv2
    • +
  • StarWars_ForcePush_Lv3
    • +
  • StarWars_ForceSpeed_Lv1
    • +
  • StarWars_ForceSpeed_Lv2
    • +
  • StarWars_ForceSpeed_Lv3
    • +     + + + + +
  • + + +
  • + 0.8 + +
  • + +
  • Heal
    • +
  • Self
    • + + +     + + +
  • + +
  • Heal
    • +
  • Ally
    • + + +
  • + + +
  • + +
  • + 12.0 + +
  • + +
  • Disarm
    • + + + + + + + +
  • + + +
  • + 16.0 + +
  • + +
  • GapBuilder
    • + + + + + +
  • + 60.0 + +
  • + +
  • GapCloser
    • +
  • Self
    • + + + + +
  • + 20.0 + + +
  • + +
  • Defensive
    • + + +
  • GapCloser
    • +     + + + +
  • + 50.0 + + +
  • + +
  • Offensive
    • + + +
  • GapCloser
    • +     + + + + + + +
  • + false + + +
  • + 6.0 + +
  • + +
  • GapCloser
    • +
  • Self
    • + + + + + +
  • + +
  • Offensive
    • + + + +
  • + +
  • Defensive
    • + + + + + + + + + +
  • + true + + +
  • + 0.99 + +
  • + +
  • Heal
    • +
  • Self
    • + + + + + +
  • + +
  • Heal
    • +
  • Ally
    • + + +
  • Offensive
    • +     + + + + +     +     + + + StarWars_Gray + +
  • PJ_GrayTrait
    • +
  • PJ_ForceSensitive
    • +     +     + + + StarWars_Sith + +
  • PJ_SithTrait
    • +     + +
  • StarWars_ForceRage_Lv1
    • +
  • StarWars_ForceRage_Lv2
    • +
  • StarWars_ForceRage_Lv3
    • +
  • StarWars_ForceChoke_Lv1
    • +
  • StarWars_ForceChoke_Lv2
    • +
  • StarWars_ForceChoke_Lv3
    • +
  • StarWars_ForceDrain_Lv1
    • +
  • StarWars_ForceDrain_Lv2
    • +
  • StarWars_ForceDrain_Lv3
    • +
  • StarWars_ForceLightning_Lv1
    • +
  • StarWars_ForceLightning_Lv2
    • +
  • StarWars_ForceLightning_Lv3
    • +
  • StarWars_ForceStorm_Lv1
    • +
  • StarWars_ForceStorm_Lv2
    • +
  • StarWars_ForceStorm_Lv3
    • +     +     + + + StarWars_Jedi + +
  • PJ_JediTrait
    • +     + +
  • StarWars_ForceHealingSelf_Lv1
    • +
  • StarWars_ForceHealingSelf_Lv2
    • +
  • StarWars_ForceHealingSelf_Lv3
    • +
  • StarWars_ForceHealingOther_Lv1
    • +
  • StarWars_ForceHealingOther_Lv2
    • +
  • StarWars_ForceHealingOther_Lv3
    • +
  • StarWars_ForceDefense_Lv1
    • +
  • StarWars_ForceDefense_Lv2
    • +
  • StarWars_ForceDefense_Lv3
    • +
  • StarWars_MindTrick_Lv1
    • +
  • StarWars_MindTrick_Lv2
    • +
  • StarWars_MindTrick_Lv3
    • +
  • StarWars_ForceGhost_Lv1
    • +
  • StarWars_ForceGhost_Lv2
    • +
  • StarWars_ForceGhost_Lv3
    • +     +     + + + + 60.0 + +
  • Force
    • +     +     + + + + StarWars_ForcePull_Lv1 + PJ_ForcePull_Apprentice + 1.0 + false + +
  • Offensive
    • +
  • GapCloser
    • +
  • Utility
    • +
  • Single
    • +     +     + + StarWars_ForcePull_Lv2 + PJ_ForcePull_Adept + 2.0 + false + +
  • Offensive
    • +
  • GapCloser
    • +
  • Utility
    • +
  • Single
    • +     +     + + StarWars_ForcePull_Lv3 + PJ_ForcePull_Master + 3.0 + false + +
  • Offensive
    • +
  • GapCloser
    • +
  • Utility
    • +
  • Single
    • +
  • Disarm
    • +     +     + + + StarWars_ForcePush_Lv1 + PJ_ForcePush_Apprentice + 1.0 + +
  • Defensive
    • +
  • GapBuilder
    • +
  • Utility
    • +
  • Single
    • +     +     + + StarWars_ForcePush_Lv2 + PJ_ForcePush_Adept + 2.0 + +
  • Defensive
    • +
  • GapBuilder
    • +
  • Utility
    • +
  • Single
    • +     +     + + StarWars_ForcePush_Lv3 + PJ_ForcePush_Master + 3.0 + +
  • Defensive
    • +
  • GapBuilder
    • +
  • Utility
    • +
  • Single
    • +     +     + + + StarWars_ForceSpeed_Lv1 + PJ_ForceSpeed_Apprentice + 10.0 + 9999.0 + 8.0 + false + true + +
  • GapCloser
    • +
  • Utility
    • +
  • Self
    • +     + + +
  • PJ_ForceSpeedHediff_One
    • +
  • PJ_ForceSpeedHediff_Two
    • +
  • PJ_ForceSpeedHediff_Three
    • +     +     + + StarWars_ForceSpeed_Lv2 + PJ_ForceSpeed_Adept + 10.0 + 9999.0 + 10.0 + false + true + +
  • GapCloser
    • +
  • Utility
    • +
  • Self
    • +     + +
  • PJ_ForceSpeedHediff_One
    • +
  • PJ_ForceSpeedHediff_Two
    • +
  • PJ_ForceSpeedHediff_Three
    • +     +     + + StarWars_ForceSpeed_Lv3 + PJ_ForceSpeed_Master + 10.0 + 9999.0 + 12.0 + false + true + +
  • GapCloser
    • +
  • Utility
    • +
  • Self
    • +     + +
  • PJ_ForceSpeedHediff_One
    • +
  • PJ_ForceSpeedHediff_Two
    • +
  • PJ_ForceSpeedHediff_Three
    • +     +     + + + + StarWars_ForceRage_Lv1 + PJ_ForceRage_Apprentice + 10.0 + 1.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceRage_Lv2 + PJ_ForceRage_Adept + 10.0 + 2.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceRage_Lv3 + PJ_ForceRage_Master + 10.0 + 3.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     + + + StarWars_ForceChoke_Lv1 + PJ_ForceChoke_Apprentice + 4.0 + true + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + StarWars_ForceChoke_Lv2 + PJ_ForceChoke_Adept + 5.0 + true + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + StarWars_ForceChoke_Lv3 + PJ_ForceChoke_Master + 6.0 + true + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + + StarWars_ForceDrain_Lv1 + PJ_ForceDrain_Apprentice + 7.0 + false + +
  • Offensive
    • +
  • Heal
    • +
  • Self
    • +
  • Single
    • +     +     + + StarWars_ForceDrain_Lv2 + PJ_ForceDrain_Adept + 8.0 + false + +
  • Offensive
    • +
  • Heal
    • +
  • Self
    • +
  • Single
    • +     +     + + StarWars_ForceDrain_Lv3 + PJ_ForceDrain_Master + 9.0 + false + +
  • Offensive
    • +
  • Heal
    • +
  • Self
    • +
  • Single
    • +     +     + + + StarWars_ForceLightning_Lv1 + PJ_ForceLightning_Apprentice + 10.0 + true + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceLightning_Lv2 + PJ_ForceLightning_Adept + 11.0 + true + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceLightning_Lv3 + PJ_ForceLightning_Master + 12.0 + true + +
  • Offensive
    • +
  • Single
    • +     +     + + + StarWars_ForceStorm_Lv1 + PJ_ForceStorm_Apprentice + 10.0 + 10 + AbilityUserAI.AbilityWorker_AreaOfEffect + 2.5 + true + +
  • Offensive
    • +
  • Mass
    • +     +     + + StarWars_ForceStorm_Lv2 + PJ_ForceStorm_Adept + 10.0 + 10 + AbilityUserAI.AbilityWorker_AreaOfEffect + 4.5 + true + +
  • Offensive
    • +
  • Mass
    • +     +     + + StarWars_ForceStorm_Lv3 + PJ_ForceStorm_Master + 10.0 + 10 + AbilityUserAI.AbilityWorker_AreaOfEffect + 6.5 + true + +
  • Offensive
    • +
  • Mass
    • +     +     + + + + StarWars_ForceHealingSelf_Lv1 + PJ_ForceHealingSelf_Apprentice + true + 1.0 + +
  • Heal
    • +
  • Self
    • +     +     + + StarWars_ForceHealingSelf_Lv2 + PJ_ForceHealingSelf_Adept + true + 2.0 + +
  • Heal
    • +
  • Self
    • +     +     + + StarWars_ForceHealingSelf_Lv3 + PJ_ForceHealingSelf_Master + true + 3.0 + +
  • Heal
    • +
  • Self
    • +     +     + + + StarWars_ForceHealingOther_Lv1 + PJ_ForceHealingOther_Apprentice + AbilityUserAI.AbilityWorker_HealAlly + 16.0 + true + false + 1.0 + false + +
  • Heal
    • +
  • Ally
    • +     +     + + StarWars_ForceHealingOther_Lv2 + PJ_ForceHealingOther_Adept + AbilityUserAI.AbilityWorker_HealAlly + 16.0 + true + false + 2.0 + false + +
  • Heal
    • +
  • Ally
    • +     +     + + StarWars_ForceHealingOther_Lv3 + PJ_ForceHealingOther_Master + AbilityUserAI.AbilityWorker_HealAlly + 16.0 + true + false + 3.0 + false + +
  • Heal
    • +
  • Ally
    • +     +     + + + StarWars_ForceDefense_Lv1 + PJ_ForceDefense_Apprentice + true + 4.0 + +
  • Defensive
    • +
  • Self
    • +     + +
  • PJ_ForceDefenseHediff
    • +     +     + + StarWars_ForceDefense_Lv2 + PJ_ForceDefense_Adept + true + 5.0 + +
  • Defensive
    • +
  • Self
    • +     + +
  • PJ_ForceDefenseHediff
    • +     +     + + StarWars_ForceDefense_Lv3 + PJ_ForceDefense_Master + true + 6.0 + +
  • Defensive
    • +
  • Self
    • +     + +
  • PJ_ForceDefenseHediff
    • +     +     + + + StarWars_MindTrick_Lv1 + PJ_MindTrick_Apprentice + 34.0 + 1.0 + false + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + StarWars_MindTrick_Lv2 + PJ_MindTrick_Adept + 44.0 + 1.0 + false + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + StarWars_MindTrick_Lv3 + PJ_MindTrick_Master + 50.0 + 1.0 + false + +
  • Offensive
    • +
  • Defensive
    • +
  • Single
    • +     +     + + + StarWars_ForceGhost_Lv1 + PJ_ForceGhost_Apprentice + 20.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceGhost_Lv2 + PJ_ForceGhost_Adept + 30.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     + + StarWars_ForceGhost_Lv3 + PJ_ForceGhost_Master + 40.0 + false + +
  • Offensive
    • +
  • Single
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/AbilityDefs/Abilities_Base b/1.4/Defs/AbilityDefs/Abilities_Base new file mode 100644 index 0000000..4fdfa5f --- /dev/null +++ b/1.4/Defs/AbilityDefs/Abilities_Base @@ -0,0 +1,38 @@ + + + + + + + Projectile + Normal + Projectile + Bullet + + False + True + + Transparent + + + + + + + + None + UI/Glow_Corrupt + ThingWithComps + 0 + False + False + Normal + +
  • + CompEquippable +
    • +     + +     + +     \ No newline at end of file diff --git a/1.4/Defs/AbilityDefs/Abilities_Base.xml b/1.4/Defs/AbilityDefs/Abilities_Base.xml new file mode 100644 index 0000000..7b887f6 --- /dev/null +++ b/1.4/Defs/AbilityDefs/Abilities_Base.xml @@ -0,0 +1,7 @@ + + + + ProjectJedi.ForceAbility + UI/Glow_Corrupt + + \ No newline at end of file diff --git a/1.4/Defs/AbilityDefs/PJ_ForcePowers_Dark.xml b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Dark.xml new file mode 100644 index 0000000..27ae0f1 --- /dev/null +++ b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Dark.xml @@ -0,0 +1,703 @@ + + + + + + + + + + AbilityUser.Projectile_AbilityLaser + PForceRage + + + Weapons/Projectiles/ForceDrain + Graphic_Single + + + true + EMP + 0 + 999 + + 0 + 10 + 10 + 0 + 22 + 45 + 0.100 + + + + PJ_ForceRage_Apprentice + + UI/ForceUser/ForceRage + Enrage an enemy using the Dark Side of the force, causing them to attack anything they see in a blind fury.\n\n(Star Wars - The Force) + + 0.22 + Dark + -0.015 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PForceRage + PJ_ForceRage_Apprentice + 1 + 60.0 + 34 + false + 1 + 2 + PJ_RageSound + 20 + false + true + +
  • + Berserk + 0.7 +
    • +     +     +     + + + PJ_ForceRage_Adept + + UI/ForceUser/ForceRage + Enrage an enemy using the Dark Side of the force, causing them to attack anything they see in a blind fury.\n\n(Star Wars - The Force) + + 0.18 + Dark + Dark + -0.05 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PForceRage + PJ_ForceRage_Adept + 1 + 20.0 + 44 + false + 1 + 2 + PJ_RageSound + 20 + false + true + +
  • + Berserk + 0.85 +
    • +     +     +     + + + PJ_ForceRage_Master + + UI/ForceUser/ForceRage + Enrage an enemy using the Dark Side of the force, causing them to attack anything they see in a blind fury.\n\n(Star Wars - The Force) + + 0.05 + Dark + Dark + -0.2 + 3 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PForceRage + PJ_ForceRage_Master + 1 + 10.0 + 50 + 1 + 2 + PJ_RageSound + 20 + false + true + +
  • + Berserk + 0.95 +
    • +     +     +     + + + AbilityUser.Projectile_Ability + PForceChoke + + + Weapons/Projectiles/ChokeP + Graphic_Single + TransparentPostLight + + + false + PJ_FChoke + 5 + 999 + + + + AbilityUser.Projectile_Ability + PForceChokeTwo + + + Weapons/Projectiles/ChokeP + Graphic_Single + TransparentPostLight + + + false + PJ_FChoke + 10 + 999 + + + + AbilityUser.Projectile_Ability + PForceChokeThree + + + Weapons/Projectiles/ChokeP + Graphic_Single + TransparentPostLight + + + false + PJ_FChoke + 15 + 999 + + + + + PJ_ForceChoke_Apprentice + + UI/ForceUser/ForceChoke + Choke the life from your enemies.\n\n(Star Wars - The Force) + + 0.20 + Dark + -0.05 + + AbilityUser.Verb_UseAbility_TrueBurst + true + true + true + false + true + PForceChoke + PJ_ForceChoke_Apprentice + 1 + 10 + 34 + PJ_ChokeSound + 20 + false + true + +
  • + 10 + Stun + 1.0 +
    • +     +     +     + + + PJ_ForceChoke_Adept + + UI/ForceUser/ForceChoke + Choke the life from your enemies.\n\n(Star Wars - The Force) + + 0.18 + Dark + Dark + -0.1 + 2 + + AbilityUser.Verb_UseAbility_TrueBurst + true + true + true + false + true + PForceChokeTwo + PJ_ForceChoke_Adept + 1 + 8 + 34 + 1 + 20 + PJ_ChokeSound + 20 + false + true + +
  • + 15 + Stun + 1.0 +
    • +     +     +     + + + PJ_ForceChoke_Master + + UI/ForceUser/ForceChoke + Choke the life from your enemies.\n\n(Star Wars - The Force) + + 0.15 + Dark + Dark + -0.15 + 3 + + AbilityUser.Verb_UseAbility_TrueBurst + true + true + true + false + true + PForceChokeThree + PJ_ForceChoke_Master + 1 + 4.5 + 34 + 1 + 20 + PJ_ChokeSound + 20 + false + true + +
  • + 25 + Stun + 1.0 +
    • +     +     +     + + + AbilityUser.Projectile_AbilityLaser + PJ_PForceDrain + + + Weapons/Projectiles/ForceDrain + Graphic_Single + + + false + PJ_FDrainDamage + 2 + 999 + + 0 + 20 + 20 + 0 + 10 + 83 + 0.000 + + + + PJ_ForceDrain_Apprentice + + UI/ForceUser/DrainMinor + Drain another entity of lifeforce.\n\n(Star Wars - The Force) + + 0.30 + Dark + -0.05 + + AbilityUser.Verb_UseAbility + true + false + false + false + true + PJ_PForceDrain + PJ_ForceDrain_Apprentice + 1 + 80.0 + 24 + 1 + 2 + Message_PositiveEvent + 20 + false + true + + + + + PJ_ForceDrain_Adept + + UI/ForceUser/DrainMinor + Drain another entity of lifeforce.\n\n(Star Wars - The Force) + + 0.28 + Dark + Dark + -0.15 + 2 + + AbilityUser.Verb_UseAbility + true + false + false + false + true + PJ_PForceDrain + PJ_ForceDrain_Adept + 1 + 50.0 + 24 + 1 + 2 + Message_PositiveEvent + 20 + false + true + + + + + PJ_ForceDrain_Master + + UI/ForceUser/DrainMinor + Drain another entity of lifeforce.\n\n(Star Wars - The Force) + + 0.25 + Dark + Dark + -0.25 + 3 + + AbilityUser.Verb_UseAbility + true + false + false + false + true + PJ_PForceDrain + PJ_ForceDrain_Master + 1 + 20.0 + 24 + 1 + 2 + Message_PositiveEvent + 20 + false + true + + + + + AbilityUser.Projectile_AbilityLaser + PForceLightningProj + + + Weapons/Projectiles/ForceLightningX + Graphic_Single + + + false + PJ_FLightning + 22 + 999 + + 0 + 20 + 20 + 0 + 12 + 75 + 0.100 + + + + PJ_ForceLightning_Apprentice + + UI/ForceUser/ForceLightning + Lash out with pure dark side energy.\n\n(Star Wars - The Force) + + 0.16 + Dark + -0.05 + + AbilityUser.Verb_UseAbility_TrueBurst + true + false + false + false + true + PForceLightningProj + PJ_ForceLightning_Apprentice + 1 + 15 + 34 + true + 1 + 2 + PJ_LightningSound + 20 + false + true + + + + + PJ_ForceLightning_Adept + + UI/ForceUser/ForceLightning + Lash out with pure dark side energy.\n\n(Star Wars - The Force) + + 0.13 + Dark + Dark + -0.15 + 2 + + AbilityUser.Verb_UseAbility_TrueBurst + true + false + false + false + true + PForceLightningProj + PJ_ForceLightning_Adept + 1 + 10 + 34 + true + 2 + 2 + PJ_LightningSound + 20 + false + true + + + + + PJ_ForceLightning_Master + + UI/ForceUser/ForceLightning + Lash out with pure dark side energy.\n\n(Star Wars - The Force) + + 0.10 + Dark + Dark + -0.25 + 3 + + AbilityUser.Verb_UseAbility_TrueBurst + true + false + false + false + true + PForceLightningProj + PJ_ForceLightning_Master + 1 + 6.5 + 34 + true + 3 + 2 + PJ_LightningSound + 20 + false + true + + + + + ProjectJedi.Projectile_ForceStorm + PJ_PForceStormProj + + + Weapons/Projectiles/Storm + Graphic_Single + TransparentPostLight + + + false + 7 + PJ_FStorm + 1 + 75 + 1 + + + + + PJ_ForceStorm_Apprentice + + UI/ForceUser/ForceStorm + Lash out with pure dark side energy at an area, causing great damage.\n\n(Star Wars - The Force) + + 0.26 + Dark + Dark + -0.07 + 1 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceStormProj + PJ_ForceStorm_Apprentice + 1 + 60 + 44 + true + PJ_LightningSound + 20 + TargetAoE + + Pawn + true + true + false + 2 + 10 + + 1 + false + + true + false + true + true + + + + + + PJ_ForceStorm_Adept + + UI/ForceUser/ForceStorm + Lash out with pure dark side energy at an area, causing great damage.\n\n(Star Wars - The Force) + + 0.22 + Dark + Dark + -0.19 + 2 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceStormProj + PJ_ForceStorm_Adept + 1 + 50 + 44 + true + PJ_LightningSound + 20 + false + TargetAoE + + Pawn + false + true + true + 3 + 10 + + 1 + + true + false + false + true + + + + + + PJ_ForceStorm_Master + + UI/ForceUser/ForceStorm + Lash out with pure dark side energy at an area, causing great damage.\n\n(Star Wars - The Force) + + 0.18 + Dark + Dark + -0.3 + 5 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceStormProj + PJ_ForceStorm_Master + 1 + 30 + 44 + true + PJ_LightningSound + 20 + TargetAoE + + Pawn + true + false + true + 5 + 10 + + 1 + false + + true + false + false + true + + + +     \ No newline at end of file diff --git a/1.4/Defs/AbilityDefs/PJ_ForcePowers_Gray.xml b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Gray.xml new file mode 100644 index 0000000..fba718f --- /dev/null +++ b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Gray.xml @@ -0,0 +1,473 @@ + + + + + + + + + + PJ_PFlyingObject + ProjectJedi.FlyingObject + + + UI/ForceUser/ForcePull + Graphic_Single + + + true + Stun + 0 + 10 + + + + PJ_PFlyingObject_Equipable + ProjectJedi.FlyingObject_Equipable + + + UI/ForceUser/ForcePull + Graphic_Single + + + true + Stun + 0 + 10 + + + + PJ_PForcePull + AbilityUser.Projectile_Ability + + + UI/ForceUser/ForcePull + Graphic_Single + + + true + Stun + 0 + 9999 + + + + + PJ_ForcePull_Apprentice + + UI/ForceUser/ForcePull + Level 1: Pulls ground objects (not people or animals) towards the caster.\n\n(Star Wars - The Force) + + 0.35 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePull + PJ_ForcePull_Apprentice + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PullSound + 20 + false + true + +
  • + 1 + PJ_DForcePull + 1.0 +
    • +     + + false + false + true + false + false + +     +     + + + PJ_ForcePull_Adept + + UI/ForceUser/ForcePull + Level 1: Pulls ground objects (not people or animals) towards the caster.\nLevel 2: Pulls and equips weapons and apparel automatically.\n\n(Star Wars - The Force) + + 0.28 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePull + PJ_ForcePull_Adept + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PullSound + 20 + false + true + +
  • + 2 + PJ_DForcePull + 1.0 +
    • +     + + false + false + true + false + false + +     +     + + + PJ_ForcePull_Master + + UI/ForceUser/ForcePull + Level 1: Pulls ground objects (not people or animals) towards the caster.\nLevel 2: Pulls and equips weapons and apparel automatically.\nLevel 3: Can now pull weapons out of the hands of others. If unarmed, force pull now pulls people or animals towards the force wielder.\n\n(Star Wars - The Force) + + 0.2 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePull + PJ_ForcePull_Master + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PullSound + 20 + false + true + +
  • + 3 + PJ_DForcePull + 1.0 +
    • +     + + true + false + true + false + false + +     +     + + + PJ_PForcePush + AbilityUser.Projectile_Ability + + + UI/ForceUser/ForcePush + Graphic_Single + + + true + Stun + 0 + 9999 + + 0.1 + + + + PJ_ForcePush_Apprentice + + UI/ForceUser/ForcePush + Level 1: Pushes characters away by 8 tiles.\n\n(Star Wars - The Force) + + 0.35 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePush + PJ_ForcePush_Apprentice + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PushSound + 20 + false + true + +
  • + 1 + PJ_DForcePush + 1.0 +
    • +     + + true + false + false + false + +     +     + + + PJ_ForcePush_Adept + + UI/ForceUser/ForcePush + Level 1: Pushes characters away by 8 tiles.\nLevel 2: Pushes 10 tiles and stuns the target.\n\n(Star Wars - The Force) + + 0.25 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePush + PJ_ForcePush_Adept + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PushSound + 20 + false + true + +
  • + 2 + PJ_DForcePush + 1.0 +
    • +
  • + 20 + Stun + 1.0 +
    • +     + + true + false + false + false + +     +     + + + PJ_ForcePush_Master + + UI/ForceUser/ForcePush + Level 1: Pushes characters away by 8 tiles.\nLevel 2: Pushes 10 tiles and stuns the target.\nLevel 3: Pushes 12 tiles, stuns the target, and adds impact damage against walls.\n\n(Star Wars - The Force) + + 0.15 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForcePush + PJ_ForcePush_Master + false + 1 + 5.0 + 24 + 1 + 2 + PJ_PushSound + 20 + false + true + +
  • + 3 + PJ_DForcePush + 1.0 +
    • +
  • + 20 + Stun + 1.0 +
    • +     + + true + false + false + false + +     +     + + + PJ_PForceSpeed + AbilityUser.Projectile_Ability + + + UI/ForceUser/ForceSpeed + Graphic_Single + + + true + Stun + 1 + 99999 + + 0.1 + + + + PJ_ForceSpeed_Apprentice + + UI/ForceUser/ForceSpeed + Increases the running speed of the caster for a short time.\n\n(Star Wars - The Force) + + 0.35 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceSpeed + PJ_ForceSpeed_Apprentice + 1 + 10.0 + 24 + 1 + 2 + PJ_SpeedSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceSpeedHediff_One + 1.0 +
    • +     +     +     + + + PJ_ForceSpeed_Adept + + UI/ForceUser/ForceSpeed + Increases the running speed of the caster for a short time.\n\n(Star Wars - The Force) + + 0.25 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceSpeed + PJ_ForceSpeed_Adept + 1 + 15.0 + 24 + 1 + 2 + PJ_SpeedSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceSpeedHediff_Two + 1.0 +
    • +     +     +     + + + PJ_ForceSpeed_Master + + UI/ForceUser/ForceSpeed + Increases the running speed of the caster for a short time.\n\n(Star Wars - The Force) + + 0.15 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_PForceSpeed + PJ_ForceSpeed_Master + 1 + 30.0 + 24 + 1 + 2 + PJ_SpeedSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceSpeedHediff_Three + 1.0 +
    • +     +     +     +     \ No newline at end of file diff --git a/1.4/Defs/AbilityDefs/PJ_ForcePowers_Light.xml b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Light.xml new file mode 100644 index 0000000..7ecbc40 --- /dev/null +++ b/1.4/Defs/AbilityDefs/PJ_ForcePowers_Light.xml @@ -0,0 +1,664 @@ + + + + + + + + + + PJ_PForceHeal + AbilityUser.Projectile_Ability + + + UI/ForceUser/HealMinor + Graphic_Single + + + true + PJ_ForceHealDamage + 100 + 10 + + 0.1 + + + + PJ_ForceHealingSelf_Apprentice + + UI/ForceUser/HealMinor + Miraculously heal the caster.\n\n(Star Wars - The Force) + + 0.35 + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingSelf_Apprentice + false + PJ_PForceHeal + 1 + 120.0 + 2 + Message_PositiveEvent + 20 + false + true + TargetSelf + false + + false + false + true + + + + + + PJ_ForceHealingSelf_Adept + + UI/ForceUser/HealMinor + Miraculously heal the caster.\n\n(Star Wars - The Force) + + 0.27 + Light + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingSelf_Adept + false + PJ_PForceHeal + 1 + 60.0 + 2 + Message_PositiveEvent + 20 + false + true + false + TargetSelf + + false + false + true + + + + + + PJ_ForceHealingSelf_Master + + UI/ForceUser/HealMinor + Miraculously heal the caster.\n\n(Star Wars - The Force) + + 0.20 + Light + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingSelf_Master + false + PJ_PForceHeal + 1 + 30.0 + 2 + Message_PositiveEvent + 20 + false + false + true + TargetSelf + + false + false + true + + + + + + PJ_ForceHealingOther_Apprentice + + UI/ForceUser/HealOther + Miraculously heals the target.\n\n(Star Wars - The Force) + + 0.38 + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingOther_Apprentice + false + PJ_PForceHeal + 1 + 120.0 + 16 + Message_PositiveEvent + 20 + false + true + + true + false + true + + + + + + PJ_ForceHealingOther_Adept + + UI/ForceUser/HealOther + Miraculously heals the target.\n\n(Star Wars - The Force) + + 0.28 + Light + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingOther_Adept + false + PJ_PForceHeal + 1 + 90.0 + 16 + Message_PositiveEvent + 20 + false + true + + true + false + true + + + + + + PJ_ForceHealingOther_Master + + UI/ForceUser/HealOther + Miraculously heals the target.\n\n(Star Wars - The Force) + + 0.20 + Light + Light + 0.10 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceHealingOther_Master + false + PJ_PForceHeal + 1 + 60.0 + 16 + Message_PositiveEvent + 20 + false + true + + true + false + true + + + + + + PJ_PForceDefense + AbilityUser.Projectile_Ability + + + UI/ForceUser/ForceDefense + Graphic_Single + + + true + PJ_ForceHealDamage + 100 + 10 + + 0.1 + + + + PJ_ForceDefense_Apprentice + + UI/ForceUser/ForceDefense + Protects the caster from harm for a short time.\n\n(Star Wars - The Force) + + 0.35 + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceDefense_Apprentice + false + PJ_PForceDefense + 1 + 85.0 + 2 + PJ_DefSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceDefenseHediff + 1.0 + 0.3 +
    • +     +     +     + + + PJ_ForceDefense_Adept + + UI/ForceUser/ForceDefense + Protects the caster from harm for a short time.\n\n(Star Wars - The Force) + + 0.25 + Light + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceDefense_Adept + false + PJ_PForceDefense + 1 + 55.0 + 2 + PJ_DefSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceDefenseHediff + 1.0 + 0.6 +
    • +     +     +     + + + PJ_ForceDefense_Master + + UI/ForceUser/ForceDefense + Protects the caster from harm for a short time.\n\n(Star Wars - The Force) + + 0.15 + Light + Light + 0.05 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PJ_ForceDefense_Master + false + PJ_PForceDefense + 1 + 35.0 + 2 + PJ_DefSound + 20 + false + true + TargetSelf + + false + false + true + + +
  • + PJ_ForceDefenseHediff + 1.0 + 1.0 +
    • +     +     +     + + + AbilityUser.Projectile_Ability + PMindTrick + + + UI/ForceUser/MindTrick + Graphic_Single + + + false + Stun + 1 + 105 + + + + + PJ_MindTrick_Apprentice + + UI/ForceUser/MindTrick + Use the force to influence the weak minded, causing them to wander aimlessly.\n\n(Star Wars - The Force) + + 0.25 + Light + 0.025 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PMindTrick + PJ_MindTrick_Apprentice + 1 + 70.0 + 34 + Message_PositiveEvent + 20 + false + false + true + +
  • + WanderConfused + 0.7 +
    • +     +     +     + + + PJ_MindTrick_Adept + + UI/ForceUser/MindTrick + Use the force to influence the weak minded, causing them to wander aimlessly.\n\n(Star Wars - The Force) + + 0.20 + Light + Light + 0.025 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PMindTrick + PJ_MindTrick_Adept + 1 + 50.0 + 44 + Message_PositiveEvent + 20 + false + false + true + +
  • + WanderConfused + 0.85 +
    • +     +     +     + + + PJ_MindTrick_Master + + UI/ForceUser/MindTrick + Use the force to influence the weak minded, causing them to wander aimlessly.\n\n(Star Wars - The Force) + + 0.15 + Light + Light + 0.025 + + AbilityUser.Verb_UseAbility + false + false + true + true + true + PMindTrick + PJ_MindTrick_Master + 1 + 30.0 + false + 50 + Message_PositiveEvent + 20 + false + true + +
  • + WanderConfused + 0.95 +
    • +     +     +     + + + AbilityUser.Projectile_Ability + PForceGhost + + + UI/ForceUser/ForceGhost + Graphic_Single + + + false + Stun + 1 + 105 + + + + + PJ_ForceGhost_Apprentice + + UI/ForceUser/ForceGhost + Summon a ghost of ages past to aid you for a short time.\n\n(Star Wars - The Force) + + 0.35 + 1 + Light + Light + 0.05 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PForceGhost + PJ_ForceGhost_Apprentice + 1 + 120.0 + 34 + false + Message_PositiveEvent + 20 + false + false + TargetLocation + + false + false + false + true + + +
  • + PJ_ForceGhostR + PJ_ForceGhost + 1 + true +
    • +     +     +     + + + PJ_ForceGhost_Adept + + UI/ForceUser/ForceGhost + Summon a ghost of ages past to aid you for a short time.\n\n(Star Wars - The Force) + + 0.25 + Light + Light + 0.05 + 2 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PForceGhost + PJ_ForceGhost_Adept + 1 + 120.0 + 34 + Message_PositiveEvent + 20 + false + false + false + TargetLocation + + false + false + false + true + + +
  • + PJ_ForceGhostR + PJ_ForceGhost + 1 + true +
    • +     +     +     + + + PJ_ForceGhost_Master + + UI/ForceUser/ForceGhost + Summon a ghost of ages past to aid you for a short time.\n\n(Star Wars - The Force) + + 0.15 + Light + Light + 0.05 + 5 + 9 + + AbilityUser.Verb_UseAbility + false + false + false + false + true + PForceGhost + PJ_ForceGhost_Master + 1 + 120.0 + 34 + Message_PositiveEvent + 20 + false + false + false + TargetLocation + + false + false + false + true + + +
  • + PJ_ForceGhostR + PJ_ForceGhost + 1 + true +
    • +     +     +     +     \ No newline at end of file diff --git a/1.4/Defs/DamageDefs/AbilityUser_Damages.xml b/1.4/Defs/DamageDefs/AbilityUser_Damages.xml new file mode 100644 index 0000000..ce800ac --- /dev/null +++ b/1.4/Defs/DamageDefs/AbilityUser_Damages.xml @@ -0,0 +1,20 @@ + + + + Laser + DamageWorker_AddInjury + + true + false + false + true + {0} has been shot to death. + Burn + Heat + 15 + BlastFlame + (1, 0.7, 0.7) + (1, 1, 0.7) + Explosion_Flame + + \ No newline at end of file diff --git a/1.4/Defs/DamageDefs/PJ_ForcePowerDamages.xml b/1.4/Defs/DamageDefs/PJ_ForcePowerDamages.xml new file mode 100644 index 0000000..f70d7a0 --- /dev/null +++ b/1.4/Defs/DamageDefs/PJ_ForcePowerDamages.xml @@ -0,0 +1,142 @@ + + + + PJ_ForceBurn + + a force burn wound + a force-burn wound + +
  • + bandaged + sutured + set +
    • +
  • + 0.15 +
    • +
  • + scar +
    • +     + + 0.0125 + 0.00625 + 0.015 + true + Burned + +     + + PJ_ForceHealDamage + + ProjectJedi.DamageWorker_ForceHeal + false + false + false + false + + + PJ_FDrainDamage + + ProjectJedi.DamageWorker_ForceDrain + true + {0} has succumbed to the power of the dark side. + PJ_ForceBurn + true + Heat + + + PJ_FLightning + + true + DamageWorker_AddInjury + {0} has succumbed to the power of the dark side. + PJ_ForceBurn + true + Heat + + + PJ_FStorm + + true + DamageWorker_AddInjury + {0} was caught in a force storm. + PJ_ForceBurn + true + Electric + Heat + 0 + BlastEMP + (0.8, 0.7, 1.0, 0.8) + ElectricalSpark + PJ_LightningSound + + + PJ_MindTrickDam + + false + true + DamageWorker_AddInjury + {0} has succumbed to mental force damage. + Crack + Heat + +
  • + PJ_MindTrick + 1.50 +
    • +     +     + + PJ_RageDam + + false + true + DamageWorker_AddInjury + {0} has succumbed to mental force damage. + Crack + Heat + +
  • + PJ_Rage + 1.80 +
    • +     +     + + PJ_FChoke + + ProjectJedi.DamageWorker_ForceChoke + false + {0} has succumbed to the power of the dark side. + PJ_ChokeCrush + true + Heat + +
  • + PJ_NoAir + 0.08 +
    • +     +     + + + PJ_DForcePull + + ProjectJedi.DamageWorker_ForcePull + false + false + true + Heat + + + + PJ_DForcePush + + ProjectJedi.DamageWorker_ForcePush + false + true + false + Heat + +     \ No newline at end of file diff --git a/1.4/Defs/FactionDefs/Factions_Hidden.xml b/1.4/Defs/FactionDefs/Factions_Hidden.xml new file mode 100644 index 0000000..657145a --- /dev/null +++ b/1.4/Defs/FactionDefs/Factions_Hidden.xml @@ -0,0 +1,119 @@ + + + + + Former jedi masters who have become one with the force, yet retained their persona.\n\n(Star Wars - The Force) + Force ghosts + 1 + Force ghosts + Ultra + +
  • Outlander
    • +     + true + false + false + + +
  • (35, 15)
    • +
  • (100, 120)
    • +
  • (1000, 500)
    • +
  • (2000, 800)
    • +
  • (4000, 1000)
    • +     +     +     + + PJ_GhostFaction + + +     \ No newline at end of file diff --git a/1.4/Defs/ForceGhost_Test/GhostLifestages.xml b/1.4/Defs/ForceGhost_Test/GhostLifestages.xml new file mode 100644 index 0000000..8a6b338 --- /dev/null +++ b/1.4/Defs/ForceGhost_Test/GhostLifestages.xml @@ -0,0 +1,8 @@ + + + + PJ_FGhostLifestage + + false + + \ No newline at end of file diff --git a/1.4/Defs/ForceGhost_Test/PJ_WeaponGhost.xml b/1.4/Defs/ForceGhost_Test/PJ_WeaponGhost.xml new file mode 100644 index 0000000..7cb5ce0 --- /dev/null +++ b/1.4/Defs/ForceGhost_Test/PJ_WeaponGhost.xml @@ -0,0 +1,58 @@ + + + + + PJ_MeleeWeapon_ForceGladius + + An ethereal short sword of ancient design. Good for stabbing or slashing.\n\n(Star Wars - The Force) + + Things/Item/Equipment/WeaponMelee/Gladius + Graphic_Single + + Medieval + 50 + +
  • PJ_GhostGlad
    • +     + + 10000 + 0.85 + + None + true + -65 + +
  • Metallic
    • +
  • Woody
    • +     + +
  • + + +
  • Blunt
    • + + 6 + 1.95 + +
  • + + +
  • Stab
    • + + 12 + 1.95 + +
  • + + +
  • Cut
    • + + 14.5 + 1.95 + +     + + Smithing + +     +     \ No newline at end of file diff --git a/1.4/Defs/ForceGhost_Test/Races_FGhost.xml b/1.4/Defs/ForceGhost_Test/Races_FGhost.xml new file mode 100644 index 0000000..42a0b12 --- /dev/null +++ b/1.4/Defs/ForceGhost_Test/Races_FGhost.xml @@ -0,0 +1,112 @@ + + + + ProjectJedi.PawnGhost + Pawn + true + Normal + Pawn + false + true + BulletImpact_Ground + + 70 + 0 + 1 + -450 + 450 + + + false + false + true + OmnivoreAnimal + 0.01 + + +
  • + CompAttachBase +
    • +     + true +     + + PJ_ForceGhostR + + A force ghost\n\n(Star Wars - The Force) + + 8.5 + 1.1 + 1.4 + 1.6 + 1 + + +
  • + Verb_MeleeAttackDamage + 1 + 21 + Cut + LeftHand +
    • +
  • + Verb_MeleeAttackDamage + 0.75 + 6 + Blunt + RightHand +
    • +     + + ToolUser + PJ_ForceGhostAI + PJ_ForceGhostAI_Constant + Human + ectoplasm + 1.3 + 50 + 5000 + +
  • + PJ_FGhostLifestage + 0 +
    • +     + Pawn_Melee_Punch_HitPawn + Pawn_Melee_Punch_HitBuilding + Pawn_Melee_Punch_Miss +     + + 15 + 1 + +     + + PJ_ForceGhost + + PJ_ForceGhostR + 510 + PJ_GhostFaction + +
  • + + Pawn/FGhost + Graphic_Multi + TransparentPostLight + 1.5 + RGBA(1.0, 1.0, 1.0, 0.5) + + (0.4, 0.8, 0.4) + + +
    • +     + + 9900 + 9900 + + +
  • PJ_GhostGlad
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/ForcePoolDefs/PJ_ForcePool.xml b/1.4/Defs/ForcePoolDefs/PJ_ForcePool.xml new file mode 100644 index 0000000..b09b474 --- /dev/null +++ b/1.4/Defs/ForcePoolDefs/PJ_ForcePool.xml @@ -0,0 +1,40 @@ + + + + PJ_ForcePool + ProjectJedi.Need_ForcePool + + Colonist's Current force pool level\n\n(Star Wars - The Force) + true + true + Humanlike + 0.50 + 0.22 + 0.04 + 1327 + true + true + true + + + PJ_ForceWielderHD + HediffWithComps + The force is strong with this one. + false + (0.8, 0.8, 0.35) + 1.0 + + PJ_ForcePool + +
  • + -0 +
    • +     + +
  • + + false +
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/Hediffs/Hediffs_FCHoke.xml b/1.4/Defs/Hediffs/Hediffs_FCHoke.xml new file mode 100644 index 0000000..b7ffe09 --- /dev/null +++ b/1.4/Defs/Hediffs/Hediffs_FCHoke.xml @@ -0,0 +1,95 @@ + + + + PJ_NoAir + HediffWithComps + (0.8, 0.8, 1) + + asphyxia + I find your lack of faith disturbing. + 0.001 + 1.5 + +
  • + -24.5 +
    • +     + +
  • + + false +
    • +
  • + + 0.1 + +
  • + Manipulation + -0.08 +
    • +
  • + Consciousness + -0.05 +
    • + + +
  • + + 0.3 + +
  • + Moving + -0.1 +
    • +
  • + Manipulation + -0.2 +
    • +
  • + Consciousness + -0.10 +
    • + + +
  • + + 0.5 + 0.15 + +
  • + Moving + -0.3 +
    • +
  • + Manipulation + -0.5 +
    • +
  • + Consciousness + -0.20 +
    • + + +
  • + + 0.8 + true + 0.30 + +
  • + Consciousness + -0.40 +
    • +
  • + Moving + -0.6 +
    • +
  • + Manipulation + -0.7 +
    • + + +     +     +     \ No newline at end of file diff --git a/1.4/Defs/Hediffs/Hediffs_PJ_ChokeCrush.xml b/1.4/Defs/Hediffs/Hediffs_PJ_ChokeCrush.xml new file mode 100644 index 0000000..7afee0b --- /dev/null +++ b/1.4/Defs/Hediffs/Hediffs_PJ_ChokeCrush.xml @@ -0,0 +1,29 @@ + + + + PJ_ChokeCrush + + All too easy. + true + +
  • + bandaged + sutured + set +
    • +
  • + 0.10 +
    • +
  • + scar +
    • +     + + 0.0125 + 0.00625 + 0.0 + true + Crushed + +     +     \ No newline at end of file diff --git a/1.4/Defs/Hediffs/Hediffs_PJ_Force.xml b/1.4/Defs/Hediffs/Hediffs_PJ_Force.xml new file mode 100644 index 0000000..adc3ab6 --- /dev/null +++ b/1.4/Defs/Hediffs/Hediffs_PJ_Force.xml @@ -0,0 +1,178 @@ + + + + PJ_ForceSpeedHediff_One + HediffWithComps + + The force can allow a user to move with great speed. + (1,0.3,0.5) + false + 1.0 + +
  • + + 700 + 700 + +
    • +     + +
  • + 1.33 + + 8.0 + 2.0 + +
    • +     +     + + PJ_ForceSpeedHediff_Two + HediffWithComps + + The force can allow a user to move with great speed. + (1,0.3,0.5) + false + 1.0 + +
  • + + 900 + 900 + +
    • +     + +
  • + 1.33 + + 8.0 + 2.0 + +
    • +     +     + + PJ_ForceSpeedHediff_Three + HediffWithComps + + The force can allow a user to move with great speed. + (1,0.3,0.5) + false + 1.0 + +
  • + + 1800 + 1800 + +
    • +     + +
  • + 1.33 + + 12.0 + 2.0 + +
    • +     +     + + PJ_ForceDefenseHediff + HediffWithComps + + Let go of your conscious self, and act on instinct. + (1,0.3,0.5) + false + 1.0 + +
  • + ProjectJedi.HediffComp_Shield +
    • +
  • + -1.5 +
    • +     + +
  • + 1.33 +
    • +     +     + + PJ_MindTrick + HediffWithComps + + The force can have a strong influence on the weak-minded. + (1,0.3,0.5) + false + 1.0 + +
  • + -1.5 +
    • +     + +
  • + 1.33 + +
  • + WanderConfused + 0.01 +
    • + + +     +     + + PJ_MindtrickThought + ThoughtWorker_Hediff + PJ_MindTrick + true + +
  • + + The force can have a strong effect on the weak minded.\n\n(Star Wars - The Force) + 2 +
    • +     +     + + PJ_Rage + HediffWithComps + + The dark side of the force can send person into a berzerker fury. + (1,0,0) + false + 1.0 + +
  • + -1.5 +
    • +     + +
  • + 1.33 + +
  • + Berserk + 0.01 +
    • + + +     +     + + PJ_RageThought + ThoughtWorker_Hediff + PJ_Rage + +
  • + + The force can have a strong effect on the weak minded. This discipline drives the target into an insensate rage.\n\n(Star Wars - The Force) + 1 +
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/JobDefs/AbilityUser_Jobs.xml b/1.4/Defs/JobDefs/AbilityUser_Jobs.xml new file mode 100644 index 0000000..1a8cefb --- /dev/null +++ b/1.4/Defs/JobDefs/AbilityUser_Jobs.xml @@ -0,0 +1,17 @@ + + + + CastAbilityVerb + AbilityUser.JobDriver_CastAbilityVerb + Using an ability + true + false + + + CastAbilitySelf + AbilityUser.JobDriver_CastAbilitySelf + Using an ability + true + false + + \ No newline at end of file diff --git a/1.4/Defs/JobDefs/PJ_ForceJobs.xml b/1.4/Defs/JobDefs/PJ_ForceJobs.xml new file mode 100644 index 0000000..0a4c758 --- /dev/null +++ b/1.4/Defs/JobDefs/PJ_ForceJobs.xml @@ -0,0 +1,8 @@ + + + + PJ_ForceMeditationJob + ProjectJedi.JobDriver_ForceMeditation + performing force meditation. + + \ No newline at end of file diff --git a/1.4/Defs/SoundDefs_Force/PJ_SoundsForce.xml b/1.4/Defs/SoundDefs_Force/PJ_SoundsForce.xml new file mode 100644 index 0000000..300bae6 --- /dev/null +++ b/1.4/Defs/SoundDefs_Force/PJ_SoundsForce.xml @@ -0,0 +1,160 @@ + + + + PJ_ForcePowersUnlocked + + 1 + 1 + +
  • + True + +
  • + StarWarsClawhammerBanjo +
    • + + + 30 + 30 + + +     +     + + PJ_LightningSound + MapOnly + + 4 + +
  • + +
  • + force/lightning +
    • + + + 30.51151 + 42.93479 + + + 0.9152174 + 1.042391 + + +     +     + + PJ_ChokeSound + MapOnly + + 1 + +
  • + +
  • + force/dark/choke +
    • + + + 0.9152174 + 1.042391 + + +     +     + + PJ_RageSound + MapOnly + + 1 + +
  • + +
  • + force/dark/rage +
    • + + + 0.9152174 + 1.042391 + + +     +     + + PJ_PushSound + MapOnly + + 1 + +
  • + +
  • + force/gray/push01 +
    • + + + 0.9152174 + 1.042391 + + +     +     + + PJ_PullSound + MapOnly + + 1 + +
  • + +
  • + force/gray/pull01 +
    • + + + 0.9152174 + 1.042391 + + +     +     + + PJ_SpeedSound + MapOnly + + 1 + +
  • + +
  • + force/gray/speed01 +
    • + + + 0.9152174 + 1.042391 + + +     +     + + PJ_DefSound + MapOnly + + 1 + +
  • + +
  • + force/light/defend01 +
    • + + + 0.9152174 + 1.042391 + + +     +     +     \ No newline at end of file diff --git a/1.4/Defs/ThingDefs_Furniture/PJ_Furniture.xml b/1.4/Defs/ThingDefs_Furniture/PJ_Furniture.xml new file mode 100644 index 0000000..35bfdd4 --- /dev/null +++ b/1.4/Defs/ThingDefs_Furniture/PJ_Furniture.xml @@ -0,0 +1,87 @@ + + + + PJ_ForceMedPadJ + ProjectJedi.Building_ForceMeditationPad + + + Furniture/MedCushion + Graphic_Single + CutoutComplex + (1.2) + + (0.6, 0.6, 0.6) + + + (0,0,1,0.703125) + (0.09375,0,0.84375,1) + (0,0,0.84375,0.625) + (0.15625,0,0.84375,0.625) + + + Building + + 220 + 7800 + 18 + 0.1 + 4 + 1.5 + + A comfortable pad to sit for meditation. Also works as a normal chair.\n\n(Star Wars - The Force) + true + +
  • Leathery
    • +
  • Fabric
    • +     + 30 + 1 + 0.40 + + true + + false +     + + PJ_ForceMedPadS + ProjectJedi.Building_ForceMeditationPad + + + Furniture/MedCushionSith + Graphic_Single + CutoutComplex + (1.2) + + (0.6, 0.6, 0.6) + + + (0,0,1,0.703125) + (0.09375,0,0.84375,1) + (0,0,0.84375,0.625) + (0.15625,0,0.84375,0.625) + + + Building + + 220 + 7800 + 18 + 0.1 + 4 + 1.5 + + A comfortable pad to sit for meditation. Also works as a normal chair.\n\n(Star Wars - The Force) + true + +
  • Leathery
    • +
  • Fabric
    • +     + 30 + 1 + 0.40 + + true + + false +     +     \ No newline at end of file diff --git a/1.4/Defs/ThingDefs_Misc/Apparel_JHoods.xml b/1.4/Defs/ThingDefs_Misc/Apparel_JHoods.xml new file mode 100644 index 0000000..4724afc --- /dev/null +++ b/1.4/Defs/ThingDefs_Misc/Apparel_JHoods.xml @@ -0,0 +1,130 @@ + + + + PJ_JediHood + + The humble hood worn by Jedi.\n\n(Star Wars - The Force) + Spacer + + Hoods/JediHoodx + Graphic_Single + + + 0.5 + 250 + 4500 + 350 + 0.15 + 0.10 + 0.2 + 4 + 4 + + + 20 + + + 0.02 + -0.01 + 0.01 + 0.05 + + + +
  • FullHead
    • +     + Hoods/JediHoodx + +
  • Overhead
    • +     + +
  • Soldier
    • +     +     +     + + PJ_SithHood + + The ominous hood worn by Sith.\n\n(Star Wars - The Force) + Spacer + + Hoods/SithHood + Graphic_Single + + + 0.5 + 250 + 4500 + 350 + 0.15 + 0.10 + 0.2 + 4 + 4 + + + 20 + + + 0.02 + -0.01 + 0.01 + 0.05 + + + +
  • FullHead
    • +     + Hoods/SithHood + +
  • Overhead
    • +     + +
  • Soldier
    • +     +     +     + + PJ_CustomHood + + A customized hood for Jedi or Sith.\n\n(Star Wars - The Force) + Spacer + + Hoods/JediHood + Graphic_Single + + + 0.5 + 250 + 4500 + 350 + 0.25 + 0.5 + 0.5 + 1.2 + + 50 + +
  • Fabric
    • +
  • Leathery
    • +     + + 0.02 + -0.01 + 0.01 + 0.05 + + + +
  • FullHead
    • +     + Hoods/JediHood + +
  • Overhead
    • +     + +
  • Soldier
    • +     +     +     +     \ No newline at end of file diff --git a/1.4/Defs/ThingDefs_Misc/Apparel_JRobes.xml b/1.4/Defs/ThingDefs_Misc/Apparel_JRobes.xml new file mode 100644 index 0000000..dff0947 --- /dev/null +++ b/1.4/Defs/ThingDefs_Misc/Apparel_JRobes.xml @@ -0,0 +1,178 @@ + + + + PJ_Jedi_Robe + + A Jedi's Robes\n\n(Star Wars - The Force) + Spacer + + ComplexClothing + + + Robes/JediRobe + Graphic_Single + + + 30 + + +
  • Apparel
    • +     + 0.001 + + 700 + 0.5 + 1.00 + 0.56 + 0.47 + 16 + 6 + 2 + + + 0.05 + -0.05 + 0.020 + 0.025 + 0.04 + -0.02 + 0.035 + -0.01 + 0.025 + 0.015 + 0.025 + 0.025 + 0.030 + 0.030 + 0.025 + 0.03 + 0.025 + 0.05 + + + +
  • Torso
    • +
  • Arms
    • +
  • Legs
    • +
  • Shoulders
    • +     + Robes/JediRobe + +
  • Shell
    • +     + +
  • Worker
    • +
  • Soldier
    • +     +     +     + + PJ_Sith_Robe + + A Dark Side version of Jedi Robes\n\n(Star Wars - The Force) + Spacer + + ComplexClothing + + + Robes/SithRobe + Graphic_Single + + + 30 + + +
  • Apparel
    • +     + 0.001 + + 700 + 0.5 + 1.00 + 0.56 + 0.47 + 16 + 6 + 2 + + + 0.05 + -0.05 + 0.020 + 0.025 + 0.04 + -0.02 + 0.035 + -0.01 + 0.025 + 0.015 + 0.025 + 0.025 + 0.030 + 0.030 + 0.025 + 0.03 + 0.025 + 0.05 + + + +
  • Torso
    • +
  • Arms
    • +
  • Legs
    • +
  • Shoulders
    • +     + Robes/SithRobe + +
  • Shell
    • +     + +
  • Worker
    • +
  • Soldier
    • +     +     +     + + PJ_InnerRobes + + The simple tunic worn by Jedi\n\n(Star Wars - The Force) + + Robes/JediGarb + Graphic_Single + + 50 + +
  • Fabric
    • +
  • Leathery
    • +     + +
  • Apparel
    • +     + 0.001 + + 5000 + 0.25 + 0.53 + 0.90 + 0.90 + + + +
  • Torso
    • +
  • Shoulders
    • +     + Robes/JediGarb + +
  • OnSkin
    • +     + +
  • PJ_ForceRobes
    • +     + +
  • Worker
    • +
  • Soldier
    • +     +     + +     +     \ No newline at end of file diff --git a/1.4/Defs/ThinkTrees/PJ_ForceGhostAI.xml b/1.4/Defs/ThinkTrees/PJ_ForceGhostAI.xml new file mode 100644 index 0000000..a838c3c --- /dev/null +++ b/1.4/Defs/ThinkTrees/PJ_ForceGhostAI.xml @@ -0,0 +1,38 @@ + + + + PJ_ForceGhostAI + + +
  • + Downed +
    • +
  • + LordDuty +
    • +
  • + Idle + +
  • + Deadly +
    • +     + +
  • + + + + + PJ_ForceGhostAI_Constant + + +
  • + + +
  • + +
    • + +     +     +     \ No newline at end of file diff --git a/1.4/Defs/ThinkTrees/PJ_SubTrees.xml b/1.4/Defs/ThinkTrees/PJ_SubTrees.xml new file mode 100644 index 0000000..a49c380 --- /dev/null +++ b/1.4/Defs/ThinkTrees/PJ_SubTrees.xml @@ -0,0 +1,16 @@ + + + + PJ_ForceMeditationThinkTree + Humanlike_PostMain + 104 + + PJ_ForcePool + 0.9 + true + +
  • + + + + \ No newline at end of file diff --git a/1.4/Defs/ThoughtDefs/Thoughts_ForceEffects.xml b/1.4/Defs/ThoughtDefs/Thoughts_ForceEffects.xml new file mode 100644 index 0000000..5b4aef0 --- /dev/null +++ b/1.4/Defs/ThoughtDefs/Thoughts_ForceEffects.xml @@ -0,0 +1,27 @@ + + + + PJ_ThoughtPull + 0.5 + 10 + +
  • + + Hey! Don't push me around!\n\n(Star Wars - The Force) + -5 +
    • + + + + PJ_ThoughtPush + 0.5 + 10 + +
  • + + Hey! Don't push me around!\n\n(Star Wars - The Force) + -5 +
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/TraitDefs/PJ_Traits.xml b/1.4/Defs/TraitDefs/PJ_Traits.xml new file mode 100644 index 0000000..1225791 --- /dev/null +++ b/1.4/Defs/TraitDefs/PJ_Traits.xml @@ -0,0 +1,115 @@ + + + + PJ_ForceSensitive + 0.2 + +
  • + + [PAWN_nameDef] has the ability to feel the force that surrounds us.\n\n(Star Wars - The Force) + 1 +
    • +
  • + + [PAWN_nameDef] has begun to control the force, but requires further training and guidance.\n\n(Star Wars - The Force) + 2 +
    • +     +     + + PJ_JediTrait + 0.03 + +
  • + + [PAWN_nameDef] Has begun the journey to becoming a Jedi Knight.\n\n(Star Wars - The Force) + 1 +
    • +
  • + + [PAWN_nameDef] has attained the rank of Knight of the Jedi Order.\n\n(Star Wars - The Force) + 2 +
    • +
  • + + [PAWN_nameDef] is among the most respected of the Jedi Order, a true Master.\n\n(Star Wars - The Force) + 3 +
    • +
  • + + [PAWN_nameDef] is ranked among the elite Jedi, those who are fit to serve on the Council.\n\n(Star Wars - The Force) + 4 +
    • +     + +
  • PJ_SithTrait
    • +
  • PJ_GrayTrait
    • +
  • PJ_ForceSensitive
    • +     +     + + PJ_SithTrait + 0.03 + +
  • + + [PAWN_nameDef] Has begun the journey to the Dark side of the force.\n\n(Star Wars - The Force) + 1 +
    • +
  • + + [PAWN_nameDef] is devoted to the dark side, spreading terror and flaring passions in their wake.\n\n(Star Wars - The Force) + 2 +
    • +
  • + + [PAWN_nameDef] is among the most feared in the galaxy, the Dark Lords of the Sith.\n\n(Star Wars - The Force) + 3 +
    • +
  • + + [PAWN_nameDef] is attuned to the dark side of the force, able to tap near-limitless power.\n\n(Star Wars - The Force) + 4 +
    • +     + +
  • Violent
    • +     + +
  • PJ_JediTrait
    • +
  • PJ_GrayTrait
    • +
  • PJ_ForceSensitive
    • +     +     + + PJ_GrayTrait + 0.03 + +
  • + + [PAWN_nameDef] is exploring the balance of the Force.\n\n(Star Wars - The Force) + 1 +
    • +
  • + + [PAWN_nameDef] is devoted to maintaining the balance of the Force.\n\n(Star Wars - The Force) + 2 +
    • +
  • + + [PAWN_nameDef] is a master Jedi, devoted to the 'living Force'.\n\n(Star Wars - The Force) + 3 +
    • +
  • + + [PAWN_nameDef] is attuned to the Living Force. [PAWN_pronoun] sees HIMself as an extension of it's will.\n\n(Star Wars - The Force) + 4 +
    • +     + +
  • PJ_JediTrait
    • +
  • PJ_SithTrait
    • +
  • PJ_ForceSensitive
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/Tutor/PJ_Tutor.xml b/1.4/Defs/Tutor/PJ_Tutor.xml new file mode 100644 index 0000000..ce89ebc --- /dev/null +++ b/1.4/Defs/Tutor/PJ_Tutor.xml @@ -0,0 +1,27 @@ + + + + + + + PJ_TutorForceSensitive + + 50 + When your colony has a character with the force sensitive trait, after a few days working they will eventually discover their force powers. More information about Force powers can be found in the Force tab. + + + + PJ_TutorForceXP + + 50 + Force Powers can be leveled up over time as characters spend time working to help the colony. The speed of how force levels are gained as characters work on the colony can be adjusted in the Mod Settings menu. As a force user becomes stronger, so too do the threats that the storyteller will throw at your colony. This can be changed in the Mod Settings menu by setting the multiplier to 1. + + + + PJ_TutorForceAlignment + + 50 + Low level force powers can be used by both dark and light sides of the force. Penultimate powers are restricted for pure dark or pure light force wielders. + + + \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 66023b0..aeab578 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,4 +1,4 @@ - + Star Wars - The Force jecrell.StarWarsTheForce @@ -31,28 +31,20 @@
  • jecrell.CallofCthulhuCults
    •  - -[h1]Adds RPG-leveling, alignment, and force powers to RimWorld.[/h1] + 1.22.0.0 (10-22-2022) + -[h1]::::: NOTICE ::::: -::::: THIS MOD REQUIRES JECSTOOLS :::::: -Download[/h1] -http://steamcommunity.com/sharedfiles/filedetails/?id=932008009 +[h1]Adds RPG-leveling, alignment, and force powers to RimWorld.[/h1] +[h1]Quick start notes:[/h1] +For a character to gain force powers, they must start with the force sensitive trait. After spending time working, they will discover their force powers through gaining force XP. Low level force powers can be used by both dark and light sides of the force. Penultimate powers are restricted for pure dark or pure light force wielders. -[h1]::::: NOTICE ::::: -::::: LOAD ORDER :::::: +[h1]::::: Load Order::::: Star Wars mods need to go below JecsTools. Putting Cults below The Force fixes alignment issues.[/h1] Thanks to Jedi Master Ailan for his direction and inspiration in the creation of this mod. Without his help and support this would have never happened. -[h1]Quick start notes:[/h1] -For a character to gain force powers, they must start with the force sensitive trait. After spending time working, they will discover their force powers through gaining force XP. Low level force powers can be used by both dark and light sides of the force. Penultimate powers are restricted for pure dark or pure light force wielders. - -[h1]Special thanks to all those that support me (and help me pay the rent) on Patreon (August 2017):[/h1] -Jedi Master Ailan, Shane Malley, Dakota Pohlman, Falloutmonk, Slick Liquid, Thom Black ShotgunFace, Fredric Sundberg, Dan Winn, Toss Antilles, Sarah Banks, Undead Jackel, Michin, Chelsea, Caine Detueur, Yewty Oxman, Jerod Clayton, Arty Kubin, Ashleigh Miller, infinity421, TheDayDude, Jacob Duga, Ryan Brock, Evan Hwang, Moshat, Christopher, Don Butterblume, John Boehr, George Chong Chuang Ming, Oliver White, Helpful Bot, vincent de keijzer, roxxploxx, Legless, Christopher Abel, Karol Rybak, Mathias Broxvall, Mark, Tim Stillson, Lachlan Easton, Nemuri Hime, Sera, Christian Hermansen, NiNe Bottles of Rum, Populous25, Steven James, Marcus Siraenu, Michael Lauder, meatface. - [list] [*]Programming by Jecrell. [*]Assets and XML by Xen. @@ -62,31 +54,41 @@ Jedi Master Ailan, Shane Malley, Dakota Pohlman, Falloutmonk, Slick Liquid, Thom [*]Spanish translation by [url=http://steamcommunity.com/id/HUOAAAAAAAAAAH/]Bub[/url]. [*]French translation by [url=http://steamcommunity.com/profiles/76561198015106010/]MrFootman[/url]. [*]German translation by [url=http://steamcommunity.com/id/Lauri7x3/]Lauri7x3[/url] -[/list] -[h1]Known Mod Conflicts[/h1] -[list] -[*]Static Quality Plus -- Disables Force XP. -[*]Step away from the medicine - Characters can't be tended after force heal. -[*]Hand me that brick - Errors -[*]Camping - Errors] -[*]Leadership and Teachers - Makes Force XP go up too quickly -[*]Cleaning area - Errors -[/list] +Thank you to my Patrons for supporting me in my efforts. Without you, none of this would be possible. -[h1]Problems? Questions? Comments?[/h1] -Join us on Discord: https://discord.gg/aDjWBBk +These are the most excellent rim dwellers who support me: +Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Genaeve , Populous25 , David Turner, TinyATuin, Michael Cailler, Jimes Tooper, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Dan Jones, Michael Whitehead, iknowdude00, Kaz, Alexander , Ken Birdwell, Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Genaeve , Populous25 , David Turner, TinyATuin, Michael Cailler, Jimes Tooper, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Dan Jones, Michael Whitehead, iknowdude00, Kaz, Alexander , Ken Birdwell +======================== +Changelog +======================== +1.22.0.0 (10-22-2022) +======================== +Updates Star Wars - The Force for RimWorld 1.4; Adds tutor info for new players on some mechanics -[img]https://i.imgur.com/Rs6T6cr.png[/img] -[list] -[*] See if the the error persists if you just have this mod and its requirements active. -[*] If not, try adding your other mods until it happens again. -[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] and command Ctrl+F12 -[*] For best support, please use the Discord-channel for error-reporting. -[*] Do not report errors by making a discussion-thread, I get no notification of that. -[*] If you have the solution for a problem, please post it to the GitHub repository. -[/list] + +Mlie's Changes +================== +1.0.4.0 - Updated for 1.3 + + +1.0.3.0 - Added support for [SYR] Trait Value + + +1.0.2.0 - Added harmony lightsaber-fixes by lbmaian + + +1.0.1.0 - Update to 1.2 +=================== + +1.20.0.1 (10-22-2018) +======================== +This should address some wacky behavior. + +1.20.0.0 (10-19-2018) +======================== +RimWorld 1.0 version -     + \ No newline at end of file diff --git a/About/Changelog.txt b/About/Changelog.txt index 3263504..726a4c1 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,3 +1,7 @@ +1.22.0.0 (10-22-2022) +======================== +Updates Star Wars - The Force for RimWorld 1.4; Adds tutor info for new players on some mechanics + Mlie's Changes ================== diff --git a/About/PatreonURL.txt b/About/PatreonURL.txt index 0c2bbdb..4f20969 100644 --- a/About/PatreonURL.txt +++ b/About/PatreonURL.txt @@ -1 +1 @@ -https://www.patreon.com/posts/22143599 +https://www.patreon.com/posts/73650399 diff --git a/About/Version.txt b/About/Version.txt index 6b86f76..48a4811 100644 --- a/About/Version.txt +++ b/About/Version.txt @@ -1 +1 @@ -1.21.1.0 +1.22.0.0 diff --git a/LoadFolders.xml b/LoadFolders.xml index e7c7a69..b03dbe6 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -14,4 +14,9 @@
  • /
  • SYRTraitValue
    • + +
  • 1.4
    • +
  • /
    • +
  • SYRTraitValue
    • +     \ No newline at end of file diff --git a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceChoke.cs b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceChoke.cs index d2cf069..22b217b 100644 --- a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceChoke.cs +++ b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceChoke.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using Verse; namespace ProjectJedi @@ -9,7 +10,10 @@ protected override BodyPartRecord ChooseHitPart(DamageInfo dinfo, Pawn pawn) { BodyPartRecord rec = null; var neckRecord = pawn.def.race.body.AllParts.FirstOrDefault(x => x.def.label == "neck"); - if (pawn.health.hediffSet.GetHediffs().All(x => x.Part != neckRecord)) + + List neckMissingPart = new List(); + pawn.health.hediffSet.GetHediffs(ref neckMissingPart, (Hediff_MissingPart x) => x.Part == neckRecord); + if (neckMissingPart?.NullOrEmpty() == true) { rec = neckRecord; } @@ -17,7 +21,10 @@ protected override BodyPartRecord ChooseHitPart(DamageInfo dinfo, Pawn pawn) { var lungRecord = pawn.def.race.body.AllParts.FirstOrDefault(x => x.def.tags.Any(s => s.defName == "BreathingSource" || s.defName == "BreathingPathway")); - if (pawn.health.hediffSet.GetHediffs().All(x => x.Part != lungRecord)) + + List lungsMissingPart = new List(); + pawn.health.hediffSet.GetHediffs(ref lungsMissingPart, (Hediff_MissingPart x) => x.Part == lungRecord); + if (lungsMissingPart.NullOrEmpty() == true) { rec = lungRecord; } diff --git a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceDrain.cs b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceDrain.cs index 3a9f82a..0c67a56 100644 --- a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceDrain.cs +++ b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceDrain.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using RimWorld; using UnityEngine; @@ -91,10 +92,13 @@ public override DamageResult Apply(DamageInfo dinfo, Thing thing) { continue; } + + List injuries = new List(); + caster.health.hediffSet.GetHediffs(ref injuries, (Hediff_Injury x) => x != null && x.def.everCurableByItem && !x.IsPermanent()); var maxInjuriesPerBodypart = 2; foreach (var current in from injury in - caster.health.hediffSet.GetHediffs() + injuries where injury.Part == rec select injury) { diff --git a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceHeal.cs b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceHeal.cs index 7ab02a7..6a58877 100644 --- a/Source/Code/Powers/DamageWorkers/DamageWorker_ForceHeal.cs +++ b/Source/Code/Powers/DamageWorkers/DamageWorker_ForceHeal.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using RimWorld; using Verse; @@ -33,7 +34,11 @@ public override DamageResult Apply(DamageInfo dinfo, Thing thing) } var maxInjuriesPerBodypart = 2; - foreach (var current in from injury in pawn.health.hediffSet.GetHediffs() + + List injuries = new List(); + pawn.health.hediffSet.GetHediffs(ref injuries, (Hediff_Injury x) => x != null && x.def.everCurableByItem && !x.IsPermanent()); + + foreach (var current in from injury in injuries where injury.Part == rec select injury) { diff --git a/Source/Code/UI/Need_ForcePool.cs b/Source/Code/UI/Need_ForcePool.cs index 675a178..92c7ee8 100644 --- a/Source/Code/UI/Need_ForcePool.cs +++ b/Source/Code/UI/Need_ForcePool.cs @@ -95,8 +95,8 @@ public override string GetTipString() } - public override void DrawOnGUI(Rect rect, int maxThresholdMarkers = int.MaxValue, float customMargin = -1F, - bool drawArrows = true, bool doTooltip = true, Rect? rectForTooltip = null) + public override void DrawOnGUI(Rect rect, int maxThresholdMarkers = 2147483647, float customMargin = -1, bool drawArrows = true, + bool doTooltip = true, Rect? rectForTooltip = null, bool drawLabel = true) { //base.DrawOnGUI(rect, maxThresholdMarkers, customMargin, drawArrows, doTooltip); if (rect.height > 70f) diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index 5759502..e193598 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -4,11 +4,11 @@ RW1.4;RW1.4Unstable RW1.4Unstable - net472 + net48 true - 9.0 + 10 false - 1.3.0.2 + $([System.IO.File]::ReadAllText("C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Workspace\Star-Wars---The-Force\About\Version.txt")) + + + + + ..\..\..\mods\JecsTools\1.4\Assemblies\AbilityUser.dll + false + + + ..\..\..\mods\JecsTools\1.4\Assemblies\CompActivatableEffect.dll + false + + + ..\..\..\mods\JecsTools\1.4\Assemblies\CompDeflector.dll + false + + + ..\..\..\mods\JecsTools\1.4\Assemblies\CompOversizedWeapon.dll + false + + + ..\..\..\..\mods\JecsTools\1.4\Assemblies\CompSlotLoadable.dll + false + + + @@ -72,23 +97,23 @@ - ..\..\..\..\..\..\workshop\content\294100\932008009\1.4\Assemblies\AbilityUser.dll + ..\..\..\mods\JecsTools\1.4\Assemblies\AbilityUser.dll false - ..\..\..\..\..\..\workshop\content\294100\932008009\1.4\Assemblies\CompActivatableEffect.dll + ..\..\..\mods\JecsTools\1.4\Assemblies\CompActivatableEffect.dll false - ..\..\..\..\..\..\workshop\content\294100\932008009\1.4\Assemblies\CompDeflector.dll + ..\..\..\mods\JecsTools\1.4\Assemblies\CompDeflector.dll false - ..\..\..\..\..\..\workshop\content\294100\932008009\1.4\Assemblies\CompOversizedWeapon.dll + ..\..\..\mods\JecsTools\1.4\Assemblies\CompOversizedWeapon.dll false - ..\..\..\..\..\..\workshop\content\294100\932008009\1.4\Assemblies\CompSlotLoadable.dll + ..\..\..\..\mods\JecsTools\1.4\Assemblies\CompSlotLoadable.dll false diff --git a/Source/ProjectJedi.sln b/Source/ProjectJedi.sln index 04464a5..dc1584d 100644 --- a/Source/ProjectJedi.sln +++ b/Source/ProjectJedi.sln @@ -10,6 +10,7 @@ Global Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU RW1.3|Any CPU = RW1.3|Any CPU + RW1.4|Any CPU = RW1.4|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A36BEEB2-7379-475B-B537-827E34571962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -18,6 +19,8 @@ Global {A36BEEB2-7379-475B-B537-827E34571962}.Release|Any CPU.Build.0 = Release|Any CPU {A36BEEB2-7379-475B-B537-827E34571962}.RW1.3|Any CPU.ActiveCfg = RW1.3|Any CPU {A36BEEB2-7379-475B-B537-827E34571962}.RW1.3|Any CPU.Build.0 = RW1.3|Any CPU + {A36BEEB2-7379-475B-B537-827E34571962}.RW1.4|Any CPU.ActiveCfg = RW1.4|Any CPU + {A36BEEB2-7379-475B-B537-827E34571962}.RW1.4|Any CPU.Build.0 = RW1.4|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/updateinfo b/updateinfo new file mode 100644 index 0000000..2240f56 --- /dev/null +++ b/updateinfo @@ -0,0 +1,38 @@ +============================== +==========Steam Format======== +============================== + +Star Wars - The Force Update +v1.22.0.0 (10-22-2022) +==================== + +Updates Star Wars - The Force for RimWorld 1.4; Adds tutor info for new players on some mechanics +-------------------- + +Download now on... +- Patreon: https://www.patreon.com/posts/22143599 +- GitHub: https://github.com/jecrell/Star-Wars---The-Force +- Steam: https://steamcommunity.com/sharedfiles/filedetails/?id=918226861 +Discuss the mod on... +- Discord: https://discord.gg/aDjWBBk +- Ludeon forums: https://ludeon.com/forums/index.php?topic=31647.0 + +============================== +===========BBS Format========= +============================== + +[center][b][glow=red,2,300][size=18pt]Star Wars - The Force[/size][/glow][/b] +[img width=260]https://raw.githubusercontent.com/jecrell/Star-Wars---The-Force/master/About/Preview.png[/img] +[hr] +[b]Star Wars - The Force +Version: 1.22.0.0 +Updated: 10-22-2022 +Description: [color=orange]Updates Star Wars - The Force for RimWorld 1.4; Adds tutor info for new players on some mechanics[/color] +[hr] +[b]Download now on...[/b] +[url=https://www.patreon.com/posts/22143599]Patreon[/url] +[url=https://github.com/jecrell/Star-Wars---The-Force]GitHub[/url] +[url=https://steamcommunity.com/sharedfiles/filedetails/?id=918226861]Steam[/url] +[b]Discuss the mod on...[/b] +[url=https://discord.gg/aDjWBBk]Discord[/url] +[url=https://ludeon.com/forums/index.php?topic=31647.0]Ludeon[/url]