60afd0112c
Update basepatch
2021-01-21 12:41:14 -08:00
14fb89043e
Merge remote-tracking branch 'pepperpow/multishop-all' into multishop
2021-01-21 12:31:19 -08:00
2ce6343859
Changed isnot statement
2021-01-21 04:39:33 -06:00
0992959bc8
Fix for servers that don't return checked items.
2021-01-21 00:12:53 -08:00
dbd99c31ad
client/server changes
...
* Server now includes checked locations as a separate list.
* If client connects to a server that sends checked checks, client can now give accurate information on checked locations, and not show "New Check: seed-unknown-location (total/216)" and instead accurately show "New check: 'seed-known-location' (total_checked/seed_total)"
/missing now accurately reports what was previously checked.
* client now attempts to translate "Unknown Location ID: 'ID'" into an actual location, if server is unaware of the location, but the client is.
2021-01-20 20:58:07 -08:00
670b8b4b11
Merge branch 'main' into breaking_changes
...
# Conflicts:
# MultiClient.py
# WebUI.py
2021-01-21 05:36:16 +01:00
2833d99eda
only print new check once in web ui
2021-01-21 05:34:45 +01:00
f87da18ead
Fix coding error
2021-01-20 13:02:34 -08:00
62435c8349
Added overworld bee trap disguises, shop indicators and new shop items
2021-01-20 04:22:26 -06:00
dfc64266b9
Fix missed instances of ctx.ui_node.log_info
2021-01-20 00:30:54 -08:00
15b949d780
Merge branch 'main' into multishop
2021-01-20 03:19:38 +01:00
dc9456f79a
fix PyYAML version name to not trigger module updater
2021-01-20 03:18:46 +01:00
4b2a9b3e87
unroll unneeded inner generator expression
2021-01-20 03:17:51 +01:00
2e32ab152e
Merge branch 'main' into multishop
...
# Conflicts:
# MultiClient.py
2021-01-20 03:17:08 +01:00
c5c64f846e
update PyYAML
2021-01-20 03:13:17 +01:00
c8616a6fe4
update prompt toolkit
2021-01-19 07:00:17 +01:00
276d49981e
Convert WebUI to logging.Handler subclass
2021-01-19 06:37:35 +01:00
3f4df40ed1
optimize some things that really don't matter
2021-01-19 06:03:44 +01:00
7e18f93a3a
copy shop slots to new world
2021-01-19 01:03:32 +01:00
b775bfa916
Merge branch 'main' into multishop
2021-01-19 01:02:57 +01:00
e2075686c2
fix ItemPlando defaults
2021-01-19 01:02:03 +01:00
2b730ab1d4
Merge branch 'main' into multishop
2021-01-18 22:30:05 +01:00
4fb8067b5e
document item plando force parameter
2021-01-18 05:07:53 +01:00
b2d7229dde
type shop as Shop
2021-01-18 04:53:02 +01:00
478e1f3a82
General coding pass on Shops
2021-01-18 04:48:20 +01:00
a67d657882
Shopswap with higher spheres as well
2021-01-17 23:17:14 +01:00
ba07da6bba
Change ShopShuffle to operate within current Sphere
2021-01-17 22:58:52 +01:00
f4281f81f5
Merge branch 'main' into multishop
2021-01-17 22:08:43 +01:00
a87a79eb00
remove some duplicate code
2021-01-17 22:08:28 +01:00
0286a81755
plando world false is default
2021-01-17 21:42:28 +01:00
26314f7c13
Document Connection Plando
...
and show where Connection Plando Errors come from
2021-01-17 18:28:10 +01:00
446893c504
Document Item Plando
2021-01-17 17:58:58 +01:00
5693d8f414
name lint to lint
2021-01-17 06:59:46 +01:00
9d692e070e
split github workflows
2021-01-17 06:58:54 +01:00
7333a15f1f
handle merge conflicts after plando update
2021-01-17 06:54:38 +01:00
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
3b5ba161de
first two plando modules documented
2021-01-17 02:15:46 +01:00
51692e7668
Merge remote-tracking branch 'origin/multishop' into multishop
2021-01-16 02:23:33 +01:00
f3e686ba9a
Move Shop related stuff to a Shops module
2021-01-16 02:23:23 +01:00
0c1b679100
Whoops, fix for backwards cherry-pick
2021-01-15 17:07:18 -08:00
94b56d10f5
Add shops / old man cave to multidata
2021-01-15 17:04:50 -08:00
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
25330bd730
Fix displaying Race Seeds
2021-01-16 00:32:52 +01:00
f046ca806c
Merge branch 'main' into multishop
2021-01-15 10:17:27 -08:00
97a5f412a8
remove take_any_locs in-place modifications
2021-01-15 19:13:22 +01:00
10a4a89c5f
Merge branch 'main' into multishop
2021-01-15 01:41:36 -08:00
6427d246a2
Fix Take-Any caves being non deterministic
2021-01-15 01:32:51 -08:00
5afe44f9cb
use multidata locations to get missing checks (in server)
2021-01-15 03:22:56 +01:00
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
fd888d9e31
Update MSU spanish tutorial ( #161 )
...
Added Stream-safe MSU packs section
2021-01-13 22:35:49 +01:00
CaitSith2
pepperpow
Fabian Dill
Fischfilet89
Edos512