Skip to content

Fullscreen UI overhaul: single windowed workspace with live pawn preview #60

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
feldoh wants to merge 1 commit into
base: main
Choose a base branch
from
+1,587 −1,202
Open

Fullscreen UI overhaul: single windowed workspace with live pawn preview #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified 1.6/Assemblies/FactionLoadout.dll
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions 1.6/Source/Dialog_XenotypeEdit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public override void DoWindowContents(Rect inRect)
if (_edit.xenotypeChances.NullOrEmpty())
{
_edit.xenotypeChances = _edit.Faction?.Def?.xenotypeSet?.xenotypeChances?.ToDictionary(x => x.xenotype.defName, x => x.chance) ?? new Dictionary<string, float>();
if (!_edit.xenotypeChances.ContainsKey(FactionEditUI.BaselinerDefName))
_edit.xenotypeChances.Add(FactionEditUI.BaselinerDefName, _edit.Faction?.Def?.xenotypeSet?.BaselinerChance ?? 1f);
if (!_edit.xenotypeChances.ContainsKey(FactionEdit.BaselinerDefName))
_edit.xenotypeChances.Add(FactionEdit.BaselinerDefName, _edit.Faction?.Def?.xenotypeSet?.BaselinerChance ?? 1f);
}

_edit.xenotypeChances[FactionEditUI.BaselinerDefName] = Math.Max(0f, 1f - _edit.xenotypeChances.Sum(x => x.Key == FactionEditUI.BaselinerDefName ? 0 : x.Value));
_edit.xenotypeChances[FactionEdit.BaselinerDefName] = Math.Max(0f, 1f - _edit.xenotypeChances.Sum(x => x.Key == FactionEdit.BaselinerDefName ? 0 : x.Value));

// Reserve space for add buttons at bottom.
const float addButtonsHeight = 70f;
Expand Down
3 changes: 3 additions & 0 deletions 1.6/Source/FactionEdit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ namespace FactionLoadout;
[HotSwappable]
public class FactionEdit : IExposable
{
/// <summary>Xenotype defName used to represent the "Baseliner" chance in xenotype edits.</summary>
public const string BaselinerDefName = "Baseliner";

private static readonly Dictionary<string, FactionDef> originalFactionDefs = new();
private static Dictionary<(FactionDef, PawnKindDef), PawnKindDef> factionSpecificPawnKindReplacements = new();
public bool Active = true;
Expand Down
Loading