optolith-database-schema 0.40.0 → 0.42.0

package/lib/types/_IdentifierGroup.js

@@ -1,5 +1,5 @@
 import * as DB from "tsondb/schema/dsl";
-import { AdvancedCombatSpecialAbilityIdentifier, AdvancedKarmaSpecialAbilityIdentifier, AdvancedMagicalSpecialAbilityIdentifier, AdvancedSkillSpecialAbilityIdentifier, AdvantageIdentifier, AmmunitionIdentifier, AncestorGlyphIdentifier, AnimalCareIdentifier, AnimalIdentifier, AnimalShapeIdentifier, AnimalShapeSizeIdentifier, AnimistPowerIdentifier, ArcaneBardTraditionIdentifier, ArcaneDancerTraditionIdentifier, ArcaneOrbEnchantmentIdentifier, ArmorIdentifier, AspectIdentifier, AttireEnchantmentIdentifier, AttributeIdentifier, BandageOrRemedyIdentifier, BeutelzauberIdentifier, BlessedTraditionIdentifier, BlessingIdentifier, BookIdentifier, BowlEnchantmentIdentifier, BrawlingSpecialAbilityIdentifier, CantripIdentifier, CauldronEnchantmentIdentifier, CeremonialItemIdentifier, CeremonialItemSpecialAbilityIdentifier, CeremonyIdentifier, ChronicleEnchantmentIdentifier, CloseCombatTechniqueIdentifier, ClothesIdentifier, ClothingPackageIdentifier, CombatSpecialAbilityIdentifier, CombatStyleSpecialAbilityIdentifier, CommandSpecialAbilityIdentifier, ContainerIdentifier, CultureIdentifier, CurseIdentifier, DaggerRitualIdentifier, DisadvantageIdentifier, DiseaseIdentifier, DominationRitualIdentifier, ElementIdentifier, ElixirIdentifier, ElvenMagicalSongIdentifier, EquipmentOfBlessedOnesIdentifier, FamiliarSpecialAbilityIdentifier, FatePointSexSpecialAbilityIdentifier, FatePointSpecialAbilityIdentifier, FocusRuleIdentifier, FoolsHatEnchantmentIdentifier, GemOrPreciousStoneIdentifier, GeneralIdentifier, GeneralSpecialAbilityIdentifier, GeodeRitualIdentifier, HaubenzauberIdentifier, IlluminationLightSourceIdentifier, IlluminationRefillOrSupplyIdentifier, InstrumentEnchantmentIdentifier, JesterTrickIdentifier, JewelryIdentifier, KarmaSpecialAbilityIdentifier, KrallenkettenzauberIdentifier, KristallkugelzauberIdentifier, LaboratoryIdentifier, LanguageIdentifier, LiebesspielzeugIdentifier, LiturgicalChantIdentifier, LiturgicalStyleSpecialAbilityIdentifier, LuxuryGoodIdentifier, LycantropicGiftIdentifier, MagicalArtifactIdentifier, MagicalDanceIdentifier, MagicalMelodyIdentifier, MagicalRuneIdentifier, MagicalSignIdentifier, MagicalSpecialAbilityIdentifier, MagicalTraditionIdentifier, MagicStyleSpecialAbilityIdentifier, MusicalInstrumentIdentifier, NewspaperIdentifier, OptionalRuleIdentifier, OrbEnchantmentIdentifier, OrienteeringAidIdentifier, PactGiftIdentifier, PatronIdentifier, PoisonIdentifier, PropertyIdentifier, ProtectiveWardingCircleSpecialAbilityIdentifier, RaceIdentifier, RangedCombatTechniqueIdentifier, RingEnchantmentIdentifier, RitualIdentifier, RopeOrChainIdentifier, ScriptIdentifier, SermonIdentifier, SexPracticeIdentifier, SexSpecialAbilityIdentifier, SickleRitualIdentifier, SikaryanDrainSpecialAbilityIdentifier, SkillApplicationIdentifier, SkillIdentifier, SkillStyleSpecialAbilityIdentifier, SpellIdentifier, SpellSwordEnchantmentIdentifier, StaffEnchantmentIdentifier, StationeryIdentifier, TargetCategoryIdentifier, ThievesToolIdentifier, ToolOfTheTradeIdentifier, ToyEnchantmentIdentifier, TradeSecretIdentifier, TravelGearOrToolIdentifier, TrinkhornzauberIdentifier, VampiricGiftIdentifier, VehicleIdentifier, VisionIdentifier, WandEnchantmentIdentifier, WeaponAccessoryIdentifier, WeaponEnchantmentIdentifier, WeaponIdentifier, WorkingSupernaturalCreatureIdentifier, ZibiljaRitualIdentifier, } from "./_Identifier.js";
+import { AdvancedCombatSpecialAbilityIdentifier, AdvancedKarmaSpecialAbilityIdentifier, AdvancedMagicalSpecialAbilityIdentifier, AdvancedSkillSpecialAbilityIdentifier, AdvantageIdentifier, AmmunitionIdentifier, AncestorGlyphIdentifier, AnimalCareIdentifier, AnimalIdentifier, AnimalShapeIdentifier, AnimalShapeSizeIdentifier, AnimistPowerIdentifier, ArcaneBardTraditionIdentifier, ArcaneDancerTraditionIdentifier, ArcaneOrbEnchantmentIdentifier, ArmorIdentifier, AspectIdentifier, AttireEnchantmentIdentifier, AttributeIdentifier, BandageOrRemedyIdentifier, BeutelzauberIdentifier, BlessedTraditionIdentifier, BlessingIdentifier, BookIdentifier, BowlEnchantmentIdentifier, BrawlingSpecialAbilityIdentifier, CantripIdentifier, CauldronEnchantmentIdentifier, CeremonialItemIdentifier, CeremonialItemSpecialAbilityIdentifier, CeremonyIdentifier, ChronicleEnchantmentIdentifier, CloseCombatTechniqueIdentifier, ClothesIdentifier, ClothingPackageIdentifier, CombatSpecialAbilityIdentifier, CombatStyleSpecialAbilityIdentifier, CommandSpecialAbilityIdentifier, ContainerIdentifier, CultureIdentifier, CurseIdentifier, DaggerRitualIdentifier, DisadvantageIdentifier, DiseaseIdentifier, DominationRitualIdentifier, ElementIdentifier, ElixirIdentifier, ElvenMagicalSongIdentifier, EnhancementIdentifier, EquipmentOfBlessedOnesIdentifier, FamiliarSpecialAbilityIdentifier, FatePointSexSpecialAbilityIdentifier, FatePointSpecialAbilityIdentifier, FocusRuleIdentifier, FoolsHatEnchantmentIdentifier, GemOrPreciousStoneIdentifier, GeneralIdentifier, GeneralSpecialAbilityIdentifier, GeodeRitualIdentifier, HaubenzauberIdentifier, IlluminationLightSourceIdentifier, IlluminationRefillOrSupplyIdentifier, InstrumentEnchantmentIdentifier, JesterTrickIdentifier, JewelryIdentifier, KarmaSpecialAbilityIdentifier, KrallenkettenzauberIdentifier, KristallkugelzauberIdentifier, LaboratoryIdentifier, LanguageIdentifier, LiebesspielzeugIdentifier, LiturgicalChantIdentifier, LiturgicalStyleSpecialAbilityIdentifier, LuxuryGoodIdentifier, LycantropicGiftIdentifier, MagicalArtifactIdentifier, MagicalDanceIdentifier, MagicalMelodyIdentifier, MagicalRuneIdentifier, MagicalSignIdentifier, MagicalSpecialAbilityIdentifier, MagicalTraditionIdentifier, MagicStyleSpecialAbilityIdentifier, MusicalInstrumentIdentifier, NewspaperIdentifier, OptionalRuleIdentifier, OrbEnchantmentIdentifier, OrienteeringAidIdentifier, PactGiftIdentifier, PatronIdentifier, PoisonIdentifier, PropertyIdentifier, ProtectiveWardingCircleSpecialAbilityIdentifier, RaceIdentifier, RangedCombatTechniqueIdentifier, RingEnchantmentIdentifier, RitualIdentifier, RopeOrChainIdentifier, ScriptIdentifier, SermonIdentifier, SexPracticeIdentifier, SexSpecialAbilityIdentifier, SickleRitualIdentifier, SikaryanDrainSpecialAbilityIdentifier, SkillApplicationIdentifier, SkillIdentifier, SkillStyleSpecialAbilityIdentifier, SpellIdentifier, SpellSwordEnchantmentIdentifier, StaffEnchantmentIdentifier, StationeryIdentifier, TargetCategoryIdentifier, ThievesToolIdentifier, ToolOfTheTradeIdentifier, ToyEnchantmentIdentifier, TradeSecretIdentifier, TravelGearOrToolIdentifier, TrinkhornzauberIdentifier, VampiricGiftIdentifier, VehicleIdentifier, VisionIdentifier, WandEnchantmentIdentifier, WeaponAccessoryIdentifier, WeaponEnchantmentIdentifier, WeaponIdentifier, WorkingSupernaturalCreatureIdentifier, ZibiljaRitualIdentifier, } from "./_Identifier.js";
 export const ActivatableIdentifier = DB.Enum(import.meta.url, {
     name: "ActivatableIdentifier",
     values: () => ({
@@ -98,6 +98,13 @@ export const CombatRelatedSpecialAbilityIdentifier = DB.Enum(import.meta.url, {
         CommandSpecialAbility: DB.EnumCase({ type: CommandSpecialAbilityIdentifier() }),
     }),
 });
+export const ProfessionSpecialAbilityIdentifier = DB.Enum(import.meta.url, {
+    name: "ProfessionSpecialAbilityIdentifier",
+    values: () => ({
+        ...SpecialAbilityIdentifier.type.value.values,
+        Enhancement: DB.EnumCase({ type: EnhancementIdentifier() }),
+    }),
+});
 export const TraditionIdentifier = DB.Enum(import.meta.url, {
     name: "TraditionIdentifier",
     values: () => ({
@@ -308,6 +315,13 @@ export const EquipmentIdentifier = DB.Enum(import.meta.url, {
         WorkingSupernaturalCreature: DB.EnumCase({ type: WorkingSupernaturalCreatureIdentifier() }),
     }),
 });
+export const AmmunitionishIdentifier = DB.Enum(import.meta.url, {
+    name: "AmmunitionishIdentifier",
+    values: () => ({
+        Ammunition: DB.EnumCase({ type: AmmunitionIdentifier() }),
+        Weapon: DB.EnumCase({ type: WeaponIdentifier() }),
+    }),
+});
 export const AdvancedSkillStyleSpecialAbilityIdentifier = DB.Enum(import.meta.url, {
     name: "AdvancedSkillStyleSpecialAbilityIdentifier",
     values: () => ({

package/lib/types/equipment/item/BandageOrRemedy.d.ts

@@ -46,7 +46,7 @@ export declare const BandageOrRemedy: DB.Entity<"BandageOrRemedy", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const BandageOrRemedy: DB.Entity<"BandageOrRemedy", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/CeremonialItem.d.ts

@@ -28,7 +28,7 @@ export declare const CeremonialItem: DB.Entity<"CeremonialItem", {
     }, []>>, false>;
     structure_points: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"StructurePoints", DB.Array<DB.IncludeIdentifier<[], DB.TypeAlias<"StructurePointsComponent", DB.Object<{
         points: DB.MemberDecl<DB.Integer, true>;
-    }>, []>>>, []>>, true>;
+    }>, []>>>, []>>, false>;
     associated_tradition: DB.MemberDecl<DB.ReferenceIdentifier, true>;
     combat_use: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CombatUse", {
         Weapon: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ImprovisedWeapon", DB.Object<{
@@ -47,7 +47,7 @@ export declare const CeremonialItem: DB.Entity<"CeremonialItem", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -70,7 +70,10 @@ export declare const CeremonialItem: DB.Entity<"CeremonialItem", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/CeremonialItem.js

@@ -19,7 +19,7 @@ export const CeremonialItem = DB.Entity(import.meta.url, {
             comment: "The complexity of crafting the item.",
             type: DB.IncludeIdentifier(Complexity),
         }),
-        structure_points: DB.Required({
+        structure_points: DB.Optional({
             comment: "The structure points of the item. Use an array if the item consists of multiple components that have individual structure points.",
             type: DB.IncludeIdentifier(StructurePoints),
         }),

package/lib/types/equipment/item/Clothes.d.ts

@@ -46,7 +46,7 @@ export declare const Clothes: DB.Entity<"Clothes", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const Clothes: DB.Entity<"Clothes", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/Container.d.ts

@@ -46,7 +46,7 @@ export declare const Container: DB.Entity<"Container", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const Container: DB.Entity<"Container", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/Elixir.d.ts

@@ -95,10 +95,25 @@ export declare const Elixir: DB.Entity<"Elixir", {
         }>, []>>>, false>;
         typical_ingredients: DB.MemberDecl<DB.Array<DB.String>, true>;
         brewing_process_prerequisites: DB.MemberDecl<DB.String, false>;
-        quality_levels: DB.MemberDecl<DB.Array<DB.String>, true>;
+        quality_levels: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ElixirEffect", {
+            Plain: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ElixirPlainEffect", DB.Object<{
+                text: DB.MemberDecl<DB.String, true>;
+            }>, []>>>;
+            ForEachQualityLevel: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ElixirEffectForEachQualityLevel", DB.Object<{
+                qualityLevels: DB.MemberDecl<DB.Array<DB.String>, true>;
+            }>, []>>>;
+        }, []>>, true>;
         errata: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Errata", DB.Array<DB.IncludeIdentifier<[], DB.TypeAlias<"Erratum", DB.Object<{
             date: DB.MemberDecl<DB.Date, true>;
             description: DB.MemberDecl<DB.String, true>;
         }>, []>>>, []>>, false>;
     }>, true>;
 }, undefined>;
+export declare const ElixirEffect: DB.Enum<"ElixirEffect", {
+    Plain: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ElixirPlainEffect", DB.Object<{
+        text: DB.MemberDecl<DB.String, true>;
+    }>, []>>>;
+    ForEachQualityLevel: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ElixirEffectForEachQualityLevel", DB.Object<{
+        qualityLevels: DB.MemberDecl<DB.Array<DB.String>, true>;
+    }>, []>>>;
+}, []>;

package/lib/types/equipment/item/Elixir.js

@@ -59,11 +59,8 @@ export const Elixir = DB.Entity(import.meta.url, {
                 type: DB.String({ minLength: 1, markdown: "block" }),
             }),
             quality_levels: DB.Required({
-                comment: "The list of effects for each quality level. The first element represents QL 1, the second element QL 2, and so on.",
-                type: DB.Array(DB.String({ minLength: 1, markdown: "block" }), {
-                    minItems: 6,
-                    maxItems: 6,
-                }),
+                comment: "The effect description may be either a plain text or a text that is divided by a list of effects for each quality level.",
+                type: DB.IncludeIdentifier(ElixirEffect),
             }),
             errata: DB.Optional({
                 type: DB.IncludeIdentifier(Errata),
@@ -78,3 +75,36 @@ export const Elixir = DB.Entity(import.meta.url, {
         },
     ],
 });
+export const ElixirEffect = DB.Enum(import.meta.url, {
+    name: "ElixirEffect",
+    comment: "The effect description may be either a plain text or a text that is divided by a list of effects for each quality level.",
+    values: () => ({
+        Plain: DB.EnumCase({
+            type: DB.IncludeIdentifier(ElixirPlainEffect),
+        }),
+        ForEachQualityLevel: DB.EnumCase({
+            type: DB.IncludeIdentifier(ElixirEffectForEachQualityLevel),
+        }),
+    }),
+});
+const ElixirPlainEffect = DB.TypeAlias(import.meta.url, {
+    name: "ElixirPlainEffect",
+    type: () => DB.Object({
+        text: DB.Required({
+            comment: "The effect description.",
+            type: DB.String({ minLength: 1, markdown: "block" }),
+        }),
+    }),
+});
+const ElixirEffectForEachQualityLevel = DB.TypeAlias(import.meta.url, {
+    name: "ElixirEffectForEachQualityLevel",
+    type: () => DB.Object({
+        qualityLevels: DB.Required({
+            comment: "The list of effects for each quality level. The first element represents QL 1, the second element QL 2, and so on.",
+            type: DB.Array(DB.String({ minLength: 1, markdown: "block" }), {
+                minItems: 6,
+                maxItems: 6,
+            }),
+        }),
+    }),
+});

package/lib/types/equipment/item/EquipmentOfBlessedOnes.d.ts

@@ -60,7 +60,7 @@ export declare const EquipmentOfBlessedOnes: DB.Entity<"EquipmentOfBlessedOnes",
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -83,7 +83,10 @@ export declare const EquipmentOfBlessedOnes: DB.Entity<"EquipmentOfBlessedOnes",
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/IlluminationLightSource.d.ts

@@ -55,7 +55,7 @@ export declare const IlluminationLightSource: DB.Entity<"IlluminationLightSource
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -78,7 +78,10 @@ export declare const IlluminationLightSource: DB.Entity<"IlluminationLightSource
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/IlluminationRefillOrSupply.d.ts

@@ -46,7 +46,7 @@ export declare const IlluminationRefillOrSupply: DB.Entity<"IlluminationRefillOr
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const IlluminationRefillOrSupply: DB.Entity<"IlluminationRefillOr
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/Liebesspielzeug.d.ts

@@ -46,7 +46,7 @@ export declare const Liebesspielzeug: DB.Entity<"Liebesspielzeug", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const Liebesspielzeug: DB.Entity<"Liebesspielzeug", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/LuxuryGood.d.ts

@@ -46,7 +46,7 @@ export declare const LuxuryGood: DB.Entity<"LuxuryGood", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const LuxuryGood: DB.Entity<"LuxuryGood", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/MagicalArtifact.d.ts

@@ -46,7 +46,7 @@ export declare const MagicalArtifact: DB.Entity<"MagicalArtifact", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const MagicalArtifact: DB.Entity<"MagicalArtifact", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/MusicalInstrument.d.ts

@@ -46,7 +46,7 @@ export declare const MusicalInstrument: DB.Entity<"MusicalInstrument", {
                 }, []>>, false>;
                 attackModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"AttackModifier", DB.Integer, []>>, false>;
                 parryModifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ParryModifier", DB.Integer, []>>, false>;
-                reach: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                reach: DB.MemberDecl<DB.Array<DB.ReferenceIdentifier>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 size: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"ShieldSize", {
                     Small: DB.EnumCase<null>;
@@ -69,7 +69,10 @@ export declare const MusicalInstrument: DB.Entity<"MusicalInstrument", {
                     medium: DB.MemberDecl<DB.Integer, true>;
                     far: DB.MemberDecl<DB.Integer, true>;
                 }>, []>>, true>;
-                ammunition: DB.MemberDecl<DB.ReferenceIdentifier, false>;
+                ammunition: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"AmmunitionishIdentifier", {
+                    Ammunition: DB.EnumCase<DB.ReferenceIdentifier>;
+                    Weapon: DB.EnumCase<DB.ReferenceIdentifier>;
+                }, []>>, false>;
                 length: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Length", DB.Integer, []>>, false>;
                 is_improvised_weapon: DB.MemberDecl<DB.Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/OrienteeringAid.d.ts

@@ -45,7 +45,7 @@ export declare const OrienteeringAid: import("tsondb/schema/dsl").Entity<string,
                 }, []>>, false>;
                 attackModifier: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").TypeAlias<"AttackModifier", import("tsondb/schema/dsl").Integer, []>>, false>;
                 parryModifier: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").TypeAlias<"ParryModifier", import("tsondb/schema/dsl").Integer, []>>, false>;
-                reach: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").ReferenceIdentifier, false>;
+                reach: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").Array<import("tsondb/schema/dsl").ReferenceIdentifier>, false>;
                 length: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").TypeAlias<"Length", import("tsondb/schema/dsl").Integer, []>>, false>;
                 size: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").Enum<"ShieldSize", {
                     Small: import("tsondb/schema/dsl").EnumCase<null>;
@@ -68,7 +68,10 @@ export declare const OrienteeringAid: import("tsondb/schema/dsl").Entity<string,
                     medium: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").Integer, true>;
                     far: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").Integer, true>;
                 }>, []>>, true>;
