Skip to content

Change Pawn Generator to be more readable/maintainable and clearer for percentages #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noreenko wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Change Pawn Generator to be more readable/maintainable and clearer for percentages #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57ee166
Update PawnGenerator and ModClassOptions to use a clearer percentage
noreenko Mar 4, 2023
e599767
Fix xml translations
noreenko Mar 4, 2023
cf1743c
Don't put a plus on 0%
noreenko Mar 4, 2023
7064deb
fix defaults
noreenko Mar 4, 2023
7a03329
Fix the percentage calculation inside of the ClassOptionsWindow (it w…
noreenko Mar 5, 2023
58cfde9
remove unused helper methods
noreenko Mar 5, 2023
4613c32
Change some names
noreenko Mar 5, 2023
5c8ba21
uncomment code regarding Poison trap
noreenko Mar 5, 2023
6cde472
Make sure to use RemoveTrait in debug tools
noreenko Mar 5, 2023
175ca0f
Fix pawn generation on null faction
noreenko Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Languages/English/Keyed/TM_English.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@

<!-- Mod Settings Class options -->
<supportTraitChance>Supporting Trait Commonality</supportTraitChance>
<TM_ClassWarning>**Change class settings only when starting a new game**</TM_ClassWarning>
<TM_ClassWarning>**Class settings only affect pawns created after changes**</TM_ClassWarning>
<TM_RequiresRestart>**Any change requires a game restart**</TM_RequiresRestart>
<TM_ClassOptions>Enabled Classes</TM_ClassOptions>
<TM_EnabledMages>Mages</TM_EnabledMages>
Expand Down
2 changes: 1 addition & 1 deletion Languages/Spanish/Keyed/TM_Spanish_Caferino.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

<!-- Mod Settings Class options -->

<TM_ClassWarning>**Cambia la configuración de las clases solo al empezar un nuevo juego**</TM_ClassWarning>
<TM_ClassWarning>**La configuración de clase solo afecta a los peones creados después del cambio**</TM_ClassWarning>
<TM_RequiresRestart>**Cualquier cambio requiere un reinicio de juego**</TM_RequiresRestart>
<TM_ClassOptions>Clases Habilitadas</TM_ClassOptions>
<TM_EnabledMages>Magos</TM_EnabledMages>
Expand Down
7 changes: 3 additions & 4 deletions RimWorldOfMagic/RimWorldOfMagic/Building_TMElementalRift.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using UnityEngine;
using RimWorld;
using AbilityUser;

using TorannMagic.ModOptions;


namespace TorannMagic
Expand Down Expand Up @@ -81,16 +81,15 @@ public override void Tick()
DetermineElementalType();
BeginAssaultCondition();
SpawnCycle();
ModOptions.SettingsRef settings = new ModOptions.SettingsRef();
if (Find.Storyteller.difficulty.threatScale != 0)
{
this.STDMultiplier = (float)(Find.Storyteller.difficulty.threatScale / 20f);
}
if(settings.riftChallenge < 2f)
if(Settings.Instance.riftChallenge < 2f)
{
this.difficultyMultiplier = 1f;
}
else if(settings.riftChallenge < 3f)
else if(Settings.Instance.riftChallenge < 3f)
{
this.difficultyMultiplier = .85f;
}
Expand Down
7 changes: 3 additions & 4 deletions RimWorldOfMagic/RimWorldOfMagic/Building_TMElementalRift_Defenders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using UnityEngine;
using RimWorld;
using AbilityUser;

using TorannMagic.ModOptions;


namespace TorannMagic
Expand Down Expand Up @@ -85,16 +85,15 @@ public override void Tick()
DetermineElementalType();
BeginAssaultCondition();
SpawnCycle();
ModOptions.SettingsRef settings = new ModOptions.SettingsRef();
if (Find.Storyteller.difficulty.threatScale != 0)
{
this.STDMultiplier = (float)(Find.Storyteller.difficulty.threatScale / 20f);
}
if(settings.riftChallenge <= 3f)
if(Settings.Instance.riftChallenge <= 3f)
{
this.difficultyMultiplier = 1f;
}
else if(settings.riftChallenge < 3f)
else if(Settings.Instance.riftChallenge < 3f)
{
this.difficultyMultiplier = .85f;
}
Expand Down
24 changes: 0 additions & 24 deletions RimWorldOfMagic/RimWorldOfMagic/CompAbilityUserMagic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace TorannMagic
{
[CompilerGenerated]
[Serializable]
[StaticConstructorOnStartup]
public class CompAbilityUserMagic : CompAbilityUserTMBase
{
public string LabelKey = "TM_Magic";
Expand Down Expand Up @@ -3561,29 +3560,6 @@ private void LoadPowers()
}
}

public void RemoveTraits()
{
List<Trait> traits = this.Pawn.story.traits.allTraits;
for (int i = 0; i < traits.Count; i++)
{
if (traits[i].def == TorannMagicDefOf.InnerFire || traits[i].def == TorannMagicDefOf.HeartOfFrost || traits[i].def == TorannMagicDefOf.StormBorn || traits[i].def == TorannMagicDefOf.Arcanist || traits[i].def == TorannMagicDefOf.Paladin ||
traits[i].def == TorannMagicDefOf.Druid || traits[i].def == TorannMagicDefOf.Priest || traits[i].def == TorannMagicDefOf.Necromancer || traits[i].def == TorannMagicDefOf.Warlock || traits[i].def == TorannMagicDefOf.Succubus ||
traits[i].def == TorannMagicDefOf.TM_Bard || traits[i].def == TorannMagicDefOf.Geomancer || traits[i].def == TorannMagicDefOf.Technomancer || traits[i].def == TorannMagicDefOf.BloodMage || traits[i].def == TorannMagicDefOf.Enchanter ||
traits[i].def == TorannMagicDefOf.Chronomancer || traits[i].def == TorannMagicDefOf.ChaosMage || traits[i].def == TorannMagicDefOf.TM_Wanderer)
{
Log.Message("Removing trait " + traits[i].Label);
traits.Remove(traits[i]);
i--;
}
if (this.customClass != null)
{
traits.Remove(this.Pawn.story.traits.GetTrait(this.customClass.classTrait));
this.customClass = null;
this.customIndex = -2;
}
}
}

public void RemoveTMagicHediffs()
{
List<Hediff> allHediffs = this.Pawn.health.hediffSet.hediffs;
Expand Down
17 changes: 0 additions & 17 deletions RimWorldOfMagic/RimWorldOfMagic/CompAbilityUserMight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace TorannMagic
{
[CompilerGenerated]
[Serializable]
[StaticConstructorOnStartup]
public class CompAbilityUserMight : CompAbilityUserTMBase
{
public string LabelKey = "TM_Might";
Expand Down Expand Up @@ -1668,22 +1667,6 @@ private void ClearPower(MightPower current)
base.UpdateAbilities();
}

public void RemoveTraits()
{
List<Trait> traits = this.Pawn.story.traits.allTraits;
for (int i = 0; i < traits.Count; i++)
{
if (traits[i].def == TorannMagicDefOf.Gladiator || traits[i].def == TorannMagicDefOf.Bladedancer || traits[i].def == TorannMagicDefOf.Ranger || traits[i].def == TorannMagicDefOf.Faceless ||
traits[i].def == TorannMagicDefOf.DeathKnight || traits[i].def == TorannMagicDefOf.TM_Psionic || traits[i].def == TorannMagicDefOf.TM_Sniper || traits[i].def == TorannMagicDefOf.TM_Monk ||
traits[i].def == TorannMagicDefOf.TM_Wayfarer || traits[i].def == TorannMagicDefOf.TM_Commander || traits[i].def == TorannMagicDefOf.TM_SuperSoldier)
{
Log.Message("Removing trait " + traits[i].Label);
traits.Remove(traits[i]);
i--;
}
}
}

private void LoadPowers(Pawn pawn)
{
if (pawn.story.traits.HasTrait(TorannMagicDefOf.Gladiator))
Expand Down
13 changes: 13 additions & 0 deletions RimWorldOfMagic/RimWorldOfMagic/CompAbilityUserTMBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,18 @@ protected void DrawMark()
DrawMark(material, new Vector3(.28f, 1f, .28f));
}
}

public void RemoveTraits()
{
List<Trait> traits = Pawn.story.traits.allTraits;
for (int i = traits.Count - 1; i >= 0; i--)
{
if (TM_ClassUtility.AllClassTraits.Contains(traits[i].def))
{
Log.Message("Removing trait " + traits[i].Label);
Pawn.story.traits.RemoveTrait(traits[i]);
}
}
}
}
}
41 changes: 21 additions & 20 deletions RimWorldOfMagic/RimWorldOfMagic/CompUseEffect_LearnMagic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using RimWorld;
using Verse;
using System.Collections.Generic;
using TorannMagic.ModOptions;
using UnityEngine;


