morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the player settings page generating yaml files with string keys containing integers

Browse Source
This commit is contained in:
Chris Wilson
2020-10-18 00:51:50 -04:00
parent e0f1f4ecfa
commit c714131b37
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mystery.py
View File

@@ -334,7 +334,7 @@ def roll_settings(weights):
ret.crystals_ganon = get_choice('ganon_open', weights) ret.crystals_ganon = get_choice('ganon_open', weights)
extra_pieces = get_choice('triforce_pieces_mode', weights, 'available'); extra_pieces = get_choice('triforce_pieces_mode', weights, 'available')
ret.triforce_pieces_required = get_choice('triforce_pieces_required', weights, 20) ret.triforce_pieces_required = get_choice('triforce_pieces_required', weights, 20)
ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 90) ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 90)

2
WebHostLib/static/assets/player-settings.js
View File

@@ -147,7 +147,7 @@ const getSettingValue = (settings, keyString) => {
const exportSettings = () => { const exportSettings = () => {
const presetNumber = document.getElementById('preset-number').value; const presetNumber = document.getElementById('preset-number').value;
const settings = JSON.parse(localStorage.getItem(`playerSettings${presetNumber}`)); const settings = JSON.parse(localStorage.getItem(`playerSettings${presetNumber}`));
const yamlText = jsyaml.safeDump(settings); const yamlText = jsyaml.safeDump(settings, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);
download(`${settings.description}.yaml`, yamlText); download(`${settings.description}.yaml`, yamlText);
}; };

12
WebHostLib/static/static/playerSettings.json
View File

@@ -402,19 +402,19 @@
"keyString": "triforce_pieces_required.30", "keyString": "triforce_pieces_required.30",
"friendlyName": 30, "friendlyName": 30,
"description": "30 Triforce pieces are required before speaking with Murahadala.", "description": "30 Triforce pieces are required before speaking with Murahadala.",
"defaultValue": 50 "defaultValue": 0
}, },
"40": { "40": {
"keyString": "triforce_pieces_required.40", "keyString": "triforce_pieces_required.40",
"friendlyName": 40, "friendlyName": 40,
"description": "40 Triforce pieces are required before speaking with Murahadala.", "description": "40 Triforce pieces are required before speaking with Murahadala.",
"defaultValue": 50 "defaultValue": 0
}, },
"50": { "50": {
"keyString": "triforce_pieces_required.50", "keyString": "triforce_pieces_required.50",
"friendlyName": 50, "friendlyName": 50,
"description": "50 Triforce pieces are required before speaking with Murahadala.", "description": "50 Triforce pieces are required before speaking with Murahadala.",
"defaultValue": 50 "defaultValue": 0
} }
} }
}, },
@@ -466,13 +466,13 @@
"keyString": "triforce_pieces_available.40", "keyString": "triforce_pieces_available.40",
"friendlyName": 40, "friendlyName": 40,
"description": "40 Triforce pieces will be hidden throughout Hyrule", "description": "40 Triforce pieces will be hidden throughout Hyrule",
"defaultValue": 50 "defaultValue": 0
}, },
"50": { "50": {
"keyString": "triforce_pieces_available.50", "keyString": "triforce_pieces_available.50",
"friendlyName": 50, "friendlyName": 50,
"description": "50 Triforce pieces will be hidden throughout Hyrule", "description": "50 Triforce pieces will be hidden throughout Hyrule",
"defaultValue": 50 "defaultValue": 0
} }
} }
}, },
@@ -492,7 +492,7 @@
"keyString": "triforce_pieces_extra.5", "keyString": "triforce_pieces_extra.5",
"friendlyName": 5, "friendlyName": 5,
"description": "5 extra Triforce pieces will be hidden throughout Hyrule", "description": "5 extra Triforce pieces will be hidden throughout Hyrule",
"defaultValue": 50 "defaultValue": 0
}, },
"10": { "10": {
"keyString": "triforce_pieces_extra.10", "keyString": "triforce_pieces_extra.10",