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

MOAR Pumpkins!

Browse Source
This commit is contained in:
Pfauenauge90 2019-07-21 23:34:21 +02:00
parent 495311de2d
commit 3559926a02
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ impl Body {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
const ALL_OBJECTS: [Body; 24] = [ const ALL_OBJECTS: [Body; 24] = [
Body::Bomb, Body::Bomb,
Body::Scarecrow, Body::Scarecrow,
@ -72,10 +73,17 @@ const ALL_OBJECTS: [Body; 5] = [
======= =======
const ALL_OBJECTS: [Body; 12] = [ const ALL_OBJECTS: [Body; 12] = [
>>>>>>> added lanterns and potions >>>>>>> added lanterns and potions
=======
const ALL_OBJECTS: [Body; 16] = [
>>>>>>> MOAR Pumpkins!
Body::Bomb, Body::Bomb,
Body::Scarecrow, Body::Scarecrow,
Body::Chest, Body::Chest,
Body::Pumpkin, Body::Pumpkin1,
Body::Pumpkin2,
Body::Pumpkin3,
Body::Pumpkin4,
Body::Pumpkin5,
Body::Campfire, Body::Campfire,
Body::LanternGround, Body::LanternGround,
Body::LanternGroundOpen, Body::LanternGroundOpen,