From 8f4b10e31939589930d95dafd8fc205597fa52e0 Mon Sep 17 00:00:00 2001
From: AJ Fontaine <fontbane@gmail.com>
Date: Mon, 26 Aug 2024 19:46:12 -0400
Subject: [PATCH] Change Cosmog line evo method

---
 public/images/items/moon_flute.png | Bin 0 -> 555 bytes
 public/images/items/sun_flute.png  | Bin 0 -> 582 bytes
 src/data/pokemon-evolutions.ts     |   8 +++++---
 src/locales/en/modifier-type.json  |   2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 public/images/items/moon_flute.png
 create mode 100644 public/images/items/sun_flute.png

diff --git a/public/images/items/moon_flute.png b/public/images/items/moon_flute.png
new file mode 100644
index 0000000000000000000000000000000000000000..4237a9b29adbe7adf206fa1cab2104f4a55d99f5
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000id
z000id0mpBsWB>pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-u}MThRCwCdmLX5WP!xr~M=JOU%uzX9=Ll}{$$}!d;riU_7UbOOTE`rjTjd;e
z%iQL8^5NE>P*=p(hC*2vRs=U`(&W9IlXLGqrxkgg^OtqTAD30U^m;vj&vL{m!0Yw8
zN&w`quS>K}F<cO+oBULgZ!OX~#j&Tv!Hi+J{Ho}5f*>($%z&5B;M(I>NInw?6Z<6z
z(2A0;TT~%wLrLA5wyNYOAGD^#I&daT?B@X!GMxc%-d!;am&FPn<rS;x!n1b`Tm$f+
zo^S^Va_<+VZX3OFC@M<hX`S+*o&dP>Gqg?t2*Y_}%ML0ifW}dTlrHzuLF<%p6fyEV
zg2c2Fc9)JU!HXJ45kTYMk0QA0oLAIrb;8K=$n>IdyAHN!W40_7F#vCl<bAVXs}sU-
z&c<xZdxcNx0#XzooPAt>8#F+t+eb<l$L^HG0Ex*M_H7({x+5|p0(Ao*>f*ZA3qXG9
z$O<sPG*G*MWWumNpxeD54rbWy1QYwE66=T&h}F!`SM}sOu>PFK#~C>GuRoch<|)sV
tx-G#?>{lFa(N2kdTljIv|MsuqV*px@<{k~r6czvg002ovPDHLkV1hC*`4j*E

literal 0
HcmV?d00001

diff --git a/public/images/items/sun_flute.png b/public/images/items/sun_flute.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7cbcdf5569e04fed086f61bb561ea7c6ea104e6
GIT binary patch
literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000id
z000id0mpBsWB>pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-%t=H+RCwCdmLYW7P!xv0*E5kg<`UP)$oJfs0@*omJyV>zNpKm8#kFz{D(i|{
zTvJuz@?>P@z^#tBR0KE#80ly#cGWxQo^${F_ul`%5qX~To^i%I$A|SpDFv`iN4%wQ
z9LIYM@}~!nc;qndunSgCi_F;_%jPAMz+f!1T0lww_m2&d!I0};eN@M-g~>L6@I%cc
zY1GPOcZ)=nWwkOnw5DYyj#V%@5#(<=*f25E1=nLqpl!Ui{AZA3LKA+dxqoahxYG2;
zJ(6^>%_Ofw$-)mc?WPO!5ZAE?v`xo(J)0_k{OQ4?+X6Gqxab+UjzxcTzRTuxFEVEV
zvDU;|7a-mR!EFXW`YhknqQW|~MoEd1l6V@yJS0gM%;$gTww^0loK=1Oq3Dm!vF(p6
z9SbFod)HBbAGZrgv;BnK=6lcLX85~OCt`hYR(8GDrg*e!4WK%oR-VPCO+P)GW%Ckq
zc1NsJuBJuZLw0>ImW~0AQ7RtJ5~k^#jTpDQYj=Gsb@2IX#3V3?wdR|j&}~7KW$S|^
z{7?fh_;OR|<%E+dqAWv6NxSKyhI%irhUupG3Q)Xu2BmpaoYGQ$Jp=LI|5dyU0HuxT
UXL3}E?f?J)07*qoM6N<$f<Ivi5dZ)H

literal 0
HcmV?d00001

diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 5a4813f1a57..b0fa42104da 100644
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@@ -59,6 +59,8 @@ export enum EvolutionItem {
   AUSPICIOUS_ARMOR,
   MALICIOUS_ARMOR,
   MASTERPIECE_TEACUP,
+  SUN_FLUTE,
+  MOON_FLUTE,
 
   BLACK_AUGURITE = 51,
   PEAT_BLOCK,
@@ -987,11 +989,11 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.KOMMO_O, 45, null, null)
   ],
   [Species.COSMOG]: [
-    new SpeciesEvolution(Species.COSMOEM, 43, null, null)
+    new SpeciesEvolution(Species.COSMOEM, 23, null, null)
   ],
   [Species.COSMOEM]: [
-    new SpeciesEvolution(Species.SOLGALEO, 53, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY)),
-    new SpeciesEvolution(Species.LUNALA, 53, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT))
+    new SpeciesEvolution(Species.SOLGALEO, 53, EvolutionItem.SUN_FLUTE, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), SpeciesWildEvolutionDelay.VERY_LONG),
+    new SpeciesEvolution(Species.LUNALA, 53, EvolutionItem.MOON_FLUTE, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.VERY_LONG)
   ],
   [Species.MELTAN]: [
     new SpeciesEvolution(Species.MELMETAL, 48, null, null)
diff --git a/src/locales/en/modifier-type.json b/src/locales/en/modifier-type.json
index 64223b64b23..db16f979ce2 100644
--- a/src/locales/en/modifier-type.json
+++ b/src/locales/en/modifier-type.json
@@ -332,6 +332,8 @@
     "SACHET": "Sachet",
     "WHIPPED_DREAM": "Whipped Dream",
     "LEADERS_CREST": "Leader's Crest",
+    "SUN_FLUTE": "Sun Flute",
+    "MOON_FLUTE": "Moon Flute",
 
     "CHIPPED_POT": "Chipped Pot",
     "BLACK_AUGURITE": "Black Augurite",