diff --git a/assets/common/items/armor/back/velorite_mage_0.ron b/assets/common/items/armor/back/velorite_mage_0.ron new file mode 100644 index 0000000000..76fda525bc --- /dev/null +++ b/assets/common/items/armor/back/velorite_mage_0.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Velorite Battlemage Cloak", + description: "Keeps your shoulders warm.", + kind: Armor( + ( + kind: Back("VeloriteMage0"), + stats: ( + protection: Normal(2.8)), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/belt/velorite_mage_0.ron b/assets/common/items/armor/belt/velorite_mage_0.ron new file mode 100644 index 0000000000..d06b094920 --- /dev/null +++ b/assets/common/items/armor/belt/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Belt", + description: "", + kind: Armor( + ( + kind: Belt("VeloriteMage0"), + stats: ( + protection: Normal(5.8) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/chest/cultist_chest_blue.ron index 77e0ab465f..c5449652f2 100644 --- a/assets/common/items/armor/chest/cultist_chest_blue.ron +++ b/assets/common/items/armor/chest/cultist_chest_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Chest", + name: "Velorite Chest", description: "Ceremonial attire used by members.", kind: Armor( ( - kind: Chest("CultistBlue"), + kind: Chest("VeloriteMage0"), stats: ( protection: Normal(30.0)), ) diff --git a/assets/common/items/armor/chest/velorite_mage_0.ron b/assets/common/items/armor/chest/velorite_mage_0.ron new file mode 100644 index 0000000000..9d8a1773d8 --- /dev/null +++ b/assets/common/items/armor/chest/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Vest", + description: "", + kind: Armor( + ( + kind: Chest("VeloriteMage0"), + stats: ( + protection: Normal(28.0) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/foot/velorite_mage_0.ron b/assets/common/items/armor/foot/velorite_mage_0.ron new file mode 100644 index 0000000000..7b48e3cd75 --- /dev/null +++ b/assets/common/items/armor/foot/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Boots", + description: "", + kind: Armor( + ( + kind: Foot("VeloriteMage0"), + stats: ( + protection: Normal(5.9) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/hand/cultist_hands_blue.ron index b9a1004fb1..959b095af4 100644 --- a/assets/common/items/armor/hand/cultist_hands_blue.ron +++ b/assets/common/items/armor/hand/cultist_hands_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Gloves", + name: "Velorite Gloves", description: "Ceremonial attire used by members.", kind: Armor( ( - kind: Hand("CultistBlue"), + kind: Hand("VeloriteMage0"), stats: ( protection: Normal(12.0)), ) diff --git a/assets/common/items/armor/hand/velorite_mage_0.ron b/assets/common/items/armor/hand/velorite_mage_0.ron new file mode 100644 index 0000000000..64a6e0ebb4 --- /dev/null +++ b/assets/common/items/armor/hand/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Gauntlets", + description: "", + kind: Armor( + ( + kind: Hand("VeloriteMage0"), + stats: ( + protection: Normal(11.5) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/pants/cultist_legs_blue.ron index 0ec110c8fe..4f965a7355 100644 --- a/assets/common/items/armor/pants/cultist_legs_blue.ron +++ b/assets/common/items/armor/pants/cultist_legs_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Skirt", + name: "Velorite Skirt", description: "Ceremonial attire used by members.", kind: Armor( ( - kind: Pants("CultistBlue"), + kind: Pants("VeloriteMage0"), stats: ( protection: Normal(24.0)), ) diff --git a/assets/common/items/armor/pants/velorite_mage_0.ron b/assets/common/items/armor/pants/velorite_mage_0.ron new file mode 100644 index 0000000000..c8e7093470 --- /dev/null +++ b/assets/common/items/armor/pants/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Kilt", + description: "", + kind: Armor( + ( + kind: Pants("VeloriteMage0"), + stats: ( + protection: Normal(23.0) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron index 52fff9a1d3..fbcda86466 100644 --- a/assets/common/items/armor/ring/ring_0.ron +++ b/assets/common/items/armor/ring/ring_0.ron @@ -5,7 +5,7 @@ ItemDef( ( kind: Ring("Ring0"), stats: ( - protection: Normal(0.0)), + protection: Normal(0.1)), ) ), quality: Low, diff --git a/assets/common/items/armor/ring/ring_gold_0.ron b/assets/common/items/armor/ring/ring_gold_0.ron new file mode 100644 index 0000000000..30a880c69d --- /dev/null +++ b/assets/common/items/armor/ring/ring_gold_0.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Gold Ring", + description: "Someone is surely missing it...", + kind: Armor( + ( + kind: Ring("RingGold0"), + stats: ( + protection: Normal(0.5)), + ) + ), + quality: Moderate, +) diff --git a/assets/common/items/armor/ring/ring_purp_high_0.ron b/assets/common/items/armor/ring/ring_purp_high_0.ron new file mode 100644 index 0000000000..addad514be --- /dev/null +++ b/assets/common/items/armor/ring/ring_purp_high_0.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Cultist Signet Ring ", + description: "Once belonged to a cultist.", + kind: Armor( + ( + kind: Ring("RingSkull0"), + stats: ( + protection: Normal(3.0)), + ) + ), + quality: High, +) diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron index 2d977abe6d..7f07f1797f 100644 --- a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron +++ b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Mantle", + name: "Velorite Mantle", description: "Ceremonial attire used by members.", kind: Armor( ( - kind: Shoulder("CultistBlue"), + kind: Shoulder("VeloriteMage0"), stats: ( protection: Normal(18.0)), ) diff --git a/assets/common/items/armor/shoulder/velorite_mage_0.ron b/assets/common/items/armor/shoulder/velorite_mage_0.ron new file mode 100644 index 0000000000..4f4ab63871 --- /dev/null +++ b/assets/common/items/armor/shoulder/velorite_mage_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Velorite Battlemage Guards", + description: "", + kind: Armor( + ( + kind: Shoulder("VeloriteMage0"), + stats: ( + protection: Normal(17.0) + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron index 5c7e3c72f8..b9823f35e9 100644 --- a/assets/common/items/debug/cultist_belt.ron +++ b/assets/common/items/debug/cultist_belt.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Cultist Belt", - description: "Ceremonial attire used by members.", + name: "Velorite Belt", + description: "", kind: Armor( ( - kind: Belt("Cultist"), + kind: Belt("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron index c6989fdcd6..e212095431 100644 --- a/assets/common/items/debug/cultist_boots.ron +++ b/assets/common/items/debug/cultist_boots.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Cultist Boots", - description: "Ceremonial attire used by members.", + name: "Velorite Boots", + description: "", kind: Armor( ( - kind: Foot("Cultist"), + kind: Foot("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron index 804c0654ad..9a0339c8d0 100644 --- a/assets/common/items/debug/cultist_chest_blue.ron +++ b/assets/common/items/debug/cultist_chest_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Chest", - description: "Ceremonial attire used by members.", + name: "Velorite Chest", + description: "", kind: Armor( ( - kind: Chest("CultistBlue"), + kind: Chest("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron index f11051465b..5138204320 100644 --- a/assets/common/items/debug/cultist_hands_blue.ron +++ b/assets/common/items/debug/cultist_hands_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Gloves", - description: "Ceremonial attire used by members.", + name: "Velorite Gloves", + description: "", kind: Armor( ( - kind: Hand("CultistBlue"), + kind: Hand("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron index 7440df74a9..7fd62d77f4 100644 --- a/assets/common/items/debug/cultist_legs_blue.ron +++ b/assets/common/items/debug/cultist_legs_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Skirt", - description: "Ceremonial attire used by members.", + name: "Velorite Skirt", + description: "", kind: Armor( ( - kind: Pants("CultistBlue"), + kind: Pants("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron index ff70d316b1..ee114ab8ff 100644 --- a/assets/common/items/debug/cultist_shoulder_blue.ron +++ b/assets/common/items/debug/cultist_shoulder_blue.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Blue Cultist Mantle", - description: "Ceremonial attire used by members.", + name: "Velorite Mantle", + description: "", kind: Armor( ( - kind: Shoulder("CultistBlue"), + kind: Shoulder("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/debug/dungeon_purple-0.ron b/assets/common/items/debug/dungeon_purple-0.ron index 6adc2da2a6..200482c826 100644 --- a/assets/common/items/debug/dungeon_purple-0.ron +++ b/assets/common/items/debug/dungeon_purple-0.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Purple Admin Cape", + name: "Velorite Admin Cape", description: "Where did I put my banhammer again?", kind: Armor( ( - kind: Back("DungPurp0"), + kind: Back("VeloriteMage0"), stats: ( protection: Invincible), ) diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron new file mode 100644 index 0000000000..e47b293cf1 --- /dev/null +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Suspicious Paper Knife", + description: "Opens letters quickly.", + kind: Tool( + ( + kind: Dagger("BasicDagger0"), + stats: ( + equip_time_millis: 0, + power: 1.80 + ), + ) + ), + quality: High, +) diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron new file mode 100644 index 0000000000..fc87c60676 --- /dev/null +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Magical Cultist Dagger", + description: "This belonged to an evil Cult Leader.", + kind: Tool( + ( + kind: Dagger("CultDagger0"), + stats: ( + equip_time_millis: 0, + power: 2.00 + ), + ) + ), + quality: Epic, +) diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron new file mode 100644 index 0000000000..3481b2be9d --- /dev/null +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Frost Cleaver", + description: "Radiates a freezing aura.", + kind: Tool( + ( + kind: Sword("FrostCleaver0"), + stats: ( + equip_time_millis: 500, + power: 1.70), + ) + ), + quality: High, +) diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron new file mode 100644 index 0000000000..4b380a4990 --- /dev/null +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Frost Saw", + description: "Forged from a single piece\nof eternal ice.", + kind: Tool( + ( + kind: Sword("FrostCleaver1"), + stats: ( + equip_time_millis: 500, + power: 1.95), + ) + ), + quality: Epic, +) diff --git a/assets/common/loot_tables/loot_table_armor_misc.ron b/assets/common/loot_tables/loot_table_armor_misc.ron index ada12a5ac3..e7233b64f5 100644 --- a/assets/common/loot_tables/loot_table_armor_misc.ron +++ b/assets/common/loot_tables/loot_table_armor_misc.ron @@ -1,6 +1,7 @@ [ // rings (0.15, "common.items.armor.ring.ring_0"), + (0.05, "common.items.armor.ring.ring_gold_0"), // capes (0.25, "common.items.armor.back.short_0"), (0.25, "common.items.armor.back.short_1"), diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index 73a7f93124..77aebb1428 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -3,7 +3,8 @@ (0.25, "common.items.armor.neck.neck_1"), (0.2, "common.items.crafting_ing.cloth_scraps"), (1.0, "common.items.crafting_ing.empty_vial"), - (0.1, "common.items.glider.glider_blue"), + (0.1, "common.items.glider.glider_blue"), + (0.05, "common.items.armor.ring.ring_gold_0"), // swords (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index fac1d2acab..c02ebbfaac 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -17,6 +17,8 @@ (0.1, "common.items.glider.glider_blue"), (0.5, "common.items.utility.firework_purple"), (0.5, "common.items.utility.bomb"), + (0.5, "common.items.armor.ring.ring_gold_0"), + (0.25, "common.items.armor.ring.ring_purp_high_0"), // Heavy Armour // belts (0.5, "common.items.armor.belt.plate_0"), diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron index 83a25bb2de..122a3c2294 100644 --- a/assets/common/loot_tables/loot_table_humanoids.ron +++ b/assets/common/loot_tables/loot_table_humanoids.ron @@ -5,6 +5,8 @@ (2, "common.items.crafting_ing.cloth_scraps"), // Consumables (0.2, "common.items.consumable.potion_minor"), + // Ring + (0.02, "common.items.armor.ring.ring_gold_0"), // Utility (0.05, "common.items.utility.collar"), // Food diff --git a/assets/common/loot_tables/loot_table_rocks.ron b/assets/common/loot_tables/loot_table_rocks.ron index e29e50f7f2..8496d9e852 100644 --- a/assets/common/loot_tables/loot_table_rocks.ron +++ b/assets/common/loot_tables/loot_table_rocks.ron @@ -1,6 +1,6 @@ [ (1, "common.items.crafting_ing.stones"), - (0.10, "common.items.crafting_ing.shiny_gem"), + (0.05, "common.items.crafting_ing.shiny_gem"), (0.10, "common.items.ore.velorite"), (0.20, "common.items.ore.veloritefrag"), ] diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index d461084197..9db508d86f 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -61,7 +61,23 @@ "voxel.weapon.dagger.dagger_rusty", (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, ), + Tool("common.items.weapons.dagger.basic-0"): VoxTrans( + "voxel.weapon.dagger.dagger_basic-0", + (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.weapons.dagger.cultist_0"): VoxTrans( + "voxel.weapon.dagger.dagger_cult-0", + (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, + ), // Swords + Tool("common.items.weapons.sword.frost_cleaver_2h-0"): VoxTrans( + "voxel.weapon.sword.frost_cleaver-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + ), + Tool("common.items.weapons.sword.frost_cleaver_2h-1"): VoxTrans( + "voxel.weapon.sword.frost_cleaver-1", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40, + ), Tool("common.items.weapons.sword.short_sword_0"): VoxTrans( "voxel.weapon.sword.short_2h-0", (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60, @@ -239,7 +255,7 @@ (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), Tool("common.items.debug.cultist_purp_2h_boss-0"): VoxTrans( - "voxel.weapon.sword.cultist_purp_2h-0", + "voxel.weapon.sword.frost_cleaver-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans( @@ -787,6 +803,35 @@ "voxel.armor.chest.shirt_white-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), + // Velorite Battlemage Set + Armor(Chest("VeloriteMage0")): VoxTrans( + "voxel.armor.chest.velorite_battlemage", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("VeloriteMage0")): VoxTrans( + "voxel.armor.pants.velorite_battlemage", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("VeloriteMage0")): VoxTrans( + "voxel.armor.belt.velorite_battlemage", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot("VeloriteMage0")): VoxTrans( + "voxel.armor.foot.velorite_battlemage", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("VeloriteMage0")): VoxTrans( + "voxel.armor.hand.velorite_battlemage_left", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("VeloriteMage0")): VoxTrans( + "voxel.armor.shoulder.velorite_battlemage_left", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Back("VeloriteMage0")): VoxTrans( + "voxel.armor.back.velorite_battlemage", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), // Assassin Set Armor(Chest("Assassin")): VoxTrans( "voxel.armor.chest.assa", @@ -1188,9 +1233,19 @@ (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, ), // Rings - Armor(Ring("Ring0")): Png( - "element.icons.ring-0", + Armor(Ring("Ring0")): VoxTrans( + "voxel.armor.ring.simple_purp-0", + (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9, ), + Armor(Ring("RingGold0")): VoxTrans( + "voxel.armor.ring.simple_gold-0", + (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9, + ), + Armor(Ring("RingSkull0")): VoxTrans( + "voxel.armor.ring.high_purp-0", + (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9, + ), + // Necks Armor(Neck("Neck0")): Png( "element.icons.neck-0", diff --git a/assets/voxygen/voxel/armor/back/velorite_battlemage.vox b/assets/voxygen/voxel/armor/back/velorite_battlemage.vox new file mode 100644 index 0000000000..74e2216ebe --- /dev/null +++ b/assets/voxygen/voxel/armor/back/velorite_battlemage.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a57fb3f28178b3bb0f207742c9b24399f87010a48041e97681a69ea6445cebf +size 1480 diff --git a/assets/voxygen/voxel/armor/belt/velorite_battlemage.vox b/assets/voxygen/voxel/armor/belt/velorite_battlemage.vox new file mode 100644 index 0000000000..d546647826 --- /dev/null +++ b/assets/voxygen/voxel/armor/belt/velorite_battlemage.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be586d0a049cd8718440b87cb9a09aadf31b3d22404c1a24f5c7135e146e86c5 +size 1480 diff --git a/assets/voxygen/voxel/armor/chest/velorite_battlemage.vox b/assets/voxygen/voxel/armor/chest/velorite_battlemage.vox new file mode 100644 index 0000000000..0bd3ab9908 --- /dev/null +++ b/assets/voxygen/voxel/armor/chest/velorite_battlemage.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0c44f1c1f5fd9424e21f55ed30c439e20e5b7eb6b1e28028acc1dd64b5d55e1 +size 2712 diff --git a/assets/voxygen/voxel/armor/foot/velorite_battlemage.vox b/assets/voxygen/voxel/armor/foot/velorite_battlemage.vox new file mode 100644 index 0000000000..e7be89f404 --- /dev/null +++ b/assets/voxygen/voxel/armor/foot/velorite_battlemage.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:609a6f6ef5bf20729bc03fcd4a12db12ee53eebbc9f8d01344f03cc58ab7d552 +size 1480 diff --git a/assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox b/assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox new file mode 100644 index 0000000000..ed4ce177ca --- /dev/null +++ b/assets/voxygen/voxel/armor/hand/velorite_battlemage_left.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88188fe81c64241656a5ee25943f70927fda998061ad61a22bac68345b45d9a9 +size 1288 diff --git a/assets/voxygen/voxel/armor/hand/velorite_battlemage_right.vox b/assets/voxygen/voxel/armor/hand/velorite_battlemage_right.vox new file mode 100644 index 0000000000..313c016b75 --- /dev/null +++ b/assets/voxygen/voxel/armor/hand/velorite_battlemage_right.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae59699777c6e6e2f8382ba22b03a1f4d629e9116bd4e1efd8d3f4ca66265af0 +size 1288 diff --git a/assets/voxygen/voxel/armor/pants/velorite_battlemage.vox b/assets/voxygen/voxel/armor/pants/velorite_battlemage.vox new file mode 100644 index 0000000000..d2da87235f --- /dev/null +++ b/assets/voxygen/voxel/armor/pants/velorite_battlemage.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a87d46a7f88ffccf38186fd3a3bb58eba5619e7047fb3818a6f186f07a4838e +size 2952 diff --git a/assets/voxygen/voxel/armor/ring/high_purp-0.vox b/assets/voxygen/voxel/armor/ring/high_purp-0.vox new file mode 100644 index 0000000000..c2d85b9ee0 --- /dev/null +++ b/assets/voxygen/voxel/armor/ring/high_purp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65291ac395117c737e511c48683855aa46d01f26859ba3be48ac07e8fd27c420 +size 1324 diff --git a/assets/voxygen/voxel/armor/ring/simple_gold-0.vox b/assets/voxygen/voxel/armor/ring/simple_gold-0.vox new file mode 100644 index 0000000000..0086958447 --- /dev/null +++ b/assets/voxygen/voxel/armor/ring/simple_gold-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ce921e48cb12d03ae53b14da5e72175349cdd69f0bfe3fe869a80c1e47b1398 +size 1260 diff --git a/assets/voxygen/voxel/armor/ring/simple_purp-0.vox b/assets/voxygen/voxel/armor/ring/simple_purp-0.vox new file mode 100644 index 0000000000..e055f9d786 --- /dev/null +++ b/assets/voxygen/voxel/armor/ring/simple_purp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3b50a1478580f84711ebcad5f076f0465a261f6c573f2d4c72b5a1a18ea4ba +size 1236 diff --git a/assets/voxygen/voxel/armor/shoulder/velorite_battlemage_left.vox b/assets/voxygen/voxel/armor/shoulder/velorite_battlemage_left.vox new file mode 100644 index 0000000000..22a5c7d053 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/velorite_battlemage_left.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c97adab9870cd51d88deb55ea1ec3a6c603d14d3a4aa55507ba36e6fadf403b4 +size 1644 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_old.vox b/assets/voxygen/voxel/figure/eyes/general/male_old.vox new file mode 100644 index 0000000000..edf3309004 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/general/male_old.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c55d37bac17f7a1411d921446c9a3c775f9a84d9435705a0844e8ceb56a82f +size 1184 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox new file mode 100644 index 0000000000..b20f0ad3b3 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2055c87773d61874494353560f7f194a9678d77c389877f05ade8116243ff8a +size 3368 diff --git a/assets/voxygen/voxel/figure/head/danari/male.vox b/assets/voxygen/voxel/figure/head/danari/male.vox index d3ef5b193e..5e94ff4429 100644 --- a/assets/voxygen/voxel/figure/head/danari/male.vox +++ b/assets/voxygen/voxel/figure/head/danari/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d8d69b1758f7344637d821f4f914a9344244f8327836da7450cc3b955f270e -size 3272 +oid sha256:def17019457774071beae4ecffe98ee47232fd8885fb419bd04b0229f31a8620 +size 3312 diff --git a/assets/voxygen/voxel/figure/head/dwarf/female.vox b/assets/voxygen/voxel/figure/head/dwarf/female.vox index 2984389c8a..3fc577e1fd 100644 --- a/assets/voxygen/voxel/figure/head/dwarf/female.vox +++ b/assets/voxygen/voxel/figure/head/dwarf/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7bd7d802ee07b5784c5d7c672a488efd3e70ed2fec974ba806e37f842732094 -size 3048 +oid sha256:c5d8e0ce02ddfcc3dfc6d46ea2553f513d872c5b1c60bed2b8d16ef6d874123f +size 3088 diff --git a/assets/voxygen/voxel/figure/head/dwarf/male.vox b/assets/voxygen/voxel/figure/head/dwarf/male.vox index 8bab58bd76..5c52188cc2 100644 --- a/assets/voxygen/voxel/figure/head/dwarf/male.vox +++ b/assets/voxygen/voxel/figure/head/dwarf/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e8d32cbc846775bc86184df4865bf01057b91fe8b4a9dd0d891129e29d6771b -size 3056 +oid sha256:dd35665db00acaf331927408bc9de24271a79a527c067a56accce0d758a43200 +size 3104 diff --git a/assets/voxygen/voxel/figure/head/elf/male.vox b/assets/voxygen/voxel/figure/head/elf/male.vox index bc33a011e0..fab236e714 100644 --- a/assets/voxygen/voxel/figure/head/elf/male.vox +++ b/assets/voxygen/voxel/figure/head/elf/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1271ff8991fecd5ee1b12aad07877c54528e10f63d3dbfb2c7263f3efe705284 -size 3344 +oid sha256:431c5bc14f6f89a6371e01570e1e49cdf69858d0bc803c4cbb839bbb178cea8c +size 3392 diff --git a/assets/voxygen/voxel/figure/head/human/male.vox b/assets/voxygen/voxel/figure/head/human/male.vox index 6e9ffab9d0..d75b8dd796 100644 --- a/assets/voxygen/voxel/figure/head/human/male.vox +++ b/assets/voxygen/voxel/figure/head/human/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fdf5705ef1376f43a1ff147dd6539209c7cd759d0075693b493439fbc8a4cc2 -size 3336 +oid sha256:be4b14aafbbdb231a0ae97036201ad2a1d06f42b62130904b05e79c19557649b +size 3384 diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index baea9952be..fdc124bc48 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -32,5 +32,9 @@ vox_spec: ("armor.back.backpack-grey", (-7.0, -5.0, -10.0)), color: Some((76, 72, 178)) ), + "VeloriteMage0": ( + vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index bfa38ec946..4e6ced2872 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -84,5 +84,9 @@ vox_spec: ("armor.belt.bonerattler", (-5.0, -4.5, 2.0)), color: None ), + "VeloriteMage0": ( + vox_spec: ("armor.belt.velorite_battlemage", (-5.0, -3.5, 2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 293502079f..95d8103777 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -126,7 +126,7 @@ vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)), color: Some((30, 0, 64)) ), - "CultistBlue": ( + "VeloriteMage0": ( vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)), color: Some((57, 81, 132)) ), @@ -146,6 +146,10 @@ vox_spec: ("armor.chest.bonerattler", (-7.0, -4.5, 2.0)), color: None ), + "VeloriteMage0": ( + vox_spec: ("armor.chest.velorite_battlemage", (-7.0, -3.5, 0.5)), + color: None + ), }, ) ) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index b2432b066d..ff4958709c 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -80,5 +80,9 @@ vox_spec: ("armor.foot.bonerattler", (-2.5, -3.5, -2.0)), color: None ), + "VeloriteMage0": ( + vox_spec: ("armor.foot.velorite_battlemage", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 9cf0fa7a07..a88e064de7 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -90,7 +90,7 @@ color: Some((30, 0, 64)) ) ), - "CultistBlue": ( + "VeloriteMage0": ( left: ( vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)), color: Some((57, 81, 132)) @@ -180,5 +180,15 @@ color: None ) ), + "VeloriteMage0": ( + left: ( + vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index bd707f546a..bc6c1dfd7f 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -67,11 +67,7 @@ "CultistPurple": ( vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)), color: Some((30, 0, 64)) - ), - "CultistBlue" : ( - vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)), - color: Some((57, 81, 132)) - ), + ), "Steel0": ( vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)), color: None @@ -104,5 +100,9 @@ vox_spec: ("armor.pants.bonerattler", (-5.0, -3.5, 1.0)), color: None ), + "VeloriteMage0": ( + vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 7f9fbc7fb6..d2b24f4141 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -111,7 +111,7 @@ color: Some((30, 0, 64)) ) ), - "CultistBlue": ( + "VeloriteMage0": ( left: ( vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)), color: Some((57, 81, 132)) @@ -271,5 +271,15 @@ color: None ) ), + "VeloriteMage0": ( + left: ( + vox_spec: ("armor.shoulder.velorite_battlemage_left", (-6.0, -4.0 , 0.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.velorite_battlemage_left", (-1.0, -4.0, 0.0)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 7308e4b5f3..f44f59da5f 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -9,7 +9,8 @@ Some(("figure.eyes.general.male_as_hair-0", (3, 9, 2))), Some(("figure.eyes.general.male_heterochromia-0", (3, 9, 2))), Some(("figure.eyes.general.male_scar-0", (3, 9, 2))), - Some(("figure.eyes.general.male_blind-0", (3, 9, 2))), + Some(("figure.eyes.general.male_blind-0", (3, 9, 2))), + Some(("figure.eyes.general.male_old", (3, 9, 2))), ], hair: [ Some(("figure.hair.human.male-0", (1, 1, 1))), @@ -52,7 +53,7 @@ Some(("figure.eyes.general.female_as_hair-0", (2, 10, 2))), Some(("figure.eyes.general.female_heterochromia-0", (2, 10, 2))), Some(("figure.eyes.general.female_scar-0", (2, 10, 2))), - Some(("figure.eyes.general.female_blind-0", (2, 10, 2))), + Some(("figure.eyes.general.female_blind-0", (2, 10, 2))), ], hair: [ Some(("figure.hair.human.female-0", (-1, -1, 0))), @@ -149,7 +150,7 @@ Some(("figure.eyes.general.male_as_hair-0", (4, 9, 2))), Some(("figure.eyes.general.male_heterochromia-0", (4, 9, 2))), Some(("figure.eyes.general.male_scar-0", (4, 9, 2))), - Some(("figure.eyes.general.male_blind-0", (4, 9, 2))), + Some(("figure.eyes.general.male_blind-0", (4, 9, 2))), ], hair: [ Some(("figure.hair.elf.male-0", (2, 1, 1))), @@ -171,7 +172,7 @@ Some(("figure.eyes.general.female_as_hair-0", (3, 9, 2))), Some(("figure.eyes.general.female_heterochromia-0", (3, 9, 2))), Some(("figure.eyes.general.female_scar-0", (3, 9, 2))), - Some(("figure.eyes.general.female_blind-0", (3, 9, 2))), + Some(("figure.eyes.general.female_blind-0", (3, 9, 2))), ], hair: [ Some(("figure.hair.elf.female-0", (0, -2, 0))), @@ -212,7 +213,8 @@ Some(("figure.eyes.general.male_as_hair-0", (2, 10, 2))), Some(("figure.eyes.general.male_heterochromia-0", (2, 10, 2))), Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), - Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), + Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), + Some(("figure.eyes.general.male_old", (1, 10, 1))), ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), @@ -263,7 +265,7 @@ Some(("figure.eyes.general.female_as_hair-0", (1, 10, 2))), Some(("figure.eyes.general.female_heterochromia-0", (1, 10, 2))), Some(("figure.eyes.general.female_scar-0", (1, 10, 2))), - Some(("figure.eyes.general.female_blind-0", (1, 10, 2))), + Some(("figure.eyes.general.female_blind-0", (1, 10, 2))), ], hair: [ Some(("figure.hair.dwarf.female-0", (-9, -9, -7))), @@ -272,7 +274,8 @@ Some(("figure.hair.dwarf.female-3", (-9, -9, -7))), Some(("figure.hair.dwarf.female-4", (-3, -2, -5))), Some(("figure.hair.dwarf.female-5", (-3, -2, -5))), - Some(("figure.hair.dwarf.female-6", (-3, -2, -5))), + Some(("figure.hair.dwarf.female-6", (-3, -2, -5))), + Some(("figure.hair.dwarf.female-7", (-9, -9, -7))), ], beard: [None], accessory: [ @@ -337,7 +340,8 @@ Some(("figure.eyes.general.male_as_hair-0", (5, 9, 4))), Some(("figure.eyes.general.male_heterochromia-0", (5, 9, 4))), Some(("figure.eyes.general.male_scar-0", (5, 9, 4))), - Some(("figure.eyes.general.male_blind-0", (5, 9, 4))), + Some(("figure.eyes.general.male_blind-0", (5, 9, 4))), + Some(("figure.eyes.general.male_old", (4, 9, 3))), ], hair: [ Some(("figure.hair.danari.male-0", (3, 1, 2))), @@ -361,7 +365,7 @@ Some(("figure.eyes.general.female_as_hair-0", (4, 9, 4))), Some(("figure.eyes.general.female_heterochromia-0", (4, 9, 4))), Some(("figure.eyes.general.female_scar-0", (4, 9, 4))), - Some(("figure.eyes.general.female_blind-0", (4, 9, 4))), + Some(("figure.eyes.general.female_blind-0", (4, 9, 4))), ], hair: [ Some(("figure.hair.danari.female-0", (3, -4, 1))), diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 882b61741e..a44a129222 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -167,20 +167,16 @@ vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)), color: None ), - "common.items.weapons.sword.cultist_purp_2h-0": ( + "common.items.weapons.sword.cultist_purp_2h": ( vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.npc_weapons.sword.cultist_purp_2h-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), + "common.items.weapons.sword.frost_cleaver_2h-0": ( + vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)), color: None ), - "common.items.debug.cultist_purp_2h_boss-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), - color: None - ), - "common.items.npc_weapons.sword.cultist_purp_2h_boss-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), + "common.items.weapons.sword.frost_cleaver_2h-1": ( + vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), color: None ), // Axes @@ -478,6 +474,14 @@ vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), color: None ), + "common.items.weapons.dagger.basic-0": ( + vox_spec: ("weapon.dagger.dagger_basic-0", (-1.5, -3.0, -3.0)), + color: None + ), + "common.items.weapons.dagger.cultist_0": ( + vox_spec: ("weapon.dagger.dagger_cult-0", (-1.5, -3.0, -3.0)), + color: None + ), // Shields "common.items.weapons.shield.shield_1": ( vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), @@ -652,6 +656,10 @@ vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), color: None ), + "common.items.debug.cultist_purp_2h_boss-0": ( + vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), + color: None + ), // Misc "common.items.weapons.empty.empty": ( vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), diff --git a/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox b/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox new file mode 100644 index 0000000000..1ea917f52c --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d80b9ef87f5213c864b2e4b5b5e4a5de3c6e6d27062f2ca1f937b2830b1b4e2f +size 6664 diff --git a/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox b/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox new file mode 100644 index 0000000000..0784c57709 --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f84a1ae0e5aa308769ea12f6abab19e6a8736e80d426c3fc3a40e75c54c2557 +size 6804 diff --git a/assets/voxygen/voxel/sprite/underwater_grass/blue-0.vox b/assets/voxygen/voxel/sprite/underwater_grass/blue-0.vox new file mode 100644 index 0000000000..07486afc5b --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_grass/blue-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25d51f0a45c74725bfb01a044c452e738626683b000893185e08e5ae34eceaed +size 1220 diff --git a/assets/voxygen/voxel/sprite/underwater_grass/blue-1.vox b/assets/voxygen/voxel/sprite/underwater_grass/blue-1.vox new file mode 100644 index 0000000000..f514cb26aa --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_grass/blue-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cb041229f68cc6d36e0c4d695aefa6249f1e9c792f9350890767ee523dced4d +size 1188 diff --git a/assets/voxygen/voxel/sprite/underwater_mud/mud-0.vox b/assets/voxygen/voxel/sprite/underwater_mud/mud-0.vox new file mode 100644 index 0000000000..6175ff350b --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_mud/mud-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26316759d9364720b2c39bf2f675203e16c04407a6fc014e0c8812cc4917036d +size 3780 diff --git a/assets/voxygen/voxel/sprite/underwater_mud/mud-1.vox b/assets/voxygen/voxel/sprite/underwater_mud/mud-1.vox new file mode 100644 index 0000000000..6ec3bc8abf --- /dev/null +++ b/assets/voxygen/voxel/sprite/underwater_mud/mud-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb527e7114b90d7fc272e14ffc8a12be531a9edeba0a20d9f80376cfa9363f11 +size 3308 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 0e7d3b07c4..72354dbcb8 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2002,6 +2002,54 @@ PotionMinor: Some(( offset: (-5.0, -5.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), +], + wind_sway: 0.0, +)), +// Underwater Grass +GrassBlue: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.underwater_grass.blue-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.underwater_grass.blue-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 1.0, +)), +// Underwater Chests +ChestBurried: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.underwater_chests.chest_skull", + offset: (-10.0, -8.0, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.underwater_chests.chest_vines", + offset: (-10.0, -8.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.0, +)), +// Underwater Mud Piles +Mud: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.underwater_mud.mud-0", + offset: (-9.5, -7.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.underwater_mud.mud-1", + offset: (-8.5, -7.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), ], wind_sway: 0.0, )), diff --git a/assets/voxygen/voxel/weapon/dagger/dagger_basic-0.vox b/assets/voxygen/voxel/weapon/dagger/dagger_basic-0.vox new file mode 100644 index 0000000000..149f476bd4 --- /dev/null +++ b/assets/voxygen/voxel/weapon/dagger/dagger_basic-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b817fd13f04f25800279e3887e0e67ad8562614e403700e08cb601059a4e3dbf +size 1272 diff --git a/assets/voxygen/voxel/weapon/dagger/dagger_cult-0.vox b/assets/voxygen/voxel/weapon/dagger/dagger_cult-0.vox new file mode 100644 index 0000000000..715230f41d --- /dev/null +++ b/assets/voxygen/voxel/weapon/dagger/dagger_cult-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a87412125ec7786ac10898352065c6fcaf502e5d726120f0509ad1f6d9d827f4 +size 1332 diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox b/assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox new file mode 100644 index 0000000000..dfbc4bd049 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/frost_cleaver-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76006007a63dcad7483a03a59b302c6d378bb539496e8a2d471eedcf53e35e09 +size 1928 diff --git a/assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox b/assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox new file mode 100644 index 0000000000..b2de88fd22 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword/frost_cleaver-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:655ed0837503ab4cd7fc35dc51e5ab2fb9aabbf12855459f18b813d3417ff45b +size 1900 diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index f4dfda99ec..ccbb8f73c4 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -315,7 +315,7 @@ impl Species { match (self, body_type) { (Species::Danari, BodyType::Female) => 4, (Species::Danari, BodyType::Male) => 4, - (Species::Dwarf, BodyType::Female) => 7, + (Species::Dwarf, BodyType::Female) => 8, (Species::Dwarf, BodyType::Male) => 4, (Species::Elf, BodyType::Female) => 21, (Species::Elf, BodyType::Male) => 4, @@ -350,13 +350,13 @@ impl Species { pub fn num_eyes(self, body_type: BodyType) -> u8 { match (self, body_type) { (Species::Danari, BodyType::Female) => 6, - (Species::Danari, BodyType::Male) => 7, + (Species::Danari, BodyType::Male) => 8, (Species::Dwarf, BodyType::Female) => 6, - (Species::Dwarf, BodyType::Male) => 7, + (Species::Dwarf, BodyType::Male) => 8, (Species::Elf, BodyType::Female) => 6, (Species::Elf, BodyType::Male) => 7, (Species::Human, BodyType::Female) => 6, - (Species::Human, BodyType::Male) => 5, + (Species::Human, BodyType::Male) => 7, (Species::Orc, BodyType::Female) => 6, (Species::Orc, BodyType::Male) => 2, (Species::Undead, BodyType::Female) => 3, diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 2094f78176..6aa649971b 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -326,6 +326,24 @@ impl Item { }); chosen.choose() }, + SpriteKind::ChestBurried => { + chosen = Lottery::::load_expect(match rng.gen_range(0, 7) { + 1 => "common.loot_tables.loot_table_weapon_common", + 2 => "common.loot_tables.loot_table_armor_light", + 3 => "common.loot_tables.loot_table_armor_cloth", + _ => "common.loot_tables.loot_table_armor_misc", + }); + chosen.choose() + }, + SpriteKind::Mud => { + chosen = Lottery::::load_expect(match rng.gen_range(0, 5) { + 0 => "common.loot_tables.loot_table_crafting", + 1 => "common.loot_tables.loot_table_weapon_common", + 2 => "common.loot_tables.loot_table_armor_misc", + _ => "common.loot_tables.loot_table_rocks", + }); + chosen.choose() + }, SpriteKind::Crate => { chosen = Lottery::::load_expect(match rng.gen_range(0, 4) { 0 => "common.loot_tables.loot_table_crafting", diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 53cb5a2ff8..6dee9037e7 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -104,6 +104,9 @@ make_case_elim!( LargeCactus = 0x4E, VialEmpty = 0x4F, PotionMinor = 0x50, + GrassBlue = 0x51, + ChestBurried = 0x52, + Mud = 0x53, } ); @@ -141,6 +144,8 @@ impl SpriteKind { SpriteKind::WardrobeSingle => 3.0, SpriteKind::WardrobeDouble => 3.0, SpriteKind::Pot => 0.90, + SpriteKind::Mud => 0.36, + SpriteKind::ChestBurried => 0.91, // TODO: Find suitable heights. SpriteKind::BarrelCactus | SpriteKind::RoundCactus @@ -188,6 +193,8 @@ impl SpriteKind { SpriteKind::Beehive => true, SpriteKind::VialEmpty => true, SpriteKind::PotionMinor => true, + SpriteKind::ChestBurried => true, + SpriteKind::Mud => true, _ => false, } } diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs index 2e623aa767..70a9a20b72 100644 --- a/voxygen/src/scene/simple.rs +++ b/voxygen/src/scene/simple.rs @@ -233,7 +233,8 @@ impl Scene { .. } = self.camera.dependents(); const VD: f32 = 115.0; // View Distance - const TIME: f64 = 10.0 * 60.0 * 60.0; + + const TIME: f64 = 9.0 * 60.0 * 60.0; const SHADOW_NEAR: f32 = 1.0; const SHADOW_FAR: f32 = 25.0; diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs index 0d058518c2..b6f23dd828 100644 --- a/voxygen/src/settings.rs +++ b/voxygen/src/settings.rs @@ -529,7 +529,7 @@ impl Default for GameplaySettings { smooth_pan_enable: true, toggle_debug: false, sct: true, - sct_player_batch: true, + sct_player_batch: false, sct_damage_batch: false, speech_bubble_dark_mode: false, speech_bubble_icon: true, diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index d5e74015d3..8a47d0fee9 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -7,7 +7,9 @@ use vek::*; fn close(x: f32, tgt: f32, falloff: f32) -> f32 { (1.0 - (x - tgt).abs() / falloff).max(0.0).powf(0.125) } + const MUSH_FACT: f32 = 1.0e-4; // To balance everything around the mushroom spawning rate +const DEPTH_WATER_NORM: f32 = 15.0; // Water depth at which regular underwater sprites start spawning pub fn apply_scatter_to(canvas: &mut Canvas) { use SpriteKind::*; #[allow(clippy::type_complexity)] @@ -274,7 +276,56 @@ pub fn apply_scatter_to(canvas: &mut Canvas) { ) }), // Underwater chests - (Chest, true, |_, _| (MUSH_FACT * 0.1, None)), + (ChestBurried, true, |_, col| { + ( + MUSH_FACT + * 1.0e-6 + * if col.alt < col.water_level - DEPTH_WATER_NORM + 30.0 { + 1.0 + } else { + 0.0 + }, + None, + ) + }), + // Underwater mud piles + (Mud, true, |_, col| { + ( + MUSH_FACT + * 1.0e-3 + * if col.alt < col.water_level - DEPTH_WATER_NORM { + 1.0 + } else { + 0.0 + }, + None, + ) + }), + // Underwater grass + (GrassBlue, true, |_, col| { + ( + MUSH_FACT + * 250.0 + * if col.alt < col.water_level - DEPTH_WATER_NORM { + 1.0 + } else { + 0.0 + }, + Some((100.0, 0.15)), + ) + }), + (Stones, true, |c, col| { + ( + (c.rockiness - 0.5).max(0.0) + * 1.0e-3 + * if col.alt < col.water_level - DEPTH_WATER_NORM { + 1.0 + } else { + 0.0 + }, + None, + ) + }), ]; canvas.foreach_col(|canvas, wpos2d, col| {