Skip to content

Commit 5784b28

Browse files
committed
Add Bahram's lottery
1 parent 9b813a2 commit 5784b28

18 files changed

Lines changed: 598 additions & 576 deletions

assets/Coin-Bahram.png

116 KB
Loading

db/items/convert-loot-table.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ export function convertLootTable(trait: Trait): string | undefined {
1010
return "skirmish hall"
1111
}
1212
}
13+
if (trait.name.endsWith("_bahram")) {
14+
return "bahram's lottery"
15+
}
1316
}

db/items/source.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ export function isEventReward(trait: Trait) {
203203
|| isHalloween2020Reward(trait)
204204
}
205205

206+
export function isBahramReward(trait: Trait) {
207+
return trait.name.endsWith("_bahram")
208+
}
209+
206210
/**
207211
* Only legendaries are reforgeable, so we only need to look
208212
* at a few items.
@@ -212,6 +216,7 @@ export function isReforgeable(trait: Trait) {
212216
&& !isSoldForCoin(trait)
213217
&& !isQuestReward(trait)
214218
&& !isEventReward(trait)
219+
&& !isBahramReward(trait)
215220
}
216221

217222
export function isClassicItem(trait: Trait) {

db/materials/currencies.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ export const currencies = [
3535
resource: "Art/UserInterface/Game_Modes/Booster02/TeamBlue",
3636
iconName: "skirmish_hall",
3737
},
38+
{
39+
resource: "local:assets/Coin-Bahram",
40+
iconName: "bahrams_lottery",
41+
},
3842
{
3943
resource: "Art/UserInterface/Icons/Buildings/AvatarMarket_ua",
4044
iconName: "market",

src/app/help/help.component.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
<p>All searches support sub-string matches and casing is ignored.</p>
2121
<p>Type <code>*</code>, <code>all</code>, <code>everything</code> or
22-
<code>anything</code> to get the entire catalog.<br><br></p>
22+
<code>anything</code> to get the entire catalog.<br><br>
23+
</p>
2324

2425
<details>
2526
<summary>Item — Properties</summary>
@@ -97,7 +98,7 @@
9798
<span>babylonian, persian, norse, starting gear</span>
9899

99100
<span>Loot table</span>
100-
<span>crete, crete-exclusive, skirmish, skirmish-exclusive</span>
101+
<span>crete, crete-exclusive, skirmish, skirmish-exclusive, bahram, bahram's lottery-exclusive</span>
101102
</div>
102103
</details>
103104

src/app/results/advisor/advisor.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<div *ngIf="advisor.lootTable">
3939
<div class="row --loot-table">
4040
<div class="icon-materials-container">
41-
<span class="icon--materials icon--materials--{{ advisor.lootTable.replace(' ', '_') }}"></span>
41+
<span
42+
class="icon--materials icon--materials--{{ advisor.lootTable.replace(' ', '_').replace('\'', '') }}"></span>
4243
</div>
4344
<span *ngIf="advisor.lootTable">
4445
Exclusive to <strong>{{ advisor.lootTable | titlecase }}</strong>

src/app/results/blueprint/blueprint.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
<div *ngIf="blueprint.lootTable">
5252
<div class="row --loot-table">
5353
<div class="icon-materials-container">
54-
<span class="icon--materials icon--materials--{{ blueprint.lootTable.replace(' ', '_') }}"></span>
54+
<span
55+
class="icon--materials icon--materials--{{ blueprint.lootTable.replace(' ', '_').replace('\'', '') }}"></span>
5556
</div>
5657
<span *ngIf="blueprint.lootTable">
5758
Exclusive to <strong>{{ blueprint.lootTable | titlecase }}</strong>

src/app/results/design/design.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<div *ngIf="design.lootTable">
4848
<div class="row --loot-table">
4949
<div class="icon-materials-container">
50-
<span class="icon--materials icon--materials--{{ design.lootTable.replace(' ', '_') }}"></span>
50+
<span
51+
class="icon--materials icon--materials--{{ design.lootTable.replace(' ', '_').replace('\'', '') }}"></span>
5152
</div>
5253
<span *ngIf="design.lootTable">
5354
Exclusive to <strong>{{ design.lootTable | titlecase }}</strong>

src/app/results/item/item.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<div *ngIf="item.lootTable">
110110
<div class="row --loot-table">
111111
<div class="icon-materials-container">
112-
<span class="icon--materials icon--materials--{{ item.lootTable.replace(' ', '_') }}"></span>
112+
<span class="icon--materials icon--materials--{{ item.lootTable.replace(' ', '_').replace('\'', '') }}"></span>
113113
</div>
114114
<span *ngIf="item.lootTable">
115115
Exclusive to <strong>{{ item.lootTable | titlecase }}</strong>

src/app/results/material/material.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<div *ngIf="material.lootTable">
2424
<div class="row --loot-table">
2525
<div class="icon-materials-container">
26-
<span class="icon--materials icon--materials--{{ material.lootTable.replace(' ', '_') }}"></span>
26+
<span
27+
class="icon--materials icon--materials--{{ material.lootTable.replace(' ', '_').replace('\'', '') }}"></span>
2728
</div>
2829
<span *ngIf="material.lootTable">
2930
Exclusive to <strong>{{ material.lootTable | titlecase }}</strong>

0 commit comments

Comments
 (0)