Skip to content

Commit f55a116

Browse files
CypherXCypherX
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 70b8bd0 + 02a85eb commit f55a116

File tree

17 files changed

+97
-21
lines changed

17 files changed

+97
-21
lines changed

‎src/assets/images/pokemon/778.02.png‎

1.14 KB
Loading

‎src/assets/images/shinypokemon/778.02.png‎

1.1 KB
Loading

‎src/components/bulletinBoardModal.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ <h5 class="modal-title" id="bulletinBoardModalLabel">Bulletin Board</h5>
1313
<!-- ko foreach: $data -->
1414
<td class="col-md-3">
1515
<div class="text-left bulletin-paper card">
16-
<div class="card-footer">
16+
<div class="card-footer clickable" data-bind="click: () => { QuestLineController.showQuestLineDetailsModal($data) }">
1717
<h5 class="card-title m-0" data-bind="text: $data.displayName">Card title</h5>
1818
</div>
19-
<div class="card-body d-flex flex-column">
19+
<div class="card-body d-flex flex-column clickable" data-bind="click: () => { QuestLineController.showQuestLineDetailsModal($data) }">
2020
<p class="card-text flex-grow-1" data-bind="text: $data.description">Description</p>
2121
<!-- ko if: $data.state() == QuestLineState.suspended -->
2222
<div class="text-center text-muted small">

‎src/components/questLineDetailsModal.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<div class="modal noselect fade" id="questLineDetailsModal" tabindex="-1" role="dialog" aria-labelledby="questLineDetailsModalLabel">
2+
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
3+
<div class="modal-content" data-bind="with: QuestLineController.questLineObservable(), as: 'questLine'">
4+
<div class="modal-header align-items-center">
5+
<h4 class="m-0" data-bind="text: questLine.displayName"></h4>
6+
</div>
7+
<div class="modal-body p-0 p-md-2 p-lg-3">
8+
<table class="table table-striped table-bordered table-hover table-sm m-0">
9+
<tbody data-bind="foreach: questLine.quests()">
10+
<tr data-bind="css: { 'bg-info': (questLine.state() === QuestLineState.started || questLine.state() === QuestLineState.suspended) && $index() === questLine.curQuest() }">
11+
<td class="vertical-middle"><div class="px-2" data-bind="text: $index() + 1"></div></td>
12+
<td class="vertical-middle text-left">
13+
<div class="px-2" data-bind="text: ($index() <= questLine.curQuest() && questLine.state() !== QuestLineState.inactive) || questLine.state() === QuestLineState.ended ? $data.description : '???'"></div>
14+
</td>
15+
<td class="vertical-middle">
16+
<div class="px-2 text-nowrap">
17+
<span class="text-success" data-bind="if: questLine.state() === QuestLineState.ended || $index() < questLine.curQuest()">Completed</span>
18+
<span class="text-danger" data-bind="if: questLine.state() === QuestLineState.inactive || (questLine.state() !== QuestLineState.ended && $index() > questLine.curQuest())">Locked</span>
19+
<span data-bind="if: questLine.state() === QuestLineState.started && $index() === questLine.curQuest()">In progress</span>
20+
<span data-bind="if: questLine.state() === QuestLineState.suspended && $index() === questLine.curQuest()">Paused</span>
21+
</div>
22+
</td>
23+
</tr>
24+
</tbody>
25+
</table>
26+
</div>
27+
<div class="modal-footer">
28+
<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
29+
</div>
30+
</div>
31+
</div>
32+
</div>

‎src/components/questModal.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ <h5>
6868
</button>
6969
<span data-bind='visible: $data.inProgress() && !$data.isCompleted(), text: Math.floor(progress()*100) + "%"'></span>
7070
<button class='btn btn-secondary btn-sm btn-block' disabled data-bind='visible: $data.claimed()'>Completed</button>
71-
<button class='btn btn-success btn-sm btn-block' disabled data-bind='visible: $data.claimed()'>Completed</button>
7271
</td>
7372
</tr>
7473
</tbody>
@@ -96,11 +95,13 @@ <h6 class="m-0 text-light font-weight-bold">Active Quest Lines</h6>
9695
</thead>
9796
<tbody data-bind="foreach: $data.active">
9897
<tr>
99-
<td class="clickable" data-toggle="modal" href="#questDetailsModal" data-bind="click: () => { App.game.quests.selectedQuestName($data.name) }">
100-
<knockout class="font-weight-bold d-block" data-bind="text: $data.name"></knockout>
98+
<td class="clickable" data-bind="click: () => { QuestLineController.showQuestLineDetailsModal($data) }">
99+
<knockout class="font-weight-bold d-block" data-bind="text: $data.displayName"></knockout>
101100
<knockout class="small" data-bind="text: $data.description"></knockout>
102101
</td>
103-
<td class="text-nowrap align-middle text-center" data-bind="text: `${$data.curQuest() + 1} / ${$data.totalQuests}`"></td>
102+
<td class="clickable text-nowrap align-middle text-center" data-bind="
103+
text: `${$data.curQuest() + 1} / ${$data.totalQuests}`,
104+
click: () => { QuestLineController.showQuestLineDetailsModal($data) }"></td>
104105
<td class="align-middle text-center">
105106
<button type="button" class="btn btn-danger btn-sm" data-bind="click: () => { $data.suspendQuest() }, tooltip: {
106107
title: $data.pauseTooltip,
@@ -127,7 +128,7 @@ <h6 class="m-0 text-light font-weight-bold">Available Quest Lines</h6>
127128
</tr>
128129
</thead>
129130
<tbody data-bind="foreach: $data.available">
130-
<tr class="clickable" data-toggle="modal" href="#questDetailsModal" data-bind="click: () => { App.game.quests.selectedQuestName($data.name) }">
131+
<tr class="clickable" data-bind="click: () => { QuestLineController.showQuestLineDetailsModal($data) }">
131132
<td>
132133
<knockout class="font-weight-bold d-block" data-bind="text: $data.displayName"></knockout>
133134
<knockout class="small" data-bind="text: $data.description"></knockout>
@@ -144,7 +145,7 @@ <h6 class="m-0 text-light font-weight-bold">Complete Quest Lines</h6>
144145
</div>
145146
<table class="table table-striped table-bordered table-hover table-sm">
146147
<tbody data-bind="foreach: $data.complete">
147-
<tr class="clickable" data-toggle="modal" href="#questDetailsModal" data-bind="click: () => { App.game.quests.selectedQuestName($data.name) }">
148+
<tr class="clickable" data-bind="click: () => { QuestLineController.showQuestLineDetailsModal($data) }">
148149
<td>
149150
<knockout class="font-weight-bold d-block" data-bind="text: $data.displayName"></knockout>
150151
<knockout class="small" data-bind="text: $data.description"></knockout>

