Merge branch 'pfau/assets' into 'master'

Pfau/assets

See merge request veloren/veloren!1023

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Dance animation
 - Speech bubbles appear when nearby players talk
 - NPCs call for help when attacked
+- Eyebrows and shapes can now be selected
 
 ### Changed
 

assets/common/items/debug/boost.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Weightless Rod",
-    description: "The sky is the limit.",
+    name: "Belzeshrub the Broom-God",
+    description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
     kind: Tool(
         (
             kind: Debug(Boost),

assets/common/items/debug/possess.ron

@@ -1,11 +1,11 @@
 Item(
-    name: "Rod of Possession",
-    description: "It's fixed on my branch.",
+    name: "Belzeshrub the Broom-God",
+    description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
     kind: Tool(
         (
-            kind: Debug(Possess),
+            kind: Debug(Boost),
             equip_time_millis: 0,            
         )
     ),
 )
-// ... as zesterer always uses to tell us.
+// And the ground is pretty hard at maximum velocity...

assets/common/items/weapons/greatsword_2h_dam-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Greatsword",
+    description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordDam0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_dam-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Greatsword",
+    description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordDam1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_dam-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Greatsword",
+    description: "A Damaged Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordDam2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_fine-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Greatsword",
+    description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordFine0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_fine-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Greatsword",
+    description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordFine1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_fine-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Greatsword",
+    description: "A Fine Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordFine2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_orn-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Greatsword",
+    description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordOrn0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_orn-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Greatsword",
+    description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordOrn1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_orn-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Greatsword",
+    description: "A Ornimented Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordOrn2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_simple-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Greatsword",
+    description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordSimple0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_simple-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Greatsword",
+    description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordSimple1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/greatsword_2h_simple-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Greatsword",
+    description: "A Simple Two-Handed Greatsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(GreatswordSimple2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-3.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam3),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-4.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam4),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_dam-5.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Damaged Longsword",
+    description: "A Damaged Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongDam5),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-3.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine3),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-4.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine4),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_fine-5.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Fine Longsword",
+    description: "A Very Fine Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongFine5),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Double-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-3.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn3),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-4.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn4),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_orn-5.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Ornimented Longsword",
+    description: "An Ornimanted Single-Edged, Two-Hand LongSword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongOrn5),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-0.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple0),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-1.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple1),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-2.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Double-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple2),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-3.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple3),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-4.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple4),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/common/items/weapons/long_2h_simple-5.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Simple Longsword",
+    description: "A Simple Single-Edged, Two-Handed Longsword\n\nPower: 2-10\n\n<Right-Click to use>",
+    kind: Tool(
+       (
+            kind: Sword(LongSimple5),    
+            equip_time_millis: 500,
+        )
+    ),
+)

assets/voxygen/audio/soundtrack.ron

@@ -1,7 +1,15 @@
 // TODO: Re-add tunes that are not fitting general outside day/night situations
+// TODO: Add an ambient-soundtrack that runs independently from the musical soundtrack
 
 (
     tracks: [
+        (
+            title: "Forest Day", // Ambience Track
+            path: "voxygen.audio.ambient.forest_day",
+            length: 629.0,
+            timing: Some(Day),
+            artist: "https://www.youtube.com/watch?v=FwVTkB-BIvM",
+        ),        
         (
             title: "Into The Dark Forest",
             path: "voxygen.audio.soundtrack.into_the_dark_forest",
@@ -93,5 +101,12 @@
             timing: Some(Night),
             artist: "badbbad",
         ),
+        (
+            title: "Forest Morning", // Ambience Track
+            path: "voxygen.audio.ambient.forest_morning",
+            length: 600.0,
+            timing: Some(Day),
+            artist: "https://www.youtube.com/watch?v=eq4nfIdK6C4",
+        ),
     ]
 )

assets/voxygen/i18n/de_DE.ron

@@ -74,12 +74,12 @@ VoxygenLocalization(
         "common.connection_lost": r#"Verbindung unterbrochen."#,
 
 
-        "common.races.orc": "Orc",
-        "common.races.human": "Mensch",
-        "common.races.dwarf": "Zwerg",
-        "common.races.elf": "Elf",
-        "common.races.undead": "Untoter",
-        "common.races.danari": "Danari",
+        "common.species.orc": "Orc",
+        "common.species.human": "Mensch",
+        "common.species.dwarf": "Zwerg",
+        "common.species.elf": "Elf",
+        "common.species.undead": "Untoter",
+        "common.species.danari": "Danari",
 
         "common.weapons.axe": "Axt",
         "common.weapons.sword": "Schwert",
@@ -240,6 +240,7 @@ Viel Spaß in der Welt von Veloren, Abenteurer!"#,
         "hud.settings.cumulated_damage": "Addierter Schaden",
         "hud.settings.incoming_damage": "Erlittener Schaden",
         "hud.settings.cumulated_incoming_damage": "Addierter erlittener Schaden",
+        "hud.settings.speech_bubble_dark_mode": "Dunkle Sprechblasen",
         "hud.settings.energybar_numbers": "Zahlen auf Ressourcenanzeige",
         "hud.settings.values": "Werte",
         "hud.settings.percentages": "Prozent",
@@ -360,7 +361,7 @@ Viel Spaß in der Welt von Veloren, Abenteurer!"#,
         "char_selection.chest_color": "Brustrüstung",
         "char_selection.eye_color": "Augenfarbe",
         "char_selection.skin": "Hautton",
-        "char_selection.eyebrows": "Augenbrauen",
+        "char_selection.eyeshape": "Augen Details",
         "char_selection.accessories": "Accessoires",
         "char_selection.create_info_name": "Euer Charakter braucht einen Namen!",
         /// End chracter selection section
@@ -386,5 +387,8 @@ Willenskraft
     },
 
     vector_map: {
+        "npc.speech.villager_under_attack": [
+            "Hilfe, ich werde angegriffen!",            
+            ],
     }
-)
+)