Expand All @@ -17,7 +18,7 @@ public override void DoEffect(Pawn user)
bool advancedClass = false;
string failMessage = "";
CompAbilityUserMagic comp = user.GetCompAbilityUserMagic();
for (int i = 0; i < TM_ClassUtility.CustomClasses.Count; i++)
for (int i = 0; i < TM_ClassUtility.CustomClasses.Length; i++)
{
TMDefs.TM_CustomClass cc = TM_ClassUtility.CustomClasses[i];
if (cc.isMage && cc.isAdvancedClass && comp != null)
Expand Down Expand Up @@ -286,12 +287,12 @@ public override void DoEffect(Pawn user)
if (attempts < 50)
{
int baseClassCount = 17;
int customClassCount = TM_ClassUtility.CustomMageClasses.Count;
int customClassCount = TM_ClassUtility.CustomMageClasses.Length;
int rnd = Mathf.RoundToInt(Rand.RangeInclusive(0, baseClassCount + customClassCount));
switch (rnd)
{
case 0:
if (ModOptions.Settings.Instance.Demonkin)
if (Settings.Demonkin.isEnabled)
{
if (user.gender == Gender.Male)
{
Expand All @@ -313,7 +314,7 @@ public override void DoEffect(Pawn user)
}
break;
case 15:
if (ModOptions.Settings.Instance.Demonkin)
if (Settings.Demonkin.isEnabled)
{
if (user.gender == Gender.Male)
{
Expand All @@ -335,7 +336,7 @@ public override void DoEffect(Pawn user)
}
break;
case 1:
if (ModOptions.Settings.Instance.Necromancer)
if (Settings.Necromancer.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Necromancer, 0, false));
}
Expand All @@ -346,7 +347,7 @@ public override void DoEffect(Pawn user)
}
break;
case 2:
if (ModOptions.Settings.Instance.Druid)
if (Settings.Druid.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Druid, 0, false));
}
Expand All @@ -357,7 +358,7 @@ public override void DoEffect(Pawn user)
}
break;
case 3:
if (ModOptions.Settings.Instance.Summoner)
if (Settings.Summoner.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Summoner, 0, false));
}
Expand All @@ -368,7 +369,7 @@ public override void DoEffect(Pawn user)
}
break;
case 4:
if (ModOptions.Settings.Instance.FireMage)
if (Settings.FireMage.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.InnerFire, 0, false));
}
Expand All @@ -379,7 +380,7 @@ public override void DoEffect(Pawn user)
}
break;
case 5:
if (ModOptions.Settings.Instance.IceMage)
if (Settings.IceMage.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.HeartOfFrost, 0, false));
}
Expand All @@ -390,7 +391,7 @@ public override void DoEffect(Pawn user)
}
break;
case 6:
if (ModOptions.Settings.Instance.LitMage)
if (Settings.LitMage.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.StormBorn, 0, false));
}
Expand All @@ -401,7 +402,7 @@ public override void DoEffect(Pawn user)
}
break;
case 7:
if (ModOptions.Settings.Instance.Arcanist)
if (Settings.Arcanist.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Arcanist, 0, false));
}
Expand All @@ -412,7 +413,7 @@ public override void DoEffect(Pawn user)
}
break;
case 8:
if (ModOptions.Settings.Instance.Priest)
if (Settings.Priest.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Priest, 0, false));
}
Expand All @@ -423,7 +424,7 @@ public override void DoEffect(Pawn user)
}
break;
case 9:
if (ModOptions.Settings.Instance.Bard)
if (Settings.Bard.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.TM_Bard, 0, false));
}
Expand All @@ -434,7 +435,7 @@ public override void DoEffect(Pawn user)
}
break;
case 10:
if (ModOptions.Settings.Instance.Paladin)
if (Settings.Paladin.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Paladin, 0, false));
}
Expand All @@ -445,7 +446,7 @@ public override void DoEffect(Pawn user)
}
break;
case 11:
if (ModOptions.Settings.Instance.Geomancer)
if (Settings.Geomancer.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Geomancer, 0, false));
}
Expand All @@ -456,7 +457,7 @@ public override void DoEffect(Pawn user)
}
break;
case 12:
if (ModOptions.Settings.Instance.Technomancer)
if (Settings.Technomancer.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Technomancer, 0, false));
}
Expand All @@ -467,7 +468,7 @@ public override void DoEffect(Pawn user)
}
break;
case 13:
if (ModOptions.Settings.Instance.BloodMage)
if (Settings.BloodMage.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.BloodMage, 0, false));
}
Expand All @@ -478,7 +479,7 @@ public override void DoEffect(Pawn user)
}
break;
case 14:
if (ModOptions.Settings.Instance.Technomancer)
if (Settings.Technomancer.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Enchanter, 0, false));
}
Expand All @@ -489,7 +490,7 @@ public override void DoEffect(Pawn user)
}
break;
case 16:
if (ModOptions.Settings.Instance.Chronomancer)
if (Settings.Chronomancer.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.Chronomancer, 0, false));
}
Expand All @@ -500,7 +501,7 @@ public override void DoEffect(Pawn user)
}
break;
case 17:
if (ModOptions.Settings.Instance.ChaosMage)
if (Settings.ChaosMage.isEnabled)
{
user.story.traits.GainTrait(new Trait(TorannMagicDefOf.ChaosMage, 0, false));
}
Expand Down
2 changes: 1 addition & 1 deletion RimWorldOfMagic/RimWorldOfMagic/CompUseEffect_LearnMight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public override void DoEffect(Pawn user)
TMDefs.TM_CustomClass cc = null;
CompAbilityUserMight comp = user.GetCompAbilityUserMight();

for (int i = 0; i < TM_ClassUtility.CustomClasses.Count; i++)
for (int i = 0; i < TM_ClassUtility.CustomClasses.Length; i++)
{
cc = TM_ClassUtility.CustomClasses[i];
if (cc.isFighter && cc.isAdvancedClass && comp != null)
Expand Down
Loading