Commit Graph

223 Commits

Author SHA1 Message Date
Fabian Dill 212abc2b5a increment version 2021-05-08 13:42:18 +02:00
Fabian Dill 60f64cc46b rename get_location_name_from_address to get_location_name_from_id 2021-04-28 15:48:11 +02:00
Fabian Dill 2df7e4e537 add seed_name to multidata and RoomInfo 2021-04-12 09:36:45 +02:00
Fabian Dill 764e6e7926 Fix MultiTracker breaking after Hint is used 2021-04-12 00:06:27 +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 6567f14415 add log_network Server argument 2021-04-07 02:37:21 +02:00
Fabian Dill 20b72369d8 allow basic WebHost functionality to work 2021-04-04 03:18:19 +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 dc73fa0f33 Factorio integration 2021-04-01 11:40:58 +02:00
CaitSith2 641dbcb138 Make sprite pool in patch prompt show up as a weighted pool. 2021-03-30 09:28:28 -07:00
CaitSith2 83b8858df3 Include sprite_pool in whitelisted adjust wanted question 2021-03-27 07:20:00 -07:00
CaitSith2 df0b98975d Add sprite pool options to gui/adjuster 2021-03-27 07:12:08 -07:00
Fabian Dill 25f234dff0 Reduce chance that shop_slot_shuffle produces empty slots, at the cost of cpu time. 2021-03-26 13:23:17 +01:00
CaitSith2 4d99bb1429 Allow setting of Glitching to Triforce from ganon in host.yaml. 2021-03-22 13:14:19 -07:00
Chris Wilson 37d33b19fc Update node.js dependencies for WebUI 2021-03-21 12:18:17 -04:00
Fabian Dill 38a0a3f15e whitelist CLientStatus 2021-03-19 04:17:26 +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 cd5696527d some er layout group fixes 2021-03-07 20:11:36 +01:00
Fabian Dill 567954a17f Merge branch 'main' into breaking_changes
# Conflicts:
#	BaseClasses.py
2021-03-06 05:27:16 +01:00
CaitSith2 d09a03aace Rip out unsafe yaml loading. 2021-03-05 11:32:24 -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 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 f19291aaed Remove Fake Hollow Knight Items and Locations
Add GetDataPackage Network system
2021-02-25 02:07:28 +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 12222d5a4c Split adjuster into own program 2021-02-19 19:08:11 +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 cf49cd5e4b Mark Advancement items in the client 2021-02-03 03:19:25 +01:00
Fabian Dill b78f852579 reduce prices of ammo and ammo capacity upgrades, make heart container actually 4X a heart piece and reduce progression item price slightly 2021-01-31 06:47:57 +01:00
Fabian Dill 9386a9c220 Update Menus 2021-01-24 21:58:26 +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
Fabian Dill 2a0d1962f1 Tag version required for sending items out of shops 2021-01-09 18:11:24 +01:00
Fabian Dill d80939480b fix some merging 2021-01-03 14:41:21 +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 b7f41e8991 increment version 2021-01-02 23:03:48 +01:00
Fabian Dill f3b6be2b20 Item Plando Support 2021-01-02 12:49:43 +01:00
Fabian Dill e8fd575379 tile_shuffle option no longer requires Enemizer, document it as such
also shuffle things around in gui.py
2020-12-29 19:59:20 +01:00
Fabian Dill e25a03173b Implement "minimum version" checks into server and clients 2020-12-29 19:23:14 +01:00
Fabian Dill c53798bdf8 increment version 2020-12-06 14:40:57 +01:00
Fabian Dill 74cf51c20b create sprite directory if it doesn't exist 2020-11-30 21:34:40 +01:00
Fabian Dill 60e20b7844 Merge remote-tracking branch 'origin/master' 2020-11-30 19:34:49 +01:00
Fabian Dill ddb8a91e5f increment version to 3.4.0 2020-11-30 19:34:42 +01:00
CaitSith2 f9a786e3f5 blacklist doors options from being warned about on master. 2020-11-30 07:43:13 -08:00
Fabian Dill b5e80d1f87 remove no longer used port_forward option 2020-11-30 16:33:54 +01:00
CaitSith2 8c94351d53 Get warnings of options that might not exist in options.yaml 2020-11-28 14:51:13 -08:00
CaitSith2 a269db6ab5 Add doors specific multi mystery default options 2020-11-28 11:39:37 -08:00
CaitSith2 77e74510af Add default options. 2020-11-28 11:34:29 -08:00
Fabian Dill 033307cfc9 Allow just updating sprites and remove old alternate sprite folder 2020-11-11 13:45:21 +01:00
Fabian Dill 8060aa7884 add never adjust answer to client 2020-11-11 13:15:35 +01:00
Fabian Dill 1a32d45474 increment version number 2020-11-07 14:48:57 +01:00
Fabian Dill c230263200 move last used adjuster settings to _2 to avoid conflict with expanded palette options 2020-11-02 03:35:03 +01:00
Fabian Dill 93ddb1d5cf increment version 2020-10-30 00:10:41 +01:00
Fabian Dill 1d58f54101 move ALTTP to its own world folder 2020-10-24 05:38:56 +02:00
Fabian Dill 94dafa3c55 Open Breaking changes 2020-10-18 23:07:48 +02:00
Fabian Dill 2ae5f316dc increment version 2020-10-18 21:42:56 +02:00
CaitSith2 99677e8d8c Bump version to 3.2.0 2020-10-14 20:51:10 -07:00
CaitSith2 f9cab31c83 No need for code that makes json base patches anymore. 2020-10-14 10:03:25 -07:00
Fabian Dill 37a3c8f0d5 3.1.1 2020-09-20 00:34:35 +02:00
Fabian Dill 0cf9118cc0 3.1.0 2020-09-19 15:20:55 +02:00
Fabian Dill 7260fffcfa 3.0.0 2020-09-13 17:30:56 +02:00
Fabian Dill 99517021c8 Fix DB scheduling on mariaDB 2020-09-09 01:41:37 +02:00
Fabian Dill 91c15173d2 Prep another test release 2020-09-03 20:34:11 +02:00
Fabian Dill 112868b751 remove duplicate shop setting in gui and make entrance/location cache renew slightly faster 2020-08-27 04:05:11 +02:00
Fabian Dill 2096d6ae5b Use proper OS-specific path uris in many more places
also move path.join into local_path and output_path to simplify use
2020-08-25 13:22:47 +02:00
Fabian Dill 8852ec9a18 make all output paths host.yaml settable
rename itemlist to itempool, as the actual item listing is in items.py
change pedestal text of book of mudora from paradox to hylian for dingusses
2020-08-20 15:43:22 +02:00
Fabian Dill 72545d12f1 prevent most cases of duplicate player names
* in theory dupes are still possible due to later filtering of characters, but this should catch most instances of it.
2020-08-20 04:03:49 +02:00
Fabian Dill df6ee1a08b Fill Algorithm optimisations (somewhat minor, but easy pickings) 2020-08-14 00:34:41 +02:00
Fabian Dill cfb8e2ce71 Don't cache the subpath component 2020-08-02 00:34:23 +02:00
Fabian Dill 2eefb566ef Bump version to 2.5.0
Skipping 2.4.1 as the update became heavier on content than expected
2020-08-01 17:10:45 +02:00
Fabian Dill 2eea9b913c default to outputting to {local_path}/output
* Windows setup has that path as writable by everyone
* most others run from source, where the entire source path and children is writable.
* People complained about files appearing in My Documents, which admittedly is not intuitive
2020-08-01 16:52:11 +02:00
Fabian Dill 78c85cce14 WebHost: List Rooms in a sortable table 2020-07-21 23:15:19 +02:00
Fabian Dill ea9e103cb0 update rom name handling 2020-07-14 04:48:56 +02:00
Fabian Dill c80b76a930 Version 2.4.0
As the list of changes has gotten large enough to warrant a minor version bunch
2020-07-12 23:04:07 +02:00
Fabian Dill 12273c396b add /countdown and !options 2020-07-05 21:45:52 +02:00
Fabian Dill 346a08c3dd Use EasyModeEscape flag of upcoming Enemizer 2020-07-05 02:06:00 +02:00
Fabian Dill 5b72fd4e36 text fixes 2020-06-21 16:13:42 +02:00
Fabian Dill 6421a373e1 Webhost Update
introduce a very WIP tracker
Server will try to reuse port and also try to only use one port
2020-06-21 15:32:31 +02:00
Fabian Dill 7353b489ce add available hint points to UI 2020-06-15 06:30:51 +02:00
Fabian Dill aebdf3b66e add get public v6 2020-06-14 09:06:37 +02:00
Fabian Dill 5da5847805 allow multiserver to defer to embedded options 2020-06-13 08:37:05 +02:00
Fabian Dill 068d3e8695 fix crash if there are no cached adjuster settings
addresses #105
2020-06-09 18:02:15 +02:00
Fabian Dill 142c47b90f bump version 2020-06-09 08:38:52 +02:00
caitsith2 91cb0630fa changes
* Allow patch.py to mass adjust roms
* Allow patch.py store target server address for patch.
2020-06-07 12:04:33 -07:00
Fabian Dill d25973989a Make clients identify themselves against server
prep for potential later async auth system. Wanted to get this into the 2.3 client update.
2020-06-04 21:27:29 +02:00
Fabian Dill 3864eb5071 fix /snes <snes_interface> if interface contains spaces (which it shouldn't, but meh) 2020-06-03 02:19:16 +02:00
Fabian Dill b2e20be077 Hints now contain ER info 2020-05-18 05:40:36 +02:00
Fabian Dill f3cf03b374 Bump to 2.2.0 2020-05-11 02:37:09 +02:00
caitsith2 d4be3387cf Fix issue when a zero byte _persistent_storage.yaml exists. 2020-04-29 22:42:26 -07:00
Fabian Dill 00da5dfd65 warn older client versions that features are missing 2020-04-28 05:59:03 +02:00
Fabian Dill 56e57de574 store last used adjuster settings and use them for patching
might use them as gui defaults later
2020-04-26 15:14:30 +02:00
CaitSith2 f380542bab
2.1.1 hotfix (#76)
* 2.1.1 hotfix
* debug log options that have nothing defined.
* make sure there is at least one value in the dictionary before considering it important.
* only attempt to create outputpath if it is defined.

* whoops
2020-04-26 02:57:20 +02:00
Fabian Dill 53cfc6cc0a 2.1.0 2020-04-25 05:49:34 +02:00
Fabian Dill 5d33b4b164 introduce persistent data storage, which for now just caches rom -> server pairs 2020-04-24 05:29:02 +02:00
Fabian Dill 7582767401 aliases 2020-04-23 06:16:54 +02:00
Fabian Dill 83b5ac389a 2.0.3 2020-04-22 17:53:57 +02:00
Fabian Dill 9842399d8b fix payment for already found hints 2020-04-22 15:50:14 +02:00
Fabian Dill fa2cf20b01 !hint now points out all hints relating to the player issuing the command.
payed hints also retain that they were already found and don't need to be re-checked as items can't be unfound.
2020-04-22 05:09:46 +02:00
Fabian Dill 860faf6ef5 unify versions 2020-04-20 14:50:49 +02:00
Fabian Dill 8599c76647 Disallow spaces in generated names 2020-04-18 21:46:57 +02:00
Fabian Dill af78914d22 mvoe client stuff to new command processor 2020-04-14 20:22:42 +02:00
Fabian Dill 470b764ac8 update prompt_toolkit 2020-03-26 22:31:54 +01:00
Fabian Dill 2bec95b4f8 make get_options a bit more refined 2020-03-23 07:59:55 +01:00
Fabian Dill e4fd07185e refine local path mechanics 2020-03-23 07:45:40 +01:00
Fabian Dill 3bb4ace176 Allow use of "options.yaml" as a gitignored options overwrite
This also sets the default hint cost back to 1000, enable it if you want it.
2020-03-22 20:12:42 +01:00
Fabian Dill 031d6823a1 mostly pathing improvements, mostly to benefit linux 2020-03-15 19:32:00 +01:00
Fabian Dill d44acfdaaf implement binary patching for multimystery (for now no gui/cli support) 2020-03-06 00:48:23 +01:00
Fabian Dill 80fa9f4c58 use executable location for local path, not Utils location. As it may be elsewhere. 2020-03-02 23:27:16 +01:00
Fabian Dill 11e1ad6901 some small improvements for mystery 2020-02-23 17:06:44 +01:00
Fabian Dill b04db006e0 implement server-client handshake and move hint system to optional colorama support 2020-02-16 15:32:40 +01:00
Fabian Dill 14e24037a5 împlement optional hint system (defaults to off) 2020-02-09 05:28:48 +01:00
Fabian Dill 8ea3f34898 compile all user starting points 2020-02-02 22:36:55 +01:00
Fabian Dill 515716a71d optimize bytearray creation time and ram use 2020-01-22 17:50:00 +01:00
Bonta-kun ad278f91d6 Multiworld: clients will now be automatically be identified from the rom name and have their names and teams set by the host, meaning those need to be configured during seed gen
Player names will show up in spoiler log and hint tiles instead of player id
MultiClient: autoreconnect to mw server
2020-01-14 10:42:27 +01:00
Bonta-kun 55a30aa91f multiworld 2019-12-09 19:27:56 +01:00
Kevin Cathcart aab696fa9c Remove logic_hash
It is no longer used for anything.
2019-07-11 20:39:08 -04:00
Kevin Cathcart 5539143f00 v30 updates 2018-09-22 22:51:54 -04:00
Kevin Cathcart 9bd9bb4f93 Shop implementation
Also a few retro mode fixes
2018-03-18 21:01:45 -04:00
Kevin Cathcart e6d23b8700 Add some useful developer commands to Utils.py
These can be used in the interactive python shell by importing Utils.py
2018-01-02 21:18:26 -05:00
Kevin Cathcart 823657bc26 Style fixes
A bunch of style fixes. Mostly white space and style import order
tweaks, but a few other stylistic changes are present too.
2017-12-17 17:05:39 -05:00
Kevin Cathcart c760ac1766 Add versioning to MSI installer.
Also close console window when not using CLI.

Remove deployment section of appveyor.yml for the time being.
2017-12-02 16:38:35 -05:00
Kevin Cathcart 793eaeed65 Create a utils file for low level helpers like path utilities 2017-12-02 16:38:35 -05:00