Fabian Dill
dc73fa0f33
Factorio integration
2021-04-01 11:40:58 +02: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
78ba31444e
additional cleanup
2021-03-03 01:57:12 +01:00
Fabian Dill
0917f21384
revert PrintJSON to use key data, to match with documented behaviour
2021-03-02 22:36:50 +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
e5e70db380
improve set_getters a bit
2021-02-25 04:14:46 +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
fe17fc6320
log misunderstood network commands
2021-02-21 23:54:08 +01:00
Fabian Dill
cbbdb2948d
attach command to args dict
2021-02-21 23:46:05 +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
129d2ec037
remove unnecessary ternaries in multiclient
2021-02-19 13:50:41 +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
Chris Wilson
db6642f290
Update WebUI to show unique items as a different color, and with a drop-shadow
2021-02-02 22:58:22 -05:00
Fabian Dill
cf49cd5e4b
Mark Advancement items in the client
2021-02-03 03:19:25 +01:00
Fabian Dill
1da1e4eac6
Sample implemention of JSONtoTextParser
2021-01-31 11:33:39 +01:00
Fabian Dill
3d81f0cca7
update after merge from /main
2021-01-30 23:43:15 +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
CaitSith2
50888eaa6b
Merge branch 'main' into multishop
2021-01-22 05:51:52 -08:00
CaitSith2
ba224535dc
Actually count recognized checks for the total.
2021-01-22 05:51:11 -08:00
CaitSith2
e2be997866
Merge branch 'main' into multishop
2021-01-21 17:01:45 -08:00
CaitSith2
d3915ba41f
Server side location ids such as cheat console no longer listed as missing.
2021-01-21 16:55:40 -08:00
CaitSith2
aa22653bfc
Fix for servers that don't return checked items.
2021-01-21 16:22:15 -08:00
CaitSith2
8754c63d4e
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-21 16:21:51 -08:00
Fabian Dill
7ce9278123
Use shutil.move instead of os.replace, for compatibility
2021-01-21 23:58:30 +01: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
CaitSith2
0992959bc8
Fix for servers that don't return checked items.
2021-01-21 00:12:53 -08:00
CaitSith2
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
Fabian Dill
670b8b4b11
Merge branch 'main' into breaking_changes
...
# Conflicts:
# MultiClient.py
# WebUI.py
2021-01-21 05:36:16 +01:00
Fabian Dill
2833d99eda
only print new check once in web ui
2021-01-21 05:34:45 +01:00
CaitSith2
dfc64266b9
Fix missed instances of ctx.ui_node.log_info
2021-01-20 00:30:54 -08:00
Fabian Dill
2e32ab152e
Merge branch 'main' into multishop
...
# Conflicts:
# MultiClient.py
2021-01-20 03:17:08 +01:00
Fabian Dill
276d49981e
Convert WebUI to logging.Handler subclass
2021-01-19 06:37:35 +01:00
Fabian Dill
f3e686ba9a
Move Shop related stuff to a Shops module
2021-01-16 02:23:23 +01:00
CaitSith2
6ab2caf37b
Take Any cave locations now known by MultiClient.
2021-01-10 17:42:58 -08:00
CaitSith2
a8475c38b2
Merge branch 'multishop-all' into multishop
2021-01-10 05:38:54 -08:00
pepperpow
4250004f11
Added Shop ID constant and forfeit values
2021-01-10 05:11:45 -06:00
CaitSith2
1848e5e8bc
Whoops, need this block to actually send items.
2021-01-09 22:38:30 -08:00
CaitSith2
c4b4ec8fba
No longer need the safety checks.
2021-01-09 18:53:09 -08:00
Fabian Dill
e36c6e97c1
Merge remote-tracking branch 'pepper/multishop-all' into multishop
...
# Conflicts:
# EntranceRandomizer.py
# Rom.py
# WebHostLib/static/static/playerSettings.json
# data/basepatch.bmbp
2021-01-09 16:03:59 +01:00
Fabian Dill
8ebd36b5a7
update Archipelago
2021-01-03 14:32:32 +01:00
Fabian Dill
08ca4245c1
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Adjuster.py
# AdjusterMain.py
# BaseClasses.py
# MultiClient.py
# MultiServer.py
# Mystery.py
# Utils.py
# WebHostLib/downloads.py
# WebHostLib/generate.py
# dumpSprites.py
# test/TestBase.py
# worlds/alttp/EntranceRandomizer.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
2021-01-03 13:13:59 +01:00
Fabian Dill
6c8d30bbe0
Allow Multiclient to log name of not yet known connection errors
2020-12-29 19:22:42 +01:00
pepperpow
ffe5b4b1a1
Fixes to clients/servers for shop checks
2020-12-15 02:34:22 -06:00
Fabian Dill
c31e38debe
restore fxpak special handling, as it is apparently still needed.
...
Also slightly improve it.
This reverts commit ee933698
2020-12-01 22:23:37 +01:00
Fabian Dill
ce7aaf5c8c
warn when data could not be sent to snes
2020-12-01 21:57:18 +01:00
Fabian Dill
5128657349
allow setting remaining_mode from server options
2020-11-30 21:07:02 +01:00
Fabian Dill
be02136a1b
revert QUSB2SNES port change (seems it sometimes doesn't host on this port and then things break)
2020-11-11 12:53:53 +01:00
Fabian Dill
dc8a7133a3
Allow qusb2snes to configure itself (now that it has a menu on first run) and bind to port 23070
2020-11-11 12:36:02 +01:00