Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addresses some comments

Browse Source
This commit is contained in:
Snowram 2020-11-01 14:39:32 +01:00
parent ce96af4363
commit a52f83e92c
25 changed files with 220 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/items/boss_drops/exp_flask.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 250\n\nTake with plenty of water\n\n<Right-Click to use>", description: "Increases Exp by 250\n\nTake with plenty of water\n\n<Right-Click to use>",
kind: Consumable( kind: Consumable(
kind: "PotionExp", kind: "PotionExp",
effect: Some( effect: [
[ Xp(250),
Xp(250), ]
]
),
), ),
quality: High, quality: High,
) )

14
assets/common/items/boss_drops/potions.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "A potent healing potion.\n\nRestores 100 health on use\n\n<Right-Click to use>", description: "A potent healing potion.\n\nRestores 100 health on use\n\n<Right-Click to use>",
kind: Consumable( kind: Consumable(
kind: "Potion", kind: "Potion",
effect: Some( effect: [
[ Health((
Health(( amount: 1000,
amount: 1000, cause: Item,
cause: Item, )),
)), ]
]
),
), ),
quality: High, quality: High,
) )

8
assets/common/items/boss_drops/xp_potion.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Provides 250 XP to the drinker\n\n<Right-Click to use>", description: "Provides 250 XP to the drinker\n\n<Right-Click to use>",
kind: Consumable( kind: Consumable(
kind: "Potion", kind: "Potion",
effect: Some( effect: [
[ Xp(250),
Xp(250), ]
]
),
), ),
quality: High, quality: High,
) )

