morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into website-redesign

Browse Source
This commit is contained in:
Chris Wilson
2020-11-23 17:49:53 -05:00
parent 172d26ffb2 d95a16a09e
commit 016d09150d
23 changed files with 673 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1206,6 +1206,110 @@
}
}
},
"countdown_start_time": {
"keyString": "countdown_start_time",
"friendlyName": "Countdown Starting Time",
"description": "The amount of time, in minutes, to start with in Timed Countdown and Timed OHKO modes.",
"inputType": "range",
"subOptions": {
"0": {
"keyString": "countdown_start_time.0",
"friendlyName": 0,
"description": "Start with no time on the timer. In Timed OHKO mode, start in OHKO mode.",
"defaultValue": 0
},
"10": {
"keyString": "countdown_start_time.10",
"friendlyName": 10,
"description": "Start with 10 minutes on the timer.",
"defaultValue": 50
},
"20": {
"keyString": "countdown_start_time.20",
"friendlyName": 20,
"description": "Start with 20 minutes on the timer.",
"defaultValue": 0
},
"30": {
"keyString": "countdown_start_time.30",
"friendlyName": 30,
"description": "Start with 30 minutes on the timer.",
"defaultValue": 0
},
"60": {
"keyString": "countdown_start_time.60",
"friendlyName": 60,
"description": "Start with an hour on the timer.",
"defaultValue": 0
}
}
},
"red_clock_time": {
"keyString": "red_clock_time",
"friendlyName": "Red Clock Time",
"description": "The amount of time, in minutes, to add to or subtract from the timer upon picking up a red clock.",
"inputType": "range",
"subOptions": {
"-2": {
"keyString": "red_clock_time.-2",
"friendlyName": -2,
"description": "Subtract 2 minutes from the timer upon picking up a red clock.",
"defaultValue": 0
},
"1": {
"keyString": "red_clock_time.1",
"friendlyName": 1,
"description": "Add a minute to the timer upon picking up a red clock.",
"defaultValue": 50
}
}
},
"blue_clock_time": {
"keyString": "blue_clock_time",
"friendlyName": "Blue Clock Time",
"description": "The amount of time, in minutes, to add to or subtract from the timer upon picking up a blue clock.",
"inputType": "range",
"subOptions": {
"1": {
"keyString": "blue_clock_time.1",
"friendlyName": 1,
"description": "Add a minute to the timer upon picking up a blue clock.",
"defaultValue": 0
},
"2": {
"keyString": "blue_clock_time.2",
"friendlyName": 2,
"description": "Add 2 minutes to the timer upon picking up a blue clock.",
"defaultValue": 50
}
}
},
"green_clock_time": {
"keyString": "green_clock_time",
"friendlyName": "Green Clock Time",
"description": "The amount of time, in minutes, to add to or subtract from the timer upon picking up a green clock.",
"inputType": "range",
"subOptions": {
"4": {
"keyString": "green_clock_time.4",
"friendlyName": 4,
"description": "Add 4 minutes to the timer upon picking up a green clock.",
"defaultValue": 50
},
"10": {
"keyString": "green_clock_time.10",
"friendlyName": 10,
"description": "Add 10 minutes to the timer upon picking up a green clock.",
"defaultValue": 0
},
"15": {
"keyString": "green_clock_time.15",
"friendlyName": 15,
"description": "Add 15 minutes to the timer upon picking up a green clock.",
"defaultValue": 0
}
}
},
"glitch_boots": {
"keyString": "glitch_boots",
"friendlyName": "Glitch Boots",
@@ -1572,26 +1676,26 @@
},
"hud_palettes": {
"keyString": "rom.hud_palettes",
"friendlyName": "Underworld Palettes",
"description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
"friendlyName": "HUD Palettes",
"description": "Randomize the colors of the HUD (user interface), within reason.",
"inputType": "range",
"subOptions": {
"default": {
"keyString": "rom.hud_palettes.default",
"friendlyName": "Vanilla",
"description": "Overworld colors will remain unchanged.",
"description": "HUD colors will remain unchanged.",
"defaultValue": 50
},
"random": {
"keyString": "rom.hud_palettes.random",
"friendlyName": "Random",
"description": "Shuffles the colors of the overworld palette.",
"description": "Shuffles the colors of the HUD palette.",
"defaultValue": 0
},
"blackout": {
"keyString": "rom.hud_palettes.blackout",
"friendlyName": "Blackout",
"description": "Never use this. Makes all overworld palette colors black.",
"description": "Never use this. Makes all HUD palette colors black.",
"defaultValue": 0
},
"grayscale": {
@@ -1634,26 +1738,26 @@
},
"shield_palettes": {
"keyString": "rom.shield_palettes",
"friendlyName": "Underworld Palettes",
"description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
"friendlyName": "Shield Palettes",
"description": "Randomize the colors of the shield, within reason.",
"inputType": "range",
"subOptions": {
"default": {
"keyString": "rom.shield_palettes.default",
"friendlyName": "Vanilla",
"description": "Overworld colors will remain unchanged.",
"description": "Shield colors will remain unchanged.",
"defaultValue": 50
},
"random": {
"keyString": "rom.shield_palettes.random",
"friendlyName": "Random",
"description": "Shuffles the colors of the overworld palette.",
"description": "Shuffles the colors of the shield palette.",
"defaultValue": 0
},
"blackout": {
"keyString": "rom.shield_palettes.blackout",
"friendlyName": "Blackout",
"description": "Never use this. Makes all overworld palette colors black.",
"description": "Never use this. Makes all shield palette colors black.",
"defaultValue": 0
},
"grayscale": {
@@ -1696,26 +1800,26 @@
},
"sword_palettes": {
"keyString": "rom.sword_palettes",
"friendlyName": "Underworld Palettes",
"description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
"friendlyName": "Sword Palettes",
"description": "Randomize the colors of the sword, within reason.",
"inputType": "range",
"subOptions": {
"default": {
"keyString": "rom.sword_palettes.default",
"friendlyName": "Vanilla",
"description": "Overworld colors will remain unchanged.",
"description": "Sword colors will remain unchanged.",
"defaultValue": 50
},
"random": {
"keyString": "rom.sword_palettes.random",
"friendlyName": "Random",
"description": "Shuffles the colors of the overworld palette.",
"description": "Shuffles the colors of the sword palette.",
"defaultValue": 0
},
"blackout": {
"keyString": "rom.sword_palettes.blackout",
"friendlyName": "Blackout",
"description": "Never use this. Makes all overworld palette colors black.",
"description": "Never use this. Makes all sword palette colors black.",
"defaultValue": 0
},
"grayscale": {

26
WebHostLib/static/static/playerSettings.yaml
View File

@@ -232,6 +232,22 @@ timer:
ohko: 0 # Timer always at zero. Permanent OHKO.
timed_countdown: 0 # Starts the clock with forty minutes. Same clocks as timed mode, but if the clock hits zero you lose. You can still keep playing, though.
display: 0 # Displays a timer, but otherwise does not affect gameplay or the item pool.
countdown_start_time: # For timed_ohko and timed_countdown timer modes, the amount of time in minutes to start with
0: 0 # For timed_ohko, starts in OHKO mode when starting the game
10: 50
20: 0
30: 0
60: 0
red_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a red clock
-2: 50
1: 0
blue_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a blue clock
1: 0
2: 50
green_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a green clock
4: 50
10: 0
15: 0
# Can be uncommented to use it
# local_items: # Force certain items to appear in your world only, not across the multiworld. Recognizes some group names, like "Swords"
# - "Moon Pearl"
@@ -391,13 +407,3 @@ rom:
dizzy: 0
sick: 0
puke: 0
uw_palettes: # Change the colors of shields
default: 50 # No changes
random: 0 # Shuffle the colors
blackout: 0 # Never use this
grayscale: 0
negative: 0
classic: 0
dizzy: 0
sick: 0
puke: 0