Merge remote-tracking branch 'origin/master' into zesterer/lod

.gitignore

@@ -23,11 +23,6 @@
 
 .project
 
-# Vim
-
-**/*.swp
-**/*.vi
-
 # Veloren
 *.rar
 *.log
@@ -40,3 +35,6 @@ todo.txt
 # direnv
 /.envrc
 *.bat
+
+# Mac
+.DS_Store

.gitlab-ci.yml

@@ -8,7 +8,8 @@ variables:
 stages:
     - optional-builds
     - check-compile
-    - post
+    - build-post
+    - publish
 
 before_script:
     - source $HOME/.cargo/env
@@ -70,7 +71,7 @@ check:
     tags:
         - veloren-docker
     script:
-        - RUSTFLAGS="-D warnings" cargo check
+        - RUSTFLAGS="-D warnings" cargo check --locked
 
 code-quality:
     stage: check-compile
@@ -90,30 +91,30 @@ security:
 
 # --
 
-# -- post build
+# -- build-post
 
 unittests:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
         - echo "Workaround, cargo tests fails due some rust files are already deleted, so we just stack cargo test. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo test || cargo test || cargo test || cargo test
+        - cargo test || ( sleep 10 && cargo test ) || ( sleep 10 && cargo test ) || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test
 
 coverage:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
         - echo "Workaround, tarpaulin fails due some rust files are already deleted, so we just stack tarpaulin. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
+        - cargo tarpaulin -v || ( sleep 10 && cargo tarpaulin -v ) || ( sleep 10 && cargo tarpaulin -v ) || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
 
 benchmarks:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
@@ -125,7 +126,7 @@ benchmarks:
 localization-status:
     variables:
         GIT_DEPTH: 0
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     allow_failure: true
@@ -135,13 +136,13 @@ localization-status:
         - cargo test -q test_all_localizations -- --nocapture --ignored
 
 linux:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -160,13 +161,13 @@ linux:
         expire_in: 1 week
 
 windows:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -181,4 +182,54 @@ windows:
             - assets/
             - LICENSE
         expire_in: 1 week
