From 1d94adc2e12b3ba9a21d6d01569d8572c30656a1 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Fri, 10 Sep 2021 08:34:01 +0000 Subject: [PATCH] 0.11 Background images and more --- assets/common/entity/spot/pirate.ron | 6 ++-- assets/common/entity/spot/witch_dark.ron | 8 ++--- assets/common/items/lantern/pumpkin.ron | 2 +- assets/common/loot_tables/creature/witch.ron | 8 +++++ assets/common/skillset/spots/general_max.ron | 4 +++ assets/common/skillset/spots/sceptre_max.ron | 21 +++++++++++++ assets/common/skillset/spots/witch.ron | 4 +++ assets/server/manifests/kits.ron | 3 +- assets/voxygen/background/bg_1.jpg | 4 +-- assets/voxygen/background/bg_10.jpg | 4 +-- assets/voxygen/background/bg_11.jpg | 4 +-- assets/voxygen/background/bg_12.jpg | 4 +-- assets/voxygen/background/bg_13.jpg | 4 +-- assets/voxygen/background/bg_2.jpg | 4 +-- assets/voxygen/background/bg_3.jpg | 4 +-- assets/voxygen/background/bg_4.jpg | 4 +-- assets/voxygen/background/bg_5.jpg | 4 +-- assets/voxygen/background/bg_6.jpg | 4 +-- assets/voxygen/background/bg_7.jpg | 4 +-- assets/voxygen/background/bg_8.jpg | 4 +-- assets/voxygen/background/bg_9.jpg | 4 +-- assets/voxygen/background/bg_main.jpg | 4 +-- assets/voxygen/voxel/armor/witch/hat.vox | 4 +-- assets/voxygen/voxel/fixture/selection_bg.vox | 4 +-- .../voxel/humanoid_armor_head_manifest.ron | 2 +- assets/voxygen/voxel/object_manifest.ron | 30 ++++++++++++++++++ assets/voxygen/voxel/sprite/bone/bone-1.vox | 3 ++ assets/voxygen/voxel/sprite/bone/bone-2.vox | 3 ++ assets/voxygen/voxel/sprite/bone/bone-3.vox | 3 ++ assets/voxygen/voxel/sprite/bone/bone-4.vox | 3 ++ assets/voxygen/voxel/sprite/bone/bone-5.vox | 3 ++ assets/voxygen/voxel/sprite_manifest.ron | 31 +++++++++++++++++++ assets/world/manifests/spots/arch.ron | 2 +- assets/world/manifests/spots/big-mushroom.ron | 2 +- assets/world/manifests/spots/gnome_spring.ron | 12 +++++++ .../world/manifests/spots_general/igloo.ron | 2 +- .../manifests/spots_savannah/lion_rock.ron | 2 +- .../manifests/spots_savannah/wolf_burrow.ron | 8 ++++- assets/world/structure/natural/arch-1.vox | 4 +-- assets/world/structure/natural/arch.vox | 4 +-- .../world/structure/natural/big_mushroom.vox | 4 +-- .../world/structure/natural/gnome_spring.vox | 3 ++ assets/world/structure/natural/igloo.vox | 4 +-- assets/world/structure/natural/lionrock_0.vox | 4 +-- .../world/structure/natural/wolf_burrow.vox | 4 +-- common/src/comp/body/object.rs | 14 ++++++++- common/src/terrain/sprite.rs | 1 + server/src/events/entity_manipulation.rs | 10 ++++-- voxygen/src/hud/diary.rs | 12 +++++-- voxygen/src/settings/interface.rs | 8 ++--- world/src/layer/spot.rs | 30 ++++++++---------- 51 files changed, 242 insertions(+), 86 deletions(-) create mode 100644 assets/common/loot_tables/creature/witch.ron create mode 100644 assets/common/skillset/spots/general_max.ron create mode 100644 assets/common/skillset/spots/sceptre_max.ron create mode 100644 assets/common/skillset/spots/witch.ron create mode 100644 assets/voxygen/voxel/sprite/bone/bone-1.vox create mode 100644 assets/voxygen/voxel/sprite/bone/bone-2.vox create mode 100644 assets/voxygen/voxel/sprite/bone/bone-3.vox create mode 100644 assets/voxygen/voxel/sprite/bone/bone-4.vox create mode 100644 assets/voxygen/voxel/sprite/bone/bone-5.vox create mode 100644 assets/world/manifests/spots/gnome_spring.ron create mode 100644 assets/world/structure/natural/gnome_spring.vox diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index 330bc5df87..a34722757c 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -7,9 +7,9 @@ EntityConfig ( beard: 0, eyes: 0, accessory: 0, - hair_color: 0, - skin: 0, - eye_color: 0, + hair_color: 12, + skin: 8, + eye_color: 3, ))), alignment: Alignment(Enemy), diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron index 15451c7db4..8bc0670d08 100644 --- a/assets/common/entity/spot/witch_dark.ron +++ b/assets/common/entity/spot/witch_dark.ron @@ -3,17 +3,17 @@ EntityConfig ( body: Exact(Humanoid(Body( species: Human, body_type: Female, - hair_style: 2, + hair_style: 15, beard: 0, eyes: 0, accessory: 0, - hair_color: 0, + hair_color: 12, skin: 0, - eye_color: 0, + eye_color: 1, ))), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.creature.witch"), hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")), diff --git a/assets/common/items/lantern/pumpkin.ron b/assets/common/items/lantern/pumpkin.ron index 0c14993fdc..ecd2cdcde7 100644 --- a/assets/common/items/lantern/pumpkin.ron +++ b/assets/common/items/lantern/pumpkin.ron @@ -9,6 +9,6 @@ ItemDef( flicker_thousandths: 600, ), ), - quality: High, + quality: Epic, tags: [Utility], ) diff --git a/assets/common/loot_tables/creature/witch.ron b/assets/common/loot_tables/creature/witch.ron new file mode 100644 index 0000000000..117c82b8a3 --- /dev/null +++ b/assets/common/loot_tables/creature/witch.ron @@ -0,0 +1,8 @@ +[ + (0.001, Item("common.items.lantern.pumpkin")), + (2.0, LootTable("common.loot_tables.materials.common")), + (0.1, Item("common.items.armor.misc.ring.gold")), + (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (0.1, LootTable("common.loot_tables.weapons.tier-4")), + (1.5, LootTable("common.loot_tables.food.prepared")), +] \ No newline at end of file diff --git a/assets/common/skillset/spots/general_max.ron b/assets/common/skillset/spots/general_max.ron new file mode 100644 index 0000000000..be6cbdf4aa --- /dev/null +++ b/assets/common/skillset/spots/general_max.ron @@ -0,0 +1,4 @@ +([ + Skill((General(HealthIncrease), Some(10))), + Skill((General(EnergyIncrease), Some(5))), +]) diff --git a/assets/common/skillset/spots/sceptre_max.ron b/assets/common/skillset/spots/sceptre_max.ron new file mode 100644 index 0000000000..39fe5f497f --- /dev/null +++ b/assets/common/skillset/spots/sceptre_max.ron @@ -0,0 +1,21 @@ +([ + Group(Weapon(Sceptre)), + + // Beam + Skill((Sceptre(LDamage), Some(3))), + Skill((Sceptre(LRange), Some(2))), + Skill((Sceptre(LLifesteal), Some(3))), + Skill((Sceptre(LRegen), Some(2))), + + // Heal + Skill((Sceptre(HHeal), Some(3))), + Skill((Sceptre(HDuration), Some(2))), + Skill((Sceptre(HRange), Some(2))), + Skill((Sceptre(HCost), Some(2))), + // Ward + Skill((Sceptre(UnlockAura), None)), + Skill((Sceptre(AStrength), Some(2))), + Skill((Sceptre(ADuration), Some(2))), + Skill((Sceptre(ARange), Some(2))), + Skill((Sceptre(ACost), Some(2))), +]) diff --git a/assets/common/skillset/spots/witch.ron b/assets/common/skillset/spots/witch.ron new file mode 100644 index 0000000000..e3ab4a47aa --- /dev/null +++ b/assets/common/skillset/spots/witch.ron @@ -0,0 +1,4 @@ +([ + Tree("common.skillset.spots.general_max"), + Tree("common.skillset.spots.sceptre_max"), +]) diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index be958331b3..3350bba1d4 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -358,8 +358,7 @@ ("common.items.armor.witch.belt",1), ("common.items.armor.witch.chest",1), ("common.items.armor.witch.hand",1), - ("common.items.armor.witch.foot",1), - ("common.items.armor.witch.hand",1), + ("common.items.armor.witch.foot",1), ("common.items.armor.witch.hat",1), ("common.items.armor.witch.pants",1), ("common.items.armor.witch.shoulder",1), diff --git a/assets/voxygen/background/bg_1.jpg b/assets/voxygen/background/bg_1.jpg index 1f3a36e64a..2575973a09 100644 --- a/assets/voxygen/background/bg_1.jpg +++ b/assets/voxygen/background/bg_1.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a27164c57a5c6e6adce341252317dbc34a00375f10b3a250d8c14b221ae2ec27 -size 226101 +oid sha256:82a44444b387b114547c1e1a07de0a8671f12272cc67edbd76d15dccd1f9411c +size 233996 diff --git a/assets/voxygen/background/bg_10.jpg b/assets/voxygen/background/bg_10.jpg index 447bf5fac4..3f175a26d6 100644 --- a/assets/voxygen/background/bg_10.jpg +++ b/assets/voxygen/background/bg_10.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aea5f2986b1ec58751309e20c9c0c61a1eab8930316196a91255b7d2d6d9b5aa -size 918935 +oid sha256:b388b848c5a63761f885a47c3daee6b7be6cb657d14dcc80164473b11c942621 +size 190459 diff --git a/assets/voxygen/background/bg_11.jpg b/assets/voxygen/background/bg_11.jpg index abd63f9c7a..af4e4d66b0 100644 --- a/assets/voxygen/background/bg_11.jpg +++ b/assets/voxygen/background/bg_11.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2ea61625000f6404fd1e5ffd72785ede6409a5b688db25ac7734105ae57c775 -size 888841 +oid sha256:d0b89bbc491ccc9b3fbd688a0b47370eeb8c07e762b1e6c10375390370dff1f8 +size 243301 diff --git a/assets/voxygen/background/bg_12.jpg b/assets/voxygen/background/bg_12.jpg index 8fc111642a..6cc50a49e3 100644 --- a/assets/voxygen/background/bg_12.jpg +++ b/assets/voxygen/background/bg_12.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26dc6a512343266c3b486c30db6da8a92b8a3fa2be83159a4001d66d1e5e8009 -size 149508 +oid sha256:265d50fd4dc7603c17d82025aa2268f7f3cd12c4b2f53f63b5d7381c54485c6e +size 176886 diff --git a/assets/voxygen/background/bg_13.jpg b/assets/voxygen/background/bg_13.jpg index 12af3eb536..51b8cbc600 100644 --- a/assets/voxygen/background/bg_13.jpg +++ b/assets/voxygen/background/bg_13.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6df7d1e82f20da3f46a7ab909ae8a0b6102f7945794d0a690218cdc6d34dceb -size 166695 +oid sha256:2409d53d9a8f7dabc65882cc521960b82089178a6375feac2efa7c7a88615205 +size 207302 diff --git a/assets/voxygen/background/bg_2.jpg b/assets/voxygen/background/bg_2.jpg index 9661ef9dc5..87a1055aa7 100644 --- a/assets/voxygen/background/bg_2.jpg +++ b/assets/voxygen/background/bg_2.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a90c88c855a19e27580ea42f7d85248c0c15a48bdcda959a295f911dd9ab4221 -size 204292 +oid sha256:dd22d7418e96bbaf0692a1fc7da3d086d57744345c3382643ad339896b7d935b +size 445849 diff --git a/assets/voxygen/background/bg_3.jpg b/assets/voxygen/background/bg_3.jpg index e4bd6a7322..9ffe223522 100644 --- a/assets/voxygen/background/bg_3.jpg +++ b/assets/voxygen/background/bg_3.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:348dace603b51dcf9aa56602fe24e1e34631142d96e12eadce14c228a2c7825f -size 838789 +oid sha256:002bc411c1db704a478b85d1a245dcca0400a4863fac3f005f681ad0e29e465e +size 94648 diff --git a/assets/voxygen/background/bg_4.jpg b/assets/voxygen/background/bg_4.jpg index 5e80d2b35d..551e958598 100644 --- a/assets/voxygen/background/bg_4.jpg +++ b/assets/voxygen/background/bg_4.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3774ae810427c148a8b8d48b434f85438ea3352414229ca51213115e1444dde5 -size 362772 +oid sha256:8df2e3ecd8843fb47da6479cd9c7fbb564ad06a906a16bd04be46c894b087ac0 +size 574151 diff --git a/assets/voxygen/background/bg_5.jpg b/assets/voxygen/background/bg_5.jpg index 6575f8fa53..430b44196a 100644 --- a/assets/voxygen/background/bg_5.jpg +++ b/assets/voxygen/background/bg_5.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc1c2f6f9f1dfc904f46eb6540fdbb15e5367f44a14322a525111cc4d666e28 -size 619281 +oid sha256:a1724fb69ba345ade7d6230548a32f10390cbf9f854370d6db596f2c494ba714 +size 528074 diff --git a/assets/voxygen/background/bg_6.jpg b/assets/voxygen/background/bg_6.jpg index 1d72e29ef8..05944c5331 100644 --- a/assets/voxygen/background/bg_6.jpg +++ b/assets/voxygen/background/bg_6.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7385e6c32080459cf8a667cb1e302bed9416e7dcd5e39e2930726e797238d4be -size 522922 +oid sha256:7b84b5221ca3133597700c8e0ce1fcb9b7a43898f28c4e5fde113628fca83621 +size 218159 diff --git a/assets/voxygen/background/bg_7.jpg b/assets/voxygen/background/bg_7.jpg index 280be23cb0..386c1d6d1b 100644 --- a/assets/voxygen/background/bg_7.jpg +++ b/assets/voxygen/background/bg_7.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a712e86e1ab5a3a2db292e34d637e1d7936dd711401df4bfa18e136f4462dad0 -size 208441 +oid sha256:5af3bfd4d4f5232043ac8d5e826c8a1615cbba51248d1b79caacca830efa283a +size 273010 diff --git a/assets/voxygen/background/bg_8.jpg b/assets/voxygen/background/bg_8.jpg index e276755ec8..387072e849 100644 --- a/assets/voxygen/background/bg_8.jpg +++ b/assets/voxygen/background/bg_8.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:882088822becbf3ff812c3c952606a353f6c448d5c2d923b6e34dab9c9fb0db4 -size 192300 +oid sha256:b72e448a44be210173bda077fc45268e46fc35f3cd284021b835b2f6bdfc0ebd +size 393699 diff --git a/assets/voxygen/background/bg_9.jpg b/assets/voxygen/background/bg_9.jpg index bc3a7f6181..20ec9f0345 100644 --- a/assets/voxygen/background/bg_9.jpg +++ b/assets/voxygen/background/bg_9.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64f48dbd1541451d73c290df7c12620030f9ac6c146a776c736cb0e1d59343fd -size 429957 +oid sha256:4d7113dffc0c0c725bbd39f001c66997c1870b51489eb601176a4505cbaa7c55 +size 236639 diff --git a/assets/voxygen/background/bg_main.jpg b/assets/voxygen/background/bg_main.jpg index b287b8064e..a36085c913 100644 --- a/assets/voxygen/background/bg_main.jpg +++ b/assets/voxygen/background/bg_main.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5cdc80edb4c64b436d4fa119edb6c8e3a963c5765697101613d7581c1be0d15 -size 326620 +oid sha256:b8c25e7e30c2fdc3d3c489a66d9ca1b6f06fe14190be28399e7477055d4e3404 +size 668015 diff --git a/assets/voxygen/voxel/armor/witch/hat.vox b/assets/voxygen/voxel/armor/witch/hat.vox index 651a71a91d..40e5727df7 100644 --- a/assets/voxygen/voxel/armor/witch/hat.vox +++ b/assets/voxygen/voxel/armor/witch/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2b0355f93f1210cd361d31a53000716eb5604d32c6ff27db6c89ba47e3f72dd -size 5272 +oid sha256:4eb3a03d09c2a420898d5944f7334695175c3f76c6565d7d582258c00d0bfd4d +size 5612 diff --git a/assets/voxygen/voxel/fixture/selection_bg.vox b/assets/voxygen/voxel/fixture/selection_bg.vox index ad322ea087..dfe8546cfd 100644 --- a/assets/voxygen/voxel/fixture/selection_bg.vox +++ b/assets/voxygen/voxel/fixture/selection_bg.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf4c380f75e788fe67c6f3673e0c638eb4ff467f512b73a6a57dd371e0c14ef8 -size 595564 +oid sha256:88283bacea75c38947c0816d7308df198e5771d1853767398af3466d0fb1b106 +size 595784 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 93486d9ade..1c7d876a40 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -29,7 +29,7 @@ color: None ), (Human, "Witch"): ( - vox_spec: ("armor.witch.hat", (-2.0, -2.0, 5.0)), + vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)), color: None ), (Human, "Pirate"): ( diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index 8f7cfaace4..9bb9166282 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -769,4 +769,34 @@ central: ("armor.empty"), ) ), + Apple: ( + bone0: ( + offset: (-5.5, -5.5, 0.0), + central: ("sprite.fruit.apple"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + Hive: ( + bone0: ( + offset: (-5.5, -5.5, 0.0), + central: ("sprite.beehive.beehive"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), + Coconut: ( + bone0: ( + offset: (-4.5, -4.5, 0.0), + central: ("sprite.fruit.coconut"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), }) diff --git a/assets/voxygen/voxel/sprite/bone/bone-1.vox b/assets/voxygen/voxel/sprite/bone/bone-1.vox new file mode 100644 index 0000000000..d25f04a0d6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bone/bone-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c344cdada89d6d00fd324e1051a1816a0a3067f027dfb40ce507b745cf352466 +size 1520 diff --git a/assets/voxygen/voxel/sprite/bone/bone-2.vox b/assets/voxygen/voxel/sprite/bone/bone-2.vox new file mode 100644 index 0000000000..0438cd0cd1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bone/bone-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b9bfb183869cb4c5aff500816ef51a4426baa9635c8f14926b8b985d2f59ad9 +size 1156 diff --git a/assets/voxygen/voxel/sprite/bone/bone-3.vox b/assets/voxygen/voxel/sprite/bone/bone-3.vox new file mode 100644 index 0000000000..f264230dad --- /dev/null +++ b/assets/voxygen/voxel/sprite/bone/bone-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a59a3511889159c022144cc41b2e6d197cb48b9d1cbd70010cd1fc6fb58c11b +size 1156 diff --git a/assets/voxygen/voxel/sprite/bone/bone-4.vox b/assets/voxygen/voxel/sprite/bone/bone-4.vox new file mode 100644 index 0000000000..4f35f94687 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bone/bone-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aed294f5934e5f43e91c8b2c6da01b177a5e6d50c2ba8abcb00e0f2d9f7cfa69 +size 1160 diff --git a/assets/voxygen/voxel/sprite/bone/bone-5.vox b/assets/voxygen/voxel/sprite/bone/bone-5.vox new file mode 100644 index 0000000000..f334fde0e9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bone/bone-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:030b3d8f41b44bac43f9d3d7fcf2a3434a9c78b4215af51b87096c0f59a9dd7a +size 1404 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 6967488fad..79f99e2112 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -3279,4 +3279,35 @@ WitchWindow: Some(( ], wind_sway: 0.0, )), +// Bones +Bones: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.bone.bone-1", + offset: (-3.0, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.bone.bone-2", + offset: (-1.0, -5.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.bone.bone-3", + offset: (-1.5, -4.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.bone.bone-4", + offset: (-3.5, -5.0, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.bone.bone-5", + offset: (-4.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), ) diff --git a/assets/world/manifests/spots/arch.ron b/assets/world/manifests/spots/arch.ron index 15e0d54744..b98b392043 100644 --- a/assets/world/manifests/spots/arch.ron +++ b/assets/world/manifests/spots/arch.ron @@ -7,6 +7,6 @@ ), ( specifier: "world.structure.natural.arch-1", - center: (14, 12, 10) + center: (12, 12, 10) ), ] diff --git a/assets/world/manifests/spots/big-mushroom.ron b/assets/world/manifests/spots/big-mushroom.ron index 731ffa5e71..210adf5d04 100644 --- a/assets/world/manifests/spots/big-mushroom.ron +++ b/assets/world/manifests/spots/big-mushroom.ron @@ -3,6 +3,6 @@ [ ( specifier: "world.structure.natural.big_mushroom", - center: (12, 12, 4), + center: (14, 14, 15), ), ] diff --git a/assets/world/manifests/spots/gnome_spring.ron b/assets/world/manifests/spots/gnome_spring.ron new file mode 100644 index 0000000000..e8b2de1968 --- /dev/null +++ b/assets/world/manifests/spots/gnome_spring.ron @@ -0,0 +1,12 @@ +#![enable(unwrap_newtypes)] + +[ + ( + specifier: "world.structure.natural.gnome_spring", + center: (10, 10, 4), + custom_indices: { + 136: Filled(GlowingRock, (r: 0, g: 255, b: 255)), + 17: Sprite(PinkFlower), + }, + ), +] diff --git a/assets/world/manifests/spots_general/igloo.ron b/assets/world/manifests/spots_general/igloo.ron index 4f0a4aaf01..c391e400f5 100644 --- a/assets/world/manifests/spots_general/igloo.ron +++ b/assets/world/manifests/spots_general/igloo.ron @@ -3,6 +3,6 @@ [ ( specifier: "world.structure.natural.igloo", - center: (13, 10, 2), + center: (14, 13, 3), ), ] diff --git a/assets/world/manifests/spots_savannah/lion_rock.ron b/assets/world/manifests/spots_savannah/lion_rock.ron index c26ef970f4..eb9e36ecb1 100644 --- a/assets/world/manifests/spots_savannah/lion_rock.ron +++ b/assets/world/manifests/spots_savannah/lion_rock.ron @@ -3,6 +3,6 @@ [ ( specifier: "world.structure.natural.lionrock_0", - center: (16, 16, 5) + center: (14, 13, 5) ), ] diff --git a/assets/world/manifests/spots_savannah/wolf_burrow.ron b/assets/world/manifests/spots_savannah/wolf_burrow.ron index 85d2d6fc60..116c4b6e80 100644 --- a/assets/world/manifests/spots_savannah/wolf_burrow.ron +++ b/assets/world/manifests/spots_savannah/wolf_burrow.ron @@ -3,6 +3,12 @@ [ ( specifier: "world.structure.natural.wolf_burrow", - center: (10, 10, 0), + center: (10, 10, 6), + custom_indices: { + 20: Sprite(ShortGrass), + 19: Sprite(Mushroom), + 18: Sprite(Chest), + 17: Sprite(Bones), + }, ), ] diff --git a/assets/world/structure/natural/arch-1.vox b/assets/world/structure/natural/arch-1.vox index 2337953b8e..4b970b08cd 100644 --- a/assets/world/structure/natural/arch-1.vox +++ b/assets/world/structure/natural/arch-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3b0fc13c4bbaf84c00666ca36e7e182dd7b6e35c6ac906b46b825a3339e7ffd -size 11464 +oid sha256:13e3bb084da193ab95b31ac60bb60f949af443c0bdcdab938b2b0252ea040d43 +size 11000 diff --git a/assets/world/structure/natural/arch.vox b/assets/world/structure/natural/arch.vox index b44d649278..ef83f062ac 100644 --- a/assets/world/structure/natural/arch.vox +++ b/assets/world/structure/natural/arch.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ee229dd104a333ee0c82dfba6bef7a045b2136c4f5c3521e843996d8e1825da -size 43428 +oid sha256:7c5d0d4b399031f95e2c5e9affad2e5cb6f0a3d3233677b28396858b89e98ce1 +size 44620 diff --git a/assets/world/structure/natural/big_mushroom.vox b/assets/world/structure/natural/big_mushroom.vox index ccf910b96a..99a464282a 100644 --- a/assets/world/structure/natural/big_mushroom.vox +++ b/assets/world/structure/natural/big_mushroom.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:739c9327bbccbb8f9cbe706b85a7a9d259cf3e14766c9beca6e42974e86d092a -size 16480 +oid sha256:b0c4cdb7c6405a90b027511fa4fe5132eb656b07896c560c48147844b67ffb50 +size 18608 diff --git a/assets/world/structure/natural/gnome_spring.vox b/assets/world/structure/natural/gnome_spring.vox new file mode 100644 index 0000000000..8876666c81 --- /dev/null +++ b/assets/world/structure/natural/gnome_spring.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be02bb496cad5ba81cad5fb9476dd9279e2accdb29b73f09c67827ab13198d56 +size 8512 diff --git a/assets/world/structure/natural/igloo.vox b/assets/world/structure/natural/igloo.vox index 405e952460..36c610cf1b 100644 --- a/assets/world/structure/natural/igloo.vox +++ b/assets/world/structure/natural/igloo.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6dc8742c6ee8a9bf8eb6c79a6a8b2023899291ce91cb92fcb645057d2ced5e8 -size 13416 +oid sha256:ba785df4931e6c7e524b4e04967fe1dc8c69157acde43a8985811ed730394e68 +size 25232 diff --git a/assets/world/structure/natural/lionrock_0.vox b/assets/world/structure/natural/lionrock_0.vox index ced6a66b6d..d3e3787e2a 100644 --- a/assets/world/structure/natural/lionrock_0.vox +++ b/assets/world/structure/natural/lionrock_0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bdcc7499dc204c5d2849380cd205ac0748276a878b7fbd090b869fb11ef569b -size 22528 +oid sha256:9286fb48d9996e3bdd5ff8f3ed914fc49c5b6c6ed2563b653c6ea06b72ae6cc5 +size 22016 diff --git a/assets/world/structure/natural/wolf_burrow.vox b/assets/world/structure/natural/wolf_burrow.vox index ade5efa217..7baec93c7f 100644 --- a/assets/world/structure/natural/wolf_burrow.vox +++ b/assets/world/structure/natural/wolf_burrow.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8e6fdca69915c8655f7c6dcd4868e470c334ff0225cf59c67379b30768dfe0a -size 13088 +oid sha256:a251945a41ed9e46688ad1e5ab7705535264957ef807e305a823b715bbc6d264 +size 16044 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 45140e2a3b..950aeab136 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -89,6 +89,9 @@ make_case_elim!( FishMeat = 74, SmallMeat = 75, Tornado = 76, + Apple = 77, + Hive = 78, + Coconut = 79, } ); @@ -99,7 +102,7 @@ impl Body { } } -pub const ALL_OBJECTS: [Body; 77] = [ +pub const ALL_OBJECTS: [Body; 80] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -177,6 +180,9 @@ pub const ALL_OBJECTS: [Body; 77] = [ Body::FishMeat, Body::SmallMeat, Body::Tornado, + Body::Apple, + Body::Hive, + Body::Coconut, ]; impl From for super::Body { @@ -263,6 +269,9 @@ impl Body { Body::FishMeat => "fish_meat", Body::SmallMeat => "small_meat", Body::Tornado => "tornado", + Body::Apple => "apple", + Body::Hive => "hive", + Body::Coconut => "coconut", } } @@ -361,6 +370,9 @@ impl Body { Body::BirdMeat => 10.0, Body::SmallMeat => 10.0, Body::Tornado => 50.0, + Body::Apple => 2.0, + Body::Hive => 2.0, + Body::Coconut => 2.0, }; Mass(m) diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index d7e918dd9d..cf67732a01 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -176,6 +176,7 @@ make_case_elim!( EnsnaringVines = 0x95, WitchWindow = 0x96, SmokeDummy = 0x97, + Bones = 0x98, } ); diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 972cae560f..62787a6fbd 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -1044,12 +1044,18 @@ pub fn handle_bonk(server: &mut Server, pos: Vec3, _owner: Option, tar drop(block_change); server .state - .create_object(Default::default(), comp::object::Body::Pouch) + .create_object(Default::default(), match block.get_sprite() { + // Create different containers depending on the original sprite + Some(SpriteKind::Apple) => comp::object::Body::Apple, + Some(SpriteKind::Beehive) => comp::object::Body::Hive, + Some(SpriteKind::Coconut) => comp::object::Body::Coconut, + _ => comp::object::Body::Pouch, + }) .with(comp::Pos(pos.map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0))) .with(item) .build(); } - } + }; } } } diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index c2ab6b23d0..f40feff4d8 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -504,9 +504,17 @@ impl<'a> Widget for Diary<'a> { .set(state.exp_bar_txt, ui); } Text::new(&rank_txt) - .mid_top_with_margin_on(state.exp_bar_frame, 5.0) + .mid_top_with_margin_on(state.exp_bar_frame, match rank { + 0..=99 => 5.0, + 100..=999 => 8.0, + _ => 10.0, + }) .font_id(self.fonts.cyri.conrod_id) - .font_size(self.fonts.cyri.scale(28)) + .font_size(self.fonts.cyri.scale(match rank { + 0..=99 => 28, + 100..=999 => 21, + _ => 15, + })) .color(TEXT_COLOR) .set(state.exp_bar_rank, ui); diff --git a/voxygen/src/settings/interface.rs b/voxygen/src/settings/interface.rs index 84a87656f1..4f37880dda 100644 --- a/voxygen/src/settings/interface.rs +++ b/voxygen/src/settings/interface.rs @@ -65,7 +65,7 @@ impl Default for InterfaceSettings { ui_scale: ScaleMode::RelativeToWindow([1920.0, 1080.0].into()), map_zoom: 10.0, map_drag: Vec2 { x: 0.0, y: 0.0 }, - map_show_topo_map: false, + map_show_topo_map: true, map_show_difficulty: true, map_show_towns: true, map_show_dungeons: true, @@ -74,10 +74,10 @@ impl Default for InterfaceSettings { map_show_caves: true, map_show_trees: false, map_show_peaks: false, - map_show_voxel_map: false, + map_show_voxel_map: true, minimap_show: true, - minimap_face_north: false, - minimap_zoom: 10.0, + minimap_face_north: true, + minimap_zoom: 160.0, } } } diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs index 5015e91846..1a3590a1dd 100644 --- a/world/src/layer/spot.rs +++ b/world/src/layer/spot.rs @@ -38,7 +38,7 @@ pub enum Spot { GnarlingTotem, WitchHouse, PirateHideout, - BigMushroom, + GnomeSpring, WolfBurrow, Igloo, //BanditCamp, @@ -85,7 +85,7 @@ impl Spot { Self::generate_spots( Spot::Igloo, world, - 100.0, + 2.0, |g, c| { g < 0.5 && !c.near_cliffs() @@ -99,7 +99,7 @@ impl Spot { Self::generate_spots( Spot::PirateHideout, world, - 3.0, + 2.0, |g, c| { g < 0.25 && !c.near_cliffs() @@ -198,7 +198,7 @@ impl Spot { Self::generate_spots( Spot::WolfBurrow, world, - 10.0, + 1.5, |g, c| { g < 0.25 && !c.near_cliffs() @@ -280,9 +280,9 @@ impl Spot { true, ); Self::generate_spots( - Spot::BigMushroom, + Spot::GnomeSpring, world, - 20.0, + 1.0, |g, c| { g < 0.25 && !c.near_cliffs() @@ -291,7 +291,7 @@ impl Spot { && c.sites.is_empty() && matches!(c.get_biome(), Forest) }, - true, + false, ); Self::generate_spots( Spot::Shipwreck, @@ -305,7 +305,6 @@ impl Spot { // Missing: /* - Witch House Bandit Camp Hunter Camp TowerRuinForest @@ -314,9 +313,6 @@ impl Spot { Merchant Outpost -> Near a road! *Quirky:* TreeHouse (Forest) - TreeStump (Forest, Grassland) - DesertBones (Desert, Savannah) - AirshipCrash (Desert, Savannah, Grassland) EnchantedRock (Forest, Jungle) */ } @@ -389,9 +385,9 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { base_structures: Some("spots.jungle.saurok-altar"), entity_radius: 6.0, entities: &[ - (2..4, "common.entity.wild.aggressive.occult_saurok"), - (2..4, "common.entity.wild.aggressive.sly_saurok"), - (2..4, "common.entity.wild.aggressive.mighty_saurok"), + (0..3, "common.entity.wild.aggressive.occult_saurok"), + (0..3, "common.entity.wild.aggressive.sly_saurok"), + (0..3, "common.entity.wild.aggressive.mighty_saurok"), ], }, Spot::RockCircle => SpotConfig { @@ -452,7 +448,7 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { }, Spot::WolfBurrow => SpotConfig { base_structures: Some("spots_savannah.wolf_burrow"), - entity_radius: 0.2, + entity_radius: 10.0, entities: &[(5..8, "common.entity.wild.aggressive.wolf")], }, Spot::TreeStumpForest => SpotConfig { @@ -480,8 +476,8 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { entity_radius: 2.0, entities: &[(0..2, "common.entity.wild.peaceful.bear")], }, - Spot::BigMushroom => SpotConfig { - base_structures: Some("spots.big-mushroom"), + Spot::GnomeSpring => SpotConfig { + base_structures: Some("spots.gnome_spring"), entity_radius: 40.0, entities: &[(7..10, "common.entity.spot.gnome.spear")], },