diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index 43421d8095..6b3594284b 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cultist Belt", - description: "Ceremonial attire used by members.", + description: "Ceremonial attire used by members.\n\nWearing cultist armor might frighten and anger villagers.", kind: Armor(( kind: Belt("Cultist"), stats: ( diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index be4e9f0040..f393576b41 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cultist Chest", - description: "Ceremonial attire used by members.", + description: "Ceremonial attire used by members.\n\nWearing cultist armor might frighten and anger villagers.", kind: Armor(( kind: Chest("Cultist"), stats: ( diff --git a/assets/common/items/armor/cultist/hand.ron b/assets/common/items/armor/cultist/hand.ron index 213445d3b4..db62f9425e 100644 --- a/assets/common/items/armor/cultist/hand.ron +++ b/assets/common/items/armor/cultist/hand.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cultist Gloves", - description: "Ceremonial attire used by members.", + description: "Ceremonial attire used by members.\n\nWearing cultist armor might frighten and anger villagers.", kind: Armor(( kind: Hand("Cultist"), stats: ( diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index 2a48813088..2b47e93ac5 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cultist Skirt", - description: "Ceremonial attire used by members.", + description: "Ceremonial attire used by members.\n\nWearing cultist armor might frighten and anger villagers.", kind: Armor(( kind: Pants("Cultist"), stats: ( diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index 58a03db82d..103de8ccab 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -1,6 +1,6 @@ ItemDef( name: "Cultist Mantle", - description: "Ceremonial attire used by members.", + description: "Ceremonial attire used by members.\n\nWearing cultist armor might frighten and anger villagers.", kind: Armor(( kind: Shoulder("Cultist"), stats: ( diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 5b1b11f81b..8d5eede478 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -139,6 +139,7 @@ (Item("common.items.food.mushroom"), 8), (Item("common.items.food.coconut"), 1), (Item("common.items.food.apple"), 4), + (Item("common.items.crafting_ing.bowl"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CookingPot), diff --git a/assets/voxygen/i18n/de_DE/char_selection_de.ron b/assets/voxygen/i18n/de_DE/char_selection_de.ron new file mode 100644 index 0000000000..e274c84413 --- /dev/null +++ b/assets/voxygen/i18n/de_DE/char_selection_de.ron @@ -0,0 +1,31 @@ +/// WARNING: Localization files shall be saved in UTF-8 format without BOM + +/// Localization for "german" Germany +( + string_map: { + "char_selection.loading_characters": "Lade Charaktere...", + "char_selection.delete_permanently": "Den Charakter unwiderruflich löschen?", + "char_selection.deleting_character": "Lösche Charakter...", + "char_selection.change_server": "Wechsle Server", + "char_selection.enter_world": "Welt betreten", + "char_selection.logout": "Ausloggen", + "char_selection.create_new_character": "Neuen Charakter erstellen", + "char_selection.creating_character": "Erstelle Charakter...", + "char_selection.character_creation": "Charakter Erstellung", + "char_selection.human_default": "Human Default", + "char_selection.level_fmt": "Level {level_nb}", + "char_selection.uncanny_valley": "Wildnis", + "char_selection.plains_of_uncertainty": "Steppen der Ungewissheit", + "char_selection.beard": "Bart", + "char_selection.hair_style": "Frisur", + "char_selection.hair_color": "Haarfarbe", + "char_selection.eye_color": "Augenfarbe", + "char_selection.skin": "Hautfarbe", + "char_selection.eyeshape": "Details der Augenpartie", + "char_selection.accessories": "Accessoires", + "char_selection.create_info_name": "Dein Charakter benötigt einen Namen!", + }, + + vector_map: { + } +) diff --git a/assets/voxygen/i18n/de_DE/de_DE_buff.ron b/assets/voxygen/i18n/de_DE/de_DE_buff.ron new file mode 100644 index 0000000000..9b374c8947 --- /dev/null +++ b/assets/voxygen/i18n/de_DE/de_DE_buff.ron @@ -0,0 +1,40 @@ +/// WARNING: Localization files shall be saved in UTF-8 format without BOM + +/// Localization for german (germany) +( + string_map: { + // Buffs + "buff.remove": "Klicke zum Entfernen", + "buff.title.missing": "Fehlender Titel", + "buff.desc.missing": "Fehlende Beschreibung", + "buff.title.heal": "Heilung", + "buff.desc.heal": "Heilung über Zeit.", + "buff.title.potion": "Trank", + "buff.desc.potion": "Trinke...", + "buff.title.saturation": "Sättigung", + "buff.desc.saturation": "Erhalte mit der Zeit Lebenspunkte durch Konsumgüter.", + "buff.title.campfire_heal": "Heilung durch Lagerfeuer", + "buff.desc.campfire_heal": "Das sitzen am Lagerfeuer heilt 1% der Lebensenergie pro Sekunde.", + "buff.title.invulnerability": "Unverwundbarkeit", + "buff.desc.invulnerability": "Du bist immung gegen jeglichen Schaden.", + "buff.title.protectingward": "Protecting Ward", + "buff.desc.protectingward": "Du bist einigermaßen vor Angriffen geschützt.", + // Debuffs + "buff.title.bleed": "Bluten", + "buff.desc.bleed": "Fügt regelmäßigen Schaden zu.", + "buff.title.cursed": "Verflucht", + "buff.desc.cursed": "Du bist verflucht.", + // Buffs stats + "buff.stat.health": "Stellt {str_total} Leben wiederher", + "buff.stat.increase_max_stamina": "Erhöt die maximale Ausdauer um {strength}", + "buff.stat.increase_max_health": "Erhöht die maximale Lebensenergie um {strength}", + "buff.stat.invulnerability": "Gewährt Unverwundbarkeit", + // Text + "buff.text.over_seconds": "über {dur_secs} Sekunden", + "buff.text.for_seconds": "für {dur_secs} Sekunden", + }, + + + vector_map: { + } +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 026c08cba9..61d00c54de 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -379,91 +379,91 @@ // 1h Swords Tool("common.items.weapons.sword_1h.bloodsteel-0"): VoxTrans( "voxel.weapon.sword_1h.bloodsteel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.bloodsteel-1"): VoxTrans( "voxel.weapon.sword_1h.bloodsteel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.bloodsteel-2"): VoxTrans( "voxel.weapon.sword_1h.bloodsteel-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.bronze-0"): VoxTrans( "voxel.weapon.sword_1h.bronze-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.bronze-1"): VoxTrans( "voxel.weapon.sword_1h.bronze-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.bronze-2"): VoxTrans( "voxel.weapon.sword_1h.bronze-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.cobalt-0"): VoxTrans( "voxel.weapon.sword_1h.cobalt-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.cobalt-1"): VoxTrans( "voxel.weapon.sword_1h.cobalt-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.cobalt-2"): VoxTrans( "voxel.weapon.sword_1h.cobalt-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.cobalt-3"): VoxTrans( "voxel.weapon.sword_1h.cobalt-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.iron-0"): VoxTrans( "voxel.weapon.sword_1h.iron-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.iron-1"): VoxTrans( "voxel.weapon.sword_1h.iron-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.iron-2"): VoxTrans( "voxel.weapon.sword_1h.iron-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.iron-3"): VoxTrans( "voxel.weapon.sword_1h.iron-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.iron-4"): VoxTrans( "voxel.weapon.sword_1h.iron-4", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.obsidian-0"): VoxTrans( "voxel.weapon.sword_1h.obsidian-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.orichalcum-0"): VoxTrans( "voxel.weapon.sword_1h.orichalcum-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.orichalcum-1"): VoxTrans( "voxel.weapon.sword_1h.orichalcum-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.steel-0"): VoxTrans( "voxel.weapon.sword_1h.steel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.steel-1"): VoxTrans( "voxel.weapon.sword_1h.steel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.steel-2"): VoxTrans( "voxel.weapon.sword_1h.steel-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Tool("common.items.weapons.sword_1h.steel-3"): VoxTrans( "voxel.weapon.sword_1h.steel-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), // Axes Tool("common.items.weapons.axe.starter_axe"): VoxTrans( @@ -585,75 +585,75 @@ // 1h Axes Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans( "voxel.weapon.axe_1h.bloodsteel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans( "voxel.weapon.axe_1h.bloodsteel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans( "voxel.weapon.axe_1h.bronze-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans( "voxel.weapon.axe_1h.bronze-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans( "voxel.weapon.axe_1h.cobalt-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans( "voxel.weapon.axe_1h.cobalt-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans( "voxel.weapon.axe_1h.iron-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans( "voxel.weapon.axe_1h.iron-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans( "voxel.weapon.axe_1h.iron-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans( "voxel.weapon.axe_1h.iron-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.orichalcum-0"): VoxTrans( "voxel.weapon.axe_1h.orichalcum-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans( "voxel.weapon.axe_1h.steel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans( "voxel.weapon.axe_1h.steel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans( "voxel.weapon.axe_1h.steel-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans( "voxel.weapon.axe_1h.stone-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans( "voxel.weapon.axe_1h.stone-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans( "voxel.weapon.axe_1h.wood-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans( "voxel.weapon.axe_1h.wood-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), // Hammers Tool("common.items.weapons.hammer.hammer_1"): VoxTrans( diff --git a/assets/voxygen/voxel/armor/cultist_slayer/chest.vox b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox index c0af732c6c..33b67d3da3 100644 --- a/assets/voxygen/voxel/armor/cultist_slayer/chest.vox +++ b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225064964669363b5b2d68ccc6280d4f517f112764b0f0f48ed7214fcdc814dd -size 28599 +oid sha256:9eab1a2542f0607367020099998025a5f5cce1d18b01b4952aa5993511ee9251 +size 2960 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox index 831a049b88..ce26a8b9ac 100644 --- a/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eca7992a259089054e4765ad001565fd8b9e14f1704d6cf17604cd8f6e0c14b9 -size 27799 +oid sha256:40be30233b89ed9f5f130aa4249ae05ab8079ed6564b7074997d493111b4335e +size 2192 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 8e2b578ef7..d8ea960673 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -293,11 +293,11 @@ ), "CultistSlayer": ( left: ( - vox_spec: ("armor.cultist_slayer.shoulder_l", (-6.0, -5.0 , -2.0)), + vox_spec: ("armor.cultist_slayer.shoulder_l", (-7.0, -5.0 , -2.0)), color: None ), right: ( - vox_spec: ("armor.cultist_slayer.shoulder_l", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.cultist_slayer.shoulder_l", (-2.0, -5.0, -2.0)), color: None ) ), diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs index fed7ccacd9..8b4c9a3777 100644 --- a/voxygen/src/hud/overhead.rs +++ b/voxygen/src/hud/overhead.rs @@ -444,7 +444,17 @@ impl<'a> Widget for Overhead<'a> { .color(Some(indicator_col)) .parent(id) .set(state.ids.level, ui); + + } + // Keep this for testing + /*Text::new(&(combat_rating*10.0).floor().to_string()) + .x_y(-37.0 * BARSIZE, MANA_BAR_Y + 6.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(indicator_col) + .parent(id) + .set(state.ids.level, ui);*/ } _ => {}, }