diff --git a/.travis.yml b/.travis.yml index cda2753c11..7a5cfe6162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,10 @@ language: node_js node_js: -- 'node' + - "10" cache: directories: - node_modules -before_install: -- chmod a+x ./install.sh -- chmod a+x ./testDebug.sh install: -- ./install.sh -before_script: - - npm install -g gulp-cli +- npm install script: -- gulp build -- ./testDebug.sh \ No newline at end of file +- npm test diff --git a/README.md b/README.md index 9ddcd740fd..1dc627344d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Build Status](https://travis-ci.org/Ishadijcks/pokeclicker.svg?branch=develop)](https://travis-ci.org/Ishadijcks/pokeclicker) +[![Build Status](https://img.shields.io/travis/pokeclicker/pokeclicker?logo=travis)](https://travis-ci.org/pokeclicker/pokeclicker) + # PokéClicker A game about catching Pokémon, defeating gym leaders, and watching numbers get bigger. @@ -20,17 +21,30 @@ All file and class names should be [upper CamelCase](https://en.wikipedia.org/wi First make sure you have git and npm available as command-line utilities (so you should install Git and NodeJS if you don't have them already). Open a command line interface in the directory that contains this README file, and use the following command to install PokéClicker's other dependencies locally: -- npm install +```cmd +npm install +``` Then finally, run the following command in the command line interface to start a browser running PokéClicker. -- npm start +```cmd +npm start +``` Changes to the sourcecode will automatically cause the browser to refresh. This means you don't need to compile TypeScript yourself. Gulp will do this for you :thumbsup: +## Use Google cloud shell _(alternative)_ +[![Google Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pokeclicker-dev/pokeclicker&git_branch=develop&page=editor&open_in_editor=README.md) +```cmd +npm install +npm start +``` + ## Deploying a new version to Github Pages Before deploying, check that the game compiles and starts up without errors. Then run: -- npm run website +```cmd +npm run website +``` After this command completes, push the changed files in the 'docs' directory to Github. diff --git a/src/assets/images/gymLeaders/bruno2.png b/src/assets/images/gymLeaders/Bruno2.png similarity index 100% rename from src/assets/images/gymLeaders/bruno2.png rename to src/assets/images/gymLeaders/Bruno2.png diff --git a/src/assets/images/gymLeaders/karen.png b/src/assets/images/gymLeaders/Karen.png similarity index 100% rename from src/assets/images/gymLeaders/karen.png rename to src/assets/images/gymLeaders/Karen.png diff --git a/src/assets/images/gymLeaders/koga2.png b/src/assets/images/gymLeaders/Koga2.png similarity index 100% rename from src/assets/images/gymLeaders/koga2.png rename to src/assets/images/gymLeaders/Koga2.png diff --git a/src/assets/images/gymLeaders/lance2.png b/src/assets/images/gymLeaders/Lance2.png similarity index 100% rename from src/assets/images/gymLeaders/lance2.png rename to src/assets/images/gymLeaders/Lance2.png diff --git a/src/assets/images/gymLeaders/will.png b/src/assets/images/gymLeaders/Will.png similarity index 100% rename from src/assets/images/gymLeaders/will.png rename to src/assets/images/gymLeaders/Will.png diff --git a/src/changelog.html b/src/changelog.html deleted file mode 100644 index 628007ad6e..0000000000 --- a/src/changelog.html +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/KantoSVG.html b/src/components/KantoSVG.html index 09b505e81b..f6ed55abc6 100644 --- a/src/components/KantoSVG.html +++ b/src/components/KantoSVG.html @@ -507,5 +507,5 @@ fill="url(#mx-gradient-dae8fc-1-7ea6e0-1-s-0)" height="12.6" stroke="#6c8ebf" width="12.6" x="325" y="240" data-bind="click:function(){MapHelper.openShipModal()}, - css:{ unlockedTown: player.highestRegion >= 1}"> + css:{ unlockedTown: player.highestRegion() >= 1}"> diff --git a/src/components/battleItemContainer.html b/src/components/battleItemContainer.html new file mode 100644 index 0000000000..9ad637f684 --- /dev/null +++ b/src/components/battleItemContainer.html @@ -0,0 +1,40 @@ +
+
+ Battle Items +
+
+ + + + + + + + + + + + +
+ + +
+
+ +
diff --git a/src/components/breeding.html b/src/components/breeding.html index d4c8d1d635..6e9d0fc63c 100644 --- a/src/components/breeding.html +++ b/src/components/breeding.html @@ -10,11 +10,11 @@

- This is the Pokémon Day Care Center. You can trade your
- level 100 pokémon for an egg of the same pokémon.
- Hatched pokémon have a higher chance of becoming shiny! + This is the Pokémon Day Care Center.
+ You can trade your level 100 pokémon for an egg of the same pokémon.
+ Hatched pokémon will increase their attack and have a higher chance of becoming shiny!

-
+

Pick an egg below to breed: @@ -33,34 +33,32 @@

-

- Pick a pokémon below to breed them: -

-
-
- -
-
-
-
-

+ +

Unfortunately, you don't have any pokémon of level 100

+ +

+ Pick a pokémon below to breed them: +

+
+ +
+
-
-

- Unfortunately, you don't have any free eggslots -

-
+

+ Unfortunately, you don't have any free eggslots +

diff --git a/src/components/breedingDisplay.html b/src/components/breedingDisplay.html index 9ec67d23ae..baf1e10cd6 100644 --- a/src/components/breedingDisplay.html +++ b/src/components/breedingDisplay.html @@ -1,15 +1,15 @@
-
+
Hatchery -
-
+ +
diff --git a/src/components/changelog.html b/src/components/changelog.html index 8366428283..3bb08569da 100644 --- a/src/components/changelog.html +++ b/src/components/changelog.html @@ -1,23 +1,17 @@ -
-
\ No newline at end of file +
diff --git a/src/components/itemModal.html b/src/components/itemModal.html index 99dde670f2..1b030b54ba 100644 --- a/src/components/itemModal.html +++ b/src/components/itemModal.html @@ -3,7 +3,6 @@ aria-labelledby="showItemModalLabel" aria-hidden="true">
-
  • Evolution stones
    • diff --git a/src/components/oakItems.html b/src/components/oakItems.html new file mode 100644 index 0000000000..3c169a6e79 --- /dev/null +++ b/src/components/oakItems.html @@ -0,0 +1,89 @@ +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + +
    +

    +
    +
    +
    +
    +
    + +
    +
    + Upgrade! +
    +
    +
    + +
    +
    +
    + Lvl. +
    +
    + Bonus: % +
    +
    + + +
    + Capture more unique Pokémon to + unlock! +
    + +
    +
    + +
    diff --git a/src/components/pokeballSelector.html b/src/components/pokeballSelector.html new file mode 100644 index 0000000000..57dab0d7ab --- /dev/null +++ b/src/components/pokeballSelector.html @@ -0,0 +1,91 @@ +
    +
    + Pokéballs +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Caught#New
    + + + +
    + + + + + +
    + + + + + +
    + + + + + +
    + + + + + +
    +
    +
    diff --git a/src/components/pokedex.html b/src/components/pokedex.html index 93d297abba..a193e04487 100644 --- a/src/components/pokedex.html +++ b/src/components/pokedex.html @@ -76,18 +76,18 @@

    Pokédex

    style="max-width: 100%; padding:0; margin:0;">
  • - number + + number +
    -
    ✨
    - - name +
    + +
    + + name
    - +
diff --git a/src/components/pokemonListContainer.html b/src/components/pokemonListContainer.html new file mode 100644 index 0000000000..4b6391d829 --- /dev/null +++ b/src/components/pokemonListContainer.html @@ -0,0 +1,37 @@ + +
+
+ Pokémon List +
+
+
+
+ Sort: +
+ +
+ +
+
+ + + + + + + + + + + +
NameAtkLvl
+
+
diff --git a/src/components/prestigeModal.html b/src/components/prestigeModal.html new file mode 100644 index 0000000000..ebf50e8f8b --- /dev/null +++ b/src/components/prestigeModal.html @@ -0,0 +1,98 @@ + diff --git a/src/components/questDisplay.html b/src/components/questDisplay.html index 3bc2c5bfb6..95c93cb65e 100644 --- a/src/components/questDisplay.html +++ b/src/components/questDisplay.html @@ -1,18 +1,18 @@ -
+
-
- - +
+
+ -
+
- +
@@ -41,6 +41,9 @@
+ + No active quest +
diff --git a/src/components/receiveGymBadge.html b/src/components/receiveGymBadge.html index 43daf8704a..704c0cbea5 100644 --- a/src/components/receiveGymBadge.html +++ b/src/components/receiveGymBadge.html @@ -7,29 +7,22 @@ + data-bind="text: GymRunner.gymObservable().leaderName.replace(/\d/g,'')">Modal title

- + + +
-
+
-
-
- -
-
diff --git a/src/components/shards.html b/src/components/shards.html index ec02d2d98b..7dfbd8fc63 100644 --- a/src/components/shards.html +++ b/src/components/shards.html @@ -37,7 +37,7 @@

diff --git a/src/components/shipModal.html b/src/components/shipModal.html index f6fe8d5964..ab3af2a4d7 100644 --- a/src/components/shipModal.html +++ b/src/components/shipModal.html @@ -13,7 +13,7 @@ Kanto diff --git a/src/components/shopModal.html b/src/components/shopModal.html index 996a5e7c1f..310e715c58 100644 --- a/src/components/shopModal.html +++ b/src/components/shopModal.html @@ -14,8 +14,7 @@

Shop

css: { active: ShopHandler.selected() == $index() }, attr: { disabled: !$data.isAvailable() }"> - +

Item Name

diff --git a/src/components/underground.html b/src/components/underground.html index fa51ebd381..1788a762ae 100644 --- a/src/components/underground.html +++ b/src/components/underground.html @@ -57,7 +57,6 @@ -
diff --git a/src/index.html b/src/index.html index a55fa92b08..4f9460ec3f 100644 --- a/src/index.html +++ b/src/index.html @@ -28,7 +28,7 @@ % - +% + +% @@ -43,8 +43,7 @@ - + -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Caught#New
- - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
-
-
-
-
Pokémon List
-
-
-
- Sort: -
- -
- -
-
- - - - - - - - - + + @import "pokeballSelector.html" - -
NameAtkLvl
-
-
+ + @import "battleItemContainer.html" + + + @import "pokemonListContainer.html"
@@ -438,8 +319,8 @@

Pokéclicker

- + @import "townView.html"
@@ -481,7 +362,7 @@

Pokéclicker

-
+
@@ -511,116 +392,9 @@

Pokéclicker

-
-
-
- - -
-
-
-
-
- -
-
-
-
-
-
-
- - - -
-
-
-
- -
-
- -
-
-
-
- -
-
- Upgrade! -
-
-
- -
-
-
-
- -
- Lvl. - -
- -
- Bonus: - - % -
-
-
-
- -
-
- - - -
-
- -
- Capture more unique Pokémon to - unlock! -
-
-
- -
+ + @import "oakItems.html" @import "questDisplay.html" @@ -689,5 +463,8 @@

Pokéclicker

@import "safariModal.html" + +@import "prestigeModal.html" + diff --git a/src/scripts/Battle.ts b/src/scripts/Battle.ts index 3cd0c0095a..9004f95706 100644 --- a/src/scripts/Battle.ts +++ b/src/scripts/Battle.ts @@ -90,10 +90,17 @@ class Battle { } protected static calculateActualCatchRate(pokeBall: GameConstants.Pokeball) { - let pokeballBonus = GameConstants.getCatchBonus(pokeBall); - let oakBonus = OakItemRunner.isActive(GameConstants.OakItem.Magic_Ball) ? + // Each of the bonuses is added on, not multiplied (20+5+10+10) + let catchRate = this.enemyPokemon().catchRate; + // Pokeball bonus + catchRate += GameConstants.getCatchBonus(pokeBall); + // Oak item bonus + catchRate += OakItemRunner.isActive(GameConstants.OakItem.Magic_Ball) ? OakItemRunner.calculateBonus(GameConstants.OakItem.Magic_Ball) : 0; - let totalChance = GameConstants.clipNumber(this.enemyPokemon().catchRate + pokeballBonus + oakBonus, 0, 100); + // Prestige bonus + catchRate += PrestigeBonuses.getBonus(36); + // Limit the catch chance to 0-100 + const totalChance = GameConstants.clipNumber(catchRate, 0, 100); return totalChance; } @@ -120,14 +127,10 @@ class Battle { static gainItem() { let p = player.route() / 1600 + 0.009375; + if (Math.random() < p) { - this.getRandomBerry() + player.getRandomBerry() } } - public static getRandomBerry() { - let i = GameHelper.getIndexFromDistribution(GameConstants.BerryDistribution); - Notifier.notify("You got a " + GameConstants.BerryType[i] + " berry!", GameConstants.NotificationOption.success); - player.berryList[i](player.berryList[i]() + 1); - } } diff --git a/src/scripts/Changelog.ts b/src/scripts/Changelog.ts new file mode 100644 index 0000000000..11ebb9cbf2 --- /dev/null +++ b/src/scripts/Changelog.ts @@ -0,0 +1,43 @@ +class Changelog { + public type: string; + public description: string; + + constructor(type: string, description: string) { + this.type = type; + this.description = description; + if (type == changelogType.VERSION) + this.description += ''; + } +} + +const changelogType = { + VERSION: '', + NEW: 'NEW', + CHANGE: 'CHANGE', + FIXED: 'FIXED', + REMOVED: 'REMOVED', + DEFAULT: '-', // unused - can be changed + INFO: 'INFO', // unused - can be changed +}; + +const changelogItems = [ + new Changelog(changelogType.VERSION, 'v1.0.3'), + new Changelog(changelogType.NEW, 'Show pokeball image by caught Pokemon in the Pokedex'), + new Changelog(changelogType.CHANGE, 'Total shiny Pokemon caught now add to your total click attack'), + new Changelog(changelogType.FIXED, 'Display floored dungeon tokens amount'), + new Changelog(changelogType.VERSION, 'v1.0.2'), + new Changelog(changelogType.NEW, 'Can now progress in multiple quest at a time (amount based on Quest Level)'), + new Changelog(changelogType.NEW, 'Side cards can now be collapsed for more space'), + new Changelog(changelogType.CHANGE, 'Move battle item container'), + new Changelog(changelogType.CHANGE, 'Update how achievement percentages are shown'), + new Changelog(changelogType.CHANGE, 'Update hatch/catch notification message'), + new Changelog(changelogType.FIXED, 'Show the hatchery "list" button once Johto unlocked without page refresh'), + new Changelog(changelogType.FIXED, 'Plates from underground should now sell for their correct value'), + new Changelog(changelogType.VERSION, 'v1.0.1'), + new Changelog(changelogType.NEW, 'Added changelog'), + new Changelog(changelogType.CHANGE, 'Show battle item names and descriptions'), + new Changelog(changelogType.FIXED, 'Item magnet now works in dungeons'), + new Changelog(changelogType.FIXED, 'Battle items no longer always active'), + new Changelog(changelogType.VERSION, 'v1.0.0'), + new Changelog(changelogType.NEW, 'Add battle items'), +]; diff --git a/src/scripts/GameConstants.ts b/src/scripts/GameConstants.ts index 0840ac29f3..3385b25c42 100644 --- a/src/scripts/GameConstants.ts +++ b/src/scripts/GameConstants.ts @@ -10,6 +10,7 @@ namespace GameConstants { export const UNDERGROUND_TICK = 1000; export const DUNGEON_TIME = 6000; export const DUNGEON_TICK = 1; + export const EFFECT_ENGINE_TICK = 1000; export const FARM_TICK = 1000; export const SAVE_TICK = 10000; export const GYM_TIME = 3000; @@ -22,6 +23,7 @@ namespace GameConstants { export const AMOUNT_OF_POKEMONS_GEN1 = 151; export const AMOUNT_OF_POKEMONS_GEN2 = 251; export const AMOUNT_OF_BADGES = 16; + export const ITEM_USE_TIME = 30; export const ROAMING_MIN_CHANCE = 8192; export const ROAMING_MAX_CHANCE = 4096; @@ -44,7 +46,7 @@ namespace GameConstants { - export const PLATE_VALUE = 25; + export const PLATE_VALUE = 100; // Oak items export const OAKITEM_XP_REQUIREMENT = [1000, 2500, 5000, 10000, 20000, Number.MAX_VALUE]; @@ -84,6 +86,20 @@ namespace GameConstants { Cell_Battery, } + export function normalize(n: number, max:number){ + return Math.min( max, Math.max(0, n)); + } + + + // Prestige + export enum PrestigeType { + "Easy" = 0, + "Medium", + "Hard" + } + + export const AMOUNT_OF_PRESTIGE_UPGRADES = 37; + // Dungeons export const DUNGEON_SIZE = 5; export const DUNGEON_CHEST_SHOW = 2; @@ -556,12 +572,12 @@ namespace GameConstants { } export enum BattleItemType { - xAttack, - xClick, - xExp, - Token_collector, - Item_magnet, - Lucky_incense + xAttack = "xAttack", + xClick = "xClick", + xExp = "xExp", + Token_collector = "Token_collector", + Item_magnet = "Item_magnet", + Lucky_incense = "Lucky_incense" } export enum PokemonItemType { @@ -742,5 +758,5 @@ namespace GameConstants { export const pokemonsNeededToTravel = [ 151, 252, // Should be 251, set to 252 in case gen 3 isn't added before beta - ] + ]; } diff --git a/src/scripts/GameHelper.ts b/src/scripts/GameHelper.ts index 25e1febe5c..bd4d7a9d98 100644 --- a/src/scripts/GameHelper.ts +++ b/src/scripts/GameHelper.ts @@ -56,6 +56,17 @@ class GameHelper { return (`0${n}`).slice(-2); } + public static formatAmount(n: number): string { + if (n >= 1e9){ + return Math.floor(n / 1e9) + "b"; + } else if (n >= 1e6){ + return Math.floor(n / 1e6) + "m"; + } else if (n >= 1e3){ + return Math.floor(n / 1e3) + "k"; + } + return n; + } + public static getIndexFromDistribution(a: number[]) { let rand = Math.random(); for (let i = 0; i < a.length; i++) { @@ -79,4 +90,7 @@ class GameHelper { return array; } + public static anOrA(name: string): string { + return ['a', 'e', 'i', 'o', 'u'].includes(name[0].toLowerCase()) ? 'an' : 'a'; + } } diff --git a/src/scripts/Main.ts b/src/scripts/Main.ts index 789c46f7f9..b78647d0aa 100644 --- a/src/scripts/Main.ts +++ b/src/scripts/Main.ts @@ -4,9 +4,12 @@ * Start the game when all html elements are loaded. */ let player; -const debug = false; +const debug = true; let game; +if (!debug) + Object.freeze(GameConstants); + interface JQuery { animateNumber(options: object): void; } @@ -15,6 +18,8 @@ document.addEventListener("DOMContentLoaded", function (event) { Preload.load(debug).then(function () { OakItemRunner.initialize(); UndergroundItem.initialize(); + Prestige.initialize(); + game = new Game(); // DungeonRunner.initializeDungeon(dungeonList["Viridian Forest"]); @@ -67,7 +72,6 @@ document.addEventListener("DOMContentLoaded", function (event) { Game.applyRouteBindings(); Preload.hideSplashScreen(); game.start(); - }); }); @@ -77,7 +81,6 @@ document.addEventListener("DOMContentLoaded", function (event) { class Game { interval; undergroundCounter: number; - farmCounter: number = 0; public static achievementCounter: number = 0; public static gameState: KnockoutObservable = ko.observable(GameConstants.GameState.fighting); @@ -105,6 +108,7 @@ class Game { // Update tick counters this.undergroundCounter += GameConstants.TICK_TIME; FarmRunner.counter += GameConstants.TICK_TIME; + EffectEngineRunner.counter += GameConstants.TICK_TIME; Game.achievementCounter += GameConstants.TICK_TIME; if (Game.achievementCounter > GameConstants.ACHIEVEMENT_TICK) { Game.achievementCounter = 0; @@ -167,6 +171,10 @@ class Game { FarmRunner.tick(); } + if (EffectEngineRunner.counter > GameConstants.EFFECT_ENGINE_TICK){ + EffectEngineRunner.tick(); + } + if (GameHelper.counter > 60 * 1000) { GameHelper.updateTime(); } diff --git a/src/scripts/Player.ts b/src/scripts/Player.ts index 87c5719581..fd5ba50071 100644 --- a/src/scripts/Player.ts +++ b/src/scripts/Player.ts @@ -10,6 +10,13 @@ class Player { public achievementsCompleted: { [name: string]: boolean }; + public prestigeType: GameConstants.PrestigeType; + public prestigePoints: Array>; + public prestigeUpgradesBought: Array>; + public prestigeBank: Array>; + + public dungeonsCleared: Array>; + private _caughtShinyList: KnockoutObservableArray; private _route: KnockoutObservable; private _caughtPokemonList: KnockoutObservableArray; @@ -45,6 +52,19 @@ class Player { this._money = ko.observable(savedPlayer._money || 0); this._dungeonTokens = ko.observable(savedPlayer._dungeonTokens || 0); this._questPoints = ko.observable(savedPlayer._questPoints || 0); + this.prestigeType = savedPlayer.prestigeType || GameConstants.PrestigeType.Easy; + this.prestigePoints = Array.apply(null, Array(GameHelper.enumLength(GameConstants.PrestigeType))).map(function (val, index) { + return ko.observable(savedPlayer.prestigePoints ? (savedPlayer.prestigePoints[index] || 0) : 0) + }); + this.prestigeUpgradesBought = Array.apply(null, Array(GameConstants.AMOUNT_OF_PRESTIGE_UPGRADES + 1)).map(function (val, index) { + return ko.observable(savedPlayer.prestigeUpgradesBought ? (savedPlayer.prestigeUpgradesBought[index] || false) : false) + }); + this.prestigeBank = Array.apply(null, Array(GameHelper.enumLength(GameConstants.Currency))).map(function (val, index) { + return ko.observable(savedPlayer.prestigeBank ? (savedPlayer.prestigeBank[index] || 0) : 0) + }); + this.dungeonsCleared = Array.apply(null, Array(GameConstants.RegionDungeons.flat().length)).map(function (val, index) { + return ko.observable(savedPlayer.dungeonsCleared ? (savedPlayer.dungeonsCleared[index] || 0) : 0) + }); this._caughtShinyList = ko.observableArray(savedPlayer._caughtShinyList); this._region = ko.observable(savedPlayer._region); if (MapHelper.validRoute(savedPlayer._route, savedPlayer._region)) { @@ -108,7 +128,7 @@ class Player { }, this); this._town = ko.observable(TownList["Pallet Town"]); this._currentTown = ko.observable(""); - this._starter = savedPlayer._starter || GameConstants.Starter.None; + this._starter = savedPlayer._starter != undefined ? savedPlayer._starter : GameConstants.Starter.None; console.log(savedPlayer._itemList); @@ -179,17 +199,15 @@ class Player { return ko.observable(savedPlayer.berryList ? (savedPlayer.berryList[index] || 0) : 0) }); this.plotList = Save.initializePlots(savedPlayer.plotList); - this.highestRegion = savedPlayer.highestRegion || 0; + this.effectList = Save.initializeEffects(savedPlayer.effectList || {}); + this.highestRegion = ko.observable(savedPlayer.highestRegion || 0); this.tutorialProgress = ko.observable(savedPlayer.tutorialProgress || 0); this.tutorialState = savedPlayer.tutorialState; this.tutorialComplete = ko.observable(!!savedPlayer.tutorialComplete); - //TODO remove before deployment - if (!debug) { - if (this.starter === GameConstants.Starter.None) { - StartSequenceRunner.start() - } + if (this.starter === GameConstants.Starter.None) { + StartSequenceRunner.start() } } @@ -225,11 +243,20 @@ class Player { public farmPoints: KnockoutObservable; public berryList: KnockoutObservable[]; + public effectList: { [name: string]: KnockoutObservable } = {}; + public tutorialProgress: KnockoutObservable; public tutorialState: any; public tutorialComplete: KnockoutObservable; - private highestRegion: GameConstants.Region; + private highestRegion: KnockoutObservable; + + public caughtAndShinyList(): KnockoutComputed { + return ko.computed(function () { + const pokeList = this.caughtPokemonList.map(pokemon=>pokemon.name); + return this.caughtShinyList().filter(pokemon=>pokeList.includes(pokemon)); + }, this); + } public routeKillsObservable(route: number): KnockoutComputed { return ko.computed(function () { @@ -265,12 +292,7 @@ class Player { } public hasKeyItem(name: string): boolean { - for (let i = 0; i < this._keyItems().length; i++) { - if (this._keyItems()[i] == name) { - return true; - } - } - return false; + return this._keyItems().includes(name); } set defeatedAmount(value: Array>) { @@ -287,7 +309,14 @@ class Player { this._keyItems().push(name); KeyItemHandler.getKeyItemObservableByName(name).valueHasMutated(); player._keyItems.valueHasMutated(); + } + } + public resetKeyItem(name: string) { + if (this.hasKeyItem(name)) { + this._keyItems().splice(this._keyItems().indexOf(name), 1); + KeyItemHandler.getKeyItemObservableByName(name).valueHasMutated(); + player._keyItems.valueHasMutated(); } } @@ -317,8 +346,19 @@ class Player { private _caughtAmount: Array>; public calculateClickAttack(): number { - let oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Poison_Barb) ? (1 + OakItemRunner.calculateBonus(GameConstants.OakItem.Poison_Barb) / 100) : 1; - return Math.floor(Math.pow(this.caughtPokemonList.length + 1, 1.4) * oakItemBonus); + // Base power + let clickAttack = Math.pow(this.caughtPokemonList.length + this.caughtAndShinyList()().length + 1, 1.4); + + // Apply Oak bonus + const oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Poison_Barb) ? (1 + OakItemRunner.calculateBonus(GameConstants.OakItem.Poison_Barb) / 100) : 1; + clickAttack *= oakItemBonus; + + // Apply battle item bonus + if(EffectEngineRunner.isActive(GameConstants.BattleItemType.xClick)()){ + clickAttack *= 1.5; + } + + return Math.floor(clickAttack); } public calculateMoneyMultiplier(): number { @@ -387,24 +427,17 @@ class Player { * @returns {boolean} */ public alreadyCaughtPokemon(pokemonName: string) { - const pokemon = PokemonHelper.getPokemonByName(pokemonName); - if (!pokemon) return false; - const id = PokemonHelper.getPokemonByName(pokemonName).id; - return player.caughtAmount[id]() > 0; + const pokemon = player._caughtPokemonList().find(p=>p.name==pokemonName); + return !!pokemon; } public alreadyCaughtPokemonShiny(pokemonName: string) { if (!this.alreadyCaughtPokemon(pokemonName)) return false; - for (let i: number = 0; i < this.caughtShinyList().length; i++) { - if (this.caughtShinyList()[i] == pokemonName) { - return true; - } - } - return false; + return player.caughtShinyList().includes(pokemonName); } public capturePokemon(pokemonName: string, shiny: boolean = false, supressNotification = false) { - if (PokemonHelper.calcNativeRegion(pokemonName) > player.highestRegion) { + if (PokemonHelper.calcNativeRegion(pokemonName) > player.highestRegion()) { return; } OakItemRunner.use(GameConstants.OakItem.Magic_Ball); @@ -414,7 +447,7 @@ class Player { this._caughtPokemonList.push(caughtPokemon); if (!supressNotification) { if (shiny) Notifier.notify(`✨ You have captured a shiny ${pokemonName}! ✨`, GameConstants.NotificationOption.warning); - else Notifier.notify(`You have captured a ${pokemonName}!`, GameConstants.NotificationOption.success) + else Notifier.notify(`You have captured ${GameHelper.anOrA(pokemonName)} ${pokemonName}!`, GameConstants.NotificationOption.success) } } if (shiny && !this.alreadyCaughtPokemonShiny(pokemonName)) { @@ -445,9 +478,13 @@ class Player { // TODO add money multipliers let oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Amulet_Coin) ? (1 + OakItemRunner.calculateBonus(GameConstants.OakItem.Amulet_Coin) / 100) : 1; let moneytogain = Math.floor(money * oakItemBonus * (1 + AchievementHandler.achievementBonus())) + if(EffectEngineRunner.isActive(GameConstants.BattleItemType.Lucky_incense)()){ + moneytogain = Math.floor(moneytogain * 1.5); + } this._money(this._money() + moneytogain); GameHelper.incrementObservable(this.statistics.totalMoney, moneytogain); Game.updateMoney(); + Game.animateMoney(moneytogain,'playerMoney'); } @@ -557,6 +594,10 @@ class Player { let oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Exp_Share) ? 1 + (OakItemRunner.calculateBonus(GameConstants.OakItem.Exp_Share) / 100) : 1; let expTotal = Math.floor(exp * level * trainerBonus * oakItemBonus * (1 + AchievementHandler.achievementBonus()) / 9); + if(EffectEngineRunner.isActive(GameConstants.BattleItemType.xExp)()){ + expTotal *= 1.5; + } + for (let pokemon of this._caughtPokemonList()) { if (pokemon.levelObservable() < (this.gymBadges.length + 2) * 10) { pokemon.exp(pokemon.exp() + expTotal); @@ -582,8 +623,12 @@ class Player { } } + public shardUpgradeMaxed(typeNum: number, effectNum: number): boolean { + return this._shardUpgrades[typeNum][effectNum]() >= GameConstants.MAX_SHARD_UPGRADES; + } + public canBuyShardUpgrade(typeNum: number, effectNum: number): boolean { - let lessThanMax = this._shardUpgrades[typeNum][effectNum]() < GameConstants.MAX_SHARD_UPGRADES; + let lessThanMax = !this.shardUpgradeMaxed(typeNum, effectNum); let hasEnoughShards = this._shardsCollected[typeNum]() >= this.getShardUpgradeCost(typeNum, effectNum); return lessThanMax && hasEnoughShards; } @@ -655,9 +700,20 @@ class Player { } public gainDungeonTokens(tokens: number) { - this._dungeonTokens(Math.floor(this._dungeonTokens() + tokens)); + // Apply prestige bonuses + tokens = Math.round(tokens * PrestigeBonuses.getBonus(2)); + + // Apply battle item bonus + if(EffectEngineRunner.isActive(GameConstants.BattleItemType.Token_collector)()){ + tokens *= 1.5; + } + + tokens = Math.floor(tokens); + + this.dungeonTokens(this.dungeonTokens() + tokens); + GameHelper.incrementObservable(this.statistics.totalTokens, tokens); - Game.animateMoney(tokens,'playerMoneyDungeon'); + Game.animateMoney(tokens, 'playerMoneyDungeon'); } get routeKills(): Array> { @@ -800,11 +856,11 @@ class Player { * @returns {number} damage to be done. */ public calculatePokemonAttack(type1: GameConstants.PokemonType, type2: GameConstants.PokemonType): number { - // TODO Calculate pokemon attack by checking upgrades and multipliers. let attack = 0; for (let pokemon of this.caughtPokemonList) { let multiplier = 1; if (this.region !== GameHelper.getRegion(pokemon.id)) { + // Pokemon only retain 20% of their total damage in other regions. multiplier = 0.2 } if (!pokemon.breeding()) { @@ -817,9 +873,25 @@ class Player { } } + if(EffectEngineRunner.isActive(GameConstants.BattleItemType.xAttack)()){ + attack *= 1.5; + } + return Math.round(attack); } + public getRandomBerry() { + let i = GameHelper.getIndexFromDistribution(GameConstants.BerryDistribution); + Notifier.notify("You got a " + GameConstants.BerryType[i] + " berry!", GameConstants.NotificationOption.success); + let amount = 1; + if (EffectEngineRunner.isActive(GameConstants.BattleItemType.Item_magnet)()) { + if (Math.random() < 0.5) { + amount += 1; + } + } + player.berryList[i](player.berryList[i]() + amount); + } + get diamonds() { return this._diamonds(); @@ -939,61 +1011,96 @@ class Player { Game.animateMoney(value,'playerMoneyQuest'); } - public toJSON() { - let keep = [ - "_money", - "_dungeonTokens", - "_questPoints", - "_caughtShinyList", - "_route", - "_caughtPokemonList", - "_defeatedAmount", - "_caughtAmount", - "_routeKills", - "_routeKillsNeeded", - "_region", - "_gymBadges", - "_pokeballs", - "_notCaughtBallSelection", - "_alreadyCaughtBallSelection", - "_sortOption", - "_sortDescending", - "_starter", - "_oakItemExp", - "_oakItemsEquipped", - "_itemList", - "_itemMultipliers", - "_keyItems", - // TODO(@Isha) remove. - "_mineInventory", - "_diamonds", - // TODO(@Isha) remove. - "_mineLayersCleared", - "_eggList", - "_eggSlots", - "_shardUpgrades", - "_shardsCollected", - "achievementsCompleted", - "completedQuestList", - "questRefreshes", - "_questXP", - "_questPoints", - "_lastSeen", - "currentQuests", - "_shinyCatches", - "gymDefeats", - "statistics", - "achievementsCompleted", - "farmPoints", - "plotList", - "berryList", - "highestRegion", - "tutorialProgress", - "tutorialState", - "tutorialComplete", - ]; + public toJSON(prestige: boolean = false) { + let keep = []; + if (!prestige){ + keep = [ + "_money", + "_dungeonTokens", + "_questPoints", + "prestigePoints", + "prestigeUpgradesBought", + "prestigeType", + "prestigeBank", + "_caughtShinyList", + "_route", + "_caughtPokemonList", + "_defeatedAmount", + "_caughtAmount", + "_routeKills", + "_routeKillsNeeded", + "_region", + "_gymBadges", + "_pokeballs", + "_notCaughtBallSelection", + "_alreadyCaughtBallSelection", + "_sortOption", + "_sortDescending", + "_starter", + "_oakItemExp", + "_oakItemsEquipped", + "_itemList", + "_itemMultipliers", + "_keyItems", + // TODO(@Isha) remove. + "_mineInventory", + "_diamonds", + // TODO(@Isha) remove. + "_mineLayersCleared", + "_eggList", + "_eggSlots", + "_shardUpgrades", + "_shardsCollected", + "achievementsCompleted", + "completedQuestList", + "questRefreshes", + "_questXP", + "_questPoints", + "_lastSeen", + "currentQuests", + "_shinyCatches", + "gymDefeats", + "dungeonsCleared", + "statistics", + "achievementsCompleted", + "farmPoints", + "plotList", + "berryList", + "highestRegion", + "tutorialProgress", + "tutorialState", + "tutorialComplete", + ]; + } else { + keep = [ + "prestigePoints", + "prestigeUpgradesBought", + "prestigeType", + "prestigeBank", + "_caughtShinyList", + "_defeatedAmount", + "_caughtAmount", + "_sortOption", + "_sortDescending", + "_oakItemExp", + "_keyItems", + "_shardUpgrades", + "_shardsCollected", + "achievementsCompleted", + "questRefreshes", + "_questXP", + "_lastSeen", + "_shinyCatches", + "statistics", + "achievementsCompleted", + "plotList", + "berryList", + "tutorialProgress", + "tutorialState", + "tutorialComplete", + ]; + } let plainJS = ko.toJS(this); return Save.filter(plainJS, keep) } - } diff --git a/src/scripts/Prestige/Prestige.ts b/src/scripts/Prestige/Prestige.ts new file mode 100644 index 0000000000..a2a4070b2c --- /dev/null +++ b/src/scripts/Prestige/Prestige.ts @@ -0,0 +1,246 @@ +class Prestige { + + public static upgradeLayout = [ + [0, 0, 1, 2, 3, 0, 0], + [0, 4, 5, 6, 7, 8, 0], + [9, 10, 11, 12, 13, 14, 15], + [16, 17, 18, 19, 20, 21, 22], + [23, 24, 25, 26, 27, 28, 29], + [0, 30, 31, 32, 33, 34, 0], + [0, 0, 35, 36, 37, 0, 0], + ]; + + public static upgradeList = []; + + /** + * Upgrades 2, 16, 22 and 36 can always be reached. Otherwise check if a neighbour is already unlocked. + * Can take some inspiration from how dungeons handle this. + */ + public static canReachUpgrade(upgradeId: number): boolean { + if (upgradeId == 2 || upgradeId == 16 || upgradeId == 22 || upgradeId == 36) { + return true; + } + + if (this.isUpgradeBought(upgradeId)) { + return true; + } + + let x = 0; + let y = 0; + + for (let i = 0; i < this.upgradeLayout.length; i++) { + for (let j = 0; j < this.upgradeLayout[i].length; j++) { + if (this.upgradeLayout[i][j] == upgradeId) { + x = JSON.parse(JSON.stringify(j)); + y = JSON.parse(JSON.stringify(i)); + break; + } + } + } + + let nb1 = this.upgradeLayout[GameConstants.normalize(y + 1, this.upgradeLayout.length-1)][GameConstants.normalize(x, this.upgradeLayout.length-1)]; + let nb2 = this.upgradeLayout[GameConstants.normalize(y - 1, this.upgradeLayout.length-1)][GameConstants.normalize(x, this.upgradeLayout.length-1)]; + let nb3 = this.upgradeLayout[GameConstants.normalize(y, this.upgradeLayout.length-1)][GameConstants.normalize(x + 1, this.upgradeLayout.length-1)]; + let nb4 = this.upgradeLayout[GameConstants.normalize(y, this.upgradeLayout.length-1)][GameConstants.normalize(x - 1, this.upgradeLayout.length-1)]; + + return this.isUpgradeBought(nb1) || this.isUpgradeBought(nb2) || this.isUpgradeBought(nb3) || this.isUpgradeBought(nb4); + } + + + /** + * Set the id of the upgrade to true in player and subtract the correct points. + */ + public static buyUpgrade(upgradeId: number) { + if(!this.canBuyUpgrade(upgradeId)) return; + + const prestigeUpgrade: PrestigeUpgrade = this.getUpgrade(upgradeId); + + player.prestigePoints[prestigeUpgrade.costType](player.prestigePoints[prestigeUpgrade.costType]() - prestigeUpgrade.cost); + player.prestigeUpgradesBought[upgradeId](true); + + Notifier.notify(`Purchased upgrade!`, GameConstants.NotificationOption.success); + } + + /** + * Reward 1 of each point that is lower or equal to the prestige that is started. + */ + public static awardPrestigePoints(type: GameConstants.PrestigeType, amount: number = 1) { + return player.prestigePoints[type](player.prestigePoints[type]() + amount); + } + + /** + * Check if an upgrade is bought. + */ + public static isUpgradeBought(upgradeId: number): boolean { + return player ? player.prestigeUpgradesBought[upgradeId]() : false; + } + + + /** + * Reset all player values except caughtShinyList, defeatedAmount, eggSlots, itemList, diamonds, shardUpgrades, mineUpgrade, statistics, questXp, shinyCatches, all farm related stuff. + * Store money, dungeontokens and questpoints so they can be recovered. + * Award prestigepoints. + * Restart the game. + */ + public static startPrestige(type: GameConstants.PrestigeType) { + if (!this.canPrestige()) + return Notifier.notify(`You must beat the Elite 4 Champion before you can prestige!`, GameConstants.NotificationOption.danger); + + // TODO: Calculate amount of points that should be awarded + const amount_of_points = this.prestigePointsEarned(); + + if (!confirm(`Are you sure you want to prestige, All Your progress will be reset.\n\nPrestige for ${amount_of_points} x ${GameConstants.PrestigeType[player.prestigeType]} points?`)) + return; + + // Apply prestige completion to statistics + GameHelper.incrementObservable(player.statistics.prestigesCompleted[player.prestigeType]); + + this.awardPrestigePoints(player.prestigeType, amount_of_points); + this.addToBank(); + + // Set Players new prestige type + player.prestigeType = type; + // Give the player the dungeon ticket + player._keyItems(['Dungeon ticket']); + // Reset player data (only keeping specific things) + localStorage.setItem('player', JSON.stringify(player.toJSON(true))); + location.reload(); + } + + public static canPrestige(){ + return player.hasBadge(GameConstants.Badge.Elite_Champion); + } + + public static prestigePointsEarned(){ + switch(true){ + case player.hasBadge(GameConstants.Badge.Elite_JohtoChampion): + return 3; + break; + case player.hasBadge(GameConstants.Badge.Elite_Champion): + return 1; + break; + default: + return 0; + } + } + + /** + * Check if an upgrade can be bought + */ + public static canBuyUpgrade(upgradeId: number): boolean { + + if (upgradeId <= 0) return false; + + let prestigeUpgrade: PrestigeUpgrade = this.getUpgrade(upgradeId); + + if (this.isUpgradeBought(upgradeId)) { + Notifier.notify('Already bought this upgrade', GameConstants.NotificationOption.danger); + return false; + } + + if (!this.canReachUpgrade(upgradeId)) { + Notifier.notify(`Can't reach this upgrade yet`, GameConstants.NotificationOption.danger); + return false; + } + + if (player.prestigePoints[prestigeUpgrade.costType]() < prestigeUpgrade.cost) { + Notifier.notify(`Can't afford upgrade`, GameConstants.NotificationOption.danger); + return false; + } + + return true; + } + + + /** + * Return the upgrade from the upgradeList + */ + public static getUpgrade(upgradeId: number): PrestigeUpgrade { + return this.upgradeList[upgradeId]; + } + + public static addUpgrade(upgrade: PrestigeUpgrade) { + this.upgradeList[upgrade.id] = upgrade; + } + + /** + * All upgrades are percentages in the form (1 + bonus). + * Decreasing a time by 33% will be (1 + -0.33) and the bonus will be -0.33 + * Increasing money by 50% will be (1 + 0.5) and the bonus will be 0.5 + */ + + public static initialize() { + // TODO add correct description and bonuses + this.addUpgrade(new PrestigeUpgrade(1, '[Farm]
Harvest time decreased by 20%', 2, GameConstants.PrestigeType.Easy, 20)); + this.addUpgrade(new PrestigeUpgrade(2, '[General]
Gain 30% more dungeon tokens', 1, GameConstants.PrestigeType.Easy, 1.3)); + this.addUpgrade(new PrestigeUpgrade(3, '[Underground]
Max daily deals +1', 2, GameConstants.PrestigeType.Easy, 1)); + this.addUpgrade(new PrestigeUpgrade(4, '[Underground]
Max treasures +1', 2, GameConstants.PrestigeType.Easy, 1)); + this.addUpgrade(new PrestigeUpgrade(5, '[Safari Zone]
Flee chance -20%', 2, GameConstants.PrestigeType.Hard, 20)); + this.addUpgrade(new PrestigeUpgrade(6, '[Underground]
Chisel damage +1', 1, GameConstants.PrestigeType.Hard, 1)); + this.addUpgrade(new PrestigeUpgrade(7, '______', 2, GameConstants.PrestigeType.Hard, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(8, '______', 2, GameConstants.PrestigeType.Easy, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(9, '[Farm]
Fertilizer effect +20%', 2, GameConstants.PrestigeType.Easy, 1.2)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(10, '______', 6, GameConstants.PrestigeType.Hard, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(11, '[General]
Routekills required decreased by 20%', 2, GameConstants.PrestigeType.Hard, 0.8)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(12, '[Quest]
Unlock +1 quest slot', 3, GameConstants.PrestigeType.Easy, 1)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(13, '______', 3, GameConstants.PrestigeType.Hard, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(14, '[Quest]
Quest skip cost halved', 2, GameConstants.PrestigeType.Hard, 0.5)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(15, '[Safari Zone]
Max steps +200', 2, GameConstants.PrestigeType.Easy, 200)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(16, '[General]
Gain 10% more exp', 1, GameConstants.PrestigeType.Easy, 1.1)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(17, '[General]
Seed droprate + 20%', 2, GameConstants.PrestigeType.Easy, 1.2)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(18, '[Dungeons]
Dungeons contain +1 treasure', 3, GameConstants.PrestigeType.Easy, 1)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(19, '[General]
Catch time -250ms', 7, GameConstants.PrestigeType.Medium, -250)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(20, '[Breeding]
Egg slot cost halved', 3, GameConstants.PrestigeType.Easy, 0.5)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(21, '[Oak Items]
Oak item xp gain increased by 30%', 2, GameConstants.PrestigeType.Easy, 1.3)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(22, '[General]
Gain 20% more money', 1, GameConstants.PrestigeType.Easy, 1.2)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(23, '[Dungeons]
Dungeon enemies drop 3 more shards', 2, GameConstants.PrestigeType.Easy, 3)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(24, '[Gyms]
Gym time limit is +10s', 5, GameConstants.PrestigeType.Medium, 1e4)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(25, '[Breeding]
Hatched Pokémon start at level 50', 4, GameConstants.PrestigeType.Medium, 50)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(26, '[Underground]
Energy regen time -10s', 6, GameConstants.PrestigeType.Easy, -1e4)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(27, '[General]
Encounter 25% more shinies', 4, GameConstants.PrestigeType.Medium, 1.25)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(28, '______', 5, GameConstants.PrestigeType.Medium, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(29, '______', 2, GameConstants.PrestigeType.Easy, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(30, '______', 2, GameConstants.PrestigeType.Easy, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(31, '[Underground]
Max energy +50', 2, GameConstants.PrestigeType.Medium, 50)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(32, '[Farm]
Harvest Berry gain +20%', 1, GameConstants.PrestigeType.Medium, 1.2)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(33, '[Breeding]
Breeding increases attack with +10%', 2, GameConstants.PrestigeType.Medium, 1.1)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(34, '______', 2, GameConstants.PrestigeType.Easy, 0)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(35, '[Quest]
Gain 25% more quest points', 2, GameConstants.PrestigeType.Easy, 1.25)); // To implement bonus + this.addUpgrade(new PrestigeUpgrade(36, '[General]
Catch rate +10%', 1, GameConstants.PrestigeType.Easy, 10)); + this.addUpgrade(new PrestigeUpgrade(37, '______', 2, GameConstants.PrestigeType.Easy, 0)); // To implement bonus + } + + public static isLocked(upgradeId: number) { + return ko.pureComputed(function(){ + return upgradeId != 0 && !Prestige.isUpgradeBought(upgradeId); + }); + } + + public static isReachable(upgradeId: number) { + return ko.pureComputed(function(){ + return upgradeId != 0 && !Prestige.isUpgradeBought(upgradeId) && Prestige.canReachUpgrade(upgradeId); + }); + } + + public static addToBank(){ + GameHelper.incrementObservable(player.prestigeBank[GameConstants.Currency.money], player._money()); + GameHelper.incrementObservable(player.prestigeBank[GameConstants.Currency.questPoint], player._questPoints()); + GameHelper.incrementObservable(player.prestigeBank[GameConstants.Currency.dungeontoken], player._dungeonTokens()); + GameHelper.incrementObservable(player.prestigeBank[GameConstants.Currency.diamond], player._diamonds()); + player._money(0); + player._questPoints(0); + player._dungeonTokens(0); + player._diamonds(0); + } + + public static takeFromBank(){ + GameHelper.incrementObservable(player._money, player.prestigeBank[GameConstants.Currency.money]()); + GameHelper.incrementObservable(player._questPoints, player.prestigeBank[GameConstants.Currency.questPoint]()); + GameHelper.incrementObservable(player._dungeonTokens, player.prestigeBank[GameConstants.Currency.dungeontoken]()); + GameHelper.incrementObservable(player._diamonds, player.prestigeBank[GameConstants.Currency.diamond]()); + player.prestigeBank[GameConstants.Currency.money](0); + player.prestigeBank[GameConstants.Currency.questPoint](0); + player.prestigeBank[GameConstants.Currency.dungeontoken](0); + player.prestigeBank[GameConstants.Currency.diamond](0); + } +} diff --git a/src/scripts/Prestige/PrestigeBonuses.ts b/src/scripts/Prestige/PrestigeBonuses.ts new file mode 100644 index 0000000000..d0fd2f3630 --- /dev/null +++ b/src/scripts/Prestige/PrestigeBonuses.ts @@ -0,0 +1,29 @@ +class PrestigeBonuses { + /** + * TODO not sure if this is the best way to do it, see #238 + */ + + /** + * Return the bonus if the upgrade is bought, 1 otherwise + */ + public static getBonus(upgradeId){ + return Math.round(Prestige.getUpgrade(upgradeId).bonus) != Prestige.getUpgrade(upgradeId).bonus ? this.getPercentageBonus(upgradeId) : this.getAddBonus(upgradeId); + } + + public static getPercentageBonus(upgradeId){ + return Prestige.isUpgradeBought(upgradeId) ? Prestige.getUpgrade(upgradeId).bonus : 1; + } + + public static getAddBonus(upgradeId){ + return Prestige.isUpgradeBought(upgradeId) ? Prestige.getUpgrade(upgradeId).bonus : 0; + } + + /** + * Repeat 36 times :/ + */ + public static getHarvestTimeBonus(){ + return this.getBonus(1); + } + + +} diff --git a/src/scripts/Prestige/PrestigeUpgrade.ts b/src/scripts/Prestige/PrestigeUpgrade.ts new file mode 100644 index 0000000000..3bd3dd9d4f --- /dev/null +++ b/src/scripts/Prestige/PrestigeUpgrade.ts @@ -0,0 +1,20 @@ +class PrestigeUpgrade { + + public id: number; + public description: string; + public tooltip: string; + public cost: number; + public costType: GameConstants.PrestigeType; + public bonus: number; + + constructor(id: number, description: string, cost: number, costType: GameConstants.PrestigeType, bonus = 0) { + this.id = id; + this.description = description; + this.tooltip = description + `
`; + for (let i = 0; i < cost; i++) + this.tooltip += ``; + this.cost = cost; + this.costType = costType; + this.bonus = bonus; + } +} diff --git a/src/scripts/Save.ts b/src/scripts/Save.ts index 2eb78d26df..3779670423 100644 --- a/src/scripts/Save.ts +++ b/src/scripts/Save.ts @@ -156,10 +156,18 @@ class Save { return res; } + public static initializeEffects(saved?: Array): {[name: string]: KnockoutObservable} { + let res = {}; + for (let obj in GameConstants.BattleItemType) { + res[obj] = ko.observable(saved ? saved[obj] || 0 : 0); + } + return res; + } + public static loadFromFile(file) { - testing = file; + let fileToRead = file; let fr = new FileReader(); - fr.readAsText(testing); + fr.readAsText(fileToRead); setTimeout(function () { try { @@ -206,5 +214,3 @@ document.addEventListener("DOMContentLoaded", function (event) { $('#saveTextArea').text(JSON.stringify(player)); }); }); - -let testing; diff --git a/src/scripts/StartSequenceRunner.ts b/src/scripts/StartSequenceRunner.ts index f952417344..da2bc9c01e 100644 --- a/src/scripts/StartSequenceRunner.ts +++ b/src/scripts/StartSequenceRunner.ts @@ -38,7 +38,6 @@ class StartSequenceRunner { } public static showCaughtMessage() { - player.routeKills[1](0); Game.gameState(GameConstants.GameState.paused); $('#starterCaughtModal').modal('show'); $('#pokeballSelector').css('display', 'block'); @@ -65,6 +64,5 @@ document.addEventListener("DOMContentLoaded", function (event) { $('#starterCaughtModal').on('hidden.bs.modal', function () { Save.store(player); Game.gameState(GameConstants.GameState.fighting); - }); }); diff --git a/src/scripts/achievements/Achievement.ts b/src/scripts/achievements/Achievement.ts index 2b81c43fd0..52f66bbb5f 100644 --- a/src/scripts/achievements/Achievement.ts +++ b/src/scripts/achievements/Achievement.ts @@ -29,7 +29,12 @@ class Achievement { return this.isCompleted() ? "100.0" : this.property.getProgressPercentage(); } - public isCompleted() { + public isCompleted(){ return this.unlocked || this.property.isCompleted(); } -} \ No newline at end of file + + public getBonus(){ + const max = AchievementHandler.calculateMaxBonus(); + return (this.bonus / max * 100).toFixed(2); + } +} diff --git a/src/scripts/achievements/ClearDungeonRequirement.ts b/src/scripts/achievements/ClearDungeonRequirement.ts index 5ffab98f4e..84f5f81134 100644 --- a/src/scripts/achievements/ClearDungeonRequirement.ts +++ b/src/scripts/achievements/ClearDungeonRequirement.ts @@ -11,4 +11,4 @@ class ClearDungeonRequirement extends Requirement { public getProgress() { return Math.min(player.statistics.dungeonsCleared[this.dungeonIndex](), this.requiredValue); } -} \ No newline at end of file +} diff --git a/src/scripts/achievements/Statistics.ts b/src/scripts/achievements/Statistics.ts index e4c3e5897e..3677ac11cd 100644 --- a/src/scripts/achievements/Statistics.ts +++ b/src/scripts/achievements/Statistics.ts @@ -17,6 +17,7 @@ class Statistics { public totalShards: Array>; public oakItemUses: Array>; public berriesHarvested: Array>; + public prestigesCompleted: Array>; private static readonly arraySizes = { "gymsDefeated": GameConstants.KantoGyms.length + GameConstants.JohtoGyms.length, @@ -26,6 +27,7 @@ class Statistics { "totalShards": GameHelper.enumLength(GameConstants.PokemonType) - 1, // remove "None" pokemon type "oakItemUses": GameHelper.enumLength(GameConstants.OakItem), "berriesHarvested": GameHelper.enumLength(GameConstants.BerryType), + "prestigesCompleted": GameHelper.enumLength(GameConstants.PrestigeType), } constructor(saved = {}) { @@ -50,6 +52,7 @@ class Statistics { "totalShards", "oakItemUses", "berriesHarvested", + "prestigesCompleted", ] for (let prop of observables) { diff --git a/src/scripts/breeding/BreedingHelper.ts b/src/scripts/breeding/BreedingHelper.ts index b61b2f27c2..b9c6b079dc 100644 --- a/src/scripts/breeding/BreedingHelper.ts +++ b/src/scripts/breeding/BreedingHelper.ts @@ -64,14 +64,14 @@ class BreedingHelper { } if (shiny) Notifier.notify(`✨ You hatched a shiny ${egg.pokemon}! ✨`, GameConstants.NotificationOption.warning); - else Notifier.notify(`You hatched a ${egg.pokemon}!`, GameConstants.NotificationOption.success); + else Notifier.notify(`You hatched ${GameHelper.anOrA(egg.pokemon)} ${egg.pokemon}!`, GameConstants.NotificationOption.success); player.capturePokemon(egg.pokemon, shiny); // Capture base form if not already caught. This helps players get Gen2 Pokemon that are base form of Gen1 let baseForm = BreedingHelper.calculateBaseForm(egg.pokemon); if (egg.pokemon != baseForm && !player.alreadyCaughtPokemon(baseForm)) { - Notifier.notify(`You also found a ${baseForm} nearby!`, GameConstants.NotificationOption.success); + Notifier.notify(`You also found ${GameHelper.anOrA(baseForm)} ${baseForm} nearby!`, GameConstants.NotificationOption.success); player.capturePokemon(baseForm, false, true); } @@ -87,7 +87,7 @@ class BreedingHelper { public static createTypedEgg(type: GameConstants.EggType): Egg { const hatch_list = HatchList[type]; - const hatchable = hatch_list.slice(0, player.highestRegion + 1); + const hatchable = hatch_list.slice(0, player.highestRegion() + 1); let possible_hatches = []; hatchable.forEach((pokemon, index)=>{ if (!pokemon.length) return; @@ -141,7 +141,7 @@ class BreedingHelper { if (!(pokemonName in pokemonDevolutionMap)) { // No devolutions at all return pokemonName; - } else if (PokemonHelper.calcNativeRegion(pokemonDevolutionMap[pokemonName]) > player.highestRegion) { + } else if (PokemonHelper.calcNativeRegion(pokemonDevolutionMap[pokemonName]) > player.highestRegion()) { // No further devolutions in current unlocked regions return pokemonName; } else { @@ -180,7 +180,7 @@ HatchList[GameConstants.EggType.Dragon] = [ document.addEventListener("DOMContentLoaded", function (event) { $('#breedingModal').on('hidden.bs.modal', function () { - if (player.highestRegion == 0) { + if (player.highestRegion() == 0) { MapHelper.moveToRoute(5, GameConstants.Region.kanto); } MapHelper.returnToMap(); diff --git a/src/scripts/dungeons/DungeonRunner.ts b/src/scripts/dungeons/DungeonRunner.ts index ab2833e792..ddcf4e1987 100644 --- a/src/scripts/dungeons/DungeonRunner.ts +++ b/src/scripts/dungeons/DungeonRunner.ts @@ -51,8 +51,14 @@ class DungeonRunner { DungeonRunner.chestsOpened++; let random: number = GameConstants.randomIntBetween(0, DungeonRunner.dungeon.itemList.length - 1); let input = GameConstants.BattleItemType[DungeonRunner.dungeon.itemList[random]]; - Notifier.notify('Found 1 ' + input + ' in a dungeon chest', GameConstants.NotificationOption.success); - player.gainItem(input, 1); + let amount = 1; + if (EffectEngineRunner.isActive(GameConstants.BattleItemType.Item_magnet)()) { + if (Math.random() < 0.5) { + amount += 1 + } + } + Notifier.notify(`Found ${amount} ${input} in a dungeon chest`, GameConstants.NotificationOption.success); + player.gainItem(input, amount); DungeonRunner.map.currentTile().type(GameConstants.DungeonTile.empty); DungeonRunner.map.currentTile().calculateCssClass(); if (DungeonRunner.chestsOpened == GameConstants.DUNGEON_CHEST_SHOW) { @@ -80,6 +86,7 @@ class DungeonRunner { public static dungeonWon() { GameHelper.incrementObservable(player.statistics.dungeonsCleared[Statistics.getDungeonIndex(DungeonRunner.dungeon.name())]); + GameHelper.incrementObservable(player.dungeonsCleared[Statistics.getDungeonIndex(DungeonRunner.dungeon.name())]); Game.gameState(GameConstants.GameState.town); // TODO award loot with a special screen Notifier.notify("You have successfully completed the dungeon", GameConstants.NotificationOption.success); @@ -101,5 +108,5 @@ class DungeonRunner { public static payTokens() { player.dungeonTokens(player.dungeonTokens() - DungeonRunner.dungeon.tokenCost); } - -} \ No newline at end of file + +} diff --git a/src/scripts/effectEngine/effectEngineRunner.ts b/src/scripts/effectEngine/effectEngineRunner.ts new file mode 100644 index 0000000000..1f0ec1b578 --- /dev/null +++ b/src/scripts/effectEngine/effectEngineRunner.ts @@ -0,0 +1,41 @@ +class EffectEngineRunner { + public static counter: number = 0; + + public static tick() { + this.counter = 0; + const timeToReduce = 1; + for(let itemName in GameConstants.BattleItemType){ + player.effectList[itemName](Math.max(0, player.effectList[itemName]() - timeToReduce)); + if (player.effectList[itemName]() == 5){ + Notifier.notify(`The ${itemName}s effect is about to wear off!`, GameConstants.NotificationOption.warning); + } + } + } + + public static getEffect(itemName: string) { + if (!player) return 0; + return player.effectList[itemName](); + } + + public static addEffect(itemName: string){ + player.effectList[itemName](Math.max(0, player.effectList[itemName]() + GameConstants.ITEM_USE_TIME)); + } + + public static formattedTimeLeft(itemName: string){ + return ko.computed(function () { + const times = GameConstants.formatTime(player.effectList[itemName]()).split(':'); + if (+times[0] > 0) { + return '60:00+'; + } + times.shift(); + return times.join(':'); + }, this); + } + + public static isActive(itemName: string): KnockoutComputed { + return ko.computed(function () { + if (!player) return false; + return !!player.effectList[itemName](); + }, this); + } +} diff --git a/src/scripts/farm/FarmRunner.ts b/src/scripts/farm/FarmRunner.ts index c7d9d9e781..3ddd396973 100644 --- a/src/scripts/farm/FarmRunner.ts +++ b/src/scripts/farm/FarmRunner.ts @@ -18,9 +18,10 @@ class FarmRunner { } public static timeToReduce(){ - let oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Sprayduck) ? OakItemRunner.calculateBonus(GameConstants.OakItem.Sprayduck) / 100 : 0; - oakItemBonus = 1 - oakItemBonus; - return Math.round(100 / oakItemBonus) / 100; + const oakItemBonus = OakItemRunner.isActive(GameConstants.OakItem.Sprayduck) ? OakItemRunner.calculateBonus(GameConstants.OakItem.Sprayduck) : 0 + const prestigeBonus = PrestigeBonuses.getBonus(1); + const bonus = 1 - ((oakItemBonus + prestigeBonus) / 100); + return Math.round(100 / bonus) / 100; } public static tick() { @@ -29,7 +30,6 @@ class FarmRunner { for (let i = 0; i < player.plotList.length; i++) { player.plotList[i]().timeLeft(Math.max(0, player.plotList[i]().timeLeft() - timeToReduce)); } - } public static computePlotPrice(): number { diff --git a/src/scripts/farm/Plot.ts b/src/scripts/farm/Plot.ts index 4419fb0b6f..3c17cea9d3 100644 --- a/src/scripts/farm/Plot.ts +++ b/src/scripts/farm/Plot.ts @@ -26,7 +26,4 @@ class Plot { } return 4 - Math.ceil(4 * this.timeLeft() / this.berry().harvestTime); } - - - } diff --git a/src/scripts/gym/GymRunner.ts b/src/scripts/gym/GymRunner.ts index c9410a32e0..4e687deb15 100644 --- a/src/scripts/gym/GymRunner.ts +++ b/src/scripts/gym/GymRunner.ts @@ -83,9 +83,13 @@ document.addEventListener("DOMContentLoaded", function (event) { $('#receiveBadgeModal').on('hidden.bs.modal', function () { - if(GymBattle.gym.badgeReward == GameConstants.Badge.Soul){ - player.gainKeyItem("Safari ticket"); - } + if(GymBattle.gym.badgeReward == GameConstants.Badge.Soul){ + player.gainKeyItem("Safari ticket"); + } + + if (GymRunner.gymObservable() instanceof Champion) { + $('#hallOfFameModal').modal('show'); + } }); }); diff --git a/src/scripts/items/BattleItem.ts b/src/scripts/items/BattleItem.ts index bc16c1e20c..203bf71d27 100644 --- a/src/scripts/items/BattleItem.ts +++ b/src/scripts/items/BattleItem.ts @@ -2,21 +2,28 @@ class BattleItem extends Item { type: GameConstants.BattleItemType; + description: string; - constructor(type: GameConstants.BattleItemType) { + constructor(type: GameConstants.BattleItemType, description: string) { let basePrice = GameConstants.ItemPrice[GameConstants.BattleItemType[type]]; let priceMultiplier = 1; super(GameConstants.BattleItemType[type], basePrice, priceMultiplier, GameConstants.Currency.money); this.type = type; + this.description = description; + } + + buy(amt: number) { + player.gainItem(this.name(), amt); } use() { + EffectEngineRunner.addEffect(this.name()); } } -ItemList['xAttack'] = new BattleItem(GameConstants.BattleItemType.xAttack); -ItemList['xClick'] = new BattleItem(GameConstants.BattleItemType.xClick); -ItemList['xExp'] = new BattleItem(GameConstants.BattleItemType.xExp); -ItemList['Token_collector'] = new BattleItem(GameConstants.BattleItemType.Token_collector); -ItemList['Item_magnet'] = new BattleItem(GameConstants.BattleItemType.Item_magnet); -ItemList['Lucky_incense'] = new BattleItem(GameConstants.BattleItemType.Lucky_incense); \ No newline at end of file +ItemList['xAttack'] = new BattleItem(GameConstants.BattleItemType.xAttack, '+50% Bonus to Pokemon attack'); +ItemList['xClick'] = new BattleItem(GameConstants.BattleItemType.xClick, '+50% Bonus to click attack'); +ItemList['xExp'] = new BattleItem(GameConstants.BattleItemType.xExp, '+50% Bonus to experience gained'); +ItemList['Token_collector'] = new BattleItem(GameConstants.BattleItemType.Token_collector, '+50% Bonus to dungeon tokens gained'); +ItemList['Item_magnet'] = new BattleItem(GameConstants.BattleItemType.Item_magnet, '+50% Chance of gaining an extra item'); +ItemList['Lucky_incense'] = new BattleItem(GameConstants.BattleItemType.Lucky_incense, '+50% Bonus to money gained'); diff --git a/src/scripts/items/EggItem.ts b/src/scripts/items/EggItem.ts index e3ff8b25d0..7fecf12fc9 100644 --- a/src/scripts/items/EggItem.ts +++ b/src/scripts/items/EggItem.ts @@ -2,8 +2,8 @@ class EggItem extends Item { type: GameConstants.EggItemType; - constructor(type: GameConstants.EggItemType) { - let basePrice = GameConstants.ItemPrice.Egg; + constructor(type: GameConstants.EggItemType, price: number = GameConstants.ItemPrice.Egg) { + let basePrice = price; let priceMultiplier = 1; super(GameConstants.EggItemType[type], basePrice, priceMultiplier, GameConstants.Currency.questPoint); this.type = type; @@ -24,7 +24,7 @@ class EggItem extends Item { let etype = GameConstants.EggType[GameConstants.EggItemType[this.type].split("_")[0]]; success = player.gainEgg(BreedingHelper.createTypedEgg(etype)); } - + if (success) { player.loseItem(this.name(), 1); } @@ -39,4 +39,4 @@ ItemList['Fighting_egg'] = new EggItem(GameConstants.EggItemType.Fighting_egg); ItemList['Electric_egg'] = new EggItem(GameConstants.EggItemType.Electric_egg); ItemList['Dragon_egg'] = new EggItem(GameConstants.EggItemType.Dragon_egg); ItemList['Pokemon_egg'] = new EggItem(GameConstants.EggItemType.Pokemon_egg); -ItemList['Mystery_egg'] = new EggItem(GameConstants.EggItemType.Mystery_egg); \ No newline at end of file +ItemList['Mystery_egg'] = new EggItem(GameConstants.EggItemType.Mystery_egg, 750); diff --git a/src/scripts/items/ItemHandler.ts b/src/scripts/items/ItemHandler.ts index ac08c745fe..7678dc17ea 100644 --- a/src/scripts/items/ItemHandler.ts +++ b/src/scripts/items/ItemHandler.ts @@ -1,13 +1,16 @@ class ItemHandler { public static stoneSelected: KnockoutObservable = ko.observable("Fire_stone"); - public static pokemonSelected: KnockoutObservable = ko.observable(""); + public static pokemonSelected: KnockoutObservable = ko.observable("Vulpix"); public static amountSelected: KnockoutObservable = ko.observable(1); static amount: KnockoutObservable = ko.observable(1); - public static useItem(name:string){ - ItemList[name].use(); - player.itemList[name](player.itemList[name]-1); + public static useItem(name: string){ + if (!player.itemList[name]()) + return Notifier.notify(`You don't have any ${name.replace(/_/g, ' ')}s left...`, GameConstants.NotificationOption.danger); + + player.itemList[name](player.itemList[name]()-1); + return ItemList[name].use(); } public static resetAmount() { @@ -23,14 +26,12 @@ class ItemHandler { public static useStones(){ if(this.pokemonSelected() == ""){ - Notifier.notify("No Pokémon selected", GameConstants.NotificationOption.danger); - return; + return Notifier.notify("No Pokémon selected", GameConstants.NotificationOption.danger); } let amountTotal = Math.min(this.amountSelected(), player.itemList[this.stoneSelected()]()); - if(amountTotal == 0){ - Notifier.notify("You don't have any stones left...", GameConstants.NotificationOption.danger); - return; + if(!amountTotal){ + return Notifier.notify(`You don't have any ${this.stoneSelected().replace(/_/g, ' ')}s left...`, GameConstants.NotificationOption.danger); } let amountUsed = 0; diff --git a/src/scripts/oakitems/OakItemRunner.ts b/src/scripts/oakitems/OakItemRunner.ts index 010b74146c..3ed6b8a79c 100644 --- a/src/scripts/oakitems/OakItemRunner.ts +++ b/src/scripts/oakitems/OakItemRunner.ts @@ -12,13 +12,8 @@ class OakItemRunner { OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Amulet_Coin, 30, "Gain more coins from battling", 25, 5, 1))); OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Poison_Barb, 40, "Clicks do more damage", 25, 5, 3))); OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Exp_Share, 50, "Gain more exp from battling", 15, 3, 1))); - OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Sprayduck, 60, "Makes your berries grow faster", 25, 5, 3))); - OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Shiny_Charm, 70, "Encounter more shinies", 50, 100, 150))); - - // TODO implement use! - // TODO implement functionality OakItemRunner.oakItemList.push(ko.observable(new OakItem(GameConstants.OakItem.Blaze_Cassette, 80, "Hatch eggs faster", 50, 10, 10))); // TODO implement use! @@ -65,6 +60,10 @@ class OakItemRunner { OakItemRunner.getOakItemObject(id).use(); } + public static canUpgradeExp(id: GameConstants.OakItem): boolean { + return OakItemRunner.getOakItemObject(id).canUpgradeExp(); + } + public static calculateBonus(id: GameConstants.OakItem): number { return OakItemRunner.getOakItemObject(id).calculateBonus()(); } diff --git a/src/scripts/pokemons/CaughtPokemon.ts b/src/scripts/pokemons/CaughtPokemon.ts index af188aa773..ed1e0c1c2a 100644 --- a/src/scripts/pokemons/CaughtPokemon.ts +++ b/src/scripts/pokemons/CaughtPokemon.ts @@ -59,7 +59,7 @@ class CaughtPokemon { this.evolver[index].dispose(); } - // We need to check if the player object has been set first, There has to be a better way though.. + // Check if player has already caught all of the possible evolutions const obtainedAllEvolutions = reset ? !PokemonHelper.getPokemonByName(this.name).evolutionByIndex(index, true, true).some(p => !player.alreadyCaughtPokemon(p)) : false; if (obtainedAllEvolutions){ @@ -71,7 +71,7 @@ class CaughtPokemon { const evolution = PokemonHelper.getPokemonByName(this.name).evolutionByIndex(index, true) || PokemonHelper.getPokemonByName(this.name).evolutionByIndex(index, false); const evoRegion = PokemonHelper.calcNativeRegion(evolution); this.evolver[index] = this.levelObservable.subscribe(() => { - if (this.levelObservable() >= evo && player.highestRegion >= evoRegion) { + if (this.levelObservable() >= evo && player.highestRegion() >= evoRegion) { Notifier.notify("Your " + this.name + " has evolved into a " + evolution, GameConstants.NotificationOption.success); player.capturePokemon(evolution, false, true); player.caughtAmount[this.id](player._caughtAmount[this.id]() + 1); diff --git a/src/scripts/pokemons/DataPokemon.ts b/src/scripts/pokemons/DataPokemon.ts index e34c091565..d182340b91 100644 --- a/src/scripts/pokemons/DataPokemon.ts +++ b/src/scripts/pokemons/DataPokemon.ts @@ -37,7 +37,7 @@ class DataPokemon implements pokemonInterface { let evolutions = this.evolution[index].constructor === Array ? this.evolution[index] : [this.evolution[index]]; if (filterMaxRegion && player){ - evolutions = evolutions.filter(p=>PokemonHelper.calcNativeRegion(p) <= player.highestRegion); + evolutions = evolutions.filter(p=>PokemonHelper.calcNativeRegion(p) <= player.highestRegion()); } if (!evolutions.length){ @@ -47,7 +47,7 @@ class DataPokemon implements pokemonInterface { if (returnAllEvolutions){ return evolutions; } - + return evolutions[Math.floor(Math.random() * evolutions.length)]; } } diff --git a/src/scripts/quests/Quest.ts b/src/scripts/quests/Quest.ts index d22a438274..f9c4e3b2af 100644 --- a/src/scripts/quests/Quest.ts +++ b/src/scripts/quests/Quest.ts @@ -26,18 +26,22 @@ abstract class Quest { } endQuest() { - if (this.isCompleted()) { + if (this.isCompleted() && !this.claimed()) { player.gainQuestPoints(this.pointsReward); this.claimed(true); if (!this.inQuestLine) player.completedQuestList[this.index](true); let oldLevel = player.questLevel; player.questXP += this.xpReward; - Notifier.notify(`You have completed your quest and claimed ${this.pointsReward} quest points!`, GameConstants.NotificationOption.success); - QuestHelper.checkCompletedSet(); + Notifier.notify(`You have completed your quest and claimed ${this.pointsReward} quest points!`, GameConstants.NotificationOption.success);; + // Refresh the list each time a player levels up if (oldLevel < player.questLevel) { Notifier.notify("Your quest level has increased!", GameConstants.NotificationOption.success); QuestHelper.refreshQuests(true); } + // Once the player completes every available quest, refresh the list for free + if (QuestHelper.allQuestCompleted()) { + QuestHelper.refreshQuests(true); + } } else { this.initial(null); } @@ -98,8 +102,7 @@ abstract class Quest { inProgress() { return ko.computed(() => { - return player.currentQuests().map(x => x.index).includes(this.index) - && !this.isCompleted(); + return player.currentQuests().map(x => x.index).includes(this.index) && !this.isCompleted(); }) } -} \ No newline at end of file +} diff --git a/src/scripts/quests/QuestHelper.ts b/src/scripts/quests/QuestHelper.ts index 1923b26851..9356ebcdba 100644 --- a/src/scripts/quests/QuestHelper.ts +++ b/src/scripts/quests/QuestHelper.ts @@ -18,7 +18,7 @@ class QuestHelper{ let amount, route, region; switch (type) { case "DefeatPokemons": - route = SeededRand.intBetween(1, GameConstants.RegionRoute[player.highestRegion]); + route = SeededRand.intBetween(1, GameConstants.RegionRoute[player.highestRegion()]); amount = SeededRand.intBetween(100, 500); return new DefeatPokemonsQuest(route, amount); case "CapturePokemons": @@ -52,13 +52,13 @@ class QuestHelper{ case "CatchShinies": return new CatchShiniesQuest(1); case "DefeatGym": - region = SeededRand.intBetween(0, player.highestRegion); + region = SeededRand.intBetween(0, player.highestRegion()); const gymTown = SeededRand.fromArray(GameConstants.RegionGyms[region]); amount = SeededRand.intBetween(5, 20); return new DefeatGymQuest(gymTown, amount); case "DefeatDungeon": // Allow upto highest region - region = SeededRand.intBetween(0, player.highestRegion); + region = SeededRand.intBetween(0, player.highestRegion()); const dungeon = SeededRand.fromArray(GameConstants.RegionDungeons[region]); amount = SeededRand.intBetween(5, 20); return new DefeatDungeonQuest(dungeon, amount); @@ -185,21 +185,20 @@ class QuestHelper{ }); } - public static checkCompletedSet() { + // returns true is all quest are completed + public static allQuestCompleted() { for (let questCompleted of player.completedQuestList) { if (!questCompleted()) { - return; + return false; } } - //Only reachable if all quests are completed - QuestHelper.getCompletionReward(); + return true; } - private static getCompletionReward() { - console.log("All quests Completed!") - } - - public static questSlots(): KnockoutObservable { - return ko.observable(1); + public static questSlots(): KnockoutComputed { + return ko.computed(function () { + // Minimum of 1, Maximum of 4 + return Math.min(4, Math.max(1, player ? Math.floor(player.questLevel / 5) : 1)); + }, this); } } diff --git a/src/scripts/quests/QuestLineHelper.ts b/src/scripts/quests/QuestLineHelper.ts index cb0c42b022..edf269cef7 100644 --- a/src/scripts/quests/QuestLineHelper.ts +++ b/src/scripts/quests/QuestLineHelper.ts @@ -32,7 +32,7 @@ class QuestLineHelper { this.tutorial.addQuest(pewter); //Buy pokeballs - let buyPokeballs = new BuyPokeballsQuest(30,GameConstants.Pokeball.Pokeball,50); + let buyPokeballs = new BuyPokeballsQuest(30, GameConstants.Pokeball.Pokeball, 50); buyPokeballs.pointsReward = 50; buyPokeballs.description = "Buy 30 pokeballs. You can find these in the Pewter City Shop."; this.tutorial.addQuest(buyPokeballs); @@ -42,6 +42,18 @@ class QuestLineHelper { routeThree.pointsReward = 100; this.tutorial.addQuest(routeThree); + //Buy Dungeon ticket + let buyDungeonTicket = new Quest(1, 10); + buyDungeonTicket.description = 'Buy the Dungeon ticket from Pewter City Shop.'; + buyDungeonTicket.questFocus = ()=>+player.hasKeyItem('Dungeon ticket'); + this.tutorial.addQuest(buyDungeonTicket); + + //Cleat Mt Moon dungeon + let clearMtMoon = new DefeatDungeonQuest(GameConstants.KantoDungeons[2], 1); + clearMtMoon.pointsReward = 10; + clearMtMoon.description = 'Gather 75 Dungeon tokens by capturing Pokemon, then clear the Mt. Moon dungeon.'; + this.tutorial.addQuest(clearMtMoon); + this.tutorialTracker = this.tutorial.curQuestInitial.subscribe((newInitial)=>{ player.tutorialProgress(QuestLineHelper.tutorial.curQuest()); player.tutorialState = newInitial; diff --git a/src/scripts/safari/Safari.ts b/src/scripts/safari/Safari.ts index 5537b9a502..e84f3d6291 100644 --- a/src/scripts/safari/Safari.ts +++ b/src/scripts/safari/Safari.ts @@ -299,7 +299,7 @@ document.addEventListener("DOMContentLoaded", function (event) { fps: 8, frames: 4 }).on('frame', function() { - if (Safari.sprite.frame%2 == 0) { + if (Safari.sprite.frame % 2 == 0) { Safari.sprite.pause(); } }); diff --git a/src/scripts/safari/SafariBattle.ts b/src/scripts/safari/SafariBattle.ts index 67fb72b3f0..cf4b033b9b 100644 --- a/src/scripts/safari/SafariBattle.ts +++ b/src/scripts/safari/SafariBattle.ts @@ -71,7 +71,8 @@ class SafariBattle { setTimeout(function(){ const oakBonus = OakItemRunner.isActive(GameConstants.OakItem.Magic_Ball) ? OakItemRunner.calculateBonus(GameConstants.OakItem.Magic_Ball) : 0; - if (random * 100 < SafariBattle.enemy.catchFactor + oakBonus){ + const prestigeBonus = PrestigeBonuses.getBonus(5); + if (random * 100 < SafariBattle.enemy.catchFactor + oakBonus + prestigeBonus){ SafariBattle.capturePokemon(); $('#safariBall').css('filter', 'brightness(0.4) grayscale(100%)'); setTimeout(function(){ @@ -201,11 +202,11 @@ class SafariBattle { } private static lockButtons() { - $('.safariOption button').attr('disabled', true); + $('.safariOption button').attr('disabled', 'true'); } private static unlockButtons() { - $('.safariOption button').attr('disabled', false); + $('.safariOption button').attr('disabled', null); } private static endBattle() { diff --git a/src/scripts/towns/Town.ts b/src/scripts/towns/Town.ts index 4e5ebde5d8..87c7ced290 100644 --- a/src/scripts/towns/Town.ts +++ b/src/scripts/towns/Town.ts @@ -56,7 +56,7 @@ class Town { public hasDungeonReq() { if (this.dungeonReq != undefined) { - return 0 < player.statistics.dungeonsCleared[Statistics.getDungeonIndex(this.dungeonReq)](); + return 0 < player.dungeonsCleared[Statistics.getDungeonIndex(this.dungeonReq)](); } else { return true; } @@ -146,7 +146,8 @@ TownList["Ecruteak City"] = new Town("Ecruteak City", [37]); let OlivineCityShop = new Shop(["Metal_coat"]); TownList["Olivine City"] = new Town("Olivine City", [39], OlivineCityShop); -TownList["Cianwood City"] = new Town("Cianwood City", [41]); +let CianwoodCityShop = new Shop(["Ultraball", "Time_stone"]); +TownList["Cianwood City"] = new Town("Cianwood City", [41], CianwoodCityShop); TownList["Mahogany Town"] = new Town("Mahogany Town", [42], null, null, "Mt Mortar"); diff --git a/src/scripts/underground/Mine.ts b/src/scripts/underground/Mine.ts index 121ba90830..fb297759dd 100644 --- a/src/scripts/underground/Mine.ts +++ b/src/scripts/underground/Mine.ts @@ -125,7 +125,7 @@ class Mine { private static chisel(x: number, y: number) { if (Mine.grid[x][y]() > 0) { if (Underground.energy >= Underground.CHISEL_ENERGY) { - Mine.grid[Mine.normalizeY(x)][Mine.normalizeX(y)](Math.max(0, Mine.grid[Mine.normalizeY(x)][Mine.normalizeX(y)]() - 2)); + Mine.grid[Mine.normalizeY(x)][Mine.normalizeX(y)](Math.max(0, Mine.grid[Mine.normalizeY(x)][Mine.normalizeX(y)]() - (2 + PrestigeBonuses.getBonus(6)))); Underground.energy = Underground.energy - Underground.CHISEL_ENERGY; } } @@ -143,7 +143,8 @@ class Mine { for (let i = 0; i < Mine.rewardNumbers.length; i++) { if (Mine.checkItemRevealed(Mine.rewardNumbers[i])) { Underground.gainMineItem(Mine.rewardNumbers[i]); - Notifier.notify("You found a " + Underground.getMineItemById(Mine.rewardNumbers[i]).name, GameConstants.NotificationOption.success); + const itemName = Underground.getMineItemById(Mine.rewardNumbers[i]).name; + Notifier.notify(`You found ${GameHelper.anOrA(itemName)} ${itemName}`, GameConstants.NotificationOption.success); Mine.itemsFound(Mine.itemsFound() + 1); GameHelper.incrementObservable(player.statistics.digItems); Mine.rewardNumbers.splice(i, 1); diff --git a/src/scripts/underground/SeededRand.ts b/src/scripts/underground/SeededRand.ts index 6edd800d98..a6f662c6e2 100644 --- a/src/scripts/underground/SeededRand.ts +++ b/src/scripts/underground/SeededRand.ts @@ -24,4 +24,4 @@ class SeededRand { public static fromArray(arr: Array): T { return arr[SeededRand.intBetween(0, arr.length - 1)] } -} \ No newline at end of file +} diff --git a/src/scripts/underground/Underground.ts b/src/scripts/underground/Underground.ts index fd8d7d4420..bdbe38fa86 100644 --- a/src/scripts/underground/Underground.ts +++ b/src/scripts/underground/Underground.ts @@ -13,7 +13,7 @@ class Underground { } public static getMaxItems() { - return Underground.BASE_ITEMS_MAX + this.getUpgrade(Underground.Upgrades.Items_Max).calculateBonus(); + return Underground.BASE_ITEMS_MAX + this.getUpgrade(Underground.Upgrades.Items_Max).calculateBonus() + PrestigeBonuses.getBonus(4); } public static getEnergyGain() { @@ -25,7 +25,7 @@ class Underground { } public static getDailyDealsMax() { - return Underground.BASE_DAILY_DEALS_MAX + this.getUpgrade(Underground.Upgrades.Daily_Deals_Max).calculateBonus(); + return Underground.BASE_DAILY_DEALS_MAX + this.getUpgrade(Underground.Upgrades.Daily_Deals_Max).calculateBonus() + PrestigeBonuses.getBonus(3); } diff --git a/src/scripts/utilities/Preload.ts b/src/scripts/utilities/Preload.ts index c9e912e844..5c25967ec5 100644 --- a/src/scripts/utilities/Preload.ts +++ b/src/scripts/utilities/Preload.ts @@ -47,6 +47,7 @@ class Preload { p.push(new Promise(resolve => { let img = new Image(); img.onload = () => resolve(); + img.onerror = () => resolve(); img.src = `assets/images/towns/${name}.png`; })); diff --git a/src/scripts/worldmap/MapHelper.ts b/src/scripts/worldmap/MapHelper.ts index 8a0023737e..52775ab00c 100644 --- a/src/scripts/worldmap/MapHelper.ts +++ b/src/scripts/worldmap/MapHelper.ts @@ -35,7 +35,7 @@ class MapHelper { private static hasDungeonReq(route, region) { let dungeonReq = GameConstants.routeDungeonRequirements[region][route]; - return dungeonReq == undefined || 0 < player.statistics.dungeonsCleared[Statistics.getDungeonIndex(dungeonReq)](); + return dungeonReq == undefined || 0 < player.dungeonsCleared[Statistics.getDungeonIndex(dungeonReq)](); } private static hasRouteKillReq(route, region) { @@ -61,7 +61,11 @@ class MapHelper { return "currentRoute"; } if (MapHelper.accessToRoute(route, region)) { - return "unlockedRoute"; + if (player.routeKillsObservable(route)() >= player.routeKillsNeeded) { + return "unlockedRoute"; + } else { + return "unlockedUnfinishedRoute"; + } } return "lockedRoute"; } @@ -75,7 +79,7 @@ class MapHelper { } if (MapHelper.accessToTown(town)) { if (dungeonList.hasOwnProperty(town)) { - if (DungeonRunner.dungeonCompleted(dungeonList[town], false)) { + if (player.statistics.dungeonsCleared[Statistics.getDungeonIndex(town)]()) { return "dungeon completedDungeon" } return "dungeon unlockedDungeon" @@ -130,7 +134,7 @@ class MapHelper { let openModal = () => {$("#ShipModal").modal('show');} switch (player.region) { case 0: - if (TownList["Vermillion City"].isUnlocked() && player.highestRegion > 0) { + if (TownList["Vermillion City"].isUnlocked() && player.highestRegion() > 0) { openModal(); return; } @@ -144,14 +148,14 @@ class MapHelper { } public static ableToTravel() { - return player.caughtPokemonList.length >= GameConstants.pokemonsNeededToTravel[player.highestRegion] + return player.caughtPokemonList.length >= GameConstants.pokemonsNeededToTravel[player.highestRegion()] } public static travelToNextRegion() { if (MapHelper.ableToTravel()) { - player.highestRegion++; - MapHelper.moveToTown(GameConstants.StartingTowns[player.highestRegion]); - player.region = player.highestRegion; + player.highestRegion(player.highestRegion() + 1); + MapHelper.moveToTown(GameConstants.StartingTowns[player.highestRegion()]); + player.region = player.highestRegion(); } } diff --git a/src/styles/battleItem.less b/src/styles/battleItem.less new file mode 100644 index 0000000000..7a6f1fb440 --- /dev/null +++ b/src/styles/battleItem.less @@ -0,0 +1,38 @@ +#BattleItemContainer { + table { + display: table; + table-layout: fixed; + width: 100%; + } + .battle-item-small { + width: 36px; + height: 36px; + margin: 5px; + border: 1px solid black; + } + + .battle-item-small-selected { + width: 36px; + height: 36px; + margin: 5px; + border: 1px solid #ff2f39; + } + + .battle-item-none { + filter: brightness(0.8); + opacity: 0.4; + } + + .meter { + width:0%; + background-color:rgb(58, 255, 58); + height:2px; + } + + .amount { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 16.6%; + } +} diff --git a/src/styles/main.less b/src/styles/main.less index bb9c36d76b..85c0c42848 100644 --- a/src/styles/main.less +++ b/src/styles/main.less @@ -58,6 +58,10 @@ background-color: rgba(0,0,0,0.5) } +[data-toggle="collapse"] { + cursor: pointer; +} + #interactionView { min-height: 200px; } @@ -84,6 +88,10 @@ button { cursor: pointer; } +body { + overflow-x: hidden; +} + body:hover { cursor: default; } @@ -190,7 +198,6 @@ body:hover { -moz-user-select: none; /* Firefox */ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; /* Non-prefixed version, currently not supported by any browser */ - touch-action: none; } img { @@ -245,7 +252,6 @@ img { } .badge-not-acquired { - -webkit-filter: grayscale(70%) contrast(3%); /* Safari 6.0 - 9.0 */ filter: grayscale(70%) contrast(3%); } diff --git a/src/styles/map.less b/src/styles/map.less index 777e3b0fa2..1cd5c5963e 100644 --- a/src/styles/map.less +++ b/src/styles/map.less @@ -3,6 +3,7 @@ @locked: url(#mx-gradient-f8cecc-1-ea583b-1-s-0); @unlocked: #009a40; @currentPlace: #55ff00; +@incomplete: #e67e22; .currentRoute { fill: #55ff00; @@ -12,6 +13,10 @@ fill: #fcb612; } +.unlockedUnfinishedRoute { + fill: @incomplete; +} + .lockedRoute { fill: #c3242c; } @@ -44,7 +49,7 @@ g > text { stroke: #000000; &.unlockedDungeon { - fill: @unlocked; + fill: @incomplete; } &.completedDungeon { fill: #008f3a; diff --git a/src/styles/oakItem.less b/src/styles/oakItem.less index e70b5b2927..17d9fa4b55 100644 --- a/src/styles/oakItem.less +++ b/src/styles/oakItem.less @@ -10,6 +10,7 @@ } .oak-item-info { + margin: 0px -20px; .progress { position: relative; } diff --git a/src/styles/pokedex.less b/src/styles/pokedex.less index 8b0b5bcab7..2bafa5cd41 100644 --- a/src/styles/pokedex.less +++ b/src/styles/pokedex.less @@ -20,9 +20,13 @@ font-size: 14px; } - span:first-child::before { + span.id::before { content: '#'; } + + span.attack::before { + content: 'Attack: '; + } } .pokemon-not-seen { diff --git a/src/styles/prestige.less b/src/styles/prestige.less new file mode 100644 index 0000000000..78d82a92bc --- /dev/null +++ b/src/styles/prestige.less @@ -0,0 +1,58 @@ +.prestige-table { + width: 60% !important; + margin: auto; +} +.prestige-table td { + width: 14.2857143%; + position: relative; +} +.prestige-table td:after { + content: ''; + display: block; + margin-top: 100%; +} +.prestige-upgrade { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; +} + +.prestige-easy { + background-color: black; +} + +.prestige-medium { + background-color:white; +} + +.prestige-hard { + background-color:red; +} + +.prestige-locked { + background-color: #333; + z-index: 2; +} + +.prestige-reachable { + filter: opacity(70%); + z-index: 1; +} + +.prestige-coins { + width: 20px; +} + +.prestige-coin-0 { + filter: hue-rotate(30deg); +} + +.prestige-coin-1 { + filter: hue-rotate(200deg); +} + +.prestige-coin-2 { + filter: hue-rotate(300deg); +}