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

added lanterns and potions

Browse Source
This commit is contained in:
Pfauenauge90 2019-07-21 22:50:51 +02:00
parent e37ca1d1f3
commit 495311de2d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/comp/body/object.rs
View File

@ -35,6 +35,7 @@ impl Body {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
const ALL_OBJECTS: [Body; 24] = [ const ALL_OBJECTS: [Body; 24] = [
@ -68,10 +69,20 @@ const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::
>>>>>>> Add campfire >>>>>>> Add campfire
======= =======
const ALL_OBJECTS: [Body; 5] = [ const ALL_OBJECTS: [Body; 5] = [
=======
const ALL_OBJECTS: [Body; 12] = [
>>>>>>> added lanterns and potions
Body::Bomb, Body::Bomb,
Body::Scarecrow, Body::Scarecrow,
Body::Chest, Body::Chest,
Body::Pumpkin, Body::Pumpkin,
Body::Campfire, Body::Campfire,
Body::LanternGround,
Body::LanternGroundOpen,
Body::LanternStanding,
Body::LanternStanding2,
Body::PotionRed,
Body::PotionBlue,
Body::PotionGreen,
]; ];
>>>>>>> formatting >>>>>>> formatting