Skip to content

Commit

Permalink
Update to A16 (1393)
Browse files Browse the repository at this point in the history
  • Loading branch information
@koisama
koisama committed Dec 22, 2016
1 parent 667922f commit 0b53796
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 43 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
View file
Expand Up @@ -3,7 +3,7 @@
<name>Numbers</name>
<author>koisama</author>
<url>https://ludeon.com/forums/index.php?topic=16558.0</url>
<targetVersion>0.15.1280</targetVersion>
<targetVersion>0.16.1393</targetVersion>
<description>
Adds a customizable general overview tab, allowing you to see any stats on all your colonists or prisoners in a single window.
</description>
Expand Down
Binary file modified Assemblies/RWNumbers.dll
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions Source/kNumbers/KListObject.cs
View file
Expand Up @@ -161,7 +161,7 @@ private void DrawSkill(Rect rect, Pawn ownerPawn)
if (!skill.TotallyDisabled)
{
Rect rect3 = new Rect(position.xMax, 0f, rect.width - position.xMax, rect.height);
Widgets.FillableBar(rect3, (float)skill.level / 20f, SkillBarFillTex, SkillBarBgTex, false);
Widgets.FillableBar(rect3, (float)skill.Level / 20f, SkillBarFillTex, SkillBarBgTex, false);
}
Rect rect4 = new Rect(position.xMax + 4f, 0f, 999f, rect.height);
rect4.yMin += 3f;
Expand All @@ -173,7 +173,7 @@ private void DrawSkill(Rect rect, Pawn ownerPawn)
}
else
{
label = skill.level.ToStringCached();
label = skill.Level.ToStringCached();
}
GenUI.SetLabelAlign(TextAnchor.MiddleLeft);
Widgets.Label(rect4, label);
Expand Down Expand Up @@ -235,7 +235,7 @@ private void DrawGear(Rect rect, ThingWithComps ownerPawn)
float x = 0;
float gWidth = 28f;
float gHeight = 28f;
Pawn p1 = (ownerPawn is Pawn) ? (ownerPawn as Pawn) : (ownerPawn as Corpse).innerPawn;
Pawn p1 = (ownerPawn is Pawn) ? (ownerPawn as Pawn) : (ownerPawn as Corpse).InnerPawn;
if (p1.RaceProps.Animal) return;
if (p1.equipment != null)
foreach(ThingWithComps thing in p1.equipment.AllEquipment)
Expand Down Expand Up @@ -271,7 +271,7 @@ private void DrawThing(Rect rect, Thing thing, Pawn selPawn)
list.Add(new FloatMenuOption("ThingInfo".Translate(), delegate
{
Find.WindowStack.Add(new Dialog_InfoCard(thing));
}, MenuOptionPriority.Medium, null, null));
}, MenuOptionPriority.Default, null, null));
if (selPawn.IsColonistPlayerControlled)
{
Action action = null;
Expand All @@ -298,10 +298,10 @@ private void DrawThing(Rect rect, Thing thing, Pawn selPawn)
Thing unused;
action = delegate
{
selPawn.inventory.container.TryDrop(thing, selPawn.Position, ThingPlaceMode.Near, out unused);
selPawn.inventory.innerContainer.TryDrop(thing, selPawn.Position, selPawn.Map, ThingPlaceMode.Near, out unused);
};
}
list.Add(new FloatMenuOption("DropThing".Translate(), action, MenuOptionPriority.Medium, null, null));
}
list.Add(new FloatMenuOption("DropThing".Translate(), action, MenuOptionPriority.Default, null, null));
}
FloatMenu window = new FloatMenu(list, thing.LabelCap, false);
Find.WindowStack.Add(window);
Expand Down
57 changes: 28 additions & 29 deletions Source/kNumbers/MainTabWindow_Numbers.cs
View file
Expand Up @@ -113,15 +113,15 @@ private void PreDrawPawnRow(Rect rect, ThingWithComps p)
rect4.xMin -= 4f;
rect4.yMin += 4f;
rect4.yMax -= 6f;
Widgets.FillableBar(rect4, (p as Pawn).health.summaryHealth.SummaryHealthPercent, GenWorldUI.OverlayHealthTex, BaseContent.ClearTex, false);
Widgets.FillableBar(rect4, (p as Pawn).health.summaryHealth.SummaryHealthPercent, GenMapUI.OverlayHealthTex, BaseContent.ClearTex, false);
}
}
if (Mouse.IsOver(rect3))
{
GUI.DrawTexture(position, TexUI.HighlightTex);
}
string label;
Pawn p1 = (p is Corpse) ? (p as Corpse).innerPawn : p as Pawn;
Pawn p1 = (p is Corpse) ? (p as Corpse).InnerPawn : p as Pawn;
if (!p1.RaceProps.Humanlike && p1.Name != null && !p1.Name.Numerical)
{
label = p1.Name.ToStringShort.CapitalizeFirst() + ", " + p1.KindLabel;
Expand Down Expand Up @@ -297,20 +297,20 @@ bool isEnemy(Pawn p)
((p.Faction != null) && p.Faction.HostileTo(Faction.OfPlayer)) ||
(!p.RaceProps.Animal && (!p.RaceProps.Humanlike || p.RaceProps.IsMechanoid))
) &&
!p.Position.Fogged() && (p.Position != IntVec3.Invalid);
!p.Position.Fogged(Find.VisibleMap) && (p.Position != IntVec3.Invalid);
}

