fix: remove alchemicum identifier and instead add elixir identifier from database schema

This commit is contained in:
Lukas Obermann
2024-01-06 18:22:36 +01:00
parent 9845562391
commit 65a72f99c8
5 changed files with 2 additions and 16 deletions
@@ -27,8 +27,6 @@ export const InlineLibraryRouter: FC<Props> = ({ id }) => {
return <InlineLibraryPlaceholder />
case "Advantage":
return <InlineLibraryPlaceholder />
case "Alchemicum":
return <InlineLibraryPlaceholder />
case "Ammunition":
return <InlineLibraryPlaceholder />
case "AncestorGlyph":
-8
View File
@@ -17,7 +17,6 @@ const initialDatabaseState: DatabaseState = {
advancedMagicalSpecialAbilities: {},
advancedSkillSpecialAbilities: {},
advantages: {},
alchemicae: {},
ammunition: {},
ancestorGlyphs: {},
animalCare: {},
@@ -192,7 +191,6 @@ const databaseSlice = createSlice({
action.payload.database.raw.advancedSkillSpecialAbilities,
)
state.advantages = Object.fromEntries(action.payload.database.raw.advantages)
state.alchemicae = Object.fromEntries(action.payload.database.raw.alchemicae)
state.ammunition = Object.fromEntries(action.payload.database.raw.ammunition)
state.ancestorGlyphs = Object.fromEntries(action.payload.database.raw.ancestorGlyphs)
state.animalCare = Object.fromEntries(action.payload.database.raw.animalCare)
@@ -428,7 +426,6 @@ export const selectStaticAdvancedMagicalSpecialAbilities = (state: RootState) =>
export const selectStaticAdvancedSkillSpecialAbilities = (state: RootState) =>
state.database.advancedSkillSpecialAbilities
export const selectStaticAdvantages = (state: RootState) => state.database.advantages
export const selectStaticAlchemicae = (state: RootState) => state.database.alchemicae
export const selectStaticAmmunition = (state: RootState) => state.database.ammunition
export const selectStaticAncestorGlyphs = (state: RootState) => state.database.ancestorGlyphs
export const selectStaticAnimalCare = (state: RootState) => state.database.animalCare
@@ -634,7 +631,6 @@ export const selectAllAdvancedSkillSpecialAbilities = createSelector(
xs => Object.values(xs),
)
export const selectAllAdvantages = createSelector(selectStaticAdvantages, xs => Object.values(xs))
export const selectAllAlchemicae = createSelector(selectStaticAlchemicae, xs => Object.values(xs))
export const selectAllAmmunition = createSelector(selectStaticAmmunition, xs => Object.values(xs))
export const selectAllAncestorGlyphs = createSelector(selectStaticAncestorGlyphs, xs =>
Object.values(xs),
@@ -1022,10 +1018,6 @@ export const selectGetAdvantage = createSelector(
selectStaticAdvantages,
xs => (id: number) => xs[id],
)
export const selectGetAlchemicum = createSelector(
selectStaticAlchemicae,
xs => (id: number) => xs[id],
)
export const selectGetAmmunition = createSelector(
selectStaticAmmunition,
xs => (id: number) => xs[id],
@@ -9,7 +9,6 @@ export type DisplayableMainIdentifier =
| ID.AdvancedMagicalSpecialAbilityIdentifier
| ID.AdvancedSkillSpecialAbilityIdentifier
| ID.AdvantageIdentifier
| ID.AlchemicumIdentifier
| ID.AmmunitionIdentifier
| ID.AncestorGlyphIdentifier
| ID.AnimalCareIdentifier
-3
View File
@@ -50,7 +50,6 @@ import { config as talismanConfig } from "optolith-database-schema/types/Talisma
import { config as targetCategoryConfig } from "optolith-database-schema/types/TargetCategory"
import { config as uIConfig } from "optolith-database-schema/types/UI"
import { config as equipmentPackageConfig } from "optolith-database-schema/types/equipment/EquipmentPackage"
import { config as alchemicumConfig } from "optolith-database-schema/types/equipment/item/Alchemicum"
import { config as ammunitionConfig } from "optolith-database-schema/types/equipment/item/Ammunition"
import { config as animalConfig } from "optolith-database-schema/types/equipment/item/Animal"
import { config as animalCareConfig } from "optolith-database-schema/types/equipment/item/AnimalCare"
@@ -177,7 +176,6 @@ export namespace GetById {
export type AdvancedMagicalSpecialAbility = GetByIdFromConfig<typeof advancedMagicalSpecialAbilityConfig>
export type AdvancedSkillSpecialAbility = GetByIdFromConfig<typeof advancedSkillSpecialAbilityConfig>
export type Advantage = GetByIdFromConfig<typeof advantageConfig>
export type Alchemicum = GetByIdFromConfig<typeof alchemicumConfig>
export type Ammunition = GetByIdFromConfig<typeof ammunitionConfig>
export type AncestorGlyph = GetByIdFromConfig<typeof ancestorGlyphConfig>
export type AnimalCare = GetByIdFromConfig<typeof animalCareConfig>
@@ -336,7 +334,6 @@ export namespace GetAll {
export type AdvancedMagicalSpecialAbilities = GetAllFromConfig<typeof advancedMagicalSpecialAbilityConfig>
export type AdvancedSkillSpecialAbilities = GetAllFromConfig<typeof advancedSkillSpecialAbilityConfig>
export type Advantages = GetAllFromConfig<typeof advantageConfig>
export type Alchemicae = GetAllFromConfig<typeof alchemicumConfig>
export type Ammunition = GetAllFromConfig<typeof ammunitionConfig>
export type AncestorGlyphs = GetAllFromConfig<typeof ancestorGlyphConfig>
export type AnimalCare = GetAllFromConfig<typeof animalCareConfig>
+2 -2
View File
@@ -372,7 +372,6 @@ type TagPropertyOptions = {
Blessing: ID.BlessingIdentifier
LiturgicalChant: ID.LiturgicalChantIdentifier
Ceremony: ID.CeremonyIdentifier
Alchemicum: ID.AlchemicumIdentifier
Ammunition: ID.AmmunitionIdentifier
Animal: ID.AnimalIdentifier
AnimalCare: ID.AnimalCareIdentifier
@@ -382,6 +381,7 @@ type TagPropertyOptions = {
CeremonialItem: ID.CeremonialItemIdentifier
Clothes: ID.ClothesIdentifier
Container: ID.ContainerIdentifier
Elixir: ID.ElixirIdentifier
EquipmentOfBlessedOnes: ID.EquipmentOfBlessedOnesIdentifier
GemOrPreciousStone: ID.GemOrPreciousStoneIdentifier
IlluminationLightSource: ID.IlluminationLightSourceIdentifier
@@ -512,7 +512,6 @@ const TagPropertyMap: {
Blessing: id => ({ tag: "Blessing", blessing: id }),
LiturgicalChant: id => ({ tag: "LiturgicalChant", liturgical_chant: id }),
Ceremony: id => ({ tag: "Ceremony", ceremony: id }),
Alchemicum: id => ({ tag: "Alchemicum", alchemicum: id }),
Ammunition: id => ({ tag: "Ammunition", ammunition: id }),
Animal: id => ({ tag: "Animal", animal: id }),
AnimalCare: id => ({ tag: "AnimalCare", animal_care: id }),
@@ -522,6 +521,7 @@ const TagPropertyMap: {
CeremonialItem: id => ({ tag: "CeremonialItem", ceremonial_item: id }),
Clothes: id => ({ tag: "Clothes", clothes: id }),
Container: id => ({ tag: "Container", container: id }),
Elixir: id => ({ tag: "Elixir", elixir: id }),
EquipmentOfBlessedOnes: id => ({ tag: "EquipmentOfBlessedOnes", equipment_of_blessed_ones: id }),
GemOrPreciousStone: id => ({ tag: "GemOrPreciousStone", gem_or_precious_stone: id }),
IlluminationLightSource: id => ({