Skip to content

Commit

Permalink
[v0.10.16] Live website
Browse files Browse the repository at this point in the history
  • Loading branch information
auto-deploy committed Nov 4, 2023
1 parent 2dc5305 commit 99653d4
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 4 deletions.
Binary file added docs/assets/images/items/pokemonItem/Sudowoodo (Golden).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/images/pokemon/185.01.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/images/shinypokemon/185.01.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/images/towns/National Park.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 27 additions & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ <h1 id="gameTitle">PokéClicker</h1>
<span id="animateCurrency-battlePoint" data-bind="text: Settings.getSetting('currencyMainDisplayReduced').observableValue() ? GameConstants.formatNumber(App.game.wallet.currencies[GameConstants.Currency.battlePoint]()) : App.game.wallet.currencies[GameConstants.Currency.battlePoint]().toLocaleString('en-US')">0</span>
</span>
</td>
<td class="col" data-bind="visible: Settings.getSetting('currencyMainDisplayExtended').observableValue() && PokemonContestController.requirements.isCompleted()">
<td class="col" data-bind="visible: Settings.getSetting('currencyMainDisplayExtended').observableValue() && (App.game.wallet.currencies[GameConstants.Currency.contestToken]() > 0)">
<span style="display: inline; position: relative;">
<img title="Contest Tokens&#013;&#010;Gained by competing in Contests" src="assets/images/currency/contestToken.svg" height="25px">
<span id="animateCurrency-contestToken" data-bind="text: Settings.getSetting('currencyMainDisplayReduced').observableValue() ? GameConstants.formatNumber(App.game.wallet.currencies[GameConstants.Currency.contestToken]()) : App.game.wallet.currencies[GameConstants.Currency.contestToken]().toLocaleString('en-US')">0</span>
Expand Down Expand Up @@ -8249,6 +8249,32 @@ <h5>Welcome to the Battle Frontier!</h5>



<!--National Park-->


<rect class="city"
data-town="National Park"
x="352"
y="232"
height="72"
width="96"
data-bind="
click:function(){MapHelper.moveToTown('National Park')},
attr: { class: MapHelper.calculateTownCssClass('National Park') },
">
</rect>

<image width="48" height="48"
x="376"
y="244"
class="iconLocation hide"
data-bind="visible: MapHelper.isTownCurrentLocation('National Park'),
attr: {href:`assets/images/profile/trainer-${App.game.profile.trainer() || 0}.png`},
playerSpriteMove">
</image>



<!--Ecruteak City-->


Expand Down
6 changes: 3 additions & 3 deletions docs/scripts/modules.min.js
View file

Large diffs are not rendered by default.

