Update

Cargo.lock

@@ -329,9 +329,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "byteorder"
@@ -353,9 +353,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cc"
-version = "1.1.28"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
 dependencies = [
  "shlex",
 ]
@@ -1183,9 +1183,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1288,9 +1288,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -1396,9 +1396,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "js-sys"
-version = "0.3.71"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1434,9 +1434,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libredox"
@@ -1717,9 +1717,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "ordered-float"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97"
 dependencies = [
  "num-traits",
 ]
@@ -1866,9 +1866,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
@@ -2148,9 +2148,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.23.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
 dependencies = [
  "once_cell",
  "ring",
@@ -2197,9 +2197,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-platform-verifier"
@@ -2241,9 +2241,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -2342,9 +2342,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
 dependencies = [
  "itoa",
  "memchr",
@@ -2479,9 +2479,9 @@ dependencies = [
 
 [[package]]
 name = "sorted-vec"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6734caf0b6f51addd5eeacca12fb39b2c6c14e8d4f3ac42f3a78955c0467458"
+checksum = "2432f7c120a790d329ee1c54c9c09495b163a72eb338b0682742e2c173b15107"
 
 [[package]]
 name = "specs"
@@ -2938,9 +2938,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
@@ -2968,7 +2968,7 @@ dependencies = [
 [[package]]
 name = "veloren-client"
 version = "0.16.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "authc",
  "byteorder",
@@ -2994,7 +2994,7 @@ dependencies = [
 [[package]]
 name = "veloren-client-i18n"
 version = "0.13.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "deunicode",
  "fluent",
@@ -3012,7 +3012,7 @@ dependencies = [
 [[package]]
 name = "veloren-common"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "approx",
  "bitflags 2.6.0",
@@ -3052,7 +3052,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-assets"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "assets_manager",
  "dot_vox",
@@ -3067,7 +3067,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-base"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "directories-next",
  "tracing",
@@ -3076,7 +3076,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-ecs"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "specs",
  "tracing",
@@ -3086,7 +3086,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-i18n"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "hashbrown 0.14.5",
  "rand",
@@ -3096,7 +3096,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-net"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "bincode",
  "flate2",
@@ -3114,7 +3114,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-state"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3136,7 +3136,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-systems"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "itertools",
  "ordered-float",
@@ -3154,7 +3154,7 @@ dependencies = [
 [[package]]
 name = "veloren-network"
 version = "0.3.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "async-channel",
  "async-trait",
@@ -3179,7 +3179,7 @@ dependencies = [
 [[package]]
 name = "veloren-network-protocol"
 version = "0.6.1"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "async-trait",
  "bitflags 2.6.0",
@@ -3193,7 +3193,7 @@ dependencies = [
 [[package]]
 name = "veloren-world"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#d3c7671b8cd7785c2203534aa8fbf861509aa003"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#bb9595be4203471256c29167de665f4ee9540085"
 dependencies = [
  "arr_macro",
  "bincode",
@@ -3256,9 +3256,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3267,9 +3267,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -3282,9 +3282,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3292,9 +3292,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3305,9 +3305,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wavefront"

assets/common/abilities/ability_set_manifest.ron

@@ -740,6 +740,8 @@
         abilities: [
             Simple(None, "common.abilities.custom.minotaur.charge"),
             Simple(None, "common.abilities.custom.minotaur.frenzy"),
+            Simple(None, "common.abilities.custom.minotaur.axethrow"),
+            Simple(None, "common.abilities.custom.minotaur.ironspike_targeted"),
         ],
     ),
      Custom("Dullahan"): (

assets/common/abilities/custom/minotaur/axethrow.ron

@@ -0,0 +1,30 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    recover_duration: 0.8,
+    projectile: (
+        kind: Explosive(
+            radius: 20,
+            min_falloff: 0.1,
+            reagent: Some(Yellow),
+            terrain: Some((1, Black))
+        ),
+        attack: Some((
+            damage: 50,
+            knockback: Some(25),
+            energy: 0,
+            buff: Some((
+                kind: Bleeding,
+                dur_secs: 10,
+                strength: DamageFraction(0.1),
+                chance: 0.1,
+            )),
+        )),
+    ),
+    projectile_body: Object(MinotaurAxe),
+    projectile_light: None,
+    projectile_speed: 80.0,
+    num_projectiles: Value(2),
+    projectile_spread: 0.4,
+    move_efficiency: 1.0,
+)

assets/common/abilities/custom/minotaur/ironspike_targeted.ron

@@ -0,0 +1,12 @@
+SpriteSummon(
+    buildup_duration: 0.4,
+    cast_duration: 0.1,
+    recover_duration: 1.1,
+    sprite: IronSpike,
+    del_timeout: Some((5, 15)),
+    summon_distance: (0, 1),
+    sparseness: 0.0,
+    angle: 360,
+    move_efficiency: 1.0,
+    anchor: Target,
+)

assets/common/cave_scatter/dark_ceiling.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (1, Orb),
 ]

assets/common/cave_scatter/dark_floor.ron

@@ -1,11 +1,9 @@
+// Unused
 [
     (50, Velorite),
     (60, VeloriteFrag),
     (40, CaveMushroom),
-    (16, SapphireSmall),
-    (12, EmeraldSmall),
     (15, Cobalt),
     (30, Bloodstone),
     (40, Coal),
-    (10, RubySmall),
 ]

assets/common/cave_scatter/deep_ceiling.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (10, CeilingMushroom),
     (6, Liana),

assets/common/cave_scatter/deep_floor.ron

@@ -1,15 +1,11 @@
+// Unused
 [
     (40, Velorite),
     (40, VeloriteFrag),
     (30, CaveMushroom),
     (30, Mushroom),
-    (30, AmethystSmall),
-    (30, TopazSmall),
-    (16, SapphireSmall),
     (100, CrystalLow),
-    (12, EmeraldSmall),
     (15, Cobalt),
     (40, Coal),
     (70, Iron),
-    (10, RubySmall),
 ]

assets/common/cave_scatter/deep_water_ceiling.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (1, CrystalHigh),
 ]

assets/common/cave_scatter/deep_water_floor.ron

@@ -1,13 +1,9 @@
+// Unused
 [
     (40, Velorite),
     (40, VeloriteFrag),
-    (30, AmethystSmall),
-    (30, TopazSmall),
-    (16, SapphireSmall),
     (100, CrystalLow),
-    (12, EmeraldSmall),
     (15, Cobalt),
     (40, Coal),
     (70, Iron),
-    (10, RubySmall),
 ]

assets/common/cave_scatter/shallow_ceiling.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (3, Liana),
     (1, CeilingMushroom),

assets/common/cave_scatter/shallow_floor.ron

@@ -1,10 +1,9 @@
+// Unused
 [
     (110, Stones),
     (250, ShortGrass),
     (50, CaveMushroom),
     (50, Mushroom),
-    (5, AmethystSmall),
-    (5, TopazSmall),
     (15, Tin),
     (12, Copper),
     (15, Iron),

assets/common/cave_scatter/shallow_water_ceiling.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (1, CrystalHigh),
 ]

assets/common/cave_scatter/shallow_water_floor.ron

@@ -1,7 +1,6 @@
+// Unused
 [
     (110, Stones),
-    (5, AmethystSmall),
-    (5, TopazSmall),
     (15, Tin),
     (12, Copper),
     (15, Iron),

assets/common/cave_scatter/vein.ron

@@ -1,3 +1,4 @@
+// Unused
 [
     (10, Velorite),
     (10, VeloriteFrag),
@@ -5,5 +6,4 @@
     (10, Bloodstone),
     (15, Silver),
     (10, Gold),
-    (8, DiamondSmall),
 ]

assets/common/entity/dungeon/myrmidon/cyclops_key.ron

@@ -0,0 +1,14 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("cyclops"),
+    alignment: Alignment(Enemy),
+    loot: Item("common.items.keys.minotaur_key"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    agent: (
+        idle_wander_factor: 0.0,
+    ),
+    meta: [],
+)

assets/common/item_i18n_manifest.ron

@@ -690,6 +690,12 @@
         Simple(
             "common.items.keys.vampire_key",
         ): "object-key-vampire",
+        Simple(
+            "common.items.keys.myrmidon_key",
+        ): "object-key-myrmidon",        
+        Simple(
+            "common.items.keys.minotaur_key",
+        ): "object-key-minotaur",
         Simple(
             "common.items.weapons.shield.shield_1",
         ): "weapon-shield-wood-0",

assets/common/items/keys/minotaur_key.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    legacy_name: "Minotaur Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: Common,
+    tags: [Utility],
+)
+

assets/common/items/keys/myrmidon_key.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    legacy_name: "Myrmidon Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: Common,
+    tags: [Utility],
+)
+

assets/common/loot_tables/calendar/halloween/halloween_harvester.ron

@@ -1,8 +1,8 @@
 [
     // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-3")),
+    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     // Misc
     (2.0, Item("common.items.armor.misc.head.facegourd")),
 ]

assets/common/loot_tables/dungeon/myrmidon/minotaur.ron

@@ -3,6 +3,7 @@
             // coins are temporary placeholder for unique drops
             MultiDrop(Item("common.items.utility.coins"), 200, 500),
             MultiDrop(Item("common.items.log.eldwood"), 2, 6),
+            Item("common.items.keys.myrmidon_key"),
       ],
    )),
   (0.1, Item("common.items.weapons.axe.parashu")),

assets/voxygen/i18n/en/command.ftl

@@ -258,6 +258,7 @@ command-outcome-invalid_outcome = { $outcome } is not a valid outcome
 command-death_effect-unknown = Unknown death effect { $effect }.
 command-spot-spot_not_found = Didn't find any spots of that kind in this world.
 command-spot-world_feature = The `worldgen` feature has to be enabled to run this command.
+command-cannot-send-message-hidden = Cannot send messages as a hidden spectator.
 
 # Unreachable/untestable but added for consistency
 

assets/voxygen/i18n/en/hud/map.ftl

@@ -15,6 +15,9 @@ hud-map-tree = Giant Tree
 hud-map-town = Town
 hud-map-castle = Castle
 hud-map-bridge = Bridge
+hud-map-bridges = Bridges
+hud-map-glider_course = Glider Course
+hud-map-glider_courses = Glider Courses
 hud-map-dungeon = Dungeon
 hud-map-df_mine = Mine
 hud-map-difficulty_dungeon =
@@ -38,6 +41,7 @@ hud-map-adlet = Adlet Stronghold
 hud-map-haniwa = Haniwa Catacomb
 hud-map-cultist = Cultist Dungeon
 hud-map-sahagin = Sahagin Island
+hud-map-myrmidon = Myrmidon Dungeon
 hud-map-terracotta = Terracotta Ruins
 hud-map-vampire_castle = Vampire Castle
 hud-map-placed_by = Placed by { $name }

assets/voxygen/i18n/en/item/items/key.ftl

@@ -31,5 +31,8 @@ object-key-sahagin = Sahagin Key
 object-key-vampire = Vampire Key
     .desc = Used to open doors. Will break after use.
 
-object-key-bloodmoon = Bloodmoon Key
+object-key-myrmidon = Myrmidon Key
+    .desc = Used to open doors. Will break after use.
+
+object-key-minotaur = Minotaur Key
     .desc = Used to open doors. Will break after use.

config/config.toml

@@ -1,25 +1,234 @@
-announcement = "Beep Boop!"
+position = [17744.0, 14975.0, 239.0]
-position = [17720.0, 14951.0, 237.0]
+orientation = 90
-orientation = 0
+announcement = "Buying cheese, selling potions and other stuff."
 
 [buy_prices]
-"consumable.potion_freezing" = 1
 "food.cheese" = 50
-"iron|sword.greatsword|sword.long" = 1_000
 
 [sell_prices]
-"food.cheese" = 1_000_000
+# Armor
+"armor.misc.neck.ankh_of_life" = 500_000
+"armor.misc.neck.carcanet_of_wrath" = 20_000
+
+## Boreal Armor
+"armor.boreal.back" = 250_000
+"armor.boreal.belt" = 250_000
+"armor.boreal.chest" = 250_000
+"armor.boreal.foot" = 250_000
+"armor.boreal.hand" = 250_000
+"armor.boreal.pants" = 250_000
+"armor.boreal.shoulder" = 250_000
+"armor.misc.head.boreal_warhelm" = 450_000
+
+## Cultist Armor & Jewelry
+"armor.cultist.bandana" = 5_000
+"armor.cultist.shoulder" = 5_000
+"armor.cultist.belt" = 5_000
+"armor.cultist.chest" = 5_000
+"armor.cultist.foot" = 5_000
+"armor.cultist.hand" = 5_000
+"armor.cultist.necklace" = 5_000
+"armor.cultist.pants" = 5_000
+"armor.cultist.ring" = 5_000
+
+## Metal
+### Orichalcum
+"armor.mail.orichalcum.back" = 24_000
+"armor.mail.orichalcum.belt" = 16_000
+"armor.mail.orichalcum.chest" = 80_000
+"armor.mail.orichalcum.foot" = 24_000
+"armor.mail.orichalcum.shoulder" = 62_000
+"armor.mail.orichalcum.pants" = 62_000
+"armor.mail.orichalcum.hand" = 24_000
+"armor.mail.orichalcum.head" = 24_000
+
+### Bloodsteel
+"armor.mail.bloodsteel.back" = 12_000
+"armor.mail.bloodsteel.belt" = 8_000
+"armor.mail.bloodsteel.chest" = 40_000
+"armor.mail.bloodsteel.foot" = 12_000
+"armor.mail.bloodsteel.shoulder" = 31_000
+"armor.mail.bloodsteel.pants" = 31_000
+"armor.mail.bloodsteel.hand" = 12_000
+
+## Hide
+### Dragonscale
+"armor.hide.dragonscale.back" = 20_000
+"armor.hide.dragonscale.belt" = 15_000
+"armor.hide.dragonscale.chest" = 50_000
+"armor.hide.dragonscale.foot" = 20_000
+"armor.hide.dragonscale.shoulder" = 45_000
+"armor.hide.dragonscale.pants" = 45_000
+"armor.hide.dragonscale.hand" = 20_000
+
+## Primal
+"armor.hide.primal.back" = 12_000
+"armor.hide.primal.belt" = 8_000
+"armor.hide.primal.chest" = 40_000
+"armor.hide.primal.foot" = 12_000
+"armor.hide.primal.shoulder" = 31_000
+"armor.hide.primal.pants" = 31_000
+"armor.hide.primal.hand" = 12_000
+
+## Cloth
+### Sunsilk
+"armor.cloth.sunsilk.back" = 100_000
+"armor.cloth.sunsilk.belt" = 15_000
+"armor.cloth.sunsilk.chest" = 200_000
+"armor.cloth.sunsilk.foot" = 10_000
+"armor.cloth.sunsilk.shoulder" = 5_000
+"armor.cloth.sunsilk.pants" = 15_000
+"armor.cloth.sunsilk.hand" = 10_000
+
+### Moonweave
+"armor.cloth.moonweave.back" = 20_000
+"armor.cloth.moonweave.belt" = 15_000
+"armor.cloth.moonweave.chest" = 50_000
+"armor.cloth.moonweave.foot" = 20_000
+"armor.cloth.moonweave.shoulder" = 45_000
+"armor.cloth.moonweave.pants" = 45_000
+"armor.cloth.moonweave.hand" = 20_000
+
+# Hats
+"armor.misc.head.cat_capuche" = 700_000
+"armor.misc.head.facegourd" = 250_000
+"armor.misc.head.hare_hat" = 100_000
+"armor.misc.head.mitre" = 10_000
+"armor.misc.head.winged_coronet" = 30_000
+"calendar.christmas.armor.misc.head.woolly_wintercap" = 250_000
+
+# Crafting
+"crafting_ing.cursed_bead" = 10_000
+"crafting_ing.glacial_crystal" = 150_000
+"crafting_ing.alkahest" = 6_000
+"crafting_ing.animal_misc.phoenix_feather" = 100_000
+"crafting_ing.brinestone" = 2_000
+"crafting_ing.coral_branch" = 1_000
+"crafting_ing.hide.dragon_scale" = 5_000
+"crafting_ing.hide.plate" = 1_000
+"crafting_ing.dwarven_battery" = 10_000
+"crafting_ing.mindflayer_bag_damaged" = 100_000
+"crafting_ing.leather.rigid_leather" = 2_000
+"log.eldwood" = 3_000
+"mineral.ingot.bloodsteel" = 3_000
+"mineral.ingot.orichalcum" = 8_000
+"mineral.ingot.gold" = 5_000
+"mineral.ore.ancient_gold" = 10_000
+
+# Food
+"food.spore_corruption" = 5_000
+
+# Potions
 "consumable.potion_minor" = 150
+"consumable.potion_med" = 350
+
+# Gliders
+"glider.skullgrin" = 10_000
+
+# Bags
+"armor.misc.bag.troll_hide_pack" = 20_000
+"armor.misc.bag.sturdy_red_backpack" = 20_000
+
+# Recipes
+## Armor
+### Metal
+"recipes.armor.iron" = 2_000
+"recipes.armor.steel" = 4_000
+"recipes.armor.cobalt" = 6_000
+"recipes.armor.bloodsteel" = 8_000
+"recipes.armor.orichalcum" = 10_000
+"recipes.armor.brinestone" = 10_000
+"recipes.armor.golemite" = 10_000
+
+### Cloth
+"recipes.armor.woolen" = 2_000
+"recipes.armor.silken" = 4_000
+"recipes.armor.druid" = 6_000
+"recipes.armor.moonweave" = 8_000
+"recipes.armor.sunsilk" = 10_000
+
+### Hide
+"recipes.armor.leather" = 2_000
+"recipes.armor.scale" = 4_000
+"recipes.armor.carapace" = 6_000
+"recipes.armor.primal" = 8_000
+"recipes.armor.dragonscale" = 10_000
+
+## Weapons
+### Metal
+"recipes.weapons.iron" = 2_000
+"recipes.weapons.steel" = 4_000
+"recipes.weapons.cobalt" = 6_000
+"recipes.weapons.bloodsteel" = 8_000
+"recipes.weapons.orichalcum" = 10_000
+
+### Wood
+"recipes.weapons.hardwood" = 4_000
+"recipes.weapons.ironwood" = 4_000
+"recipes.weapons.frostwood" = 8_000
+"recipes.weapons.eldwood" = 10_000
+
+## Equipment
+"recipes.equipment.moderate" = 8_000
+"recipes.equipment.advanced" = 10_000
+
+## Unique
+"recipes.unique.seashell_necklace" = 2_000
+"recipes.unique.abyssal_gorget" = 6_000
+"recipes.unique.abyssal_ring" = 8_000
+"recipes.unique.delvers_lamp" = 10_000
+"recipes.unique.mindflayer_spellbag" = 10_000
+"recipes.unique.troll_hide_pack" = 40_000
+"recipes.unique.winged_coronet" = 20_000
+"recipes.unique.polaris" = 100_000
+
+## Other
+"recipes.charms" = 2_000
+"recipes.explosives" = 2_000
+"recipes.gliders" = 2_000
+"recipes.instruments" = 2_000
+"recipes.utility" = 2_000
+
+# Instruments
+"tool.instruments.icy_talharpa" = 500_000
+"tool.instruments.steeltonguedrum" = 300_000
+
+# Legendary Weapons
+"weapons.axe.parashu" = 150_000
+"weapons.sword.caladbolg" = 150_000
+"weapons.staff.laevateinn" = 50_000
+"weapons.hammer.mjolnir" = 150_000
+"weapons.sceptre.caduceus" = 150_000
+"weapons.bow.sagitta" = 300_000
+
+# Lanterns
+"boss_drops.lantern" = 20_000 # Magic Lantern
+"lantern.blue_0" = 10_000
+"lantern.geode_purp" = 10_000
+"lantern.pumpkin" = 25_000
+
+# Utility
+"utility.bomb" = 500
+"utility.collar" = 100
+"utility.firework_blue" = 200
+"utility.firework_green" = 200
+"utility.firework_purple" = 200
+"utility.firework_red" = 200
+"utility.firework_white" = 200
+"utility.firework_yellow" = 200
 
 # Modular Weapons
-## Axes
+## Orichalcum
+### Axes
 "orichalcum|axe.axe|axe.long" = 45_000
 "orichalcum|axe.axe|axe.medium" = 45_000
 "orichalcum|axe.axe|axe.short" = 45_000
 
 "orichalcum|axe.greataxe|axe.long" = 45_000
+"orichalcum|axe.greataxe|axe.medium" = 45_000
 
 "orichalcum|axe.poleaxe|axe.long" = 45_000
+"orichalcum|axe.poleaxe|axe.medium" = 45_000
 
 "orichalcum|axe.battleaxe|axe.long" = 45_000
 "orichalcum|axe.battleaxe|axe.medium" = 45_000
@@ -30,19 +239,22 @@ orientation = 0
 "orichalcum|axe.jagged|axe.short" = 45_000
 
 "orichalcum|axe.labrys|axe.long" = 45_000
+"orichalcum|axe.labrys|axe.medium" = 45_000
 
 "orichalcum|axe.ornate|axe.long" = 45_000
 "orichalcum|axe.ornate|axe.medium" = 45_000
 "orichalcum|axe.ornate|axe.short" = 45_000
 
-## Swords
+### Swords
 "orichalcum|sword.greatsword|sword.long" = 45_000
+"orichalcum|sword.greatsword|sword.medium" = 45_000
 
 "orichalcum|sword.katana|sword.long" = 45_000
 "orichalcum|sword.katana|sword.medium" = 45_000
 "orichalcum|sword.katana|sword.short" = 45_000
 
 "orichalcum|sword.longsword|sword.long" = 45_000
+"orichalcum|sword.longsword|sword.medium" = 45_000
 
 "orichalcum|sword.ornate|sword.long" = 45_000
 "orichalcum|sword.ornate|sword.medium" = 45_000
@@ -57,8 +269,9 @@ orientation = 0
 "orichalcum|sword.sawblade|sword.short" = 45_000
 
 "orichalcum|sword.zweihander|sword.long" = 45_000
+"orichalcum|sword.zweihander|sword.medium" = 45_000
 
-## Hammers
+### Hammers
 "orichalcum|hammer.hammer|hammer.long" = 45_000
 "orichalcum|hammer.hammer|hammer.medium" = 45_000
 "orichalcum|hammer.hammer|hammer.short" = 45_000
@@ -68,8 +281,10 @@ orientation = 0
 "orichalcum|hammer.ornate|hammer.short" = 45_000
 
 "orichalcum|hammer.greathammer|hammer.long" = 45_000
+"orichalcum|hammer.greathammer|hammer.medium" = 45_000
 
 "orichalcum|hammer.maul|hammer.long" = 45_000
+"orichalcum|hammer.maul|hammer.medium" = 45_000
 
 "orichalcum|hammer.warhammer|hammer.long" = 45_000
 "orichalcum|hammer.warhammer|hammer.medium" = 45_000
@@ -80,8 +295,10 @@ orientation = 0
 "orichalcum|hammer.spikedmace|hammer.short" = 45_000
 
 "orichalcum|hammer.greatmace|hammer.long" = 45_000
+"orichalcum|hammer.greatmace|hammer.medium" = 45_000
 
-## Bows
+## Eldwood
+### Bows
 "eldwood|bow.bow|bow.long" = 20_000
 "eldwood|bow.composite|bow.long" = 20_000
 "eldwood|bow.greatbow|bow.long" = 20_000
@@ -106,7 +323,7 @@ orientation = 0
 "eldwood|bow.shortbow|bow.short" = 20_000
 "eldwood|bow.warbow|bow.short" = 20_000
 
-## Staffs
+### Staffs
 "eldwood|staff.brand|staff.heavy" = 20_000
 "eldwood|staff.grandstaff|staff.heavy" = 20_000
 "eldwood|staff.longpole|staff.heavy" = 20_000
@@ -131,7 +348,7 @@ orientation = 0
 "eldwood|staff.rod|staff.light" = 20_000
 "eldwood|staff.staff|staff.light" = 20_000
 
-## Sceptres
+### Sceptres
 "eldwood|sceptre.arbor|sceptre.heavy" = 20_000
 "eldwood|sceptre.cane|sceptre.heavy" = 20_000
 "eldwood|sceptre.crook|sceptre.heavy" = 20_000
@@ -155,3 +372,158 @@ orientation = 0
 "eldwood|sceptre.grandsceptre|sceptre.light" = 20_000
 "eldwood|sceptre.ornate|sceptre.light" = 20_000
 "eldwood|sceptre.sceptre|sceptre.light" = 20_000
+
+## Bloodsteel
+### Axes
+"bloodsteel|axe.axe|axe.long" = 15_000
+"bloodsteel|axe.axe|axe.medium" = 15_000
+"bloodsteel|axe.axe|axe.short" = 15_000
+
+"bloodsteel|axe.greataxe|axe.long" = 15_000
+"bloodsteel|axe.greataxe|axe.medium" = 15_000
+
+"bloodsteel|axe.poleaxe|axe.long" = 15_000
+"bloodsteel|axe.poleaxe|axe.medium" = 15_000
+
+"bloodsteel|axe.battleaxe|axe.long" = 15_000
+"bloodsteel|axe.battleaxe|axe.medium" = 15_000
+"bloodsteel|axe.battleaxe|axe.short" = 15_000
+
+"bloodsteel|axe.jagged|axe.long" = 15_000
+"bloodsteel|axe.jagged|axe.medium" = 15_000
+"bloodsteel|axe.jagged|axe.short" = 15_000
+
+"bloodsteel|axe.labrys|axe.long" = 15_000
+"bloodsteel|axe.labrys|axe.medium" = 15_000
+
+"bloodsteel|axe.ornate|axe.long" = 15_000
+"bloodsteel|axe.ornate|axe.medium" = 15_000
+"bloodsteel|axe.ornate|axe.short" = 15_000
+
+### Swords
+"bloodsteel|sword.greatsword|sword.long" = 15_000
+"bloodsteel|sword.greatsword|sword.medium" = 15_000
+
+"bloodsteel|sword.katana|sword.long" = 15_000
+"bloodsteel|sword.katana|sword.medium" = 15_000
+"bloodsteel|sword.katana|sword.short" = 15_000
+
+"bloodsteel|sword.longsword|sword.long" = 15_000
+"bloodsteel|sword.longsword|sword.medium" = 15_000
+
+"bloodsteel|sword.ornate|sword.long" = 15_000
+"bloodsteel|sword.ornate|sword.medium" = 15_000
+"bloodsteel|sword.ornate|sword.short" = 15_000
+
+"bloodsteel|sword.sabre|sword.long" = 15_000
+"bloodsteel|sword.sabre|sword.medium" = 15_000
+"bloodsteel|sword.sabre|sword.short" = 15_000
+
+"bloodsteel|sword.sawblade|sword.long" = 15_000
+"bloodsteel|sword.sawblade|sword.medium" = 15_000
+"bloodsteel|sword.sawblade|sword.short" = 15_000
+
+"bloodsteel|sword.zweihander|sword.long" = 15_000
+"bloodsteel|sword.zweihander|sword.medium" = 15_000
+
+### Hammers
+"bloodsteel|hammer.hammer|hammer.long" = 15_000
+"bloodsteel|hammer.hammer|hammer.medium" = 15_000
+"bloodsteel|hammer.hammer|hammer.short" = 15_000
+
+"bloodsteel|hammer.ornate|hammer.long" = 15_000
+"bloodsteel|hammer.ornate|hammer.medium" = 15_000
+"bloodsteel|hammer.ornate|hammer.short" = 15_000
+
+"bloodsteel|hammer.greathammer|hammer.long" = 15_000
+"bloodsteel|hammer.greathammer|hammer.medium" = 15_000
+
+"bloodsteel|hammer.maul|hammer.long" = 15_000
+"bloodsteel|hammer.maul|hammer.medium" = 15_000
+
+"bloodsteel|hammer.warhammer|hammer.long" = 15_000
+"bloodsteel|hammer.warhammer|hammer.medium" = 15_000
+"bloodsteel|hammer.warhammer|hammer.short" = 15_000
+
+"bloodsteel|hammer.spikedmace|hammer.long" = 15_000
+"bloodsteel|hammer.spikedmace|hammer.medium" = 15_000
+"bloodsteel|hammer.spikedmace|hammer.short" = 15_000
+
+"bloodsteel|hammer.greatmace|hammer.long" = 15_000
+"bloodsteel|hammer.greatmace|hammer.medium" = 15_000
+
+## Frostwood
+### Bows
+"frostwood|bow.bow|bow.long" = 10_000
+"frostwood|bow.composite|bow.long" = 10_000
+"frostwood|bow.greatbow|bow.long" = 10_000
+"frostwood|bow.longbow|bow.long" = 10_000
+"frostwood|bow.ornate|bow.long" = 10_000
+"frostwood|bow.shortbow|bow.long" = 10_000
+"frostwood|bow.warbow|bow.long" = 10_000
+
+"frostwood|bow.bow|bow.medium" = 10_000
+"frostwood|bow.composite|bow.medium" = 10_000
+"frostwood|bow.greatbow|bow.medium" = 10_000
+"frostwood|bow.longbow|bow.medium" = 10_000
+"frostwood|bow.ornate|bow.medium" = 10_000
+"frostwood|bow.shortbow|bow.medium" = 10_000
+"frostwood|bow.warbow|bow.medium" = 10_000
+
+"frostwood|bow.bow|bow.short" = 10_000
+"frostwood|bow.composite|bow.short" = 10_000
+"frostwood|bow.greatbow|bow.short" = 10_000
+"frostwood|bow.longbow|bow.short" = 10_000
+"frostwood|bow.ornate|bow.short" = 10_000
+"frostwood|bow.shortbow|bow.short" = 10_000
+"frostwood|bow.warbow|bow.short" = 10_000
+
+### Staffs
+"frostwood|staff.brand|staff.heavy" = 10_000
+"frostwood|staff.grandstaff|staff.heavy" = 10_000
+"frostwood|staff.longpole|staff.heavy" = 10_000
+"frostwood|staff.ornate|staff.heavy" = 10_000
+"frostwood|staff.pole|staff.heavy" = 10_000
+"frostwood|staff.rod|staff.heavy" = 10_000
+"frostwood|staff.staff|staff.heavy" = 10_000
+
+"frostwood|staff.brand|staff.medium" = 10_000
+"frostwood|staff.grandstaff|staff.medium" = 10_000
+"frostwood|staff.longpole|staff.medium" = 10_000
+"frostwood|staff.ornate|staff.medium" = 10_000
+"frostwood|staff.pole|staff.medium" = 10_000
+"frostwood|staff.rod|staff.medium" = 10_000
+"frostwood|staff.staff|staff.medium" = 10_000
+
+"frostwood|staff.brand|staff.light" = 10_000
+"frostwood|staff.grandstaff|staff.light" = 10_000
+"frostwood|staff.longpole|staff.light" = 10_000
+"frostwood|staff.ornate|staff.light" = 10_000
+"frostwood|staff.pole|staff.light" = 10_000
+"frostwood|staff.rod|staff.light" = 10_000
+"frostwood|staff.staff|staff.light" = 10_000
+
+### Sceptres
+"frostwood|sceptre.arbor|sceptre.heavy" = 10_000
+"frostwood|sceptre.cane|sceptre.heavy" = 10_000
+"frostwood|sceptre.crook|sceptre.heavy" = 10_000
+"frostwood|sceptre.crozier|sceptre.heavy" = 10_000
+"frostwood|sceptre.grandsceptre|sceptre.heavy" = 10_000
+"frostwood|sceptre.ornate|sceptre.heavy" = 10_000
+"frostwood|sceptre.sceptre|sceptre.heavy" = 10_000
+
+"frostwood|sceptre.arbor|sceptre.medium" = 10_000
+"frostwood|sceptre.cane|sceptre.medium" = 10_000
+"frostwood|sceptre.crook|sceptre.medium" = 10_000
+"frostwood|sceptre.crozier|sceptre.medium" = 10_000
+"frostwood|sceptre.grandsceptre|sceptre.medium" = 10_000
+"frostwood|sceptre.ornate|sceptre.medium" = 10_000
+"frostwood|sceptre.sceptre|sceptre.medium" = 10_000
+
+"frostwood|sceptre.arbor|sceptre.light" = 10_000
+"frostwood|sceptre.cane|sceptre.light" = 10_000
+"frostwood|sceptre.crook|sceptre.light" = 10_000
+"frostwood|sceptre.crozier|sceptre.light" = 10_000
+"frostwood|sceptre.grandsceptre|sceptre.light" = 10_000
+"frostwood|sceptre.ornate|sceptre.light" = 10_000
+"frostwood|sceptre.sceptre|sceptre.light" = 10_000

src/bot.rs

@@ -11,7 +11,9 @@ use hashbrown::HashMap;
 use log::{debug, info};
 use tokio::runtime::Runtime;
 use vek::{Quaternion, Vec3};
-use veloren_client::{addr::ConnectionArgs, Client, Event as VelorenEvent, SiteInfoRich, WorldExt};
+use veloren_client::{
+    addr::ConnectionArgs, Client, ClientType, Event as VelorenEvent, SiteInfoRich, WorldExt,
+};
 use veloren_client_i18n::LocalizationHandle;
 use veloren_common::{
     clock::Clock,
@@ -1036,6 +1038,7 @@ fn connect_to_veloren(
             &|_| {},
             |_| {},
             Default::default(),
+            ClientType::Bot { privileged: false },
         ))
         .map_err(|error| format!("{error:?}"))
 }