mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-04-01 20:43:24 -07:00
3069deb019
* Jak 1: Initial commit: Cell Locations, Items, and Regions modeled.
* Jak 1: Wrote Regions, Rules, init. Untested.
* Jak 1: Fixed mistakes, need better understanding of Entrances.
* Jak 1: Fixed bugs, refactored Regions, added missing Special Checks. First spoiler log generated.
* Jak 1: Add Scout Fly Locations, code and style cleanup.
* Jak 1: Add Scout Flies to Regions.
* Jak 1: Add version info.
* Jak 1: Reduced code smell.
* Jak 1: Fixed UT bugs, added Free The Sages as Locations.
* Jak 1: Refactor ID scheme to better fit game's scheme. Add more subregions and rules, but still missing one-way Entrances.
* Jak 1: Add some one-ways, adjust scout fly offset.
* Jak 1: Found Scout Fly ID's for first 4 maps.
* Jak 1: Add more scout fly ID's, refactor game/AP ID translation for easier reading and code reuse.
* Jak 1: Fixed a few things. Four maps to go.
* Jak 1: Last of the scout flies mapped!
* Jak 1: simplify citadel sages logic.
* Jak 1: WebWorld setup, some documentation.
* Jak 1: Initial checkin of Client. Removed the colon from the game name.
* Jak 1: Refactored client into components, working on async communication between the client and the game.
* Jak 1: In tandem with new ArchipelaGOAL memory structure, define read_memory.
* Jak 1: There's magic in the air...
* Jak 1: Fixed bug translating scout fly ID's.
* Jak 1: Make the REPL a little more verbose, easier to debug.
* Jak 1: Did you know Snowy Mountain had such specific unlock requirements? I didn't.
* Jak 1: Update Documentation.
* Jak 1: Simplify user interaction with agents, make process more robust/less dependent on order of ops.
* Jak 1: Simplified startup process, updated docs, prayed.
* Jak 1: quick fix to settings.
* Jak and Daxter: Implement New Game (#1)
* Jak 1: Initial commit: Cell Locations, Items, and Regions modeled.
* Jak 1: Wrote Regions, Rules, init. Untested.
* Jak 1: Fixed mistakes, need better understanding of Entrances.
* Jak 1: Fixed bugs, refactored Regions, added missing Special Checks. First spoiler log generated.
* Jak 1: Add Scout Fly Locations, code and style cleanup.
* Jak 1: Add Scout Flies to Regions.
* Jak 1: Add version info.
* Jak 1: Reduced code smell.
* Jak 1: Fixed UT bugs, added Free The Sages as Locations.
* Jak 1: Refactor ID scheme to better fit game's scheme. Add more subregions and rules, but still missing one-way Entrances.
* Jak 1: Add some one-ways, adjust scout fly offset.
* Jak 1: Found Scout Fly ID's for first 4 maps.
* Jak 1: Add more scout fly ID's, refactor game/AP ID translation for easier reading and code reuse.
* Jak 1: Fixed a few things. Four maps to go.
* Jak 1: Last of the scout flies mapped!
* Jak 1: simplify citadel sages logic.
* Jak 1: WebWorld setup, some documentation.
* Jak 1: Initial checkin of Client. Removed the colon from the game name.
* Jak 1: Refactored client into components, working on async communication between the client and the game.
* Jak 1: In tandem with new ArchipelaGOAL memory structure, define read_memory.
* Jak 1: There's magic in the air...
* Jak 1: Fixed bug translating scout fly ID's.
* Jak 1: Make the REPL a little more verbose, easier to debug.
* Jak 1: Did you know Snowy Mountain had such specific unlock requirements? I didn't.
* Jak 1: Update Documentation.
* Jak 1: Simplify user interaction with agents, make process more robust/less dependent on order of ops.
* Jak 1: Simplified startup process, updated docs, prayed.
* Jak 1: quick fix to settings.
* Jak and Daxter: Genericize Items, Update Scout Fly logic, Add Victory Condition. (#3)
* Jak 1: Update to 0.4.6. Decouple locations from items, support filler items.
* Jak 1: Total revamp of Items. This is where everything broke.
* Jak 1: Decouple 7 scout fly checks from normal checks, update regions/rules for orb counts/traders.
* Jak 1: correct regions/rules, account for sequential oracle/miner locations.
* Jak 1: make nicer strings.
* Jak 1: Add logic for finished game. First full run complete!
* Jak 1: update group names.
* Jak and Daxter - Gondola, Pontoons, Rules, Regions, and Client Update
* Jak 1: Overhaul of regions, rules, and special locations. Updated game info page.
* Jak 1: Preparations for Alpha. Reintroducing automatic startup in client. Updating docs, readme, codeowners.
* Alpha Updates (#15)
* Jak 1: Consolidate client into apworld, create launcher icon, improve setup docs.
* Jak 1: Update setup guide.
* Jak 1: Load title screen, save states of in/outboxes.
* Logging Update (#16)
* Jak 1: Separate info and debug logs.
* Jak 1: Update world info to refer to Archipelago Options menu.
* Deathlink (#18)
* Jak 1: Implement Deathlink. TODO: make it optional...
* Jak 1: Issue a proper send-event for deathlink deaths.
* Jak 1: Added cause of death to deathlink, fixed typo.
* Jak 1: Make Deathlink toggleable.
* Jak 1: Added player name to death text, added zoomer/flut/fishing text, simplified GOAL call for deathlink.
* Jak 1: Fix death text in client logger.
* Move Randomizer (#26)
* Finally remove debug-segment text, update Python imports to relative paths.
* HUGE refactor to Regions/Rules to support move rando, first hub area coded.
* More refactoring.
* Another refactor - may squash.
* Fix some Rules, reuse some code by returning key regions from build_regions.
* More regions added. A couple of TODOs.
* Fixed trade logic, added LPC regions.
* Added Spider, Snowy, Boggy. Fixed Misty's orbs.
* Fix circular import, assert orb counts per level, fix a few naming errors.
* Citadel added, missing locs and connections fixed. First move rando seed generated.
* Add Move Rando to Options class.
* Fixed rules for prerequisite moves.
* Implement client functionality for move rando, add blurbs to game info page.
* Fix wrong address for cache checks.
* Fix byte alignment of offsets, refactor read_memory for better code reuse.
* Refactor memory offsets and add some unit tests.
* Make green eco the filler item, also define a maximum ID. Fix Boggy tether locations.
* Move rando fixes (#29)
* Fix virtual regions in Snowy. Fix some GMC problems.
* Fix Deathlink on sunken slides.
* Removed unncessary code causing build failure.
* Orbsanity (#32)
* My big dumb shortcut: a 2000 item array.
* A better idea: bundle orbs as a numerical option and make array variable size.
* Have Item/Region generation respect the chosen Orbsanity bundle size. Fix trade logic.
* Separate Global/Local Orbsanity options. TODO - re-introduce orb factory for per-level option.
* Per-level Orbsanity implemented w/ orb bundle factory.
* Implement Orbsanity for client, fix some things up for regions.
* Fix location name/id mappings.
* Fix client orb collection on connection.
* Fix minor Deathlink bug, add Update instructions.
* Finishing Touches (#36)
* Set up connector level thresholds, completion goal choices.
* Send AP sender/recipient info to game via client.
* Slight refactors.
* Refactor option checking, add DataStorage handling of traded orbs.
* Update instructions to change order of load/connect.
* Add Option check to ensure enough Locations exist for Cell Count thresholds. Fix Final Door region.
* Need some height move to get LPC sunken chamber cell.
* Rename completion_condition to jak_completion_condition (#41)
* The Afterparty (#42)
* Fixes to Jak client, rules, options, and more.
* Post-rebase fixes.
* Remove orbsanity reset code, optimize game text in client.
* More game text optimization.
* Added more specific troubleshooting/setup instructions.
* Add known issue about large releases taking time. (Dodge 6,666th commit.)
* Remove "Bundle of", Add location name groups, set better default RootDirectory for new players.
* Make orb trade amounts configurable, make orbsanity defaults more reasonable.
* Add HUD info to doc.
* Exempt's Code Review Updates (#43)
* Round 1 of code review updates, the easy stuff.
* Factor options checking away from region/rule creation.
* Code review updates round 2, more complex stuff.
* Code review updates round 3: the mental health annihilator
* Code review updates part 4: redemption.
* More code review feedback, simplifying code, etc.
* Added a host.yaml option to override friendly limits, plus a couple of code review updates.
* Added singleplayer limits, player names to enforcement rules.
* Updated friendly limits to be more strict, optimized recalculate logic.
* Today's the big day Jak: updates docs for mod support in OpenGOAL Launcher
* Rearranged and clarified some instructions, ADDED PATH-SPACE FIX TO CLIENT.
* Fix deathlink reset stalls on a busy client. (#47)
* Jak & Daxter Client : queue game text messages to get items faster during release (#48)
* queue game text messages to write them during the main_tick function and empty the message queue faster during release
* wrap comment for code style character limit
Co-authored-by: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com>
* remove useless blank line
Co-authored-by: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com>
* whitespace code style
Co-authored-by: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com>
* Move JsonMessageData dataclass outside of ReplClient class for code clarity
---------
Co-authored-by: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com>
* Item Classifications (and REPL fixes) (#49)
* Changes to item classifications
* Bugfixes to power cell thresholds.
* Fix bugs in item_type_helper.
* Refactor 100 cell door to pass unit tests.
* Quick fix to ReplClient.
* Not so quick fix to ReplClient.
* Display friendly limits in options tooltips.
* Use math.ceil like a normal person.
* Missed a space.
* Fix non-accessibility due to bad orb calculation.
* Updated documentation.
* More Options, More Docs, More Tests (#51)
* Reorder cell counts, require punch for Klaww.
* Friendlier friendly friendlies.
* Removed custom_worlds references from docs/setup guide, focused OpenGOAL Launcher language.
* Increased breadth of unit tests.
* Clean imports of unit tests.
* Create OptionGroups.
* Fix region rule bug with Punch for Klaww.
* Include Punch For Klaww in slot data.
* Update worlds/jakanddaxter/__init__.py
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Temper and Harden Text Client (#52)
* Provide config path so OpenGOAL can use mod-specific saves and settings.
* Add versioning to MemoryReader. Harden the client against user errors.
* Updated comments.
* Add Deathlink as a "statement of intent" to the YAML. Small updates to client.
* Revert deathlink changes.
* Update error message.
* Added color markup to log messages printed in text client.
* Separate loggers by agent, write markup to GUI and non-markup to disk simultaneously.
* Refactor MemoryReader callbacks from main_tick to constructor.
* Make callback names more... informative.
* Give users explicit instructions in error messages.
* Stellar Messaging (#54)
* Use new ap-messenger functions for text writing.
* Remove Powershell requirement, bump memory version to 3.
* Error message update w/ instructions for game crash.
* Create no console window for gk.
* ISO Data Enhancement (#58)
* Add iso-path as argument to GOAL compiler.
# Conflicts:
# worlds/jakanddaxter/Client.py
* More resilient handling of iso_path.
* Fixed scout fly ID mismatches.
* Corrected iso_data subpath.
* Update memory version to 4.
* Docs update for iso_data.
* Auto Detect OpenGOAL Install (#63)
* Auto detect OpenGOAL install path. Also fix Deathlink on server connection.
* Updated docs, add instructions to error messages.
* Slight tweak to error text.
* J&D : add per region location groups (#64)
* add per region power cells location group
* add per region scout flies location group
* add per zone orb bundle groups
(I'm not particularly happy about this code, but I figured doing it this way was the point of least friction/duplication)
* guess who forgot 9 very important characters in each line of the last commit
* Rearrange location group names, quick fix to client error handling.
* Fix pycharm warnings.
* Fix more pycharm warnings.
* Light cleanup: fix icons, add bug report page, remove py 3.8 code.
* Update worlds/jakanddaxter/Options.py
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Update worlds/jakanddaxter/Options.py
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Update worlds/jakanddaxter/Options.py
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Update worlds/jakanddaxter/Options.py
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* Code review updates on comments, tooltips, and type hints.
* Update type hint for lists in regions.
* Missed todo removal.
* More type hint updates.
* Small region updates for location accessibility, small updates to world guide and README.md.
* Add GMC scout fly location group.
* Improved sanitization of game text.
* Traps 2 (#70)
* Add trap items, relevant options, and citadel orb caches.
* Update REPL to send traps to game.
* Fix item counter.
* Allow player to select which traps to use.
* Fix host.yaml doc strings, ap-setup-options typing, bump memory version to 5.
* Alter some trap names.
* Update world doc.
* Add health trap.
* Added 3 more trap types.
* Protect against empty trap list.
* Reword traps paragraph in world doc.
* Another update to trap paragraph.
* Concisify trap option docstring.
* Timestamp on game log file.
* Update client to handle waiting on title screen.
* Send slot name and seed to game.
* Use self.random instead.
* Update setup doc for new title screen.
* Quick clarification of orb caches in world doc.
* Sanitize slot info earlier.
* Added to and improved unit tests.
* Light cleanup on world.
* Optimizations to movement rules, docs: known issues update.
* Quick fixes for beta 0.5.0 release: template options and LPC logic.
* Quick fix to spoiler counts.
* Reorganize world guide for faster navigation.
* Fix links.
* Update HUD section.
* Found a way to render apostrophes in item names.
* March Refactors (#77)
* Reorg imports, small fix to Rock Village movement.
* Fix wait-on-title message never going to ready message.
* Colorama init fix.
* Swap trap list for a dictionary of trap weights.
* The more laws, the less justice.
* Quick readability update.
* Have memory reader provide instructions for slow booting games.
* Revert some things.
* Update setup_en.md
* Update HUD mode lingo for combined msgs.
* Remade launcher icon, sized correctly.
* I don't know why I can't be satisfied with things.
* Apply suggestions from Scipio
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Properly use the settings API instead of Utils.
* Newline on requirements.txt.
* Add __init__ files for frozen builds.
* Replace an ap_inform function with a CommonClient built-in.
* Resize icon to match kivymd expected size.
* First round of Treble code reviews.
* Second round of Treble code reviews.
* Third round of Treble code reviews.
* Missed an unncessary if condition.
* Missed unnecessary comments.
* Fourth round of Treble code reviews.
* Switch trap dictionary to OptionCounter.
* Use existing slot name/seed from network protocol.
* Violet code review updates.
* Violet code review updates part 2.
* Refactor to avoid floating imports (Violet part 3).
* Found a few more valid characters for messaging.
* Move tests out of init, add colon to game name (now that it's safe).
* But don't include those chars for file text.
* Implement Vi suggestion on webhost-capable friendly limits.
* Revert "Implement Vi suggestion on webhost-capable friendly limits."
This reverts commit 2d012b7f4a.
* Rename all files for PEP8.
* Refactor how maximums work on webhost.
* Fix rogue UT.
* Don't rush.
* Fix client post-PEP8.
---------
Co-authored-by: Justus Lind <DeamonHunter@users.noreply.github.com>
Co-authored-by: Romain BERNARD <30secondstodraw@gmail.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
254 lines
4.6 KiB
Plaintext
254 lines
4.6 KiB
Plaintext
# Archipelago World Code Owners / Maintainers Document
|
|
#
|
|
# This file is used to notate the current "owners" or "maintainers" of any currently merged world folder as well as
|
|
# certain documentation. For any pull requests that modify these worlds/docs, a code owner must approve the PR in
|
|
# addition to a core maintainer. All other files and folders are owned and maintained by core maintainers directly.
|
|
#
|
|
# All usernames must be GitHub usernames (and are case sensitive).
|
|
|
|
# Adventure
|
|
/worlds/adventure/ @JusticePS
|
|
|
|
# A Hat in Time
|
|
/worlds/ahit/ @CookieCat45
|
|
|
|
# A Link to the Past
|
|
/worlds/alttp/ @Berserker66
|
|
|
|
# Sudoku (APSudoku)
|
|
/worlds/apsudoku/ @EmilyV99
|
|
|
|
# Aquaria
|
|
/worlds/aquaria/ @tioui
|
|
|
|
# ArchipIDLE
|
|
/worlds/archipidle/ @LegendaryLinux
|
|
|
|
# Blasphemous
|
|
/worlds/blasphemous/ @TRPG0
|
|
|
|
# Bomb Rush Cyberfunk
|
|
/worlds/bomb_rush_cyberfunk/ @TRPG0
|
|
|
|
# Bumper Stickers
|
|
/worlds/bumpstik/ @FelicitusNeko
|
|
|
|
# Castlevania 64
|
|
/worlds/cv64/ @LiquidCat64
|
|
|
|
# Castlevania: Circle of the Moon
|
|
/worlds/cvcotm/ @LiquidCat64
|
|
|
|
# Celeste 64
|
|
/worlds/celeste64/ @PoryGone
|
|
|
|
# ChecksFinder
|
|
/worlds/checksfinder/ @SunCatMC
|
|
|
|
# Civilization VI
|
|
/worlds/civ6/ @hesto2
|
|
|
|
# Clique
|
|
/worlds/clique/ @ThePhar
|
|
|
|
# Dark Souls III
|
|
/worlds/dark_souls_3/ @Marechal-L @nex3
|
|
|
|
# Donkey Kong Country 3
|
|
/worlds/dkc3/ @PoryGone
|
|
|
|
# DLCQuest
|
|
/worlds/dlcquest/ @axe-y @agilbert1412
|
|
|
|
# DOOM 1993
|
|
/worlds/doom_1993/ @Daivuk @KScl
|
|
|
|
# DOOM II
|
|
/worlds/doom_ii/ @Daivuk @KScl
|
|
|
|
# Factorio
|
|
/worlds/factorio/ @Berserker66
|
|
|
|
# Faxanadu
|
|
/worlds/faxanadu/ @Daivuk
|
|
|
|
# Final Fantasy Mystic Quest
|
|
/worlds/ffmq/ @Alchav @wildham0
|
|
|
|
# Heretic
|
|
/worlds/heretic/ @Daivuk @KScl
|
|
|
|
# Hollow Knight
|
|
/worlds/hk/ @BadMagic100 @qwint
|
|
|
|
# Hylics 2
|
|
/worlds/hylics2/ @TRPG0
|
|
|
|
# Inscryption
|
|
/worlds/inscryption/ @DrBibop @Glowbuzz
|
|
|
|
# Jak and Daxter: The Precursor Legacy
|
|
/worlds/jakanddaxter/ @massimilianodelliubaldini
|
|
|
|
# Kirby's Dream Land 3
|
|
/worlds/kdl3/ @Silvris
|
|
|
|
# Kingdom Hearts
|
|
/worlds/kh1/ @gaithern
|
|
|
|
# Kingdom Hearts 2
|
|
/worlds/kh2/ @JaredWeakStrike
|
|
|
|
# Landstalker: The Treasures of King Nole
|
|
/worlds/landstalker/ @Dinopony
|
|
|
|
# Lingo
|
|
/worlds/lingo/ @hatkirby
|
|
|
|
# Links Awakening DX
|
|
/worlds/ladx/ @threeandthreee
|
|
|
|
# Lufia II Ancient Cave
|
|
/worlds/lufia2ac/ @el-u
|
|
/worlds/lufia2ac/docs/ @wordfcuk @el-u
|
|
|
|
# Mario & Luigi: Superstar Saga
|
|
/worlds/mlss/ @jamesbrq
|
|
|
|
# Meritous
|
|
/worlds/meritous/ @FelicitusNeko
|
|
|
|
# The Messenger
|
|
/worlds/messenger/ @alwaysintreble
|
|
|
|
# Minecraft
|
|
/worlds/minecraft/ @KonoTyran @espeon65536
|
|
|
|
# Mega Man 2
|
|
/worlds/mm2/ @Silvris
|
|
|
|
# MegaMan Battle Network 3
|
|
/worlds/mmbn3/ @digiholic
|
|
|
|
# Muse Dash
|
|
/worlds/musedash/ @DeamonHunter
|
|
|
|
# Noita
|
|
/worlds/noita/ @ScipioWright @heinermann
|
|
|
|
# Old School Runescape
|
|
/worlds/osrs @digiholic
|
|
|
|
# Overcooked! 2
|
|
/worlds/overcooked2/ @toasterparty
|
|
|
|
# Pokemon Emerald
|
|
/worlds/pokemon_emerald/ @Zunawe
|
|
|
|
# Pokemon Red and Blue
|
|
/worlds/pokemon_rb/ @Alchav
|
|
|
|
# Raft
|
|
/worlds/raft/ @SunnyBat
|
|
|
|
# Rogue Legacy
|
|
/worlds/rogue_legacy/ @ThePhar
|
|
|
|
# Risk of Rain 2
|
|
/worlds/ror2/ @kindasneaki
|
|
|
|
# Saving Princess
|
|
/worlds/saving_princess/ @LeonarthCG
|
|
|
|
# Shivers
|
|
/worlds/shivers/ @GodlFire @korydondzila
|
|
|
|
# A Short Hike
|
|
/worlds/shorthike/ @chandler05 @BrandenEK
|
|
|
|
# Sonic Adventure 2 Battle
|
|
/worlds/sa2b/ @PoryGone @RaspberrySpace
|
|
|
|
# Starcraft 2
|
|
/worlds/sc2/ @Ziktofel
|
|
|
|
# Super Metroid
|
|
/worlds/sm/ @lordlou
|
|
|
|
# Super Mario 64
|
|
/worlds/sm64ex/ @N00byKing
|
|
|
|
# Super Mario World
|
|
/worlds/smw/ @PoryGone
|
|
|
|
# SMZ3
|
|
/worlds/smz3/ @lordlou
|
|
|
|
# Secret of Evermore
|
|
/worlds/soe/ @black-sliver
|
|
|
|
# Stardew Valley
|
|
/worlds/stardew_valley/ @agilbert1412
|
|
|
|
# Subnautica
|
|
/worlds/subnautica/ @Berserker66
|
|
|
|
# Terraria
|
|
/worlds/terraria/ @Seldom-SE
|
|
|
|
# Timespinner
|
|
/worlds/timespinner/ @Jarno458
|
|
|
|
# The Legend of Zelda (1)
|
|
/worlds/tloz/ @Rosalie-A @t3hf1gm3nt
|
|
|
|
# TUNIC
|
|
/worlds/tunic/ @silent-destroyer @ScipioWright
|
|
|
|
# Undertale
|
|
/worlds/undertale/ @jonloveslegos
|
|
|
|
# VVVVVV
|
|
/worlds/v6/ @N00byKing
|
|
|
|
# Wargroove
|
|
/worlds/wargroove/ @FlySniper
|
|
|
|
# The Wind Waker
|
|
/worlds/tww/ @tanjo3
|
|
|
|
# The Witness
|
|
/worlds/witness/ @NewSoupVi @blastron
|
|
|
|
# Yacht Dice
|
|
/worlds/yachtdice/ @spinerak
|
|
|
|
# Yoshi's Island
|
|
/worlds/yoshisisland/ @PinkSwitch
|
|
|
|
#Yu-Gi-Oh! Ultimate Masters: World Championship Tournament 2006
|
|
/worlds/yugioh06/ @Rensen3
|
|
|
|
# Zillion
|
|
/worlds/zillion/ @beauxq
|
|
|
|
## Active Unmaintained Worlds
|
|
|
|
# The following worlds in this repo are currently unmaintained, but currently still work in core. If any update breaks
|
|
# compatibility, these worlds may be deleted. If you are interested in stepping up as maintainer for
|
|
# any of these worlds, please review `/docs/world maintainer.md` documentation.
|
|
|
|
# Final Fantasy (1)
|
|
# /worlds/ff1/
|
|
|
|
# Ocarina of Time
|
|
# /worlds/oot/
|
|
|
|
###################
|
|
## Documentation ##
|
|
###################
|
|
|
|
# Apworld Dev Faq
|
|
/docs/apworld_dev_faq.md @qwint @ScipioWright
|
|
|