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

item images

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-19 22:36:40 +01:00
parent 1e1ce2adbf
commit 3145b26cd6
5 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/hand/leather_0.ron
View File

@ -1,6 +1,6 @@
Item(
name: "Swift Gloves",
description: "Only the best for a member of the creed.",
description: "Swift like the wind.",
kind: Armor(
kind: Hand(Leather0),
stats: 20,

51
assets/voxygen/item_image_manifest.ron
View File

@ -3,34 +3,54 @@
// VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
({
// Weapons
// Bows
Tool(Bow(BasicBow)): VoxTrans(
"voxel.weapon.bow.simple-bow",
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
),
// Daggers
Tool(Dagger(BasicDagger)): VoxTrans(
"voxel.weapon.dagger.dagger_rusty",
(0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
),
Tool(Sword(Rapier)): VoxTrans(
"voxel.weapon.sword.rusty_2h",
// Swords
Tool(Sword(Short0)): VoxTrans(
"voxel.weapon.sword.short_2h-0",
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
),
Tool(Sword(BasicSword)): VoxTrans(
"voxel.weapon.sword.weapon.sword.rusty_2h",
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
),
Tool(Sword(Zweihander0)): VoxTrans(
"voxel.weapon.sword.zweihander_2h-0",
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
),
Tool(Sword(WoodTraining)): VoxTrans(
"voxel.weapon.sword.wood_2h",
(0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
),
// Axes
Tool(Axe(BasicAxe)): VoxTrans(
"voxel.weapon.axe.rusty_2h",
(0.0, -8.0, 0.0), (-90.0, 90.0, 0.0), 2.0,
),
// Hammers
Tool(Hammer(BasicHammer)): VoxTrans(
"voxel.weapon.hammer.rusty_2h",
(0.0, -8.0, 0.0), (-90.0, 90.0, 0.0), 2.0,
),
// Staffs
Tool(Staff(BasicStaff)): VoxTrans(
"voxel.weapon.staff.wood-fire",
(0.0, -9.0, 0.0), (90.0, 90.0, 0.0), 2.5,
),
// Shields
Tool(Shield(BasicShield)): VoxTrans(
"voxel.weapon.shield.wood-0",
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
),
// Other
Utility(Collar): VoxTrans(
"element.icons.collar",
(0.0, 0.0, 0.0), (-90.0, 180.0, 10.0), 1.3,
@ -86,6 +106,31 @@
"voxel.armor.shoulder.plate_left-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
//Leather0 Armor
Armor(Chest(Leather0)): VoxTrans(
"voxel.armor.chest.leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(Leather0)): VoxTrans(
"voxel.armor.pants.leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(Leather0)): VoxTrans(
"voxel.armor.belt.leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(Leather0)): VoxTrans(
"voxel.armor.foot.leather-0",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Leather0)): VoxTrans(
"voxel.armor.hand.leather_left-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Leather1)): VoxTrans(
"voxel.armor.shoulder.leather_left-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
// Consumables
Consumable(Apple): VoxTrans(
"element.icons.item_apple",
@ -133,5 +178,3 @@
(0.0, -7.0, 0.0), (90.0, 90.0, 0.0), 1.6,
),
})

2
assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
View File

@ -16,7 +16,7 @@
color: None
),
Sword(Short0): (
vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -4.0)),
vox_spec: ("weapon.sword.short_2h-0", (-2.0, -6.5, -1.0)),
color: None
),
Axe(BasicAxe): (

2
common/src/comp/inventory/mod.rs
View File

@ -277,7 +277,7 @@ impl Inventory {
impl Default for Inventory {
fn default() -> Inventory {
let mut inventory = Inventory {
slots: vec![None; 27],
slots: vec![None; 200],
};
inventory.push(assets::load_expect_cloned("common.items.cheese"));
inventory.push(assets::load_expect_cloned("common.items.apple"));

4
voxygen/src/hud/bag.rs
View File

@ -180,8 +180,8 @@ impl<'a> Widget for Bag<'a> {
self.stats.exp.maximum(),
&self.localized_strings.get("hud.bag.exp")
);
let space_used = 2; // TODO: Add functionality
let space_max = 999;
let space_used = 0; // TODO: Add functionality
let space_max = 0;
let bag_space = format!("{}/{}", space_used, space_max);
let level = (self.stats.level.level()).to_string();
let currency = 999999; // TODO: Add as a Stat maybe?