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

rebase

Browse Source
This commit is contained in:
flo666 2022-10-24 20:26:22 +02:00 committed by Sam
parent 1750c9a0f2
commit 715a0b7b20
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/voxygen/i18n/en/hud/map.ftl
View File

@ -33,4 +33,5 @@ hud-map-zoom_minimap_explanation =
the area around you in higher detail
hud-map-gnarling = Gnarling Fortification
hud-map-chapel_site = Sea Chapel
hud-map-adlet = Adlet Stronghold
hud-map-placed_by = Placed by { $name }

4
voxygen/src/hud/map.rs
View File

@ -924,7 +924,7 @@ impl<'a> Widget for Map<'a> {
SiteKind::Gnarling => i18n.get_msg("hud-map-gnarling"),
SiteKind::ChapelSite => i18n.get_msg("hud-map-chapel_Site"),
SiteKind::Bridge => i18n.get_msg("hud-map-bridge"),
SiteKind::Adlet => i18n.get_msg("hud.map.adlet"),
SiteKind::Adlet => i18n.get_msg("hud-map-adlet"),
});
let (difficulty, desc) = match &site.kind {
SiteKind::Town => (None, i18n.get_msg("hud-map-town")),
@ -951,7 +951,7 @@ impl<'a> Widget for Map<'a> {
SiteKind::Gnarling => (Some(0), i18n.get_msg("hud-map-gnarling")),
SiteKind::ChapelSite => (Some(3), i18n.get_msg("hud-map-chapel_site")),
SiteKind::Bridge => (None, i18n.get_msg("hud-map-bridge")),
SiteKind::Adlet => (Some(0), i18n.get_msg("hud.map.adlet")),
SiteKind::Adlet => (Some(0), i18n.get_msg("hud-map-adlet")),
};
let desc = desc.into_owned() + &get_site_economy(site_rich);
let site_btn = Button::image(match &site.kind {

2
world/src/civ/mod.rs
View File

@ -297,7 +297,7 @@ impl Civs {
SiteKind::Gnarling => (16i32, 10.0),
SiteKind::Citadel => (16i32, 0.0),
SiteKind::Bridge(_, _) => (0, 0.0),
SiteKind::Adlet => (16i32, 10.0),
SiteKind::Adlet => (16i32, 0.0),
};
let (raise, raise_dist, make_waypoint): (f32, i32, bool) = match &site.kind {