bool isWildAnimal(Pawn p)
{
return p.RaceProps.Animal && (p.Faction != Faction.OfPlayer) && !p.Position.Fogged() && (p.Position != IntVec3.Invalid);
return p.RaceProps.Animal && (p.Faction != Faction.OfPlayer) && !p.Position.Fogged(Find.VisibleMap) && (p.Position != IntVec3.Invalid);
}

bool isGuest(Pawn p)
{
return
(p.guest != null) && !p.guest.IsPrisoner &&
(p.Faction != null) && !p.Faction.HostileTo(Faction.OfPlayer) && p.Faction != Faction.OfPlayer &&
!p.Position.Fogged() && (p.Position != IntVec3.Invalid);
!p.Position.Fogged(Find.VisibleMap) && (p.Position != IntVec3.Invalid);
}

void UpdatePawnList()
Expand All @@ -319,54 +319,53 @@ void UpdatePawnList()

this.things.Clear();
IEnumerable<ThingWithComps> tempPawns = new List<ThingWithComps>();

switch (chosenPawnType)
{
default:
case pawnType.Colonists:
tempPawns = Find.MapPawns.FreeColonists.Select(p=>p as ThingWithComps).ToList();
tempPawns = Find.VisibleMap.mapPawns.FreeColonists.Select(p=>p as ThingWithComps).ToList();
pStatDef = pawnHumanlikeStatDef;
pNeedDef = pawnHumanlikeNeedDef;
break;

case pawnType.Prisoners:
tempPawns = Find.MapPawns.PrisonersOfColony.Select(p => p as ThingWithComps).ToList();
tempPawns = Find.VisibleMap.mapPawns.PrisonersOfColony.Select(p => p as ThingWithComps).ToList();
pStatDef = pawnHumanlikeStatDef;
pNeedDef = pawnHumanlikeNeedDef;
break;

case pawnType.Guests:
tempPawns = Find.MapPawns.AllPawns.Where(p => isGuest(p)).Select(p => p as ThingWithComps).ToList();
tempPawns = Find.VisibleMap.mapPawns.AllPawns.Where(p => isGuest(p)).Select(p => p as ThingWithComps).ToList();
pStatDef = pawnHumanlikeStatDef;
pNeedDef = pawnHumanlikeNeedDef;
break;

case pawnType.Enemies:
// tempPawns = Find.MapPawns.PawnsHostileToColony.Select(p => p as ThingWithComps).ToList();
tempPawns = (from p in Find.MapPawns.AllPawns where isEnemy(p) select p).Select(p => p as ThingWithComps).ToList();
tempPawns = (from p in Find.VisibleMap.mapPawns.AllPawns where isEnemy(p) select p).Select(p => p as ThingWithComps).ToList();
pStatDef = pawnHumanlikeStatDef;
pNeedDef = pawnHumanlikeNeedDef;
break;

case pawnType.Animals:
tempPawns = (from p in Find.MapPawns.PawnsInFaction(Faction.OfPlayer) where p.RaceProps.Animal select p).Select(p => p as ThingWithComps).ToList();
tempPawns = (from p in Find.VisibleMap.mapPawns.PawnsInFaction(Faction.OfPlayer) where p.RaceProps.Animal select p).Select(p => p as ThingWithComps).ToList();
pStatDef = pawnAnimalStatDef;
pNeedDef = pawnAnimalNeedDef;
break;

case pawnType.WildAnimals:
tempPawns = (from p in Find.MapPawns.AllPawns where isWildAnimal(p) select p).Select(p => p as ThingWithComps).ToList();
tempPawns = (from p in Find.VisibleMap.mapPawns.AllPawns where isWildAnimal(p) select p).Select(p => p as ThingWithComps).ToList();
pStatDef = pawnAnimalStatDef;
pNeedDef = pawnAnimalNeedDef;
break;

case pawnType.Corpses:
tempPawns = Find.ListerThings.AllThings.Where(p => (p is Corpse) && (!(p as Corpse).innerPawn.RaceProps.Animal)).Select(p => p as ThingWithComps).ToList();
tempPawns = Find.VisibleMap.listerThings.AllThings.Where(p => (p is Corpse) && (!(p as Corpse).InnerPawn.RaceProps.Animal)).Select(p => p as ThingWithComps).ToList();
pStatDef = new List<StatDef>();
pNeedDef = new List<NeedDef>();
break;
case pawnType.AnimalCorpses:
tempPawns = Find.ListerThings.AllThings.Where(p => (p is Corpse) && (p as Corpse).innerPawn.RaceProps.Animal && !p.Position.Fogged()).Select(p => p as ThingWithComps).ToList();
tempPawns = Find.VisibleMap.listerThings.AllThings.Where(p => (p is Corpse) && (p as Corpse).InnerPawn.RaceProps.Animal && !p.Position.Fogged(Find.VisibleMap)).Select(p => p as ThingWithComps).ToList();
pStatDef = new List<StatDef>();
pNeedDef = new List<NeedDef>();
break;
Expand Down Expand Up @@ -406,8 +405,8 @@ void UpdatePawnList()
break;

case KListObject.objectType.Gear:
this.things = tempPawns.Where(p=>(p is Pawn)||((p is Corpse)&&(!(p as Corpse).innerPawn.RaceProps.Animal))).OrderBy(p => {
Pawn p1 = (p is Pawn)?(p as Pawn):(p as Corpse).innerPawn;
this.things = tempPawns.Where(p=>(p is Pawn)||((p is Corpse)&&(!(p as Corpse).InnerPawn.RaceProps.Animal))).OrderBy(p => {
Pawn p1 = (p is Pawn)?(p as Pawn):(p as Corpse).InnerPawn;
return (p1.equipment != null) ? ((p1.equipment.AllEquipment.Count() > 0) ? p1.equipment.AllEquipment.First().LabelCap : "") : "";
}).ToList();
break;
Expand Down Expand Up @@ -503,7 +502,7 @@ public void PawnSelectOptionsMaker()
}
};

list.Add(new FloatMenuOption(("koisama.pawntype."+pawn.ToString()).Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption(("koisama.pawntype."+pawn.ToString()).Translate(), action, MenuOptionPriority.Default, null, null));
}
Find.WindowStack.Add(new FloatMenu(list));
}
Expand All @@ -520,7 +519,7 @@ public void StatsOptionsMaker()
if(fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption(stat.LabelCap, action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption(stat.LabelCap, action, MenuOptionPriority.Default, null, null));
}
Find.WindowStack.Add(new FloatMenu(list));
}
Expand All @@ -536,7 +535,7 @@ public void SkillsOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption(skill.LabelCap, action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption(skill.LabelCap, action, MenuOptionPriority.Default, null, null));
}
Find.WindowStack.Add(new FloatMenu(list));
}
Expand All @@ -552,7 +551,7 @@ public void NeedsOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption(need.LabelCap, action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption(need.LabelCap, action, MenuOptionPriority.Default, null, null));
}
Find.WindowStack.Add(new FloatMenu(list));
}
Expand All @@ -577,7 +576,7 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.Equipment".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.Equipment".Translate(), action, MenuOptionPriority.Default, null, null));
}

