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-22 14:38:21 +01:00
parent 5016b8da3a
commit 61e2a986f2
27 changed files with 194 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/pants/cloth_blue_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Blue Linen Skirt",
description: "WIP",
kind: Armor(
kind: Belt(ClothBlue0),
kind: Pants(ClothBlue0),
stats: 20,
),
)

2
assets/common/items/armor/pants/cloth_green_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Green Linen Skirt",
description: "WIP",
kind: Armor(
kind: Belt(ClothGreen0),
kind: Pants(ClothGreen0),
stats: 20,
),
)

2
assets/common/items/armor/pants/cloth_purple_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Purple Linen Skirt",
description: "WIP",
kind: Armor(
kind: Belt(ClothPurple0),
kind: Pants(ClothPurple0),
stats: 20,
),
)

2
assets/common/items/armor/shoulder/cloth_blue_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Blue Linen Coat",
description: "WIP",
kind: Armor(
kind: Belt(ClothBlue0),
kind: Shoulder(ClothBlue0),
stats: 20,
),
)

4
assets/common/items/armor/shoulder/cloth_green_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Green Linen Coat",
description: "WIP",
kind: Armor(
kind: Belt(ClothGreen0),
kind: Shoulder(ClothGreen0),
stats: 20,
),
)
)

4
assets/common/items/armor/shoulder/cloth_purple_0.ron
View File

@ -2,7 +2,7 @@ Item(
name: "Purple Linen Coat",
description: "WIP",
kind: Armor(
kind: Belt(ClothPurple0),
kind: Shoulder(ClothPurple0),
stats: 20,
),
)
)

99
assets/voxygen/item_image_manifest.ron
View File

@ -74,11 +74,11 @@
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Assassin)): VoxTrans(
"voxel.armor.hand.assa_left",
"voxel.armor.hand.assa_right",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Assassin)): VoxTrans(
"voxel.armor.shoulder.assa_left",
"voxel.armor.shoulder.assa_right",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
// Starting Armor - Plate
@ -99,15 +99,15 @@
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Plate0)): VoxTrans(
"voxel.armor.hand.plate_left-0",
"voxel.armor.hand.plate_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Plate0)): VoxTrans(
"voxel.armor.shoulder.plate_left-0",
"voxel.armor.shoulder.plate_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Leather0 Armor
Armor(Chest(Leather0)): VoxTrans(
Armor(Chest(Leather0)): VoxTrans(
"voxel.armor.chest.leather-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
@ -124,15 +124,98 @@
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Leather0)): VoxTrans(
"voxel.armor.hand.leather_left-0",
"voxel.armor.hand.leather_right-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",
"voxel.armor.shoulder.leather_right-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
Armor(Shoulder(Leather0)): VoxTrans(
"voxel.armor.shoulder.leather_left-0",
"voxel.armor.shoulder.leather_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Linen Cloth
Armor(Chest(ClothBlue0)): VoxTrans(
"voxel.armor.chest.cloth_blue-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(ClothBlue0)): VoxTrans(
"voxel.armor.pants.cloth_blue-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(ClothBlue0)): VoxTrans(
"voxel.armor.belt.cloth_blue-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(ClothBlue0)): VoxTrans(
"voxel.armor.foot.cloth_blue-0",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(ClothBlue0)): VoxTrans(
"voxel.armor.hand.cloth_blue_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(ClothBlue0)): VoxTrans(
"voxel.armor.shoulder.cloth_blue_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//////////////
Armor(Chest(ClothGreen0)): VoxTrans(
"voxel.armor.chest.cloth_green-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(ClothGreen0)): VoxTrans(
"voxel.armor.pants.cloth_green-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(ClothGreen0)): VoxTrans(
"voxel.armor.belt.cloth_green-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(ClothGreen0)): VoxTrans(
"voxel.armor.foot.cloth_green-0",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(ClothGreen0)): VoxTrans(
"voxel.armor.hand.cloth_green_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Leather1)): VoxTrans(
"voxel.armor.shoulder.cloth_green_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
Armor(Shoulder(ClothGreen0)): VoxTrans(
"voxel.armor.shoulder.cloth_green_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//////
Armor(Chest(ClothPurple0)): VoxTrans(
"voxel.armor.chest.cloth_purple-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(ClothPurple0)): VoxTrans(
"voxel.armor.pants.cloth_purple-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(ClothPurple0)): VoxTrans(
"voxel.armor.belt.cloth_purple-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(ClothPurple0)): VoxTrans(
"voxel.armor.foot.cloth_purple-0",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(ClothPurple0)): VoxTrans(
"voxel.armor.hand.cloth_purple_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(ClothPurple0)): VoxTrans(
"voxel.armor.shoulder.cloth_purple_right-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
Armor(Shoulder(ClothPurple0)): VoxTrans(
"voxel.armor.shoulder.cloth_purple_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
// Consumables

BIN
assets/voxygen/voxel/armor/belt/cloth_blood.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_blue-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_green-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_purple-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/chest/cloth_blue-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/chest/cloth_green-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/chest/cloth_purple-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/cloth_blue-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/cloth_green-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/cloth_purple-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/grayscale.vox (Stored with Git LFS)
View File

Binary file not shown.

8
assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
View File

@ -36,16 +36,16 @@
color: None
),
ClothPurple0:(
vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
color: None
),
ClothBlue0:(
vox_spec: ("armor.belt.cloth_blue_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
color: None
),
ClothGreen0:(
vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
color: None
),
})

8
assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
View File

@ -44,16 +44,16 @@
color: None
),
ClothPurple0:(
vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 2.0)),
vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
color: None
),
ClothBlue0:(
vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 2.0)),
vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
color: None
),
ClothGreen0:(
vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 2.0)),
vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
color: None
),
})