‎src/components/questStepClearedModal.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
aria-labelledby="questStepClearedModalLabel" aria-hidden="true">
33
<div class="modal-dialog modal-dialog-scrollable" role="document">
44
<div class="modal-content">
5-
<!-- ko if: Quest.questObservable()?.optionalArgs -->
5+
<!-- ko if: QuestLineController.questStepObservable()?.optionalArgs -->
66
<div class="modal-header">
77
<div style="width: 100%;">
88
<img src="" onerror="this.src='assets/images/npcs/specialNPCs/Mysterious Trainer.png'"
9-
data-bind="attr:{ src: Quest.questObservable().getNpcImage()}">
9+
data-bind="attr:{ src: QuestLineController.questStepObservable().getNpcImage()}">
1010
<h5 class="modal-title" id="questStepClearedModalLabel"
11-
data-bind="text: Quest.questObservable().getNpcDisplayName()">Modal title</h5>
11+
data-bind="text: QuestLineController.questStepObservable().getNpcDisplayName()">Modal title</h5>
1212

1313
</div>
1414
</div>
1515
<div class="modal-body">
16-
<p data-bind="html: TextMerger.mergeText(Quest.questObservable()?.getClearedMessage())"></p>
16+
<p data-bind="html: TextMerger.mergeText(QuestLineController.questStepObservable()?.getClearedMessage())"></p>
1717

1818
</div>
1919
<div class="modal-footer">

‎src/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ <h2 class="pageItemFooter" style="display: block; font-size: 1rem;">
535535
<!-- Moon Phase Modal -->
536536
@import "moonPhaseModal.html"
537537

538-
<!-- Quest Detail Modal -->
539-
@import "questDetailsModal.html"
538+
<!-- QuestLine Details Modal -->
539+
@import "questLineDetailsModal.html"
540540

541541
<script type="text/javascript">
542542
// Check if we are running in an iframe

‎src/modules/notifications/NotificationConstants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const NotificationConstants = {
2020
dream_orb: new Sound('dream_orb', 'Opening Dream Orb'),
2121
pokerus: new Sound('pokerus_resistant', 'Pokémon has become Resistant to Pokérus'),
2222
max_flow: new Sound('max_flow', 'Maximum Flow has accumulated at the Purify Chamber'),
23+
dungeon_guide_complete: new Sound('battle_frontier', 'Dungeon Guide has completed all dungeon attempts'),
2324
},
2425
Hatchery: {
2526
ready_to_hatch: new Sound('ready_to_hatch', 'Egg ready to hatch'),

‎src/modules/pokemons/PokemonList.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23939,6 +23939,23 @@ export const pokemonList = createPokemonArray(
2393923939
'speed': 106,
2394023940
},
2394123941
},
23942+
{
23943+
'id': 778.02,
23944+
'name': 'Mimikyu (Busted)',
23945+
'type': [PokemonType.Ghost, PokemonType.Fairy],
23946+
'eggCycles': 20,
23947+
'levelType': LevelType.mediumfast,
23948+
'exp': 167,
23949+
'catchRate': 45,
23950+
'base': {
23951+
'hitpoints': 55,
23952+
'attack': 90,
23953+
'specialAttack': 50,
23954+
'defense': 80,
23955+
'specialDefense': 105,
23956+
'speed': 96,
23957+
},
23958+
},
2394223959
{
2394323960
'id': 779,
2394423961
'name': 'Bruxish',

‎src/modules/pokemons/PokemonNameType.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,7 @@ export type PokemonNameType
12511251
| 'Totem Togedemaru'
12521252
| 'Mimikyu'
12531253
| 'Totem Mimikyu'
1254+
| 'Mimikyu (Busted)'
12541255
| 'Bruxish'
12551256
| 'Drampa'
12561257
| 'Dhelmise'

0 commit comments

Comments
 (0)