assets/voxygen/i18n/en.ron

@@ -77,12 +77,12 @@ Did the server restart?
 Is the client up to date?"#,
 
 
-        "common.races.orc": "Orc",
-        "common.races.human": "Human",
-        "common.races.dwarf": "Dwarf",
-        "common.races.elf": "Elf",
-        "common.races.undead": "Undead",
-        "common.races.danari": "Danari",
+        "common.species.orc": "Orc",
+        "common.species.human": "Human",
+        "common.species.dwarf": "Dwarf",
+        "common.species.elf": "Elf",
+        "common.species.undead": "Undead",
+        "common.species.danari": "Danari",
 
         "common.weapons.axe": "Axe",
         "common.weapons.sword": "Sword",
@@ -356,11 +356,10 @@ Enjoy your stay in the World of Veloren."#,
         "char_selection.plains_of_uncertainty": "Plains of Uncertainty",
         "char_selection.beard": "Beard",
         "char_selection.hair_style": "Hair Style",
-        "char_selection.hair_color": "Hair Color",
-        "char_selection.chest_color": "Chest color",
-        "char_selection.eye_color": "Eye color",
+        "char_selection.hair_color": "Hair Color",        
+        "char_selection.eye_color": "Eye Color",
         "char_selection.skin": "Skin",
-        "char_selection.eyebrows": "Eyebrows",
+        "char_selection.eyeshape": "Eye Details",
         "char_selection.accessories": "Accessories",
         "char_selection.create_info_name": "Your Character needs a name!",
 
@@ -422,6 +421,7 @@ Willpower
             "They're coming for me!",
             "Help! Help! I'm being repressed",
             "Ah, now we see the violence inherent in the system.",
+            "Tis but a scratch!"
         ],
     }
 )

assets/voxygen/i18n/fr_FR.ron

