Skip to content

Commit d0e9ef9

Browse files
authored
System updates (#116)
* Reworked burrow to support the new system condition of burrowing * Reworked how we process differences from the system - We now use the system as our base and then override properties with whatever is in the config. - Added activeEffectCustomized to mark that a user has changed an active effect and therefore we should not overwrite it with what's in the system. * Added a button to reset individual conditions from the lab * Updated swade min version since we now depend on their burrowing condition * Cleaned up the reset dialog a bit to work better when resetting a single condition * Cleanup and bug fixes with condition reset * Fixed missing remove row button * Changed the remove to only appear on conditions added by the lab * Removed duplicate functions * Fixed null error * Fixed typo * Updated icon and behaviour of burrowing to align with flying
1 parent c76e1f7 commit d0e9ef9

19 files changed

+179
-113
lines changed

succ/assets/icons/1-burrowing.svg

Lines changed: 6 additions & 0 deletions
Loading

succ/assets/icons/1-flying.svg

Lines changed: 0 additions & 1 deletion
Loading

succ/assets/icons/m-burrow.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

succ/config/condition-config-module-overrides/swade-core-rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"referenceId": "@UUID[Compendium.swade-core-rules.swade-powers.Item.YCK7uLmPENKq0Zdb]"
152152
},
153153
{
154-
"id": "burrow",
154+
"id": "burrowing",
155155
"referenceId": "@UUID[Compendium.swade-core-rules.swade-powers.Item.cLRfMRfjBZZBQmFW]"
156156
},
157157
{

succ/config/condition-config-module-overrides/swade-fantasy-companion.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"referenceId": "@UUID[Compendium.swade-fantasy-companion.swade-fc-powers.Item.qjflUvZxnhUF91dS]"
3636
},
3737
{
38-
"id": "burrow",
38+
"id": "burrowing",
3939
"referenceId": "@UUID[Compendium.swade-fantasy-companion.swade-fc-powers.Item.BXORrKNOSAwAXW3m]"
4040
},
4141
{

succ/config/condition-config-module-overrides/swpf-core-rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"referenceId": "@UUID[Compendium.swpf-core-rules.swpf-powers.Item.0idlYkwVS0ox5btN]"
175175
},
176176
{
177-
"id": "burrow",
177+
"id": "burrowing",
178178
"referenceId": "@UUID[Compendium.swpf-core-rules.swpf-powers.Item.jGCxdBPUHrSSrucJ]"
179179
},
180180
{

succ/config/condition-config.json

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@
6262
"fly": true
6363
}
6464
},
65+
{
66+
"id": "burrowing",
67+
"name": "SWADE.Burrowing",
68+
"img": "modules/succ/assets/icons/1-burrowing.svg",
69+
"referenceId": "@UUID[Compendium.swade.powers.Item.cLRfMRfjBZZBQmFW]",
70+
"options": {
71+
"burrow": true
72+
}
73+
},
6574
{
6675
"id": "holding",
6776
"name": "SWADE.Holding",
@@ -297,23 +306,6 @@
297306
}
298307
}
299308
},
300-
{
301-
"id": "burrow",
302-
"name": "ENHANCED_CONDITIONS.Condition.Burrow",
303-
"img": "modules/succ/assets/icons/m-burrow.svg",
304-
"referenceId": "@UUID[Compendium.swade.powers.Item.cLRfMRfjBZZBQmFW]",
305-
"activeEffect": {
306-
"system": {
307-
"expiration": 3
308-
},
309-
"duration": {
310-
"rounds": 5
311-
}
312-
},
313-
"options": {
314-
"burrow": true
315-
}
316-
},
317309
{
318310
"id": "confusion",
319311
"name": "ENHANCED_CONDITIONS.Condition.Confusion",

succ/config/default-condition-groups/expanded-powers.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"canBeDisabled": true,
77
"conditions": [
88
{"id":"arcane-protection", "enabledByDefault": false},
9-
{"id":"burrow", "enabledByDefault": false},
109
{"id":"confusion", "enabledByDefault": false},
1110
{"id":"damage-field", "enabledByDefault": false},
1211
{"id":"deflection", "enabledByDefault": false},

succ/config/default-condition-groups/system-uncommon.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{"id":"berserk", "enabledByDefault": true},
99
{"id":"blind", "enabledByDefault": true},
1010
{"id":"boost", "enabledByDefault": true},
11+
{"id":"burrowing", "enabledByDefault": true},
1112
{"id":"frightened", "enabledByDefault": true},
1213
{"id":"invisible", "enabledByDefault": true},
1314
{"id":"lower", "enabledByDefault": true},

succ/lang/en.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,19 +221,21 @@
221221
"ENHANCED_CONDITIONS.Lab.SaveMacro.Title": "Creates a toggle condition macro and adds it to the hotbar",
222222
"ENHANCED_CONDITIONS.Lab.CreatedToggleMacro.Name": "Toggle ",
223223
"ENHANCED_CONDITIONS.Lab.MacrosConfig.Button": "Macros Config",
224+
"ENHANCED_CONDITIONS.Lab.ResetCondition.Button": "Reset",
224225
"ENHANCED_CONDITIONS.Lab.Import.NoFile": "You did not upload a data file!",
225226
"ENHANCED_CONDITIONS.Lab.ConfirmDeleteTitle": "Confirm Row Deletion",
226227
"ENHANCED_CONDITIONS.Lab.ConfirmDeleteContent": "Are you sure you want to delete this row?",
227228
"ENHANCED_CONDITIONS.Lab.RestoreDefaultsTitle": "Restore Defaults?",
228229
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.Body": "<p>Are you sure you want to restore this mapping to defaults?</p><strong>If you save, this change will be permanent.</strong>",
230+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.Condition.Body": "<p>Are you sure you want to restore {0} to default?</p><strong>If you save, this change will be permanent.</strong>",
229231
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ClearCache": "Clear cache and reload defaults from module folder",
230232
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.RemoveAdded": "Remove conditions added through the Condition Lab",
231-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetActiveEffects": "Reset Active Effects",
232-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetIcons": "Reset Icons",
233-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetMacros": "Reset Macros",
234-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetNames": "Reset Names",
235-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetOptions": "Reset Options",
236-
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetReferenceLinks": "Reset Reference Links",
233+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetActiveEffects": "Reset Active Effect",
234+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetIcons": "Reset Icon",
235+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetMacros": "Reset Macro",
236+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetNames": "Reset Name",
237+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetOptions": "Reset Option",
238+
"ENHANCED_CONDITIONS.Lab.RestoreDefaults.ResetReferenceLinks": "Reset Reference Link",
237239
"ENHANCED_CONDITIONS.Lab.ResetFormTitle": "Reset Form?",
238240
"ENHANCED_CONDITIONS.Lab.ResetFormContent": "<p>Are you sure you want to reset the form?</p><p><strong>You will lose any unsaved changes.</strong></p>",
239241
"ENHANCED_CONDITIONS.Lab.SaveFailed": "Condition Lab failed to Save and Close",
@@ -268,7 +270,6 @@
268270
"ENHANCED_CONDITIONS.Condition.Rage": "Rage",
269271
"ENHANCED_CONDITIONS.Condition.Deflection": "Deflection",
270272
"ENHANCED_CONDITIONS.Condition.ArcaneProtection": "Arcane Protection",
271-
"ENHANCED_CONDITIONS.Condition.Burrow": "Burrow",
272273
"ENHANCED_CONDITIONS.Condition.Confusion": "Confusion",
273274
"ENHANCED_CONDITIONS.Condition.DamageField": "Damage Field",
274275
"ENHANCED_CONDITIONS.Condition.ElementalManipulation": "Elemental Manipulation",

0 commit comments

Comments
 (0)