mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Merge remote-tracking branch 'pepper/multishop-all' into multishop
# Conflicts: # EntranceRandomizer.py # Rom.py # WebHostLib/static/static/playerSettings.json # data/basepatch.bmbp
This commit is contained in:
Fabian Dill
@@ -477,9 +477,23 @@
|
||||
"name": "None",
|
||||
"value": "none"
|
||||
},
|
||||
{
|
||||
"name": "Inventory",
|
||||
"value": "i"
|
||||
"g": {
|
||||
"keyString": "shop_shuffle.g",
|
||||
"friendlyName": "Inventory Generate",
|
||||
"description": "Generates new default base inventories of overworld and underworld shops.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"f": {
|
||||
"keyString": "shop_shuffle.f",
|
||||
"friendlyName": "Full Inventory Generate",
|
||||
"description": "Generates new base inventories of each individual shop.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"i": {
|
||||
"keyString": "shop_shuffle.i",
|
||||
"friendlyName": "Inventory Shuffle",
|
||||
"description": "Shuffles the inventories of shops between each other.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
{
|
||||
"name": "Prices",
|
||||
@@ -493,9 +507,269 @@
|
||||
"name": "Inventory and Prices",
|
||||
"value": "ip"
|
||||
},
|
||||
{
|
||||
"name": "Inventory, Prices, and Upgrades",
|
||||
"value": "ipu"
|
||||
"uip": {
|
||||
"keyString": "shop_shuffle.uip",
|
||||
"friendlyName": "Full Shuffle",
|
||||
"description": "Shuffles the inventory and randomizes the prices of items in shops. Also distributes capacity upgrades throughout the world.",
|
||||
"defaultValue": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
"shop_shuffle_slots": {
|
||||
"keyString": "shop_shuffle_slots",
|
||||
"friendlyName": "Shop Shuffle Slots",
|
||||
"description": "How Many Slots in Shops are dedicated to items from the item pool",
|
||||
"inputType": "range",
|
||||
"subOptions": {
|
||||
"0": {
|
||||
"keyString": "shop_shuffle_slots.0",
|
||||
"friendlyName": 0,
|
||||
"description": "0 slots",
|
||||
"defaultValue": 50
|
||||
},
|
||||
"15": {
|
||||
"keyString": "shop_shuffle_slots.3",
|
||||
"friendlyName": 3,
|
||||
"description": "3 slots",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"20": {
|
||||
"keyString": "shop_shuffle_slots.6",
|
||||
"friendlyName": 6,
|
||||
"description": "6 slots",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"30": {
|
||||
"keyString": "shop_shuffle_slots.12",
|
||||
"friendlyName": 12,
|
||||
"description": "12 slots",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"40": {
|
||||
"keyString": "shop_shuffle_slots.96",
|
||||
"friendlyName": 96,
|
||||
"description": "96 slots",
|
||||
"defaultValue": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
"potion_shop_shuffle": {
|
||||
"keyString": "potion_shop_shuffle",
|
||||
"friendlyName": "Potion Shop Shuffle Rules",
|
||||
"description": "Influence on potion shop by shop shuffle options",
|
||||
"inputType": "range",
|
||||
"subOptions": {
|
||||
"none": {
|
||||
"keyString": "potion_shop_shuffle.none",
|
||||
"friendlyName": "Vanilla Shops",
|
||||
"description": "Shop contents are left unchanged, only prices.",
|
||||
"defaultValue": 50
|
||||
},
|
||||
"a": {
|
||||
"keyString": "potion_shop_shuffle.a",
|
||||
"friendlyName": "Any Items can be shuffled in and out of the shop",
|
||||
"description": "",
|
||||
"defaultValue": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
"shuffle_prizes": {
|
||||
"keyString": "shuffle_prizes",
|
||||
"friendlyName": "Prize Shuffle",
|
||||
"description": "Alters the Prizes from pulling, bonking, enemy kills, digging, and hoarders",
|
||||
"inputType": "range",
|
||||
"subOptions": {
|
||||
"none": {
|
||||
"keyString": "shuffle_prizes.none",
|
||||
"friendlyName": "None",
|
||||
"description": "All prizes from pulling, bonking, enemy kills, digging, hoarders are vanilla.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"g": {
|
||||
"keyString": "shuffle_prizes.g",
|
||||
"friendlyName": "\"General\" prize shuffle",
|
||||
"description": "Shuffles the prizes from pulling, enemy kills, digging, hoarders",
|
||||
"defaultValue": 50
|
||||
},
|
||||
"b": {
|
||||
"keyString": "shuffle_prizes.b",
|
||||
"friendlyName": "Bonk prize shuffle",
|
||||
"description": "Shuffles the prizes from bonking into trees.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"bg": {
|
||||
"keyString": "shuffle_prizes.bg",
|
||||
"friendlyName": "Both",
|
||||
"description": "Shuffles both of the options.",
|
||||
"defaultValue": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
"timer": {
|
||||
"keyString": "timer",
|
||||
"friendlyName": "Timed Modes",
|
||||
"description": "Add a timer to the game UI, and cause it to have various effects.",
|
||||
"inputType": "range",
|
||||
"subOptions": {
|
||||
"none": {
|
||||
"keyString": "timer.none",
|
||||
"friendlyName": "Disabled",
|
||||
"description": "No timed mode is applied to the game.",
|
||||
"defaultValue": 50
|
||||
},
|
||||
"timed": {
|
||||
"keyString": "timer.timed",
|
||||
"friendlyName": "Timed Mode",
|
||||
"description": "Starts with clock at zero. Green clocks subtract 4 minutes (total 20). Blue clocks subtract 2 minutes (total 10). Red clocks add two minutes (total 10). Winner is the player with the lowest time at the end.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"timed_ohko": {
|
||||
"keyString": "timer.timed_ohko",
|
||||
"friendlyName": "Timed OHKO",
|
||||
"description": "Starts the clock at ten minutes. Green clocks add five minutes (total 25). As long as the clock as at zero, Link will die in one hit.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"ohko": {
|
||||
"keyString": "timer.ohko",
|
||||
"friendlyName": "One-Hit KO",
|
||||
"description": "Timer always at zero. Permanent OHKO.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"timed_countdown": {
|
||||
"keyString": "timer.timed_countdown",
|
||||
"friendlyName": "Timed Countdown",
|
||||
"description": "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.",
|
||||
"defaultValue": 0
|
||||
},
|
||||
"display": {
|
||||
"keyString": "timer.display",
|
||||
"friendlyName": "Timer Only",
|
||||
"description": "Displays a timer, but otherwise does not affect gameplay or the item pool.",
|
||||
"defaultValue": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"description": "Start with Pegasus Boots in any glitched logic mode that makes use of them.",
|
||||
"inputType": "range",
|
||||
"subOptions": {
|
||||
"on": {
|
||||
"keyString": "glitch_boots.on",
|
||||
"friendlyName": "On",
|
||||
"description": "Enable glitch boots.",
|
||||
"defaultValue": 50
|
||||
},
|
||||
"off": {
|
||||
"keyString": "glitch_boots.off",
|
||||
"friendlyName": "Off",
|
||||
"description": "Disable glitch boots.",
|
||||
"defaultValue": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user