Skip to content

Commit d660d8e

Browse files
romaniac01romaniac01
committed
2024_10_27_update_starting_gear_info
1 parent 2f6cc6b commit d660d8e

File tree

10 files changed

+322
-241
lines changed

10 files changed

+322
-241
lines changed

‎api-types/Advisors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface Advisor {
4343
sellable: "true" | "false" // FIXME should be `boolean`
4444
tradeable: "true" | "false" // FIXME should be `boolean`
4545
destroyable: "true" | "false" // FIXME should be `boolean`
46-
civilization?: "Egypt" | "Greek" | "Celt" | "Persia" | "Norse" | "Babylonian"
46+
civilization?: "Egypt" | "Greek" | "Celt" | "Persia" | "Norse" | "Babylonian" | "Indian"
4747
shortdescriptionid?: string // FIXME should be `number`
4848
specialborder?: "true" // FIXME should be `boolean`
4949
}

‎db/items/convert.ts

+18-10
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import { convertLootTable } from "./convert-loot-table"
1212
import { buildSearchString } from "./search"
1313
import {
1414
getQuestName,
15-
isBabylonianStartingGear,
16-
isNorseStartingGear,
17-
isPersianStartingGear,
15+
isProStartingGear,
1816
isReforgeable,
1917
isStartingGear,
2018
isLevel40StartingGear,
@@ -56,9 +54,19 @@ export async function convertItem(trait: Trait): Promise<Item> {
5654
event: convertEvent(trait),
5755
lootTable: convertLootTable(trait),
5856
starting: [
59-
isPersianStartingGear(trait) && "persian",
60-
isBabylonianStartingGear(trait) && "babylonian",
61-
isNorseStartingGear(trait) && "norse",
57+
isProStartingGear(trait) && "persian",
58+
isProStartingGear(trait) && "babylonian",
59+
isProStartingGear(trait) && "norse",
60+
isProStartingGear(trait) && "indian",
61+
62+
isLevel40StartingGear(trait) && "greek",
63+
isLevel40StartingGear(trait) && "egyptian",
64+
isLevel40StartingGear(trait) && "celtic",
65+
isLevel40StartingGear(trait) && "persian",
66+
isLevel40StartingGear(trait) && "roman",
67+
isLevel40StartingGear(trait) && "babylonian",
68+
isLevel40StartingGear(trait) && "norse",
69+
isLevel40StartingGear(trait) && "indian",
6270
].filter(Boolean) as string[],
6371
visualfactor: visualfactor_text,
6472
search: "",
@@ -68,9 +76,9 @@ export async function convertItem(trait: Trait): Promise<Item> {
6876
if (trait.traittype.toLowerCase().startsWith("vanity")) {
6977
item.levels = [1]
7078
}
71-
if (isStartingGear(trait)) {
79+
/*if (isStartingGear(trait)) {
7280
item.levels = [20]
73-
}
81+
}*/
7482
}
7583

7684
if (!item.starting!.length) {
@@ -85,9 +93,9 @@ export async function convertItem(trait: Trait): Promise<Item> {
8593
if (item.effects) {
8694
item.effectsRange = isReforgeable(trait) || undefined
8795
}
88-
} else if (isStartingGear(trait)) {
96+
} else if (isProStartingGear(trait)) {
8997
if (item.effects) {
90-
item.effectsRange = !isStartingGear(trait) || undefined
98+
item.effectsRange = !isProStartingGear(trait) || undefined
9199
}
92100
} else if (isLevel40StartingGear(trait)) {
93101
if (item.effects) {

‎db/items/search.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ import {
1111
import { convertEvent } from "./convert-event"
1212

1313
import {
14-
isBabylonianStartingGear,
14+
isProStartingGear,
15+
isLevel40StartingGear,
1516
isClassicItem,
16-
isNorseStartingGear,
17-
isPersianStartingGear,
1817
isQuestReward,
1918
isReforgeable,
2019
isSoldByCouncilOfImhotep,
@@ -77,7 +76,7 @@ export async function buildSearchString(item: Item, trait: Trait): Promise<strin
7776
builder.add("Classic")
7877
} else {
7978
builder.add("Celeste")
80-
}
79+
}/*
8180
if (isBabylonianStartingGear(trait)) {
8281
builder.add("Babylonian Starting Gear")
8382
}
@@ -86,6 +85,12 @@ export async function buildSearchString(item: Item, trait: Trait): Promise<strin
8685
}
8786
if (isNorseStartingGear(trait)) {
8887
builder.add("Norse Starting Gear")
88+
}*/
89+
if (isProStartingGear(trait)) {
90+
builder.add("Pro Starting Gear")
91+
}
92+
if (isLevel40StartingGear(trait)) {
93+
builder.add("Level 40 Starting Gear")
8994
}
9095
if (item.lootTable) {
9196
builder.add(item.lootTable)

‎db/items/source.ts

+27-8
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const eventSummer2019 = [
123123
"se2019_spear1h",
124124
"se2019_scepter2h",
125125
]
126-
126+
/*
127127
const persianStartingGear = [
128128
"armorbldg_u201", "armorclth_r201", "armorlgt_r201", "armormed_r201",
129129
"armorplt_u201", "arrowoh_u201_vr", "ballista2h_u201_vr", "bow1h_u201",
@@ -145,7 +145,24 @@ const norseStartingGear = [
145145
"bow1h_u201", "firethrower2h_u201", "fishingnet1h_u201", "javalin2h_u201",
146146
"ramhead2h_u201", "scepter2h_u201", "shield1h_u201", "spear1h_u201",
147147
"spear2h_u201", "sword1h_u201", "tool1h_u201",
148+
]*/
149+
150+
const proStartingGear = [
151+
"armorbldg_u201", "armorclth_r201", "armorlgt_r201", "armormed_r201",
152+
"armorplt_u201", "arrowoh_u201_vr", "axe2h_u201", "ballista2h_u201_vr",
153+
"bow1h_u201", "firethrower2h_u201", "fishingnet1h_u201", "javalin2h_u201",
154+
"ramhead2h_u201", "scepter2h_u201", "shield1h_u201", "spear1h_u201",
155+
"spear2h_u201", "sword1h_u201", "tool1h_u201", "clubh_u201",
148156
]
157+
/*
158+
const level40StartingGear = [
159+
"arrowoh_r202", "axe2h_r202", "gear_siege_r202", "banner_r202", "warhorn_r202",
160+
"bellybow1h_r202", "bow1h_r202", "armormed_r202", "club2h_r202", "firethrower2h_r202",
161+
"armorlgt_r202", "tool1h_r202", "spear2h_r202", "gear_r202", "scout1h_r202",
162+
"javalin2h_r202", "spear1h_r202", "gear_bldg_los_r202", "merchant2h_r202",
163+
"fishingnet1h_r202", "armorplt_r202", "ramhead2h_r202", "armorbldg_r202",
164+
"gear_boat_r202", "",
165+
]*/
149166

150167
const eventReforgeIgnoreList = [
151168
"armorbldg_winter2021",
@@ -326,21 +343,23 @@ export function isReforgeable(trait: Trait) {
326343
export function isClassicItem(trait: Trait) {
327344
return trait.dbid < celesteLegendariesStart
328345
}
329-
346+
/*
330347
export function isPersianStartingGear(trait: Trait) {
331348
return persianStartingGear.includes(trait.name)
332349
}
333350
334351
export function isBabylonianStartingGear(trait: Trait) {
335-
return babylonianStartingGear.includes(trait.name)
352+
return trait.name.startsWith("_bahram")
336353
}
337354
338355
export function isNorseStartingGear(trait: Trait) {
339-
return norseStartingGear.includes(trait.name)
340-
}
356+
return proStartingGear.includes(trait.name)
357+
}*/
341358

359+
export function isProStartingGear(trait: Trait) {
360+
return proStartingGear.includes(trait.name)
361+
}
342362
export function isStartingGear(trait: Trait) {
343-
return isPersianStartingGear(trait)
344-
|| isBabylonianStartingGear(trait)
345-
|| isNorseStartingGear(trait)
363+
return isProStartingGear(trait)
364+
&& isLevel40StartingGear(trait)
346365
}

‎db/materials/currencies.ts

+20
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,26 @@ export const currencies = [
4747
resource: "Art/UserInterface/Icons/Buildings/AvatarMarket_ua",
4848
iconName: "market",
4949
},
50+
{
51+
resource: "Art/UserInterface/Avatar/RegionShieldC01_4_ua",
52+
iconName: "greek",
53+
},
54+
{
55+
resource: "Art/UserInterface/Avatar/RegionShieldC02_4_ua",
56+
iconName: "egyptian",
57+
},
58+
{
59+
resource: "Art/UserInterface/Avatar/RegionShieldC03_4_ua",
60+
iconName: "celtic",
61+
},
5062
{
5163
resource: "Art/UserInterface/Avatar/RegionShieldC04_4_ua",
5264
iconName: "persian",
5365
},
66+
{
67+
resource: "Art/UserInterface/Avatar/RegionShieldC05_4_ua",
68+
iconName: "roman",
69+
},
5470
{
5571
resource: "Art/UserInterface/Avatar/RegionShieldC06_4_ua",
5672
iconName: "babylonian",
@@ -59,6 +75,10 @@ export const currencies = [
5975
resource: "Art/UserInterface/Avatar/RegionShieldC07_4_ua",
6076
iconName: "norse",
6177
},
78+
{
79+
resource: "Art/UserInterface/Avatar/RegionShieldC08_4_ua",
80+
iconName: "indian",
81+
},
6282
{
6383
resource: "Art/UserInterface/Icons/Blueprints/BlueprintIcons_All/Blueprint_WorkshopSawmill_ua",
6484
iconName: "workshop-logger",

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

+40-16
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,48 @@
179179

180180
<!-- STARTING GEAR -->
181181
<div *ngIf="item.starting?.length">
182-
<div class="row --source">
183-
<span>
184-
Pro Civilization Starting Gear:
185-
</span>
182+
<div *ngIf="level < 21">
183+
<div class="row --source">
184+
<span>
185+
Pro Civilization Starting Gear:
186+
</span>
187+
</div>
188+
189+
<div class="row --materials">
190+
<ng-container *ngFor="let civ of item.starting">
191+
<div class="icon-materials-container">
192+
<span class="icon--materials icon--materials--{{ civ }}"></span>
193+
</div>
194+
<span>{{ civ | titlecase }}</span>
195+
<span></span><!-- wrap line -->
196+
<span></span><!-- wrap line -->
197+
<span></span><!-- wrap line -->
198+
<span></span><!-- wrap line -->
199+
<span></span><!-- wrap line -->
200+
</ng-container>
201+
</div>
186202
</div>
187203

188-
<div class="row --materials">
189-
<ng-container *ngFor="let civ of item.starting">
190-
<div class="icon-materials-container">
191-
<span class="icon--materials icon--materials--{{ civ }}"></span>
192-
</div>
193-
<span>{{ civ | titlecase }}</span>
194-
<span></span><!-- wrap line -->
195-
<span></span><!-- wrap line -->
196-
<span></span><!-- wrap line -->
197-
<span></span><!-- wrap line -->
198-
<span></span><!-- wrap line -->
199-
</ng-container>
204+
<div *ngIf="level > 22">
205+
<div class="row --source">
206+
<span>
207+
Level 40 Civilization Starting Gear:
208+
</span>
209+
</div>
210+
211+
<div class="row --materials">
212+
<ng-container *ngFor="let civ of item.starting">
213+
<div class="icon-materials-container">
214+
<span class="icon--materials icon--materials--{{ civ }}"></span>
215+
</div>
216+
<span>{{ civ | titlecase }}</span>
217+
<span></span><!-- wrap line -->
218+
<span></span><!-- wrap line -->
219+
<span></span><!-- wrap line -->
220+
<span></span><!-- wrap line -->
221+
<span></span><!-- wrap line -->
222+
</ng-container>
223+
</div>
200224
</div>
201225
</div>
202226

‎src/assets/db/items.json

+1-1
Large diffs are not rendered by default.

‎src/assets/sprites/materials.png

48.5 KB
Loading

0 commit comments

Comments
 (0)