fix: updates models with latest game update data

jmgilman · Jun 2, 2024 · 9028f92 · 9028f92
1 parent 58ee456
commit 9028f92
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/pymerc/api/models/common.py b/pymerc/api/models/common.py
@@ -22,6 +22,7 @@ class BuildingType(Enum):
     Apothecary = "apothecary"
     Bakery = "bakery"
     Bloomery = "bloomery"
+    BoardingHouse = "boardinghouse"
     Brewery = "brewery"
     Brickworks = "brickworks"
     Butchery = "butchery"
@@ -44,6 +45,7 @@ class BuildingType(Enum):
     Dyeworks = "dyeworks"
     Farmstead = "farmstead"
     Fisher = "fisher"
+    FishingShack = "fishing shack"
     FlaxFarm = "flax farm"
     Foundry = "foundry"
     GlassBlower = "glass blower"
@@ -71,6 +73,7 @@ class BuildingType(Enum):
     Quarry = "quarry"
     RettingPit = "retting pit"
     Ropewalk = "ropewalk"
+    SailLoft = "sail loft"
     Saltery = "saltery"
     SaltMine = "salt mine"
     Sawmill = "sawmill"
@@ -188,6 +191,7 @@ class Item(Enum):
     Hides = "hides"
     Honey = "honey"
     HopBeer = "hop beer"
+    Hulk = "hulk"
     IronOre = "iron ore"
     Jewellery = "jewellery"
     Labour = "labour"
@@ -215,6 +219,7 @@ class Item(Enum):
     Protection = "protection"
     Resin = "resin"
     Rope = "rope"
+    Sails = "sails"
     Salt = "salt"
     Scythes = "scythes"
     SilverBars = "silver bars"
@@ -272,8 +277,10 @@ class Recipe(Enum):
     BrewHopBeer1 = "brew hop beer 1"
     BrewHopBeer2 = "brew hop beer 2"
     BuildCog1 = "build cog 1"
+    BuildCog2 = "build cog 2"
     BuildHandcart1 = "build handcart 1"
     BuildHandcart2 = "build handcart 2"
+    BuildHulk1 = "build hulk 1"
     BuildSnekkja1 = "build snekkja 1"
     BuildSnekkja2 = "build snekkja 2"
     BuildTumbrel1 = "build tumbrel 1"
@@ -289,6 +296,7 @@ class Recipe(Enum):
     BurnTar1 = "burn tar 1"
     BurnTar2 = "burn tar 2"
     BurnTiles1 = "burn tiles 1"
+    BurnTiles2 = "burn tiles 2"
     ButcherCattle1a = "butcher cattle 1a"
     ButcherCattle1b = "butcher cattle 1b"
     ButcherCattle2 = "butcher cattle 2"
@@ -301,6 +309,7 @@ class Recipe(Enum):
     CraftBelts1 = "craft belts 1"
     CraftBelts2 = "craft belts 2"
     CraftBelts3 = "craft belts 3"
+    CraftBelts4 = "craft belts 4"
     CraftCookware1 = "craft cookware 1"
     CraftFurniture1 = "craft furniture 1"
     CraftFurniture2 = "craft furniture 2"
@@ -310,6 +319,7 @@ class Recipe(Enum):
     CraftPloughs2 = "craft ploughs 2"
     CraftPloughs3 = "craft ploughs 3"
     CraftScythes1 = "craft scythes 1"
+    CraftScythes2 = "craft scythes 2"
     CraftTools1 = "craft tools 1"
     CraftTools2 = "craft tools 2"
     CraftWheels1 = "craft wheels 1"
@@ -335,6 +345,7 @@ class Recipe(Enum):
     Fishing1 = "fishing 1"
     Fishing2a = "fishing 2a"
     Fishing2b = "fishing 2b"
+    Fishing3 = "fishing 3"
     ForgeArms1 = "forge arms 1"
     ForgeArms2 = "forge arms 2"
     ForgeArms2b = "forge arms 2b"
@@ -444,16 +455,20 @@ class Recipe(Enum):
     MakeCheese5 = "make cheese 5"
     MakeHarnesses1 = "make harnesses 1"
     MakeHarnesses2 = "make harnesses 2"
+    MakeHarnesses2b = "make harnesses 2b"
     MakeJewellery1 = "make jewellery 1"
     MakeJewellery2 = "make jewellery 2"
     MakeLeatherArmor1 = "make leather armor 1"
     MakeMedicine1 = "make medicine 1"
