Skip to content

Commit aa55788

Browse files
danx91danx91
committed
Add OnlyActiveQuests option
1 parent 10551cb commit aa55788

8 files changed

Lines changed: 70 additions & 36 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ AllQuestsCheckmarks-Server/package-lock.json
1010

1111
**/.vs/
1212
**/bin/
13-
**/obj/
13+
**/obj/
14+
15+
TODO.md

‎AllQuestsCheckmarks-Core/Helpers/Settings.cs‎

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ internal static class Settings
1515
public static ConfigEntry<bool> IncludeLoyaltyRegain;
1616
public static ConfigEntry<bool> IncludeNonFir;
1717
public static ConfigEntry<bool> HideFulfilled;
18+
public static ConfigEntry<bool> OnlyActiveQuests;
1819
public static ConfigEntry<bool> IncludeRaidItems;
1920
public static ConfigEntry<bool> SquadQuests;
2021
public static ConfigEntry<bool> MarkEnoughItems;
@@ -73,13 +74,20 @@ public void Parse()
7374

7475
public static void Init(ConfigFile config)
7576
{
77+
int generalIndex = 99;
78+
int colorsIndex = 199;
79+
int textIndex = 299;
80+
81+
/*
82+
* GENERAL
83+
*/
7684
IncludeCollector = config.Bind(
7785
"1. General",
7886
"Include Collector quest (Fence)",
7987
true,
8088
MakeDescription(
8189
"Whether or not to include items needed for Collector quest",
82-
99
90+
generalIndex--
8391
)
8492
);
8593

@@ -89,7 +97,7 @@ public static void Init(ConfigFile config)
8997
true,
9098
MakeDescription(
9199
"Whether or not to include quests that don't require found in raid items",
92-
98
100+
generalIndex--
93101
)
94102
);
95103

@@ -99,7 +107,7 @@ public static void Init(ConfigFile config)
99107
false,
100108
MakeDescription(
101109
"Whether or not to include quests for regaining loyalty (Compensation for Damage (Fence), Make Amends (Lightkeeper) & Chemical questline finale)",
102-
97
110+
generalIndex--
103111
)
104112
);
105113

@@ -110,7 +118,17 @@ public static void Init(ConfigFile config)
110118
MakeDescription(
111119
"Whether or not to hide checkmark in raid on items that you have enough for all active and future quests. Be careful when using with " +
112120
"'Include items in PMC inventory (in raid)', as this combo may hide checkmarks while still in raid!",
113-
96
121+
generalIndex--
122+
)
123+
);
124+
125+
OnlyActiveQuests = config.Bind(
126+
"1. General",
127+
"Show only active quests",
128+
false,
129+
MakeDescription(
130+
"Whether or not to show only active quests (no future quests)",
131+
generalIndex--
114132
)
115133
);
116134

@@ -120,32 +138,35 @@ public static void Init(ConfigFile config)
120138
false,
121139
MakeDescription(
122140
"Whether or not to include items in PMC inventory while in raid in 'In Stash' count",
123-
95
141+
generalIndex--
124142
)
125143
);
126144

145+
/*
146+
* COLORS
147+
*/
127148
CheckmarkColor = config.BindColor(
128149
"2. Colors",
129150
"Checkmark color",
130151
"#bf00ff",
131152
"Color of checkmark if item is not currently needed but is required for future quests",
132-
199
153+
colorsIndex--
133154
);
134155

135156
NonFirColor = config.BindColor(
136157
"2. Colors",
137158
"Checkmark color (non-FIR)",
138159
"#73264d",
139160
"Color of checkmark if non-FiR item is not currently needed but is required for future quests",
140-
198
161+
colorsIndex--
141162
);
142163

143164
CollectorColor = config.BindColor(
144165
"2. Colors",
145166
"Collector color",
146167
"#bf00ff",
147168
"Color of checkmark for collector quest",
148-
197
169+
colorsIndex--
149170
);
150171

