From ccc1f8eff5f6b2af9462645ccba93ea43e1eafca Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 17 Jan 2021 23:06:05 +0100 Subject: [PATCH] Small fixes --- UI/Base/Ornament.ts | 10 +++++----- .../bicycle_tube_vending_machine.json | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/UI/Base/Ornament.ts b/UI/Base/Ornament.ts index 2cbf759..3de8733 100644 --- a/UI/Base/Ornament.ts +++ b/UI/Base/Ornament.ts @@ -16,10 +16,10 @@ export default class Ornament extends UIElement { const self = this; this.onClick(() => { let c = Number(index.data); - if(isNaN(c)){ + if (isNaN(c)) { c = 0; } - self._index.setData(""+ ((c + 1) % (Ornament.ornamentsCount + 1))); + self._index.setData("" + ((c + 1) % (Ornament.ornamentsCount + 1))); }) } @@ -35,11 +35,11 @@ export default class Ornament extends UIElement { } InnerRender(): string { - if(this._index.data == "0"){ + const svg = Svg.All[`Ornament-Horiz-${Number(this._index.data) - 1}.svg`]; + if (this._index.data == "0" || svg === undefined) { return "" } - console.log(this._index.data) - return Svg.All[`Ornament-Horiz-${Number(this._index.data) - 1}.svg`] + return svg; } } \ No newline at end of file diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index 3b0b816..53018e3 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -133,8 +133,7 @@ "then": "Schwalbe tubes are sold here" } ], - "multiAnswer": true, - "condition": "operator!=Schwalbe" + "multiAnswer": true }, { "question": "Who maintains this vending machine?",