+    MakeMedicine2 = "make medicine 2"
     MakeNets1 = "make nets 1"
     MakeNets2 = "make nets 2"
+    MakeNets3 = "make nets 3"
     MakeRope1 = "make rope 1"
     MakeWindows1 = "make windows 1"
     MakeWine1 = "make wine 1"
     MakeWine2 = "make wine 2"
+    MakeWine3 = "make wine 3"
     Malting1 = "malting 1"
     Malting2 = "malting 2"
     Milling1 = "milling 1"
@@ -464,16 +479,21 @@ class Recipe(Enum):
     MineCopper3 = "mine copper 3"
     MineCopper4 = "mine copper 4"
     MineGold1 = "mine gold 1"
+    MineGold1b = "mine gold 1b"
     MineGold2 = "mine gold 2"
+    MineGold2b = "mine gold 2b"
     MineIron1 = "mine iron 1"
     MineIron2 = "mine iron 2"
     MineIron3 = "mine iron 3"
     MineIron4 = "mine iron 4"
     MineLead1 = "mine lead 1"
     MineLead2 = "mine lead 2"
+    MineLead2b = "mine lead 2b"
     MineLead3 = "mine lead 3"
+    MineLead3b = "mine lead 3b"
     MineSalt1 = "mine salt 1"
     MineSalt2 = "mine salt 2"
+    MineSalt3 = "mine salt 3"
     MintCopperCoins1 = "mint copper coins 1"
     MintCopperCoins2 = "mint copper coins 2"
     MintGoldCoins1 = "mint gold coins 1"
@@ -486,7 +506,9 @@ class Recipe(Enum):
     Patrol3a = "patrol 3a"
     Patrol3b = "patrol 3b"
     RefineSteel1 = "refine steel 1"
+    RefineSteel1b = "refine steel 1b"
     RefineSteel2 = "refine steel 2"
+    RefineSteel2b = "refine steel 2b"
     Retting1 = "retting 1"
     Retting2 = "retting 2"
     SaltingFish1 = "salting fish 1"
@@ -495,7 +517,12 @@ class Recipe(Enum):
     SaltingMeat2 = "salting meat 2"
     Sawing1 = "sawing 1"
     Sawing2 = "sawing 2"
+    Sawing3 = "sawing 3"
+    Sawing4 = "sawing 4"
     Service1 = "service 1"
+    Service2 = "service 2"
+    Service3 = "service 3"
+    Service4 = "service 4"
     SewCoats1a = "sew coats 1a"
     SewCoats1b = "sew coats 1b"
     SewCoats2a = "sew coats 2a"
@@ -508,8 +535,11 @@ class Recipe(Enum):
     SewGarments3b = "sew garments 3b"
     SewGarments4a = "sew garments 4a"
     SewGarments4b = "sew garments 4b"
+    SewSails1 = "sew sails 1"
+    SewSails2 = "sew sails 2"
     ShearSheep1 = "shear sheep 1"
     ShearSheep2 = "shear sheep 2"
+    ShearSheep3 = "shear sheep 3"
     SmeltCopper1 = "smelt copper 1"
     SmeltCopper2 = "smelt copper 2"
     SmeltGold1 = "smelt gold 1"
@@ -534,6 +564,9 @@ class Recipe(Enum):
     SplitTimber2 = "split timber 2"
     TanHides1 = "tan hides 1"
     TanHides2 = "tan hides 2"
+    TrapFish1 = "trap fish 1"
+    TrapFish2 = "trap fish 2"
+    TrapFish3 = "trap fish 3"
     TumbrelOperations = "tumbrel operations"
     WeaveCloth1 = "weave cloth 1"
     WeaveCloth2a = "weave cloth 2a"
@@ -574,6 +607,7 @@ class Transport(Enum):
 
     Cog = "cog"
     Handcart = "handcart"
+    Hulk = "hulk"
     Snekkja = "snekkja"
     Tumbrel = "tumbrel"
 

diff --git a/pymerc/api/models/static.py b/pymerc/api/models/static.py
@@ -108,6 +108,6 @@ class Item(BaseModel):
 class ItemPrice(BaseModel):
     """Represents the price of an item in the game."""
 
-    low: float
+    low: Optional[float] = None
     typical: float
-    high: float
+    high: Optional[float] = None