@@ -52,12 +52,12 @@ VoxygenLocalization(
         "common.cancel": "Annuler",
         "common.none": "Aucun",
 
-        "common.races.orc": "Orc",
-        "common.races.human": "Humain",
-        "common.races.dwarf": "Nain",
-        "common.races.elf": "Elfe",
-        "common.races.undead": "Mort vivant",
-        "common.races.danari": "Danari",
+        "common.species.orc": "Orc",
+        "common.species.human": "Humain",
+        "common.species.dwarf": "Nain",
+        "common.species.elf": "Elfe",
+        "common.species.undead": "Mort vivant",
+        "common.species.danari": "Danari",
 
         "common.weapons.axe": "Hâche",
         "common.weapons.sword": "Épée",

assets/voxygen/i18n/it_IT.ron

@@ -87,12 +87,12 @@ Il client è aggiornato?"#,
 
 
 
-                "common.races.orc": "Orco",
-                "common.races.human": "Umano",
-                "common.races.dwarf": "Nano",
-                "common.races.elf": "Elfo",
-                "common.races.undead": "Non-Morto",
-                "common.races.danari": "Danari",
+                "common.species.orc": "Orco",
+                "common.species.human": "Umano",
+                "common.species.dwarf": "Nano",
+                "common.species.elf": "Elfo",
+                "common.species.undead": "Non-Morto",
+                "common.species.danari": "Danari",
 
 
 

assets/voxygen/i18n/pt_PT.ron

@@ -63,12 +63,12 @@ Será que o server reiniciou?
 O cliente está atualizado?"#,
 
 
-        "common.races.orc": "Ogre",
-        "common.races.human": "Humano",
-        "common.races.dwarf": "Anão",
-        "common.races.elf": "Elfo",
-        "common.races.undead": "Morto-vivo",
-        "common.races.danari": "Danari",
+        "common.species.orc": "Ogre",
+        "common.species.human": "Humano",
+        "common.species.dwarf": "Anão",
+        "common.species.elf": "Elfo",
+        "common.species.undead": "Morto-vivo",
+        "common.species.danari": "Danari",
 
         "common.weapons.axe": "Machado",
         "common.weapons.sword": "Espada",

assets/voxygen/i18n/ru_RU.ron

@@ -63,12 +63,12 @@ VoxygenLocalization(
 Клиент обновлен до последней версии?"#,
 
 
-        "common.races.orc": "Орк",
-        "common.races.human": "Человек",
-        "common.races.dwarf": "Дварф",
-        "common.races.elf": "Эльф",
-        "common.races.undead": "Нежить",
-        "common.races.danari": "Данари",
+        "common.species.orc": "Орк",
+        "common.species.human": "Человек",
+        "common.species.dwarf": "Дварф",
+        "common.species.elf": "Эльф",
+        "common.species.undead": "Нежить",
+        "common.species.danari": "Данари",
 
         "common.weapons.axe": "Топор",
         "common.weapons.sword": "Меч",

assets/voxygen/i18n/tr_TR.ron

@@ -75,12 +75,12 @@ Sunucu yeniden mi başladı?
 İstemci güncel mi?"#,
 
 
-        "common.races.orc": "Ork",
-        "common.races.human": "İnsan",
-        "common.races.dwarf": "Cüce",
-        "common.races.elf": "Elf",
-        "common.races.undead": "Hortlak",
-        "common.races.danari": "Danari",
+        "common.species.orc": "Ork",
+        "common.species.human": "İnsan",
+        "common.species.dwarf": "Cüce",
+        "common.species.elf": "Elf",
+        "common.species.undead": "Hortlak",
+        "common.species.danari": "Danari",
 
         "common.weapons.axe": "Balta",
         "common.weapons.sword": "Kılıç",

assets/voxygen/item_image_manifest.ron

@@ -30,6 +30,154 @@
         "voxel.weapon.sword.wood_2h",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
     ),
+    Tool(Sword(LongFine3)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-3",
+        (0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
+    ),
+    Tool(Sword(GreatswordDam0)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_dam-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordDam1)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_dam-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordDam2)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_dam-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordSimple0)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_simple-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordSimple1)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_simple-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordSimple2)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_simple-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordOrn0)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_orn-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordOrn1)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_orn-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordOrn2)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_orn-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordFine0)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_fine-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordFine1)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_fine-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(GreatswordFine2)): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_fine-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam0)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam1)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam2)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam3)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-3",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam4)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-4",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongDam5)): VoxTrans(
+        "voxel.weapon.sword.long_2h_dam-5",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple0)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple1)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple2)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple3)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-3",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple4)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-4",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongSimple5)): VoxTrans(
+        "voxel.weapon.sword.long_2h_simple-5",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn0)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn1)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn2)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn3)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-3",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn4)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-4",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongOrn5)): VoxTrans(
+        "voxel.weapon.sword.long_2h_orn-5",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine0)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine1)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine2)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-2",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine3)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-3",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine4)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-4",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    Tool(Sword(LongFine5)): VoxTrans(
+        "voxel.weapon.sword.long_2h_fine-5",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
     // Axes
     Tool(Axe(BasicAxe)): VoxTrans(
         "voxel.weapon.axe.rusty_2h",
@@ -500,11 +648,7 @@
     ),
     // Debug Items
     Tool(Debug(Boost)): VoxTrans(
-        "voxel.weapon.debug_wand-0",
-        (0.0, -7.0, 0.0), (90.0, 90.0, 0.0), 1.6,
-    ),
-    Tool(Debug(Possess)): VoxTrans(
-        "voxel.weapon.debug_wand-1",
-        (0.0, -7.0, 0.0), (90.0, 90.0, 0.0), 1.6,
-    ),
+        "voxel.weapon.tool.broom_belzeshrub_purple",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),    
 })