Skip to content

Commit 3686a3b

Browse files
committed
Added more DLC items. Added option to show all possible items for events in addition to missing ones. Added potential loot note for events the analzyer is not aware of.
1 parent 3fad578 commit 3686a3b

File tree

9 files changed

+92
-9
lines changed

9 files changed

+92
-9
lines changed

App.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<setting name="MissingItemColor" serializeAs="String">
5050
<value>Red</value>
5151
</setting>
52+
<setting name="ShowPossibleItems" serializeAs="String">
53+
<value>False</value>
54+
</setting>
5255
</RemnantSaveManager.Properties.Settings>
5356
</userSettings>
5457
</configuration>

MainWindow.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<CheckBox x:Name="chkCreateLogFile" Content="Create log file" ToolTip="Whether a log.txt file should be created" HorizontalAlignment="Left" Margin="10,123,0,0" VerticalAlignment="Top" Click="chkCreateLogFile_Click" TabIndex="105"/>
9797
<ComboBox x:Name="cmbMissingItemColor" HorizontalAlignment="Left" Margin="10,143,0,0" VerticalAlignment="Top" Width="113"/>
9898
<Label Content="World analzyer missing item color" HorizontalAlignment="Left" Margin="128,139,0,0" VerticalAlignment="Top"/>
99+
<CheckBox x:Name="chkShowPossibleItems" Content="Show possible items in analyzer" HorizontalAlignment="Left" Margin="322,145,0,0" VerticalAlignment="Top" Click="chkShowPossibleItems_Click"/>
99100
</Grid>
100101
</TabItem>
101102
<TabItem Header="Log">

MainWindow.xaml.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,5 +1049,13 @@ private void cmbMissingItemColorSelectionChanged(object sender, RoutedEventArgs
10491049
Properties.Settings.Default.Save();
10501050
updateCurrentWorldAnalyzer();
10511051
}
1052+
1053+
private void chkShowPossibleItems_Click(object sender, RoutedEventArgs e)
1054+
{
1055+
bool newValue = chkShowPossibleItems.IsChecked.HasValue ? chkShowPossibleItems.IsChecked.Value : false;
1056+
Properties.Settings.Default.ShowPossibleItems = newValue;
1057+
Properties.Settings.Default.Save();
1058+
updateCurrentWorldAnalyzer();
1059+
}
10521060
}
10531061
}

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.95.34.0")]
55-
[assembly: AssemblyFileVersion("1.95.34.0")]
54+
[assembly: AssemblyVersion("1.95.35.0")]
55+
[assembly: AssemblyFileVersion("1.95.35.0")]

Properties/Settings.Designer.cs

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Properties/Settings.settings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@
4141
<Setting Name="MissingItemColor" Type="System.String" Scope="User">
4242
<Value Profile="(Default)">Red</Value>
4343
</Setting>
44+
<Setting Name="ShowPossibleItems" Type="System.Boolean" Scope="User">
45+
<Value Profile="(Default)">False</Value>
46+
</Setting>
4447
</Settings>
4548
</SettingsFile>

RemnantWorldEvent.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ public string MissingItems {
2222
return string.Join("\n", mItems);
2323
}
2424
}
25+
public string PossibleItems
26+
{
27+
get
28+
{
29+
return string.Join("\n", this.getPossibleItems());
30+
}
31+
}
2532
public enum ProcessMode { Campaign, Adventure, Subject2923 };
2633

2734
public string getKey()
@@ -56,6 +63,12 @@ public void setMissingItems(RemnantCharacter charData)
5663
}
5764
}
5865
mItems = missingItems;
66+
67+
if (possibleItems.Count == 0 && !GameInfo.Events.ContainsKey(this.getKey()) && !this.getKey().Equals("TraitBook") && !this.getKey().Equals("Simulacrum"))
68+
{
69+
RemnantItem ri = new RemnantItem("/UnknownPotentialLoot");
70+
mItems.Add(ri);
71+
}
5972
}
6073

6174
public override string ToString()
@@ -424,7 +437,7 @@ static private string getEventType(string textLine)
424437
eventType = "Item Drop";
425438
}
426439
}
427-
else if (textLine.Contains("OverworldPOI") || textLine.Contains("OverWorldPOI"))
440+
else if (textLine.Contains("OverworldPOI") || textLine.Contains("OverworlPOI"))
428441
{
429442
eventType = "Point of Interest";
430443
}

