Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made a few more changes to migration, removed additional weapon.

Browse Source
This commit is contained in:
Sam 2021-08-15 16:24:04 -04:00
parent 9776760f47
commit a908eb5791
7 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/items/weapons/staff/laevateinn.ron
View File

@ -6,10 +6,10 @@ ItemDef(
hands: Direct(Two),
stats: Direct((
equip_time_secs: 0.6,
power: 1.67,
power: 2.5,
effect_power: 1.0,
speed: 1.2,
crit_chance: 0.1,
speed: 0.8,
crit_chance: 0.2,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,

21
assets/common/items/weapons/staff/phoenix.ron
View File

@ -1,21 +0,0 @@
ItemDef(
name: Direct("Phoenix"),
description: "The ashes never stop glowing",
kind: Tool((
kind: Staff,
hands: Direct(Two),
stats: Direct((
equip_time_secs: 0.6,
power: 2.5,
effect_power: 1.0,
speed: 0.8,
crit_chance: 0.2,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
)),
)),
quality: Direct(Legendary),
tags: [],
ability_spec: None,
)

3
assets/common/loot_tables/weapons/legendary_ranged.ron
View File

@ -1,7 +1,6 @@
[
(1.0, Item("common.items.weapons.bow.sagitta")),
(0.5, Item("common.items.weapons.staff.phoenix")),
(0.5, Item("common.items.weapons.staff.laevateinn")),
(1.0, Item("common.items.weapons.staff.laevateinn")),
(0.5, Item("common.items.weapons.sceptre.root_evil")),
(0.5, Item("common.items.weapons.sceptre.caduceus")),
]

6
assets/common/trading/item_price_equality.ron
View File

@ -1,9 +1,5 @@
[
// Legendary staves and sceptres
Set([
"common.items.weapons.staff.phoenix",
"common.items.weapons.staff.laevateinn",
]),
// Legendary sceptres
Set([
"common.items.weapons.sceptre.root_evil",
"common.items.weapons.sceptre.caduceus",

1
assets/server/manifests/kits.ron
View File

@ -86,7 +86,6 @@
// Legendaries
("common.items.weapons.hammer.mjolnir",1),
("common.items.weapons.staff.laevateinn",1),
("common.items.weapons.staff.phoenix",1),
("common.items.weapons.sword.caladbolg",1),
("common.items.weapons.bow.sagitta",1),
("common.items.weapons.axe.parashu",1),

16
assets/voxygen/item_image_manifest.ron
View File

@ -90,6 +90,10 @@
(0.0, 0.0, 0.0), (125.0, 90.0, 80.0), 1.0,
),
// Bows
ModularWeapon(("common.items.crafting_ing.modular.damage.sword.longsword", "iron", One)): VoxTrans(
"voxel.weapon.sword.iron-5",
(0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.bow.bone-0"): VoxTrans(
"voxel.weapon.bow.bone-0",
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
@ -1268,7 +1272,7 @@
Armor(Hand("Merchant")): VoxTrans(
"voxel.armor.merchant.hand",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
),
Armor(Head("Merchant")): VoxTrans(
"voxel.armor.merchant.turban",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
@ -3033,12 +3037,4 @@
"voxel.sprite.mineral.gem.diamondgem",
(0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6,
),
ModularComponent("common.items.crafting_ing.modular.damage.sword.tier5"): VoxTrans(
"voxel.weapon_components.sword.cultist.cultist_purp_2h-0_blade",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
),
ModularComponent("common.items.crafting_ing.modular.held.sword.tier5"): VoxTrans(
"voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
),
})
})

4
server/src/migrations/V44__modular-weapons.sql
View File

@ -802,6 +802,10 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-1', 'co
INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-1', 'common.items.crafting_ing.modular.damage.axe.axe', 794, 793);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-1', 'common.items.crafting_ing.modular.held.axe.short', 795, 793);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-1', 'common.items.mineral.ingot.bronze', 796, 794);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.staff.phoenix', 'common.items.weapons.modular.staff', 797, NULL);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.staff.phoenix', 'common.items.crafting_ing.modular.damage.staff.medium', 798, 797);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.staff.phoenix', 'common.items.crafting_ing.modular.held.staff.grandstaff', 799, 797);
INSERT INTO _temp_modular_items VALUES('common.items.weapons.staff.phoenix', 'common.items.log.eldwood', 800, 799);
-- Create a temporary table to hold data for the modular weapon items
CREATE TEMP TABLE _temp_modular_component_items