Skip to content

Commit cee411a

Browse files
committed
made each mode variant toggleable (closes #10)
1 parent eb91488 commit cee411a

6 files changed

Lines changed: 51 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
## 21.2.0
2+
**:sparkles: Features**
3+
- Made each mode variant toggleable ([#10](https://git.omni.ms/vintage-story-mods/durable-better-prospecting/issues/10))
4+
25
**:bug: Bug Fixes**
36
- Re-added mod icon ([#12](https://git.omni.ms/vintage-story-mods/durable-better-prospecting/issues/12))
47

DurableBetterProspecting/Managers/LegacyConfigManager.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,23 @@ public void Migrate()
6868
commonConfig.RockMode.DurabilityCost = legacyConfig.RockModeDurabilityCost;
6969
commonConfig.RockMode.SampleSize = legacyConfig.RockModeSize;
7070

71-
commonConfig.DistanceMode.Enabled = legacyConfig.DistanceModeEnabled;
71+
commonConfig.DistanceMode.EnabledShort = legacyConfig.DistanceModeEnabled;
7272
commonConfig.DistanceMode.DurabilityCostShort = legacyConfig.DistanceModeSmallDurabilityCost;
7373
commonConfig.DistanceMode.SampleSizeShort = legacyConfig.DistanceModeSmallSize;
74+
commonConfig.DistanceMode.EnabledMedium = legacyConfig.DistanceModeEnabled;
7475
commonConfig.DistanceMode.DurabilityCostMedium = legacyConfig.DistanceModeMediumDurabilityCost;
7576
commonConfig.DistanceMode.SampleSizeMedium = legacyConfig.DistanceModeMediumSize;
77+
commonConfig.DistanceMode.EnabledLong = legacyConfig.DistanceModeEnabled;
7678
commonConfig.DistanceMode.DurabilityCostLong = legacyConfig.DistanceModeLargeDurabilityCost;
7779
commonConfig.DistanceMode.SampleSizeLong = legacyConfig.DistanceModeLargeSize;
7880

79-
commonConfig.QuantityMode.Enabled = legacyConfig.AreaModeEnabled;
81+
commonConfig.QuantityMode.EnabledShort = legacyConfig.AreaModeEnabled;
8082
commonConfig.QuantityMode.DurabilityCostShort = legacyConfig.AreaModeSmallDurabilityCost;
8183
commonConfig.QuantityMode.SampleSizeShort = legacyConfig.AreaModeSmallSize;
84+
commonConfig.QuantityMode.EnabledMedium = legacyConfig.AreaModeEnabled;
8285
commonConfig.QuantityMode.DurabilityCostMedium = legacyConfig.AreaModeMediumDurabilityCost;
8386
commonConfig.QuantityMode.SampleSizeMedium = legacyConfig.AreaModeMediumSize;
87+
commonConfig.QuantityMode.EnabledLong = legacyConfig.AreaModeEnabled;
8488
commonConfig.QuantityMode.DurabilityCostLong = legacyConfig.AreaModeLargeDurabilityCost;
8589
commonConfig.QuantityMode.SampleSizeLong = legacyConfig.AreaModeLargeSize;
8690

DurableBetterProspecting/Managers/ModeManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private void CreateModes()
156156
SampleType = SampleType.Ore,
157157
SampleSize = _commonConfig.DistanceMode.SampleSizeShort,
158158
DurabilityCost = _commonConfig.DistanceMode.DurabilityCostShort,
159-
Enabled = _commonConfig.DistanceMode.Enabled
159+
Enabled = _commonConfig.DistanceMode.EnabledShort
160160
};
161161

162162
DistanceMediumMode = new PickaxeMode
@@ -168,7 +168,7 @@ private void CreateModes()
168168
SampleType = SampleType.Ore,
169169
SampleSize = _commonConfig.DistanceMode.SampleSizeMedium,
170170
DurabilityCost = _commonConfig.DistanceMode.DurabilityCostMedium,
171-
Enabled = _commonConfig.DistanceMode.Enabled
171+
Enabled = _commonConfig.DistanceMode.EnabledMedium
172172
};
173173

174174
DistanceLongMode = new PickaxeMode
@@ -180,7 +180,7 @@ private void CreateModes()
180180
SampleType = SampleType.Ore,
181181
SampleSize = _commonConfig.DistanceMode.SampleSizeLong,
182182
DurabilityCost = _commonConfig.DistanceMode.DurabilityCostLong,
183-
Enabled = _commonConfig.DistanceMode.Enabled
183+
Enabled = _commonConfig.DistanceMode.EnabledLong
184184
};
185185

186186
QuantityShortMode = new PickaxeMode
@@ -192,7 +192,7 @@ private void CreateModes()
192192
SampleType = SampleType.Ore,
193193
SampleSize = _commonConfig.QuantityMode.SampleSizeShort,
194194
DurabilityCost = _commonConfig.QuantityMode.DurabilityCostShort,
195-
Enabled = _commonConfig.QuantityMode.Enabled
195+
Enabled = _commonConfig.QuantityMode.EnabledShort
196196
};
197197

198198
QuantityMediumMode = new PickaxeMode
@@ -204,7 +204,7 @@ private void CreateModes()
204204
SampleType = SampleType.Ore,
205205
SampleSize = _commonConfig.QuantityMode.SampleSizeMedium,
206206
DurabilityCost = _commonConfig.QuantityMode.DurabilityCostMedium,
207-
Enabled = _commonConfig.QuantityMode.Enabled
207+
Enabled = _commonConfig.QuantityMode.EnabledMedium
208208
};
209209

