Skip to content

Commit 3cb2aea

Browse files
committed
Add BoostRequires and set BoostTemplate to False if the Attrib is kNull.
Fix the Recipe tab name for the Merit vendor.
1 parent 5b8a530 commit 3cb2aea

File tree

5 files changed

+893
-781
lines changed

5 files changed

+893
-781
lines changed

Inventor/BoostSetData.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class Boost
5353
public string displayName;
5454
public string description;
5555
public string shortHelp;
56+
public string slotRequires;
5657
public List<BoostType> aspects;
5758
public List<string> salvage;
5859
}
@@ -124,7 +125,7 @@ public string GetDropRecipe(List<int> craftingCost, List<Salvage> salvageList)
124125
{
125126
s += "DetailRecipe " + boost.name + "_" + level + Environment.NewLine;
126127
s += "{" + Environment.NewLine;
127-
s += "\tDisplayName \"" + PString(displayName + ": " + boost.displayName) + "\"" + Environment.NewLine;
128+
s += "\tDisplayName \"" + PString(displayName + ": " + boost.displayName + " (Recipe)") + "\"" + Environment.NewLine;
128129
s += "\tDisplayHelp \"" + PString("This recipe builds the " + displayName + ": " + boost.displayName + " Enhancement") + "\"" + Environment.NewLine;
129130
s += "\tDisplayTabName \"P1273912828\"" + Environment.NewLine;
130131
s += "\tType Drop" + Environment.NewLine;
@@ -353,12 +354,13 @@ public string GetPowers(Boost boost, bool attuned, string prefix, string catalyz
353354
s += "\tRadius 0" + Environment.NewLine;
354355
s += "\tArc 0" + Environment.NewLine;
355356
s += "\tBoostsAllowed kScience_Boost, kTechnology_Boost, kMagic_Boost, kMutation_Boost, kNatural_Boost" + (String.IsNullOrEmpty(boostsAllowed) ? String.Empty : ", " + boostsAllowed) + Environment.NewLine;
356-
if (!String.IsNullOrEmpty(catalyzed)) s += "\tBoostCatalystConversion Boosts." + catalyzed + boost.name + "." + catalyzed + boost.name + Environment.NewLine;
357-
s += "\t" + (attuned ? "BoostUsePlayerLevel " : "BoostBoostable ") + "True" + Environment.NewLine;
357+
if (!String.IsNullOrEmpty(catalyzed)) s += "\tBoostCatalystConversion Boosts." + catalyzed + boost.name + "." + catalyzed + boost.name + Environment.NewLine;
358+
s += "\t" + (attuned ? "BoostUsePlayerLevel " : "BoostBoostable ") + "True" + Environment.NewLine;
358359
s += "\tBoostIgnoreEffectiveness True" + Environment.NewLine;
359360
s += "\tBoostCombinable False" + Environment.NewLine;
360361
s += "\tMinSlotLevel " + (minSlotLevel - 1) + Environment.NewLine;
361-
s += "\tBoostAlwaysCountForSet True" + Environment.NewLine;
362+
if (!String.IsNullOrEmpty(boost.slotRequires)) s += "\tSlotRequires " + boost.slotRequires + Environment.NewLine;
363+
s += "\tBoostAlwaysCountForSet True" + Environment.NewLine;
362364
if (attuned) s += "\tBoostLicenseLevel 0" + Environment.NewLine;
363365
s += "\tDisplayShortHelp \"" + PString(boost.shortHelp) + "\"" + Environment.NewLine;
364366
s += "\tDisplayHelp \"" + PString(boost.description) + "\"" + Environment.NewLine;
@@ -387,7 +389,7 @@ public string GetPowers(Boost boost, bool attuned, string prefix, string catalyz
387389
s += "\t\tChance 1" + Environment.NewLine;
388390
s += "\t\tNearGround kFalse" + Environment.NewLine;
389391
s += "\t\tCancelOnMiss kFalse" + Environment.NewLine;
390-
s += "\t\tBoostTemplate kTrue" + Environment.NewLine;
392+
s += "\t\tBoostTemplate " + (attrib.attrib == "kNull" ? "kFalse" : "kTrue") + Environment.NewLine;
391393
s += "\t\tStackType kReplace" + Environment.NewLine;
392394
if (!String.IsNullOrEmpty(attrib.reward)) s += "\t\tReward " + attrib.reward + Environment.NewLine;
393395
s += "\t}" + Environment.NewLine;

0 commit comments

Comments
 (0)