-                ammunition: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").ReferenceIdentifier, false>;
+                ammunition: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").Enum<"AmmunitionishIdentifier", {
+                    Ammunition: import("tsondb/schema/dsl").EnumCase<import("tsondb/schema/dsl").ReferenceIdentifier>;
+                    Weapon: import("tsondb/schema/dsl").EnumCase<import("tsondb/schema/dsl").ReferenceIdentifier>;
+                }, []>>, false>;
                 length: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").IncludeIdentifier<[], import("tsondb/schema/dsl").TypeAlias<"Length", import("tsondb/schema/dsl").Integer, []>>, false>;
                 is_improvised_weapon: import("tsondb/schema/dsl").MemberDecl<import("tsondb/schema/dsl").Boolean, true>;
             }>, false>;

package/lib/types/equipment/item/Poison.d.ts

@@ -20,33 +20,37 @@ export declare const Poison: DB.Entity<"Poison", {
                 }>>, []>>>;
             }, []>>, true>;
             is_extractable: DB.MemberDecl<DB.Boolean, true>;
-            trade_secret: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"RecipeTradeSecret", DB.Object<{
-                ap_value: DB.MemberDecl<DB.Integer, true>;
-                prerequisites: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"PlainGeneralPrerequisites", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PlainPrerequisites", DB.Array<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.Enum<"PrerequisitesElement", {
-                    Single: DB.EnumCase<DB.TypeArgument<DB.Param<"T", DB.Type>>>;
-                    Disjunction: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisitesDisjunction", DB.Object<{
-                        list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
-                        display_option: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DisplayOption", {
-                            Hide: DB.EnumCase<null>;
-                            ReplaceWith: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ReplacementDisplayOption", DB.Object<{
-                                sentence_type: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"SentenceType", {
-                                    Standalone: DB.EnumCase<null>;
-                                    Connected: DB.EnumCase<null>;
-                                }, []>>, false>;
-                                translations: DB.MemberDecl<DB.NestedEntityMap<"ReplacementDisplayOptionTranslation", {
-                                    replacement: DB.MemberDecl<DB.String, true>;
-                                }>, true>;
-                            }>, []>>>;
-                        }, []>>, false>;
-                    }>, [T: DB.Param<"T", DB.Type>]>>>;
-                    Group: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisiteGroup", DB.Object<{
-                        list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
-                        translations: DB.MemberDecl<DB.NestedEntityMap<"PrerequisiteGroupTranslation", {
-                            text: DB.MemberDecl<DB.String, true>;
-                        }>, true>;
-                    }>, [T: DB.Param<"T", DB.Type>]>>>;
-                }, [T: DB.Param<"T", DB.Type>]>>>, [T: DB.Param<"T", DB.Type>]>>, []>>, false>;
-            }>, []>>, false>;
+            complexity: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RecipeComplexity", {
+                Primitive: DB.EnumCase<null>;
+                Simple: DB.EnumCase<null>;
+                Complex: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"RecipeTradeSecret", DB.Object<{
+                    ap_value: DB.MemberDecl<DB.Integer, true>;
+                    prerequisites: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"PlainGeneralPrerequisites", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PlainPrerequisites", DB.Array<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.Enum<"PrerequisitesElement", {
+                        Single: DB.EnumCase<DB.TypeArgument<DB.Param<"T", DB.Type>>>;
+                        Disjunction: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisitesDisjunction", DB.Object<{
+                            list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
+                            display_option: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DisplayOption", {
+                                Hide: DB.EnumCase<null>;
+                                ReplaceWith: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ReplacementDisplayOption", DB.Object<{
+                                    sentence_type: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"SentenceType", {
+                                        Standalone: DB.EnumCase<null>;
+                                        Connected: DB.EnumCase<null>;
+                                    }, []>>, false>;
+                                    translations: DB.MemberDecl<DB.NestedEntityMap<"ReplacementDisplayOptionTranslation", {
+                                        replacement: DB.MemberDecl<DB.String, true>;
+                                    }>, true>;
+                                }>, []>>>;
+                            }, []>>, false>;
+                        }>, [T: DB.Param<"T", DB.Type>]>>>;
+                        Group: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisiteGroup", DB.Object<{
+                            list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
+                            translations: DB.MemberDecl<DB.NestedEntityMap<"PrerequisiteGroupTranslation", {
+                                text: DB.MemberDecl<DB.String, true>;
+                            }>, true>;
+                        }>, [T: DB.Param<"T", DB.Type>]>>>;
+                    }, [T: DB.Param<"T", DB.Type>]>>>, [T: DB.Param<"T", DB.Type>]>>, []>>, false>;
+                }>, []>>>;
+            }, []>>, false>;
         }>, []>>>;
         AlchemicalPoison: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"AlchemicalPoison", DB.Object<{
             effect_types: DB.MemberDecl<DB.Array<DB.IncludeIdentifier<[], DB.Enum<"EffectType", {
@@ -209,21 +213,8 @@ export declare const Poison: DB.Entity<"Poison", {
     }, []>>, true>;
     start: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonStart", {
         Immediate: DB.EnumCase<null>;
-        Constant: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ConstantPoisonTime", DB.Object<{
-            value: DB.MemberDecl<DB.Integer, true>;
-            unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonTimeUnit", {
-                CombatRounds: DB.EnumCase<null>;
-                Minutes: DB.EnumCase<null>;
-                Hours: DB.EnumCase<null>;
-                Days: DB.EnumCase<null>;
-            }, []>>, true>;
-        }>, []>>>;
-        DiceBased: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"DiceBasedPoisonTime", DB.Object<{
-            dice: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Dice", DB.Object<{
-                number: DB.MemberDecl<DB.Integer, true>;
-                sides: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"DieType", DB.Integer, []>>, true>;
-            }>, []>>, true>;
-            flat: DB.MemberDecl<DB.Integer, false>;
+        ExpressionBased: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedPoisonTime", DB.Object<{
+            value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedPoisonTimeValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], MathOperation>, []>>, true>;
             unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonTimeUnit", {
                 CombatRounds: DB.EnumCase<null>;
                 Minutes: DB.EnumCase<null>;