6
assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
View File

@ -28,15 +28,15 @@
color: None
),
ClothPurple0:(
vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)),
vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)),
color: None
),
ClothBlue0:(
vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)),
vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)),
color: None
),
ClothGreen0:(
vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)),
vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)),
color: None
),
})

6
assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
View File

@ -51,7 +51,7 @@
),
ClothPurple0: (
left: (
vox_spec: ("armor.hand.cloth_purple_left-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (
@ -61,7 +61,7 @@
),
ClothBlue0: (
left: (
vox_spec: ("armor.hand.cloth_blue_left-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (
@ -71,7 +71,7 @@
),
ClothGreen0: (
left: (
vox_spec: ("armor.hand.cloth_green_left-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (

6
assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
View File

@ -40,15 +40,15 @@
color: None
),
ClothPurple0:(
vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
color: None
),
ClothBlue0:(
vox_spec: ("armor.pants.cloth_blue_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
color: None
),
ClothGreen0:(
vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)),
vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
color: None
),
})

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

@ -82,7 +82,7 @@
),
ClothPurple0: (
left: (
vox_spec: ("armor.shoulder.cloth_purple_left-0", (-3.2, -3.5, 1.0)),
vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)),
color: None
),
right: (

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

@ -277,10 +277,62 @@ impl Inventory {
impl Default for Inventory {
fn default() -> Inventory {
let mut inventory = Inventory {
slots: vec![None; 18],
slots: vec![None; 45],
};
inventory.push(assets::load_expect_cloned("common.items.cheese"));
inventory.push(assets::load_expect_cloned("common.items.apple"));
inventory.push(assets::load_expect_cloned(
"common.items.armor.chest.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.belt.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.foot.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.hand.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.pants.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.shoulder.cloth_blue_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.chest.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.belt.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.foot.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.hand.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.pants.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.shoulder.cloth_green_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.chest.cloth_purple_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.belt.cloth_purple_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.foot.cloth_purple_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.hand.cloth_purple_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.pants.cloth_purple_0",
));
inventory.push(assets::load_expect_cloned(
"common.items.armor.shoulder.cloth_purple_0",
));
inventory
}
}