monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,132 Commits 1 Branch 0 Tags 67 MiB
Commit Graph

3132 Commits

Author SHA1 Message Date
Fabian Dill 26314f7c13 Document Connection Plando 
and show where Connection Plando Errors come from
 2021-01-17 18:28:10 +01:00
Fabian Dill 446893c504 Document Item Plando 2021-01-17 17:58:58 +01:00
Fabian Dill 5693d8f414 name lint to lint 2021-01-17 06:59:46 +01:00
Fabian Dill 9d692e070e split github workflows 2021-01-17 06:58:54 +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 3b5ba161de first two plando modules documented 2021-01-17 02:15:46 +01:00
Fabian Dill 51692e7668 Merge remote-tracking branch 'origin/multishop' into multishop 2021-01-16 02:23:33 +01:00
Fabian Dill f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
CaitSith2 0c1b679100 Whoops, fix for backwards cherry-pick 2021-01-15 17:07:18 -08:00
CaitSith2 94b56d10f5 Add shops / old man cave to multidata 2021-01-15 17:04:50 -08:00
Fischfilet89 65fa39df95
Update weightedSettings.json (#162) 
fixed a typo at line 1020 regarding enemy health on the setting "armor-plated"
 2021-01-16 00:38:55 +01:00
Fabian Dill 25330bd730 Fix displaying Race Seeds 2021-01-16 00:32:52 +01:00
CaitSith2 f046ca806c Merge branch 'main' into multishop 2021-01-15 10:17:27 -08:00
Fabian Dill 97a5f412a8 remove take_any_locs in-place modifications 2021-01-15 19:13:22 +01:00
CaitSith2 10a4a89c5f Merge branch 'main' into multishop 2021-01-15 01:41:36 -08:00
CaitSith2 6427d246a2 Fix Take-Any caves being non deterministic 2021-01-15 01:32:51 -08:00
Fabian Dill 5afe44f9cb use multidata locations to get missing checks (in server) 2021-01-15 03:22:56 +01:00
Fabian Dill d214783932 If due to DR or Plando the world is not fulfilling access rules, default to can_beat_game for Shop Logic 2021-01-14 00:26:49 +01:00
Edos512 fd888d9e31
Update MSU spanish tutorial (#161) 
Added Stream-safe MSU packs section
 2021-01-13 22:35:49 +01:00
CaitSith2 082a7b7e41 Merge branch 'main' into multishop 2021-01-13 10:40:52 -08:00
CaitSith2 7bb115de72 Fix bug with placements always being empty. 
It will never be not empty, because every placement that succeeds gets its event set to true, and the conditional expects locations already placed within the fill to also not be events.
 2021-01-13 10:40:23 -08:00
Fabian Dill 67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Fabian Dill 85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling 2021-01-13 15:00:00 +01:00
Fabian Dill e8a57a4d24 Change hint for shop items to be "for sale" 
Lock Dungeon Prizes, as they're not supposed to be moved by any swapping mechanic
 2021-01-13 14:58:40 +01:00
Fabian Dill c0cdeef67a Optimize fulfills_accessibility by pruning to relevant locations 2021-01-13 14:27:17 +01:00
Chris Wilson 9aea7fa113 Update wording on host game page 2021-01-12 21:09:59 -05:00
Fabian Dill 32c5ee53e5 Test both item swap rules 2021-01-13 02:41:29 +01:00
Chris Wilson 51003275d4 Minor size adjustment to "Stream Safe MSU Packs" header 2021-01-11 23:05:06 -05:00
Chris Wilson 4880d12654 Re-worded the MSU tutorial to be more technically correct. 2021-01-11 23:03:54 -05:00
Chris Wilson 092fde54fd Add a list of stream-safe MSU packs to the MSU-1 tutorial 2021-01-11 19:59:27 -05:00
Fabian Dill a879e3fc8b use computed goal names for open_pyramid, just in case 2021-01-11 20:45:59 +01:00
Fabian Dill 0978daba69 Make sure shop slots obey accessibility rules. 
The way this is checked is quite computationally expensive, should revisit later.
 2021-01-11 19:56:18 +01:00
Fabian Dill 058436e47f shop cleanup and correctly backreference swapped items' locations 
Also fixes a false reference in progression balancing from 2019 (swapped Location.item.location was not updated)
 2021-01-11 13:35:48 +01:00
Fabian Dill 322feb37f0 remove removed shop locations from relevant caches 2021-01-11 04:06:25 +01:00
Fabian Dill 3a99aedf89 safer failure in case of no more candidate swaps 2021-01-11 02:55:32 +01:00
Fabian Dill f47fafe7e3 remove empty shopslots from regions 2021-01-11 02:48:57 +01:00
CaitSith2 6ab2caf37b Take Any cave locations now known by MultiClient. 2021-01-10 17:42:58 -08:00
CaitSith2 d214a1f596 Re-insert un-filled capacity upgrades back into the shop. 2021-01-10 11:24:13 -08:00
Fabian Dill f12259dd7d Simplify ShopSlot Shuffling 2021-01-10 19:23:57 +01:00
Fabian Dill 52d5b96435 optimize price conditions 2021-01-10 16:01:04 +01:00
Fabian Dill 3df7c360ef mark todo 2021-01-10 15:52:04 +01:00
Fabian Dill 36123308a6 Refine Shop Item Candidate picking 2021-01-10 15:50:18 +01:00
CaitSith2 d8e5d0e4fc Merge branch 'main' into multishop 2021-01-10 05:57:19 -08:00
Fabian Dill 10b7c83f1d Just use locations in the multidata, not static IDs, for forfeits 
Should also work better for *other* games
 2021-01-10 14:50:38 +01:00
CaitSith2 a8475c38b2 Merge branch 'multishop-all' into multishop 2021-01-10 05:38:54 -08:00
Fabian Dill a4bb67d90a Merge branch 'main' into multishop 2021-01-10 12:52:41 +01:00
Fabian Dill 233e9e6208 expand forfeit to forfeit out anything that is in multidata, so forfeits works with not yet implemented locations 2021-01-10 12:52:23 +01:00
Fabian Dill 2442a255cf
Merge pull request #159 from ScootyPuffJr1/main 
Update Text.py
 2021-01-10 12:38:39 +01:00
pepperpow 4250004f11 Added Shop ID constant and forfeit values 2021-01-10 05:11:45 -06:00