@@ -328,28 +319,6 @@ export declare const IndefinitePoisonCost: DB.TypeAlias<"IndefinitePoisonCost",
         description: DB.MemberDecl<DB.String, true>;
     }>, true>;
 }>, []>;
-export declare const ConstantPoisonTime: DB.TypeAlias<"ConstantPoisonTime", DB.Object<{
-    value: DB.MemberDecl<DB.Integer, true>;
-    unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonTimeUnit", {
-        CombatRounds: DB.EnumCase<null>;
-        Minutes: DB.EnumCase<null>;
-        Hours: DB.EnumCase<null>;
-        Days: DB.EnumCase<null>;
-    }, []>>, true>;
-}>, []>;
-export declare const DiceBasedPoisonTime: DB.TypeAlias<"DiceBasedPoisonTime", DB.Object<{
-    dice: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"Dice", DB.Object<{
-        number: DB.MemberDecl<DB.Integer, true>;
-        sides: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"DieType", DB.Integer, []>>, true>;
-    }>, []>>, true>;
-    flat: DB.MemberDecl<DB.Integer, false>;
-    unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonTimeUnit", {
-        CombatRounds: DB.EnumCase<null>;
-        Minutes: DB.EnumCase<null>;
-        Hours: DB.EnumCase<null>;
-        Days: DB.EnumCase<null>;
-    }, []>>, true>;
-}>, []>;
 export declare const ExpressionBasedPoisonTime: DB.TypeAlias<"ExpressionBasedPoisonTime", DB.Object<{
     value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedPoisonTimeValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], MathOperation>, []>>, true>;
     unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"PoisonTimeUnit", {
@@ -385,33 +354,37 @@ export declare const AnimalVenom: DB.TypeAlias<"AnimalVenom", DB.Object<{
         }>>, []>>>;
     }, []>>, true>;
     is_extractable: DB.MemberDecl<DB.Boolean, true>;
