mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-30 00:13:24 -07:00
Code Issues Packages Projects Releases Wiki Activity
6,836 Commits 122 Branches 55 Tags
a443aa01fcc391dc2ded233bad9964ec9e015cb7
Commit Graph

6836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scipio Wright
a443aa01fc Merge branch 'main' into tunc-combat-logic 2024-07-23 17:43:19 -04:00
Scipio Wright
86df1a9014 Update some comments 2024-07-23 09:52:34 -04:00
Silent
ed4ad386e8 TUNIC: Add setting to disable local spoiler to host yaml (#3661) 
* Add TunicSettings class for host yaml options

* Update __init__.py

* Update worlds/tunic/__init__.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Use self.settings

* Remove unused import

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
 2024-07-23 09:04:24 +02:00
Star Rauchenberger
5188375736 Lingo: Add pilgrimage logic through Starting Room (#3654) 
* Lingo: Add pilgrimage logic through Starting Room

* Added unit test

* Reverse order of two doors in unit test

* Remove print statements from TestPilgrimage

* Update generated.dat
 2024-07-23 08:34:47 +02:00
Star Rauchenberger
9c2933f803 Lingo: Fix Early Color Hallways painting in pilgrimages (#3645) 2024-07-23 00:45:49 +02:00
Scipio Wright
b840c3fe1a TUNIC: Move 3 locations to Quarry Back (#3649) 
* Move 3 locations to Quarry Back

* Change the non-er region too
 2024-07-23 00:43:41 +02:00
agilbert1412
c12d3dd6ad Stardew valley: Fix Queen of Sauce Cookbook conditions (#3651) 
* - Extracted walnut logic to a Mixin so it can be used in content pack requirements

* - Add 100 walnut requirements to the Queen of Sauce Cookbook

* - Woops a file wasn't added to previous commits

* - Make the queen of sauce cookbook a ginger island only thing, due to the walnut requirement

* - Moved the book in the correct content pack

* - Removed an empty class that I'm not sure where it came from
 2024-07-23 00:36:42 +02:00
Trevor L
f7989780fa Bomb Rush Cyberfunk: Fix final graffiti location being unobtainable (#3669) 2024-07-22 09:17:34 +02:00
agilbert1412
e59bec36ec Stardew Valley: Add gourmand frog rules for completing his tasks sequentially (#3652) 2024-07-22 08:32:40 +02:00
agilbert1412
48a0fb05a2 Stardew Valley: Removed Stardrop Tea from Full Shipment (#3655) 2024-07-22 01:52:44 +02:00
chandler05
12f1ef873c A Short Hike: Fix Boat Rental purchase being incorrectly calculated (#3639) 2024-07-22 01:47:46 +02:00
Rensen3
d7d4565429 YGO06: fixes non-deterministic bug by changing sets to lists (#3674) 2024-07-22 01:27:10 +02:00
qwint
7039b17bf6 CommonClient: fix bug when using Connect button without a disconnect (#3609) 
* makes the kivy connect button do the same username forgetting that /connect does to fix an issue where losing connection would make you unable to connect to a different server

* extract duplicate code
 2024-07-22 01:12:11 +02:00
Scipio Wright
c5344e20d2 Fix create_item classification 2024-07-21 09:58:16 -04:00
Jérémie Bolduc
34e7748f23 Stardew Valley: Make sure number of month in time logic is a int to improve performance by ~20% (#3665) 
* make sure number of month is actually a int

* improve rule explain like in pr

* remove redundant if in can_complete_bundle

* assert number is int so cache is not bloated
 2024-07-20 21:24:24 +02:00
gurglemurgle5
e33a9991ef CommonClient: Escape markup sent in chat messages (#3659) 
* escape markup in uncolored text

* Fix comment to allign with style guide

Fixes the comment so it follows the style guide, along with making it
better explain the code.

* Make more concise
 2024-07-19 08:37:59 +02:00
Scipio Wright
92786799f5 Merge branch 'main' into tunc-combat-logic 2024-07-17 19:42:26 -04:00
black-sliver
4d1507cd0e Core: Update cx_freeze to 7.2.0 and freeze it (#3648) 
supersedes ArchipelagoMW/Archipelago#3405
 2024-07-18 00:49:59 +02:00
Scipio Wright
06ce0920cf Adjust combat logic to deal with weird edge cases so it doesn't take stuff out of logic that was previously in logic 2024-07-17 17:06:07 -04:00
Fabian Dill
7b39b23f73 Subnautica: increase minimum client version (#3657) 2024-07-17 22:33:51 +02:00
Scipio Wright
0b5cacdda3 Add test for a problematic connection 2024-07-17 16:13:53 -04:00
Scipio Wright
d4ce12c67a Update gauntlet rule to hard-require a sword 2024-07-17 16:03:11 -04:00
Scipio Wright
27f132d4cd Remove redundant rule 2024-07-16 23:04:55 -04:00
Scipio Wright
8d2fb0625e Fix accidentally removed librarian rule 2024-07-16 23:02:09 -04:00
Scipio Wright
d02966a682 Fix lower zig ls rule 2024-07-15 15:21:10 -04:00
Scipio Wright
7300f64a77 Fix secret gathering place issue 2024-07-15 14:07:38 -04:00
Scipio Wright
aecf3c8257 Fix secret gathering place issue 2024-07-15 14:01:43 -04:00
Scipio Wright
19dbe860c9 Update combat logic description 2024-07-15 11:05:11 -04:00
Scipio Wright
77827197f6 Remove test combat option 2024-07-15 10:07:11 -04:00
Scipio Wright
db567c3c76 Merge Silent's missing slot data bugfix PR #3628 2024-07-15 10:02:03 -04:00
Scipio Wright
685d3369d6 Add combat logic to slot data 2024-07-15 09:58:45 -04:00
Scipio Wright
7777846f62 Reword combat logic option description, remove test option 2024-07-15 09:54:26 -04:00
Scipio Wright
169f807662 Remove completed todo 2024-07-15 09:50:23 -04:00
Scipio Wright
4edf799f34 Modify lower zig ls drop region destinations 2024-07-15 09:49:57 -04:00
Scipio Wright
45b168eede Remove the 100 moneys from logic 2024-07-15 09:44:34 -04:00
Scipio Wright
69c6f48245 Merge branch 'ArchipelagoMW:main' into tunc-combat-logic 2024-07-15 09:42:21 -04:00
Sunny Bat
925e02dca7 Raft: Move to new Options API (#3587) 2024-07-15 15:09:02 +02:00
CookieCat
e76d32e908 AHIT: Fix act shuffle test fail (#3522) 2024-07-14 14:17:05 +02:00
dennisw100
08a36ec223 Undertale: Fixed output location of the patched game in UndertaleClient.py (#3418) 
* Update UndertaleClient.py Fixed output location of the patched game

Fixed the error that when the client is opened outside of the archipelago folder, the patched folder would be created in there which on windows ends up trying to create it in the system32 folder

Bug Report: https://discord.com/channels/731205301247803413/1148330675452264499/1237412436382973962

* Undertale: removed unnecessary wrapping in UndertaleClient.py

I did not know os.path.join was unnecessary in this case the more you know.
 2024-07-14 14:11:52 +02:00
Bryce Wilson
48dc14421e Pokemon Emerald: Fix logic for coin case location (#3631) 2024-07-14 14:05:50 +02:00
black-sliver
948f50f35d customserver: fix minor memory leak (#3636) 
Old code keeps ref to last started room's task and thus never fully cleans it up.
 2024-07-14 13:56:56 +02:00
black-sliver
187f9dac94 customserver: preemtively run GC before starting room (#3637) 
GC seems to be lazy.
 2024-07-14 13:56:27 +02:00
Scipio Wright
8208a4d356 Dagger or combat for swamp big skeleton chest 2024-07-13 22:20:15 -04:00
Scipio Wright
6f0440548d Put in money logic 2024-07-13 13:41:39 -04:00
Scipio Wright
7e25b00f3c Modify beneath the vault bridge rule to need a lantern if combat logic is on 2024-07-13 11:13:44 -04:00
Scipio Wright
351e427b99 Add laurels rules to combat logic chests 2024-07-13 10:48:58 -04:00
Scipio Wright
38d0bb6634 Revamp combat logic function to work properly without melee 2024-07-13 10:39:58 -04:00
Scipio Wright
9f90401b91 Update the rule for the chest near the 6 crabs surrounding a slorm to also possibly require laurels 2024-07-13 10:23:56 -04:00
Scipio Wright
68dd2737d2 Add rule for atoll near the 6 crabs surrounding a poor defenseless baby slorm 2024-07-13 10:15:31 -04:00
Scipio Wright
d86e198260 Add rule for entering town portal of having equipment to deal with enemies 2024-07-13 09:56:47 -04:00