//all living things
Expand All @@ -589,15 +588,15 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.Age".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.Age".Translate(), action, MenuOptionPriority.Default, null, null));

action = delegate
{
KListObject kl = new KListObject(KListObject.objectType.MentalState, "koisama.MentalState".Translate(), null);
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.MentalState".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.MentalState".Translate(), action, MenuOptionPriority.Default, null, null));
}

if (chosenPawnType == pawnType.Prisoners) {
Expand All @@ -607,15 +606,15 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("GetsFood".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("GetsFood".Translate(), action, MenuOptionPriority.Default, null, null));

Action action2 = delegate
{
KListObject kl = new KListObject(KListObject.objectType.ControlPrisonerInteraction, "koisama.Interaction".Translate(), null);
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.Interaction".Translate(), action2, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.Interaction".Translate(), action2, MenuOptionPriority.Default, null, null));
}

if (chosenPawnType == pawnType.Animals)
Expand All @@ -626,15 +625,15 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("MilkFullness".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("MilkFullness".Translate(), action, MenuOptionPriority.Default, null, null));

Action action2 = delegate
{
KListObject kl = new KListObject(KListObject.objectType.AnimalWoolGrowth, "WoolGrowth".Translate(), null);
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("WoolGrowth".Translate(), action2, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("WoolGrowth".Translate(), action2, MenuOptionPriority.Default, null, null));
}

