Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes

This commit is contained in:
Joshua Yanovski 2020-04-27 22:35:24 +02:00
commit 2c5ad9d076
273 changed files with 3039 additions and 2059 deletions

View File

@ -1,8 +1,6 @@
Item(
name: "Apple",
description: "Red and juicy.
Restores 20 Health.",
description: "Restores 20 Health\n\nRed and juicy\n\n<Right-Click to use>",
kind: Consumable(
kind: Apple,
effect: Health((

View File

@ -1,8 +1,6 @@
Item(
name: "Admin's Cape",
description: "
With great power comes
great responsibility. ",
description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility.\n\n<Right-Click to use>",
kind: Armor(
kind: Back(Admin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Short leather Cape",
description: "",
description: "Back\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Back(Short0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Belt",
description: "Only the best for a member of the creed.",
description: "Belt\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Belt",
description: "Soft and warm",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Belt",
description: "Soft and warm",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Linen Belt",
description: "Soft and warm",
description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Belt",
description: "Swift like the wind.",
description: "Belt\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Belt",
description: "WIP",
description: "Belt\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Belt(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Chest",
description: "Only the best for a member of the creed.",
description: "Chest\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Chest",
description: "Soft and warm",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Chest",
description: "Soft and warm",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Linen Chest",
description: "Soft and warm",
description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Chest",
description: "Swift like the wind.",
description: "Chest\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Chestplate",
description: "Arrows to the stomach are soooo last update.",
description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(PlateGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Boots",
description: "Only the best for a member of the creed.",
description: "Feet\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Boots",
description: "Soft and warm",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Boots",
description: "Soft and warm",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Linen Boots",
description: "Soft and warm",
description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Boots",
description: "Swift like the wind.",
description: "Feet\n\nArmor: 0\n\nSwift like the wind.\nWon't make you run faster.\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Feet",
description: "WIP",
description: "Feet\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Gloves",
description: "Only the best for a member of the creed.",
description: "Hands\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Wrists",
description: "WIP",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Wrists",
description: "WIP",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Silk Wrists",
description: "WIP",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Gloves",
description: "Swift like the wind.",
description: "Hands\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Handguards",
description: "WIP",
description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Hand(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Dark Assassin Mask",
description: "WIP",
description: "Head\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Head(AssaMask0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Leather Cap",
description: "WIP",
description: "Head\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Head(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Plain Necklace",
description: "",
description: "Neck\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Neck(Neck0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Pants",
description: "Only the best for a member of the creed.",
description: "Legs\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Skirt",
description: "WIP",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Skirt",
description: "WIP",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Linen Skirt",
description: "WIP",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Hunting Pants",
description: "",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(Green),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Pants",
description: "",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Legguards",
description: "WIP",
description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(PlateGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Scratched Ring",
description: "Barely fits your finger.",
description: "Ring\n\nBarely fits your finger.\n\n<Right-Click to use>",
kind: Armor(
kind: Ring(Ring0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Assassin Shoulder Guard",
description: "Only the best for a member of the creed.",
description: "Shoulders\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(Assassin),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Blue Linen Coat",
description: "WIP",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(ClothBlue0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Green Linen Coat",
description: "WIP",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(ClothGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Purple Linen Coat",
description: "WIP",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(ClothPurple0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Leather Pauldrons",
description: "",
description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(Leather0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Swift Shoulderpads",
description: "Swift like the wind.",
description: "Shoulders\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(Leather1),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Shoulderguards",
description: "A strong shoulder to lean on.",
description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>",
kind: Armor(
kind: Shoulder(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Rugged Shirt",
description: "Smells like Adventure.",
description: "Chest\n\nArmor: 0\n\nSmells like Adventure.\n\n<Right-Click to use>",
kind: Armor(
kind: Chest(Rugged0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Rugged Commoner's Pants",
description: "They remind you of the old days.",
description: "Legs\n\nArmor: 0\n\nThey remind you of the old days.\n\n<Right-Click to use>",
kind: Armor(
kind: Pants(Rugged0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Worn out Sandals",
description: "Loyal companions.",
description: "Feet\n\nArmor: 0\n\nLoyal companions.\n\n<Right-Click to use>",
kind: Armor(
kind: Foot(Sandal0),
stats: (20),

View File

@ -1,8 +1,6 @@
Item(
name: "Admin's Tabard",
description: "
With great power comes
great responsibility. ",
description: "Tabard\n\nWith great power comes\ngreat responsibility.\n\n<Right-Click to use>",
kind: Armor(
kind: Tabard(Admin),
stats: (20),

View File

@ -1,8 +1,6 @@
Item(
name: "Dwarven Cheese",
description: "Aromatic and nutritious.
Restores 15 Health.",
description: "Restores 15 Health\n\nAromatic and nutritious\n\n<Right-Click to use>",
kind: Consumable(
kind: Cheese,
effect: Health((

View File

@ -1,8 +1,6 @@
Item(
name: "Coconut",
description: "Reliable source of water and fat.
Restores 30 health.",
description: "Restores 30 health\n\nReliable source of water and fat\n\n<Right-Click to use>",
kind: Consumable(
kind: Coconut,
effect: Health((

View File

@ -1,6 +1,6 @@
Item(
name: "Collar",
description: "Tames wild animals within 5 blocks.",
description: "Tames wild animals within 5 blocks\n\n<Right-Click to use>",
kind: Utility(
kind: Collar,
),

View File

@ -1,7 +1,6 @@
Item(
name: "Admin's Tabard",
description: "With great power comes
great responsibility. ",
description: "Tabard\n\nWith great power comes\ngreat responsibility. ",
kind: Armor(
kind: Tabard(Admin),
stats: (20),

View File

@ -1,7 +1,6 @@
Item(
name: "Admin's Cape",
description: "With great power comes
great responsibility. ",
description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility. ",
kind: Armor(
kind: Back(Admin),
stats: (20),

View File

@ -1,5 +0,0 @@
Item(
name: "Lime Zest Lantern",
description: "It has an opening that could fit a ring...",
kind: Lantern(Green0),
)

View File

@ -1,8 +0,0 @@
Item(
name: "Swift Leather Cap",
description: "WIP",
kind: Armor(
kind: Head(Leather0),
stats: (20),
),
)

View File

@ -1,8 +0,0 @@
Item(
name: "Plain Necklace",
description: "WIP",
kind: Armor(
kind: Neck(Neck0),
stats: (20),
),
)

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Belt",
description: "WIP",
description: "Belt\n\nArmor: 0\n\n",
kind: Armor(
kind: Belt(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Feet",
description: "WIP",
description: "Feet\n\nArmor: 0\n\n",
kind: Armor(
kind: Foot(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Chestplate",
description: "Arrows to the stomach are soooo last update.",
description: "Chest\n\nArmor: 0",
kind: Armor(
kind: Chest(PlateGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Legguards",
description: "WIP",
description: "Legs\n\nArmor: 0\n\n",
kind: Armor(
kind: Pants(PlateGreen0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Handguards",
description: "WIP",
description: "Hands\n\nArmor: 0\n\n",
kind: Armor(
kind: Hand(Plate0),
stats: (20),

View File

@ -1,6 +1,6 @@
Item(
name: "Iron Shoulderguards",
description: "A strong shoulder to lean on.",
description: "Shoulders\n\nArmor: 0\n\A strong shoulder to lean on.",
kind: Armor(
kind: Shoulder(Plate0),
stats: (20),

View File

@ -1,8 +0,0 @@
Item(
name: "Scratched Ring",
description: "WIP",
kind: Armor(
kind: Ring(Ring0),
stats: (20),
),
)

View File

@ -1,8 +1,6 @@
Item(
name: "Mushroom",
description: "Hopefully this one is not poisonous.
Restores 10 Health.",
description: "Restores 10 Health\n\nHopefully this one is not poisonous\n\n<Right-Click to use>",
kind: Consumable(
kind: Mushroom,
effect: Health((

View File

@ -1,8 +1,6 @@
Item(
name: "Minor Potion",
description: "Restores a small amount of Health.
Restores 50 Health.",
description: "Restores 50 Health\n\n<Right-Click to use>",
kind: Consumable(
kind: PotionMinor,
effect: Health((

View File

@ -1,8 +1,6 @@
Item(
name: "Velorite",
description: "Just a slight touch makes you feel the knowledge of ancient times.
Increases Exp by 20.",
description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times\n\n<Right-Click to use>",
kind: Consumable(
kind: Velorite,
effect: Xp(20),

View File

@ -1,8 +1,6 @@
Item(
name: "Velorite Fragment",
description: "Small runes sparkle on its surface.
Increases Exp by 10.",
description: "Increases Exp by 10\n\nSmall runes sparkle on its surface\n\n<Right-Click to use>",
kind: Consumable(
kind: VeloriteFrag,
effect: Xp(10),

View File

@ -1,8 +1,6 @@
Item(
name: "Crude Mallet",
description: "Breaks bones like sticks and stones.
\n
Power: 20",
description: "Two-Hand Hammer\n\nPower: 10-12\n\nBreaks bones like sticks and stones.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Hammer(BasicHammer),

View File

@ -1,6 +1,6 @@
Item(
name: "A Shield",
description: "Legends tell this item is useless.",
description: "WIP",
kind: Tool (
(
kind: Shield(BasicShield),

View File

@ -1,7 +1,6 @@
Item(
name: "Vicious Gladius",
description: "
Power: 15",
description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
kind: Tool(
(
kind: Sword(Short0),

View File

@ -1,8 +1,6 @@
Item(
name: "Humble Stick",
description: "Walking stick with a sharpened end.
Power: 6",
description: "Two-Hand Staff\n\nPower: 2-10\n\nWalking stick with a sharpened end\n\n<Right-Click to use>",
kind: Tool(
(
kind: Staff(BasicStaff),

View File

@ -1,7 +1,6 @@
Item(
name: "Sceptre of Regeneration",
description: " Infused by the power of Nature.
Power: 25",
description: "Healing-Sceptre\n\nPower 15-18\n\nHeals your allies with the power of nature.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Staff(Sceptre),

View File

@ -1,8 +1,6 @@
Item(
name: "Notched Axe",
description: "Every dent tells the story of a chopped tree.
Power: 15",
description: "Two-Hand Axe\n\nPower 3-14\n\nEvery dent tells the story of a chopped tree.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Axe(BasicAxe),

View File

@ -1,8 +1,6 @@
Item(
name: "Uneven Bow",
description: "Someone carved his initials into it...
Power: 15",
description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n<Right-Click to use>",
kind: Tool(
(
kind: Bow(BasicBow),

View File

@ -1,8 +1,6 @@
Item(
name: "Sharp Kitchen Knife",
description: "Great for cutting meat.
Power: 15",
description: "WIP",
kind: Tool(
(
kind: Dagger(BasicDagger),

View File

@ -1,8 +1,6 @@
Item(
name: "Sturdy Old Hammer",
description: "'Property of...' The rest is missing.
Power: 15",
description: "Two-Hand Hammer\n\nPower: 10-12\n\n'Property of...' The rest is missing.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Hammer(BasicHammer),

View File

@ -1,8 +1,6 @@
Item(
name: "Gnarled Rod",
description: "Smells like resin and magic.
Power: 20",
description: "Firestaff\n\nPower: 1-13\n\nSmells like resin and magic.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Staff(BasicStaff),

View File

@ -1,8 +1,6 @@
Item(
name: "Battered Sword",
description: "Held together by Rust and hope.
Power: 15",
description: "Two-Hand Sword\n\nPower: 2-10\n\nHeld together by Rust and hope.\n\n<Right-Click to use>",
kind: Tool(
(
kind: Sword(BasicSword),

View File

@ -1,7 +1,6 @@
Item(
name: "Wooden Training Sword",
description: "
Power: 15",
description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
kind: Tool(
(
kind: Sword(WoodTraining),

View File

@ -1,7 +1,6 @@
Item(
name: "Sturdy Bihander",
description: "
Power: 15",
description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
kind: Tool(
(
kind: Sword(Zweihander0),

View File

@ -474,9 +474,23 @@
]
},
"species": {
"giant": {
"keyword": "giant",
"generic": "Giant"
"ogre": {
"keyword": "ogre",
"generic": "Ogre"
}
}
},
"golem": {
"body": {
"keyword": "golem",
"names": [
"phil"
]
},
"species": {
"stonegolem": {
"keyword": "stonegolem",
"generic": "StoneGolem"
}
}
},

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/voxygen/element/buttons/button.vox (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More