Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Timespinner: many new stuffs #1433

Merged
merged 49 commits into from
Feb 19, 2023

Conversation

Jarno458
Copy link
Collaborator

@Jarno458 Jarno458 commented Feb 4, 2023

What is this fixing or adding?

(Only listing the AP changes here, not client changes)
New Flags:

  • [Dad Percent]: "The win condition is beating the boss of Emperor's Tower"
  • [Rising Tides]: "Random area's are flooded"
    • Possible areas that can be flooded:
      • Maw caves + boss spot
      • Xarion boss spot
      • Lake Desolation chicken jump
      • Castle Courtyard
      • Castle Basement
      • Castle Moat
      • Ancient Pyramid Shaft + regrets chest
      • Ancient Pyramid boss spot
      • Dry Lake Serene
  • [Unchained Keys]: "Start with Twin Pyramid Key, which does not give free warp; warp items for Past, Present, (and ??? with Enter Sandman) can be found"
  • [Trapped Chests]: "Items can be traps. Toggles available traps in the 'Traps' settings"
  • [LevelCap]: "Sets the max level Lunais can achieve."
  • [ExtraEarringsXP]: "Adds additional XP granted by Galaxy Earrings."

Bug Fixes:

  • Fixed game from crashing when playing on nightmare lvl1 without first clearing the game
  • Fixed connecting with the wrong save to archipelago multiworld

New Yaml options:

  LevelCap: 80 #Range 1 - 99 (default: 99)
  ExtraEarringsXP: 5 #Range 0 - 24 (default: 0)
  DadPercent: random #Toggle (default: off)
  RisingTides: true #Toggle (default: off)
  RisingTidesOverrides: # Default weights "Dry": 67, "Flooded": 33
    Xarion: # Regions can be: CastleBasement, Xarion, Maw, AncientPyramidShaft, Sandman, CastleMoat, CastleCourtyard, LakeDesolation, LakeSerene
      Dry: 50
      Flooded: 450
  UnchainedKeys: random #Toggle (default: off)
  TrapChance: 100 # Range 0 - 100 (default: 10%)
  Traps: # Default: all
    - 'Bee Trap' # Can bee: 'Meteor Sparrow Trap', 'Poison Trap', 'Chaos Trap', 'Neurotoxin Trap', 'Bee Trap'

How was this tested?

Using AP world available in the timespinner channel in discord channel for the last two weeks
Also many generation tests, to find generation issues
Tracker changes where tested through a local webhost only
(the client side of the changes where tested and developed over past two months as a beta)

@Jarno458 Jarno458 marked this pull request as ready for review February 4, 2023 15:47
@Jarno458 Jarno458 marked this pull request as draft February 5, 2023 13:58
@Jarno458 Jarno458 marked this pull request as ready for review February 5, 2023 14:39
Copy link
Collaborator

@alwaysintreble alwaysintreble left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good other than a random change I don't understand. Would be nice if you added some tests for the new logic stuff -hint hint-

setup.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
Jarno458 and others added 3 commits February 17, 2023 09:29
I am not sure why, i guess this is just to make adding future games less conflicting?

Co-authored-by: Fabian Dill <[email protected]>
Copy link
Member

@black-sliver black-sliver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracker requires #1453 but seems to work fine with it.

Found a couple of typos and some inconsistencies. I don't really care where you put your braces and brackets and white spaces, but it should be consistent.

Also please make sure the changes in WebHostLib match the corresponding sections from style.md. (You added a lot of spaces in front of { in the css)

(Looks like #1034 will pass after merging this)

WebHostLib/static/styles/timespinnerTracker.css Outdated Show resolved Hide resolved
worlds/timespinner/Options.py Show resolved Hide resolved
worlds/timespinner/Options.py Outdated Show resolved Hide resolved
worlds/timespinner/Options.py Outdated Show resolved Hide resolved
worlds/timespinner/Options.py Outdated Show resolved Hide resolved
worlds/timespinner/__init__.py Outdated Show resolved Hide resolved
worlds/timespinner/__init__.py Outdated Show resolved Hide resolved
worlds/timespinner/__init__.py Outdated Show resolved Hide resolved
worlds/timespinner/__init__.py Outdated Show resolved Hide resolved
worlds/timespinner/__init__.py Outdated Show resolved Hide resolved
@Jarno458
Copy link
Collaborator Author

Jarno458 commented Feb 19, 2023

Tracker requires #1453 but seems to work fine with it.
@black-sliver WDYM requires? this was tested and developed without any addition branches, just master + my changes?

@black-sliver
Copy link
Member

Tracker requires #1453 but seems to work fine with it.
@black-sliver WDYM requires? this was tested and developed without any addition branches, just master + my changes?

Tracker is currently broken on main, not your fault, so when you merged main, it broke on your branch as well. Just wanted to point that out if anyone else wants to test.

@black-sliver black-sliver merged commit fc2e555 into ArchipelagoMW:main Feb 19, 2023
@Jarno458 Jarno458 deleted the timespinner_rising_tides branch February 19, 2023 20:23
kindasneaki pushed a commit to kindasneaki/Archipelago that referenced this pull request Jun 28, 2023
* Timespinner: added RisingTides and DadPercent flags

* Implemented logic for DadPercent and RisingTides

* Fixed TODO's

* Logic fixes

* Fixed + removed LogicMixins

* Fixes

* More Fixes

* Added UnchainedKeys flag

* Fixed available items in pool with UnchainedKeys

* Fixed typing callable

* Fixed generation failures

* More refactorings

* Implemented traps

* Fixed more typo

* Fixed copy paste bug

* Fixed teleporter logic

* Fixed traps from pool

* Fixed pyramid gates bug that causes a crash on connecting

* Fixed seed reproduceability

* Fixed logic eye for eye spy
Now consider warp beacons as starter progression items

* Attempt to add tracker icons using table

* Replaced table layout with css grid

* Fixed tracker + added Timespinner was apworld capatible

* Updated archipelago items description

* updated URL

* Cleared up text

* Fixed based on self review of PR

* Fixed unit tests

* Fixed seed reproduceability when the traps yaml option is not provided

* Fixed logic for flooded basement

* Implemented Beserkers review result

I am not sure why, i guess this is just to make adding future games less conflicting?

Co-authored-by: Fabian Dill <[email protected]>

* Added two new options (thanks to WeffJebster)

* Apply suggestions from code review

Co-authored-by: black-sliver <[email protected]>

* Apply suggestions from code review

Co-authored-by: black-sliver <[email protected]>

* Apply suggestions from code review

Co-authored-by: black-sliver <[email protected]>

* Apply suggestions from code review

Co-authored-by: black-sliver <[email protected]>

* Addition review results

---------

Co-authored-by: Fabian Dill <[email protected]>
Co-authored-by: black-sliver <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants