Skip to content

Commit 13549b5

Browse files
authored
fix(vitamins): Vitamin distribution fixes/tweaks (pokeclicker#5933)
* updates to vitamin distribution * remove vendor prefix styling --------- Co-authored-by: CypherX <672420+CypherX@users.noreply.github.com>
1 parent 3471664 commit 13549b5

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/components/pokemonVitaminExpandedModal.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,16 @@ <h5 class="modal-title text-light">Vitamins</h5>&nbsp; <button type="button" cla
131131
click: () => { $parent.removeVitamin($data, VitaminController.getMultiplier()) },
132132
class: ($parent.vitaminsUsed[$data]() > 0 && !$parent.breeding ? 'text-success' : 'text-muted')">-</button>
133133

134-
<knockout class="align-middle d-inline-block border border-secondary rounded" style="width: 2rem; overflow: hidden;" data-bind="text: $parent.vitaminsUsed[$data], event: {
135-
blur: (data, event) => { $parent.setVitaminAmount($data, +event.currentTarget.textContent); $parent.vitaminsUsed[$data].notifySubscribers(); window.getSelection().empty(); }
136-
}, attr: { contenteditable: $parent.breeding ? false : 'plaintext-only' }" tabindex="1" onfocus="window.getSelection().selectAllChildren(this)">0</knockout>
134+
<input type="number" class="vitamin-input form-control form-control-sm d-inline-block text-center p-0" style="width: 2rem; height: 1.5rem; overflow: hidden;" tabindex="1"
135+
min="0" onfocus="this.select()" onblur="window.getSelection().empty();"
136+
data-bind="value: $parent.vitaminsUsed[$data](), // the () here is intended, this creates a one-way binding
137+
disable: $parent.breeding,
138+
event: {
139+
change: (data, event) => {
140+
$parent.setVitaminAmount($data, +event.target.value);
141+
event.target.value = $parent.vitaminsUsed[$data](); // force input to update
142+
}
143+
}" />
137144

138145
<button type="button" class="btn btn-link btn-sm text-decoration-none align-text-top" tabindex="-1" style="line-height: 0.6; font-size: 1rem;"
139146
data-bind="

src/scripts/party/PartyPokemon.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,11 @@ class PartyPokemon implements Saveable, TmpPartyPokemonType {
342342
}
343343

344344
public setVitaminAmount(vitamin: GameConstants.VitaminType, amount: number) {
345-
if (this.breeding || isNaN(amount) || amount < 0) {
345+
if (this.breeding || isNaN(amount)) {
346346
return;
347347
}
348348

349+
amount = Math.max(0, amount);
349350
const diff = Math.floor(amount) - this.vitaminsUsed[vitamin]();
350351
if (diff === 0) {
351352
return;

src/styles/main.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,3 +846,12 @@ button.btn-circle {
846846
line-height: 30px;
847847
}
848848
}
849+
850+
.vitamin-input {
851+
appearance: textfield;
852+
853+
&::-webkit-inner-spin-button, &::-webkit-outer-spin-button {
854+
appearance: none;
855+
margin: 0;
856+
}
857+
}

0 commit comments

Comments
 (0)