Skip to content

Commit 98a4dd1

Browse files
RedzepRQwertypop04
andauthored
new(questline): Add a Questline based on Deoxys Movie. Unlocks 2 new alt forms (pokeclicker#5928)
* Add a Questline based on Deoxys Movie. Unlocks 2 new alt forms * remove extra comma * fix numbers * Change deoxys green name + gave quest a text * Fix merge error --------- Co-authored-by: Qwertypop04 <63805905+Qwertypop04@users.noreply.github.com>
1 parent 12555ff commit 98a4dd1

File tree

18 files changed

+187
-5
lines changed

18 files changed

+187
-5
lines changed
10.6 KB
Loading
49.6 KB
Loading
53 KB
Loading
1.35 KB
Loading
1.45 KB
Loading
1.34 KB
Loading
1.45 KB
Loading

src/modules/GameConstants.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,6 +2254,9 @@ export const TemporaryBattles = [
22542254
'Kyurem 2',
22552255
'Kyurem 3',
22562256
'Twerps',
2257+
'Destiny Deoxys Rayquaza',
2258+
'Destiny Deoxys Army',
2259+
'Destiny Rayquaza',
22572260
'Volo 1',
22582261
'Akari 1',
22592262
'Warden Mai',
@@ -2587,6 +2590,7 @@ export enum GemShops {
25872590
HoennFluteMaster,
25882591
HoennStoneSalesman,
25892592
UnovaFluteMaster,
2593+
hoennBattleFrontierDeoxysDeal,
25902594
FurfrouGemTrader,
25912595
KalosStoneSalesman,
25922596
SilvallyTrader,

src/modules/gems/GemDealList.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ const unovaFluteDeals = [
9090
),
9191
];
9292

93+
const hoennBattleFrontierDeoxysDeal = [
94+
new GemDeal(
95+
[{ gemType: PokemonType.Psychic, amount: 3860 }],
96+
ItemList['Deoxys (Clone)'],
97+
1,
98+
),
99+
];
100+
93101
const kalosFurfrouDeal = [
94102
new GemDeal(
95103
[
@@ -333,11 +341,12 @@ const alolaMagikarpJumpDeal = [
333341
const dealList = {
334342
[GemShops.HoennFluteMaster]: ko.observableArray(hoennFluteDeals),
335343
[GemShops.HoennStoneSalesman]: ko.observableArray(hoennStoneDeals),
344+
[GemShops.hoennBattleFrontierDeoxysDeal]: ko.observableArray(hoennBattleFrontierDeoxysDeal),
336345
[GemShops.UnovaFluteMaster]: ko.observableArray(unovaFluteDeals),
337346
[GemShops.FurfrouGemTrader]: ko.observableArray(kalosFurfrouDeal),
338347
[GemShops.KalosStoneSalesman]: ko.observableArray(kalosStoneDeals),
339348
[GemShops.SilvallyTrader]: ko.observableArray(alolaSilvallyDeals),
340349
[GemShops.MagikarpJumpGemTrader]: ko.observableArray(alolaMagikarpJumpDeal),
341350
};
342351

343-
export default dealList;
352+
export default dealList;

src/modules/items/ItemList.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ ItemList['Pikachu (Palaeontologist)'] = new PokemonItem('Pikachu (Palaeontologis
370370
// Hoenn
371371
ItemList['Probably Chimecho'] = new PokemonItem('Hoppip (Chimecho)', 35800, Currency.diamond, false, 'Probably Chimecho');
372372
ItemList.Beldum = new PokemonItem('Beldum', 22500);
373+
ItemList['Deoxys (Clone)'] = new PokemonItem('Deoxys (Clone)', 100);
373374
// Sinnoh
374375
ItemList['Grotle (Acorn)'] = new PokemonItem('Grotle (Acorn)');
375376
ItemList.Combee = new PokemonItem('Combee', 6750);

0 commit comments

Comments
 (0)