Mumble
55e0d65ac8
[Refactor] Improvements on getOrder() ( #3547 )
...
* Moved getOrder() into TurnStartPhase
* Cleaned up bypass speed checks
* Revert "Cleaned up bypass speed checks"
This reverts commit 11150254f5
.
* Added comments.
* Fixed up some inconsistencies
* changed isSameBracket check
* changed isSameBracket check p2
* changed isSameBracket check p3
* changed isSameBracket check p3
* Fixed up conditionals + stall/M.m
* Seems OK
* Update battle-spec.ts
* Updated tests to use new functions introduced. Less intuitive, but faster.
* Update src/phases.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Moved getOrder() into TurnStartPhase
* Cleaned up bypass speed checks
* Revert "Cleaned up bypass speed checks"
This reverts commit 11150254f5
.
* Added comments.
* Fixed up some inconsistencies
* changed isSameBracket check
* changed isSameBracket check p2
* changed isSameBracket check p3
* changed isSameBracket check p3
* Fixed up conditionals + stall/M.m
* Seems OK
* Update battle-spec.ts
* Updated tests to use new functions introduced. Less intuitive, but faster.
* Removed import
* i hate git
* Moved getOrder() into TurnStartPhase
* Seems OK
* missing import
* Added Snooze's review
* Added test fixes and removed unwanted edit.
* fixed dynamax cannon test
* typedocs fixes
* Updating battle-order.test.ts
* merge fixes
* ughhh
* Update src/test/abilities/mycelium_might.test.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* tsdocs :)
* Fixed tests
* Update src/phases/turn-start-phase.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* Update src/phases/turn-start-phase.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* innerthunder's fixes
* commas
* Mocked stats instead of directly changing them
---------
Co-authored-by: Frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-09-01 15:23:25 -07:00
flx-sta
69a9e6a365
Localization: remove all "<key>_female": null
entries in /en ( #3918 )
2024-09-02 00:21:48 +02:00
Frederico Santos
86fe4dd888
Merge pull request #3834 from pagefaultgames/beta
...
Beta Release #3
2024-09-01 23:15:28 +01:00
Frederico Santos
55acf0eeac
Merge branch 'main' into beta
2024-09-01 23:10:40 +01:00
Frederico Santos
e80b4fe122
feat: Update banner key assignment in TimedEventDisplay setup method
2024-09-01 21:16:20 +01:00
Mumble
95a02a96a7
Fixing banner error upon refresh ( #3956 )
2024-09-01 21:11:23 +01:00
Mumble
de66b450a5
[Beta][Misc] Banner ( #3926 )
...
* Initial work - does not work.
* Revert
* image replacement
* better scaling
* Removing most of the bangs
* no more bangs
* Update src/timed-event-manager.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Implemented Torranx's suggestion
* Ready for Translations
* Delete Picture
* Localized banners
* Biomes fix
* Corrections
* Update src/timed-event-manager.ts
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
2024-09-01 20:18:40 +01:00
damocleas
85a8abc0e8
[Balance] Final Adjustments to biomes + Gmax Snorlax Ability + Passive changed ( #3950 )
...
* Biome Adjustments 1
* MOUNTAIN OUT FROM ANCIENT RUINS
* snorlax gmax adjustment
* Localizers please calm down - Snorlax Ability + Passive change
* One more time let's give it a go biomes.ts
* fixed ]
* Update biomes.ts
* fixed spelling mistake
2024-08-31 16:39:21 -07:00
Mumble
15fea2e171
Gamepad for Run Info ( #3940 )
...
Co-authored-by: frutescens <info@laptop>
2024-08-31 19:50:09 +01:00
Mumble
f8e119f37e
[Beta][Bug] Preventing Run History encryption ( #3933 )
...
* Blah
* Thought about it more
* Removed excess comment
* Purposely tested everything by manually setting bypassLogin to false
---------
Co-authored-by: frutescens <info@laptop>
2024-08-31 02:12:47 -04:00
Opaque02
ce0ba3fbf9
[Bug] Fixed issue where menu can't be opened up after a trainer battle ( #3932 )
2024-08-31 00:53:15 -04:00
Frederico Santos
3a50925de0
refactor: Update excludedMenus condition to look for currentPhase instead
2024-08-31 05:14:25 +01:00
Mumble
f9de149f55
double voucher prevention ( #3931 )
...
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-31 04:40:40 +01:00
NightKev
642b18e747
[Bug] Fix Pokemon not gaining HP when evolving ( #3569 )
...
* Don't recalculate stats that already exist
* add test to cover hp update after evo (#4 )
- add evolution phase to phase interceptor
- add mock for video game object
- add returning video mock on add.video()
* add test to make sure pkm are not healed on evolve
* Stop on `EndEvolutionPhase` to prevent game state leak in tests
* Fix imports
* Remove `.js` from import
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Add docs to mock class
---------
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-30 20:21:56 -07:00
NightKev
15205c5e00
Prevent daily runs from breaking due to very (un)lucky RNG ( #3841 )
2024-08-30 20:10:38 -07:00
chaosgrimmon
d9d147280b
[Sprite] Fix Manaphy egg outline ( #3863 )
...
* [Sprite] Add Manaphy egg outline
* [Sprite] Fix Manaphy egg outline
2024-08-30 23:10:22 -04:00
chaosgrimmon
3d5957a998
[Sprite] Beta2 Variant Patch icon chores ( #3748 )
...
* [Sprite] Add Gen1 icons
* [Sprite] Add Gen3 icons
* [Sprite] Add Gen4 icons
* [Sprite] Add Gen4 icons
* [Sprite] Add Gen5 icons
* [Sprite] Add Gen6 icons
* [Sprite] Add Gen9 icons
* [Sprite] Add Gen1 variant icons
* [Sprite] Add Gen2 variant icons
* [Sprite] Add Gen3 variant icons
* [Sprite] Add Gen4 variant icons
* [Sprite] Add Gen5 variant icons
* [Sprite] Add Gen7 variant icons
* [Sprite] Add more Gen1 variant icons
* [Sprite] Add Beta2 Gen2 variant icons
* [Sprite] Add Beta2 Gen1 variant icons
* [Sprite] Add Beta2 Gen3 variant icons
* [Sprite] Add Beta2 Gen4 variant icons
* [Sprite] Add Beta2 Gen5 variant icons
* [Sprite] Add Beta2 Gen6 variant icons
* [Sprite] Add Beta2 Gen7 variant icons
* [Sprite] Add Beta2 Gen8 variant icons
* [Sprite] Add Beta2 Gen9 variant icons
2024-08-30 23:06:36 -04:00
Frederico Santos
5e2c05afe9
refactor: Update excludedMenus condition to look at the end of the modeChain
2024-08-31 03:33:07 +01:00
Mumble
dd0b6464d2
[Beta][Bug] Fixing Trapped ability messages ( #3928 )
...
* always update your repo
* enemy command phase changed too
* typedocs
* Typedocs part 2
* Added simulation boolean back
* restored simulated
* Remove `console.log()` statements
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-30 22:07:27 -04:00
NightKev
dd0e820893
Fix turn order issue in Miracle Eye test ( #3912 )
2024-08-30 15:33:35 -07:00
Blitzy
8ff566eaca
[Enhancement] Certain Signature Move Animation Fixes ( #3878 )
...
* Add Missing Move Animations
* Change Zippy-Zap / Buzzy Buzz animations
* Sappy Seed change
* Change Mortal Spin
2024-08-31 00:21:19 +02:00
Mumble
87f55a8a1a
[Bug][Beta] Double vouchers fix ( #3906 )
...
* The fix.
* Ordinals....
* tsdocs..
* my forgetting
* Fixed issues
* Update src/phases/encounter-phase.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* The actual change
* actual fixes
* This should fix it... maybe
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-30 11:06:18 -07:00
flx-sta
87d2300ee8
[Bug] skip-seen-dialogue storing strings instead of i18n keys ( #3900 )
...
* fix skipSeenDialogue storing
seen dialogues were stores as actual string instead of their i18n-keys. This fixes it.
Reported on discord:
https://discord.com/channels/1125469663833370665/1176874654015684739/1278794542648131695
* fix falling back to english
* Victory-Rival Dialgoue
* Update src/phases/game-over-phase.ts
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
* fix showDialogue for non i18n-key calls
showDialogue can be called with either text or an i18n key. This wasn't taken into account and caused some console spamming.
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-08-30 10:59:39 -07:00
AJ Fontaine
e2db9cb8a4
Even more TM fixes ( #3889 )
2024-08-30 10:54:48 -07:00
Mumble
60aa61e56e
[Bug] Skip Eternatus dialogue again ( #3716 )
...
* The fix.
* Ordinals....
* tsdocs..
* my forgetting
* Fixed issues
* Update src/phases/encounter-phase.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* The actual change
* actual fixes
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-30 11:16:15 +02:00
chaosgrimmon
db4a63dbb9
[Sprite] Fix Courtney eye whites ( #3907 )
2024-08-30 00:15:35 -07:00
Madmadness65
aeecb67f32
Add inverse "item" sprite
...
Pull #3525 forgot to add this graphic into the items folder, which would mean the sprite would be lost if the items atlas was overwritten at any point. This shouldn't affect any existing functionality.
2024-08-29 20:56:05 -05:00
Opaque02
d1132a5765
[QoL] Test dialogue menu option ( #3725 )
...
* Adding code to allow use of a testing dialogue translation menu
* Updated to include autocomplete functionality
* Added multiple inputs
* Added locales for other languages as well as checks to make this only available on local/beta
* Updated a few things to try get the dialogue to work for full length of the window
* Fixed issue with message box not taking up full length of the screen (thanks Moka!) and some minor bugs
* Whoops, forgot to stage a file
* Updated locale files
* Fixed broken tests and docs
* Removed keys from json
* Reordered and reorganised some things
* Put admin enum at end to match handlers
* Removed old unneeded line of code
* Updated to include the ability to handle cases where i18 keys are null in the locales json
2024-08-30 02:38:46 +01:00
Frederico Santos
f7169868f3
chore: Refactor AdminUiHandler to clear input fields and revert mode
2024-08-30 00:22:09 +01:00
Frederico Santos
7eb6ba4dfd
chore: Clear input fields and revert mode in AdminUiHandler
2024-08-30 00:19:03 +01:00
Frederico Santos
f1111dc0d2
chore: Update AdminUiHandler to clear input fields and set mode to ADMIN
2024-08-30 00:13:53 +01:00
AJ Fontaine
3b9b0c4091
Blitzy's implementation of evil teams in trainer-config.ts ( #3884 )
2024-08-30 00:05:09 +01:00
Frederico Santos
8bf44a2047
Fix error handling and revert mode in AdminUiHandler
2024-08-29 23:59:19 +01:00
MokaStitcher
e4da48f51a
[Bug] Starter select default attributes fixes ( #3870 )
...
* Test changes to starter ui stuff for edge case stuff to fix
* Minor bug fixes
* [starter-ui] cleanup outdated fix
* use existing method to get the default form from the caught attributes
* clear the existing StarterPreferences of potential invalid values
* remember the last variant used even when disabling shiny form
* fix variant and shiny checks for edge case with variant flags but no shiny flag
* more fixes for invalid starter prefs and default settings
---------
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
2024-08-29 14:47:37 -07:00
AJ Fontaine
b2cd21bcb1
Fix evolution items not working on mons without forms ( #3902 )
2024-08-29 22:13:10 +01:00
Mumble
9833b1da7e
[Balance] Randomized Biome after End Biome ( #3888 )
...
* Biome.END goes somewhere random
* this way island is included too
* no towns or plains
* Enums are dumb
---------
Co-authored-by: frutescens <info@laptop>
2024-08-29 22:10:38 +01:00
damocleas
db9434ac11
[Balance] Biome Changes / Minor Passive Changes / Minor Egg Move Changes / Beta GMax form adjustments ( #3852 )
...
* [Balance] Previous Egg/Passive/Eternatus Update Adjustments
* Update pokemon-species.ts
* Updated Eternatus, src/field/pokemon.ts
* Update egg-moves.ts for Drowzee and Darkrai
* Update biomes.ts
* Update biomes.ts to screw over Dojo!
* Update pokemon-species.ts gmax adjustments
2024-08-29 20:29:06 +01:00
Leo Kim
c112abbcd2
[Challenge] Inverse battle challenge ( #3525 )
...
* add inverse battle challenge. refactoring type.ts for inverse battle challenge
* update type integer -> number
* add inverse battle condition to thunder wave, conversion 2.
* add inverse_battle test code, add checking gameMode in runToSummon not to overwrite gameMode to CLASSIC always
* update startBattle with isClassicMode default = true
* add inverse achievement
* fix achv validation condition
* remove unnecessary new line
* update defaultWidth 160 -> 200
* update locales
* fix korean translation
* fix korean translation2
* Update src/locales/de/achv.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/challenges.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/challenges.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* resize challenge description 96 -> 84
* update challenge select UI size.
* revert font size to 84. update de translation
* Update src/locales/fr/challenges.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/fr/achv.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/es/challenges.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/fr/challenges.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/fr/achv.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/es/achv.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/fr/achv.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* shrink de font size on achivement
* set middle align to achv title
* Update src/locales/zh_CN/achv.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/achv.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_CN/challenges.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/challenges.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* fix zh_TW ahiv.ts
* fix import code on inverse battle test for updated phase
* Update src/data/type.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* update requested changes
* Update src/locales/pt_BR/achv.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/pt_BR/achv.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/pt_BR/challenges.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* [draft] update inverse battle apply function
* change the way how to use applyChallenge for inverse type
* resolve confilct
* fix test codes
* remove unnecessary multiplier variable and break codes
* update getTypeDamageMultiplier argument type from `number` to `Type`
* Fix inverse types tests (#1 )
* Fix Inverse Battle tests
* Add timeout parameter to tests
* update requested changes
* update requested changes
* update requested changes2
* update comments
* Update src/test/utils/helpers/challengeModeHelper.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/test/utils/helpers/challengeModeHelper.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix mis pasted code
* revert loadChallenge code for FreshStartChallenge
* code refactoring
* restore challenge.json lost translations
* revert UI changes
* revert unreverted newlines
* Run History inclusion
* requested changes from torranx
* update WaterSuperEffectTypeMultiplierAttr for inverse battle matchup.
* fix test code. adding flying press test code
* update requested change from xavion3
* updated requested change from xavion 2
* update requested changes from xavion 3
* remove exception code which is not valid
* attach partial mark to Freeze dry. requested by xavion
* add missing game over phase code when we delete old phases.ts
* fix test codes
* merge conflict
* fix achv condition
* updated achv block condition. we don't want to change desc now
* resolve conflict
* Eternatus Moveset Tinkering
* Cleaning it up
---------
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: frutescens <info@laptop>
2024-08-29 19:59:33 +01:00
Jannik Tappert
1e95068f14
[Localization] [EN] Admin Dialouge as it was intended by blitzy ( #3896 )
...
* Admin Dialouge as it was intended by blitzy
* Dont forget the females
* Delete female file
2024-08-29 19:40:12 +02:00
flx-sta
968c4ce3e6
[Localization] Use gender context for dialogues (all 3 files) ( #3879 )
...
* merge dialogue files into single files
No more -male, -female. Rather using context
* adopt changes from #3697
2024-08-29 10:17:40 -07:00
Jason Guan
0d7c335cd9
[Bug] Make Destiny Bond fail when used consecutively in accordance with Gen VII+ implementation ( #3504 )
...
* make destiny bond fail on consecutive turns
* Update move.ts to remove .length shorthand
Co-authored-by: schmidtc1 <62030095+schmidtc1@users.noreply.github.com>
* change 'turnMove' variable name
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
* update variable names
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
* add comments
* Replace tabs with spaces
---------
Co-authored-by: schmidtc1 <62030095+schmidtc1@users.noreply.github.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-29 10:00:58 -07:00
Blitzy
4cea71c400
[Localization] Change a few Evil Admin lines to sound more coherent. ( #3697 )
...
* Change a few lines of dialogue
* Change line per request of Dertapp
* Update dialogue.ts
* Update src/locales/de/dialogue.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update ko locales
* Apply suggestions from code review
Co-authored-by: Asdar <asdargmng@gmail.com>
---------
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-08-29 18:54:56 +02:00
gitlocalize-app[bot]
c742e99650
[Localization] [DE] Fix Lusamine Dialog spelling ( #3880 )
...
* Translate dialogue-male.json via GitLocalize
* Translate dialogue-female.json via GitLocalize
* Update src/locales/de/dialogue-male.json
* Update src/locales/de/dialogue-male.json
---------
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-08-29 18:41:44 +02:00
flx-sta
af918975a8
adapt gender context logic to run-history ( #3881 )
2024-08-29 09:25:45 -07:00
Opaque02
b781562553
Updated rival battle to have space between words again ( #3893 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
2024-08-29 18:16:51 +02:00
flx-sta
44294f1aec
[Localization] Use gender context for achievments/achv ( #3871 )
...
* i18n: prepare female DE achievments
and copy keys in base language: en
* adapt gender context for achv
* add a TODO about an odd `this` usage
* remove debugging leftover code
whops
* add `playerGender` to settings helper
* fix test runs
And revert some changes
2024-08-29 09:13:35 -07:00
Opaque02
27d52af077
Changed Mode.ADMIN enum to be in line with the handler ( #3892 )
2024-08-29 15:59:06 +01:00
Opaque02
59ff4e9941
Admin panel beta ( #3846 )
...
* feat: Add hasAdminRole property to UserInfo interface and update initLoggedInUser and updateUserInfo functions
This commit adds the hasAdminRole property to the UserInfo interface in the account.ts file. The initLoggedInUser function is updated to set the hasAdminRole property to false by default. The updateUserInfo function is also updated to set the hasAdminRole property to false when bypassLogin is true. This change allows for better management of user roles and permissions.
Co-authored-by: frutescens <info@laptop>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
* Updated UI for admin panel and menu
* Remove random blank line from merge
* Fix imports in `src/ui/ui.ts`
---------
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-29 10:22:01 +01:00
Blitzy
d86c47a39f
[Sprite] Update Rose Sprite ( #3890 )
2024-08-29 01:57:22 -07:00
Blitzy
8f2699e6ea
[Enhancement] Update Team Skull Sprites ( #3886 )
...
* Update Team Skull Sprites
* Add files via upload
* Update skull_grunt_f.json
* Update skull_grunt_m.json
* Fix eol
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-28 23:38:21 -07:00