Commit Graph

5224 Commits

Author SHA1 Message Date
06111612a3 voxygen: better translation of buff-death messages
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.

Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.

```
function getbuff --argument langfile buff
    grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end

set buffs burning bleeding curse crippled frozen mysterious

function replacebuffs --argument langfile entity
	set slug 'hud-chat-died_of_'$entity'_buff_msg'
    for buff in $buffs[-1..1]
        set bstr (getbuff $langfile $buff)
        or continue
        sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
    end
    sed -i -E 's/('$slug' \=).*/\1/' $langfile
end

function dofile --argument langfile
    sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
    for entity in pvp npc nonexistent
        replacebuffs $langfile $entity
    end
    sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
    sed -i -e /hud-outcome-/d $langfile
    sed -i -e '/#.*outcomes/d' $langfile
end

for langfile in assets/voxygen/i18n/*/hud/chat.ftl
    echo doing $langfile
    dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
9ef2875db7 voxygen: avoid unnecessary allocation
Cow::to_string() goes through &str even for an Owned variant,
Cow::into_owned() passes Owned variants through as-is. As it happens,
the values here are always Owned (see comment in try_msg_ctx()
implementation).
2023-08-29 17:09:31 +00:00
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
f6b1d39cf4 Merge branch 'xMAC94x/update_dependencies' into 'master'
xmac94x/update dependencies

See merge request veloren/veloren!4090
2023-08-28 17:08:55 +00:00
f2958954b9 new model for portal & use cultist particles 2023-08-27 19:40:49 +02:00
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02:00
de34726fa7 Merge branch 'imbris/winit-update-v2' into 'master'
Update winit to 0.28

See merge request veloren/veloren!4088
2023-08-27 15:10:00 +00:00
eec1b5853e Remove unused cpal version
Also it turns out directories-next is in use for something that we need
2023-08-23 00:47:31 -04:00
f5445774de Update winit to 0.28
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
b20ff5144c determine location names when loading character list 2023-08-22 22:41:48 +02:00
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
14f433b6cd used second sfx for teleport event 2023-08-19 11:44:58 +02:00
dc1756b2df added sfx (thanks to @flo666) 2023-08-17 22:47:35 +02:00
9f213019d1 Settings for Si prefixes in the interface menu 2023-08-17 15:24:05 +00:00
e5e26149ed review 2023-08-17 11:16:20 +02:00
0c9a942027 refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
92ab8dab9a require interaction to start teleportation 2023-08-15 12:24:49 +02:00
6a4a6bab9f dance dance 2023-08-15 12:24:49 +02:00
ac68f0af7b addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
bb2034ca92 portal particles 2023-08-15 12:24:48 +02:00
13dbf679c5 review 2023-08-15 11:10:54 +02:00
b7c56c9057 Hud fix 2023-08-15 11:10:54 +02:00
1ea0f249f5 display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
4bdbb3ff6b Move stay position to agent 2023-08-15 11:10:54 +02:00
6a080c242c Add server side check to stop stay when mounted
Add filter to allow telling other pets to stay when mounted
2023-08-15 11:10:53 +02:00
0648ba1bc6 Clean Code
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
25f1f8f6cb Changed to .filter and .min_by_key for iterator 2023-08-15 11:10:53 +02:00
5894913ede Changed mod.rs to use CachedSpatialGrid 2023-08-15 11:10:53 +02:00
d6496c999d Removed is_stay variable
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
d9d364fe79 Add stay position to PetState
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
9597810e3d Remove is_stay function
Clean code
2023-08-15 11:10:53 +02:00
e611d695b1 Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
5ef300c72c Add keybinding for zooming the camera 2023-08-10 16:55:09 +00:00
58b541490b Merge branch 'fix_sea_wyvern_head_offset' into 'master'
fix sea wyvern head offset

See merge request veloren/veloren!4059
2023-08-09 12:44:27 +00:00
b3899d6966 Merge branch 'isse/usable-shovel' into 'master'
Usable shovel

See merge request veloren/veloren!4060
2023-08-08 18:45:10 +00:00
ba1cee4fd2 more animation 2023-08-06 21:39:38 +02:00
16f53d33ed Play sfx on successful repair 2023-08-05 18:49:49 +00:00
98385b3b15 animation 2023-08-04 13:59:22 +02:00
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
b06960ce1c fix interaction_text 2023-08-03 20:56:26 +02:00
d890190af4 add animations 2023-08-03 19:45:23 +02:00
5e225d7f35 add to changelog 2023-08-03 19:38:31 +02:00
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
9bd5003d31 fix sea wyvern head offset 2023-08-03 19:25:55 +02:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
bcbfbbb274 Merge branch 'jimmy/controller-layers' into 'master'
controller layers

See merge request veloren/veloren!3988
2023-07-31 16:20:01 +00:00
996bbeb983 add doc comments to LayerEntry and GameLayerEntries structs 2023-07-30 13:34:23 -04:00
18d74e6a8e replace conditional LayerEntry construction during input check 2023-07-30 13:19:46 -04:00
32f3437fb0 Combat music toggle 2023-07-30 08:10:36 +00:00
Sam
e3ad16ef47 Addressed review comments 2023-07-29 19:04:11 -04:00