mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'combat' into 'master'
Combat rewrite See merge request veloren/veloren!855
This commit is contained in:
commit
f34d4b379e
8
.gitignore
vendored
8
.gitignore
vendored
@ -23,11 +23,6 @@
|
||||
|
||||
.project
|
||||
|
||||
# Vim
|
||||
|
||||
**/*.swp
|
||||
**/*.vi
|
||||
|
||||
# Veloren
|
||||
*.rar
|
||||
*.log
|
||||
@ -40,3 +35,6 @@ todo.txt
|
||||
# direnv
|
||||
/.envrc
|
||||
*.bat
|
||||
|
||||
# Mac
|
||||
.DS_Store
|
16
CHANGELOG.md
16
CHANGELOG.md
@ -31,6 +31,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Added Italian translation
|
||||
- Added Portuguese translation
|
||||
- Added Turkish translation
|
||||
- Complete rewrite of the combat system into a state machine
|
||||
- Abilities like Dash and Triplestrike
|
||||
- Armor can now be eqipped as items
|
||||
- Fireball explosions
|
||||
- Inventory supports stacking
|
||||
- Many new armors and weapons to find in chests
|
||||
- Fleshed out "attack" animation into alpha, beta and spin type attacks
|
||||
- Fleshed out range attack into charging and shooting anims for staff/bow
|
||||
- Customized attack animation for hammers and axes
|
||||
|
||||
### Changed
|
||||
|
||||
@ -39,6 +48,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Fixed /give_exp ignoring player argument
|
||||
- Extend run sfx to small animals to prevent sneak attacks by geese.
|
||||
- Decreased clientside latency of ServerEvent mediated effects (e.g. projectiles, inventory operations, etc)
|
||||
- Started changing the visual theme of the UI
|
||||
- Merge of the Bag and Character-Screen
|
||||
- Merge of the Map and Questlog
|
||||
- Overhauled icon art
|
||||
- Asset cleanup to lower client-size
|
||||
- Rewrote the humanoid skeleton to be more ideal for attack animations
|
||||
|
||||
|
||||
### Removed
|
||||
|
||||
|
676
Cargo.lock
generated
676
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,8 @@
|
||||
Item(
|
||||
name: "Apple",
|
||||
description: "Red and juicy.",
|
||||
description: "Red and juicy.
|
||||
|
||||
Restores 20 Health.",
|
||||
kind: Consumable(
|
||||
kind: Apple,
|
||||
effect: Health((
|
||||
|
8
assets/common/items/armor/belt/assassin.ron
Normal file
8
assets/common/items/armor/belt/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Belt",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Belt(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/belt/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/belt/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Belt",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Belt(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/belt/cloth_green_0.ron
Normal file
8
assets/common/items/armor/belt/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Belt",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Belt(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/belt/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/belt/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Linen Belt",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Belt(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/belt/leather_0.ron
Normal file
8
assets/common/items/armor/belt/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Belt",
|
||||
description: "Swift like the wind.",
|
||||
kind: Armor(
|
||||
kind: Belt(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/belt/plate_0.ron
Normal file
8
assets/common/items/armor/belt/plate_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Belt",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Belt(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/assassin.ron
Normal file
8
assets/common/items/armor/chest/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Chest",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Chest(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/chest/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Chest",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Chest(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/cloth_green_0.ron
Normal file
8
assets/common/items/armor/chest/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Chest",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Chest(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/chest/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Linen Chest",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Chest(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/leather_0.ron
Normal file
8
assets/common/items/armor/chest/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Chest",
|
||||
description: "Swift like the wind.",
|
||||
kind: Armor(
|
||||
kind: Chest(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/chest/plate_green_0.ron
Normal file
8
assets/common/items/armor/chest/plate_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Chestplate",
|
||||
description: "Arrows to the stomach are soooo last update.",
|
||||
kind: Armor(
|
||||
kind: Chest(PlateGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/assassin.ron
Normal file
8
assets/common/items/armor/foot/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Boots",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Foot(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/foot/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Boots",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Foot(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/cloth_green_0.ron
Normal file
8
assets/common/items/armor/foot/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Boots",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Foot(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/foot/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Linen Boots",
|
||||
description: "Soft and warm",
|
||||
kind: Armor(
|
||||
kind: Foot(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/leather_0.ron
Normal file
8
assets/common/items/armor/foot/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Boots",
|
||||
description: "Swift like the wind.",
|
||||
kind: Armor(
|
||||
kind: Foot(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/foot/plate_0.ron
Normal file
8
assets/common/items/armor/foot/plate_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Feet",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Foot(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/assassin.ron
Normal file
8
assets/common/items/armor/hand/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Gloves",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Hand(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/hand/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Wrists",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Hand(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/cloth_green_0.ron
Normal file
8
assets/common/items/armor/hand/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Wrists",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Hand(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/hand/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Silk Wrists",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Hand(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/leather_0.ron
Normal file
8
assets/common/items/armor/hand/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Gloves",
|
||||
description: "Swift like the wind.",
|
||||
kind: Armor(
|
||||
kind: Hand(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/hand/plate_0.ron
Normal file
8
assets/common/items/armor/hand/plate_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Handguards",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Hand(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/assassin.ron
Normal file
8
assets/common/items/armor/pants/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Pants",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Pants(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/pants/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Skirt",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Pants(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/cloth_green_0.ron
Normal file
8
assets/common/items/armor/pants/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Skirt",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Pants(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/pants/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Linen Skirt",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Pants(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/green_0.ron
Normal file
8
assets/common/items/armor/pants/green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Hunting Pants",
|
||||
description: "",
|
||||
kind: Armor(
|
||||
kind: Pants(Green),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/leather_0.ron
Normal file
8
assets/common/items/armor/pants/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Pants",
|
||||
description: "",
|
||||
kind: Armor(
|
||||
kind: Pants(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/pants/plate_green_0.ron
Normal file
8
assets/common/items/armor/pants/plate_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Legguards",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Pants(PlateGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/assassin.ron
Normal file
8
assets/common/items/armor/shoulder/assassin.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Assassin Shoulder Guard",
|
||||
description: "Only the best for a member of the creed.",
|
||||
kind: Armor(
|
||||
kind: Shoulder(Assassin),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/cloth_blue_0.ron
Normal file
8
assets/common/items/armor/shoulder/cloth_blue_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Linen Coat",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Shoulder(ClothBlue0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/cloth_green_0.ron
Normal file
8
assets/common/items/armor/shoulder/cloth_green_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Green Linen Coat",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Shoulder(ClothGreen0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/cloth_purple_0.ron
Normal file
8
assets/common/items/armor/shoulder/cloth_purple_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Purple Linen Coat",
|
||||
description: "WIP",
|
||||
kind: Armor(
|
||||
kind: Shoulder(ClothPurple0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_0.ron
Normal file
8
assets/common/items/armor/shoulder/leather_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Leather Pauldrons",
|
||||
description: "",
|
||||
kind: Armor(
|
||||
kind: Shoulder(Leather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_1.ron
Normal file
8
assets/common/items/armor/shoulder/leather_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Swift Shoulderpads",
|
||||
description: "Swift like the wind.",
|
||||
kind: Armor(
|
||||
kind: Shoulder(Leather1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/plate_0.ron
Normal file
8
assets/common/items/armor/shoulder/plate_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Shoulderguards",
|
||||
description: "A strong shoulder to lean on.",
|
||||
kind: Armor(
|
||||
kind: Shoulder(Plate0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -1,10 +1,12 @@
|
||||
Item(
|
||||
name: "Dwarven Cheese",
|
||||
description: "Aromatic and nutritious.",
|
||||
description: "Aromatic and nutritious.
|
||||
|
||||
Restores 15 Health.",
|
||||
kind: Consumable(
|
||||
kind: Cheese,
|
||||
effect: Health((
|
||||
amount: 40,
|
||||
amount: 15,
|
||||
cause: Item,
|
||||
)),
|
||||
),
|
||||
|
@ -2,8 +2,10 @@ Item(
|
||||
name: "Weightless Rod",
|
||||
description: "The sky is the limit.",
|
||||
kind: Tool(
|
||||
kind: Debug(Boost),
|
||||
power: 0,
|
||||
(
|
||||
kind: Debug(Boost),
|
||||
equip_time_millis: 0,
|
||||
)
|
||||
),
|
||||
)
|
||||
// And the ground is pretty hard at maximum velocity...
|
@ -2,8 +2,10 @@ Item(
|
||||
name: "Rod of Possession",
|
||||
description: "It's fixed on my branch.",
|
||||
kind: Tool(
|
||||
kind: Debug(Possess),
|
||||
power: 0,
|
||||
(
|
||||
kind: Debug(Possess),
|
||||
equip_time_millis: 0,
|
||||
)
|
||||
),
|
||||
)
|
||||
// ... as zesterer always uses to tell us.
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Blue Flower",
|
||||
description: "Matches the color of the sky.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Pink Flower",
|
||||
description: "Looks like a lollipop.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Red Flower",
|
||||
description: "Roses are red...",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Sunflower",
|
||||
description: "Smells like summer.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "White flower",
|
||||
description: "Pure and precious.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Yellow Flower",
|
||||
description: "Glows like the sun.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Flower,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Long Grass",
|
||||
description: "Greener than an orc's snout.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Grass,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Medium Grass",
|
||||
description: "Greener than an orc's snout.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Grass,
|
||||
)
|
||||
)
|
||||
|
@ -1,5 +1,7 @@
|
||||
Item(
|
||||
name: "Short Grass",
|
||||
description: "Greener than an orc's snout.",
|
||||
kind: Ingredient,
|
||||
kind: Ingredient(
|
||||
kind: Grass,
|
||||
)
|
||||
)
|
||||
|
@ -1,6 +1,8 @@
|
||||
Item(
|
||||
name: "Mushroom",
|
||||
description: "Hopefully this one is not poisonous.",
|
||||
description: "Hopefully this one is not poisonous.
|
||||
|
||||
Restores 10 Health.",
|
||||
kind: Consumable(
|
||||
kind: Mushroom,
|
||||
effect: Health((
|
||||
|
@ -1,6 +1,8 @@
|
||||
Item(
|
||||
name: "Minor Potion",
|
||||
description: "Restores a small amount of Health.",
|
||||
description: "Restores a small amount of Health.
|
||||
|
||||
Restores 50 Health.",
|
||||
kind: Consumable(
|
||||
kind: PotionMinor,
|
||||
effect: Health((
|
||||
|
@ -1,8 +1,10 @@
|
||||
Item(
|
||||
name: "Velorite",
|
||||
description: "Just a slight touch makes you feel the knowledge of ancient times.",
|
||||
description: "Just a slight touch makes you feel the knowledge of ancient times.
|
||||
|
||||
Increases Exp by 20.",
|
||||
kind: Consumable(
|
||||
kind: Velorite,
|
||||
effect: Xp(50),
|
||||
effect: Xp(20),
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,10 @@
|
||||
Item(
|
||||
name: "Velorite Fragment",
|
||||
description: "Small runes sparkle on its surface.",
|
||||
description: "Small runes sparkle on its surface.
|
||||
|
||||
Increases Exp by 10.",
|
||||
kind: Consumable(
|
||||
kind: VeloriteFrag,
|
||||
effect: Xp(20),
|
||||
effect: Xp(10),
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Crude Mallet",
|
||||
description: "Breaks bones like sticks and stones.",
|
||||
description: "Breaks bones like sticks and stones.
|
||||
\n
|
||||
Power: 20",
|
||||
kind: Tool(
|
||||
kind: Hammer,
|
||||
power: 20,
|
||||
),
|
||||
(
|
||||
kind: Hammer(BasicHammer),
|
||||
equip_time_millis: 500,
|
||||
)
|
||||
)
|
||||
)
|
||||
|
10
assets/common/items/weapons/shield_1.ron
Normal file
10
assets/common/items/weapons/shield_1.ron
Normal file
@ -0,0 +1,10 @@
|
||||
Item(
|
||||
name: "A Shield",
|
||||
description: "Legends tell this item is useless.",
|
||||
kind: Tool (
|
||||
(
|
||||
kind: Shield(BasicShield),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
11
assets/common/items/weapons/short_sword_0.ron
Normal file
11
assets/common/items/weapons/short_sword_0.ron
Normal file
@ -0,0 +1,11 @@
|
||||
Item(
|
||||
name: "Vicious Gladius",
|
||||
description: "
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
(
|
||||
kind: Sword(Short0),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Humble Stick",
|
||||
description: "Walking stick with a sharpened end.",
|
||||
description: "Walking stick with a sharpened end.
|
||||
|
||||
Power: 6",
|
||||
kind: Tool(
|
||||
kind: Hammer,
|
||||
power: 6,
|
||||
(
|
||||
kind: Staff(BasicStaff),
|
||||
equip_time_millis: 200,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
11
assets/common/items/weapons/staff_nature.ron
Normal file
11
assets/common/items/weapons/staff_nature.ron
Normal file
@ -0,0 +1,11 @@
|
||||
Item(
|
||||
name: "Sceptre of Regeneration",
|
||||
description: " Infused by the power of Nature.
|
||||
Power: 25",
|
||||
kind: Tool(
|
||||
(
|
||||
kind: Staff(Sceptre),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Notched Axe",
|
||||
description: "Every dent tells the story of a chopped tree.",
|
||||
description: "Every dent tells the story of a chopped tree.
|
||||
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
kind: Axe,
|
||||
power: 15,
|
||||
(
|
||||
kind: Axe(BasicAxe),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Uneven Bow",
|
||||
description: "Someone carved his initials into it...",
|
||||
description: "Someone carved his initials into it...
|
||||
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
kind: Bow,
|
||||
power: 15,
|
||||
(
|
||||
kind: Bow(BasicBow),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Sharp Kitchen Knife",
|
||||
description: "Great for cutting meat.",
|
||||
description: "Great for cutting meat.
|
||||
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
kind: Dagger,
|
||||
power: 15,
|
||||
(
|
||||
kind: Dagger(BasicDagger),
|
||||
equip_time_millis: 300,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Sturdy Old Hammer",
|
||||
description: "'Property of...' The rest is missing. ",
|
||||
description: "'Property of...' The rest is missing.
|
||||
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
kind: Hammer,
|
||||
power: 15,
|
||||
(
|
||||
kind: Hammer(BasicHammer),
|
||||
equip_time_millis: 500,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Gnarled Rod",
|
||||
description: "Smells like resin and magic.",
|
||||
description: "Smells like resin and magic.
|
||||
|
||||
Power: 20",
|
||||
kind: Tool(
|
||||
kind: Staff,
|
||||
power: 20,
|
||||
(
|
||||
kind: Staff(BasicStaff),
|
||||
equip_time_millis: 300,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
@ -1,8 +1,12 @@
|
||||
Item(
|
||||
name: "Battered Sword",
|
||||
description: "Held together by Rust and hope.",
|
||||
description: "Held together by Rust and hope.
|
||||
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
kind: Sword,
|
||||
power: 15,
|
||||
(
|
||||
kind: Sword(BasicSword),
|
||||
equip_time_millis: 300,
|
||||
)
|
||||
),
|
||||
)
|
||||
|
11
assets/common/items/weapons/wood_sword.ron
Normal file
11
assets/common/items/weapons/wood_sword.ron
Normal file
@ -0,0 +1,11 @@
|
||||
Item(
|
||||
name: "Wooden Training Sword",
|
||||
description: "
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
(
|
||||
kind: Sword(WoodTraining),
|
||||
equip_time_millis: 400,
|
||||
)
|
||||
),
|
||||
)
|
11
assets/common/items/weapons/zweihander_sword_0.ron
Normal file
11
assets/common/items/weapons/zweihander_sword_0.ron
Normal file
@ -0,0 +1,11 @@
|
||||
Item(
|
||||
name: "Sturdy Bihander",
|
||||
description: "
|
||||
Power: 15",
|
||||
kind: Tool(
|
||||
(
|
||||
kind: Sword(Zweihander0),
|
||||
equip_time_millis: 500,
|
||||
)
|
||||
),
|
||||
)
|
@ -23,17 +23,17 @@
|
||||
],
|
||||
threshold: 0.5,
|
||||
),
|
||||
Wield(Sword): (
|
||||
Wield(Sword(BasicSword)): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.weapon.sword_out",
|
||||
],
|
||||
threshold: 0.5,
|
||||
threshold: 1.0,
|
||||
),
|
||||
Unwield(Sword): (
|
||||
Unwield(Sword(BasicSword)): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.weapon.sword_in",
|
||||
],
|
||||
threshold: 0.5,
|
||||
threshold: 1.0,
|
||||
),
|
||||
Inventory(Collected): (
|
||||
files: [
|
||||
|
BIN
assets/voxygen/background/bg_9.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/background/bg_9.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/armor_slot.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/armor_slot.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/character.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/character.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/buttons/character_hover.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/character_hover.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/buttons/character_press.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/character_press.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/buttons/close_btn.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/close_btn.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/close_btn_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/close_btn_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/close_btn_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/close_btn_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/indicator_mmap.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/indicator_mmap.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/indicator_mmap_small.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/indicator_mmap_small.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_slot_sel.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_slot_sel.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_tab.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_tab.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_tab_active.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_tab_active.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_tab_inactive.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_tab_inactive.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_tab_inactive_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_tab_inactive_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_tab_inactive_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_tab_inactive_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.vox
(Stored with Git LFS)
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user