* Moved migrations to beginning of server initialisation

* Added migrations for entity ID changes to existing tables

.gitignore

@@ -30,8 +30,9 @@ run.sh
 maps
 screenshots
 todo.txt
-armorstats.csv
+
-weaponstats.csv
+# Export data
+*.csv
 
 # Game data
 *.sqlite

CHANGELOG.md

@@ -8,7 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-
 - New level of detail feature, letting you see all the world's terrain at any view distance.
 - Point and directional lights now cast realistic shadows, using shadow mapping.
 - Added leaf and chimney particles
@@ -35,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved projectile physics
 - Improved overhead aiming
 - Figure meshing no longer blocks the main thread.
+- Overhauled persistence layer including no longer storing serialized JSON items in the database
 
 ### Removed
 

Cargo.lock

@@ -4670,6 +4670,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "hashbrown",
+ "itertools",
  "lazy_static",
  "libsqlite3-sys",
  "portpicker",
@@ -4752,7 +4753,6 @@ dependencies = [
  "tracing-appender",
  "tracing-log",
  "tracing-subscriber",
- "tracing-tracy",
  "treeculler",
  "uvth 3.1.1",
  "vek 0.12.0",

assets/common/items/armor/back/admin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Admin's Cape",
     description: "With great power comes\ngreat responsibility.",
     kind: Armor(

assets/common/items/armor/back/dungeon_purple-0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Cultist Cape",
     description: "Smells like dark magic and candles.",
     kind: Armor(

assets/common/items/armor/back/leather_adventurer.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Agile Cape",
     description: "'Tightly packed pieces of leather to endure all weather.'",
     kind: Armor(

assets/common/items/armor/back/short_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Short leather Cape",
     description: "Probably made of the finest leather.",
     kind: Armor(

assets/common/items/armor/back/short_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Blanket",
     description: "Keeps your shoulders warm.",
     kind: Armor(

assets/common/items/armor/belt/assassin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Assassin Belt",
     description: "Only the best for a member of the creed.",
     kind: Armor(

assets/common/items/armor/belt/bonerattler.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Bonerattler Belt",
     description: "Made from the strongest bones.",
     kind: Armor(

assets/common/items/armor/belt/cloth_blue_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Linen Belt",
     description: "Soft and warm",
     kind: Armor(

assets/common/items/armor/belt/cloth_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Linen Belt",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/belt/cloth_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Linen Belt",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/belt/cultist_belt.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Cultist Belt",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/belt/druid.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Druid's Belt",
     description: "Twisted vines to keep everything secure.",
     kind: Armor(

assets/common/items/armor/belt/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Belt",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/belt/leather_2.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leather Belt",
     description: "A belt made from simple leather.",
     kind: Armor(

assets/common/items/armor/belt/leather_adventurer.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Agile Belt",
     description: "'Tightly packed pieces of leather to endure all weather.'",
     kind: Armor(

assets/common/items/armor/belt/plate_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Iron Belt",
     description: "A belt with a buckle forged from iron.",
     kind: Armor(

assets/common/items/armor/belt/steel_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Steel Belt",
     description: "A belt forged from steel.",
     kind: Armor(

assets/common/items/armor/belt/tarasque.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Tarasque Belt",
     description: "As strong as a tarasque shell.",
     kind: Armor(

assets/common/items/armor/belt/twig.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Twig Belt",
     description: "A belt made from woven from twigs.",
     kind: Armor(

assets/common/items/armor/belt/twigsflowers.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Flowery Belt",
     description: "A belt woven from twigs and flowers.",
     kind: Armor(

assets/common/items/armor/belt/twigsleaves.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leafy Belt",
     description: "A belt woven from twigs and leaves.",
     kind: Armor(

assets/common/items/armor/chest/assassin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Assassin Chest",
     description: "Only the best for a member of the creed.",
     kind: Armor(

assets/common/items/armor/chest/bonerattler.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Bonerattler Cuirass",
     description: "Made from the strongest bones.",
     kind: Armor(

assets/common/items/armor/chest/cloth_blue_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Linen Chest",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/chest/cloth_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Linen Chest",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/chest/cloth_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Linen Chest",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/chest/cultist_chest_blue.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Cultist Chest",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/chest/cultist_chest_purple.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Cultist Chest",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/chest/druid.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Druid's Vest",
     description: "Druidic chest wrappings.",
     kind: Armor(

assets/common/items/armor/chest/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Chest",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/chest/leather_2.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leather Cuirass",
     description: "A cuirass made of simple leather.",
     kind: Armor(

assets/common/items/armor/chest/leather_adventurer.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Agile Chest",
     description: "'Tightly packed pieces of leather to endure all weather.'",
     kind: Armor(

assets/common/items/armor/chest/plate_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Iron Chestplate",
     description: "A chestplate forged from iron.",
     kind: Armor(

assets/common/items/armor/chest/steel_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Steel Cuirass",
     description: "A cuirass of steel plate.",
     kind: Armor(

assets/common/items/armor/chest/tarasque.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Tarasque Cuirass",
     description: "As strong as a tarasque shell.",
     kind: Armor(

assets/common/items/armor/chest/twig.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Twig Shirt",
     description: "A shirt woven from twigs.",
     kind: Armor(

assets/common/items/armor/chest/twigsflowers.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Flowery Shirt",
     description: "A shirt woven from twigs and flowers.",
     kind: Armor(

assets/common/items/armor/chest/twigsleaves.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leafy Shirt",
     description: "A shirt woven from twigs and leaves.",
     kind: Armor(

assets/common/items/armor/chest/worker_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_green_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_orange_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Orange Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_orange_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Orange Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_purple_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_red_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Red Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_red_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Red Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_yellow_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Yellow Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/chest/worker_yellow_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Yellow Worker Shirt",
     description: "Was used by a farmer, until recently.",
     kind: Armor(

assets/common/items/armor/foot/assassin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Assassin Boots",
     description: "Only the best for a member of the creed.",
     kind: Armor(

assets/common/items/armor/foot/bonerattler.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Bonerattler Boots",
     description: "Made from the strongest bones.",
     kind: Armor(

assets/common/items/armor/foot/cloth_blue_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Linen Boots",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/foot/cloth_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Linen Boots",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/foot/cloth_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Linen Boots",
     description: "Soft and warm.",
     kind: Armor(

assets/common/items/armor/foot/cultist_boots.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Cultist Boots",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/foot/druid.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Druid's Slippers",
     description: "For treading softly through the woods.",
     kind: Armor(

assets/common/items/armor/foot/jackalope_slippers.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Fluffy Jackalope Slippers",
     description: "So warm and cozy!",
     kind: Armor(

assets/common/items/armor/foot/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Boots",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/foot/leather_2.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leather Boots",
     description: "Boots made of simple leather.",
     kind: Armor(

assets/common/items/armor/foot/leather_adventurer.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Agile Kickers",
     description: "'Tightly packed pieces of leather to endure all weather.",
     kind: Armor(

assets/common/items/armor/foot/plate_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Iron Feet",
     description: "Boots forged from iron.",
     kind: Armor(

assets/common/items/armor/foot/steel_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Steel Boots",
     description: "Boots forged from steel.",
     kind: Armor(

assets/common/items/armor/foot/tarasque.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Tarasque Boots",
     description: "As strong as a tarasque shell.",
     kind: Armor(

assets/common/items/armor/foot/twig.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Twig Boots",
     description: "Boots woven from twigs.",
     kind: Armor(

assets/common/items/armor/foot/twigsflowers.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Flowery Boots",
     description: "Boots woven from twigs and flowers.",
     kind: Armor(

assets/common/items/armor/foot/twigsleaves.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leafy Boots",
     description: "Boots woven from twigs and leaves.",
     kind: Armor(

assets/common/items/armor/hand/assassin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Assassin Gloves",
     description: "Only the best for a member of the creed.",
     kind: Armor(

assets/common/items/armor/hand/bonerattler.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Bonerattler Gauntlets",
     description: "Made from the strongest bones.",
     kind: Armor(

assets/common/items/armor/hand/cloth_blue_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Linen Wrists",
     description: "A strip of cloth.",
     kind: Armor(

assets/common/items/armor/hand/cloth_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Linen Wrists",
     description: "A strip of cloth.",
     kind: Armor(

assets/common/items/armor/hand/cloth_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Silk Wrists",
     description: "A strip of cloth.",
     kind: Armor(

assets/common/items/armor/hand/cultist_hands_blue.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Cultist Gloves",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/hand/cultist_hands_purple.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Cultist Gloves",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/hand/druid.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Druid's Gloves",
     description: "Soft, strong, and flexible.",
     kind: Armor(

assets/common/items/armor/hand/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Gloves",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/hand/leather_2.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leather Gloves",
     description: "Gloves made of simple leather.",
     kind: Armor(

assets/common/items/armor/hand/leather_adventurer.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Agile Gauntlets",
     description: "'Tightly packed pieces of leather to endure all weather.'",
     kind: Armor(

assets/common/items/armor/hand/plate_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Iron Handguards",
     description: "Gauntlets forged from iron.",
     kind: Armor(

assets/common/items/armor/hand/steel_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Steel Gauntlets",
     description: "Gauntlets forged from steel.",
     kind: Armor(

assets/common/items/armor/hand/tarasque.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Tarasque Gauntlets",
     description: "As strong as a tarasque shell.",
     kind: Armor(

assets/common/items/armor/hand/twig.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Twig Wraps",
     description: "Handwraps woven from twigs.",
     kind: Armor(

assets/common/items/armor/hand/twigsflowers.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Flowery Wraps",
     description: "Handwraps woven from twigs and flowers.",
     kind: Armor(

assets/common/items/armor/hand/twigsleaves.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leafy Wraps",
     description: "Handwraps woven from twigs and leaves.",
     kind: Armor(

assets/common/items/armor/head/assa_mask_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Dark Assassin Mask",
     description: "Used to obscure your face.",
     kind: Armor(

assets/common/items/armor/head/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Leather Cap",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/neck/neck_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Plain Necklace",
     description: "It's become tarnished with age.",
     kind: Armor(

assets/common/items/armor/neck/neck_1.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Gem of lesser Protection",
     description: "Surrounded by a discrete magical glow.",
     kind: Armor(

assets/common/items/armor/pants/assassin.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Assassin Pants",
     description: "Only the best for a member of the creed.",
     kind: Armor(

assets/common/items/armor/pants/bonerattler.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Bonerattler Chausses",
     description: "Made from the strongest bones.",
     kind: Armor(

assets/common/items/armor/pants/cloth_blue_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Linen Skirt",
     description: "A skirt made from linen.",
     kind: Armor(

assets/common/items/armor/pants/cloth_green_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Green Linen Skirt",
     description: "A skirt made from linen.",
     kind: Armor(

assets/common/items/armor/pants/cloth_purple_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Linen Skirt",
     description: "A skirt made from linen.",
     kind: Armor(

assets/common/items/armor/pants/cultist_legs_blue.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Blue Cultist Skirt",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/pants/cultist_legs_purple.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Purple Cultist Skirt",
     description: "Ceremonial attire used by members.",
     kind: Armor(

assets/common/items/armor/pants/druid.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Druid's Kilt",
     description: "Feel the breeze!",
     kind: Armor(

assets/common/items/armor/pants/hunting.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Hunting Pants",
     description: "Crafted from soft, supple leather.",
     kind: Armor(

assets/common/items/armor/pants/leather_0.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Pants",
     description: "Swift like the wind.",
     kind: Armor(

assets/common/items/armor/pants/leather_2.ron

@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Leather Leg Armour",
     description: "Leg armour made of simple leather.",
     kind: Armor(