Merge branch 'imbris/slots' into 'master'

Slots! Dragging, right-click to use, capes, lanterns, unequipping.

Closes #526

See merge request veloren/veloren!904

CHANGELOG.md

@@ -44,6 +44,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - German translation
 - Added a silhouette for players when they are occluded
 - Added transparency to the player when zooming in
+- Made armor and hotbar slots actually function
+- Added dragging and right-click to use functionality to inventory, armor & hotbar slots
+- Added capes, lanterns, tabards, rings, helmets & necklaces as equippable armor
 
 ### Changed
 

assets/common/items/armor/back/admin.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Admin's Cape",
+   description: "
+   With great power comes 
+   great responsibility. ",
+    kind: Armor(
+        kind: Back(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/back/short_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Short leather Cape",
+   description: "",
+    kind: Armor(
+        kind: Back(Short0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/head/assa_mask_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Dark Assassin Mask",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(AssaMask0),
+        stats: (20),
+    ),
+)

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

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

assets/common/items/armor/neck/neck_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Plain Necklace",
+   description: "",
+    kind: Armor(
+        kind: Neck(Neck0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/ring/ring_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Scratched Ring",
+   description: "Barely fits your finger.",
+    kind: Armor(
+        kind: Ring(Ring0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/rugged_chest.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Rugged Shirt",
+    description: "Smells like Adventure.",
+    kind: Armor(
+        kind: Chest(Rugged0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/rugged_pants.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Rugged Commoner's Pants",
+   description: "They remind you of the old days.",
+    kind: Armor(
+        kind: Pants(Rugged0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/sandals_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Worn out Sandals",
+    description: "Loyal companions.",
+    kind: Armor(
+        kind: Foot(Sandal0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/tabard/admin.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Admin's Tabard",
+   description: "
+   With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Tabard(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/debug/admin_back.ron

@@ -0,0 +1,9 @@
+Item(
+    name: "Admin's Cape",
+   description: "With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Back(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/debug/admin_tabard.ron

@@ -0,0 +1,9 @@
+Item(
+    name: "Admin's Tabard",
+   description: "With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Tabard(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/debug/green_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Lime Zest Lantern",
+    description: "It has an opening that could fit a ring...",
+    kind: Lantern(Green0),
+)

assets/common/items/debug/leather_0.ron

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

assets/common/items/debug/neck_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Plain Necklace",
+   description: "WIP",
+    kind: Armor(
+        kind: Neck(Neck0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_belt.ron

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

assets/common/items/debug/plate_chest.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/debug/plate_feet.ron

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

assets/common/items/debug/plate_hands.ron

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

assets/common/items/debug/plate_legs.ron

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

assets/common/items/debug/plate_shoulder.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/debug/ring_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Scratched Ring",
+   description: "WIP",
+    kind: Armor(
+        kind: Ring(Ring0),
+        stats: (20),
+    ),
+)

assets/common/items/lantern/black_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Black Lantern",
+    description: "Used by city guards.",
+    kind: Lantern(Black0),
+)

assets/common/items/lantern/green_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Lime Zest Lantern",
+    description: "It has an opening that could fit a ring...",
+    kind: Lantern(Green0),
+)

assets/voxygen/i18n/de_DE.ron

@@ -155,9 +155,7 @@ eurer erstellen Charaktere gespeichert."#,
         "hud.press_key_to_toggle_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen",
 
         /// Respawn message
-        "hud.press_key_to_respawn": r#"Drückt {key} um am letzten Lagerfeuer wiederbelebt zu werden.
-
-Drückt Enter und tippt /waypoint in den Chat um den Wegpunkt hier zu erstellen."#,
+        "hud.press_key_to_respawn": r#"Drückt {key} um am letzten Lagerfeuer wiederbelebt zu werden."#,
 
         /// Welcome message
         "hud.welcome": r#"Willkommen zur Veloren Alpha.
@@ -197,11 +195,25 @@ um dieses Fenster zu schließen? Drückt 'TAB'!
 Viel Spaß in der Welt von Veloren, Abenteurer!"#,
 
         // Inventory
-        "hud.bag.inventory": "s Inventar",
-        "hud.bag.stats_title": "s Werte",
+        "hud.bag.inventory": "{playername}s Inventar",
+        "hud.bag.stats_title": "{playername}s Werte",
         "hud.bag.exp": "Erf",
         "hud.bag.armor": "Rüstung",
         "hud.bag.stats": "Werte",
+        "hud.bag.head": "Kopf",
+        "hud.bag.neck": "Hals",
+        "hud.bag.tabard": "Wappenrock",
+        "hud.bag.shoulders": "Schultern",
+        "hud.bag.chest": "Brust",
+        "hud.bag.hands": "Hände",
+        "hud.bag.lantern": "Laterne",
+        "hud.bag.belt": "Gürtel",
+        "hud.bag.ring": "Ring",
+        "hud.bag.back": "Rücken",
+        "hud.bag.legs": "Beine",
+        "hud.bag.feet": "Füße",
+        "hud.bag.mainhand": "Haupthand",
+        "hud.bag.offhand": "Nebenhand",  
 
         // Map and Questlog
         "hud.map.map_title": "Karte",
@@ -257,92 +269,70 @@ Viel Spaß in der Welt von Veloren, Abenteurer!"#,
         "hud.settings.sound_effect_volume": "Geräusch Lautstärke",
         "hud.settings.audio_device": "Ausgabegerät",
 
-        /// Control list
-        "hud.settings.control_names": r#"Free Cursor
-Toggle Help Window
-Toggle Interface
-Toggle FPS and Debug Info
-Take Screenshot
-Toggle Nametags
-Toggle Fullscreen
+        "hud.settings.awaitingkey": "Drückt eine Taste...",
 
-
-Move Forward
-Move Left
-Move Right
-Move Backwards
-
-Jump
-
-Glider
-
-Dodge
-
-Auto Walk
-
-Sheathe/Draw Weapons
-
-Put on/Remove Helmet
-
-Sit
-
-
-Basic Attack
-Secondary Attack/Block/Aim
-
-
-Skillbar Slot 1
-Skillbar Slot 2
-Skillbar Slot 3
-Skillbar Slot 4
-Skillbar Slot 5
-Skillbar Slot 6
-Skillbar Slot 7
-Skillbar Slot 8
-Skillbar Slot 9
-Skillbar Slot 10
-
-
-Pause Menu
-Settings
-Social
-Map
-Spellbook
-Character
-Questlog
-Bag
-
-
-
-Send Chat Message
-Scroll Chat
-
-
-Chat commands:  
-
-/alias [Name] - Change your Chat Name   
-/tp [Name] - Teleports you to another player    
-/jump <dx> <dy> <dz> - Offset your position 
-/goto <x> <y> <z> - Teleport to a position  
-/kill - Kill yourself   
-/pig - Spawn pig NPC    
-/wolf - Spawn wolf NPC  
-/help - Display chat commands"#,
-
-        "hud.social": "Andere Spieler",
+        "hud.social": "Sozial",
         "hud.social.online": "Online",
         "hud.social.friends": "Freunde",
-        "hud.social.not_yet_available": "Noch nicht verfügbar.",
-        "hud.social.Faction": "Fraktion",
-        "hud.social.play_online_fmt": "Online Spieler",
+        "hud.social.not_yet_available": "Noch nicht verfügbar",
         "hud.social.faction": "Fraktion",
-
+        "hud.social.play_online_fmt": "{nb_player} Spieler online",
 
         "hud.spell": "Zauber",
 
-        "hud.free_look_indicator": "Freies Umsehen Aktiv",
-        /// End HUD section
+        "hud.free_look_indicator": "Freie Sicht aktiv",
 
+       
+        /// End HUD section
+        /// Start GameInput section
+
+        "gameinput.primary": "Linker mittlerer Slot",
+        "gameinput.secondary": "Rechter mittlerer Slot",
+        "gameinput.slot1": "Hotbar Slot 1",        
+        "gameinput.slot2": "Hotbar Slot 2",
+        "gameinput.slot3": "Hotbar Slot 3",
+        "gameinput.slot4": "Hotbar Slot 4",
+        "gameinput.slot5": "Hotbar Slot 5",
+        "gameinput.slot6": "Hotbar Slot 6",
+        "gameinput.slot7": "Hotbar Slot 7",
+        "gameinput.slot8": "Hotbar Slot 8",
+        "gameinput.slot9": "Hotbar Slot 9",
+        "gameinput.slot10": "Hotbar Slot 10",
+        "gameinput.swaploadout": "Waffe wechseln",
+        "gameinput.togglecursor": "Mauszeiger zeigen/verstecken",
+        "gameinput.help": "Hilfe anzeigen",
+        "gameinput.toggleinterface": "Interface verstecken/zeigen",
+        "gameinput.toggledebug": "FPS und Debug Informationen",
+        "gameinput.screenshot": "Bildschirmaufnahme",
+        "gameinput.toggleingameui": "Namensplaketten zeigen",
+        "gameinput.fullscreen": "Vollbildschirm",
+        "gameinput.moveforward": "Vorwärts bewegen",
+        "gameinput.moveleft": "Nach Links bewegen",
+        "gameinput.moveright": "Nach Rechts bewegen",
+        "gameinput.moveback": "Rückwärts bewegen",
+        "gameinput.jump": "Springen",
+        "gameinput.glide": "Gleiter",
+        "gameinput.roll": "Rollen",
+        "gameinput.climb": "Klettern",
+        "gameinput.climbdown": "Runter klettern",
+        "gameinput.wallleap": "Wandsprung",
+        "gameinput.mount": "Aufsteigen",
+        "gameinput.enter": "Betreten",
+        "gameinput.command": "Befehl",
+        "gameinput.escape": "Escape",
+        "gameinput.map": "Karte",
+        "gameinput.bag": "Inventar",
+        "gameinput.social": "Sozial",
+        "gameinput.sit": "Sitzen",
+        "gameinput.spellbook": "Zauber",
+        "gameinput.settings": "Einstellungen",
+        "gameinput.respawn": "Wiederbeleben",
+        "gameinput.charge": "Anstürmen",
+        "gameinput.togglewield": "Waffe ziehen/wegstecken",
+        "gameinput.interact": "Interagieren",
+        "gameinput.freelook": "Freie Sicht",
+
+        /// End GameInput section
 
         /// Start chracter selection section
         "char_selection.delete_permanently": "Diesen Charakter unwiderruflich löschen?",

assets/voxygen/i18n/en.ron

@@ -190,11 +190,26 @@ Enjoy your stay in the World of Veloren."#,
 
 
         // Inventory
-        "hud.bag.inventory": "'s Inventory",
-        "hud.bag.stats_title": "'s Stats",
+        "hud.bag.inventory": "{playername}'s Inventory",
+        "hud.bag.stats_title": "{playername}'s Stats",
         "hud.bag.exp": "Exp",
         "hud.bag.armor": "Armor",
         "hud.bag.stats": "Stats",
+        "hud.bag.head": "Head",
+        "hud.bag.neck": "Neck",
+        "hud.bag.tabard": "Tabard",
+        "hud.bag.shoulders": "Shoulders",
+        "hud.bag.chest": "Chest",
+        "hud.bag.hands": "Hands",
+        "hud.bag.lantern": "Lantern",
+        "hud.bag.belt": "Belt",
+        "hud.bag.ring": "Ring",
+        "hud.bag.back": "Back",
+        "hud.bag.legs": "Legs",
+        "hud.bag.feet": "Feet",
+        "hud.bag.mainhand": "Mainhand",
+        "hud.bag.offhand": "Offhand",    
+
 
         // Map and Questlog
         "hud.map.map_title": "Map",
@@ -261,7 +276,8 @@ Enjoy your stay in the World of Veloren."#,
 
         "hud.spell": "Spell",
 
-        "hud.free_look_indicator": "Free look active",
+        "hud.free_look_indicator": "Free look active",       
+
         /// End HUD section
 
 
@@ -269,9 +285,18 @@ Enjoy your stay in the World of Veloren."#,
 
         "gameinput.primary": "Basic Attack",
         "gameinput.secondary": "Secondary Attack/Block/Aim",
-        "gameinput.ability3": "Hotbar Slot 1",
+       "gameinput.slot1": "Hotbar Slot 1",        
+        "gameinput.slot2": "Hotbar Slot 2",
+        "gameinput.slot3": "Hotbar Slot 3",
+        "gameinput.slot4": "Hotbar Slot 4",
+        "gameinput.slot5": "Hotbar Slot 5",
+        "gameinput.slot6": "Hotbar Slot 6",
+        "gameinput.slot7": "Hotbar Slot 7",
+        "gameinput.slot8": "Hotbar Slot 8",
+        "gameinput.slot9": "Hotbar Slot 9",
+        "gameinput.slot10": "Hotbar Slot 10",
         "gameinput.swaploadout": "Swap Loadout",
-        "gameinput.togglecursor": "Free Cursor",
+        "gameinput.togglecursor": "Toggle Cursor",
         "gameinput.help": "Toggle Help Window",
         "gameinput.toggleinterface": "Toggle Interface",
         "gameinput.toggledebug": "Toggle FPS and Debug Info",
@@ -296,14 +321,14 @@ Enjoy your stay in the World of Veloren."#,
         "gameinput.bag": "Bag",
         "gameinput.social": "Social",
         "gameinput.sit": "Sit",
-        "gameinput.spellbook": "Spell Book",
+        "gameinput.spellbook": "Spells",
         "gameinput.settings": "Settings",
         "gameinput.respawn": "Respawn",
         "gameinput.charge": "Charge",
         "gameinput.togglewield": "Toggle Wield",
         "gameinput.interact": "Interact",
-        "gameinput.freelook": "Free look behavior",
-
+        "gameinput.freelook": "Free Look",
+        
         /// End GameInput section
 
 

assets/voxygen/item_image_manifest.ron

@@ -54,12 +54,31 @@
         "voxel.weapon.shield.wood-0",
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
     ),
+    // Lanterns
+    Lantern(Black0): Png(
+        "element.icons.lantern_black-0",        
+    ),
+    Lantern(Green0): Png(
+        "element.icons.lantern_green-0",        
+    ),
     // Other
     Utility(Collar): Png(
         "element.icons.collar",
-    ),
-    
+    ),    
     // Armor
+    // Starter Parts
+    Armor(Foot(Sandal0)): VoxTrans(
+        "voxel.armor.foot.cloth_sandals",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Pants(Rugged0)): VoxTrans(
+        "voxel.armor.pants.rugged-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Chest(Rugged0)): VoxTrans(
+        "voxel.armor.chest.rugged-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
     // Assassin Set
     Armor(Chest(Assassin)): VoxTrans(
         "voxel.armor.chest.assa",
@@ -222,6 +241,36 @@
         "voxel.armor.shoulder.cloth_purple_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    // Backs
+    Armor(Back(Short0)): VoxTrans(
+        "voxel.armor.back.short-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Back(Admin)): VoxTrans(
+        "voxel.armor.back.admin",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Rings
+    Armor(Ring(Ring0)): Png(
+        "element.icons.ring-0",        
+    ),
+    // Necks
+    Armor(Neck(Neck0)): Png(
+        "element.icons.neck-0",        
+    ),
+    // Tabards
+    Armor(Tabard(Admin)): Png(
+        "element.icons.tabard_admin",        
+    ),
+    // Heads
+    Armor(Head(Leather0)): VoxTrans(
+        "voxel.armor.head.leather-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Head(AssaMask0)): VoxTrans(
+        "voxel.armor.head.assa_mask-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
     // Consumables
     Consumable(Apple): VoxTrans(
         "element.icons.item_apple",

assets/voxygen/voxel/humanoid_armor_back_manifest.ron

@@ -0,0 +1,16 @@
+((
+    default: (
+        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
+        color: None
+    ),
+    map: {
+      Short0: (
+          vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
+          color: None
+      ), 
+      Admin: (
+          vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
+          color: None
+      ),     
+    },
+))