//healable
Expand All @@ -646,7 +645,7 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.MedicalCare".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.MedicalCare".Translate(), action, MenuOptionPriority.Default, null, null));
}

if (! new[] { pawnType.Corpses, pawnType.AnimalCorpses }.Contains(chosenPawnType))
Expand All @@ -657,7 +656,7 @@ public void OtherOptionsMaker()
if (fits(kl.minWidthDesired))
kList.Add(kl);
};
list.Add(new FloatMenuOption("koisama.CurrentJob".Translate(), action, MenuOptionPriority.Medium, null, null));
list.Add(new FloatMenuOption("koisama.CurrentJob".Translate(), action, MenuOptionPriority.Default, null, null));
}

Find.WindowStack.Add(new FloatMenu(list));
Expand Down
9 changes: 7 additions & 2 deletions Source/kNumbers/MapComponent_Numbers.cs
View file
Expand Up @@ -13,6 +13,11 @@ class MapComponent_Numbers : MapComponent

private List<KListObject> tmpKList;

public MapComponent_Numbers(Map map) : base(map)
{
this.map = map;
}

public override void ExposeData()
{

Expand Down Expand Up @@ -54,13 +59,13 @@ private static void SetDefaultValues()

public static void InitMapComponent()
{
if(Find.Map.GetComponent<MapComponent_Numbers>() == null)
if(Find.VisibleMap.GetComponent<MapComponent_Numbers>() == null)
{
if (!hasData)
{
SetDefaultValues();
}
Find.Map.components.Add(new MapComponent_Numbers());
Find.VisibleMap.components.Add(new MapComponent_Numbers(Find.VisibleMap));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions Source/kNumbers/kNumbers.csproj
View file
Expand Up @@ -37,9 +37,9 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.14.6039.41296, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Assembly-CSharp, Version=0.15.6082.36194, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\RimWorld1393Win\RimWorld1393Win_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -49,7 +49,7 @@
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\RimWorld1393Win\RimWorld1393Win_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -60,7 +60,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /y $(TargetFileName) "C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\kNumbers\Assemblies"
<PostBuildEvent>copy /y $(TargetFileName) "C:\Misc\RimWorld1393Win\Mods\kNumbers\Assemblies"
copy /y $(TargetFileName) ..\..\..\..\Assemblies</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down

0 comments on commit 0b53796

Please sign in to comment.