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

103 Commits

Author SHA1 Message Date
Fabian Dill
95358bc523 Never download a sprite with Author "Nintendo" 2021-04-28 10:31:24 +02:00
Fabian Dill
4fc1ce77ac only build vanilla sprite data once correctly 2021-04-28 02:39:55 +02:00
Fabian Dill
b8c7d6a72f remove remaining sprite data 2021-04-27 07:19:53 +02:00
Fabian Dill
a5efed83b9 Set non-LttP Shop prices to 5 to 140 Rupee range 2021-04-16 21:41:19 +02:00
Fabian Dill
433981fd3d pass explicit seed_name from MultiMystery.py 2021-04-12 09:45:07 +02:00
Fabian Dill
d4b422840a Fix dynamic world attributes not updating 2021-04-10 06:36:06 +02:00
Fabian Dill
c4d6ac50be turn weapons into boolean swordless 2021-04-09 20:40:45 +02:00
Fabian Dill
f0a6b5a8e4 Factorio: 
add visibility option
fix tech_cost using the wrong variable name
fix yaml defaults not init'ing the Option class
LttP:
fix potential pathing confusion in maseya palette shuffler
Server:
Minimum version per team made no sense, removed
 2021-04-08 19:53:24 +02:00
Fabian Dill
d451145d53 Merge branch 'main' into Archipelago_Main 2021-04-04 03:17:46 +02:00
Fabian Dill
250099f5fd Small adjustments 2021-04-03 20:02:15 +02:00
Fabian Dill
91bcd59940 implement Factorio options max_science_pack and tech_cost 
also give warnings about deprecated LttP options
also fix FactorioClient.py getting stuck if send an unknown item id
also fix !missing having an extra newline after each entry
also default to no webui
 2021-04-03 14:47:49 +02:00
Fabian Dill
01ef041b86 last minute fixing 2021-04-01 20:31:39 +02:00
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
1f5bcb6273 update basic and normal boss shuffling with a less biased algorithm 2021-03-26 04:05:36 +01:00
Fabian Dill
71fb238916 According to Espeon, this is fine; removing TODO 2021-03-23 00:13:21 +01:00
Fabian Dill
f2a1858b59 Implement (most) Hollow Knight Options 2021-03-21 00:47:17 +01:00
Fabian Dill
8c6c7bc575 Update intro text 2021-03-20 02:09:17 +01:00
Fabian Dill
bbe51c4cc7 Speed up restrictive_fill a bit. 
This also changes behaviour slightly; it used to fill beatable only players' items first, now it shuffles it all together. It is not documented why this was done, so hopefully this doesn't undo something intentional.
 2021-03-18 17:27:31 +01:00
Fabian Dill
01ef29568a Temporarily destroy the world, instead of copying it. 
Not pretty, but faster. Unfortunately can't be threaded alongside rom/multidata creation, as otherwise locations may be empty at certain times.
 2021-03-17 10:53:40 +01:00
Fabian Dill
91c0650b42 remove some missed nonlocal world references 
that would refer to a different world after copying it
It is static data though, so it hasn't created an actual bug (yet)
 2021-03-14 22:59:41 +01:00
Fabian Dill
3d93f659e3 some option updates 2021-03-14 08:38:02 +01:00
Fabian Dill
4b499d2b1c fix location hints not being able to get the correct text 2021-03-14 00:27:06 +01:00
Fabian Dill
6455dc3ffc Merge branch 'main' into breaking_changes 
# Conflicts:
#	README.md
 2021-03-13 23:34:38 +01:00
Fabian Dill
a528ed5e9e Client now uses location_id consistently internally, instead of switching on a dime all the time 
And some smaller changes
 2021-03-07 22:05:07 +01:00
Fabian Dill
f7dc21ddcc Merge branch 'main' into breaking_changes 
# Conflicts:
#	Main.py
#	Utils.py
 2021-03-07 22:04:06 +01:00
Fabian Dill
1d6aabeea6 fix some missed bmbp -> apbp spots 2021-03-03 02:02:41 +01:00
Fabian Dill
bfa9bde348 Merge branch 'main' into breaking_changes 2021-03-03 02:00:10 +01: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
Fabian Dill
7871555620 Implement PrintJSON 
Remove deprecated network packets
Make Client send new locations checked only once
Simplify register_location_checks
Rip out Server savegame compatibility
 2021-03-02 22:31:44 +01:00
Fabian Dill
07b9fcfefc minor cleanup 2021-02-28 20:48:30 +01:00
Fabian Dill
612c3c23c0 spheres should ignore empty locations 2021-02-27 18:58:17 +01:00
Fabian Dill
8bfddb7fc6 Remove Single-Item logic macros 2021-02-27 17:11:54 +01:00
Fabian Dill
abcc2690f0 Add "Fake" (Randomizer-only) Hollow Knight items 2021-02-26 21:03:16 +01:00
Fabian Dill
f19291aaed Remove Fake Hollow Knight Items and Locations 
Add GetDataPackage Network system
 2021-02-25 02:07:28 +01:00
Fabian Dill
e60ae897b4 Allow HK items in shops and allow settings local/non-local items for HK 2021-02-24 00:36:37 +01:00
Fabian Dill
a248fd5f94 add a HK game completion rule 2021-02-22 11:18:53 +01:00
Fabian Dill
8a395a3021 update guis 2021-02-21 20:37:43 +01: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
Fabian Dill
96dfccdbfc set correct version in multidata 2021-02-19 13:47:25 +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
Fabian Dill
3d81f0cca7 update after merge from /main 2021-01-30 23:43:15 +01:00
Fabian Dill
2553b1d2ee Merge branch 'main' into breaking_changes 2021-01-30 23:40:25 +01:00
Fabian Dill
28c12054dd update to Shops release 2021-01-30 23:37:35 +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
Fabian Dill
670b8b4b11 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	WebUI.py
 2021-01-21 05:36:16 +01:00
Fabian Dill
7333a15f1f handle merge conflicts after plando update 2021-01-17 06:54:38 +01:00
Fabian Dill
514cd19367 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
 2021-01-17 06:50:25 +01:00
Fabian Dill
6bb7631382 fix unit tests 2021-01-03 17:16:07 +01:00
Fabian Dill
8ebd36b5a7 update Archipelago 2021-01-03 14:32:32 +01:00