Resources/GameInfo.xml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<GameInfo version="33">
2+
<GameInfo version="34">
33
<Zones>
44
<Zone name="Earth"/>
55
<Zone name="Rhom"/>
@@ -73,6 +73,7 @@
7373
<MainLocation key="Jungle Overworld Zone1" name="TheVerdantStrand"/>
7474
<MainLocation key="Jungle Overworld Zone2" name="TheScaldingGlade"/>
7575
<MainLocation key="Rural Overworld 01" name="Rural"/>
76+
<MainLocation key="Rural Overworld 02" name="Rural"/>
7677
<MainLocation key="Snow Overworld Zone1" name="DrolniirWoods"/>
7778
<MainLocation key="Snow Overworld Zone2" name="DeepfrostExpanse"/>
7879
</MainLocations>
@@ -93,6 +94,9 @@
9394
<Event name="AggressorsBane">
9495
<Item>/Items/Trinkets/AggressorsBane</Item>
9596
</Event>
97+
<Event name="AlchemistsJewel" altname="Alchemist'sJewel">
98+
<Item dlc="Subject 2923">/Items/Trinkets/Trinket_AlchemistsJewel</Item>
99+
</Event>
96100
<Event name="ArmorVault">
97101
<Item>/Items/Armor/Akari/Armor_Head_Akari</Item>
98102
<Item>/Items/Armor/Akari/Armor_Body_Akari</Item>
@@ -215,6 +219,9 @@
215219
<Item>/Items/Trinkets/HerosRing</Item>
216220
<Item>/Items/Traits/Trait_Fortification</Item>
217221
</Event>
222+
<Event name="FiveFingeredRing">
223+
<Item dlc="Subject 2923" notes="Random drop on rural Earth">/Items/Trinkets/FiveFingeredRing</Item>
224+
</Event>
218225
<Event name="Flautist">
219226
<Item>/Items/Trinkets/Trinket_HeartOfTheWolf</Item>
220227
<Item>/Items/Traits/Trait_Swiftness</Item>
@@ -254,6 +261,9 @@
254261
<Event name="HeartSeeker">
255262
<Item>/Items/Trinkets/HeartSeeker</Item>
256263
</Event>
264+
<Event name="Homestead">
265+
<Item dlc="Subject 2923">/Items/Trinkets/VanguardRing</Item>
266+
</Event>
257267
<Event name="HoundMaster">
258268
<Item>/Items/Mods/HowlersImmunity</Item>
259269
</Event>
@@ -285,6 +295,9 @@
285295
<Item>/Items/Armor/Slayer/Armor_Body_Slayer</Item>
286296
<Item>/Items/Armor/Slayer/Armor_Legs_Slayer</Item>
287297
</Event>
298+
<Event name="JanitorsWatch">
299+
<Item dlc="Subject 2923" notes="Give Janitor's Watch to Clementine">/Items/Trinkets/AmberMoonstone</Item>
300+
</Event>
288301
<Event name="KeepersRing">
289302
<Item>/Items/Trinkets/Trinket_KeepersRing</Item>
290303
</Event>
@@ -412,7 +425,9 @@
412425
<Item>/Items/Armor/Twisted/Armor_Body_Twisted</Item>
413426
<Item>/Items/Armor/Twisted/Armor_Legs_Twisted</Item>
414427
</Event>
415-
<Event name="Sagestone">
428+
<Event name="Ruins">
429+
</Event>
430+
<Event name="SageStone">
416431
<Item>/Items/Trinkets/Trinket_Sagestone</Item>
417432
</Event>
418433
<Event name="Sentinel" altname="Raze">
@@ -421,6 +436,8 @@
421436
<Event name="SerpentsFang">
422437
<Item dlc="Subject 2923" notes="Random drop on Reisum">/Items/Trinkets/SerpentsFang</Item>
423438
</Event>
439+
<Event name="Settlement">
440+
</Event>
424441
<Event name="ShamanFlames">
425442
<Item dlc="Subject 2923">/Items/Trinkets/Trinket_PrismaticDiamondRing</Item>
426443
</Event>
@@ -554,6 +571,7 @@
554571
<Item>/Items/Traits/Trait_WillToLive</Item>
555572
<Item>/Items/Traits/Trait_WorldWalker</Item>
556573
<Item>/Items/Traits/Trait_Invoker</Item>
574+
<Item notes="Obtain 25 weapon mods">/Items/Traits/Trait_FlashCaster</Item>
557575
<Item notes="Vault over 50 ledges">/Items/Traits/Trait_Climber</Item>
558576
<Item notes="Deal 5,000 damage to armored points on enemies">/Items/Traits/Trait_ArmorPiercer</Item>
559577
<Item notes="Get 100 kills using explosion damage">/Items/Traits/Trait_Demolitionist</Item>
@@ -562,17 +580,24 @@
562580
<Item>/Player/Emotes/Emote_Wave</Item>
563581
<Item mode="survival" notes="Reward for 5 consecutive boss kills">/Items/Armor/Adventurer/Armor_Head_Adventurer</Item>
564582
<Item mode="survival" notes="Reward for 10 consecutive boss kills">/Items/Weapons/Human/Melee/Sword/Weapon_HerosSword</Item>
565-
<Item mode="survival" notes="Reward for 100 total boss kills">/Items/Trinkets/BlackRose</Item>
566-
<Item mode="survival" notes="Reward for 75 total boss kills">/Items/Trinkets/DaredevilsCharm</Item>
567583
<Item mode="survival" notes="Reward for 25 total boss kills">/Items/Trinkets/Trinket_LoopOfProsperity</Item>
568584
<Item mode="survival" notes="Reward for 50 total boss kills">/Items/Trinkets/TalismanOfPerseverance</Item>
585+
<Item mode="survival" notes="Reward for 75 total boss kills">/Items/Trinkets/DaredevilsCharm</Item>
586+
<Item mode="survival" notes="Reward for 100 total boss kills">/Items/Trinkets/BlackRose</Item>
587+
<Item mode="survival" notes="Reward for defeating all minibosses twice(?)">/Items/Trinkets/BlackCatBand</Item>
588+
<Item mode="survival" notes="Reward for defeating all world bosses twice(?)">/Items/Trinkets/BrightSteelRing</Item>
589+
<Item mode="survival" notes="Reward for defeating all bosses an unknown number of times">/Items/Trinkets/WhiteRose</Item>
590+
<Item mode="survival" notes="Purchase 100 items">/Items/Trinkets/RingOfFlawlessBeauty</Item>
569591
<Item mode="hardcore" notes="Reward for defeating Clavinger/Harrow">/Items/Trinkets/AkariWarBand</Item>
570592
<Item mode="hardcore" notes="Reward for defeating Ixillis">/Items/Trinkets/Trinket_EmpoweringLoop</Item>
571593
<Item mode="hardcore" notes="Reward for defeating Singe/Ent">/Items/Trinkets/Trinket_ProvisionerRing</Item>
572594
<Item mode="hardcore" notes="Reward for defeating Totem Father/Ravager">/Items/Trinkets/RingOfSumpremacy</Item>
573595
<Item mode="hardcore" notes="Reward for defeating Dreamer">/Items/Trinkets/Trinket_NightmareSpiral</Item>
574596
<Item mode="hardcore" notes="Reward for defeating Dreamer">/Player/Emotes/Emote_HighFive</Item>
575597
<Item mode="hardcore" notes="High five emote another player">/Items/Trinkets/Trinket_BandOfAccord</Item>
598+
<Item mode="hardcore" notes="Reward for defeating Brudvaak and Vargr" dlc="Subject 2923">/Items/Trinkets/RingOfPunisher</Item>
599+
<Item mode="hardcore" notes="Reward for defeating Root Harbinger" dlc="Subject 2923">/Items/Trinkets/Trinket_ShatteredVertebrae</Item>
600+
<Item mode="hardcore" notes="Reward for completing both campaigns" dlc="Subject 2923">/Items/Trinkets/Trinket_OnyxPendulum</Item>
576601
</Event>
577602
<Event name="VolatileGem">
578603
<Item dlc="Subject 2923" notes="Random drop on Reisum">/Items/Trinkets/VolatileGem</Item>

SaveAnalyzer.xaml.cs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,25 @@ private void autoGeneratingColumn(object sender, DataGridAutoGeneratingColumnEve
231231
{
232232
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.ForegroundProperty, new SolidColorBrush(analyzerColor.textColor)));
233233
}
234-
} else
234+
} else if (e.Column.Header.Equals("PossibleItems"))
235+
{
236+
if (!Properties.Settings.Default.ShowPossibleItems)
237+
{
238+
e.Cancel = true;
239+
return;
240+
}
241+
e.Column.Header = "Possible Items";
242+
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.FontSizeProperty, ((fontSize / 3) * 2)));
243+
if (Properties.Settings.Default.MissingItemColor.Equals("Red"))
244+
{
245+
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.ForegroundProperty, new SolidColorBrush(Colors.Red)));
246+
}
247+
else
248+
{
249+
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.ForegroundProperty, new SolidColorBrush(analyzerColor.textColor)));
250+
}
251+
}
252+
else
235253
{
236254
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.FontSizeProperty, fontSize));
237255
e.Column.CellStyle.Setters.Add(new Setter(DataGridCell.ForegroundProperty, new SolidColorBrush(analyzerColor.textColor)));

0 commit comments

Comments
 (0)