f8569db21b
Merge remote-tracking branch 'Archipelago/main' into Archipelago_Main
2021-10-18 22:58:45 +02:00
34eba2655e
MultiServer: add !collect and collect_mode
...
CommonClient: make missing and checked location lookups faster
FactorioClient: implement reverse grant technologies for collect/forfeit/coop
2021-10-18 22:58:29 +02:00
66e198cbb6
Merge branch 'rip_compat' into Archipelago_Main
...
# Conflicts:
# MultiServer.py
2021-10-18 08:18:28 +02:00
33c747a881
Accidently changed variable name
2021-10-18 06:11:25 +00:00
20d61d14e0
Fixed some spelling
2021-10-18 06:11:25 +00:00
8ccdb56bf1
Merge pull request #104 from alwaysintreble/ror2
...
Risk of rain 2: Revert breaking naming change
2021-10-14 13:25:34 -04:00
17ed957c6b
Include military science pack in all techs military or higher.
...
This does mean you have to get military science online to research your silo.
2021-10-14 10:20:56 -07:00
e4564abe41
Fix tech-maniac achievement for silo spawn.
2021-10-13 07:03:18 -07:00
f16b29b16b
Merge branch 'main' into ror2
2021-10-12 09:09:11 -05:00
065931cae7
Greatly reduced number of items marked as never_excluded due to the performance implications it brings
2021-10-11 11:55:46 +00:00
e301b67e49
Greatly improved performance when no locations are excluded
2021-10-10 18:24:31 +00:00
952d878442
Marked items as never exclude + some more refactorings
2021-10-10 18:24:31 +00: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
96ffe95404
hopefully fix lint error
2021-10-09 21:03:03 -07:00
f8deb1bd7f
Make visible_sending part of AutoWorld.
2021-10-09 20:38:53 -07:00
d8de84e417
Revert Item Pickup to ItemPickup because it broke stuff
2021-10-09 22:11:05 -05:00
eb602aedc3
Fill overworld-shuffle dungeon items with logic
...
Prevents maps and compasses from failing fast fill
2021-10-09 17:32:10 +00:00
b539892cc0
Fixed Timespinner generation *oops*
2021-10-09 13:58:07 +00:00
c7a315ac97
Refactorings
2021-10-09 13:58:07 +00:00
b1fb793ea4
Ror2: fix generation mistake ( #100 )
...
* Risk of Rain 2: logic updates
* Risk of Rain 2: move a variable definition so it can be reused. Reverted a change that broke stuff for some reason.
* Documentation update
2021-10-09 15:57:37 +02:00
d3780cd9d5
Documentation update
2021-10-09 05:55:50 -05:00
d10cab824a
Merge branch 'ArchipelagoMW:main' into ror2
2021-10-08 13:29:25 -05:00
a93d633d25
Risk of Rain 2: move a variable definition so it can be reused. Reverted a change that broke stuff for some reason.
2021-10-08 13:27:23 -05:00
cd53dcfe43
Fix typo
2021-10-08 10:10:12 +00: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
3348dce122
Core: try-except-else style
2021-10-05 23:52:22 +00:00
53e6ca6e34
Core: better error message for exclusion failure
2021-10-05 23:52:22 +00:00
0fed7f1295
Core: do not error on location exclusion if the location has an ID value
2021-10-05 23:52:22 +00:00
6ade832029
Subnautica: fix Aurora Prawn Suit Bay requires laser cutter
...
Subnautica: add Dunes North Wreck's PDA to the correct wreck
Subnautica: fix typo in Yellow
Subnautica: fix progression tag for many items
Subnautica: move extra items from valuable item pool to fast-fill
Testclient at https://cdn.discordapp.com/attachments/731214280439103580/895047705552904222/ArchipelagoSubnautica.zip
2021-10-05 23:07:03 +02:00
50ba9a56f7
Risk of Rain 2: logic updates
2021-10-05 20:23:27 +00:00
990141df47
Risk of Rain 2: logic updates
2021-10-04 22:28:40 -05:00
46e9fd7ae3
Rules.py: add typing info
2021-10-03 17:22:47 +02:00
96d7277a22
Fixed Timespinner routing + some typing
2021-10-03 13:44:36 +00:00
0c59ad7e22
OoT: reenable MQ dungeon support
2021-10-03 08:52:29 +00:00
fa1b93252c
OoT: place Deku Shields first in closed forest + shopsanity
2021-10-03 08:52:29 +00:00
0d9e186e18
OoT: place shop progression first rather than only tunics
2021-10-03 08:52:29 +00: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
4f7e3d7a45
Fixed routing issue for Inverted seeds
2021-10-01 16:05:26 +00: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
cff5db446d
Fixed some bugs + added documentation + added a few features ( #87 )
...
* Refactorings + minor logic fix
* Fixed unnececerly recalculation of item_name_groups
* Enabled other itemId's so that they can be send to client when desired
* Marked the loss of location 1337158
* Updated network graph
* First draft tinmespinner documentation
* Moved personal items to slot_data rather than location scouts
* Disabled Remote Items
* Updated docs
* Fixed port override
2021-09-30 19:51:07 +02: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
16454dbc33
Increment data version.
2021-09-28 13:00:02 +00:00
ea8b6e6438
Adjustment to chaos weights. Add progression logic.
2021-09-28 13:00:02 +00:00
c0b25e1f6e
Adjustment to chaos weights. Add progression logic.
2021-09-28 13:00:02 +00:00
Fabian Dill
Vince Lund
Hussein Farran
CaitSith2
alwaysintreble
Jarno Westhof
Jarno Westhof
espeon65536