14
assets/common/items/consumable/potion_big.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 100 Health", description: "Restores 100 Health",
kind: Consumable( kind: Consumable(
kind: "PotionLarge", kind: "PotionLarge",
effect: Some( effect: [
[ Health((
Health(( amount: 1000,
amount: 1000, cause: Item,
cause: Item, )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

14
assets/common/items/consumable/potion_med.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 70 Health", description: "Restores 70 Health",
kind: Consumable( kind: Consumable(
kind: "PotionMed", kind: "PotionMed",
effect: Some( effect: [
[ Health((
Health(( amount: 700,
amount: 700, cause: Item,
cause: Item, )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

14
assets/common/items/consumable/potion_minor.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 50 Health", description: "Restores 50 Health",
kind: Consumable( kind: Consumable(
kind: "PotionMinor", kind: "PotionMinor",
effect: Some( effect: [
[ Health((
Health(( amount: 500,
amount: 500, cause: Item,
cause: Item, )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/apple.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 10 Health over 10 seconds\n\nRed and juicy", description: "Restores 10 Health over 10 seconds\n\nRed and juicy",
kind: Consumable( kind: Consumable(
kind: "Apple", kind: "Apple",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 10.0,
strength: 10.0, duration: Some((
duration: Some(( secs: 10,
secs: 10, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/apple_mushroom_curry.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 120 Health over 5 seconds\n\nWho could say no to that?", description: "Restores 120 Health over 5 seconds\n\nWho could say no to that?",
kind: Consumable( kind: Consumable(
kind: "AppleShroomCurry", kind: "AppleShroomCurry",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 240.0,
strength: 120.0, duration: Some((
duration: Some(( secs: 5,
secs: 5, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Moderate, quality: Moderate,
) )

28
assets/common/items/food/apple_stick.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 25 Health over 5 seconds\n\nThe stick makes it easier to carry!", description: "Restores 25 Health over 5 seconds\n\nThe stick makes it easier to carry!",
kind: Consumable( kind: Consumable(
kind: "AppleStick", kind: "AppleStick",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 50.0,
strength: 25.0, duration: Some((
duration: Some(( secs: 5,
secs: 5, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/cheese.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious", description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious",
kind: Consumable( kind: Consumable(
kind: "Cheese", kind: "Cheese",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 15.0,
strength: 15.0, duration: Some((
duration: Some(( secs: 10,
secs: 10, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/coconut.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat", description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat",
kind: Consumable( kind: Consumable(
kind: "Coconut", kind: "Coconut",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 20.0,
strength: 20.0, duration: Some((
duration: Some(( secs: 10,
secs: 10, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/mushroom.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 5 Health over 10 seconds\n\nHopefully this one is not poisonous", description: "Restores 5 Health over 10 seconds\n\nHopefully this one is not poisonous",
kind: Consumable( kind: Consumable(
kind: "Mushroom", kind: "Mushroom",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 5.0,
strength: 5.0, duration: Some((
duration: Some(( secs: 10,
secs: 10, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/mushroom_stick.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 20 Health over 5 seconds\n\nRoasted mushrooms on a stick for easy carrying.", description: "Restores 20 Health over 5 seconds\n\nRoasted mushrooms on a stick for easy carrying.",
kind: Consumable( kind: Consumable(
kind: "MushroomStick", kind: "MushroomStick",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 40.0,
strength: 20.0, duration: Some((
duration: Some(( secs: 5,
secs: 5, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Common, quality: Common,
) )

28
assets/common/items/food/sunflower_icetea.ron
View File

@ -3,21 +3,19 @@ ItemDef(
description: "Restores 50 Health over 5 seconds\n\nBrewed from freshly shelled sunflower seeds.", description: "Restores 50 Health over 5 seconds\n\nBrewed from freshly shelled sunflower seeds.",
kind: Consumable( kind: Consumable(
kind: "SunflowerTea", kind: "SunflowerTea",
effect: Some( effect: [
[ Buff((
Buff(( kind: Saturation,
kind: Saturation, data: (
data: ( strength: 100.0,
strength: 50.0, duration: Some((
duration: Some(( secs: 5,
secs: 5, nanos: 0,
nanos: 0, )),
)), ),
), cat_ids: [Natural],
cat_ids: [Natural], )),
)), ]
]
),
), ),
quality: Moderate, quality: Moderate,
) )

8
assets/common/items/ore/velorite.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times", description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times",
kind: Consumable( kind: Consumable(
kind: "Velorite", kind: "Velorite",
effect: Some( effect: [
[ Xp(20),
Xp(20), ]
]
),
), ),
quality: High, quality: High,
) )

8
assets/common/items/ore/veloritefrag.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 10\n\nSmall runes sparkle on its surface", description: "Increases Exp by 10\n\nSmall runes sparkle on its surface",
kind: Consumable( kind: Consumable(
kind: "VeloriteFrag", kind: "VeloriteFrag",
effect: Some( effect: [
[ Xp(10),
Xp(10), ]
]
),
), ),
quality: Moderate, quality: Moderate,
) )

BIN
assets/voxygen/element/icons/de_buffs/buff_saturation_0.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

70
assets/voxygen/i18n/de_DE.ron
View File

@ -1,5 +1,5 @@
/// Translation document instructions /// Translation document instructions
/// ///
/// In order to keep localization documents readible please follow the following /// In order to keep localization documents readible please follow the following
/// rules: /// rules:
/// - separate the string map sections using a commentary describing the purpose /// - 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. 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. 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. 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.quests": "Quests",
"hud.you_died": "Ihr seid gestorben.", "hud.you_died": "Ihr seid gestorben.",
"hud.waypoint_saved": "Wegpunkt gesichert", "hud.waypoint_saved": "Wegpunkt gesichert",
"hud.press_key_to_show_keybindings_fmt": "[{key}] Tastenbelegung", "hud.press_key_to_show_keybindings_fmt": "[{key}] Tastenbelegung",
"hud.press_key_to_toggle_lantern_fmt": "[{key}] Laterne", "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", "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", "hud.press_key_to_toggle_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen",
// Chat outputs // Chat outputs
"hud.chat.online_msg": "[{name}] ist jetzt online.", "hud.chat.online_msg": "[{name}] ist jetzt online.",
"hud.chat.offline_msg": "{name} ist jetzt offline.", "hud.chat.offline_msg": "{name} ist jetzt offline.",
"hud.chat.loot_msg": "Ihr erhaltet [{item}]", "hud.chat.loot_msg": "Ihr erhaltet [{item}]",
"hud.chat.loot_fail": "Euer Inventar ist voll!", "hud.chat.loot_fail": "Euer Inventar ist voll!",
"hud.chat.goodbye": "Verbindung getrennt.", "hud.chat.goodbye": "Verbindung getrennt.",
"hud.chat.connection_lost": "Verbindung unterbrochen. Trenne Verbindung in {time} Sekunden.", "hud.chat.connection_lost": "Verbindung unterbrochen. Trenne Verbindung in {time} Sekunden.",
"hud.chat.default_death_msg": "[{name}] ist gestorben", "hud.chat.default_death_msg": "[{name}] ist gestorben",
"hud.chat.environmental_kill_msg": "[{name}] starb durch {environment}", "hud.chat.environmental_kill_msg": "[{name}] starb durch {environment}",
"hud.chat.fall_kill_msg": "[{name}] starb durch Fallschaden", "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. 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. 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! um unsere Dörfer herum aufgetaucht!
Versammelt einige Kämpfer, sucht etwas Versammelt einige Kämpfer, sucht etwas
Nahrung und besiegt ihre abscheulichen Nahrung und besiegt ihre abscheulichen
Anführer und Akolyten. Anführer und Akolyten.
Vielleicht könnt Ihr sogar einen ihrer Vielleicht könnt Ihr sogar einen ihrer
magischen Gegenstände ergattern?"#, magischen Gegenstände ergattern?"#,
// Inventory // Inventory
@ -273,7 +273,7 @@ magischen Gegenstände ergattern?"#,
"hud.bag.legs": "Beine", "hud.bag.legs": "Beine",
"hud.bag.feet": "Füße", "hud.bag.feet": "Füße",
"hud.bag.mainhand": "Haupthand", "hud.bag.mainhand": "Haupthand",
"hud.bag.offhand": "Nebenhand", "hud.bag.offhand": "Nebenhand",
// Map and Questlog // Map and Questlog
"hud.map.map_title": "Karte", "hud.map.map_title": "Karte",
@ -292,7 +292,7 @@ magischen Gegenstände ergattern?"#,
"hud.settings.custom_scaling": "Freie Skalierung", "hud.settings.custom_scaling": "Freie Skalierung",
"hud.settings.crosshair": "Fadenkreuz", "hud.settings.crosshair": "Fadenkreuz",
"hud.settings.transparency": "Transparenz", "hud.settings.transparency": "Transparenz",
"hud.settings.hotbar": "Hotbar", "hud.settings.hotbar": "Hotbar",
"hud.settings.toggle_shortcuts": "Tastenbelegung", "hud.settings.toggle_shortcuts": "Tastenbelegung",
"hud.settings.toggle_bar_experience": "Erfahrungsleiste", "hud.settings.toggle_bar_experience": "Erfahrungsleiste",
"hud.settings.scrolling_combat_text": "Aufsteigende Kampfwerte", "hud.settings.scrolling_combat_text": "Aufsteigende Kampfwerte",
@ -300,7 +300,7 @@ magischen Gegenstände ergattern?"#,
"hud.settings.cumulated_damage": "Addierter Schaden", "hud.settings.cumulated_damage": "Addierter Schaden",
"hud.settings.incoming_damage": "Erlittener Schaden", "hud.settings.incoming_damage": "Erlittener Schaden",
"hud.settings.cumulated_incoming_damage": "Addierter 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_dark_mode": "Dunkle Sprechblasen",
"hud.settings.speech_bubble_icon": "Sprechblasen-Symbole", "hud.settings.speech_bubble_icon": "Sprechblasen-Symbole",
"hud.settings.energybar_numbers": "Zahlen auf Ressourcenanzeige", "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.chat_character_name": "Characternamen im Chat",
"hud.settings.buffs_mmap": "Zeige Buffs an der Mini-Map", "hud.settings.buffs_mmap": "Zeige Buffs an der Mini-Map",
"hud.settings.buffs_skillbar": "Zeige Buffs an der Fähigkeiten Leiste", "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.medium": "Mittel",
"hud.settings.cloud_rendering_mode.minimal": "Minimal", "hud.settings.cloud_rendering_mode.minimal": "Minimal",
"hud.settings.cloud_rendering_mode.high": "Hoch", "hud.settings.cloud_rendering_mode.high": "Hoch",
"hud.settings.pan_sensitivity": "Schwenk-Sensibilität", "hud.settings.pan_sensitivity": "Schwenk-Sensibilität",
"hud.settings.zoom_sensitivity": "Zoom-Sensibilität", "hud.settings.zoom_sensitivity": "Zoom-Sensibilität",
@ -341,7 +341,7 @@ magischen Gegenstände ergattern?"#,
"hud.settings.resolution": "Auflösung", "hud.settings.resolution": "Auflösung",
"hud.settings.bit_depth": "Bittiefe", "hud.settings.bit_depth": "Bittiefe",
"hud.settings.refresh_rate": "Bildwiederholrate", "hud.settings.refresh_rate": "Bildwiederholrate",
"hud.settings.fullscreen": "Vollbild", "hud.settings.fullscreen": "Vollbild",
"hud.settings.fullscreen_mode": "Vollbild-Modus", "hud.settings.fullscreen_mode": "Vollbild-Modus",
"hud.settings.fullscreen_mode.exclusive": "Exklusiv", "hud.settings.fullscreen_mode.exclusive": "Exklusiv",
"hud.settings.fullscreen_mode.borderless": "Rahmenlos", "hud.settings.fullscreen_mode.borderless": "Rahmenlos",
@ -374,7 +374,7 @@ magischen Gegenstände ergattern?"#,
"hud.social.account": "Account", "hud.social.account": "Account",
"hud.spell": "Zauber", "hud.spell": "Zauber",
"hud.social.name" : "Name", "hud.social.name" : "Name",
"hud.social.level" : "Lvl", "hud.social.level" : "Lvl",
"hud.social.zone" : "Gebiet", "hud.social.zone" : "Gebiet",
@ -401,13 +401,13 @@ magischen Gegenstände ergattern?"#,
"hud.free_look_indicator": "Freie Sicht aktiv", "hud.free_look_indicator": "Freie Sicht aktiv",
"hud.auto_walk_indicator": "Automatisches Laufen aktiv", "hud.auto_walk_indicator": "Automatisches Laufen aktiv",
/// End HUD section /// End HUD section
/// Start GameInput section /// Start GameInput section
"gameinput.primary": "Linker mittlerer Slot", "gameinput.primary": "Linker mittlerer Slot",
"gameinput.secondary": "Rechter mittlerer Slot", "gameinput.secondary": "Rechter mittlerer Slot",
"gameinput.slot1": "Hotbar Slot 1", "gameinput.slot1": "Hotbar Slot 1",
"gameinput.slot2": "Hotbar Slot 2", "gameinput.slot2": "Hotbar Slot 2",
"gameinput.slot3": "Hotbar Slot 3", "gameinput.slot3": "Hotbar Slot 3",
"gameinput.slot4": "Hotbar Slot 4", "gameinput.slot4": "Hotbar Slot 4",
@ -450,7 +450,7 @@ magischen Gegenstände ergattern?"#,
"gameinput.charge": "Anstürmen", "gameinput.charge": "Anstürmen",
"gameinput.togglewield": "Waffe ziehen/wegstecken", "gameinput.togglewield": "Waffe ziehen/wegstecken",
"gameinput.interact": "Interagieren", "gameinput.interact": "Interagieren",
"gameinput.freelook": "Freie Sicht", "gameinput.freelook": "Freie Sicht",
"gameinput.autowalk": "Automatisch Laufen", "gameinput.autowalk": "Automatisch Laufen",
"gameinput.dance": "Tanzen", "gameinput.dance": "Tanzen",
"gameinput.declinegroupinvite": "Ablehnen", "gameinput.declinegroupinvite": "Ablehnen",
@ -501,7 +501,7 @@ Willenskraft
/// Start character window section /// Start character window section
/// Start Escape Menu Section /// Start Escape Menu Section
"esc_menu.logout": "Ausloggen", "esc_menu.logout": "Ausloggen",
@ -510,14 +510,14 @@ Willenskraft
/// Buffs and Debuffs /// Buffs and Debuffs
"buff.remove": "Klicken zum Entfernen", "buff.remove": "Klicken zum Entfernen",
"buff.title.missing": "Fehlender Titel", "buff.title.missing": "Fehlender Titel",
"buff.desc.missing": "Fehlende Beschreibung", "buff.desc.missing": "Fehlende Beschreibung",
// Buffs // Buffs
"buff.title.heal_test": "HoT Buff Test", "buff.title.heal": "HoT Buff Test",
"buff.desc.heal_test": "HoT Buff Test", "buff.desc.heal": "HoT Buff Test",
// Debuffs // Debuffs
"debuff.title.bleed_test": "Blutung", "debuff.title.bleed": "Blutung",
"debuff.desc.bleed_test": "Fügt regelmäßig Schaden zu.", "debuff.desc.bleed": "Fügt regelmäßig Schaden zu.",
}, },
vector_map: { vector_map: {
@ -530,17 +530,17 @@ Willenskraft
"NPCs mit demselben Level können unterschiedlich schwierig zu besiegen sein.", "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.", "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!", "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.", "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.", "Ein NPC mit einem Schädel unter seiner Lebensanzeige ist deutlich stärker als Ihr.",
"Drückt 'J' um zu tanzen. Yeah!", "Drückt 'J' um zu tanzen. Yeah!",
"Verwendet 'L-Shift' um mit Eurem Gleiter den Himmel zu erobern!", "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!", "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": [ "npc.speech.villager_under_attack": [
"Hilfe, ich werde angegriffen!", "Hilfe, ich werde angegriffen!",
], ],
} }
) )

12
assets/voxygen/i18n/en.ron
View File

@ -520,13 +520,13 @@ Protection
"buff.title.missing": "Missing Title", "buff.title.missing": "Missing Title",
"buff.desc.missing": "Missing Description", "buff.desc.missing": "Missing Description",
// Buffs // Buffs
"buff.title.heal_test": "Heal Test", "buff.title.heal": "Heal",
"buff.desc.heal_test": "This is a test buff to test healing.", "buff.desc.heal": "Gain health over time.",
"buff.title.saturation_test": "Saturation", "buff.title.saturation": "Saturation",
"buff.desc.saturation_test": "This is a test buff to test saturation.", "buff.desc.saturation": "Gain health over time from consumables.",
// Debuffs // Debuffs
"debuff.title.bleed_test": "Bleeding", "debuff.title.bleed": "Bleeding",
"debuff.desc.bleed_test": "Inflicts regular damage.", "debuff.desc.bleed": "Inflicts regular damage.",
}, },

24
assets/voxygen/i18n/tr_TR.ron
View File

@ -1,5 +1,5 @@
/// Translation document instructions /// Translation document instructions
/// ///
/// In order to keep localization documents readible please follow the following /// In order to keep localization documents readible please follow the following
/// rules: /// rules:
/// - separate the string map sections using a commentary describing the purpose /// - separate the string map sections using a commentary describing the purpose
@ -7,7 +7,7 @@
/// - prepend multi-line strings with a commentary /// - prepend multi-line strings with a commentary
/// - append one blank lines after a multi-line strings and two after sections /// - 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! /// `assets/voxygen/i18n` and that's it!
/// ///
/// WARNING: Localization files shall be saved in UTF-8 format without BOM /// 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.quests": "Görevler",
"hud.you_died": "Öldün", "hud.you_died": "Öldün",
"hud.waypoint_saved": "Yol noktası kaydedildi", "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_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_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", "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", "hud.sct.block": "BLOKLANDI",
// Respawn message // 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 // Welcome message
"hud.welcome": r#"Veloren Alfa sürümüne hoşgeldin!, "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 Birkaç yoldaş bul, yiyeceğini hazırla
ve kült lideri ile onun yardımcılarını alt et. 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!"#, eşyalarını bile ele geçirebilirsin!"#,
@ -275,7 +275,7 @@ eşyalarını bile ele geçirebilirsin!"#,
"hud.bag.feet": "Ayaklar", "hud.bag.feet": "Ayaklar",
"hud.bag.mainhand": "Birincil", "hud.bag.mainhand": "Birincil",
"hud.bag.offhand": "İkincil", "hud.bag.offhand": "İkincil",
// Map and Questlog // Map and Questlog
"hud.map.map_title": "Harita", "hud.map.map_title": "Harita",
"hud.map.qlog_title": "Görevler", "hud.map.qlog_title": "Görevler",
@ -462,7 +462,7 @@ edince kapat"#,
"gameinput.sneak": "Eğil", "gameinput.sneak": "Eğil",
"gameinput.swimdown": "Aşağı Dal", "gameinput.swimdown": "Aşağı Dal",
"gameinput.swimup": "Yüzeye çık", "gameinput.swimup": "Yüzeye çık",
/// End GameInput section /// End GameInput section
@ -508,7 +508,7 @@ Koruma
/// Start character window section /// Start character window section
/// Start Escape Menu Section /// Start Escape Menu Section
"esc_menu.logout": "Çıkış yap", "esc_menu.logout": "Çıkış yap",
@ -520,11 +520,11 @@ Koruma
"buff.title.missing": "İsim Yok", "buff.title.missing": "İsim Yok",
"buff.desc.missing": "Açıklama Yok", "buff.desc.missing": "Açıklama Yok",
// Buffs // Buffs
"buff.title.heal_test": "İyileştirme Testi", "buff.title.heal": "İyileştirme Testi",
"buff.desc.heal_test": "Bu etki iyileştirmeyi test etmek için.", "buff.desc.heal": "Bu etki iyileştirmeyi test etmek için.",
// Debuffs // Debuffs
"debuff.title.bleed_test": "Kanama", "debuff.title.bleed": "Kanama",
"debuff.desc.bleed_test": "Normal hasar verir.", "debuff.desc.bleed": "Normal hasar verir.",
}, },
vector_map: { vector_map: {

2
common/src/comp/inventory/item/mod.rs
View File

@ -83,7 +83,7 @@ pub enum ItemKind {
Glider(Glider), Glider(Glider),
Consumable { Consumable {
kind: String, kind: String,
effect: Option<Vec<Effect>>, effect: Vec<Effect>,
}, },
Throwable { Throwable {
kind: Throwable, kind: Throwable,

44
voxygen/src/hud/buffs.rs
View File

@ -182,7 +182,7 @@ impl<'a> Widget for BuffsBar<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed }) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind { let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, 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, _ => self.imgs.missing_icon,
}; };
let buff_widget = Image::new(buff_img).w_h(20.0, 20.0); 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); .set(id, ui);
// Create Buff tooltip // Create Buff tooltip
let title = match buff.kind { let title = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
localized_strings.get("buff.title.heal_test")
},
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test") localized_strings.get("buff.title.saturation")
}, },
_ => localized_strings.get("buff.title.missing"), _ => 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 click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
let desc_txt = match buff.kind { let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
localized_strings.get("buff.desc.heal_test")
},
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test") localized_strings.get("buff.desc.saturation")
}, },
_ => localized_strings.get("buff.desc.missing"), _ => localized_strings.get("buff.desc.missing"),
}; };
@ -303,9 +299,7 @@ impl<'a> Widget for BuffsBar<'a> {
.set(id, ui); .set(id, ui);
// Create Debuff tooltip // Create Debuff tooltip
let title = match debuff.kind { let title = match debuff.kind {
BuffKind::Bleeding { .. } => { BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
localized_strings.get("debuff.title.bleed_test")
},
_ => localized_strings.get("buff.title.missing"), _ => localized_strings.get("buff.title.missing"),
}; };
let remaining_time = if current_duration.is_none() { 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()) format!("Remaining: {:.0}s", current_duration.unwrap().as_secs_f32())
}; };
let desc_txt = match debuff.kind { let desc_txt = match debuff.kind {
BuffKind::Bleeding { .. } => { BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
localized_strings.get("debuff.desc.bleed_test")
},
_ => localized_strings.get("debuff.desc.missing"), _ => localized_strings.get("debuff.desc.missing"),
}; };
let desc = format!("{}\n\n{}", desc_txt, remaining_time); let desc = format!("{}\n\n{}", desc_txt, remaining_time);
@ -386,7 +378,7 @@ impl<'a> Widget for BuffsBar<'a> {
}) as u32; }) as u32;
let buff_img = match buff.kind { let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, 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::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
}; };
@ -410,15 +402,11 @@ impl<'a> Widget for BuffsBar<'a> {
.set(id, ui); .set(id, ui);
// Create Buff tooltip // Create Buff tooltip
let title = match buff.kind { let title = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
localized_strings.get("buff.title.heal_test")
},
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test") localized_strings.get("buff.title.saturation")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.title.bleed_test")
}, },
BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
_ => localized_strings.get("buff.title.missing"), _ => localized_strings.get("buff.title.missing"),
}; };
let remaining_time = if current_duration.is_none() { 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 click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
let desc_txt = match buff.kind { let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
localized_strings.get("buff.desc.heal_test")
},
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test") localized_strings.get("buff.desc.saturation")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.desc.bleed_test")
}, },
BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
_ => localized_strings.get("buff.desc.missing"), _ => localized_strings.get("buff.desc.missing"),
}; };
let desc = if buff.is_buff { let desc = if buff.is_buff {

14
voxygen/src/hud/group.rs
View File

@ -482,7 +482,7 @@ impl<'a> Widget for Group<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed }) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind { let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, 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::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
}; };
@ -511,13 +511,13 @@ impl<'a> Widget for Group<'a> {
// Create Buff tooltip // Create Buff tooltip
let title = match buff.kind { let title = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => {
localized_strings.get("buff.title.heal_test") localized_strings.get("buff.title.heal")
}, },
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test") localized_strings.get("buff.title.saturation")
}, },
BuffKind::Bleeding { .. } => { BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.title.bleed_test") localized_strings.get("debuff.title.bleed")
}, },
_ => localized_strings.get("buff.title.missing"), _ => localized_strings.get("buff.title.missing"),
}; };
@ -531,13 +531,13 @@ impl<'a> Widget for Group<'a> {
}; };
let desc_txt = match buff.kind { let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => { BuffKind::Regeneration { .. } => {
localized_strings.get("buff.desc.heal_test") localized_strings.get("buff.desc.heal")
}, },
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test") localized_strings.get("buff.desc.saturation")
}, },
BuffKind::Bleeding { .. } => { BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.desc.bleed_test") localized_strings.get("debuff.desc.bleed")
}, },
_ => localized_strings.get("buff.desc.missing"), _ => localized_strings.get("buff.desc.missing"),
}; };

1
voxygen/src/hud/img_ids.rs
View File

@ -352,6 +352,7 @@ image_ids! {
// Buffs // Buffs
buff_plus_0: "voxygen.element.icons.de_buffs.buff_plus_0", buff_plus_0: "voxygen.element.icons.de_buffs.buff_plus_0",
buff_saturation_0: "voxygen.element.icons.de_buffs.buff_saturation_0",
// Debuffs // Debuffs
debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0", debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0",

2
voxygen/src/hud/overhead.rs
View File

@ -243,7 +243,7 @@ impl<'a> Widget for Overhead<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed }) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind { let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0, 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::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0, BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
}; };