210210
QuantityLongMode = new PickaxeMode
@@ -216,7 +216,7 @@ private void CreateModes()
216216
SampleType = SampleType.Ore,
217217
SampleSize = _commonConfig.QuantityMode.SampleSizeLong,
218218
DurabilityCost = _commonConfig.QuantityMode.DurabilityCostLong,
219-
Enabled = _commonConfig.QuantityMode.Enabled
219+
Enabled = _commonConfig.QuantityMode.EnabledLong
220220
};
221221

222222
_modes =

DurableBetterProspecting/assets/durablebetterprospecting/lang/en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141

4242
"config--button--reset": "Reset to default: {0}",
4343
"config--label--enabled": "Enabled",
44+
"config--label--enabled-short": "Enabled (Short Range)",
45+
"config--label--enabled-medium": "Enabled (Medium Range)",
46+
"config--label--enabled-long": "Enabled (Long Range)",
4447
"config--label--allowed": "Allowed",
4548
"config--label--threshold": "Threshold",
4649
"config--label--durability-cost": "Durability Cost",

DurableBetterProspecting/buildConfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"outputSubdir": "durablebetterprospecting",
44
"substitute": [
55
"DurableBetterProspectingSystem.cs",
6+
"config.json",
67
"modinfo.json"
78
]
89
}

DurableBetterProspecting/config.json

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@
241241
"description": "Distance mode configuration",
242242
"entries": [
243243
{
244-
"name": "Enabled",
244+
"name": "EnabledShort",
245245
"type": "Bool",
246246
"defaultValue": true,
247-
"label": "config--label--enabled",
247+
"label": "config--label--enabled-short",
248248
"description": null
249249
},
250250
{
@@ -261,6 +261,13 @@
261261
"label": "config--label--sample-size-short",
262262
"description": "config--description--sample-size-cube"
263263
},
264+
{
265+
"name": "EnabledMedium",
266+
"type": "Bool",
267+
"defaultValue": true,
268+
"label": "config--label--enabled-medium",
269+
"description": null
270+
},
264271
{
265272
"name": "DurabilityCostMedium",
266273
"type": "Int32",
@@ -275,6 +282,13 @@
275282
"label": "config--label--sample-size-medium",
276283
"description": "config--description--sample-size-cube"
277284
},
285+
{
286+
"name": "EnabledLong",
287+
"type": "Bool",
288+
"defaultValue": true,
289+
"label": "config--label--enabled-long",
290+
"description": null
291+
},
278292
{
279293
"name": "DurabilityCostLong",
280294
"type": "Int32",
@@ -297,10 +311,10 @@
297311
"description": "Quantity mode configuration",
298312
"entries": [
299313
{
300-
"name": "Enabled",
314+
"name": "EnabledShort",
301315
"type": "Bool",
302316
"defaultValue": true,
303-
"label": "config--label--enabled",
317+
"label": "config--label--enabled-short",
304318
"description": null
305319
},
306320
{
@@ -317,6 +331,13 @@
317331
"label": "config--label--sample-size-short",
318332
"description": "config--description--sample-size-cube"
319333
},
334+
{
335+
"name": "EnabledMedium",
336+
"type": "Bool",
337+
"defaultValue": true,
338+
"label": "config--label--enabled-medium",
339+
"description": null
340+
},
320341
{
321342
"name": "DurabilityCostMedium",
322343
"type": "Int32",
@@ -331,6 +352,13 @@
331352
"label": "config--label--sample-size-medium",
332353
"description": "config--description--sample-size-cube"
333354
},
355+
{
356+
"name": "EnabledLong",
357+
"type": "Bool",
358+
"defaultValue": true,
359+
"label": "config--label--enabled-long",
360+
"description": null
361+
},
334362
{
335363
"name": "DurabilityCostLong",
336364
"type": "Int32",

0 commit comments

Comments
 (0)