151172
MarkEnoughItems = config.Bind(
@@ -155,7 +176,7 @@ public static void Init(ConfigFile config)
155176
MakeDescription(
156177
"Whether or not to use different checkmark color if you have enough items for all quests. " +
157178
"'Hide checkmark if have enough' option will hide this checkmark while in raid",
158-
195
179+
generalIndex--
159180
)
160181
);
161182

@@ -164,7 +185,7 @@ public static void Init(ConfigFile config)
164185
"Have enough color",
165186
"#00ff00",
166187
"Color of checkmark if you have enough items for all quests",
167-
194
188+
colorsIndex--
168189
);
169190

170191
UseCustomQuestColor = config.Bind(
@@ -173,7 +194,7 @@ public static void Init(ConfigFile config)
173194
false,
174195
MakeDescription(
175196
"Whether or not to use custom checkmark color for active quests",
176-
193
197+
generalIndex--
177198
)
178199
);
179200

@@ -182,16 +203,19 @@ public static void Init(ConfigFile config)
182203
"Custom quest color",
183204
"#ffeb6d",
184205
"Custom color of default quest checkmark",
185-
192
206+
colorsIndex--
186207
);
187208

209+
/*
210+
* TEXT
211+
*/
188212
BulletPoints = config.Bind(
189213
"3. Text",
190214
"Use bullet points",
191215
true,
192216
MakeDescription(
193217
"Whether or not to use bullet points in quests list",
194-
299
218+
textIndex--
195219
)
196220
);
197221

@@ -201,7 +225,7 @@ public static void Init(ConfigFile config)
201225
false,
202226
MakeDescription(
203227
"Whether or not to use custom text colors",
204-
298
228+
textIndex--
205229
)
206230
);
207231

@@ -210,15 +234,15 @@ public static void Init(ConfigFile config)
210234
"Custom text color - active quests",
211235
"#dd831a",
212236
"Custom color of active quests text",
213-
297
237+
textIndex--
214238
);
215239

216240
FutureQuestTextColor = config.BindColor(
217241
"3. Text",
218242
"Custom text color - future quests",
219243
"#d24dff",
220244
"Custom color of future quests text",
221-
296
245+
textIndex--
222246
);
223247

224248
if (Plugin.isFikaInstalled)
@@ -229,7 +253,7 @@ public static void Init(ConfigFile config)
229253
true,
230254
MakeDescription(
231255
"Wether or not to mark items currently needed for players in your squad",
232-
94
256+
generalIndex--
233257
)
234258
);
235259

@@ -238,27 +262,32 @@ public static void Init(ConfigFile config)
238262
"Checkmark color (squad members)",
239263
"#ff3333",
240264
"Color of checkmark if item is not currently needed but is required for one of your squad members",
241-
196
265+
colorsIndex--
242266
);
243267

244268
SquadQuestTextColor = config.BindColor(
245269
"3. Text",
246270
"Custom text color - squad quests",
247271
"#ffc299",
248272
"Custom color of squad quests text",
249-
295
273+
textIndex--
250274
);
251275
}
252276

277+
/*
278+
* MoreCheckmarks
279+
*/
253280
if (Plugin.isMoreCheckmarksInstalled)
254281
{
282+
int moreCheckmarksIndex = 399;
283+
255284
MoreCheckmarksHideout = config.Bind(
256285
"4. MoreCheckmarks",
257286
"Include hideout upgrades",
258287
true,
259288
MakeDescription(
260289
"Whether or not to include items required for hideout upgrades from MoreCheckmarks mod",
261-
399
290+
moreCheckmarksIndex--
262291
)
263292
);
264293

@@ -268,7 +297,7 @@ public static void Init(ConfigFile config)
268297
true,
269298
MakeDescription(
270299
"Whether or not to include items required for hideout upgrades from MoreCheckmarks mod in 'Total needed' count",
271-
398
300+
moreCheckmarksIndex--
272301
)
273302
);
274303

@@ -277,7 +306,7 @@ public static void Init(ConfigFile config)
277306
"Hideout upgrades color",
278307
"#0000ff",
279308
"Color of checkmark for items required for hideout upgrades",
280-
397
309+
moreCheckmarksIndex--
281310
);
282311

