Merge e0a0d2377f into 206419c9f1

Merge pull request #5061 from pagefaultgames/main
Merge main (1.4.2) into beta
2024-12-31 03:12:24 -08:00 · 2024-12-31 02:38:07 -08:00 · 2024-12-30 20:20:23 -08:00 · 2024-12-07 18:50:07 +01:00 · 2024-12-05 22:31:29 +01:00 · 2024-12-04 02:49:36 +01:00
5 changed files with 5 additions and 5 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.4.1",
+			"version": "1.4.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
--- a/public/fonts/pkmnems.ttf
+++ b/public/fonts/pkmnems.ttf
--- a/public/fonts/pokemon-emerald-pro.ttf
+++ b/public/fonts/pokemon-emerald-pro.ttf
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@ -770,8 +770,8 @@ export const pokemonFormChanges: PokemonFormChanges = {
    new SpeciesFormChange(Species.KYUREM, "", "white", new SpeciesFormChangeItemTrigger(FormChangeItem.LIGHT_STONE), false, getSpeciesDependentFormChangeCondition(Species.RESHIRAM))
  ],
  [Species.KELDEO]: [
-    new SpeciesFormChange(Species.KELDEO, "ordinary", "resolute", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD)),
+    new SpeciesFormChange(Species.KELDEO, "ordinary", "resolute", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD), false, new SpeciesFormChangeCondition((p) => p.scene.gameMode.isDaily !== true)),
-    new SpeciesFormChange(Species.KELDEO, "resolute", "ordinary", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD, false))
+    new SpeciesFormChange(Species.KELDEO, "resolute", "ordinary", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD, false), false, new SpeciesFormChangeCondition((p) => p.scene.gameMode.isDaily !== true))
  ],
  [Species.MELOETTA]: [
    new SpeciesFormChange(Species.MELOETTA, "aria", "pirouette", new MeloettaFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
Author	SHA1	Message	Date
Lugiad	25c77b6f8d	Merge `e0a0d2377f` into `206419c9f1`	2024-12-31 03:12:24 -08:00
NightKev	206419c9f1	Merge pull request #5061 from pagefaultgames/main Merge main (1.4.2) into beta	2024-12-31 02:38:07 -08:00
NightKev	14902cdb60	[Hotfix] Prevent Keldeo from changing forms in Daily Run (#5060 ) * [Hotfix] Prevent Keldeo from changing forms in Daily Run * Update patch version	2024-12-30 20:20:23 -08:00
Lugiad	e0a0d2377f	Merge branch 'beta' into fonts-update-romanian	2024-12-07 18:50:07 +01:00
Lugiad	42cb32f765	Add files via upload	2024-12-05 22:31:29 +01:00
Lugiad	7fe0701a67	Add files via upload	2024-12-04 02:49:36 +01:00