From a52f83e92c4b48cad82f5d1b4970bf06ceff9612 Mon Sep 17 00:00:00 2001 From: Snowram Date: Sun, 1 Nov 2020 14:39:32 +0100 Subject: [PATCH] Addresses some comments --- assets/common/items/boss_drops/exp_flask.ron | 8 +-- assets/common/items/boss_drops/potions.ron | 14 ++-- assets/common/items/boss_drops/xp_potion.ron | 8 +-- assets/common/items/consumable/potion_big.ron | 14 ++-- assets/common/items/consumable/potion_med.ron | 14 ++-- .../common/items/consumable/potion_minor.ron | 14 ++-- assets/common/items/food/apple.ron | 28 ++++---- .../items/food/apple_mushroom_curry.ron | 28 ++++---- assets/common/items/food/apple_stick.ron | 28 ++++---- assets/common/items/food/cheese.ron | 28 ++++---- assets/common/items/food/coconut.ron | 28 ++++---- assets/common/items/food/mushroom.ron | 28 ++++---- assets/common/items/food/mushroom_stick.ron | 28 ++++---- assets/common/items/food/sunflower_icetea.ron | 28 ++++---- assets/common/items/ore/velorite.ron | 8 +-- assets/common/items/ore/veloritefrag.ron | 8 +-- .../icons/de_buffs/buff_saturation_0.png | 3 + assets/voxygen/i18n/de_DE.ron | 70 +++++++++---------- assets/voxygen/i18n/en.ron | 12 ++-- assets/voxygen/i18n/tr_TR.ron | 24 +++---- common/src/comp/inventory/item/mod.rs | 2 +- voxygen/src/hud/buffs.rs | 44 ++++-------- voxygen/src/hud/group.rs | 14 ++-- voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/overhead.rs | 2 +- 25 files changed, 220 insertions(+), 264 deletions(-) create mode 100644 assets/voxygen/element/icons/de_buffs/buff_saturation_0.png diff --git a/assets/common/items/boss_drops/exp_flask.ron b/assets/common/items/boss_drops/exp_flask.ron index c4cc3e1f87..fd87fb20d7 100644 --- a/assets/common/items/boss_drops/exp_flask.ron +++ b/assets/common/items/boss_drops/exp_flask.ron @@ -3,11 +3,9 @@ ItemDef( description: "Increases Exp by 250\n\nTake with plenty of water\n\n", kind: Consumable( kind: "PotionExp", - effect: Some( - [ - Xp(250), - ] - ), + effect: [ + Xp(250), + ] ), quality: High, ) diff --git a/assets/common/items/boss_drops/potions.ron b/assets/common/items/boss_drops/potions.ron index 42195bd3c5..a98620f489 100644 --- a/assets/common/items/boss_drops/potions.ron +++ b/assets/common/items/boss_drops/potions.ron @@ -3,14 +3,12 @@ ItemDef( description: "A potent healing potion.\n\nRestores 100 health on use\n\n", kind: Consumable( kind: "Potion", - effect: Some( - [ - Health(( - amount: 1000, - cause: Item, - )), - ] - ), + effect: [ + Health(( + amount: 1000, + cause: Item, + )), + ] ), quality: High, ) diff --git a/assets/common/items/boss_drops/xp_potion.ron b/assets/common/items/boss_drops/xp_potion.ron index 023ae0a000..447e648695 100644 --- a/assets/common/items/boss_drops/xp_potion.ron +++ b/assets/common/items/boss_drops/xp_potion.ron @@ -3,11 +3,9 @@ ItemDef( description: "Provides 250 XP to the drinker\n\n", kind: Consumable( kind: "Potion", - effect: Some( - [ - Xp(250), - ] - ), + effect: [ + Xp(250), + ] ), quality: High, ) diff --git a/assets/common/items/consumable/potion_big.ron b/assets/common/items/consumable/potion_big.ron index 6eab677174..d09f800e2d 100644 --- a/assets/common/items/consumable/potion_big.ron +++ b/assets/common/items/consumable/potion_big.ron @@ -3,14 +3,12 @@ ItemDef( description: "Restores 100 Health", kind: Consumable( kind: "PotionLarge", - effect: Some( - [ - Health(( - amount: 1000, - cause: Item, - )), - ] - ), + effect: [ + Health(( + amount: 1000, + cause: Item, + )), + ] ), quality: Common, ) diff --git a/assets/common/items/consumable/potion_med.ron b/assets/common/items/consumable/potion_med.ron index 51035da8cc..e1ab119579 100644 --- a/assets/common/items/consumable/potion_med.ron +++ b/assets/common/items/consumable/potion_med.ron @@ -3,14 +3,12 @@ ItemDef( description: "Restores 70 Health", kind: Consumable( kind: "PotionMed", - effect: Some( - [ - Health(( - amount: 700, - cause: Item, - )), - ] - ), + effect: [ + Health(( + amount: 700, + cause: Item, + )), + ] ), quality: Common, ) diff --git a/assets/common/items/consumable/potion_minor.ron b/assets/common/items/consumable/potion_minor.ron index 0658b81f30..7b5e648225 100644 --- a/assets/common/items/consumable/potion_minor.ron +++ b/assets/common/items/consumable/potion_minor.ron @@ -3,14 +3,12 @@ ItemDef( description: "Restores 50 Health", kind: Consumable( kind: "PotionMinor", - effect: Some( - [ - Health(( - amount: 500, - cause: Item, - )), - ] - ), + effect: [ + Health(( + amount: 500, + cause: Item, + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/apple.ron b/assets/common/items/food/apple.ron index 4e945d2592..2969acd184 100644 --- a/assets/common/items/food/apple.ron +++ b/assets/common/items/food/apple.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 10 Health over 10 seconds\n\nRed and juicy", kind: Consumable( kind: "Apple", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 10.0, - duration: Some(( - secs: 10, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 10.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/apple_mushroom_curry.ron b/assets/common/items/food/apple_mushroom_curry.ron index e3b4676c2d..4c1ed514e5 100644 --- a/assets/common/items/food/apple_mushroom_curry.ron +++ b/assets/common/items/food/apple_mushroom_curry.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 120 Health over 5 seconds\n\nWho could say no to that?", kind: Consumable( kind: "AppleShroomCurry", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 120.0, - duration: Some(( - secs: 5, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 240.0, + duration: Some(( + secs: 5, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Moderate, ) diff --git a/assets/common/items/food/apple_stick.ron b/assets/common/items/food/apple_stick.ron index 3d1e94c9d7..e250220d64 100644 --- a/assets/common/items/food/apple_stick.ron +++ b/assets/common/items/food/apple_stick.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 25 Health over 5 seconds\n\nThe stick makes it easier to carry!", kind: Consumable( kind: "AppleStick", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 25.0, - duration: Some(( - secs: 5, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 50.0, + duration: Some(( + secs: 5, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index febc37eb30..cdd967d1af 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious", kind: Consumable( kind: "Cheese", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 15.0, - duration: Some(( - secs: 10, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/coconut.ron b/assets/common/items/food/coconut.ron index acdcee0208..75992f3335 100644 --- a/assets/common/items/food/coconut.ron +++ b/assets/common/items/food/coconut.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat", kind: Consumable( kind: "Coconut", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 20.0, - duration: Some(( - secs: 10, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 20.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/mushroom.ron b/assets/common/items/food/mushroom.ron index 172dec7b96..08b26aed8a 100644 --- a/assets/common/items/food/mushroom.ron +++ b/assets/common/items/food/mushroom.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 5 Health over 10 seconds\n\nHopefully this one is not poisonous", kind: Consumable( kind: "Mushroom", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 5.0, - duration: Some(( - secs: 10, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 5.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/mushroom_stick.ron b/assets/common/items/food/mushroom_stick.ron index 038bfe585c..80cf305eb9 100644 --- a/assets/common/items/food/mushroom_stick.ron +++ b/assets/common/items/food/mushroom_stick.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 20 Health over 5 seconds\n\nRoasted mushrooms on a stick for easy carrying.", kind: Consumable( kind: "MushroomStick", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 20.0, - duration: Some(( - secs: 5, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 40.0, + duration: Some(( + secs: 5, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Common, ) diff --git a/assets/common/items/food/sunflower_icetea.ron b/assets/common/items/food/sunflower_icetea.ron index da147b3503..8015388bfd 100644 --- a/assets/common/items/food/sunflower_icetea.ron +++ b/assets/common/items/food/sunflower_icetea.ron @@ -3,21 +3,19 @@ ItemDef( description: "Restores 50 Health over 5 seconds\n\nBrewed from freshly shelled sunflower seeds.", kind: Consumable( kind: "SunflowerTea", - effect: Some( - [ - Buff(( - kind: Saturation, - data: ( - strength: 50.0, - duration: Some(( - secs: 5, - nanos: 0, - )), - ), - cat_ids: [Natural], - )), - ] - ), + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 100.0, + duration: Some(( + secs: 5, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] ), quality: Moderate, ) diff --git a/assets/common/items/ore/velorite.ron b/assets/common/items/ore/velorite.ron index 424ade12d1..bfb3c50b37 100644 --- a/assets/common/items/ore/velorite.ron +++ b/assets/common/items/ore/velorite.ron @@ -3,11 +3,9 @@ ItemDef( description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times", kind: Consumable( kind: "Velorite", - effect: Some( - [ - Xp(20), - ] - ), + effect: [ + Xp(20), + ] ), quality: High, ) diff --git a/assets/common/items/ore/veloritefrag.ron b/assets/common/items/ore/veloritefrag.ron index aff073bbb5..76042b4a03 100644 --- a/assets/common/items/ore/veloritefrag.ron +++ b/assets/common/items/ore/veloritefrag.ron @@ -3,11 +3,9 @@ ItemDef( description: "Increases Exp by 10\n\nSmall runes sparkle on its surface", kind: Consumable( kind: "VeloriteFrag", - effect: Some( - [ - Xp(10), - ] - ), + effect: [ + Xp(10), + ] ), quality: Moderate, ) diff --git a/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png b/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png new file mode 100644 index 0000000000..31ccab8c08 --- /dev/null +++ b/assets/voxygen/element/icons/de_buffs/buff_saturation_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be3c24efae2f8e2f2ce3ca4fd25a91be850bb3fa51141f3c33c2f94193fb80d5 +size 1517 diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron index 8448b4dc39..24e269ead1 100644 --- a/assets/voxygen/i18n/de_DE.ron +++ b/assets/voxygen/i18n/de_DE.ron @@ -1,5 +1,5 @@ /// Translation document instructions -/// +/// /// In order to keep localization documents readible please follow the following /// rules: /// - separate the string map sections using a commentary describing the purpose @@ -120,7 +120,7 @@ Dies ist eine frühe Alpha. Ihr werdet auf Bugs, unfertiges Gameplay und Mechani Für konstruktives Feedback und Bug-Reports könnt Ihr uns via Reddit, Gitlab oder unseren Discord Server kontaktieren. -Veloren hat die GPL 3 Open-Source Lizenz. Das heißt Ihr könnt es kostenlos spielen, +Veloren hat die GPL 3 Open-Source Lizenz. Das heißt Ihr könnt es kostenlos spielen, aber auch modifizieren (solange die Mods auch die selbe Lizenz tragen) und das Spiel an andere weiterschicken. Veloren ist ein Non-Profit Community Projekt und jeder Mitarbeiter entwickelt es als Hobby in seiner Freizeit. @@ -164,7 +164,7 @@ https://account.veloren.net. "hud.quests": "Quests", "hud.you_died": "Ihr seid gestorben.", "hud.waypoint_saved": "Wegpunkt gesichert", - + "hud.press_key_to_show_keybindings_fmt": "[{key}] Tastenbelegung", "hud.press_key_to_toggle_lantern_fmt": "[{key}] Laterne", "hud.press_key_to_show_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen", @@ -172,13 +172,13 @@ https://account.veloren.net. "hud.press_key_to_toggle_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen", // Chat outputs - "hud.chat.online_msg": "[{name}] ist jetzt online.", - "hud.chat.offline_msg": "{name} ist jetzt offline.", - "hud.chat.loot_msg": "Ihr erhaltet [{item}]", + "hud.chat.online_msg": "[{name}] ist jetzt online.", + "hud.chat.offline_msg": "{name} ist jetzt offline.", + "hud.chat.loot_msg": "Ihr erhaltet [{item}]", "hud.chat.loot_fail": "Euer Inventar ist voll!", "hud.chat.goodbye": "Verbindung getrennt.", "hud.chat.connection_lost": "Verbindung unterbrochen. Trenne Verbindung in {time} Sekunden.", - + "hud.chat.default_death_msg": "[{name}] ist gestorben", "hud.chat.environmental_kill_msg": "[{name}] starb durch {environment}", "hud.chat.fall_kill_msg": "[{name}] starb durch Fallschaden", @@ -224,7 +224,7 @@ Um diese zu nutzen öffnet Euer Inventar mit 'B'. Doppelklickt den Gegenstand in Eurer Tasche, um diesen zu nutzen. -Um Items wegzuwerfen klickt sie einmal im Inventar an +Um Items wegzuwerfen klickt sie einmal im Inventar an und klickt dann außerhalb der Tasche. @@ -246,11 +246,11 @@ Viel Spaß in der Welt von Veloren, Abenteurer!"#, um unsere Dörfer herum aufgetaucht! -Versammelt einige Kämpfer, sucht etwas -Nahrung und besiegt ihre abscheulichen +Versammelt einige Kämpfer, sucht etwas +Nahrung und besiegt ihre abscheulichen Anführer und Akolyten. -Vielleicht könnt Ihr sogar einen ihrer +Vielleicht könnt Ihr sogar einen ihrer magischen Gegenstände ergattern?"#, // Inventory @@ -273,7 +273,7 @@ magischen Gegenstände ergattern?"#, "hud.bag.legs": "Beine", "hud.bag.feet": "Füße", "hud.bag.mainhand": "Haupthand", - "hud.bag.offhand": "Nebenhand", + "hud.bag.offhand": "Nebenhand", // Map and Questlog "hud.map.map_title": "Karte", @@ -292,7 +292,7 @@ magischen Gegenstände ergattern?"#, "hud.settings.custom_scaling": "Freie Skalierung", "hud.settings.crosshair": "Fadenkreuz", "hud.settings.transparency": "Transparenz", - "hud.settings.hotbar": "Hotbar", + "hud.settings.hotbar": "Hotbar", "hud.settings.toggle_shortcuts": "Tastenbelegung", "hud.settings.toggle_bar_experience": "Erfahrungsleiste", "hud.settings.scrolling_combat_text": "Aufsteigende Kampfwerte", @@ -300,7 +300,7 @@ magischen Gegenstände ergattern?"#, "hud.settings.cumulated_damage": "Addierter Schaden", "hud.settings.incoming_damage": "Erlittener Schaden", "hud.settings.cumulated_incoming_damage": "Addierter erlittener Schaden", - "hud.settings.speech_bubble": "Sprechblase", + "hud.settings.speech_bubble": "Sprechblase", "hud.settings.speech_bubble_dark_mode": "Dunkle Sprechblasen", "hud.settings.speech_bubble_icon": "Sprechblasen-Symbole", "hud.settings.energybar_numbers": "Zahlen auf Ressourcenanzeige", @@ -311,10 +311,10 @@ magischen Gegenstände ergattern?"#, "hud.settings.chat_character_name": "Characternamen im Chat", "hud.settings.buffs_mmap": "Zeige Buffs an der Mini-Map", "hud.settings.buffs_skillbar": "Zeige Buffs an der Fähigkeiten Leiste", - "hud.settings.cloud_rendering_mode.low": "Niedrig", + "hud.settings.cloud_rendering_mode.low": "Niedrig", "hud.settings.cloud_rendering_mode.medium": "Mittel", - "hud.settings.cloud_rendering_mode.minimal": "Minimal", - "hud.settings.cloud_rendering_mode.high": "Hoch", + "hud.settings.cloud_rendering_mode.minimal": "Minimal", + "hud.settings.cloud_rendering_mode.high": "Hoch", "hud.settings.pan_sensitivity": "Schwenk-Sensibilität", "hud.settings.zoom_sensitivity": "Zoom-Sensibilität", @@ -341,7 +341,7 @@ magischen Gegenstände ergattern?"#, "hud.settings.resolution": "Auflösung", "hud.settings.bit_depth": "Bittiefe", "hud.settings.refresh_rate": "Bildwiederholrate", - "hud.settings.fullscreen": "Vollbild", + "hud.settings.fullscreen": "Vollbild", "hud.settings.fullscreen_mode": "Vollbild-Modus", "hud.settings.fullscreen_mode.exclusive": "Exklusiv", "hud.settings.fullscreen_mode.borderless": "Rahmenlos", @@ -374,7 +374,7 @@ magischen Gegenstände ergattern?"#, "hud.social.account": "Account", "hud.spell": "Zauber", - + "hud.social.name" : "Name", "hud.social.level" : "Lvl", "hud.social.zone" : "Gebiet", @@ -401,13 +401,13 @@ magischen Gegenstände ergattern?"#, "hud.free_look_indicator": "Freie Sicht aktiv", "hud.auto_walk_indicator": "Automatisches Laufen aktiv", - + /// End HUD section /// Start GameInput section "gameinput.primary": "Linker mittlerer Slot", "gameinput.secondary": "Rechter mittlerer Slot", - "gameinput.slot1": "Hotbar Slot 1", + "gameinput.slot1": "Hotbar Slot 1", "gameinput.slot2": "Hotbar Slot 2", "gameinput.slot3": "Hotbar Slot 3", "gameinput.slot4": "Hotbar Slot 4", @@ -450,7 +450,7 @@ magischen Gegenstände ergattern?"#, "gameinput.charge": "Anstürmen", "gameinput.togglewield": "Waffe ziehen/wegstecken", "gameinput.interact": "Interagieren", - "gameinput.freelook": "Freie Sicht", + "gameinput.freelook": "Freie Sicht", "gameinput.autowalk": "Automatisch Laufen", "gameinput.dance": "Tanzen", "gameinput.declinegroupinvite": "Ablehnen", @@ -501,7 +501,7 @@ Willenskraft /// Start character window section - + /// Start Escape Menu Section "esc_menu.logout": "Ausloggen", @@ -510,14 +510,14 @@ Willenskraft /// Buffs and Debuffs "buff.remove": "Klicken zum Entfernen", - "buff.title.missing": "Fehlender Titel", - "buff.desc.missing": "Fehlende Beschreibung", + "buff.title.missing": "Fehlender Titel", + "buff.desc.missing": "Fehlende Beschreibung", // Buffs - "buff.title.heal_test": "HoT Buff Test", - "buff.desc.heal_test": "HoT Buff Test", - // Debuffs - "debuff.title.bleed_test": "Blutung", - "debuff.desc.bleed_test": "Fügt regelmäßig Schaden zu.", + "buff.title.heal": "HoT Buff Test", + "buff.desc.heal": "HoT Buff Test", + // Debuffs + "debuff.title.bleed": "Blutung", + "debuff.desc.bleed": "Fügt regelmäßig Schaden zu.", }, vector_map: { @@ -530,17 +530,17 @@ Willenskraft "NPCs mit demselben Level können unterschiedlich schwierig zu besiegen sein.", "Behaltet den Boden um euch im Blick! Dort gibt es Nahrung, Kisten und Anderes zu finden.", "Ist Euer Inventar voll mit Nahrung? Wertet es einfach durch Crafting auf!", - "Ihr sucht nach einem Abenteuer? Dungeons sind mit braunen Markierungen auf der Karte vermerkt!", + "Ihr sucht nach einem Abenteuer? Dungeons sind mit braunen Markierungen auf der Karte vermerkt!", "Vergesst nicht Eure Grafikeinstellungen anzupassen! Mit 'N' kommt ihr in die Einstellungen.", - "Zusammen kämpfen macht mehr Spaß! Drückt 'O' um Eure Mitspieler anzuzeigen.", + "Zusammen kämpfen macht mehr Spaß! Drückt 'O' um Eure Mitspieler anzuzeigen.", "Ein NPC mit einem Schädel unter seiner Lebensanzeige ist deutlich stärker als Ihr.", "Drückt 'J' um zu tanzen. Yeah!", "Verwendet 'L-Shift' um mit Eurem Gleiter den Himmel zu erobern!", "Veloren befindet sich noch in der Pre-Alpha Phase. Wir tun unser Bestes, um das Spielgefühl jeden Tag zu verbessern!", - "Ihr wünscht, Euch mit uns auszutauschen oder wollt unserem Entwickler-Team beitreten? Kommt doch einfach auf unseren Discord-Server!", - ], + "Ihr wünscht, Euch mit uns auszutauschen oder wollt unserem Entwickler-Team beitreten? Kommt doch einfach auf unseren Discord-Server!", + ], "npc.speech.villager_under_attack": [ - "Hilfe, ich werde angegriffen!", + "Hilfe, ich werde angegriffen!", ], } ) diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index 95df52318f..754d19d5d2 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -520,13 +520,13 @@ Protection "buff.title.missing": "Missing Title", "buff.desc.missing": "Missing Description", // Buffs - "buff.title.heal_test": "Heal Test", - "buff.desc.heal_test": "This is a test buff to test healing.", - "buff.title.saturation_test": "Saturation", - "buff.desc.saturation_test": "This is a test buff to test saturation.", + "buff.title.heal": "Heal", + "buff.desc.heal": "Gain health over time.", + "buff.title.saturation": "Saturation", + "buff.desc.saturation": "Gain health over time from consumables.", // Debuffs - "debuff.title.bleed_test": "Bleeding", - "debuff.desc.bleed_test": "Inflicts regular damage.", + "debuff.title.bleed": "Bleeding", + "debuff.desc.bleed": "Inflicts regular damage.", }, diff --git a/assets/voxygen/i18n/tr_TR.ron b/assets/voxygen/i18n/tr_TR.ron index 1eb7166a63..4de1f61798 100644 --- a/assets/voxygen/i18n/tr_TR.ron +++ b/assets/voxygen/i18n/tr_TR.ron @@ -1,5 +1,5 @@ /// Translation document instructions -/// +/// /// In order to keep localization documents readible please follow the following /// rules: /// - separate the string map sections using a commentary describing the purpose @@ -7,7 +7,7 @@ /// - prepend multi-line strings with a commentary /// - append one blank lines after a multi-line strings and two after sections /// -/// To add a new language in Veloren, just write an additional `.ron` file in +/// To add a new language in Veloren, just write an additional `.ron` file in /// `assets/voxygen/i18n` and that's it! /// /// WARNING: Localization files shall be saved in UTF-8 format without BOM @@ -164,7 +164,7 @@ bir hesap oluşturabilirsin."#, "hud.quests": "Görevler", "hud.you_died": "Öldün", "hud.waypoint_saved": "Yol noktası kaydedildi", - + "hud.press_key_to_show_keybindings_fmt": "Kontrolleri göstermek için {key}'e bas", "hud.press_key_to_toggle_lantern_fmt": "Fenerini yakıp söndürmek için [{key}]'e bas", "hud.press_key_to_show_debug_info_fmt": "Hata ayıklama bilgilerini göstermek için {key}'e bas", @@ -203,7 +203,7 @@ bir hesap oluşturabilirsin."#, "hud.sct.block": "BLOKLANDI", // Respawn message - "hud.press_key_to_respawn": r#"Ziyaret ettiğin en son kamp ateşinde yeniden doğmak için {key}'e bas."#, + "hud.press_key_to_respawn": r#"Ziyaret ettiğin en son kamp ateşinde yeniden doğmak için {key}'e bas."#, // Welcome message "hud.welcome": r#"Veloren Alfa sürümüne hoşgeldin!, @@ -250,7 +250,7 @@ dolu zindanlar belirdi. Birkaç yoldaş bul, yiyeceğini hazırla ve kült lideri ile onun yardımcılarını alt et. -Kim bilir? Belki onların tılsımlı +Kim bilir? Belki onların tılsımlı eşyalarını bile ele geçirebilirsin!"#, @@ -275,7 +275,7 @@ eşyalarını bile ele geçirebilirsin!"#, "hud.bag.feet": "Ayaklar", "hud.bag.mainhand": "Birincil", "hud.bag.offhand": "İkincil", - + // Map and Questlog "hud.map.map_title": "Harita", "hud.map.qlog_title": "Görevler", @@ -462,7 +462,7 @@ edince kapat"#, "gameinput.sneak": "Eğil", "gameinput.swimdown": "Aşağı Dal", "gameinput.swimup": "Yüzeye çık", - + /// End GameInput section @@ -508,7 +508,7 @@ Koruma /// Start character window section - + /// Start Escape Menu Section "esc_menu.logout": "Çıkış yap", @@ -520,11 +520,11 @@ Koruma "buff.title.missing": "İsim Yok", "buff.desc.missing": "Açıklama Yok", // Buffs - "buff.title.heal_test": "İyileştirme Testi", - "buff.desc.heal_test": "Bu etki iyileştirmeyi test etmek için.", + "buff.title.heal": "İyileştirme Testi", + "buff.desc.heal": "Bu etki iyileştirmeyi test etmek için.", // Debuffs - "debuff.title.bleed_test": "Kanama", - "debuff.desc.bleed_test": "Normal hasar verir.", + "debuff.title.bleed": "Kanama", + "debuff.desc.bleed": "Normal hasar verir.", }, vector_map: { diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 5c50bf57bb..585c21b39a 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -83,7 +83,7 @@ pub enum ItemKind { Glider(Glider), Consumable { kind: String, - effect: Option>, + effect: Vec, }, Throwable { kind: Throwable, diff --git a/voxygen/src/hud/buffs.rs b/voxygen/src/hud/buffs.rs index 1fbeceaeb8..6e1e86f34f 100644 --- a/voxygen/src/hud/buffs.rs +++ b/voxygen/src/hud/buffs.rs @@ -182,7 +182,7 @@ impl<'a> Widget for BuffsBar<'a> { }) as u32; // Percentage to determine which frame of the timer overlay is displayed let buff_img = match buff.kind { BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, - BuffKind::Saturation { .. } => self.imgs.buff_plus_0, + BuffKind::Saturation { .. } => self.imgs.buff_saturation_0, _ => self.imgs.missing_icon, }; let buff_widget = Image::new(buff_img).w_h(20.0, 20.0); @@ -205,11 +205,9 @@ impl<'a> Widget for BuffsBar<'a> { .set(id, ui); // Create Buff tooltip let title = match buff.kind { - BuffKind::Regeneration { .. } => { - localized_strings.get("buff.title.heal_test") - }, + BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"), BuffKind::Saturation { .. } => { - localized_strings.get("buff.title.saturation_test") + localized_strings.get("buff.title.saturation") }, _ => localized_strings.get("buff.title.missing"), }; @@ -220,11 +218,9 @@ impl<'a> Widget for BuffsBar<'a> { }; let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove")); let desc_txt = match buff.kind { - BuffKind::Regeneration { .. } => { - localized_strings.get("buff.desc.heal_test") - }, + BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"), BuffKind::Saturation { .. } => { - localized_strings.get("buff.desc.saturation_test") + localized_strings.get("buff.desc.saturation") }, _ => localized_strings.get("buff.desc.missing"), }; @@ -303,9 +299,7 @@ impl<'a> Widget for BuffsBar<'a> { .set(id, ui); // Create Debuff tooltip let title = match debuff.kind { - BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.title.bleed_test") - }, + BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"), _ => localized_strings.get("buff.title.missing"), }; let remaining_time = if current_duration.is_none() { @@ -314,9 +308,7 @@ impl<'a> Widget for BuffsBar<'a> { format!("Remaining: {:.0}s", current_duration.unwrap().as_secs_f32()) }; let desc_txt = match debuff.kind { - BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.desc.bleed_test") - }, + BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"), _ => localized_strings.get("debuff.desc.missing"), }; let desc = format!("{}\n\n{}", desc_txt, remaining_time); @@ -386,7 +378,7 @@ impl<'a> Widget for BuffsBar<'a> { }) as u32; let buff_img = match buff.kind { BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, - BuffKind::Saturation { .. } => self.imgs.buff_plus_0, + BuffKind::Saturation { .. } => self.imgs.buff_saturation_0, BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, }; @@ -410,15 +402,11 @@ impl<'a> Widget for BuffsBar<'a> { .set(id, ui); // Create Buff tooltip let title = match buff.kind { - BuffKind::Regeneration { .. } => { - localized_strings.get("buff.title.heal_test") - }, + BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"), BuffKind::Saturation { .. } => { - localized_strings.get("buff.title.saturation_test") - }, - BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.title.bleed_test") + localized_strings.get("buff.title.saturation") }, + BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"), _ => localized_strings.get("buff.title.missing"), }; let remaining_time = if current_duration.is_none() { @@ -428,15 +416,11 @@ impl<'a> Widget for BuffsBar<'a> { }; let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove")); let desc_txt = match buff.kind { - BuffKind::Regeneration { .. } => { - localized_strings.get("buff.desc.heal_test") - }, + BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"), BuffKind::Saturation { .. } => { - localized_strings.get("buff.desc.saturation_test") - }, - BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.desc.bleed_test") + localized_strings.get("buff.desc.saturation") }, + BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"), _ => localized_strings.get("buff.desc.missing"), }; let desc = if buff.is_buff { diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs index b46df6fac3..516e36046e 100644 --- a/voxygen/src/hud/group.rs +++ b/voxygen/src/hud/group.rs @@ -482,7 +482,7 @@ impl<'a> Widget for Group<'a> { }) as u32; // Percentage to determine which frame of the timer overlay is displayed let buff_img = match buff.kind { BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, - BuffKind::Saturation { .. } => self.imgs.buff_plus_0, + BuffKind::Saturation { .. } => self.imgs.buff_saturation_0, BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, }; @@ -511,13 +511,13 @@ impl<'a> Widget for Group<'a> { // Create Buff tooltip let title = match buff.kind { BuffKind::Regeneration { .. } => { - localized_strings.get("buff.title.heal_test") + localized_strings.get("buff.title.heal") }, BuffKind::Saturation { .. } => { - localized_strings.get("buff.title.saturation_test") + localized_strings.get("buff.title.saturation") }, BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.title.bleed_test") + localized_strings.get("debuff.title.bleed") }, _ => localized_strings.get("buff.title.missing"), }; @@ -531,13 +531,13 @@ impl<'a> Widget for Group<'a> { }; let desc_txt = match buff.kind { BuffKind::Regeneration { .. } => { - localized_strings.get("buff.desc.heal_test") + localized_strings.get("buff.desc.heal") }, BuffKind::Saturation { .. } => { - localized_strings.get("buff.desc.saturation_test") + localized_strings.get("buff.desc.saturation") }, BuffKind::Bleeding { .. } => { - localized_strings.get("debuff.desc.bleed_test") + localized_strings.get("debuff.desc.bleed") }, _ => localized_strings.get("buff.desc.missing"), }; diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index fbb48033c0..fe7c495b64 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -352,6 +352,7 @@ image_ids! { // Buffs buff_plus_0: "voxygen.element.icons.de_buffs.buff_plus_0", + buff_saturation_0: "voxygen.element.icons.de_buffs.buff_saturation_0", // Debuffs debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0", diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs index eb3bdd1133..202082bf29 100644 --- a/voxygen/src/hud/overhead.rs +++ b/voxygen/src/hud/overhead.rs @@ -243,7 +243,7 @@ impl<'a> Widget for Overhead<'a> { }) as u32; // Percentage to determine which frame of the timer overlay is displayed let buff_img = match buff.kind { BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, - BuffKind::Saturation { .. } => self.imgs.buff_plus_0, + BuffKind::Saturation { .. } => self.imgs.buff_saturation_0, BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, };