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
2,330 Commits 2 Branches 10 Tags
d24ee45462831113fc88a7f3aa75cb821061299e
Commit Graph

222 Commits

Author SHA1 Message Date
Fabian Dill
d24ee45462 Merge branch 'main' into Archipelago_Main 
# Conflicts:
#	BaseClasses.py
#	LttPAdjuster.py
#	Main.py
#	Mystery.py
#	Utils.py
#	WebHostLib/generate.py
#	playerSettings.yaml
 2021-04-01 11:44:37 +02:00
Fabian Dill
dc73fa0f33 Factorio integration 2021-04-01 11:40:58 +02:00
CaitSith2
9233a7e208 name variable changes 
* Convert %number%, %player% and %% to {number}, {player} and %.
* added {NUMBER} - output number if greater than 1.
* added {PLAYER}, output player slot number if greater than 1.
 2021-03-28 16:52:32 -07:00
CaitSith2
4d99bb1429 Allow setting of Glitching to Triforce from ganon in host.yaml. 2021-03-22 13:14:19 -07:00
Fabian Dill
f2a1858b59 Implement (most) Hollow Knight Options 2021-03-21 00:47:17 +01:00
Fabian Dill
275ac5be2b fix progression balancing being the copy function. 2021-03-17 06:29:48 +01:00
Fabian Dill
f55096b8cc use python str formatting for player variable names 2021-03-17 06:26:06 +01:00
Fabian Dill
3d93f659e3 some option updates 2021-03-14 08:38:02 +01:00
Fabian Dill
03bcd2aed7 Merge branch 'main' into breaking_changes 2021-03-14 07:04:40 +01:00
CaitSith2
7000f572f6 use os.path.splitext() to remove ".yaml" from player name. 2021-03-13 15:26:21 -08:00
CaitSith2
00feff6b56 Keep all "." in player name except ".yaml" 2021-03-13 15:15:12 -08:00
Fabian Dill
6455dc3ffc Merge branch 'main' into breaking_changes 
# Conflicts:
#	README.md
 2021-03-13 23:34:38 +01:00
CaitSith2
28b2afe022 Fix random shop_shuffle_slot support. 2021-03-12 23:13:30 -08:00
Fabian Dill
6e5e4fa96e allow 'random' shop_shuffle_slots 2021-03-13 05:19:53 +01:00
CaitSith2
a331c397aa Allow %%, %player%, %number% variables in names. 2021-03-12 17:43:50 -08:00
Fabian Dill
f7dc21ddcc Merge branch 'main' into breaking_changes 
# Conflicts:
#	Main.py
#	Utils.py
 2021-03-07 22:04:06 +01:00
CaitSith2
58d748d7ff catch plando boss placement errors in yaml. 2021-03-07 04:36:46 -08:00
CaitSith2
cefa6bb04f Do not allow overriding host.yaml plando options with pre-rolls. 2021-03-07 03:38:49 -08:00
CaitSith2
1e17704ee6 Add useful info for which medallion has the unknown type. 2021-03-07 03:31:36 -08:00
Fabian Dill
567954a17f Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
 2021-03-06 05:27:16 +01:00
CaitSith2
43643870da Remove the last bit of code that required unsafe yaml loading. 2021-03-05 11:40:46 -08:00
CaitSith2
d09a03aace Rip out unsafe yaml loading. 2021-03-05 11:32:24 -08:00
CaitSith2
60e032510d Make pre_rolled safer by converting namespace/plandoitems/plandoconnections to/from dict. 2021-03-05 02:50:40 -08:00
CaitSith2
475d39932c main doesn't have doors to roll. 2021-03-03 13:02:55 -08:00
CaitSith2
6ddfbdf709 Allow pre-rolling yaml settings, and re-using the exact same pre-rolled settings later, for different actual seeds. 2021-03-03 02:20:37 -08:00
Fabian Dill
0d576eefbb Merge branch 'main' into breaking_changes 
# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py
 2021-03-03 01:54:52 +01:00
CaitSith2
2e275d1f4e Merge remote-tracking branch 'pepperpow/triforce_changes' into main 2021-02-26 19:56:44 -08:00
CaitSith2
69c1e138b4 Use a default value. 2021-02-24 20:28:52 -08:00
CaitSith2
056a0c739c No point in assigning a seed for vanilla ER layout. 2021-02-24 13:23:42 -08:00
pepperpow
222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06:00
Fabian Dill
ff9b24e88e Hollow Knight integration 
(prototype status)
 2021-02-21 20:17:24 +01:00
Fabian Dill
dcce53f8c8 Merge branch 'main' into breaking_changes 
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
 2021-02-21 20:15:07 +01:00
CaitSith2
8c020db07d Add an identifier for triggers, to know which branch the seed is rolled on. 2021-02-19 23:21:18 -08:00
pepperpow
fca64f1177 Removes Flashing instances in game (#168) 
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
 2021-02-19 17:45:54 +01:00
Fabian Dill
122e360ec8 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py
 2021-02-19 13:45:50 +01:00
CaitSith2
acefb47a00 Warn if trigger option name doesn't match something in the yaml. 2021-02-13 13:57:52 -08:00
CaitSith2
44f4f7f20c Allow for rom options in linked/triggered options without needing to... 
...overwrite the entire rom tree.
 2021-02-13 10:26:02 -08:00
Fabian Dill
5e619dec60 add mystery triggers 2021-02-13 14:03:23 +01:00
pepperpow
1d1abb7d22 Removed remnants of team stuff, make hide_goal default 2021-02-05 20:37:27 -06:00
Fabian Dill
96d544ac84 Speed up Progression Balancing, mostly by using generators and pre-sorts where the opportunity exists 
In some cases multi-thousand element lists were created in-memory with near identical contents, per player, then discarded and reassembled.
Was testing against a case with 3 GB of additional memory use (50 players) which appeared to get stuck, but really was just very slow. This example case is fixed with these changes.
Additionally, progression balancing is now run after ShopSlotFill, so it is now "aware" of the changed progression shops can produce.
As well, special handling for keys was removed, as not all games will have the notion of keys.
 2021-02-05 08:07:12 +01:00
Fabian Dill
a646594f08 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
 2021-01-30 23:29:32 +01:00
pepperpow
82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
CaitSith2
7f74aa7cb0 Implement open_pyramid yaml settings 2021-01-29 13:27:42 -08:00
Chris Wilson
635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings. 
- Also fix a bug caused by the website settings always forcing options to lowercase
 2021-01-24 21:14:58 -05:00
Fabian Dill
c604dfe509 move networks commands to [str, Optional[dict]] across the board 
and some other updates
PrintHTML is an experiment and is unlikely the solution I'll go with
 2021-01-21 23:37:58 +01:00
Fabian Dill
670b8b4b11 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	WebUI.py
 2021-01-21 05:36:16 +01:00
Fabian Dill
b775bfa916 Merge branch 'main' into multishop 2021-01-19 01:02:57 +01:00
Fabian Dill
e2075686c2 fix ItemPlando defaults 2021-01-19 01:02:03 +01:00
Fabian Dill
2b730ab1d4 Merge branch 'main' into multishop 2021-01-18 22:30:05 +01:00
Fabian Dill
4fb8067b5e document item plando force parameter 2021-01-18 05:07:53 +01:00