-    trade_secret: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"RecipeTradeSecret", DB.Object<{
-        ap_value: DB.MemberDecl<DB.Integer, true>;
-        prerequisites: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"PlainGeneralPrerequisites", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PlainPrerequisites", DB.Array<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.Enum<"PrerequisitesElement", {
-            Single: DB.EnumCase<DB.TypeArgument<DB.Param<"T", DB.Type>>>;
-            Disjunction: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisitesDisjunction", DB.Object<{
-                list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
-                display_option: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DisplayOption", {
-                    Hide: DB.EnumCase<null>;
-                    ReplaceWith: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ReplacementDisplayOption", DB.Object<{
-                        sentence_type: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"SentenceType", {
-                            Standalone: DB.EnumCase<null>;
-                            Connected: DB.EnumCase<null>;
-                        }, []>>, false>;
-                        translations: DB.MemberDecl<DB.NestedEntityMap<"ReplacementDisplayOptionTranslation", {
-                            replacement: DB.MemberDecl<DB.String, true>;
-                        }>, true>;
-                    }>, []>>>;
-                }, []>>, false>;
-            }>, [T: DB.Param<"T", DB.Type>]>>>;
-            Group: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisiteGroup", DB.Object<{
-                list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
-                translations: DB.MemberDecl<DB.NestedEntityMap<"PrerequisiteGroupTranslation", {
-                    text: DB.MemberDecl<DB.String, true>;
-                }>, true>;
-            }>, [T: DB.Param<"T", DB.Type>]>>>;
-        }, [T: DB.Param<"T", DB.Type>]>>>, [T: DB.Param<"T", DB.Type>]>>, []>>, false>;
-    }>, []>>, false>;
+    complexity: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RecipeComplexity", {
+        Primitive: DB.EnumCase<null>;
+        Simple: DB.EnumCase<null>;
+        Complex: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"RecipeTradeSecret", DB.Object<{
+            ap_value: DB.MemberDecl<DB.Integer, true>;
+            prerequisites: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"PlainGeneralPrerequisites", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PlainPrerequisites", DB.Array<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.Enum<"PrerequisitesElement", {
+                Single: DB.EnumCase<DB.TypeArgument<DB.Param<"T", DB.Type>>>;
+                Disjunction: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisitesDisjunction", DB.Object<{
+                    list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
+                    display_option: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DisplayOption", {
+                        Hide: DB.EnumCase<null>;
+                        ReplaceWith: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ReplacementDisplayOption", DB.Object<{
+                            sentence_type: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"SentenceType", {
+                                Standalone: DB.EnumCase<null>;
+                                Connected: DB.EnumCase<null>;
+                            }, []>>, false>;
+                            translations: DB.MemberDecl<DB.NestedEntityMap<"ReplacementDisplayOptionTranslation", {
+                                replacement: DB.MemberDecl<DB.String, true>;
+                            }>, true>;
+                        }>, []>>>;
+                    }, []>>, false>;
+                }>, [T: DB.Param<"T", DB.Type>]>>>;
+                Group: DB.EnumCase<DB.IncludeIdentifier<DB.Param<string, DB.Type>[], DB.TypeAlias<"PrerequisiteGroup", DB.Object<{
+                    list: DB.MemberDecl<DB.Array<DB.TypeArgument<DB.Param<"T", DB.Type>>>, true>;
+                    translations: DB.MemberDecl<DB.NestedEntityMap<"PrerequisiteGroupTranslation", {
+                        text: DB.MemberDecl<DB.String, true>;
+                    }>, true>;
+                }>, [T: DB.Param<"T", DB.Type>]>>>;
+            }, [T: DB.Param<"T", DB.Type>]>>>, [T: DB.Param<"T", DB.Type>]>>, []>>, false>;
+        }>, []>>>;
+    }, []>>, false>;
 }>, []>;
 export declare const AlchemicalPoison: DB.TypeAlias<"AlchemicalPoison", DB.Object<{
     effect_types: DB.MemberDecl<DB.Array<DB.IncludeIdentifier<[], DB.Enum<"EffectType", {