+
+macos:
+    stage: build-post
+    when: delayed
+    start_in: 5 seconds
+    only:
+        refs:
+            - /^r[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
+            - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
+        - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
+        - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
+    artifacts:
+        paths:
+            - veloren-server-cli
+            - veloren-voxygen
+            - assets/
+            - LICENSE
+        expire_in: 1 week
+    allow_failure: true
+# --
+
+# -- publish
+
+docker:
+    stage: publish
+    when: delayed
+    start_in: 5 seconds
+    image:
+      name: gcr.io/kaniko-project/executor:debug
+      entrypoint: [""]
+    dependencies:
+        - linux
+    before_script:
+        - ls "$CI_PROJECT_DIR/server-cli/"
+    only:
+      refs:
+          - /^r[0-9]+\.[0-9]+\.[0-9]+/
+          - /^v[0-9]+\.[0-9]+/
+          - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-server"
+
 # --

.gitlab/CODEOWNERS

@@ -0,0 +1,28 @@
+# Defines people who should approve to certain parts of the codebase
+
+/assets/ @assetsandvisualdesign @frontend
+/chat-cli/ @frontend
+/client/ @backend @networking
+/common/ @backend @networking
+/server/ @backend @networking
+/server-cli/ @frontend
+#/voxygen/ @someone
+/voxygen/anim/ @animation
+/voxygen/audio/ @audio 
+#/voxygen/hud/ @someone
+#/voxygen/menu / @someone
+#/voxygen/mesh/ @someone
+/voxygen/render/ @rendering 
+#/voxygen/scene/ @someone
+#/voxygen/ui/ @someone 
+/world/ @worldgen
+
+# All files related to documentation or game unrelated content needs to be approved by the meta group
+*.md @meta
+*.nix @meta
+.gitignore @meta
+.gitattributes @meta
+.gitlab-ci.yml @meta
+rust-toolchain @meta
+LICENSE @meta
+.cargo/ @meta

CHANGELOG.md

@@ -19,12 +19,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added gamma setting
 - Added new orc hairstyles
 - Added sfx for wielding/unwielding weapons
+- Fixed NPCs attacking the player forever after killing them
+- Added sfx for collecting, dropping and using inventory items
+- New attack animation
+- weapon control system
+- Game pauses when in singleplayer and pause menu
+- Added authentication system (to play on the official server register on https://account.veloren.net)
+- Added gamepad/controller support
+- Added player feedback when attempting to pickup an item with a full inventory
+- Added free look
+- Added Italian translation
+- Added Portuguese translation
+- Added Turkish translation
+- Complete rewrite of the combat system into a state machine
+- Abilities like Dash and Triplestrike
+- Armor can now be eqipped as items
+- Fireball explosions
+- Inventory supports stacking
+- Many new armors and weapons to find in chests
+- Fleshed out "attack" animation into alpha, beta and spin type attacks
+- Fleshed out range attack into charging and shooting anims for staff/bow
+- Customized attack animation for hammers and axes
 
 ### Changed
 
 - Brighter / higher contrast main-map
 - Removed highlighting of non-collectible sprites
 - Fixed /give_exp ignoring player argument
+- Extend run sfx to small animals to prevent sneak attacks by geese.
+- Decreased clientside latency of ServerEvent mediated effects (e.g. projectiles, inventory operations, etc)
+- Started changing the visual theme of the UI
+- Merge of the Bag and Character-Screen
+- Merge of the Map and Questlog
+- Overhauled icon art
+- Asset cleanup to lower client-size
+- Rewrote the humanoid skeleton to be more ideal for attack animations
+
 
 ### Removed
 

README.md

@@ -18,6 +18,9 @@ Currently the communication of contributors happens mainly on our [official Disc
 
 ## Useful Links
 
+[Sign Up](https://account.veloren.net) - Here you can create an online account for Veloren.
+This will be needed to play on auth-enabled servers, including the official server.
+
 [The Book](https://book.veloren.net) - A collection of all important information relating to Veloren. It includes information on how to compile Veloren and how to contribute.
 
 [Future Plans](https://gitlab.com/veloren/veloren/milestones) - Go here for information about Veloren's development roadmap and what we're currently working on.

assets/common/items/apple.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Apple",
-    description: "Red and juicy.",
+    description: "Red and juicy.
+    
+Restores 20 Health.",
     kind: Consumable(
         kind: Apple,
         effect: Health((

assets/common/items/armor/belt/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Belt",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Belt(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/belt/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Belt",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Belt(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/belt/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Belt",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Belt(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/belt/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Linen Belt",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Belt(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/belt/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Belt",
+    description: "Swift like the wind.",
+    kind: Armor(
+        kind: Belt(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/belt/plate_0.ron

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

assets/common/items/armor/chest/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Chest",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Chest(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/chest/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Chest",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Chest(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/chest/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Chest",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Chest(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/chest/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Linen Chest",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Chest(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/chest/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Chest",
+    description: "Swift like the wind.",
+    kind: Armor(
+        kind: Chest(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/chest/plate_green_0.ron

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

assets/common/items/armor/foot/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Boots",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Foot(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/foot/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Boots",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Foot(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/foot/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Boots",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Foot(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/foot/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Linen Boots",
+   description: "Soft and warm",
+    kind: Armor(
+        kind: Foot(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/foot/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Boots",
+    description: "Swift like the wind.",
+    kind: Armor(
+        kind: Foot(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/foot/plate_0.ron

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

assets/common/items/armor/hand/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Gloves",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Hand(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/hand/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Wrists",
+    description: "WIP",
+    kind: Armor(
+        kind: Hand(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/hand/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Wrists",
+   description: "WIP",
+    kind: Armor(
+        kind: Hand(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/hand/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Silk Wrists",
+   description: "WIP",
+    kind: Armor(
+        kind: Hand(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/hand/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Gloves",
+    description: "Swift like the wind.",
+    kind: Armor(
+        kind: Hand(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/hand/plate_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Handguards",
+    description: "WIP",
+    kind: Armor(
+        kind: Hand(Plate0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Pants",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Pants(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Skirt",
+   description: "WIP",
+    kind: Armor(
+        kind: Pants(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Skirt",
+   description: "WIP",
+    kind: Armor(
+        kind: Pants(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Linen Skirt",
+   description: "WIP",
+    kind: Armor(
+        kind: Pants(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Hunting Pants",
+    description: "",
+    kind: Armor(
+        kind: Pants(Green),
+        stats: (20),
+    ),
+)

assets/common/items/armor/pants/leather_0.ron

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

assets/common/items/armor/pants/plate_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Legguards",
+    description: "WIP",
+    kind: Armor(
+        kind: Pants(PlateGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/assassin.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Assassin Shoulder Guard",
+    description: "Only the best for a member of the creed.",
+    kind: Armor(
+        kind: Shoulder(Assassin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/cloth_blue_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Blue Linen Coat",
+   description: "WIP",
+    kind: Armor(
+        kind: Shoulder(ClothBlue0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/cloth_green_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Green Linen Coat",
+   description: "WIP",
+    kind: Armor(
+        kind: Shoulder(ClothGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/cloth_purple_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Purple Linen Coat",
+   description: "WIP",
+    kind: Armor(
+        kind: Shoulder(ClothPurple0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Leather Pauldrons",
+    description: "",
+    kind: Armor(
+        kind: Shoulder(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/leather_1.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Shoulderpads",
+    description: "Swift like the wind.",
+    kind: Armor(
+        kind: Shoulder(Leather1),
+        stats: (20),
+    ),
+)

assets/common/items/armor/shoulder/plate_0.ron

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

assets/common/items/cheese.ron

@@ -1,10 +1,12 @@
 Item(
     name: "Dwarven Cheese",
-    description: "Aromatic and nutritious.",
+    description: "Aromatic and nutritious.
+    
+Restores 15 Health.",
     kind: Consumable(
         kind: Cheese,
         effect: Health((
-            amount: 40,
+            amount: 15,
             cause: Item,
         )),
     ),

assets/common/items/debug/boost.ron

@@ -2,8 +2,10 @@ Item(
     name: "Weightless Rod",
     description: "The sky is the limit.",
     kind: Tool(
+        (
             kind: Debug(Boost),
-        power: 0,
+            equip_time_millis: 0,            
+        )
     ),
 )
 // And the ground is pretty hard at maximum velocity...

assets/common/items/debug/possess.ron

@@ -2,8 +2,10 @@ Item(
     name: "Rod of Possession",
     description: "It's fixed on my branch.",
     kind: Tool(
+        (
             kind: Debug(Possess),
-        power: 0,
+            equip_time_millis: 0,            
+        )
     ),
 )
 // ... as zesterer always uses to tell us.

assets/common/items/flowers/blue.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Blue Flower",
     description: "Matches the color of the sky.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/flowers/pink.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Pink Flower",
     description: "Looks like a lollipop.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/flowers/red.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Red Flower",
     description: "Roses are red...",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/flowers/sun.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Sunflower",
     description: "Smells like summer.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/flowers/white.ron

@@ -1,5 +1,7 @@
 Item(
     name: "White flower",
     description: "Pure and precious.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/flowers/yellow.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Yellow Flower",
     description: "Glows like the sun.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Flower,
+    )
 )

assets/common/items/grasses/long.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Long Grass",
     description: "Greener than an orc's snout.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Grass,
+    )
 )

assets/common/items/grasses/medium.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Medium Grass",
     description: "Greener than an orc's snout.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Grass,
+    )
 )

assets/common/items/grasses/short.ron

@@ -1,5 +1,7 @@
 Item(
     name: "Short Grass",
     description: "Greener than an orc's snout.",
-    kind: Ingredient,
+    kind: Ingredient(
+        kind: Grass,
+    )
 )

assets/common/items/mushroom.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Mushroom",
-    description: "Hopefully this one is not poisonous.",
+    description: "Hopefully this one is not poisonous.
+
+Restores 10 Health.",
     kind: Consumable(
         kind: Mushroom,
         effect: Health((

assets/common/items/potion_minor.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Minor Potion",
-    description: "Restores a small amount of Health.",
+    description: "Restores a small amount of Health.
+
+Restores 50 Health.",
     kind: Consumable(
         kind: PotionMinor,
         effect: Health((

assets/common/items/velorite.ron

@@ -1,8 +1,10 @@
 Item(
     name: "Velorite",
-    description: "Just a slight touch makes you feel the knowledge of ancient times.",
+    description: "Just a slight touch makes you feel the knowledge of ancient times.
+
+Increases Exp by 20.",
     kind: Consumable(
         kind: Velorite,
-        effect: Xp(50),
+        effect: Xp(20),
     ),
 )

assets/common/items/veloritefrag.ron

@@ -1,8 +1,10 @@
 Item(
     name: "Velorite Fragment",
-    description: "Small runes sparkle on its surface.",
+    description: "Small runes sparkle on its surface.
+
+Increases Exp by 10.",
     kind: Consumable(
         kind: VeloriteFrag,
-        effect: Xp(20),
+        effect: Xp(10),
     ),
 )

assets/common/items/weapons/hammer_1.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Crude Mallet",
-    description: "Breaks bones like sticks and stones.",
+    description: "Breaks bones like sticks and stones.
+    \n
+    Power: 20",
     kind: Tool(
-        kind: Hammer,
+        (
-        power: 20,
+            kind: Hammer(BasicHammer),    
-    ),
+            equip_time_millis: 500,
+        )
+    )
 )

assets/common/items/weapons/shield_1.ron

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

assets/common/items/weapons/short_sword_0.ron

@@ -0,0 +1,11 @@
+Item(
+    name: "Vicious Gladius",
+    description: "    
+    Power: 15",
+    kind: Tool(
+        (
+            kind: Sword(Short0),    
+            equip_time_millis: 400,
+        )
+    ),
+)

assets/common/items/weapons/staff_1.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Humble Stick",
-    description: "Walking stick with a sharpened end.",
+    description: "Walking stick with a sharpened end.
+    
+    Power: 6",
     kind: Tool(
-        kind: Hammer,
+        (
-        power: 6,
+            kind: Staff(BasicStaff),    
+            equip_time_millis: 200,
+        )
     ),
 )

assets/common/items/weapons/staff_nature.ron

@@ -0,0 +1,11 @@
+Item(
+    name: "Sceptre of Regeneration",
+    description: " Infused by the power of Nature.   
+    Power: 25",
+    kind: Tool(
+        (
+            kind: Staff(Sceptre),    
+            equip_time_millis: 400,
+        )
+    ),
+)

assets/common/items/weapons/starter_axe.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Notched Axe",
-    description: "Every dent tells the story of a chopped tree.",
+    description: "Every dent tells the story of a chopped tree.
+    
+    Power: 15",
     kind: Tool(
-        kind: Axe,
+        (
-        power: 15,
+            kind: Axe(BasicAxe),    
+            equip_time_millis: 400,
+        )
     ),
 )

assets/common/items/weapons/starter_bow.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Uneven Bow",
-    description: "Someone carved his initials into it...",
+    description: "Someone carved his initials into it...
+    
+    Power: 15",
     kind: Tool(
-        kind: Bow,
+        (
-        power: 15,
+            kind: Bow(BasicBow),    
+            equip_time_millis: 400,
+        )
     ),
 )

assets/common/items/weapons/starter_dagger.ron

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

assets/common/items/weapons/starter_hammer.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Sturdy Old Hammer",
-    description: "'Property of...' The rest is missing. ",
+    description: "'Property of...' The rest is missing.
+    
+    Power: 15",
     kind: Tool(
-        kind: Hammer,
+        (
-        power: 15,
+            kind: Hammer(BasicHammer),    
+            equip_time_millis: 500,
+        )
     ),
 )

assets/common/items/weapons/starter_staff.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Gnarled Rod",
-    description: "Smells like resin and magic.",
+    description: "Smells like resin and magic.
+    
+    Power: 20",
     kind: Tool(
-        kind: Staff,
+        (
-        power: 20,
+            kind: Staff(BasicStaff),    
+            equip_time_millis: 300,
+        )
     ),
 )

assets/common/items/weapons/starter_sword.ron

@@ -1,8 +1,12 @@
 Item(
     name: "Battered Sword",
-    description: "Held together by Rust and hope.",
+    description: "Held together by Rust and hope.
+    
+    Power: 15",
     kind: Tool(
-        kind: Sword,
+        (
-        power: 15,
+            kind: Sword(BasicSword),    
+            equip_time_millis: 300,
+        )
     ),
 )

assets/common/items/weapons/wood_sword.ron

@@ -0,0 +1,11 @@
+Item(
+    name: "Wooden Training Sword",
+    description: "    
+    Power: 15",
+    kind: Tool(
+        (
+            kind: Sword(WoodTraining),    
+            equip_time_millis: 400,
+        )
+    ),
+)

assets/common/items/weapons/zweihander_sword_0.ron

@@ -0,0 +1,11 @@
+Item(
+    name: "Sturdy Bihander",
+    description: "    
+    Power: 15",
+    kind: Tool(
+       (
+            kind: Sword(Zweihander0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/npc_names.json

@@ -459,6 +459,10 @@
             "peacock": {
                 "keyword": "peacock",
                 "generic": "Peacock"
+            },
+            "eagle": {
+                "keyword": "eagle",
+                "generic": "Eagle"
             }
         }
     },

assets/voxygen/audio/sfx.ron

@@ -23,17 +23,77 @@
             ],
             threshold: 0.5,
         ),
-        Wield(Sword): (
+        Wield(Sword(BasicSword)): (
             files: [
                 "voxygen.audio.sfx.weapon.sword_out",
             ],
-            threshold: 0.5,
+            threshold: 1.0,
         ),
-        Unwield(Sword): (
+        Unwield(Sword(BasicSword)): (
             files: [
                 "voxygen.audio.sfx.weapon.sword_in",
             ],
+            threshold: 1.0,
+        ),
+        Inventory(Collected): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
             threshold: 0.5,
         ),
+        Inventory(Swapped): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Given): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Dropped): (
+            files: [
+                "voxygen.audio.sfx.footsteps.stepgrass_4",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Consumed(Potion)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.liquid",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(PotionMinor)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.liquid",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Apple)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.apple",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Mushroom)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Cheese)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(CollectFailed): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_failed",
+            ],
+            threshold: 0.3,
+        )
     }
 )