01a2376b74
Let make_dungeon set up items, then replace
2021-12-30 16:55:33 +01:00
d10ddb17b6
Let make_dungeon set up items, then replace
2021-12-30 16:55:33 +01:00
c42d489bf7
Pull dungeon item replacements from diff extras
2021-12-30 16:55:33 +01:00
8fef6b8d8c
Add "Start With" option
2021-12-30 16:55:33 +01:00
35b1178c20
Add "Start With" option
2021-12-30 16:55:33 +01:00
c0f95755ff
Add "Start With" option
2021-12-30 16:55:33 +01:00
b7676a3da2
Add "Start With" option for dungeon items
2021-12-30 16:55:33 +01:00
4ed45248eb
LttP: Rename "Dark World Shop" overworld door to Village of Outcasts Shop. Note: Now the overworld door, Region, Shop and inside door are named the same.
2021-12-29 11:08:23 +01:00
af96f71190
Fix bug where there is less locations than hint count.
2021-12-16 15:34:18 -08:00
246a5c568b
Core: add some more types
2021-11-30 05:33:56 +01:00
9f0a8e6d48
LttP: add hint options "Vendors" and "Full"
...
LttP: fix hint grammar if a Location isn't an ALttPLocation
2021-11-27 22:58:12 +01:00
c638a2cfb6
LttP: remove SM joke hint to reduce confusion
2021-11-18 18:57:31 +01:00
4a8ba0575f
Post-Merge Cleanup
2021-11-12 14:36:34 +01:00
8316a1902d
Move death link byte to sram
2021-11-11 12:07:17 -08:00
b9941e40c1
LttP: Allow DeathLink to be adjusted post-gen
2021-11-08 16:34:54 +01:00
583819c4ae
LttP, beemizer: support fine-tuned trap replacements ( #113 )
...
* update beemizer logic to separate replacement chance and single vs trap chance
* convert beemizer options to new style
2021-11-03 06:34:11 +01:00
0e0cc0ad16
LttP: Implement DeathLink
2021-11-01 19:37:47 +01:00
82aca3bce4
Fix TR small key getting shuffled away
2021-10-26 16:54:42 +00:00
4e3b8a5178
MultiServer: allow sending another Connect, to update tags, uuid, team etc.
2021-10-25 06:57:06 +02:00
2fe5459c56
Core & LttP: remove 255 player limit
2021-10-21 08:15:47 +02:00
66e198cbb6
Merge branch 'rip_compat' into Archipelago_Main
...
# Conflicts:
# MultiServer.py
2021-10-18 08:18:28 +02:00
e66a2a7c30
Core: change precollected_items to dict-style
...
Core: make sure there are enough threads available during generate_output to prevent deadlocks if event waiting is used
2021-10-10 16:50:08 +02:00
1217179f8a
Tests: Implement generic default options reachability test
...
Tests: remove duplicate TestDeathMountain.py
LttP: Move er_seeds out of Main
OriBF: Fix Mapstone typo
2021-10-06 11:32:49 +02:00
c5193ffdd9
GT flashing now disabled by reduce flashing.
2021-10-05 21:12:26 -07:00
b7aa5a17b7
LttP: Bartering, add price types for replacement items
2021-10-02 10:15:00 +02:00
d55a057a4d
Merge remote-tracking branch 'Archipelago/main' into Archipelago_Main
2021-10-02 07:01:26 +02:00
d1709764ef
Merge branch 'new_shops' into Archipelago_Main
2021-10-02 06:58:43 +02:00
4ca53a6ee0
ALttP: fix dungeon exits in HMG and NL if PoD, Hera or SP are there
2021-10-01 16:04:51 +00:00
efe02e2591
allow swamp BK in first chest in hybrid major glitches
2021-10-01 16:04:51 +00:00
858d4c74ce
Options: fix start_hints
2021-09-30 19:49:36 +02:00
f56bf0db73
MultiServer: remove legacy datapackage keys
...
MultiServer: remove warning about legacy datapackage use
MultiServer: remove legacy permission flags
Options: add "random" option to all Choices
LttP: remove random special handling from HeartColor
2021-09-30 13:22:25 +02:00
bde02f696b
Core: add Item.trap property
2021-09-29 05:21:33 +02:00
f9a9189687
LttP: actually fix shop shuffle u with grouped_random progressive
2021-09-26 10:09:40 +02:00
9daf1abcd9
LttP: fix shop shuffle u with grouped_random progressive
2021-09-26 09:55:54 +02:00
7f35f6f8f4
Factorio/LttP: remove some things that were marked for removal
2021-09-26 08:49:32 +02:00
8e569a1d1f
AutoWorld: split remote_start_inventory out from remote_items
2021-09-23 03:48:37 +02:00
111e11924f
LttP: fix multithreading racing condition resulting in Ganon giving the wrong prog bow hint, also have one less world.find_items() which is quite cpu expensive
2021-09-20 01:00:09 +02:00
f85dde6323
LttP: remove rom handling from Main.py
2021-09-18 22:13:19 +02:00
6441f92c9f
LttP: remove no longer used argument
2021-09-18 06:56:19 +02:00
a82bf1bb32
Options: raise Exception if per-game options are in root
...
Options: implement progression balancing and accessibility on new system
Options: implement the notion of "common" and "per_game_common" options in various systems
Options: centralize item and location name checking
Spoiler: prettier print some lists, sets and dicts
WebHost: add common options into /templates
2021-09-17 00:17:54 +02:00
5d68dc568f
Fill: fix non_local_items breaking in single player
2021-09-15 01:02:06 +02:00
ee1ea881e8
LttP: fix Enemizer option handover
2021-09-15 00:24:52 +02:00
4ed185a155
Merge branch 'Archipelago_Main' into new_shops
2021-09-13 02:52:03 +02:00
fbb220ce85
remove pass
2021-09-13 02:51:59 +02:00
8cc045f370
Fixes to barter pricing min/max, future key logic, spoiler log
2021-09-13 00:50:38 +00:00
c1c92647ca
LttP: move some simple Toggle options over to new system part 2
2021-09-13 02:01:15 +02:00
033adceb6f
LttP: move some simple Toggle options over to new system
2021-09-13 01:32:32 +02:00
4d68000692
Shops: limit "funny_prices" to logic free choices
2021-09-12 20:25:08 +02:00
fc62b4e0bd
Bartering Update
2021-09-03 13:26:30 -05:00
c73b994305
use_cache argument to get_all_state
2021-09-01 19:21:03 +00:00
88451d4239
Skip caching get_all_state while setting rules
...
Since rules have not been set for later worlds, the cache believes the completion condition is freely available if it had been placed previously, which breaks beatable-only key placement.
2021-09-01 19:21:03 +00:00
fbb8d6b132
invalidate state cache so that reachable_regions are recalculated during TR key logic
2021-09-01 11:22:30 +00:00
fb0f70b3e3
make owg entrances in inverted
2021-09-01 11:22:30 +00:00
17929415ee
actually set owg rules
2021-09-01 11:22:30 +00:00
631b6788c6
remove keys option for get_all_state, collect dungeon-local keys, and fix all uses of the state
2021-09-01 11:22:30 +00:00
7972aa6320
split building owg connections and setting the rules for those connections
2021-09-01 11:22:30 +00:00
138c884684
wipe reachable regions during TR key logic checks to ensure properly finding logic regions
2021-09-01 11:22:30 +00:00
4fcce66505
Move game names and descriptions into AutoWorld, fix option value names on player-settings pages
2021-08-31 17:28:46 -04:00
df037c54ff
LttP: fix dungeon original item rule calling
...
Found by Espeon
2021-08-30 23:52:40 +02:00
fd6e009c4b
Fill: fix placing non_local + non advancement items
2021-08-30 22:20:44 +02:00
6c357b61cc
LttP: re-remove LttP import in BaseClasses
2021-08-30 19:11:12 +02:00
3c74f561d5
LttP: Fix smallkey_shuffle in menu display
...
use smallkey_shuffle.option_universal from worlds.alttp.Options rather than "universal" for compare operations on universal checking.
2021-08-30 09:59:20 -07:00
cc70a6fa26
LttP: make shuffle names consistent
2021-08-30 18:00:39 +02:00
1c42564d90
LttP: remove leftover location binding
2021-08-30 16:47:34 +02:00
5daadcb2d5
LttP: implement new dungeon_items handling
...
LttP: move glitch_boots to new options system
WebHost: options.yaml no longer lists aliases
General: remove region.can_fill, it was only used as a hack to make dungeon-specific items to work
2021-08-30 16:31:56 +02:00
3fa28a3fdb
LttP: fix import mistake
2021-08-30 01:18:30 +02:00
baa7992a7a
AutoWorld: add post_fill
...
LttP: Move ShopSlotFill to post_fill
2021-08-30 01:16:04 +02:00
11fedef2f5
Generate: turn off interpret_on_off for newstyle options
2021-08-29 20:21:49 +02:00
da6674760c
LttP: convert MultiWorld.dungeons to dict for faster lookup
2021-08-29 16:02:28 +02:00
ee03371dd0
LttP: make heartbeep off functional again
2021-08-29 15:43:16 +02:00
a975c8fd00
LttP: Format non-native Location hints better
2021-08-28 23:18:45 +02:00
de567cc701
LttP: Move more functionality into ALttPItem from Item
...
LttP: More efficiently build !hint entrance info
LttP: More efficiently check for and build Big Bomb Shop playthrough path
2021-08-28 12:56:52 +02:00
de4775b0c8
LttP: Move difficulties and er seed sharing to generate_early
2021-08-28 00:26:02 +02:00
21255b3b46
LttP: Rename Shop Slot 1, 2, 3 to Shop Slot Left, Center, Right
...
General: Move generic IDs from LttP to new Generic World
Generate: ensure thread errors are collected before data from their completion may be referenced in playthrough/spoiler
2021-08-27 14:52:33 +02:00
e8da9924c6
allow collecting silver bow if noglitches or swordless, even if the limit is under 2
2021-08-27 07:44:05 +00:00
96b38aba04
mark TRBK as impassable during initial pass for TR key logic, so that crystaroller can be marked as front-locked
2021-08-27 07:44:05 +00:00
6a3d1fcaf4
LttP & Factorio: fix item state removal for progressive items.
2021-08-21 06:55:08 +02:00
aec39c919c
Minecraft: add missing minecraft defaults
2021-08-15 02:32:36 +02:00
8abfd14569
LttP: fix missing music
2021-08-14 01:00:36 +02:00
f2f4d6a133
remove leftover debug log
2021-08-14 00:51:35 +02:00
3ed7092af5
LttP: make sure Hyrule Castle Small Key in Standard + keyshuffle is reachable in first sphere of any such players
2021-08-14 00:51:35 +02:00
a532ceeb0a
AutoWorld: Should no longer need to overwrite collect, collect_item should be used instead
...
AutoWorld: Now correctly automatically applies State.remove if collect_item is also correct
LttP: Make keys advancement items
This feels like it improved generation chance. Might not be the case.
2021-08-10 09:47:28 +02:00
9ec0680ce5
LttP: move game specific fill to new AutoWorld fill_hook
2021-08-10 09:03:44 +02:00
299036ecca
LttP: move some LttP specific things more towards locations where they belong.
2021-08-10 08:00:53 +02:00
50ad661796
Put in support for old Progressive item key
...
I will probably regret this.
2021-08-09 10:07:25 +02:00
ba3bb201cd
Multiple: Followed a rabbit hole of moving LttP Rom generation to AutoWorld
...
Generator: Re-allow names with spaces (and see what breaks)
Generator: Removed teams (Note that teams are intended to move from a generation step feature to a server runtime feature, allowing dynamic creation of an already generated MW)
LttP: All Rom Options are now on the new system
LttP: palette option "random" is now called "good"
LttP: Roms are now created as part of the general output file creation step
LttP: disable Music is now Music, removing potential double negatives
LttP & Factorio: Progressive option random is now grouped_random
LttP: Enemy damage option random is now Enemy damage: chaos
2021-08-09 09:15:41 +02:00
01d88c362a
AutoWorld: Add "stage" methods and implement LttP Dungeon fill as an example.
2021-08-09 06:50:11 +02:00
f19878fcb8
LttP: Remove calling the player Idiot
2021-08-09 03:51:33 +02:00
39a5921522
round of post-test fixes
2021-07-23 20:04:51 +02:00
15747f48e9
fix LttP create_regions
2021-07-23 12:03:19 +02:00
21af3bf563
move LttP create_regions and set_rules to AutoWorld
2021-07-22 15:51:50 +02:00
2fc4006dfa
RIP: MultiMystery and Mystery, now there's just Generate
...
Other changes:
host.yaml Multi Mystery options were moved and changed
generate_output now has an output_directory argument
MultiWorld.get_game_players(<game>) now replaces <game>_player_ids
Python venv should now work properly
2021-07-21 18:08:15 +02:00
e105616b96
use dynamic item name groups in State
2021-07-21 09:45:15 +02:00
573fde4bbc
Merge together FactorioClient.py and FactorioClientGUI.py
...
Add cmd arguments
Add kivy style file, allowing users to modify it
2021-07-19 21:52:08 +02:00
4f998a6880
Documentation: now in repository. Programming documentation should be in /docs, player/user documentation should be in /WebHostLib/static/assets/tutorial.
...
Network: implement InvalidPacket, remove InvalidArguments and InvalidCmd
Datapackage: implement per-game versions and per-game package retrieval
2021-07-14 10:02:39 +02:00
62a6cdc9f7
allow remote_items to be set via AutoWorld
2021-07-13 19:14:57 +02:00
f456dba993
newstyle DataPackage. Both versions in merged format for compatibility for now.
2021-07-12 18:05:46 +02:00
768ae584d3
AutoWorld: add hint_blacklist, automatically generated all_names
...
MultiServer: revamp hint commands with AutoWorld
2021-07-12 15:33:20 +02:00
ae32315bf7
add World.location_names
2021-07-12 15:11:48 +02:00
b53d6c370b
AutoWorld: remove Games Enum (AutoWorldRegister.world_types replaces it)
2021-07-12 14:10:49 +02:00
31c550d410
AutoWorld: basic Item handling
2021-07-12 13:54:47 +02:00
54177c7064
bump required LttP Client Version
2021-07-10 07:37:56 +02:00
172c1789a8
introduce World.topology_present, to indicate if any meaningful path information is available in the world
2021-07-08 11:07:41 +02:00
9db506ef42
Factorio: recipe randomization (rocket-part and science-packs only for now)
2021-07-07 10:14:58 +02:00
7d5b20ccfc
Remove temporary solution "OptionSets" in favor of AutoWorld's Options
2021-07-04 16:18:21 +02:00
2530d28c9d
Move Progressive Items to AutoWorld
2021-07-04 15:47:11 +02:00
6458653812
Update Text.py
2021-06-29 22:00:06 +00:00
7f8bb10fc5
Move Factorio, Hollow Knight and Minecraft Options into AutoWorld
2021-06-25 23:32:13 +02:00
6c1d164330
LttP: set non-native items to Power Star
2021-06-22 06:25:19 +02:00
304f63aedf
Merge branch 'espeon' into Archipelago_Main
...
# Conflicts:
# playerSettings.yaml
2021-06-21 02:49:06 +02:00
deff356910
Added HMG check to all checks for OWG and NL
2021-06-14 22:10:26 -05:00
cea2f81b86
remove IRH special rule now that it's a 1/1 triforce piece hunt
2021-06-13 07:57:34 +02:00
760fb32016
fix Factorio Recipe Time randomization not being deterministic
2021-06-11 14:47:13 +02:00
568a71cdbe
Start implementing object oriented scaffold for world types
...
(There's still a lot of work ahead, such as:
registering locations and items to the World, as well as methods to create_item_from_name()
many more method names for various stages
embedding Options into the world type
and many more...)
2021-06-11 14:22:44 +02:00
96e13786cd
Fixed broken mirrorless swamp rules
2021-06-10 18:10:25 -05:00
b3b56fcafd
removed unnecessary import
2021-06-08 19:32:27 -05:00
671fd50cfb
Moved the add_rule for mirrorless swamp to speed it up on invalid entrance shuffle type
2021-06-08 19:19:11 -05:00
eaf19643a9
Cleaned up code for assigning dungeon reentry rules
2021-06-08 19:18:28 -05:00
a582a3781b
Moved the addition of HMG-specific connections to fix crossed ER
2021-06-08 18:32:22 -05:00
e0d90e0b21
Properly accounting for agatower not freely opening for dungeon reentry
2021-06-08 18:17:21 -05:00
a73189338c
Fixed full ER HMG not ignoring pearl requirements on entrances
2021-06-08 18:15:47 -05:00
5ea03c71c0
start moving some alttp options over to the new system
2021-06-08 21:58:11 +02:00
adda0eff4a
implement Range option type
2021-06-08 14:15:23 +02:00
2001ca6566
Fixed the check on dungeon reentry not working properly
2021-06-08 01:22:16 -05:00
b9a783d7d7
Fixed open connections breaking non-HMG seed generation
2021-06-08 00:50:28 -05:00
eb9ee9f41e
Hybrid Major Glitches connections and logic
2021-06-07 20:19:03 -05:00
16c6e17a49
Initial handling of hybrid glitch logic outside of UnderworldGlitchRules
2021-06-07 01:19:27 -05:00
ac31671914
initial hybridmg logic file commit
2021-06-07 00:38:30 -05:00
c095c28618
Split requirements into world types, automatically discover and resolve them.
2021-06-06 15:30:20 +02:00
aa6f65ee1f
Prevent logical lockout from Pedestal/Pyramid Fairy in ice rod hunt
2021-05-27 12:14:20 +02:00
b82d6cec31
regain basic WebHost functionality
2021-05-13 21:57:11 +02:00
daa959e353
remove suppress rom argument
2021-05-13 01:40:36 +02:00
729088fd85
Fix generation failure if aga tower door was placed on HC ledge in inverted dungeonsfull
2021-05-11 01:26:59 +02:00
909172cbad
Factorio, Minecraft & Hollow Knight: add startinventory support
2021-05-09 21:22:21 +02:00
2f7e532f4f
Minecraft Randomizer
...
Squash merge, original Commits:
* Minecraft locations, items, and generation without logic
* added id lookup for minecraft
* typing import fix in minecraft/Items.py
* fix 2
* implementing Minecraft options and hard/postgame advancement exclusion
* first logic pass (75/80)
* logic pass 2 and proper completion conditions
* added insane difficulty pool, modified method of excluding item pools for easier extension
* bump network_data_package version
* minecraft testing framework
* switch Ancient Debris to Netherite Scrap to avoid advancement triggering on receiving that item
* Testing now functions, split tests up by advancement pane, added some story tests
* Newer testing framework: every advancement gets its own function, for ease of testing
* fixed logic for The End... Again...
* changed option names to "include_hard_advancements" etc.
* village/pillager-related advancements now require can_adventure: weapon + food
* a few minecraft tests
* rename "Flint & Steel" to "Flint and Steel" for parity with in-game name
* additional MC tests
* more tests, mostly nether-related tests
* more tests, removed anvil path for Two Birds One Arrow
* include Minecraft slot data, and a world seed for each Minecraft player slot
* Added new items: ender pearls, lapis, porkchops
* All remaining Minecraft tests
* formatting of Minecraft tests and logic for better readability
* require Wither kill for Monsters Hunted
* properly removed 8 Emeralds item from item pool
* enchanting required for wither; fishing rod required for water breathing; water breathing required for elder guardian kill
* Added 12 new advancements (ported from old achievement system)
* renamed "On a Rail" for consistency with modern advancements
* tests for the new advancements
* moved slot_data generation for minecraft into worlds/minecraft/__init__.py, added logic_version to slot_data
* output minecraft options in the spoiler log
* modified advancement goal values for new advancements
* make non-native Minecraft items appear as Shovel in ALttP, and unknown-game items as Power Stars
* fixed glowstone block logic for Not Quite Nine Lives
* setup for shuffling MC structures: building ER world and shuffling regions/entrances
* ensured Nether Fortresses can't be placed in the End
* finished logic for structure randomization
* fixed nonnative items always showing up as Hammers in ALttP shops
* output minecraft structure info in the spoiler
* generate .apmc file for communication with MC client
* fixed structure rando always using the same seed
* move stuff to worlds/minecraft/Regions.py
* make output apmc file have consistent name with other files
* added minecraft bottle macro; fixed tests imports
* generalizing MC region generation
* restructured structure shuffling in preparation for structure plando
* only output structure rando info in spoiler if they are shuffled
* Force structure rando to always be off, for the stable release
* added Minecraft options to player settings
* formally added combat_difficulty as an option
* Added Ender Dragon into playthrough, cleaned up goal map
* Added new difficulties: Easy, Normal, Hard combat
* moved .apmc generation time to prevent outputs on failed generation
* updated tests for new combat logic
* Fixed bug causing generation to fail; removed Nether Fortress event since it should no longer be needed with the fix
* moved all MC-specific functions into gen_minecraft
* renamed "logic_version" to "client_version"
* bug fixes
properly flagged event locations/items with id None
moved generation back to Main.py to fix mysterious generation failures
* moved link_minecraft_regions into minecraft init, left create_regions in Main for caching
* added seed_name, player_name, client_version to apmc file
* reenabled structure shuffle
* added entrance tests for minecraft
Co-authored-by: achuang <alexander.w.chuang@gmail.com>
2021-05-08 13:38:57 +02:00
5c9aa09c80
LttP: implement dungeonscrossed ER
2021-05-08 12:04:03 +02:00
e5bbcb8d27
merge of 6bf02455e6
2021-05-08 01:49:30 +02:00
cf488e5a5d
convert parse_zspr to staticmethod
2021-05-08 01:44:37 +02:00
36ef9e8a72
LttP: Read author game display name from zspr
2021-05-07 22:34:02 +02:00
5cb2689609
LttP: speed up ER shuffling caves
2021-05-07 21:01:13 +02:00
95358bc523
Never download a sprite with Author "Nintendo"
2021-04-28 10:31:24 +02:00
4fc1ce77ac
only build vanilla sprite data once correctly
2021-04-28 02:39:55 +02:00
b8c7d6a72f
remove remaining sprite data
2021-04-27 07:19:53 +02:00
a5efed83b9
Set non-LttP Shop prices to 5 to 140 Rupee range
2021-04-16 21:41:19 +02:00
433981fd3d
pass explicit seed_name from MultiMystery.py
2021-04-12 09:45:07 +02:00
d4b422840a
Fix dynamic world attributes not updating
2021-04-10 06:36:06 +02:00
c4d6ac50be
turn weapons into boolean swordless
2021-04-09 20:40:45 +02:00
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
d451145d53
Merge branch 'main' into Archipelago_Main
2021-04-04 03:17:46 +02:00
250099f5fd
Small adjustments
2021-04-03 20:02:15 +02:00
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
01ef041b86
last minute fixing
2021-04-01 20:31:39 +02:00
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
1f5bcb6273
update basic and normal boss shuffling with a less biased algorithm
2021-03-26 04:05:36 +01:00
71fb238916
According to Espeon, this is fine; removing TODO
2021-03-23 00:13:21 +01:00
f2a1858b59
Implement (most) Hollow Knight Options
2021-03-21 00:47:17 +01:00
8c6c7bc575
Update intro text
2021-03-20 02:09:17 +01:00
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
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
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
3d93f659e3
some option updates
2021-03-14 08:38:02 +01:00
4b499d2b1c
fix location hints not being able to get the correct text
2021-03-14 00:27:06 +01:00
6455dc3ffc
Merge branch 'main' into breaking_changes
...
# Conflicts:
# README.md
2021-03-13 23:34:38 +01:00
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
f7dc21ddcc
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Main.py
# Utils.py
2021-03-07 22:04:06 +01:00
1d6aabeea6
fix some missed bmbp -> apbp spots
2021-03-03 02:02:41 +01:00
bfa9bde348
Merge branch 'main' into breaking_changes
2021-03-03 02:00:10 +01:00
0d576eefbb
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Main.py
# worlds/alttp/EntranceRandomizer.py
2021-03-03 01:54:52 +01:00
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
07b9fcfefc
minor cleanup
2021-02-28 20:48:30 +01:00
612c3c23c0
spheres should ignore empty locations
2021-02-27 18:58:17 +01:00
8bfddb7fc6
Remove Single-Item logic macros
2021-02-27 17:11:54 +01:00
abcc2690f0
Add "Fake" (Randomizer-only) Hollow Knight items
2021-02-26 21:03:16 +01:00
f19291aaed
Remove Fake Hollow Knight Items and Locations
...
Add GetDataPackage Network system
2021-02-25 02:07:28 +01:00
e60ae897b4
Allow HK items in shops and allow settings local/non-local items for HK
2021-02-24 00:36:37 +01:00
a248fd5f94
add a HK game completion rule
2021-02-22 11:18:53 +01:00
8a395a3021
update guis
2021-02-21 20:37:43 +01:00
ff9b24e88e
Hollow Knight integration
...
(prototype status)
2021-02-21 20:17:24 +01:00
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
96dfccdbfc
set correct version in multidata
2021-02-19 13:47:25 +01:00
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
3d81f0cca7
update after merge from /main
2021-01-30 23:43:15 +01:00
2553b1d2ee
Merge branch 'main' into breaking_changes
2021-01-30 23:40:25 +01:00
28c12054dd
update to Shops release
2021-01-30 23:37:35 +01:00
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
670b8b4b11
Merge branch 'main' into breaking_changes
...
# Conflicts:
# MultiClient.py
# WebUI.py
2021-01-21 05:36:16 +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
6bb7631382
fix unit tests
2021-01-03 17:16:07 +01:00
8ebd36b5a7
update Archipelago
2021-01-03 14:32:32 +01:00
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
4de64eab84
update Options system #2
2020-10-24 19:46:13 +02:00
1d58f54101
move ALTTP to its own world folder
2020-10-24 05:38:56 +02:00
Alchav
Fabian Dill
CaitSith2
Adam Ziegler
Kyle Franz
espeon65536
pepperpow
Chris Wilson
alwaysintreble
espeon65536