283312
MoreCheckmarksBarters = config.Bind(
@@ -286,7 +315,7 @@ public static void Init(ConfigFile config)
286315
true,
287316
MakeDescription(
288317
"Whether or not to include items required for barters from MoreCheckmarks mod",
289-
396
318+
moreCheckmarksIndex--
290319
)
291320
);
292321

@@ -296,7 +325,7 @@ public static void Init(ConfigFile config)
296325
true,
297326
MakeDescription(
298327
"Whether or not to show checkmark for barter items from MoreCheckmarks mod",
299-
395
328+
moreCheckmarksIndex--
300329
)
301330
);
302331

@@ -305,18 +334,21 @@ public static void Init(ConfigFile config)
305334
"Barter color",
306335
"#00ffff",
307336
"Color of checkmark for items required for barters",
308-
394
337+
moreCheckmarksIndex--
309338
);
310339
}
311340

341+
/*
342+
* DEBUG
343+
*/
312344
ShowDebug = config.Bind(
313345
"9. Debug",
314346
"Debug logs",
315347
false,
316348
"Log debug info to Player.log"
317349
);
318350

319-
foreach(ColorEntry color in _allColors)
351+
foreach (ColorEntry color in _allColors)
320352
{
321353
color.Parse();
322354
}

‎AllQuestsCheckmarks-Core/Patches/QuestItemViewPanelPatch.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static bool Prefix(Profile profile, Item item, [CanBeNull] SimpleTooltip tooltip
136136
}
137137
}
138138

139-
if (QuestsHelper.IsNeededForActiveOrFutureQuests(item, out QuestsData.ItemData itemData))
139+
if (!Settings.OnlyActiveQuests.Value && QuestsHelper.IsNeededForActiveOrFutureQuests(item, out QuestsData.ItemData itemData))
140140
{
141141
string futureColor = useCustomTextColors ? Settings.FutureQuestTextColor.Hex : "#d24dff";
142142

‎AllQuestsCheckmarks-Core/Plugin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace AllQuestsCheckmarks
1212
{
1313
[
14-
BepInPlugin("ZGFueDkx.AllQuestCheckmarks", "AllQuestsCheckmarks", "1.2.1"),
14+
BepInPlugin("ZGFueDkx.AllQuestCheckmarks", "AllQuestsCheckmarks", "1.2.4"),
1515
BepInDependency("com.SPT.core", "3.11.0"),
1616
BepInDependency("com.fika.core", BepInDependency.DependencyFlags.SoftDependency),
1717
BepInDependency("VIP.TommySoucy.MoreCheckmarks", BepInDependency.DependencyFlags.SoftDependency)

‎AllQuestsCheckmarks-Core/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
[assembly: Guid("4644babf-09e8-4e27-b375-e955377ac32d")]
1616

17-
[assembly: AssemblyVersion("1.2.3")]
18-
[assembly: AssemblyFileVersion("1.2.3")]
17+
[assembly: AssemblyVersion("1.2.4")]
18+
[assembly: AssemblyFileVersion("1.2.4")]

‎AllQuestsCheckmarks-Fika/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
[assembly: Guid("dbd8af8b-ae48-48ef-9ab0-acad5a682eb5")]
1616

17-
[assembly: AssemblyVersion("1.2.3")]
18-
[assembly: AssemblyFileVersion("1.2.3")]
17+
[assembly: AssemblyVersion("1.2.4")]
18+
[assembly: AssemblyFileVersion("1.2.4")]

‎AllQuestsCheckmarks-MoreCheckmarks/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
[assembly: Guid("52610d18-ee50-4355-862b-7b1498dfcacd")]
1616

17-
[assembly: AssemblyVersion("1.2.3")]
18-
[assembly: AssemblyFileVersion("1.2.3")]
17+
[assembly: AssemblyVersion("1.2.4")]
18+
[assembly: AssemblyFileVersion("1.2.4")]

‎build.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"info":{
33
"name": "allquestscheckmarks",
4-
"version": "1.2.2",
4+
"version": "1.2.4",
55
"spt": "3.11"
66
},
77
"dest": {

0 commit comments

Comments
 (0)