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

Encounters beta #1

Merged
merged 56 commits into from
Jun 10, 2024
Merged

Encounters beta #1

merged 56 commits into from
Jun 10, 2024

Conversation

ben-lear
Copy link
Owner

No description provided.

ImperialSympathizer and others added 30 commits May 28, 2024 17:19
I pushed an empty file for some reason
fixed formatting
Copy link

netlify bot commented Jun 10, 2024

Deploy Preview for cheerful-treacle-b65fd9 ready!

Name Link
🔨 Latest commit 2422698
🔍 Latest deploy log https://app.netlify.com/sites/cheerful-treacle-b65fd9/deploys/666783ae07a9910008366669
😎 Deploy Preview https://deploy-preview-1--cheerful-treacle-b65fd9.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@ben-lear ben-lear merged commit 6185274 into main Jun 10, 2024
7 of 8 checks passed
@ben-lear ben-lear deleted the encounters-beta branch June 10, 2024 22:53
@ben-lear ben-lear restored the encounters-beta branch June 10, 2024 22:53
ben-lear pushed a commit that referenced this pull request Sep 5, 2024
* 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 <[email protected]>

* Update src/locales/de/challenges.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/locales/de/challenges.ts

Co-authored-by: Jannik Tappert <[email protected]>

* 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' <[email protected]>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/es/challenges.ts

Co-authored-by: Asdar <[email protected]>

* Update src/locales/fr/challenges.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/es/achv.ts

Co-authored-by: Asdar <[email protected]>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <[email protected]>

* shrink de font size on achivement

* set middle align to achv title

* Update src/locales/zh_CN/achv.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_TW/achv.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_CN/challenges.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_TW/challenges.ts

Co-authored-by: mercurius-00 <[email protected]>

* fix zh_TW ahiv.ts

* fix import code on inverse battle test for updated phase

* Update src/data/type.ts

Co-authored-by: NightKev <[email protected]>

* update requested changes

* Update src/locales/pt_BR/achv.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

* Update src/locales/pt_BR/achv.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

* Update src/locales/pt_BR/challenges.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

* [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 <[email protected]>

* Update src/test/utils/helpers/challengeModeHelper.ts

Co-authored-by: NightKev <[email protected]>

* 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 <[email protected]>
Co-authored-by: Lugiad' <[email protected]>
Co-authored-by: Asdar <[email protected]>
Co-authored-by: mercurius-00 <[email protected]>
Co-authored-by: NightKev <[email protected]>
Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>
Co-authored-by: flx-sta <[email protected]>
Co-authored-by: frutescens <info@laptop>
ben-lear pushed a commit that referenced this pull request Sep 11, 2024
* Update modifier-type.ts

* Great tier vouch

* Update trainer-victory-phase.ts

* Update trainer-victory-phase.ts

* Update timed-event-manager.ts and loading-scene.ts (#1)

* Update timed-event-manager.ts and loading-scene.ts

* egg-update-zh-cn update

* Update language codes in loading-scene.ts and timed-event-manager.ts

* updated image

---------

Co-authored-by: Frederico Santos <[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.

2 participants