diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron index bf4a4faba3..abec0c62e3 100644 --- a/assets/common/items/apple.ron +++ b/assets/common/items/apple.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 20, cause: Item, - )), - amount: 20, + )), ), ) diff --git a/assets/common/items/boss_drops/potions.ron b/assets/common/items/boss_drops/potions.ron index 7c70ffa670..00ec4ce889 100644 --- a/assets/common/items/boss_drops/potions.ron +++ b/assets/common/items/boss_drops/potions.ron @@ -7,6 +7,5 @@ Item( amount: 100, cause: Item, )), - amount: 10, ), ) diff --git a/assets/common/items/cheese.ron b/assets/common/items/cheese.ron index 3c563dfc27..8c4f618b96 100644 --- a/assets/common/items/cheese.ron +++ b/assets/common/items/cheese.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 15, cause: Item, - )), - amount: 20, + )), ), ) diff --git a/assets/common/items/coconut.ron b/assets/common/items/coconut.ron index a094eb6fb0..b38608652d 100644 --- a/assets/common/items/coconut.ron +++ b/assets/common/items/coconut.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 30, cause: Item, - )), - amount: 20, + )), ), ) diff --git a/assets/common/items/mushroom.ron b/assets/common/items/mushroom.ron index 326a0bfa13..d341a5f773 100644 --- a/assets/common/items/mushroom.ron +++ b/assets/common/items/mushroom.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 10, cause: Item, - )), - amount: 40, + )), ), ) diff --git a/assets/common/items/potion_big.ron b/assets/common/items/potion_big.ron index 2d709e607f..42553d58e2 100644 --- a/assets/common/items/potion_big.ron +++ b/assets/common/items/potion_big.ron @@ -7,6 +7,6 @@ Item( amount: 100, cause: Item, )), - amount: 10, + , ), ) diff --git a/assets/common/items/potion_med.ron b/assets/common/items/potion_med.ron index ec5c8845a1..61cf612204 100644 --- a/assets/common/items/potion_med.ron +++ b/assets/common/items/potion_med.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 70, cause: Item, - )), - amount: 10, + )), ), ) diff --git a/assets/common/items/potion_minor.ron b/assets/common/items/potion_minor.ron index bc1e471871..431af1fbe7 100644 --- a/assets/common/items/potion_minor.ron +++ b/assets/common/items/potion_minor.ron @@ -6,7 +6,6 @@ Item( effect: Health(( amount: 50, cause: Item, - )), - amount: 10, + )), ), ) diff --git a/assets/common/items/velorite.ron b/assets/common/items/velorite.ron index 951c40eaa5..4a31cd56d8 100644 --- a/assets/common/items/velorite.ron +++ b/assets/common/items/velorite.ron @@ -4,6 +4,5 @@ Item( kind: Consumable( kind: Velorite, effect: Xp(20), - ), - amount: 10, + ), ) diff --git a/assets/common/items/veloritefrag.ron b/assets/common/items/veloritefrag.ron index 07d5a4df40..74c2a0036f 100644 --- a/assets/common/items/veloritefrag.ron +++ b/assets/common/items/veloritefrag.ron @@ -4,6 +4,5 @@ Item( kind: Consumable( kind: VeloriteFrag, effect: Xp(10), - ), - amount: 20, + ), ) diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron index 1682ff7a48..979379fbab 100644 --- a/assets/voxygen/i18n/de_DE.ron +++ b/assets/voxygen/i18n/de_DE.ron @@ -194,17 +194,17 @@ um dieses Fenster zu schließen? Drückt 'TAB'! Viel Spaß in der Welt von Veloren, Abenteurer!"#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, -"hud.temp_quest_text": r#"Dungeons filled with evil cultists -have emerged all around our peaceful towns! +"hud.temp_quest_headline": r#"Bitte helft uns, Reisender!"#, +"hud.temp_quest_text": r#"Höhlen voller böser Kultisten sind überall +um unsere Dörfer herum aufgetaucht! -Gather some company, stack up on food -and defeat their vile leaders and acolytes. +Versammelt einige Kämpfer, sucht etwas +Nahrung und besiegt ihre abscheulichen +Anführer und Akolyten. - -Maybe you can even obtain one of their -magically infused items?"#, +Vielleicht könnt ihr sogar einen ihrer +magischen Gegenstände ergattern?"#, // Inventory "hud.bag.inventory": "{playername}s Inventar", diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index e001d9ec97..ff4ed07b8c 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -190,7 +190,7 @@ Want to free your cursor to close this window? Press TAB! Enjoy your stay in the World of Veloren."#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/assets/voxygen/i18n/fr_FR.ron b/assets/voxygen/i18n/fr_FR.ron index 75b4b7518a..42d996bb0d 100644 --- a/assets/voxygen/i18n/fr_FR.ron +++ b/assets/voxygen/i18n/fr_FR.ron @@ -153,7 +153,7 @@ Vous souhaitez libérer votre souris pour fermer cette fenêtre? Tapez sur TAB! Profitez de votre séjour dans le monde de Veloren."#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/assets/voxygen/i18n/it_IT.ron b/assets/voxygen/i18n/it_IT.ron index 9ed617662b..657821da47 100644 --- a/assets/voxygen/i18n/it_IT.ron +++ b/assets/voxygen/i18n/it_IT.ron @@ -280,7 +280,7 @@ Vuoi sbloccare il cursore per chiudere questa finestra? Premi TAB! Goditi il tuo soggiorno nel Mondo di Veloren."#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/assets/voxygen/i18n/pt_PT.ron b/assets/voxygen/i18n/pt_PT.ron index b97e2575b2..170f5f8623 100644 --- a/assets/voxygen/i18n/pt_PT.ron +++ b/assets/voxygen/i18n/pt_PT.ron @@ -182,7 +182,7 @@ Quer libertar o mouse para fechar esta janela? Clique em TAB! Aprecie a sua estadia no mundo de Veloren."#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/assets/voxygen/i18n/ru_RU.ron b/assets/voxygen/i18n/ru_RU.ron index 85736a18a5..8d13344917 100644 --- a/assets/voxygen/i18n/ru_RU.ron +++ b/assets/voxygen/i18n/ru_RU.ron @@ -179,7 +179,7 @@ https://account.veloren.net."#, Наслаждайтесь миром Veloren."#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/assets/voxygen/i18n/tr_TR.ron b/assets/voxygen/i18n/tr_TR.ron index fc29052e23..296012c360 100644 --- a/assets/voxygen/i18n/tr_TR.ron +++ b/assets/voxygen/i18n/tr_TR.ron @@ -191,7 +191,7 @@ Bu pencereyi kapatmak için imlecini serbest bırakmak mı istiyorsun? TAB'a bas Veloren'in Dünyasında sana iyi eğlenceler!"#, -"hud.temp_quest_headline": r#"Please, help us Traveler!"#, +"hud.temp_quest_headline": r#"Please, help us Traveller!"#, "hud.temp_quest_text": r#"Dungeons filled with evil cultists have emerged all around our peaceful towns! diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index ca5dd67841..adab3db211 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1155,7 +1155,7 @@ impl Hud { .label_font_id(self.fonts.cyri.conrod_id) .label_font_size(self.fonts.cyri.scale(22)) .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(1.0)) + .label_y(conrod_core::position::Relative::Scalar(2.0)) .set(self.ids.accept_button, ui_widgets) .was_clicked() { @@ -1165,7 +1165,9 @@ impl Hud { } } }, - Intro::Never => {}, + Intro::Never => { + self.show.intro = false; + }, } }