mmo-ref/stendhal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webclient: increase keyring capacity to 12 when "keyring_ext" feature...

Browse source 
...enabled. FIXME: keyring is 2x6 instead of 3x4.
This commit is contained in:
Jordan Irwin 2022-01-17 04:14:00 -08:00
parent f9cf87cdf1
commit 3cb9abf48f
2 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
srcjs/stendhal/ui/component/ItemInventoryComponent.ts
View file

@ -20,13 +20,14 @@ declare var stendhal: any;
export class ItemInventoryComponent extends Component {
private static counter = 0;
private itemContainerImplementation!: ItemContainerImplementation;
protected itemContainerImplementation!: ItemContainerImplementation;
protected suffix;
constructor(object: any, slot: string, sizeX: number, sizeY: number, quickPickup: boolean, defaultImage?: string) {
super("iteminventory-template");
ItemInventoryComponent.counter++;
let suffix = "." + ItemInventoryComponent.counter + ".";
this.suffix = "." + ItemInventoryComponent.counter + ".";
this.componentElement.classList.add("inventorypopup_" + sizeX);
if (quickPickup) {
this.componentElement.classList.add("quickPickup");
@ -35,13 +36,13 @@ export class ItemInventoryComponent extends Component {
// TODO: rewrite ItemContainerImplementation not to depend on unique ids (aka suffix)
let html = "";
for (let i = 0; i < sizeX * sizeY; i++) {
html += "<div id='" + slot + suffix + i + "' class='itemSlot'></div>";
html += "<div id='" + slot + this.suffix + i + "' class='itemSlot'></div>";
}
this.componentElement.innerHTML = html;
// ItemContainerImplementation uses document.getElementById, so our parent windows must be added to the DOM first.
queueMicrotask(() => {
this.itemContainerImplementation = new ItemContainerImplementation(slot, sizeX * sizeY, object, suffix, quickPickup, defaultImage);
this.itemContainerImplementation = new ItemContainerImplementation(slot, sizeX * sizeY, object, this.suffix, quickPickup, defaultImage);
stendhal.ui.equip.inventory.push(this.itemContainerImplementation);
});
}

41
srcjs/stendhal/ui/component/KeyringComponent.ts
View file

@ -9,23 +9,42 @@
* *
***************************************************************************/
import { ItemContainerImplementation } from "./ItemContainerImplementation";
import { ItemInventoryComponent } from "./ItemInventoryComponent";
declare var marauroa: any;
declare var stendhal: any;
export class KeyringComponent extends ItemInventoryComponent {
private object: any;
private slotName: string;
private quickPickup: boolean;
private defaultImage?: string;
private isExtended: boolean = false;
constructor(object: any, slot: string, sizeX: number, sizeY: number, quickPickup: boolean, defaultImage?: string) {
super(object, slot, sizeX, sizeY, quickPickup, defaultImage);
this.object = object;
this.slotName = slot;
this.quickPickup = quickPickup;
this.defaultImage = defaultImage;
}
override update() {
// FIXME: keyring visibility not updating
let features = null;
if (marauroa.me != null) {
features = marauroa.me["features"];
}
let keyringEnabled = false;
let extendedKeyring = false;
if (features != null) {
keyringEnabled = features["keyring"] != null;
extendedKeyring = features["keyring_ext"] != null;
}
if (keyringEnabled && !this.isVisible()) {
@ -34,6 +53,26 @@ export class KeyringComponent extends ItemInventoryComponent {
this.setVisible(false);
}
if (extendedKeyring && !this.isExtended) {
this.addExtendedSlots();
}
super.update();
}
private addExtendedSlots() {
// FIXME: keyring is 2x6 instead of 3x4
let html = this.componentElement.innerHTML;
for (let i = 8; i < 12; i++) {
html += "<div id='" + this.slotName + this.suffix + i + "' class='itemSlot'></div>";
}
this.componentElement.innerHTML = html;
this.isExtended = true;
queueMicrotask(() => {
this.itemContainerImplementation = new ItemContainerImplementation(this.slotName, 12, this.object, this.suffix, this.quickPickup, this.defaultImage);
stendhal.ui.equip.inventory.push(this.itemContainerImplementation);
});
}
}