109 changes: 109 additions & 0 deletions docs/scripts/script.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26161,6 +26161,7 @@ ItemList['Goldeen (Diva)'] = new PokemonItem('Goldeen (Diva)', 500, Currency.con
ItemList['Onix (Rocker)'] = new PokemonItem('Onix (Rocker)', 1000, Currency.contestToken);
ItemList['Tangela (Pom-pom)'] = new PokemonItem('Tangela (Pom-pom)', 400, Currency.contestToken);
ItemList['Weepinbell (Fancy)'] = new PokemonItem('Weepinbell (Fancy)', 700, Currency.contestToken);
ItemList['Sudowoodo (Golden)'] = new PokemonItem('Sudowoodo (Golden)', 2000, Currency.contestToken);
ItemList['Pikachu (Rock Star)'] = new PokemonItem('Pikachu (Rock Star)', 1000, Currency.contestToken);
ItemList['Pikachu (Belle)'] = new PokemonItem('Pikachu (Belle)', 1000, Currency.contestToken);
ItemList['Pikachu (Pop Star)'] = new PokemonItem('Pikachu (Pop Star)', 1000, Currency.contestToken);
Expand Down Expand Up @@ -32620,6 +32621,8 @@ class Safari {
switch (player.region) {
case GameConstants.Region.kanto:
return new Amount(100, GameConstants.Currency.questPoint);
case GameConstants.Region.johto:
return new Amount(500, GameConstants.Currency.questPoint);
case GameConstants.Region.kalos:
return new Amount(1000, GameConstants.Currency.questPoint);
default:
Expand Down Expand Up @@ -33005,6 +33008,9 @@ document.addEventListener('DOMContentLoaded', () => {
case GameConstants.Region.kanto:
MapHelper.moveToTown('Safari Zone');
break;
case GameConstants.Region.johto:
MapHelper.moveToTown('National Park');
break;
case GameConstants.Region.kalos:
MapHelper.moveToTown('Friend Safari');
break;
Expand Down Expand Up @@ -33132,6 +33138,12 @@ class SafariBattle {
App.game.party.gainPokemonById(pokemonID, SafariBattle.enemy.shiny);
const partyPokemon = App.game.party.getPokemon(pokemonID);
partyPokemon.effortPoints += App.game.party.calculateEffortPoints(partyPokemon, SafariBattle.enemy.shiny, GameConstants.ShadowStatus.None, GameConstants.SAFARI_EP_YIELD);
const bugReward = Math.floor(partyPokemon.baseAttack / 5);
switch (player.region) {
case (GameConstants.Region.johto):
App.game.wallet.gainContestTokens(bugReward);
break;
}
if (!isgameOver) {
Safari.spawnItemCheck();
}
Expand Down Expand Up @@ -33729,6 +33741,23 @@ SafariItemController.list = {
{ item: { id: 'Exeggcute (Single)', type: ItemType.item }, weight: 0.25, requirement: new MultiRequirement([new SafariLevelRequirement(5), new ObtainedPokemonRequirement('Exeggcute')]) },
{ item: { id: 'Pinsirite', type: ItemType.item }, weight: 1, requirement: new MultiRequirement([new MaxRegionRequirement(GameConstants.Region.kalos), new ObtainedPokemonRequirement('Pinsir'), new SafariLevelRequirement(10)]) },
],
[GameConstants.Region.johto]: [
{ item: { id: 'Nestball', type: ItemType.item }, weight: 1 },
{ item: { id: 'Fastball', type: ItemType.item }, weight: 1 },
{ item: { id: 'Luxuryball', type: ItemType.item }, weight: 1 },
{ item: { id: 'MediumRestore', type: ItemType.item }, weight: 1 },
{ item: { id: 'LargeRestore', type: ItemType.item }, weight: 1 },
{ item: { id: 'Boost_Mulch', type: ItemType.item }, weight: 2 },
{ item: { id: 'Rich_Mulch', type: ItemType.item }, weight: 2 },
{ item: { id: 'Surprise_Mulch', type: ItemType.item }, weight: 2 },
{ item: { id: 'Amaze_Mulch', type: ItemType.item }, weight: 2 },
{ item: { id: 'Freeze_Mulch', type: ItemType.item }, weight: 2 },
{ item: { id: 'Berry_Shovel', type: ItemType.item }, weight: 1 },
{ item: { id: 'Mulch_Shovel', type: ItemType.item }, weight: 1 },
{ item: { id: 'Rare_Candy', type: ItemType.item }, weight: 1 },
{ item: { id: 'Sun Stone', type: ItemType.underground }, weight: 1 },
{ item: { id: 'Everstone', type: ItemType.underground }, weight: 1 },
],
[GameConstants.Region.kalos]: [
{ item: { id: 'Mago', type: ItemType.berry }, weight: 1.95 },
{ item: { id: 'Iapapa', type: ItemType.berry }, weight: 1.95 },
Expand Down Expand Up @@ -33856,6 +33885,7 @@ class SafariEncounter {
class SafariPokemonList {
static generateSafariLists() {
this.generateKantoSafariList();
this.generateJohtoSafariList();
this.generateKalosSafariList();
}
static generateKantoSafariList() {
Expand Down Expand Up @@ -33890,6 +33920,66 @@ class SafariPokemonList {
];
SafariPokemonList.list[GameConstants.Region.kanto](pokemon);
}
static generateJohtoSafariList() {
// Lower weighted pokemon will appear less frequently, equally weighted are equally likely to appear
// Unlocks new mons after being caught
const pokemon = [
// Grass
new SafariEncounter('Caterpie', 5),
new SafariEncounter('Metapod', 2),
new SafariEncounter('Butterfree', 1),
new SafariEncounter('Weedle', 5),
new SafariEncounter('Kakuna', 2),
new SafariEncounter('Beedrill', 1),
new SafariEncounter('Venonat', 3),
new SafariEncounter('Ledyba', 3),
new SafariEncounter('Spinarak', 3),
new SafariEncounter('Paras', 3),
new SafariEncounter('Scyther', 3),
new SafariEncounter('Pinsir', 2),
new SafariEncounter('Pineco', 3),
new SafariEncounter('Shuckle', 2),
new SafariEncounter('Wurmple', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Silcoon', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Beautifly', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Cascoon', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Dustox', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Masquerain', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Nincada', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Kricketot', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Kricketune', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Combee', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Vespiquen', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Yanmega', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Sewaddle', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Swadloon', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Leavanny', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Venipede', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Whirlipede', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Scolipede', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Dwebble', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Durant', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Scatterbug', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Spewpa', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Grubbin', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Charjabug', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Vikavolt', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Cutiefly', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Blipbug', 5, [SafariEnvironments.Grass], true),
new SafariEncounter('Dottler', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Orbeetle', 1, [SafariEnvironments.Grass], true),
new SafariEncounter('Sizzlipede', 2, [SafariEnvironments.Grass], true),
new SafariEncounter('Snom', 2, [SafariEnvironments.Grass], true),
// Water
new SafariEncounter('Yanma', 1, [SafariEnvironments.Water]),
new SafariEncounter('Surskit', 5, [SafariEnvironments.Water], true),
new SafariEncounter('Dewpider', 5, [SafariEnvironments.Water], true),
new SafariEncounter('Araquanid', 1, [SafariEnvironments.Water], true),
new SafariEncounter('Wimpod', 1, [SafariEnvironments.Water], true),
new SafariEncounter('Golisopod', 1, [SafariEnvironments.Water], true),
];
SafariPokemonList.list[GameConstants.Region.johto](pokemon);
}
static generateKalosSafariList() {
SeededRand.seed(+player.trainerId);
// Obtain the list of non-EVable pokemon and shuffle it
Expand Down Expand Up @@ -33937,6 +34027,7 @@ class SafariPokemonList {
}
SafariPokemonList.list = {
[GameConstants.Region.kanto]: ko.observableArray(),
[GameConstants.Region.johto]: ko.observableArray(),
[GameConstants.Region.kalos]: ko.observableArray(),
};
class SafariTownContent extends TownContent {
Expand Down Expand Up @@ -40287,6 +40378,10 @@ const JohtoBerryMaster = new BerryMasterShop(GameConstants.BerryTraderLocations[
ItemList.ShucaBerry,
ItemList.ChartiBerry,
], 'Johto Berry Master');
//Johto Contest Shop
const JohtoContestShop = new Shop([
ItemList['Sudowoodo (Golden)'],
], 'Contest Shop');
// Johto NPCs
const CherrygroveMrPokemon = new NPC('Mr. Pokémon', [
'Welcome to Johto! This is where the first ever Pokémon egg was found long ago.',
Expand Down Expand Up @@ -40546,6 +40641,16 @@ const HowardClifford3 = new NPC('Howard Clifford', [
image: 'assets/images/npcs/Howard Clifford.png',
requirement: new MultiRequirement([new QuestLineStepCompletedRequirement('Detective Pikachu', 13), new QuestLineStepCompletedRequirement('Detective Pikachu', 15, GameConstants.AchievementOption.less)]),
});
const ParkAttendant = new NPC('Park Attendant', [
'Welcome to the National Park!',
'Lots of people come through here to take a stroll, and some come from far away to participate in our Bug Catching Contest!',
'All kinds of Bug Pokémon can be found in the park, with different ones showing up every day! Each one can be caught for Contest Tokens, and more powerful Pokémon are worth more Tokens!',
], { image: 'assets/images/npcs/Pokémon Ranger (male).png' });
const ParkResearcher = new NPC('Researcher', [
'Welcome to the National Park!',
'Thanks to recent breakthroughs in the field of alloying and electroplating, we have discovered a way to coat some Pokémon in metal!',
'An experimental specimen can be bought here: A Sudowoodo that is no longer weak against Water attacks!',
], { image: 'assets/images/npcs/Scientist (male).png' });
//Johto Towns
TownList['New Bark Town'] = new Town('New Bark Town', GameConstants.Region.johto, GameConstants.JohtoSubRegions.Johto, [new BulletinBoard(GameConstants.BulletinBoards.Johto)], {
requirements: [new GymBadgeRequirement(BadgeEnums.Elite_KantoChampion)],
Expand Down Expand Up @@ -40596,6 +40701,10 @@ TownList['Indigo Plateau Johto'] = new Town('Indigo Plateau Johto', GameConstant
new TemporaryBattleRequirement('Silver 5'),
],
});
TownList['National Park'] = new Town('National Park', GameConstants.Region.johto, GameConstants.JohtoSubRegions.Johto, [new SafariTownContent(), JohtoContestShop], {
requirements: [new RouteKillRequirement(10, GameConstants.Region.johto, 35)],
npcs: [ParkAttendant, ParkResearcher],
});
//Johto Dungeons
TownList['Sprout Tower'] = new DungeonTown('Sprout Tower', GameConstants.Region.johto, GameConstants.JohtoSubRegions.Johto, [new RouteKillRequirement(10, GameConstants.Region.johto, 31)]);
TownList['Ruins of Alph'] = new DungeonTown('Ruins of Alph', GameConstants.Region.johto, GameConstants.JohtoSubRegions.Johto, [new RouteKillRequirement(10, GameConstants.Region.johto, 32)]);
Expand Down

0 comments on commit 99653d4

Please sign in to comment.