From 60f1688ac2e554086ee4112e80d5b2111abe7ea2 Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 18 Jul 2024 10:34:16 -0400 Subject: [PATCH 1/4] Add more detail to debug logs --- src/bot.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bot.rs b/src/bot.rs index 873a2d1..0ce9209 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -943,7 +943,10 @@ impl Bot { fn handle_position_and_orientation(&mut self) -> Result<(), String> { if let Some(current_position) = self.client.current::() { if current_position != self.position { - debug!("Updating position to {}", self.position.0); + debug!( + "Updating position from {} to {}", + current_position.0, self.position.0 + ); let entity = self.client.entity(); let ecs = self.client.state_mut().ecs(); @@ -957,7 +960,10 @@ impl Bot { if let Some(current_orientation) = self.client.current::() { if current_orientation != self.orientation { - debug!("Updating orientation to {:?}", self.orientation); + debug!( + "Updating orientation from {:?} to {:?}", + current_orientation, self.orientation + ); let entity = self.client.entity(); let ecs = self.client.state_mut().ecs(); From 70791b04867940fe240cf0a9aa3d10fdb830ce46 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 2 Aug 2024 15:49:52 -0400 Subject: [PATCH 2/4] Fix dumb error; Report item stock with prices --- src/bot.rs | 30 +++++++++++++++++++++++++----- src/main.rs | 8 ++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/bot.rs b/src/bot.rs index 0ce9209..1e5b504 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -848,22 +848,42 @@ impl Bot { } } + let inventories = self.client.inventories(); + let my_inventory = inventories + .get(self.client.entity()) + .ok_or("Failed to find inventory")?; + for (item_id, price) in &self.sell_prices.0 { - let item_name = self.get_item_name(item_id.as_ref()); + let item = Item::new_from_item_definition_id( + item_id.as_ref(), + &self.ability_map, + &self.material_manifest, + ) + .map_err(|error| error.to_string())?; + let (item_name_i18n_id, _) = item.i18n(&self.item_i18n); + let item_name = self.localization.read().get_content(&item_name_i18n_id); + let item_inventory_slot = my_inventory.get_slot_of_item(&item); + let stock = if let Some(slot_id) = item_inventory_slot { + my_inventory.get(slot_id).unwrap().amount() + } else { + 0 + }; if item_name.to_lowercase().contains(&search_term) { - selling.push((item_name, price)); + selling.push((item_name, price, stock)); continue; } if let Some(item_id_string) = item_id.as_ref().itemdef_id() { if item_id_string.to_lowercase().contains(&search_term) { - selling.push((item_name, price)); + selling.push((item_name, price, stock)); } } } + drop(inventories); + let total_found = buying.len() + selling.len(); if total_found == 0 { @@ -910,12 +930,12 @@ impl Bot { ); } - for (item_name, price) in selling { + for (item_name, price, stock) in selling { self.client.send_command( "tell".to_string(), vec![ player_name.clone(), - format!("Selling {item_name} for {price} coins."), + format!("Selling {item_name} for {price} coins. I have {stock} in stock."), ], ); } diff --git a/src/main.rs b/src/main.rs index 3e85be8..9836eb1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,10 +29,10 @@ fn main() { }; let game_server = config .game_server - .unwrap_or("server.veloren.net".to_string()); + .unwrap_or_else(|| "server.veloren.net".to_string()); let auth_server = config .auth_server - .unwrap_or("https://auth.veloren.net".to_string()); + .unwrap_or_else(|| "https://auth.veloren.net".to_string()); let mut bot = Bot::new( game_server, &auth_server, @@ -50,8 +50,8 @@ fn main() { loop { match bot.tick() { - Ok(true) => return, - Ok(false) => {} + Ok(true) => {} + Ok(false) => return, Err(error) => { error!("{error}"); } From 68e7b675efd1c2a87de41b028d9eb8be1a006a93 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 2 Aug 2024 15:59:38 -0400 Subject: [PATCH 3/4] Remove unused voxygen translations --- assets/voxygen/i18n/en/body.ftl | 35 -- assets/voxygen/i18n/en/buff.ftl | 149 ------- assets/voxygen/i18n/en/char_selection.ftl | 29 -- assets/voxygen/i18n/en/command.ftl | 106 ----- assets/voxygen/i18n/en/common.ftl | 124 ------ assets/voxygen/i18n/en/esc_menu.ftl | 2 - assets/voxygen/i18n/en/gameinput.ftl | 78 ---- assets/voxygen/i18n/en/hud/ability.ftl | 454 --------------------- assets/voxygen/i18n/en/hud/bag.ftl | 59 --- assets/voxygen/i18n/en/hud/char_window.ftl | 9 - assets/voxygen/i18n/en/hud/chat.ftl | 91 ----- assets/voxygen/i18n/en/hud/crafting.ftl | 53 --- assets/voxygen/i18n/en/hud/group.ftl | 13 - assets/voxygen/i18n/en/hud/map.ftl | 42 -- assets/voxygen/i18n/en/hud/misc.ftl | 84 ---- assets/voxygen/i18n/en/hud/quest.ftl | 7 - assets/voxygen/i18n/en/hud/sct.ftl | 2 - assets/voxygen/i18n/en/hud/settings.ftl | 167 -------- assets/voxygen/i18n/en/hud/signs.ftl | 1 - assets/voxygen/i18n/en/hud/skills.ftl | 148 ------- assets/voxygen/i18n/en/hud/social.ftl | 15 - assets/voxygen/i18n/en/hud/subtitles.ftl | 165 -------- assets/voxygen/i18n/en/hud/trade.ftl | 32 -- assets/voxygen/i18n/en/main.ftl | 112 ----- assets/voxygen/i18n/en/npc.ftl | 325 --------------- 25 files changed, 2302 deletions(-) delete mode 100644 assets/voxygen/i18n/en/body.ftl delete mode 100644 assets/voxygen/i18n/en/buff.ftl delete mode 100644 assets/voxygen/i18n/en/char_selection.ftl delete mode 100644 assets/voxygen/i18n/en/command.ftl delete mode 100644 assets/voxygen/i18n/en/common.ftl delete mode 100644 assets/voxygen/i18n/en/esc_menu.ftl delete mode 100644 assets/voxygen/i18n/en/gameinput.ftl delete mode 100644 assets/voxygen/i18n/en/hud/ability.ftl delete mode 100644 assets/voxygen/i18n/en/hud/bag.ftl delete mode 100644 assets/voxygen/i18n/en/hud/char_window.ftl delete mode 100644 assets/voxygen/i18n/en/hud/chat.ftl delete mode 100644 assets/voxygen/i18n/en/hud/crafting.ftl delete mode 100644 assets/voxygen/i18n/en/hud/group.ftl delete mode 100644 assets/voxygen/i18n/en/hud/map.ftl delete mode 100644 assets/voxygen/i18n/en/hud/misc.ftl delete mode 100644 assets/voxygen/i18n/en/hud/quest.ftl delete mode 100644 assets/voxygen/i18n/en/hud/sct.ftl delete mode 100644 assets/voxygen/i18n/en/hud/settings.ftl delete mode 100644 assets/voxygen/i18n/en/hud/signs.ftl delete mode 100644 assets/voxygen/i18n/en/hud/skills.ftl delete mode 100644 assets/voxygen/i18n/en/hud/social.ftl delete mode 100644 assets/voxygen/i18n/en/hud/subtitles.ftl delete mode 100644 assets/voxygen/i18n/en/hud/trade.ftl delete mode 100644 assets/voxygen/i18n/en/main.ftl delete mode 100644 assets/voxygen/i18n/en/npc.ftl diff --git a/assets/voxygen/i18n/en/body.ftl b/assets/voxygen/i18n/en/body.ftl deleted file mode 100644 index f1ad801..0000000 --- a/assets/voxygen/i18n/en/body.ftl +++ /dev/null @@ -1,35 +0,0 @@ -## Monster descriptions, used ONLY in npc-speech-tell_monster - -body-npc-speech-generic = some creature -body-npc-speech-biped_large-ogre-male = an ogre -body-npc-speech-biped_large-ogre-female = an ogre -body-npc-speech-biped_large-cyclops = a cyclops -body-npc-speech-biped_large-wendigo = a wendigo -body-npc-speech-biped_large-werewolf = a werewolf -body-npc-speech-biped_large-cave_troll = a cave troll -body-npc-speech-biped_large-mountain_troll = a mountain troll -body-npc-speech-biped_large-swamp_troll = a swamp troll -body-npc-speech-biped_large-blue_oni = a blue oni -body-npc-speech-biped_large-red_oni = a red oni -body-npc-speech-biped_large-tursus = a tursus -body-npc-speech-biped_large-dullahan = a dullahan -body-npc-speech-biped_large-occult_saurok = an occult saurok -body-npc-speech-biped_large-mighty_saurok = a mighty saurok -body-npc-speech-biped_large-sly_saurok = a sly saurok -body-npc-speech-biped_large-mindflayer = a mindflayer -body-npc-speech-biped_large-minotaur = a minotaur -body-npc-speech-biped_large-tidal_warrior = a tidal warrior -body-npc-speech-biped_large-yeti = a yeti -body-npc-speech-biped_large-harvester = a harvester -body-npc-speech-biped_large-cultist_warlord = a cultist warlord -body-npc-speech-biped_large-cultist_warlock = a cultist warlock -body-npc-speech-biped_large-husk_brute = a husk brute -body-npc-speech-biped_large-gigas_frost = a gigas frost -body-npc-speech-biped_large-adlet_elder = an adlet elder -body-npc-speech-biped_large-sea_bishop = a sea bishop -body-npc-speech-biped_large-haniwa_general = a haniwa general -body-npc-speech-biped_large-terracotta_besieger = a terracotta besieger -body-npc-speech-biped_large-terracotta_demolisher = a terracotta demolisher -body-npc-speech-biped_large-terracotta_punisher = a terracotta punisher -body-npc-speech-biped_large-terracotta_pursuer = a terracotta pursuer -body-npc-speech-biped_large-cursekeeper = a terracotta pursuer diff --git a/assets/voxygen/i18n/en/buff.ftl b/assets/voxygen/i18n/en/buff.ftl deleted file mode 100644 index 02e8c88..0000000 --- a/assets/voxygen/i18n/en/buff.ftl +++ /dev/null @@ -1,149 +0,0 @@ -## Regeneration -buff-heal = Heal - .desc = Gain health over time. - .stat = Restores { $str_total } health points. -## Potion -buff-potion = Potion - .desc = Drinking... -## Agility -buff-agility = Agility - .desc = Your movement is faster, but you deal less damage, and take more damage. - .stat = - Increases movement speed by { $strength } %. - In return, your attack power and defense decrease drastically. -## Saturation -buff-saturation = Saturation - .desc = Gain health over time from consumables. -## Campfire -buff-campfire_heal = Campfire Heal - .desc = Resting at a campfire heals { $rate } % HP per second. -## Energy Regen -buff-energy_regen = Energy Regeneration - .desc = Faster energy regeneration. - .stat = Restores { $str_total } energy. -## Health Increase -buff-increase_max_health = Increase Max Health - .desc = Your maximum HP is increased. - .stat = - Raises maximum health - by { $strength }. -## Energy Increase -buff-increase_max_energy = Increase Max Energy - .desc = Your maximum energy is increased. - .stat = - Raises maximum energy - by { $strength }. -## Invulnerability -buff-invulnerability = Invulnerability - .desc = You cannot be damaged by any attack. - .stat = Grants invulnerability. -## Protection Ward -buff-protectingward = Protecting Ward - .desc = You are protected, somewhat, from attacks. -## Frenzied -buff-frenzied = Frenzied - .desc = You are imbued with unnatural speed and can ignore minor injuries. -## Haste -buff-hastened = Hastened - .desc = Your movements and attacks are faster. -## Bleeding -buff-bleed = Bleeding - .desc = Inflicts regular damage. -## Curse -buff-cursed = Cursed - .desc = You are cursed. -## Burning -buff-burn = On Fire - .desc = You are burning alive. -## Crippled -buff-crippled = Crippled - .desc = Your movement is crippled as your legs are heavily injured. -## Freeze -buff-frozen = Frozen - .desc = Your movements and attacks are slowed. -## Wet -buff-wet = Wet - .desc = The ground rejects your feet, making it hard to stop. -## Poisoned -buff-poisoned = Poisoned - .desc = You feel your life withering away... -## Ensnared -buff-ensnared = Ensnared - .desc = Vines grasp at your legs, impeding your movement. -## Fortitude -buff-fortitude = Fortitude - .desc = You can withstand staggers, and as you take more damage you stagger others more easily. -## Parried -buff-parried = Parried - .desc = You were parried and now are slow to recover. -## Potion sickness -buff-potionsickness = Potion sickness - .desc = Potions have less positive effect on you after recently consuming a potion. - .stat = - Decreases the positive effects of - subsequent potions by { $strength } %. -## Reckless -buff-reckless = Reckless - .desc = Your attacks are more powerful. However, you are leaving your defenses open. -## Polymorped -buff-polymorphed = Polymorphed - .desc = Your body changes form. -## Flame -buff-flame = Flame - .desc = Flame is your ally. -## Frigid -buff-frigid = Frigid - .desc = Freeze your foes. -## Lifesteal -buff-lifesteal = Lifesteal - .desc = Siphon your enemies' life away. -## Salamander's Aspect -buff-salamanderaspect = Salamander's Aspect - .desc = You cannot burn and you move fast through lava. -## Imminent Critical -buff-imminentcritical = Imminent Critical - .desc = Your next attack will critically hit the enemy. -## Fury -buff-fury = Fury - .desc = With your fury, your strikes generate more combo. -## Sunderer -buff-sunderer = Sunderer - .desc = Your attacks can break through your foes' defences and refresh you with more energy. -## Defiance -buff-defiance = Defiance - .desc = You can withstand mightier and more staggering blows and generate combo by being hit, however you are slower. -## Bloodfeast -buff-bloodfeast = Bloodfeast - .desc = You restore life on attacks against bleeding enemies. -## Berserk -buff-berserk = Berserk - .desc = You are in a berserking rage, causing your attacks to be more powerful and swift, and increasing your speed. However, as a result your defensive capability is less. -## Heatstroke -buff-heatstroke = Heatstroke - .desc = You were exposed to heat and now suffer from heatstroke. Your energy reward and movement speed are cut down. Chill. -## Scornful Taunt -buff-scornfultaunt = Scornful Taunt - .desc = You scornfully taunt your enemies, granting you bolstered fortitude and stamina. However, your death will bolster your killer. -## Rooted -buff-rooted = Rooted - .desc = You are stuck in place and cannot move. -## Winded -buff-winded = Winded - .desc = You can barely breathe hampering how much energy you can recover and how quickly you can move. -## Concussion -buff-concussion = Concussion - .desc = You have been hit hard on the head and have trouble focusing, preventing you from using some of your more complex attacks. -## Staggered -buff-staggered = Staggered - .desc = You are off balance and more susceptible to heavy attacks. -## Tenacity -buff-tenacity = Tenacity - .desc = You are not only able to shrug off heavier attacks, they energize you as well. However you are also slower. -## Resilience -buff-resilience = Resilience - .desc = After having just taken a debilitating attack, you become more resilient to future incapaciting effects. -## Util -buff-text-over_seconds = over { $dur_secs } seconds -buff-text-for_seconds = for { $dur_secs } seconds -buff-mysterious = Mysterious effect -buff-remove = Click to remove diff --git a/assets/voxygen/i18n/en/char_selection.ftl b/assets/voxygen/i18n/en/char_selection.ftl deleted file mode 100644 index d12d49f..0000000 --- a/assets/voxygen/i18n/en/char_selection.ftl +++ /dev/null @@ -1,29 +0,0 @@ -char_selection-loading_characters = Loading characters... -char_selection-delete_permanently = Permanently delete this character? -char_selection-change_server = Change Server -char_selection-enter_world = Enter World -char_selection-spectate = Spectate World -char_selection-joining_character = Joining world... -char_selection-logout = Logout -char_selection-create_new_character = Create new character -char_selection-creating_character = Creating character... -char_selection-character_creation = Character creation -char_selection-human_default = Human default -char_selection-level_fmt = Level { $level_nb } -char_selection-uncanny_valley = Wilderness -char_selection-plains_of_uncertainty = Plains of Uncertainty -char_selection-beard = Beard -char_selection-hair_style = Hair Style -char_selection-hair_color = Hair Color -char_selection-eye_color = Eye Color -char_selection-skin = Skin -char_selection-eyeshape = Eye Details -char_selection-accessories = Accessories -char_selection-starting_site = Select Starting Area -char_selection-starting_site_next = Next -char_selection-starting_site_prev = Previous -char_selection-starting_site_name = { $name } -char_selection-starting_site_kind = Kind: { $kind } -char_selection-create_info_name = Your character needs a name! -char_selection-version_mismatch = WARNING! This server is running a different, possibly incompatible game version. Please update your game. -char_selection-rules = Rules diff --git a/assets/voxygen/i18n/en/command.ftl b/assets/voxygen/i18n/en/command.ftl deleted file mode 100644 index 6168b95..0000000 --- a/assets/voxygen/i18n/en/command.ftl +++ /dev/null @@ -1,106 +0,0 @@ -command-no-permission = You don't have permission to use '/{ $command_name }' -command-position-unavailable = Cannot get position for { $target } -command-player-role-unavailable = Cannot get administrator roles for { $target } -command-uid-unavailable = Cannot get UID for { $target } -command-area-not-found = Could not find area named '{ $area }' -command-player-not-found = Player '{ $player }' not found! -command-player-uuid-not-found = Player with UUID '{ $uuid }' not found! -command-username-uuid-unavailable = Unable to determine UUID for username { $username } -command-uuid-username-unavailable = Unable to determine username for UUID { $uuid } -command-no-sudo = It's rude to impersonate people -command-entity-dead = Entity '{ $entity }' is dead! -command-error-while-evaluating-request = Encountered an error while validating the request: { $error } -command-give-inventory-full = Player inventory full. Gave { $given -> - [1] only one - *[other] { $given } -} of { $total } items. -command-invalid-item = Invalid item: { $item } -command-invalid-block-kind = Invalid block kind: { $kind } -command-nof-entities-at-least = Number of entities should be at least 1 -command-nof-entities-less-than = Number of entities should be less than 50 -command-entity-load-failed = Failed to load entity config: { $config } -command-spawned-entities-config = Spawned { $n } entities from config: { $config } -command-invalid-sprite = Invalid sprite kind: { $kind } -command-time-parse-too-large = { $n } is invalid, cannot be larger than 16 digits. -command-time-parse-negative = { $n } is invalid, cannot be negative. -command-time-backwards = { $t } is before the current time, time cannot go backwards. -command-time-invalid = { $t } is not a valid time. -command-rtsim-purge-perms = You must be a real admin (not just a temporary admin) to purge rtsim data. -command-chunk-not-loaded = Chunk { $x }, { $y } not loaded -command-chunk-out-of-bounds = Chunk { $x }, { $y } not within map bounds -command-spawned-entity = Spawned entity with ID: { $id } -command-spawned-dummy = Spawned a training dummy -command-spawned-airship = Spawned an airship -command-spawned-campfire = Spawned a campfire -command-spawned-safezone = Spawned a safe zone -command-volume-size-incorrect = Size has to be between 1 and 127. -command-volume-created = Created a volume -command-permit-build-given = You are now permitted to build in '{ $area }' -command-permit-build-granted = Permission to build in '{ $area }' granted -command-revoke-build-recv = Your permission to build in '{ $area }' has been revoked -command-revoke-build = Permission to build in '{ $area }' revoked -command-revoke-build-all = Your build permissions have been revoked. -command-revoked-all-build = All build permissions revoked. -command-no-buid-perms = You do not have permission to build. -command-set-build-mode-off = Toggled build mode off. -command-set-build-mode-on-persistent = Toggled build mode on. Experimental terrain persistence is enabled. The server will attempt to persist changes, but this is not guaranteed. -command-set-build-mode-on-unpersistent = Toggled build mode on. Changes will not be persisted when a chunk unloads. -command-invalid-alignment = Invalid alignment: { $alignment } -command-kit-not-enough-slots = Inventory doesn't have enough slots -command-lantern-unequiped = Please equip a lantern first -command-lantern-adjusted-strength = You adjusted flame strength. -command-lantern-adjusted-strength-color = You adjusted flame strength and color. -command-explosion-power-too-high = Explosion power mustn't be more than { $power } -command-explosion-power-too-low = Explosion power must be more than { $power } -# Note: Do not translate "confirm" here -command-disconnectall-confirm = Please run the command again with the second argument of "confirm" to confirm that - you really want to disconnect all players from the server -command-invalid-skill-group = { $group } is not a skill group! -command-unknown = Unknown command -command-disabled-by-settings = Command disabled in server settings -command-battlemode-intown = You need to be in town to change battle mode! -command-battlemode-cooldown = Cooldown period active. Try again in { $cooldown } seconds -command-battlemode-available-modes = Available modes: pvp, pve -command-battlemode-same = Attempted to set the same battle mode -command-battlemode-updated = New battle mode: { $battlemode } -command-buff-unknown = Unknown buff: { $buff } -command-buff-data = Buff argument '{ $buff }' requires additional data -command-buff-body-unknown = Unknown body spec: { $spec } -command-skillpreset-load-error = Error while loading presets -command-skillpreset-broken = Skill preset is broken -command-skillpreset-missing = Preset does not exist: { $preset } -command-location-invalid = Location name '{ $location }' is invalid. Names may only contain lowercase ASCII and - underscores -command-location-duplicate = Location '{ $location }' already exists, consider deleting it first -command-location-not-found = Location '{ $location }' does not exist -command-location-created = Created location '{ $location }' -command-location-deleted = Deleted location '{ $location }' -command-locations-empty = No locations currently exist -command-locations-list = Available locations: { $locations } -# Note: Do not translate these weather names -command-weather-valid-values = Valid values are 'clear', 'rain', 'wind' and 'storm'. -command-scale-set = Set scale to { $scale } -command-repaired-items = Repaired all equipped items -command-message-group-missing = You are using group chat but do not belong to a group. Use /world or - /region to change chat. -command-tell-request = { $sender } wants to talk to you. -command-transform-invalid-presence = Cannot transform in the current presence -command-aura-invalid-buff-parameters = Invalid buff parameters for aura -command-aura-spawn = Spawned new aura attached to entity -command-aura-spawn-new-entity = Spawned new aura -command-reloaded-chunks = Reloaded { $reloaded } chunks -command-server-no-experimental-terrain-persistence = Server was compiled without terrain persistence enabled -command-experimental-terrain-persistence-disabled = Experimental terrain persistence is disabled - -# Unreachable/untestable but added for consistency - -command-player-info-unavailable = Cannot get player information for { $target } -command-unimplemented-spawn-special = Spawning special entities is not implemented -command-kit-inventory-unavailable = Could not get inventory -command-inventory-cant-fit-item = Can't fit item to inventory -# Emitted by /disconnect_all when you don't exist (?) -command-you-dont-exist = You do not exist, so you cannot use this command -command-destroyed-tethers = All tethers destroyed! You are now free -command-destroyed-no-tethers = You're not connected to any tethers -command-dismounted = Dismounted -command-no-dismount = You're not riding or being ridden diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl deleted file mode 100644 index f1e7eb6..0000000 --- a/assets/voxygen/i18n/en/common.ftl +++ /dev/null @@ -1,124 +0,0 @@ -common-username = username -common-singleplayer = Singleplayer -common-multiplayer = Multiplayer -common-servers = Servers -common-quit = Quit -common-settings = Settings -common-languages = Languages -common-interface = Interface -common-gameplay = Gameplay -common-controls = Controls -common-video = Graphics -common-sound = Sound -common-chat = Chat -common-networking = Networking -common-accessibility = Accessibility -common-resume = Resume -common-characters = Characters -common-close = Close -common-yes = Yes -common-no = No -common-back = Back -common-create = Create -common-okay = Okay -common-add = Add -common-accept = Accept -common-decline = Decline -common-disclaimer = Disclaimer -common-cancel = Cancel -common-none = None -common-error = Error -common-fatal_error = Fatal Error -common-you = You -common-automatic = Auto -common-random = Random -common-empty = Empty -common-confirm = Confirm -common-delete_server = Delete Server -common-interface_settings = Interface Settings -common-gameplay_settings = Gameplay Settings -common-controls_settings = Controls Settings -common-video_settings = Graphics Settings -common-sound_settings = Sound Settings -common-language_settings = Language Settings -common-chat_settings = Chat Settings -common-networking_settings = Networking Settings -common-accessibility_settings = Accessibility Settings -common-connection_lost = - Connection lost! - Did the server restart? - Is the client up to date? -common-species-orc = Orc -common-species-human = Human -common-species-dwarf = Dwarf -common-species-elf = Elf -common-species-draugr = Draugr -common-species-danari = Danari -common-weapons-axe = Axe -common-weapons-dagger = Dagger -common-weapons-greatsword = Greatsword -common-weapons-shortswords = Shortswords -common-weapons-sword = Sword -common-weapons-staff = Firestaff -common-weapons-bow = Bow -common-weapons-hammer = Hammer -common-weapons-general = General Combat -common-weapons-sceptre = Healing Sceptre -common-weapons-shield = Shield -common-weapons-spear = Spear -common-weapons-hammer_simple = Simple Hammer -common-weapons-sword_simple = Simple Sword -common-weapons-staff_simple = Simple Staff -common-weapons-axe_simple = Simple Axe -common-weapons-bow_simple = Simple Bow -common-weapons-unique = Unique -common-tool-debug = Debug -common-tool-farming = Farming Tool -common-tool-pick = Pickaxe -common-tool-shovel = Shovel -common-tool-mining = Mining -common-tool-instrument = Instrument -common-kind-modular_component = Modular Component -common-kind-modular_component_partial = Component -common-kind-glider = Glider -common-kind-consumable = Consumable -common-kind-throwable = Can be thrown -common-kind-utility = Utility -common-kind-ingredient = Ingredient -common-kind-lantern = Lantern -common-kind-recipegroup = Recipes -common-hands-one = One-Handed -common-hands-two = Two-Handed -common-rand_appearance = Random appearance -common-rand_name = Random name -common-stats-combat_rating = CR -common-stats-power = Power -common-stats-speed = Speed -common-stats-effect-power = Effect Power -common-stats-range = Range -common-stats-energy_efficiency = Energy Efficiency -common-stats-buff_strength = Buff/Debuff Strength -common-stats-precision_mult = Crit Mult -common-stats-armor = Armor -common-stats-poise_res = Stun Res -common-stats-energy_max = Max Energy -common-stats-energy_reward = Energy Reward -common-stats-precision_power = Crit Power -common-stats-stealth = Stealth -common-stats-slots = Slots -common-stats-durability = Durability -common-material-metal = Metal -common-material-wood = Wood -common-material-stone = Stone -common-material-cloth = Cloth -common-material-hide = Hide -common-sprite-chest = Chest -common-sprite-chair = Chair -common-sprite-mud = Mud -common-sprite-grave = Grave -common-sprite-crate = Crate -common-sprite-signboard = Signboard -common-sprite-street_lamp = Street Lamp -common-sprite-lantern = Lantern -common-sprite-seashell_lantern = Seashell Lantern -common-sprite-firebowl_ground = Firebowl \ No newline at end of file diff --git a/assets/voxygen/i18n/en/esc_menu.ftl b/assets/voxygen/i18n/en/esc_menu.ftl deleted file mode 100644 index 1ea8d86..0000000 --- a/assets/voxygen/i18n/en/esc_menu.ftl +++ /dev/null @@ -1,2 +0,0 @@ -esc_menu-logout = Logout -esc_menu-quit_game = Quit Game diff --git a/assets/voxygen/i18n/en/gameinput.ftl b/assets/voxygen/i18n/en/gameinput.ftl deleted file mode 100644 index e3de56e..0000000 --- a/assets/voxygen/i18n/en/gameinput.ftl +++ /dev/null @@ -1,78 +0,0 @@ -gameinput-primary = Basic Attack -gameinput-secondary = Secondary Attack -gameinput-block = Block -gameinput-slot1 = Hotbar Slot 1 -gameinput-slot2 = Hotbar Slot 2 -gameinput-slot3 = Hotbar Slot 3 -gameinput-slot4 = Hotbar Slot 4 -gameinput-slot5 = Hotbar Slot 5 -gameinput-slot6 = Hotbar Slot 6 -gameinput-slot7 = Hotbar Slot 7 -gameinput-slot8 = Hotbar Slot 8 -gameinput-slot9 = Hotbar Slot 9 -gameinput-slot10 = Hotbar Slot 10 -gameinput-swaploadout = Swap Loadout -gameinput-togglecursor = Toggle Cursor -gameinput-help = Toggle Help Window -gameinput-toggleinterface = Toggle Interface -gameinput-toggledebug = Toggle FPS and Debug Info -gameinput-toggle_egui_debug = Toggle EGUI Debug Info -gameinput-togglechat = Toggle Chat -gameinput-screenshot = Take Screenshot -gameinput-toggleingameui = Toggle Nametags -gameinput-fullscreen = Toggle Fullscreen -gameinput-moveforward = Move Forward -gameinput-moveleft = Move Left -gameinput-moveright = Move Right -gameinput-moveback = Move Backwards -gameinput-jump = Jump -gameinput-glide = Glider -gameinput-roll = Roll -gameinput-climb = Climb -gameinput-climbdown = Climb Down -gameinput-wallleap = Wall Leap -gameinput-togglelantern = Toggle Lantern -gameinput-mount = Mount -gameinput-stayfollow = Stay/Follow -gameinput-chat = Chat -gameinput-command = Command -gameinput-escape = Escape -gameinput-map = Map -gameinput-bag = Bag -gameinput-trade = Trade -gameinput-social = Social -gameinput-sit = Sit -gameinput-spellbook = Spells -gameinput-settings = Settings -gameinput-respawn = Respawn -gameinput-charge = Charge -gameinput-togglewield = Toggle Wield -gameinput-interact = Interact -gameinput-freelook = Free Look -gameinput-autowalk = Auto Walk/Swim -gameinput-zoomin = Camera zoom in -gameinput-zoomout = Camera zoom out -gameinput-zoomlock = Camera zoom lock -gameinput-cameraclamp = Camera Clamp -gameinput-dance = Dance -gameinput-select = Select Entity -gameinput-acceptgroupinvite = Accept Group Invite -gameinput-declinegroupinvite = Decline Group Invite -gameinput-cyclecamera = Cycle camera -gameinput-crafting = Crafting -gameinput-fly = Fly -gameinput-sneak = Sneak -gameinput-swimdown = Swim downwards -gameinput-swimup = Swim upwards -gameinput-mapzoomin = Increase map zoom -gameinput-mapzoomout = Decrease map zoom -gameinput-greet = Greet -gameinput-map-locationmarkerbutton = Set a waypoint in the Map -gameinput-spectatespeedboost = Spectate speed boost -gameinput-spectateviewpoint = Spectate viewpoint -gameinput-mutemaster = Mute master volume -gameinput-muteinactivemaster = Mute master volume (inactive window) -gameinput-mutemusic = Mute music volume -gameinput-mutesfx = Mute SFX volume -gameinput-muteambience = Mute ambience volume -gameinput-togglewalk = Toggle Walking diff --git a/assets/voxygen/i18n/en/hud/ability.ftl b/assets/voxygen/i18n/en/hud/ability.ftl deleted file mode 100644 index 94605a2..0000000 --- a/assets/voxygen/i18n/en/hud/ability.ftl +++ /dev/null @@ -1,454 +0,0 @@ -## Internal terms, currently only used in zh-Hans. -## If we remove them here, they also get auto-removed in zh-Hans, -## so please keep them, even when not used in English file. -## See https://github.com/WeblateOrg/weblate/issues/9895 - --heavy_stance = "" --agile_stance = "" --defensive_stance = "" --crippling_stance = "" --cleaving_stance = "" - --basic_state = "" --heavy_state = "" --agile_state = "" --defensive_state = "" --crippling_state = "" --cleaving_state = "" --double_slash = "" --modified_depending_stance = "" --crescent_slash = "" --fell_strike = "" --skewer = "" --cascade = "" --cross_cut = "" --requires_moderate_combo = "" --enter_stance = "" --require_stance = "" - -## Debug abilities -common-abilities-debug-possess = Possessing Arrow - .desc = Shoots a poisonous arrow. Lets you control your target. -common-abilities-debug-evolve = Evolve - .desc = You become your better self. -common-abilities-debug-glide_boost = Vroom - .desc = Gives you the force to reach the sky -common-abilities-debug-glide_speeder = Vroom - .desc = Gives you the force to reach wherever your eyes look - -## Hotbar abilities - -# Not-yet reworked weapon abilities - -common-abilities-hammer-leap = Smash of Doom - .desc = An AOE attack with knockback. Leaps to position of cursor. -common-abilities-bow-shotgun = Burst - .desc = Launches a burst of arrows -common-abilities-staff-fireshockwave = Ring of Fire - .desc = Ignites the ground with fiery shockwave. -common-abilities-sceptre-wardingaura = Warding Aura - .desc = Wards your allies against enemy attacks. - -## Sword abilities -veloren-core-pseudo_abilities-sword-heavy_stance = Heavy Stance - .desc = Attacks in this stance can stagger enemies and deal more damage to staggered enemies but are slower. -veloren-core-pseudo_abilities-sword-agile_stance = Agile Stance - .desc = Attacks are faster but weaker in this stance. -veloren-core-pseudo_abilities-sword-defensive_stance = Defensive Stance - .desc = Attacks in this stance can act as either a weak block or a parry. -veloren-core-pseudo_abilities-sword-crippling_stance = Crippling Stance - .desc = Attacks in this stance create or worsen lasting injuries. -veloren-core-pseudo_abilities-sword-cleaving_stance = Cleaving Stance - .desc = Attacks in this stance can hit multiple enemies. -veloren-core-pseudo_abilities-sword-double_slash = Double Slash - .desc = A two-hit combo. -common-abilities-sword-basic_double_slash = Basic Double Slash - .desc = A basic two-hit combo. -common-abilities-sword-heavy_double_slash = Heavy Double Slash - .desc = A slower two-hit combo that can stagger. -common-abilities-sword-agile_double_slash = Agile Double Slash - .desc = A fast two-hit combo with lighter strikes. -common-abilities-sword-defensive_double_slash = Defensive Double Slash - .desc = A two-hit combo that reduces the impact of enemy strikes. -common-abilities-sword-crippling_double_slash = Crippling Double Slash - .desc = A two-hit combo that can prolong an enemy's bleeding. -common-abilities-sword-cleaving_double_slash = Cleaving Double Slash - .desc = A two-hit combo that can cleave through multiple enemies. -veloren-core-pseudo_abilities-sword-secondary_ability = Secondary Sword Ability - .desc = The ability bound to secondary attack key. -common-abilities-sword-basic_thrust = Basic Thrust - .desc = Charging the thrust will make it more powerful. -common-abilities-sword-heavy_slam = Heavy Slam - .desc = A strong overhead slash that can be charged to be more staggering. -common-abilities-sword-agile_perforate = Perforate - .desc = A rapid flurry of light attacks. -common-abilities-sword-agile_dual_perforate = Perforate - .desc = A rapid flurry of light attacks with both swords. -common-abilities-sword-defensive_vital_jab = Defensive Vital Jab - .desc = A quickly charged jab that does more damage against parried foes. -common-abilities-sword-crippling_deep_rend = Deep Rend - .desc = A strike aimed at an already open wound, deals more damage to bleeding enemies. -common-abilities-sword-cleaving_spiral_slash = Spiral Slash - .desc = Sweep your blade fully around you to hit anyone nearby. -common-abilities-sword-cleaving_dual_spiral_slash = Spiral Slash - .desc = Sweep both of your blades fully around you to hit anyone nearby. -veloren-core-pseudo_abilities-sword-crescent_slash = Crescent Slash - .desc = - An upwards diagonal slash. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_crescent_slash = Basic Crescent Slash - .desc = A basic, upwards diagonal slash. -common-abilities-sword-heavy_crescent_slash = Heavy Crescent Slash - .desc = An upwards diagonal slash that can stagger. -common-abilities-sword-agile_crescent_slash = Agile Crescent Slash - .desc = A light, upwards diagonal slash. -common-abilities-sword-defensive_crescent_slash = Defensive Crescent Slash - .desc = A parrying, upwards diagonal slash. -common-abilities-sword-crippling_crescent_slash = Crippling Crescent Slash - .desc = An upwards diagonal slash that can bleed. -common-abilities-sword-cleaving_crescent_slash = Cleaving Crescent Slash - .desc = An upwards diagonal slash that can cleave through enemies. -veloren-core-pseudo_abilities-sword-fell_strike = Fell Strike - .desc = - A quick strong slash. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_fell_strike = Basic Fell Strike - .desc = A basic, quick strong slash. -common-abilities-sword-heavy_fell_strike = Heavy Fell Strike - .desc = A strong slash that can stagger. -common-abilities-sword-agile_fell_strike = Agile Fell Strike - .desc = A very quick strong slash. -common-abilities-sword-defensive_fell_strike = Defensive Fell Strike - .desc = A parrying, quick strong slash. -common-abilities-sword-crippling_fell_strike = Crippling Fell Strike - .desc = A quick strong slash that can bleed. -common-abilities-sword-cleaving_fell_strike = Cleaving Fell Strike - .desc = A quick strong slash that can cleave through enemies. -veloren-core-pseudo_abilities-sword-skewer = Skewer - .desc = - A stabbing lunge. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_skewer = Basic Skewer - .desc = A basic, stabbing lunge. -common-abilities-sword-heavy_skewer = Heavy Skewer - .desc = A stabbing lunge that can stagger. -common-abilities-sword-agile_skewer = Agile Skewer - .desc = A quick, stabbing lunge. -common-abilities-sword-defensive_skewer = Defensive Skewer - .desc = A parrying, stabbing lunge. -common-abilities-sword-crippling_skewer = Crippling Skewer - .desc = A stabbing lunge that can bleed. -common-abilities-sword-cleaving_skewer = Cleaving Skewer - .desc = A stabbing lunge that can cleave through enemies. -veloren-core-pseudo_abilities-sword-cascade = Cascade - .desc = - An overhead slash. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_cascade = Basic Cascade - .desc = A basic, overhead slash. -common-abilities-sword-heavy_cascade = Heavy Cascade - .desc = An overhead slash that can stagger. -common-abilities-sword-agile_cascade = Agile Cascade - .desc = A quick, overhead slash. -common-abilities-sword-defensive_cascade = Defensive Cascade - .desc = A parrying, overhead slash. -common-abilities-sword-crippling_cascade = Crippling Cascade - .desc = An overhead slash that can bleed. -common-abilities-sword-cleaving_cascade = Cleaving Cascade - .desc = An overhead slash that can cleave through enemies. -veloren-core-pseudo_abilities-sword-cross_cut = Cross Cut - .desc = - A right and left slash. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_cross_cut = Basic Cross Cut - .desc = A basic right and left slash. -common-abilities-sword-heavy_cross_cut = Heavy Cross Cut - .desc = A right and left slash that can each stagger. -common-abilities-sword-agile_cross_cut = Agile Cross Cut - .desc = A quick right and left slash. -common-abilities-sword-defensive_cross_cut = Defensive Cross Cut - .desc = A parrying right and left slash. -common-abilities-sword-crippling_cross_cut = Crippling Cross Cut - .desc = A right and left slash that can bleed. -common-abilities-sword-cleaving_cross_cut = Cleaving Cross Cut - .desc = A right and left slash which cleave through enemies. -common-abilities-sword-basic_dual_cross_cut = Basic Cross Cut - .desc = A simultaneous basic right and left slash. -common-abilities-sword-heavy_dual_cross_cut = Heavy Cross Cut - .desc = A simultaneous right and left slash that can each stagger. -common-abilities-sword-agile_dual_cross_cut = Agile Cross Cut - .desc = A simultaneous quick right and left slash. -common-abilities-sword-defensive_dual_cross_cut = Defensive Cross Cut - .desc = A simultaneous parrying right and left slash. -common-abilities-sword-crippling_dual_cross_cut = Crippling Cross Cut - .desc = A simultaneous right and left slash that can bleed. -common-abilities-sword-cleaving_dual_cross_cut = Cleaving Cross Cut - .desc = A simultaneous right and left slash which cleave through enemies. -veloren-core-pseudo_abilities-sword-finisher = Finisher - .desc = - An ability that consumes combo and is meant to end a fight. - This skill changes depending on your adopted stance. -common-abilities-sword-basic_mighty_strike = Mighty Strike - .desc = - A simple, powerful slash. - Requires a moderate amount of combo to use. -common-abilities-sword-heavy_guillotine = Guillotine - .desc = - A strong cleave that will likely stagger what it doesn't kill. - Requires a moderate amount of combo to use. -common-abilities-sword-agile_hundred_cuts = Hundred Cuts - .desc = - Many very rapid slashes on a target. - Requires a moderate amount of combo to use. -common-abilities-sword-defensive_counter = Counter - .desc = - A rapidly launched attack that deals substantially more damage to a parried foe. - Requires a moderate amount of combo to use. -common-abilities-sword-crippling_mutilate = Mutilate - .desc = - Mutilate your foe by sawing through their injuries, deals more damage to bleeding foes. - Requires a moderate amount of combo to use. -common-abilities-sword-cleaving_bladestorm = Bladestorm - .desc = - Decimate your enemies with multiple cyclic swings of your sword. - Requires a moderate amount of combo to use. -common-abilities-sword-cleaving_dual_bladestorm = Bladestorm - .desc = - Decimate your enemies with multiple cyclic swings of both of your swords. - Requires a moderate amount of combo to use. -common-abilities-sword-heavy_sweep = Heavy Sweep - .desc = - A heavy, wide, sweeping strike that deals more damage to a staggered enemy. - Enters heavy stance. -common-abilities-sword-heavy_pommel_strike = Pommel Strike - .desc = - Concuss your foe with a blunt strike to the head. - Enters heavy stance. -common-abilities-sword-agile_quick_draw = Quick Draw - .desc = - Dash forward as you draw your blade for a quick attack. - Enters agile stance. -common-abilities-sword-agile_feint = Feint - .desc = - Step to the side then back before striking. - Enters agile stance. -common-abilities-sword-defensive_riposte = Riposte - .desc = - Parry a strike before instantly counter-attacking. - Enters defensive stance. -common-abilities-sword-defensive_disengage = Disengage - .desc = - Retreat backwards a step after striking. - Enters defensive stance. -common-abilities-sword-crippling_gouge = Gouge - .desc = - Inflict a lasting wound on your enemy that will continue to bleed. - Enters crippling stance. -common-abilities-sword-crippling_hamstring = Hamstring - .desc = - Injure the tendons of your foe, leaving them less maneuverable. - Enters crippling stance. -common-abilities-sword-cleaving_whirlwind_slice = Whirlwind Slice - .desc = - Strike all surrounding enemies with circular attacks. - Enters cleaving stance. -common-abilities-sword-cleaving_dual_whirlwind_slice = Whirlwind Slice - .desc = - Strike all surrounding enemies with circular attacks using both of your swords. - Enters cleaving stance. -common-abilities-sword-cleaving_earth_splitter = Earth Splitter - .desc = - Split the earth, if used while falling will have a much stronger impact. - Enters cleaving stance. -common-abilities-sword-heavy_fortitude = Fortitude - .desc = - Increases stagger resistance and as you take more damage your attacks will be more staggering. - Requires heavy stance. -common-abilities-sword-heavy_pillar_thrust = Pillar Thrust - .desc = - Stab your sword down through the enemy, all the way into the ground, is more powerful if used while falling. - Requires heavy stance. -common-abilities-sword-agile_dancing_edge = Dancing Edge - .desc = - Move and attack more swiftly. - Requires agile stance. -common-abilities-sword-agile_flurry = Flurry - .desc = - Multiple rapid stabs. - Requires agile stance. -common-abilities-sword-agile_dual_flurry = Flurry - .desc = - Multiple rapid stabs with both swords. - Requires agile stance. -common-abilities-sword-defensive_stalwart_sword = Stalwart Sword - .desc = - Shrug off the brunt of attacks, incoming damage is reduced. - Requires defensive stance. -common-abilities-sword-defensive_deflect = Deflect - .desc = - A swift enough maneuver to even block projectiles. - Requires defensive stance. -common-abilities-sword-crippling_eviscerate = Eviscerate - .desc = - Shreds wounds further, deals more damage to crippled enemies. - Requires crippling stance. -common-abilities-sword-crippling_bloody_gash = Bloody Gash - .desc = - Cruelly strike an already bleeding wound, does more damage to bleeding enemies. - Requires crippling stance. -common-abilities-sword-cleaving_blade_fever = Blade Fever - .desc = - Attack more recklessly, increasing the power of your strikes while leaving yourself open to incoming attacks. - Requires cleaving stance. -common-abilities-sword-cleaving_sky_splitter = Sky Splitter - .desc = - A powerful strike that purportedly can even split the sky, but will split through enemies. - Requires cleaving stance. - -## Axe abilities -common-abilities-axe-triple_chop = Triple Chop - .desc = Three quick strikes. -common-abilities-axe-cleave = Cleave - .desc = A downwards chop that can build multiple combo. -common-abilities-axe-brutal_swing = Brutal Swing - .desc = A spinning cleave around you. -common-abilities-axe-berserk = Berserk - .desc = Increases your strength at the cost of leaving you vulnerable. -common-abilities-axe-rising_tide = Rising Tide - .desc = An upwards strike that greatly increases combo. -common-abilities-axe-savage_sense = Savage Sense - .desc = Identify a vital point on your target, ensuring your next strike critically damages them. -common-abilities-axe-adrenaline_rush = Adrenaline Rush - .desc = - Consume all your combo to replenish your energy. - Scales with combo on activation, consumes all combo. -common-abilities-axe-execute = Execute - .desc = - A devastating strike often known to be fatal. - Requires 30 combo to use. - Automatically upgrades to maelstrom at 50 combo if unlocked. -common-abilities-axe-maelstrom = Maelstrom - .desc = - Strike everything in your vicinity with a devastating, spinning strike. - Automatically upgrades from execute at 50 combo. -common-abilities-axe-rake = Rake - .desc = Drag your axe across your foe, inducing bleeding. -common-abilities-axe-bloodfeast = Bloodfeast - .desc = Your axe thirsts for the blood of your enemies, replenishing you with each strike against a bleeding enemy. -common-abilities-axe-fierce_raze = Fierce Raze - .desc = A rapid flurry of strikes on your foe. -common-abilities-axe-dual_fierce_raze = Fierce Raze - .desc = A rapid flurry of strikes on your foe using both of your axes. -common-abilities-axe-furor = Furor - .desc = As your fury rises, your strikes generate more combo. -common-abilities-axe-fracture = Fracture - .desc = - A crippling blow that hampers your foe's movement. - Scales with combo on activation, consumes half of combo. -common-abilities-axe-lacerate = Lacerate - .desc = - Flay your target, causing their lifeblood to flow out. - Requires 30 combo to use. - Automatically upgrades to riptide at 50 combo if unlocked. -common-abilities-axe-riptide = Riptide - .desc = - Flay everything nearby, parting them from their blood. - Automatically upgrades from lacerate at 50 combo. -common-abilities-axe-skull_bash = Skullbash - .desc = A strike with the flat of your axe that can stagger. -common-abilities-axe-sunder = Sunder - .desc = By changing your grip, you become able to bypass your enemy's armor while restoring your energy more effectively. -common-abilities-axe-plunder = Plunder - .desc = Quickly step towards your foe, robbing them of their balance with a strike. -common-abilities-axe-defiance = Defiance - .desc = Stare death in the eye longer as you make yourself resistant to both staggers and death. -common-abilities-axe-keelhaul = Keelhaul - .desc = - Hook your opponent to pull them closer towards you. - Scales with combo on activation, consumes half of combo. -common-abilities-axe-bulkhead = Bulkhead - .desc = - A heavy swing that some say can even stagger titans. - Requires 30 combo to use. - Automatically upgrades to capsize at 50 combo if unlocked. -common-abilities-axe-capsize = Capsize - .desc = - Stagger everything nearby with a heavy spinning strike. - Automatically upgrades from bulkhead at 50 combo. - -# Hammer abilities -common-abilities-hammer-solid_smash = Solid Smash - .desc = - A solid smash, that'll hurt -common-abilities-hammer-wide_wallop = Wide Wallop - .desc = - Pull back and send them flying -common-abilities-hammer-scornful_swipe = Scornful Swipe - .desc = - Bolster your fortitude and stamina by taunting your enemies before striking at them. If you fall to an enemy they become empowered. -common-abilities-hammer-tremor = Tremor - .desc = - Strike the earth with enough force that the ground beneath your foes trembles. -common-abilities-hammer-vigorous_bash = Vigorous Bash - .desc = - Use the head of your hammer to quickly strike your foes, giving a surge of adrenaline if the target is off balance. -common-abilities-hammer-heavy_whorl = Heavy Whorl - .desc = - You strike all foes surrounding you with your hammer. -common-abilities-hammer-dual_heavy_whorl = Heavy Whorl - .desc = - You strike all foes surrounding you with your hammers. -common-abilities-hammer-intercept = Intercept - .desc = - Charge forward with your hammer throwing your weight behind your strike. -common-abilities-hammer-dual_intercept = Intercept - .desc = - Charge forward with your hammers throwing your weight behind your strike. -common-abilities-hammer-retaliate = Retaliate - .desc = - After blocking an attack, retaliate with a heavy strike back. -common-abilities-hammer-spine_cracker = Spine Cracker - .desc = - When you foe turns their back to you, strike them hard in the back, targeting the weak part of their spine. -common-abilities-hammer-breach = Breach - .desc = - Breach through your enemy's attempt at defense with a heavy strike from your hammer. -common-abilities-hammer-pile_driver = Pile Driver - .desc = - Strike your enemy into the ground, stopping their movement until they free their legs. -common-abilities-hammer-lung_pummel = Lung Pummel - .desc = - Swipe your hammer into your foe's side, winding them. -common-abilities-hammer-helm_crusher = Helm Crusher - .desc = - Bash your enemy's head with your hammer, concussing them. -common-abilities-hammer-iron_tempest = Iron Tempest - .desc = - Swing swiftly enough that your hammer becomes like a storm, scattering your enemies. -common-abilities-hammer-dual_iron_tempest = Iron Tempest - .desc = - Swing swiftly enough that your hammers becomes like a storm, scattering your enemies. -common-abilities-hammer-upheaval = Upheaval - .desc = - Slam your hammer into your foe, knocking them into the air and leaving them vulnerable to staggers. -common-abilities-hammer-dual_upheaval = Upheaval - .desc = - Slam your hammers into your foes, knocking them into the air and leaving them vulnerable to staggers. -common-abilities-hammer-rampart = Rampart - .desc = - Strike the ground, causing very mild tectonic uplift which protects your allies from attacks. -common-abilities-hammer-tenacity = Tenacity - .desc = - Hold yourself strong as you withstand attack after attack, managing to keep attacking all the while. -common-abilities-hammer-thunderclap = Thunderclap - .desc = - Unleash a devastating, adrenaline-fueled overhead strike against your foe. -common-abilities-hammer-seismic_shock = Seismic Shock - .desc = - After buildup up enough momentum in your hammer, strike the ground with enough force that it erupts outward, throwing your foes into the air. -common-abilities-hammer-earthshaker = Earthshaker - .desc = - Slam the head of your blood-soaked hammer into the ground, unleashing a shockwave that knocks the wind out of everyone around you. -common-abilities-hammer-judgement = Judgement - .desc = - Bring your hammer down on your foe with all your weight, potentially killing them outright if they are staggered. diff --git a/assets/voxygen/i18n/en/hud/bag.ftl b/assets/voxygen/i18n/en/hud/bag.ftl deleted file mode 100644 index 778ed00..0000000 --- a/assets/voxygen/i18n/en/hud/bag.ftl +++ /dev/null @@ -1,59 +0,0 @@ -hud-bag-inventory = { $playername }'s Inventory -hud-bag-stats_title = { $playername }'s Stats -hud-bag-armor = Armor -hud-bag-stats = Stats -hud-bag-head = Head -hud-bag-neck = Neck -hud-bag-tabard = Tabard -hud-bag-shoulders = Shoulders -hud-bag-chest = Chest -hud-bag-hands = Hands -hud-bag-lantern = Lantern -hud-bag-glider = Glider -hud-bag-belt = Belt -hud-bag-ring = Ring -hud-bag-back = Back -hud-bag-backpack = Backpack -hud-bag-legs = Legs -hud-bag-feet = Feet -hud-bag-mainhand = Mainhand -hud-bag-offhand = Offhand -hud-bag-inactive_mainhand = Inactive Mainhand -hud-bag-inactive_offhand = Inactive Offhand -hud-bag-swap_equipped_weapons_title = Swap equipped weapons -hud-bag-swap_equipped_weapons_desc = Press { $key } -hud-bag-bag = Bag -hud-bag-health = Health -hud-bag-energy = Energy -hud-bag-combat_rating = Combat Rating -hud-bag-protection = Protection -hud-bag-stun_res = Stun Resilience -hud-bag-stealth = Stealth -hud-bag-combat_rating_desc = - Calculated from your - equipment and health. -hud-bag-protection_desc = Damage reduction through armor. -hud-bag-stun_res_desc = - Resilience against being stunned by consecutive hits. - Regenerates like energy. -hud-bag-sort_by_name = Sort by Name -hud-bag-sort_by_quality = Sort by Quality -hud-bag-sort_by_category = Sort by Category -hud-bag-sort_by_tag = Sort by Tag -hud-bag-sort_by_quantity = Sort by Quantity -hud-bag-use_slot_equip_drop_items = { $slot_deficit -> - [1] Equipping this item will result in insufficient inventory space to hold the items in your inventory and 1 item will drop on the floor. Do you wish to continue? - *[other] Equipping this item will result in insufficient inventory space to hold the items in your inventory and { $slot_deficit } items will drop on the floor. Do you wish to continue? -} -hud-bag-use_slot_unequip_drop_items = { $slot_deficit -> - [1] Unequipping this item will result in insufficient inventory space to hold the items in your inventory and 1 item will drop on the floor. Do you wish to continue? - *[other] Unequipping this item will result in insufficient inventory space to hold the items in your inventory and { $slot_deficit } items will drop on the floor. Do you wish to continue? -} -hud-bag-swap_slots_drop_items = { $slot_deficit -> - [1] This will result in dropping 1 item on the ground. Are you sure? - *[other] This will result in dropping { $slot_deficit } items on the ground. Are you sure? -} -hud-bag-split_swap_slots_drop_items = { $slot_deficit -> - [1] This will result in dropping 1 item on the ground. Are you sure? - *[other] This will result in dropping { $slot_deficit } items on the ground. Are you sure? -} diff --git a/assets/voxygen/i18n/en/hud/char_window.ftl b/assets/voxygen/i18n/en/hud/char_window.ftl deleted file mode 100644 index 34b4e3d..0000000 --- a/assets/voxygen/i18n/en/hud/char_window.ftl +++ /dev/null @@ -1,9 +0,0 @@ -character_window-character_name = Character name -character_window-character_stats = - Endurance - - Fitness - - Willpower - - Protection diff --git a/assets/voxygen/i18n/en/hud/chat.ftl b/assets/voxygen/i18n/en/hud/chat.ftl deleted file mode 100644 index d76f369..0000000 --- a/assets/voxygen/i18n/en/hud/chat.ftl +++ /dev/null @@ -1,91 +0,0 @@ -## Player events, $user_gender should be available - -hud-chat-online_msg = [{ $name }] is online now. -hud-chat-offline_msg = [{ $name }] went offline. -hud-chat-goodbye = Goodbye! -hud-chat-connection_lost = Connection lost. Kicking in { $time } seconds. - -## Player /tell messages, $user_gender should be available - -hud-chat-tell-to = To [{ $alias }]: { $msg } -hud-chat-tell-from = From [{ $alias }]: { $msg } - -## Npc /tell messages, no gender info, sadly - -hud-chat-tell-to-npc = To [{ $alias }]: { $msg } -hud-chat-tell-from-npc = From [{ $alias }]: { $msg } - -## Generic messages - -hud-chat-message = [{ $alias }]: { $msg } -hud-chat-message-with-name = [{ $alias }] { $name }: { $msg } -hud-chat-message-in-group = ({ $group }) [{ $alias }]: { $msg } -hud-chat-message-in-group-with-name = ({ $group }) [{ $alias }] { $name }: { $msg } - -## PvP Buff deaths, both $attacker_gender and $victim_gender are available - -hud-chat-died_of_pvp_buff_msg = - .burning = [{ $victim }] died of: burning caused by [{ $attacker }] - .bleeding = [{ $victim }] died of: bleeding caused by [{ $attacker }] - .curse = [{ $victim }] died of: curse caused by [{ $attacker }] - .crippled = [{ $victim }] died of: crippled caused by [{ $attacker }] - .frozen = [{ $victim }] died of: frozen caused by [{ $attacker }] - .mysterious = [{ $victim }] died of: secret caused by [{ $attacker }] - -## PvE Buff deaths, only $victim_gender is available - -hud-chat-died_of_npc_buff_msg = - .burning = [{ $victim }] died of: burning caused by { $attacker } - .bleeding = [{ $victim }] died of: bleeding caused by { $attacker } - .curse = [{ $victim }] died of: curse caused by { $attacker } - .crippled = [{ $victim }] died of: crippled caused by { $attacker } - .frozen = [{ $victim }] died of: frozen caused by { $attacker } - .mysterious = [{ $victim }] died of: secret caused by { $attacker } - -## Random Buff deaths, only $victim_gender is available - -hud-chat-died_of_buff_nonexistent_msg = - .burning = [{ $victim }] died of: burning - .bleeding = [{ $victim }] died of: bleeding - .curse = [{ $victim }] died of: curse - .crippled = [{ $victim }] died of: crippled - .frozen = [{ $victim }] died of: frozen - .mysterious = [{ $victim }] died of: secret - -## Other PvP deaths, both $attacker_gender and $victim_gender are available - -hud-chat-pvp_melee_kill_msg = [{ $attacker }] defeated [{ $victim }] -hud-chat-pvp_ranged_kill_msg = [{ $attacker }] shot [{ $victim }] -hud-chat-pvp_explosion_kill_msg = [{ $attacker }] blew up [{ $victim }] -hud-chat-pvp_energy_kill_msg = [{ $attacker }] killed [{ $victim }] with magic -hud-chat-pvp_other_kill_msg = [{ $attacker }] killed [{ $victim }] - -## Other PvE deaths, only $victim_gender is available - -hud-chat-npc_melee_kill_msg = { $attacker } killed [{ $victim }] -hud-chat-npc_ranged_kill_msg = { $attacker } shot [{ $victim }] -hud-chat-npc_explosion_kill_msg = { $attacker } blew up [{ $victim }] -hud-chat-npc_energy_kill_msg = { $attacker } killed [{ $victim }] with magic -hud-chat-npc_other_kill_msg = { $attacker } killed [{ $victim }] - -## Other deaths, only $victim_gender is available - -hud-chat-fall_kill_msg = [{ $name }] died from fall damage -hud-chat-suicide_msg = [{ $name }] died from self-inflicted wounds -hud-chat-default_death_msg = [{ $name }] died - -## Chat utils - -hud-chat-all = All -hud-chat-chat_tab_hover_tooltip = Right click for settings - -## HUD Pickup message - -hud-loot-pickup-msg-you = { $amount -> - [1] You picked up { $item } - *[other] You picked up {$amount}x {$item} -} -hud-loot-pickup-msg = { $amount -> - [1] { $actor } picked up { $item } - *[other] { $actor } picked up { $amount }x { $item } -} diff --git a/assets/voxygen/i18n/en/hud/crafting.ftl b/assets/voxygen/i18n/en/hud/crafting.ftl deleted file mode 100644 index 97cd385..0000000 --- a/assets/voxygen/i18n/en/hud/crafting.ftl +++ /dev/null @@ -1,53 +0,0 @@ -hud-crafting = Crafting -hud-crafting-recipes = Recipes -hud-crafting-ingredients = Ingredients: -hud-crafting-craft = Craft -hud-crafting-craft_all = Craft All -hud-crafting-repair = Repair -hud-crafting-repair_equipped = Repair Equipped -hud-crafting-repair_all = Repair All -hud-crafting-tool_cata = Requires: -hud-crafting-req_crafting_station = Requires: -hud-crafting-anvil = Anvil -hud-crafting-cauldron = Cauldron -hud-crafting-cooking_pot = Cooking Pot -hud-crafting-crafting_bench = Crafting Bench -hud-crafting-forge = Forge -hud-crafting-loom = Loom -hud-crafting-spinning_wheel = Spinning Wheel -hud-crafting-tanning_rack = Tanning Rack -hud-crafting-salvaging_station = Salvaging Bench -hud-crafting-repair_bench = Repair Bench -hud-crafting-campfire = Campfire -hud-crafting-tabs-all = All -hud-crafting-tabs-armor = Armor -hud-crafting-tabs-dismantle = Dismantle -hud-crafting-tabs-food = Food -hud-crafting-tabs-glider = Gliders -hud-crafting-tabs-potion = Potions -hud-crafting-tabs-tool = Tools -hud-crafting-tabs-utility = Utility -hud-crafting-tabs-weapon = Weapons -hud-crafting-tabs-bag = Bags -hud-crafting-tabs-processed_material = Materials -hud-crafting-dismantle_title = Dismantling -hud-crafting-dismantle_explanation = - Hover items in your bag to see what - you can salvage. - - Double-Click them to start dismantling. -hud-crafting-modular_desc = Drag Item-Parts here to craft a weapon -hud-crafting-mod_weap_prim_slot_title = Primary Weapon Component -hud-crafting-mod_weap_prim_slot_desc = Place a primary weapon component here (e.g. a sword blade, axe head, or bow limbs). -hud-crafting-mod_weap_sec_slot_title = Secondary Weapon Component -hud-crafting-mod_weap_sec_slot_desc = Place a secondary weapon component here (e.g. a sword hilt, bow grip, or staff core). -hud-crafting-mod_comp_metal_prim_slot_title = Metal Ingot -hud-crafting-mod_comp_metal_prim_slot_desc = Place a metal ingot here, only certain metals can be used to make weapons. -hud-crafting-mod_comp_wood_prim_slot_title = Wood -hud-crafting-mod_comp_wood_prim_slot_desc = Place a kind of wood here, only certain woods can be used to make weapons. -hud-crafting-mod_comp_sec_slot_title = Animal Material -hud-crafting-mod_comp_sec_slot_desc = Optionally place an animal crafting ingredient, only certain ingredients can be used to augment weapons. -hud-crafting-repair_slot_title = Damaged Item -hud-crafting-repair_slot_desc = Place an item here to see the cost of repairing it at its current durability level. -hud-crafting-recipe-uncraftable = Recipe Cannot be Crafted -hud-crafting-recipe-unlearned = You must first learn how to craft this recipe. diff --git a/assets/voxygen/i18n/en/hud/group.ftl b/assets/voxygen/i18n/en/hud/group.ftl deleted file mode 100644 index b91e9e0..0000000 --- a/assets/voxygen/i18n/en/hud/group.ftl +++ /dev/null @@ -1,13 +0,0 @@ -hud-group = Group -hud-group-invite_to_join = [{ $name }] invited you to their group! -hud-group-invite_to_trade = [{ $name }] would like to trade with you. -hud-group-invite = Invite -hud-group-kick = Kick -hud-group-assign_leader = Assign Leader -hud-group-leave = Leave Group -hud-group-dead = Dead -hud-group-out_of_range = Out of range -hud-group-add_friend = Add to Friends -hud-group-link_group = Link Groups -hud-group-in_menu = In Menu -hud-group-members = Group Members diff --git a/assets/voxygen/i18n/en/hud/map.ftl b/assets/voxygen/i18n/en/hud/map.ftl deleted file mode 100644 index 0a913fd..0000000 --- a/assets/voxygen/i18n/en/hud/map.ftl +++ /dev/null @@ -1,42 +0,0 @@ -hud-map-map_title = Map -hud-map-qlog_title = Quests -hud-map-topo_map = Topographic -hud-map-difficulty = Difficulty -hud-map-towns = Towns -hud-map-castles = Castles -hud-map-dungeons = Dungeons -hud-map-caves = Caves -hud-map-cave = Cave -hud-map-peaks = Mountains -hud-map-biomes = Biomes -hud-map-voxel_map = Voxel map -hud-map-trees = Giant Trees -hud-map-tree = Giant Tree -hud-map-town = Town -hud-map-castle = Castle -hud-map-bridge = Bridge -hud-map-dungeon = Dungeon -hud-map-df_mine = Mine -hud-map-difficulty_dungeon = - Dungeon - - Difficulty: { $difficulty } -hud-map-drag = Drag -hud-map-zoom = Zoom -hud-map-mid_click = Set Waypoint -hud-map-recenter = Recenter -hud-map-marked_location = Marked Location -hud-map-marked_location_remove = Click to remove -hud-map-change_map_mode = Change Map Mode -hud-map-toggle_minimap_voxel = Toggle Minimap Voxel View -hud-map-zoom_minimap_explanation = - Zoom in the Minimap to see - 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-haniwa = Haniwa Catacomb -hud-map-cultist = Cultist Dungeon -hud-map-sahagin = Sahagin Island -hud-map-terracotta = Terracotta Ruins -hud-map-placed_by = Placed by { $name } diff --git a/assets/voxygen/i18n/en/hud/misc.ftl b/assets/voxygen/i18n/en/hud/misc.ftl deleted file mode 100644 index 35e1987..0000000 --- a/assets/voxygen/i18n/en/hud/misc.ftl +++ /dev/null @@ -1,84 +0,0 @@ -hud-do_not_show_on_startup = Don't show this on startup -hud-show_tips = Show Tips -hud-quests = Quests -hud-you_died = You Died -hud-waypoint_saved = Waypoint Saved -hud-sp_arrow_txt = SP -hud-inventory_full = Inventory Full -hud-someone_else = someone else -hud-another_group = another group -hud-owned_by_for_secs = Owned by { $name } for { $secs } secs -hud-press_key_to_show_keybindings_fmt = [{ $key }] Key bindings -hud-press_key_to_toggle_lantern_fmt = [{ $key }] Lantern -hud-press_key_to_show_debug_info_fmt = Press { $key } to show debug info -hud-press_key_to_toggle_keybindings_fmt = Press { $key } to toggle key bindings -hud-press_key_to_toggle_debug_info_fmt = Press { $key } to toggle debug info -hud_items_lost_dur = Your equipped items have lost Durability. -hud-press_key_to_respawn = Press { $key } to respawn at the last campfire you visited. -hud-tutorial_btn = Tutorial -hud-tutorial_click_here = Press [ { $key } ] to free your cursor and click this button! -hud-tutorial_elements = Crafting -hud-temp_quest_headline = Greetings traveller! -hud-temp_quest_text = - To begin your journey you could start looking through this village and gather some supplies. - - You are welcome to take whatever you need on your journey! - - Look at the bottom right of the screen to find various things like your bag, the crafting menu and the map. - - The crafting stations allow you to create armor, weapons, food and much more! - - The wild animals all around town are a great source of Animal Hide to create some protection against the dangers of the world. - - Whenever you feel ready, try to get even better equipment from the many challenges marked on your map! -hud-spell = Spells -hud-diary = Diary -hud-free_look_indicator = Free look active. Press { $key } to disable. -hud-camera_clamp_indicator = Camera vertical clamp active. Press { $key } to disable. -hud-auto_walk_indicator = Auto walk/swim active -hud-zoom_lock_indicator-remind = Zoom locked -hud-zoom_lock_indicator-enable = Camera zoom locked -hud-zoom_lock_indicator-disable = Camera zoom unlocked -hud-activate = Activate -hud-deactivate = Deactivate -hud-collect = Collect -hud-pick_up = Pick up -hud-open = Open -hud-use = Use -hud-read = Read -hud-unlock-requires = Open with { $item } -hud-unlock-consumes = Use { $item } to open -hud-mine = Mine -hud-dig = Dig -hud-mine-needs_pickaxe = Needs Pickaxe -hud-mine-needs_shovel = Needs Shovel -hud-mine-needs_unhandled_case = Needs ??? -hud-talk = Talk -hud-pet = Pet -hud-trade = Trade -hud-mount = Mount -hud-follow = Follow -hud-stay = Stay -hud-sit = Sit -hud-steer = Steer -hud-lay = Lay -hud-portal = Portal - --server = Server --client = Client -hud-init-stage-singleplayer = Starting singleplayer server... -hud-init-stage-server-db-migrations = [{ -server }]: Applying database migrations... -hud-init-stage-server-db-vacuum = [{ -server }]: Cleaning up database... -hud-init-stage-server-worldsim-erosion = [{ -server }]: Erosion { $percentage } % -hud-init-stage-server-worldciv-civcreate = [{ -server }]: Generated { $generated } out of { $total } civilizations -hud-init-stage-server-worldciv-site = [{ -server }]: Generating sites... -hud-init-stage-server-economysim = [{ -server }]: Simulating economy... -hud-init-stage-server-spotgen = [{ -server }]: Generating spots... -hud-init-stage-server-starting = [{ -server }]: Starting server... -hud-init-stage-multiplayer = Starting multiplayer -hud-init-stage-client-connection-establish = [{ -client }]: Establishing connection to server... -hud-init-stage-client-request-server-version = [{ -client }]: Waiting for server version... -hud-init-stage-client-authentication = [{ -client }]: Authenticating... -hud-init-stage-client-load-init-data = [{ -client }]: Loading initialization data from server... -hud-init-stage-client-starting-client = [{ -client }]: Preparing Client... -hud-init-stage-render-pipeline = Creating render pipeline ({ $done }/{ $total }) diff --git a/assets/voxygen/i18n/en/hud/quest.ftl b/assets/voxygen/i18n/en/hud/quest.ftl deleted file mode 100644 index 8e2a55b..0000000 --- a/assets/voxygen/i18n/en/hud/quest.ftl +++ /dev/null @@ -1,7 +0,0 @@ -hud-quest = Quest -hud-quest-intro = Greetings, { $playername }! -hud-quest-desc-fetch = Please help me find: -hud-quest-desc-kill = Could you help me kill -hud-quest-reward = I will reward you with: -hud-quest-accept = Accept -hud-quest-decline = Decline diff --git a/assets/voxygen/i18n/en/hud/sct.ftl b/assets/voxygen/i18n/en/hud/sct.ftl deleted file mode 100644 index d1bc1ba..0000000 --- a/assets/voxygen/i18n/en/hud/sct.ftl +++ /dev/null @@ -1,2 +0,0 @@ -hud-sct-experience = { $amount } XP -hud-sct-block = BLOCKED diff --git a/assets/voxygen/i18n/en/hud/settings.ftl b/assets/voxygen/i18n/en/hud/settings.ftl deleted file mode 100644 index 51af2e9..0000000 --- a/assets/voxygen/i18n/en/hud/settings.ftl +++ /dev/null @@ -1,167 +0,0 @@ -hud-settings-general = General -hud-settings-none = None -hud-settings-press_behavior-toggle = Toggle -hud-settings-press_behavior-hold = Hold -hud-settings-autopress_behavior-toggle = Toggle -hud-settings-autopress_behavior-auto = Auto -hud-settings-help_window = Help Window -hud-settings-debug_info = Debug Info -hud-settings-show_hitboxes = Show hitboxes -hud-settings-show_chat = Show chat -hud-settings-show_hotkey_hints = Show hotkey hints -hud-settings-tips_on_startup = Tips-On-Startup -hud-settings-ui_scale = UI-Scale -hud-settings-relative_scaling = Relative Scaling -hud-settings-custom_scaling = Custom Scaling -hud-settings-crosshair = Crosshair -hud-settings-opacity = Opacity -hud-settings-hotbar = Hotbar -hud-settings-slots = Slots -hud-settings-toggle_shortcuts = Toggle Shortcuts -hud-settings-buffs_skillbar = Buffs at skill bar -hud-settings-buffs_mmap = Buffs at Minimap -hud-settings-use_prefixes = Use SI prefixes for quantities -hud-settings-prefix_switch_point = Digit limit for SI prefix switch -hud-settings-toggle_bar_experience = Toggle Experience Bar -hud-settings-scrolling_combat_text = Scrolling Combat Text -hud-settings-damage_accumulation_duration = Damage Accumulation Duration -hud-settings-incoming_damage = Incoming Damage -hud-settings-incoming_damage_accumulation_duration = Incoming Damage Accumulation Duration -hud-settings-round_damage = Round Damage -hud-settings-speech_bubble = Speech Bubble -hud-settings-speech_bubble_self = Show Own Speech Bubbles -hud-settings-speech_bubble_dark_mode = Speech Bubble Dark Mode -hud-settings-speech_bubble_icon = Speech Bubble Icon -hud-settings-energybar_numbers = Energy bar numbers -hud-settings-always_show_bars = Always show the energy bar -hud-settings-enable_poise_bar = Enable Poise bar -hud-settings-experience_numbers = Experience points -hud-settings-accumulate_experience = Show experience points as aggregate -hud-settings-values = Values -hud-settings-percentages = Percentages -hud-settings-chat = Chat -hud-settings-background_opacity = Background Opacity -hud-settings-chat_character_name = Character Names in Chat -hud-settings-loading_tips = Loading Screen Tips -hud-settings-reset_interface = Reset to Defaults -hud-settings-pan_sensitivity = Pan Sensitivity -hud-settings-zoom_sensitivity = Zoom Sensitivity -hud-settings-camera_clamp_angle = Angle for vertical camera clamp mode -hud-settings-invert_scroll_zoom = Invert Scroll Zoom -hud-settings-invert_mouse_y_axis = Invert Mouse Y Axis -hud-settings-invert_controller_y_axis = Invert Controller Y Axis -hud-settings-enable_mouse_smoothing = Camera Smoothing -hud-settings-free_look_behavior = Free look behavior -hud-settings-auto_walk_behavior = Auto walk behavior -hud-settings-walking_speed_behavior = Walking speed behavior -hud-settings-walking_speed = Walking speed -hud-settings-camera_clamp_behavior = Camera clamp behavior -hud-settings-zoom_lock_behavior = Camera zoom lock behavior -hud-settings-aim_offset_x = Horizontal Aim Offset -hud-settings-aim_offset_y = Vertical Aim Offset -hud-settings-player_physics_behavior = Player physics (experimental) -hud-settings-stop_auto_walk_on_input = Stop auto walk on movement -hud-settings-auto_camera = Auto camera -hud-settings-bow_zoom = Zoom in when charging bow -hud-settings-zoom_lock = Camera zoom lock -hud-settings-reset_gameplay = Reset to Defaults -hud-settings-view_distance = View Distance -hud-settings-entity_view_distance = Entities View Distance -hud-settings-lod_distance = LoD Distance -hud-settings-sprites_view_distance = Sprites View Distance -hud-settings-entities_detail_distance = Entities Detail Distance -hud-settings-maximum_fps = Maximum FPS -hud-settings-background_fps = Background FPS -hud-settings-present_mode = Present Mode -hud-settings-present_mode-vsync_capped = Vsync capped -hud-settings-present_mode-vsync_adaptive = Adaptive vsync -hud-settings-present_mode-vsync_uncapped = Vsync uncapped -hud-settings-present_mode-vsync_off = Vsync off -hud-settings-fov = Field of View (deg) -hud-settings-gamma = Gamma -hud-settings-exposure = Exposure -hud-settings-ambiance = Ambiance Brightness -hud-settings-antialiasing_mode = AntiAliasing Mode -hud-settings-upscale_factor = Internal Resolution -hud-settings-cloud_rendering_mode = Cloud Rendering Mode -hud-settings-fluid_rendering_mode = Fluid Rendering Mode -hud-settings-fluid_rendering_mode-low = Low -hud-settings-fluid_rendering_mode-medium = Medium -hud-settings-fluid_rendering_mode-high = High -hud-settings-reflection_rendering_mode = Reflection Rendering Mode -hud-settings-reflection_rendering_mode-low = Low -hud-settings-reflection_rendering_mode-medium = Medium -hud-settings-reflection_rendering_mode-high = High -hud-settings-cloud_rendering_mode-minimal = Minimal -hud-settings-cloud_rendering_mode-low = Low -hud-settings-cloud_rendering_mode-medium = Medium -hud-settings-cloud_rendering_mode-high = High -hud-settings-cloud_rendering_mode-ultra = Ultra -hud-settings-fullscreen = Fullscreen -hud-settings-fullscreen_mode = Fullscreen Mode -hud-settings-fullscreen_mode-exclusive = Exclusive -hud-settings-fullscreen_mode-borderless = Borderless -hud-settings-gpu_profiler = Enable GPU timing (not supported everywhere) -hud-settings-particles = Particles -hud-settings-lossy_terrain_compression = Lossy terrain compression -hud-settings-weapon_trails = Weapon trails -hud-settings-flashing_lights = Flashing lights -hud-settings-flashing_lights_info = Enables all kinds of flashing, e.g. flickering or lightning strikes -hud-settings-resolution = Resolution -hud-settings-bit_depth = Bit Depth -hud-settings-refresh_rate = Refresh Rate -hud-settings-lighting_rendering_mode = Lighting Rendering Mode -hud-settings-lighting_rendering_mode-ashikhmin = Type A - High -hud-settings-lighting_rendering_mode-blinnphong = Type B - Medium -hud-settings-lighting_rendering_mode-lambertian = Type L - Cheap -hud-settings-shadow_rendering_mode = Shadow Rendering Mode -hud-settings-shadow_rendering_mode-none = None -hud-settings-shadow_rendering_mode-cheap = Cheap -hud-settings-shadow_rendering_mode-map = Map -hud-settings-shadow_rendering_mode-map-resolution = Resolution -hud-settings-rain_occlusion-resolution = Rain Occlusion Resolution -hud-settings-lod_detail = LoD Detail -hud-settings-save_window_size = Save window size -hud-settings-reset_graphics = Reset to Defaults -hud-settings-minimal_graphics = Minimal -hud-settings-low_graphics = Low -hud-settings-medium_graphics = Medium -hud-settings-high_graphics = High -hud-settings-ultra_graphics = Ultra -hud-settings-bloom = Bloom -hud-settings-point_glow = Point Glow -hud-settings-master_volume = Master Volume -hud-settings-inactive_master_volume_perc = Inactive Window Volume -hud-settings-music_volume = Music Volume -hud-settings-sound_effect_volume = Sound Effects Volume -hud-settings-ambience_volume = Ambience Volume -hud-settings-combat_music = Combat Music -hud-settings-music_spacing = Music Spacing -hud-settings-audio_device = Audio Device -hud-settings-reset_sound = Reset to Defaults -hud-settings-english_fallback = Display English for missing translations -hud-settings-language_send_to_server = Send the configured language to servers (for localizing rules and motd messages) -hud-settings-awaitingkey = Press a key... -hud-settings-unbound = None -hud-settings-reset_keybinds = Reset to defaults -hud-settings-keybind-helper = - M1 to set - M2 to unset -hud-settings-chat_tabs = Chat Tabs -hud-settings-label = Label: -hud-settings-delete = Delete -hud-settings-show_all = Show all -hud-settings-messages = Messages -hud-settings-activity = Activity -hud-settings-death = Death -hud-settings-group = Group -hud-settings-faction = Faction -hud-settings-world = World -hud-settings-region = Region -hud-settings-say = Say -hud-settings-all = All -hud-settings-group_only = Group only -hud-settings-reset_chat = Reset to Defaults -hud-settings-third_party_integrations = Third-party Integrations -hud-settings-enable_discord_integration = Enable Discord Integration -hud-settings-subtitles = Subtitles diff --git a/assets/voxygen/i18n/en/hud/signs.ftl b/assets/voxygen/i18n/en/hud/signs.ftl deleted file mode 100644 index cd85a0f..0000000 --- a/assets/voxygen/i18n/en/hud/signs.ftl +++ /dev/null @@ -1 +0,0 @@ -common-signs-keep_out = Keep Out! diff --git a/assets/voxygen/i18n/en/hud/skills.ftl b/assets/voxygen/i18n/en/hud/skills.ftl deleted file mode 100644 index 6462c67..0000000 --- a/assets/voxygen/i18n/en/hud/skills.ftl +++ /dev/null @@ -1,148 +0,0 @@ -## Internal terms, currently only used in es -## If we remove them here, they also get auto-removed in es, -## so please keep them, even when not used in English file. -## See https://github.com/WeblateOrg/weblate/issues/9895 --hud-skill-sc_wardaura_title = "" --hud-skill-bow_shotgun_title = "" --hud-skill-st_shockwave_title = "" - -## Skill tree UI -hud-rank_up = New skill point -hud-skill-sp_available = - { $number -> - [0] No skill points available - [1] { $number } skill point available - *[other] { $number } skill points available - } -hud-skill-not_unlocked = Not yet unlocked -hud-skill-req_sp = {"\u000A"}Requires { $number } SP -hud-skill-set_as_exp_bar = Track progress on experience bar - -hud-skill-unlck_sword_title = Sword proficiency -hud-skill-unlck_sword = Unlocks the sword skill tree.{ $SP } -hud-skill-unlck_axe_title = Axe proficiency -hud-skill-unlck_axe = Unlocks the axe skill tree.{ $SP } -hud-skill-unlck_hammer_title = Hammer proficiency -hud-skill-unlck_hammer = Unlocks the hammer skill tree.{ $SP } -hud-skill-unlck_bow_title = Bow proficiency -hud-skill-unlck_bow = Unlocks the bow skill tree.{ $SP } -hud-skill-unlck_staff_title = Staff proficiency -hud-skill-unlck_staff = Unlocks the staff skill tree.{ $SP } -hud-skill-unlck_sceptre_title = Sceptre proficiency -hud-skill-unlck_sceptre = Unlocks the sceptre skill tree.{ $SP } -hud-skill-climbing_title = Climbing -hud-skill-climbing = Ability to climb surfaces. -hud-skill-climbing_cost_title = Climbing Cost -hud-skill-climbing_cost = Climbing uses { $boost } % less energy.{ $SP } -hud-skill-climbing_speed_title = Climbing Speed -hud-skill-climbing_speed = Climb { $boost } % faster.{ $SP } -hud-skill-swim_title = Swimming -hud-skill-swim = Moving through water. -hud-skill-swim_speed_title = Swimming Speed -hud-skill-swim_speed = Swim { $boost } % faster.{ $SP } -hud-skill-sc_lifesteal_title = Lifesteal Beam -hud-skill-sc_lifesteal = Drain the life from your enemies. -hud-skill-sc_lifesteal_damage_title = Damage -hud-skill-sc_lifesteal_damage = Deal { $boost } % more damage.{ $SP } -hud-skill-sc_lifesteal_range_title = Range -hud-skill-sc_lifesteal_range = Your beam reaches { $boost } % further.{ $SP } -hud-skill-sc_lifesteal_lifesteal_title = Lifesteal -hud-skill-sc_lifesteal_lifesteal = Convert an additional { $boost } % of damage into health.{ $SP } -hud-skill-sc_lifesteal_regen_title = Energy Regen -hud-skill-sc_lifesteal_regen = Replenish your energy by an additional { $boost } %.{ $SP } -hud-skill-sc_heal_title = Healing Aura -hud-skill-sc_heal = Heal your allies using the blood of your enemies, requires combo to activate. -hud-skill-sc_heal_heal_title = Heal -hud-skill-sc_heal_heal = Increases the amount you heal by { $boost } %.{ $SP } -hud-skill-sc_heal_cost_title = Energy Cost -hud-skill-sc_heal_cost = Healing requires { $boost } % less energy.{ $SP } -hud-skill-sc_heal_duration_title = Duration -hud-skill-sc_heal_duration = The effects of your healing aura last { $boost } % longer.{ $SP } -hud-skill-sc_heal_range_title = Radius -hud-skill-sc_heal_range = Your healing aura reaches { $boost } % further.{ $SP } -hud-skill-sc_wardaura_unlock_title = Warding Aura Unlock -hud-skill-sc_wardaura_unlock = Allows you to ward your allies against enemy attacks.{ $SP } -hud-skill-sc_wardaura_strength_title = Strength -hud-skill-sc_wardaura_strength = The strength of your protection increases by { $boost } %.{ $SP } -hud-skill-sc_wardaura_duration_title = Duration -hud-skill-sc_wardaura_duration = The effects of your ward last { $boost } % longer.{ $SP } -hud-skill-sc_wardaura_range_title = Radius -hud-skill-sc_wardaura_range = Your ward reaches { $boost } % further.{ $SP } -hud-skill-sc_wardaura_cost_title = Energy Cost -hud-skill-sc_wardaura_cost = Creating the ward requires { $boost } % less energy.{ $SP } -hud-skill-st_shockwave_range_title = Shockwave Range -hud-skill-st_shockwave_range = Throw things that used to be out of reach, range increased { $boost } %.{ $SP } -hud-skill-st_shockwave_cost_title = Shockwave Cost -hud-skill-st_shockwave_cost = Decreases the energy cost to throw helpless villagers by { $boost } %.{ $SP } -hud-skill-st_shockwave_knockback_title = Shockwave Knockback -hud-skill-st_shockwave_knockback = Increases throw potential by { $boost } %.{ $SP } -hud-skill-st_shockwave_damage_title = Shockwave Damage -hud-skill-st_shockwave_damage = Increases the damage done by { $boost } %.{ $SP } -hud-skill-st_shockwave_unlock_title = Shockwave Unlock -hud-skill-st_shockwave_unlock = Unlocks the ability to throw enemies away using fire.{ $SP } -hud-skill-st_flamethrower_title = Flamethrower -hud-skill-st_flamethrower = Throws fire, cook'em all. -hud-skill-st_flame_velocity_title = Flame Velocity -hud-skill-st_flame_velocity = Gets the fire there faster, { $boost } % faster.{ $SP } -hud-skill-st_flamethrower_range_title = Flamethrower Range -hud-skill-st_flamethrower_range = For when the flames just won't reach, they go { $boost } % further.{ $SP } -hud-skill-st_energy_drain_title = Energy Drain -hud-skill-st_energy_drain = Decreases the rate energy is drained by { $boost } %.{ $SP } -hud-skill-st_flamethrower_damage_title = Flamethrower Damage -hud-skill-st_flamethrower_damage = Increases damage by { $boost } %.{ $SP } -hud-skill-st_explosion_radius_title = Explosion Radius -hud-skill-st_explosion_radius = Bigger is better, increases explosion radius by { $boost } %.{ $SP } -hud-skill-st_energy_regen_title = Energy Regen -hud-skill-st_energy_regen = Increases energy gain by { $boost } %.{ $SP } -hud-skill-st_fireball_title = Fireball -hud-skill-st_fireball = Shoots a fireball that explodes on impact. -hud-skill-st_damage_title = Damage -hud-skill-st_damage = Increases damage by { $boost } %.{ $SP } -hud-skill-bow_projectile_speed_title = Projectile Speed -hud-skill-bow_projectile_speed = Allows you to shoot arrows further, faster, by { $boost } %.{ $SP } -hud-skill-bow_charged_title = Charged Shoot -hud-skill-bow_charged = Because you waited longer. -hud-skill-bow_charged_damage_title = Charged Damage -hud-skill-bow_charged_damage = Increases damage by { $boost } %.{ $SP } -hud-skill-bow_charged_energy_regen_title = Charged Regen -hud-skill-bow_charged_energy_regen = Increases energy recovery by { $boost } %.{ $SP } -hud-skill-bow_charged_knockback_title = Charged Knockback -hud-skill-bow_charged_knockback = Knock enemies further back by { $boost } %.{ $SP } -hud-skill-bow_charged_speed_title = Charged Speed -hud-skill-bow_charged_speed = Increases the rate that you charge the attack by { $boost } %.{ $SP } -hud-skill-bow_charged_move_title = Charged Move Speed -hud-skill-bow_charged_move = Increases how fast you can shuffle while charging the attack by { $boost } %.{ $SP } -hud-skill-bow_repeater_title = Repeater -hud-skill-bow_repeater = Shoots faster the longer you fire for. -hud-skill-bow_repeater_damage_title = Repeater Damage -hud-skill-bow_repeater_damage = Increases the damage done by { $boost } %.{ $SP } -hud-skill-bow_repeater_cost_title = Repeater Cost -hud-skill-bow_repeater_cost = Decreases the energy cost to become a repeater by { $boost } %.{ $SP } -hud-skill-bow_repeater_speed_title = Repeater Speed -hud-skill-bow_repeater_speed = Increases the rate at which you fire arrows by { $boost } %.{ $SP } -hud-skill-bow_shotgun_unlock_title = Unlocks Shotgun -hud-skill-bow_shotgun_unlock = Unlocks ability to fire multiple arrows at once.{ $SP } -hud-skill-bow_shotgun_damage_title = Shotgun Damage -hud-skill-bow_shotgun_damage = Increases the damage done by { $boost } %.{ $SP } -hud-skill-bow_shotgun_cost_title = Shotgun Cost -hud-skill-bow_shotgun_cost = Decreases the cost of shotgun by { $boost } %.{ $SP } -hud-skill-bow_shotgun_arrow_count_title = Shotgun Arrows -hud-skill-bow_shotgun_arrow_count = Increases the number of arrows in the burst by { $boost }.{ $SP } -hud-skill-bow_shotgun_spread_title = Shotgun Spread -hud-skill-bow_shotgun_spread = Decreases the spread of the arrows by { $boost } %.{ $SP } -hud-skill-mining_title = Mining -hud-skill-pick_strike_title = Pickaxe Strike -hud-skill-pick_strike = Hit rocks with the pickaxe to gain ore, gems and experience. -hud-skill-pick_strike_speed_title = Pickaxe Strike Speed -hud-skill-pick_strike_speed = Mine rocks faster.{ $SP } -hud-skill-pick_strike_oregain_title = Pickaxe Strike Ore Yield -hud-skill-pick_strike_oregain = Chance to gain extra ore ({ $boost } % per level).{ $SP } -hud-skill-pick_strike_gemgain_title = Pickaxe Strike Gem Yield -hud-skill-pick_strike_gemgain = Chance to gain extra gems ({ $boost } % per level).{ $SP } - -## Skill tree error dialog -hud-skill-persistence-hash_mismatch = There was a difference detected in one of your skill groups since you last played. -hud-skill-persistence-deserialization_failure = There was a error in loading some of your skills from the database. -hud-skill-persistence-spent_experience_missing = The amount of free experience you had in one of your skill groups differed from when you last played. -hud-skill-persistence-skills_unlock_failed = Your skills were not able to be obtained in the same order you acquired them. Prerequisites or costs may have changed. -hud-skill-persistence-common_message = Some of your skill points have been reset. You will need to reassign them. diff --git a/assets/voxygen/i18n/en/hud/social.ftl b/assets/voxygen/i18n/en/hud/social.ftl deleted file mode 100644 index 17940d2..0000000 --- a/assets/voxygen/i18n/en/hud/social.ftl +++ /dev/null @@ -1,15 +0,0 @@ -hud-social = Players -hud-social-online = Online: -hud-social-friends = Friends -hud-social-not_yet_available = Not yet available -hud-social-faction = Faction -hud-social-play_online_fmt = - { $nb_player -> - [1] { $nb_player } player online - *[other] { $nb_player } players online - } - -hud-social-name = Name -hud-social-level = Level -hud-social-zone = Zone -hud-social-account = Account diff --git a/assets/voxygen/i18n/en/hud/subtitles.ftl b/assets/voxygen/i18n/en/hud/subtitles.ftl deleted file mode 100644 index b5cc9c6..0000000 --- a/assets/voxygen/i18n/en/hud/subtitles.ftl +++ /dev/null @@ -1,165 +0,0 @@ -subtitle-campfire = Campfire crackling -subtitle-bird_call = Birds singing -subtitle-bees = Bees buzzing -subtitle-owl = Owl hooting -subtitle-running_water = Water bubbling -subtitle-lavapool = Lava pool -subtitle-lightning = Thunder -subtitle-portal-activated = Portal Activated -subtitle-portal-teleported = Teleported via portal - -subtitle-footsteps_grass = Walking on grass -subtitle-footsteps_earth = Walking on dirt -subtitle-footsteps_rock = Walking on rock -subtitle-footsteps_snow = Walking on snow -subtitle-pickup_item = Item picked up -subtitle-pickup_failed = Pickup failed - -subtitle-glider_open = Glider equipped -subtitle-glider_close = Glider unequipped -subtitle-glide = Gliding -subtitle-roll = Rolling -subtitle-swim = Swimming -subtitle-climb = Climbing -subtitle-damage = Damage -subtitle-death = Death - -subtitle-wield_bow = Bow equipped -subtitle-unwield_bow = Bow unequipped -subtitle-pickup_bow = Bow picked up - -subtitle-wield_sword = Sword equipped -subtitle-unwield_sword = Sword unequipped -subtitle-sword_attack = Sword swung -subtitle-pickup_sword = Sword picked up - -subtitle-wield_axe = Axe equipped -subtitle-unwield_axe = Axe unequipped -subtitle-axe_attack = Axe swung -subtitle-pickup_axe = Axe picked up - -subtitle-wield_hammer = Hammer equipped -subtitle-unwield_hammer = Hammer unequipped -subtitle-hammer_attack = Hammer swung -subtitle-pickup_hammer = Hammer picked up - -subtitle-wield_staff = Staff equipped -subtitle-unwield_staff = Staff unequipped -subtitle-fire_shot = Staff fired -subtitle-staff_attack = Staff fired -subtitle-pickup_staff = Staff picked up - -subtitle-wield_sceptre = Sceptre equipped -subtitle-unwield_sceptre = Sceptre unequipped -subtitle-sceptre_heal = Sceptre heal aura -subtitle-pickup_sceptre = Sceptre picked up - -subtitle-wield_dagger = Dagger equipped -subtitle-uwield_dagger = Dagger unequipped -subtitle-dagger_attack = Dagger swung -subtitle-pickup_dagger = Dagger picked up - -subtitle-wield_shield = Shield equipped -subtitle-unwield_shield = Shield unequipped -subtitle-shield_attack = Shield pushed -subtitle-pickup_shield = Shield picked up - -subtitle-pickup_pick = Pickaxe picked up -subtitle-pickup_gemstone = Gemstone picked up - -subtitle-instrument_organ = Organ playing - -subtitle-wield_instrument = Instrument equipped -subtitle-unwield_instrument = Instrument unequipped -subtitle-instrument_double_bass = Double Bass playing -subtitle-instrument_flute = Flute playing -subtitle-instrument_glass_flute = Glass Flute playing -subtitle-instrument_lyre = Lyre playing -subtitle-instrument_icy_talharpa = Icy Talharpa playing -subtitle-instrument_kalimba = Kalimba playing -subtitle-instrument_melodica = Melodica playing -subtitle-instrument_lute = Lute playing -subtitle-instrument_steeldrum = Steeldrum playing -subtitle-instrument_shamisen = Shamisen playing -subtitle-instrument_sitar = Sitar playing -subtitle-instrument_guitar = Guitar playing -subtitle-instrument_dark_guitar = Dark Guitar playing -subtitle-instrument_washboard = Washboard playing -subtitle-instrument_wildskin_drum = Wildskin Drum playing -subtitle-pickup_instrument = Pickup instrument - -subtitle-explosion = Explosion -subtitle-surprise_egg = Divine Sound - -subtitle-arrow_shot = Arrow released -subtitle-arrow_miss = Arrow miss -subtitle-arrow_hit = Arrow hit -subtitle-skill_point = Skill Point gained -subtitle-sceptre_beam = Sceptre beam -subtitle-flame_thrower = Flame thrower -subtitle-break_block = Block destroyed -subtitle-attack_blocked = Attack blocked -subtitle-parry = Parried -subtitle-interrupted = Interrupted -subtitle-stunned = Stunned -subtitle-dazed = Dazed -subtitle-knocked_down = Knocked down - -subtitle-attack-ground_slam = Ground slam -subtitle-attack-laser_beam = Laser beam -subtitle-attack-cyclops_charge = Cyclops charge -subtitle-attack-fuse_charge = Fuse sizzling -subtitle-giga_roar = Frost gigas roar -subtitle-deep_laugh = Deep Laugh -subtitle-bleep = Beep Bleep -subtitle-attack-flash_freeze = Flash freeze -subtitle-attack-icy_spikes = Icy spikes -subtitle-attack-ice_crack = Ice crack -subtitle-attack-steam = Steam -subtitle-attack-shovel = Shovel digging -subtitle-attack-from-the-ashes = Heal Sound - -subtitle-consume_potion = Drinking potion -subtitle-consume_apple = Eating apple -subtitle-consume_cheese = Eating cheese -subtitle-consume_food = Eating -subtitle-consume_liquid = Drinking - -subtitle-utterance-alligator-angry = Alligator hissing -subtitle-utterance-antelope-angry = Antelope snorting -subtitle-utterance-biped_large-angry = Heavy grunting -subtitle-utterance-bird-angry = Bird screeching -subtitle-utterance-adlet-angry = Adlet barking -subtitle-utterance-pig-angry = Pig grunting -subtitle-utterance-reptile-angry = Reptile hissing -subtitle-utterance-sea_crocodile-angry = Sea Crocodile hissing -subtitle-utterance-saurok-angry = Saurok hissing -subtitle-utterance-cat-calm = Cat meowing -subtitle-utterance-cow-calm = Cow mooing -subtitle-utterance-fungome-calm = Fungome squeaking -subtitle-utterance-goat-calm = Goat bleating -subtitle-utterance-pig-calm = Pig oinking -subtitle-utterance-sheep-calm = Sheep bleating -subtitle-utterance-truffler-calm = Truffler oinking -subtitle-utterance-human-greeting = Greeting -subtitle-utterance-adlet-hurt = Adlet whining -subtitle-utterance-antelope-hurt = Antelope crying -subtitle-utterance-biped_large-hurt = Heavy hurting -subtitle-utterance-human-hurt = Human hurting -subtitle-utterance-lion-hurt = Lion growling -subtitle-utterance-mandroga-hurt = Mandroga screaming -subtitle-utterance-maneater-hurt = Maneater burping -subtitle-utterance-marlin-hurt = Marlin hurting -subtitle-utterance-mindflayer-hurt = Mindflayer hurting -subtitle-utterance-dagon-hurt = Dagon hurting -subtitle-utterance-asp-angry = Asp hissing -subtitle-utterance-asp-calm = Asp croaking -subtitle-utterance-asp-hurt = Asp hurting -subtitle-utterance-wendigo-angry = Wendigo screaming -subtitle-utterance-wendigo-calm = Wendigo mumbling -subtitle-utterance-wolf-angry = Wolf growling -subtitle-utterance-wolf-hurt = Wolf whining -subtitle-utterance-wyvern-angry = Wyvern roaring -subtitle-utterance-wyvern-hurt = Wyvern hurting -subtitle-utterance-phoenix-angry = Phoenix screaming -subtitle-utterance-phoenix-hurt = Phoenix hurting diff --git a/assets/voxygen/i18n/en/hud/trade.ftl b/assets/voxygen/i18n/en/hud/trade.ftl deleted file mode 100644 index 7ff75ae..0000000 --- a/assets/voxygen/i18n/en/hud/trade.ftl +++ /dev/null @@ -1,32 +0,0 @@ -hud-trade-trade_window = Trade -hud-trade-phase1_description = - Drag the items you want to trade - into the corresponding area. -hud-trade-phase2_description = - The trade is now locked to give you - time to review it. -hud-trade-phase3_description = Trade is being processed. -hud-trade-persons_offer = Offer from { $playername } -hud-trade-has_accepted = - { $playername } - has accepted -hud-trade-accept = Accept -hud-trade-decline = Decline -hud-trade-invite_sent = Trade request sent to { $playername }. -hud-trade-result-completed = Trade completed successfully. -hud-trade-result-declined = Trade declined. -hud-trade-result-nospace = Not enough space to complete the trade. -hud-trade-buy = Buy Price: { $coin_num -> - [1] one coin - *[other] { $coin_formatted } coins -} -hud-trade-sell = Sell Price: { $coin_num -> - [1] one coin - *[other] { $coin_formatted } coins -} -hud-trade-tooltip_hint_1 = -hud-trade-tooltip_hint_2 = -hud-trade-your_offer = Your offer -hud-trade-their_offer = Their offer -hud-trade-amount_input = Select an item -hud-confirm-trade-for-nothing = Really give away these items in exchange for nothing? diff --git a/assets/voxygen/i18n/en/main.ftl b/assets/voxygen/i18n/en/main.ftl deleted file mode 100644 index cd4429a..0000000 --- a/assets/voxygen/i18n/en/main.ftl +++ /dev/null @@ -1,112 +0,0 @@ -main-username = Username -main-server = Server -main-password = Password -main-connecting = Connecting -main-creating_world = Creating world -main-tip = Tip: -main-unbound_key_tip = unbound -main-notice = - Welcome to the alpha version of Veloren! - - Before you dive into the fun, please keep a few things in mind: - - - This is a very early alpha. Expect bugs, extremely unfinished gameplay, unpolished mechanics, and missing features. - - - If you have constructive feedback or bug reports, you can contact us on our GitLab repository and on our Discord or Matrix server. - - - Veloren is open source. You are free to play, modify, and redistribute the game in accordance to version 3 of the GNU General Public license. - - - Veloren is a non-profit community project, and everybody working on it is a volunteer. - If you like what you see, you are welcome to join any of our working groups! - - Thanks for taking the time to read this notice, we hope you enjoy the game! - - ~ The development team -main-login_process = - About multiplayer mode: - - Please note that you need an account to play on servers with authentication enabled. - - You can create an account at: - https://veloren.net/account/ -main-singleplayer-new = New -main-singleplayer-delete = Delete -main-singleplayer-regenerate = Regenerate -main-singleplayer-create_custom = Create Custom -main-singleplayer-invalid_name = Error: Invalid name -main-singleplayer-seed = Seed -main-singleplayer-day_length = Day duration -main-singleplayer-random_seed = Random -main-singleplayer-size_lg = Logarithmic size -main-singleplayer-map_large_warning = Warning: Large worlds will take a long time to start for the first time. -main-singleplayer-world_name = World name -main-singleplayer-map_scale = Vertical scaling -main-singleplayer-map_erosion_quality = Erosion quality -main-singleplayer-map_shape = Shape -main-singleplayer-play = Play -main-singleplayer-generate_and_play = Generate & Play -menu-singleplayer-confirm_delete = Are you sure you want to delete "{ $world_name }"? -menu-singleplayer-confirm_regenerate = Are you sure you want to regenerate "{ $world_name }"? -main-login-server_not_found = Server not found. -main-login-authentication_error = Authentication error on server. -main-login-internal_error = Internal error on client. Hint: The player character might have been deleted. -main-login-failed_auth_server_url_invalid = Failed to connect to authentication server. -main-login-insecure_auth_scheme = The HTTP authentication scheme is not supported. It's insecure! For development purposes, HTTP is allowed for 'localhost' or debug builds. -main-login-server_full = Server is full. -main-login-untrusted_auth_server = Authentication server not trusted. -main-login-outdated_client_or_server = ServerWentMad: Probably versions are incompatible, check for updates. -main-login-timeout = Timeout: Server did not respond in time. Hint: the server might be currently overloaded or there are issues on the network. -main-login-server_shut_down = Server shut down. -main-login-network_error = Network error. -main-login-network_wrong_version = Mismatched server and client version. Hint: You might need to update your game client. -main-login-failed_sending_request = Request to authentication server failed. -main-login-invalid_character = The selected character is invalid. -main-login-client_crashed = Client crashed. -main-login-not_on_whitelist = You are not a member in the whitelist of the server you have attempted to join. -main-login-banned = You have been banned with the following reason: -main-login-kicked = You have been kicked with the following reason: -main-login-select_language = Select a language -main-login-client_version = Client version -main-login-server_version = Server version -main-login-client_init_failed = Client failed to initialize: { $init_fail_reason } -main-login-username_bad_characters = Username contains invalid characters! (Only alphanumeric, '_' and '-' are allowed). -main-login-username_too_long = Username is too long! Max length is: { $max_len } -main-servers-select_server = Select a server -main-servers-singleplayer_error = Failed to connect to internal server: { $sp_error } -main-servers-network_error = Server network/socket error: { $raw_error } -main-servers-participant_error = Participant disconnect/protocol error: { $raw_error } -main-servers-stream_error = Client connection/compression/(de)serialization error: { $raw_error } -main-servers-database_error = Server database error: { $raw_error } -main-servers-persistence_error = Server persistence error (Probably Asset/Character Data related): { $raw_error } -main-servers-other_error = Server general error: { $raw_error } -main-server-rules = This server has rules that must be accepted. -main-server-rules-seen-before = These rules have changed since the last time you accepted them. -main-credits = Credits -main-credits-created_by = created by -main-credits-music = Music -main-credits-fonts = Fonts -main-credits-other_art = Other Art -main-credits-contributors = Contributors -loading-tips = - .a0 = Press '{ $gameinput-togglelantern }' to light your lantern. - .a1 = Press '{ $gameinput-help }' to see all default key bindings. - .a2 = You can type /say or /s to only chat with players directly around you. - .a3 = You can type /region or /r to only chat with players a couple of hundred blocks around you. - .a4 = Admins can use the /build command to enter build mode. - .a5 = You can type /group or /g to only chat with players in your current group. - .a6 = To send private messages type /tell followed by a player name and your message. - .a7 = Keep an eye out for food, chests and other loot spread all around the world! - .a8 = Inventory filled with food? Try crafting better food from it! - .a9 = Wondering what there is to do? Try out one of the dungeons marked on the map! - .a10 = Don't forget to adjust the graphics for your system. Press '{ $gameinput-settings }' to open the settings. - .a11 = Playing with others is fun! Press '{ $gameinput-social }' to see who is online. - .a12 = Press '{ $gameinput-dance }' to dance. Party! - .a13 = Press '{ $gameinput-glide }' to open your Glider and conquer the skies. - .a14 = Veloren is still in Pre-Alpha. We do our best to improve it every day! - .a15 = If you want to join the dev team or just have a chat with us, join our Discord server. - .a16 = You can toggle showing your amount of health on the health bar in the settings. - .a17 = Sit near a campfire (with the '{ $gameinput-sit }' key) to slowly recover from your injuries. - .a18 = Need more bags or better armor to continue your journey? Press '{ $gameinput-crafting }' to open the crafting menu! - .a19 = Press '{ $gameinput-roll }' to roll. Rolling can be used to move faster and dodge enemy attacks. - .a20 = Wondering what an item is used for? Search 'input:' in crafting to see what recipes it's used in. - .a21 = You can take screenshots with '{ $gameinput-screenshot }'. diff --git a/assets/voxygen/i18n/en/npc.ftl b/assets/voxygen/i18n/en/npc.ftl deleted file mode 100644 index 60e691c..0000000 --- a/assets/voxygen/i18n/en/npc.ftl +++ /dev/null @@ -1,325 +0,0 @@ -## Generic NPC messages - -npc-speech-villager = - .a0 = I love cheese. -npc-speech-villager_open = - .a0 = I wonder what the Catoblepas thinks when it eats grass. - .a1 = What do you suppose makes Glowing Remains glow? - .a2 = Have you ever heard of the ferocious Land Sharks? I hear they live in deserts. - .a3 = I wonder what is on the other side of the mountains. - .a4 = I left some cheese with my sibling. Now I don't know if it exists or not. I call it Schrödinger's cheese. - .a5 = Have you ever caught a firefly? - .a6 = They say shiny gems of all kinds can be found in caves. - .a7 = I just can't understand where those sauroks keep coming from. -npc-speech-villager_adventurous = - .a0 = I hope to make my own glider someday. - .a1 = I'd like to go spelunking in a cave when I'm stronger. -npc-speech-villager_closed = - .a0 = You're not from around here are you? - .a2 = They say mushrooms are good for your health. Never eat them myself. - .a3 = To be, or not to be? I think I'll be a farmer. -npc-speech-villager_conscientious = - .a0 = I keep busy. There's always something to do. - .a1 = I hope it rains soon. Would be good for the crops. -npc-speech-villager_busybody = - .a0 = People should talk less and work more. -npc-speech-villager_unconscientious = - .a0 = I think it's time for second breakfast! - .a1 = I wish was my house wasn't such a mess. But then I'd have to tidy up! Haha! - .a2 = Now where did I leave that thing... -npc-speech-villager_extroverted = - .a0 = You won't believe what I did this weekend! - .a1 = Top of the morning to you! - .a2 = What do you think about this weather? - .a3 = I'm just crackers about cheese! - .a4 = Don't forget the crackers! - .a5 = I simply adore dwarven cheese. I wish I could make it. - .a6 = I had a wonderful dream about cheese last night. What does it mean? - .a7 = I love honey! And I hate bees. -npc-speech-villager_sociable = - .a0 = Won't you come in? We were just about to have some cheese! - .a1 = Would you like to see my garden? Okay, maybe some other time. -npc-speech-villager_introverted = - .a0 = Hi. - .a1 = Oh me? I'm nothing special. -npc-speech-villager_agreeable = - .a0 = How are you today? - .a1 = Just tell me if you need anything. - .a2 = Have you seen my cat? -npc-speech-villager_worried = - .a0 = Be careful, alright? There are so many dangers out there. -npc-speech-villager_disagreeable = - .a0 = I say it like it is. If people don't like that, too bad. - .a1 = People are too easily offended. -npc-speech-villager_neurotic = - .a0 = Thinking about those dungeons makes me scared. I hope someone will clear them out. - .a1 = Someone should do something about those cultists. Preferably not me. - .a2 = I have the feeling something bad will happen. - .a3 = I wish someone would keep the wolves away from the village. -npc-speech-villager_sad_loner = - .a0 = I'm so lonely. - .a1 = ... Sorry about this awkward silence. I'm not so good with people. -npc-speech-villager_seeker = - .a0 = I want to see the world one day. There's got to be more to life than this village. -npc-speech-villager_stable = - .a0 = Isn't it such a lovely day? - .a1 = Life's not too bad. - .a2 = Lovely day for a stroll in the woods! -npc-speech-villager_decline_trade = - .a0 = Sorry, I don't have anything to trade. - .a1 = Trade? Like I got anything that may interest you. - .a2 = My house is mine, I won't trade it for anything. -npc-speech-villager_busy = - .a0 = Sorry, I can't speak with you right now. - .a1 = We'll talk later, I'm busy. -npc-speech-merchant_advertisement = - .a0 = Can I interest you in a trade? - .a1 = Do you want to trade with me? - .a2 = I have plenty of goods. Do you want to take a look? -npc-speech-merchant_busy = - .a0 = Please wait, I'm only one person. - .a1 = Just a moment, let me finish. - .a2 = I'm busy, come back later. -npc-speech-merchant_busy_rude = - .a0 = Hey, wait your turn. - .a1 = Do you see the other person in front of you? - .a2 = No cutting in line. -npc-speech-merchant_trade_successful = - .a0 = Thank you for trading with me! - .a1 = Thank you! -npc-speech-merchant_trade_declined = - .a0 = Maybe another time, have a good day! - .a1 = Too bad, maybe next time, then! -npc-speech-merchant_trade_cancelled_hostile = - .a0 = Sorry to cut it short, we have a problem to solve here! - .a1 = We'll trade later, I need to take care of this first! -npc-speech-ambush = - .a0 = It's unwise to travel alone! - .a1 = Like stealing candy from a baby! -npc-speech-villager_cultist_alarm = - .a0 = Lookout! There is a cultist on the loose! - .a1 = To arms! The cultists are attacking! - .a2 = How dare the cultists attack our village! - .a3 = Death to the cultists! - .a4 = Cultists will not be tolerated here! - .a5 = Murderous cultist! - .a6 = Taste the edge of my sword, you dirty cultist! - .a7 = Nothing can clean the blood from your hands, cultist! - .a8 = Billions of blistering blue barnacles! A cultist among us! - .a9 = The evils of this cultist are about to be over! - .a10 = This cultist is mine! - .a11 = Prepare to meet your maker, foul cultist! - .a12 = I see a cultist! Get them! - .a13 = I see a cultist! Attack! - .a14 = I see a cultist! Don't let them escape! - .a15 = Would the most honorable cultist care for some DEATH?! - .a16 = Never forgive! Never forget! Cultist, regret! - .a17 = Die, cultist! - .a18 = Your reign of terror will seize! - .a19 = Here's for all that you've done! - .a20 = We don't take kindly to your types around here. - .a21 = You should have stayed underground! -npc-speech-villager_under_attack = - .a0 = Help, I'm under attack! - .a1 = Help! I'm under attack! - .a2 = Ouch! I'm under attack! - .a3 = Ouch! I'm under attack! Help! - .a4 = Help me! I'm under attack! - .a5 = I'm under attack! Help! - .a6 = I'm under attack! Help me! - .a7 = Help! - .a8 = Help! Help! - .a9 = Help! Help! Help! - .a10 = I'm under attack! - .a11 = AAAHHH! I'm under attack! - .a12 = AAAHHH! I'm under attack! Help! - .a13 = Help! We're under attack! - .a14 = Help! Murderer! - .a15 = Help! There's a murderer on the loose! - .a16 = Help! They're trying to kill me! - .a17 = Guards, I'm under attack! - .a18 = Guards! I'm under attack! - .a19 = I'm under attack! Guards! - .a20 = Help! Guards! I'm under attack! - .a21 = Guards! Come quick! - .a22 = Guards! Guards! - .a23 = Guards! There's a villain attacking me! - .a24 = Guards, slay this foul villain! - .a25 = Guards! There's a murderer! - .a26 = Guards! Help me! - .a27 = You won't get away with this! Guards! - .a28 = You fiend! - .a29 = Help me! - .a30 = Help! Please! - .a31 = Ouch! Guards! Help! - .a32 = They're coming for me! - .a33 = Help! Help! I'm being repressed! - .a34 = Ah, now we see the violence inherent in the system. - .a35 = 'Tis but a scratch! - .a36 = Stop that! - .a37 = What did I ever do to you?! - .a38 = Please stop attacking me! - .a39 = Hey! Watch where you point that thing! - .a40 = Heinous wretch, be gone with you! - .a41 = Stop it! Go away! - .a42 = Now you're making me mad! - .a43 = Oi! Who do you think you are?! - .a44 = I'll have your head for that! - .a45 = Stop, please! I carry nothing of value! - .a46 = I'll set my brother on you, he's bigger than I am! - .a47 = Nooo, I'm telling mother! - .a48 = Curse you! - .a49 = Please don't do that. - .a50 = That wasn't very nice! - .a51 = Your weapon works, you can put it away now! - .a52 = Spare me! - .a53 = Please, I have a family! - .a54 = I'm too young to die! - .a55 = Can we talk about this? - .a56 = Violence is never the answer! - .a57 = Today is turning out to be a very bad day... - .a58 = Hey, that hurt! - .a59 = Eek! - .a60 = How rude! - .a61 = Stop, I beg you! - .a62 = A pox upon you! - .a63 = This isn't fun. - .a64 = How dare you?! - .a65 = You'll pay for that! - .a66 = Keep that up and you'll be sorry! - .a67 = Don't make me hurt you! - .a68 = There must be some misunderstanding! - .a69 = You don't need to do this! - .a70 = Be gone, fiend! - .a71 = That really hurt! - .a72 = Why would you do that? - .a73 = By the spirits, cease! - .a74 = You must have me confused with someone else! - .a75 = I don't deserve this! - .a76 = Please don't do that again. - .a77 = Guards, throw this monster in the lake! - .a78 = I'll set my tarasque on you! - .a79 = Why meeeeeee? -npc-speech-villager_enemy_killed = - .a0 = I have destroyed my enemy! - .a1 = Finally at peace! - .a2 = ... now what was I doing? -npc-speech-menacing = - .a0 = I'm warning you! - .a1 = Any closer and I'll attack! - .a2 = You don't scare me! - .a3 = Get away from here! - .a4 = Turn around if you want to live! - .a5 = You're not welcome here! -npc-speech-cultist_low_health_fleeing = - .a0 = Retreat for the cause! - .a1 = Retreat! - .a2 = Curse you! - .a3 = I will curse you in the afterlife! - .a4 = I must rest! - .a5 = They're too strong! -npc-speech-prisoner = - .a0 = Please find the key! - .a1 = Being trapped is no fun. - .a2 = That Cardinal can't be trusted. - .a3 = These Clerics are up to no good. -npc-speech-moving_on = - .a0 = I've spent enough time here, onward to { $site }! -npc-speech-migrating = - .a0 = I'm no longer happy living here. Time to migrate to { $site }. - .a1 = Time to move to { $site }, I've had it with this place. -npc-speech-night_time = - .a0 = It's dark, time to head home. - .a1 = I'm tired. - .a2 = My bed beckons! -npc-speech-day_time = - .a0 = A new day begins! - .a1 = I never liked waking up... -npc-speech-start_hunting = - .a0 = Time to go hunting! -npc-speech-guard_thought = - .a0 = My brother's out fighting ogres. What do I get? Guard duty... - .a1 = Just one more patrol, then I can head home. - .a2 = No bandits are going to get past me. -npc-speech-merchant_sell_undirected = - .a0 = All my goods are of the highest quality! - .a1 = Does anybody want to buy my wares? - .a2 = I've got the best offers in town. - .a3 = Looking for supplies? I've got you covered. -npc-speech-merchant_sell_directed = - .a0 = You there! Are you in need of a new thingamabob? - .a1 = Are you hungry? I'm sure I've got some cheese you can buy. - .a2 = You look like you could do with some new armour! - -## NPC site hints -## Available variables: -## - $dir references npc-speech-dir-* variables below -## - $dist references npc-speech-dist-* variables below -## - $site represents hard-coded site in the world - -npc-speech-tell_site = - .a0 = There's { $site } { $dir } of here. Have you visited it? - .a1 = You should visit { $site } some time. - .a2 = If you travel { $dist } { $dir }, you can get to { $site }. - .a3 = { $dir } you'll find { $site }, it's { $dist }. - -npc-speech-site = - .a0 = Don't you think our village is the best? - .a1 = Welcome to { $site } ! - .a2 = { $site } is a pleasant village to live in. - -## NPC monster hints -## Available variables: -## - $dir references npc-speech-dir-* variables below -## - $dist references npc-speech-dist-* variables below -## - $body references body-npc-speech-* variables in `body` component - -npc-speech-tell_monster = - .a0 = They say there's { $body } { $dir }, { $dist }... - .a1 = You think you're tough? There's { $body } { $dir }. - -## Direction hints, used ONLY in npc-speech-tell* above - -npc-speech-dir_north = to the north -npc-speech-dir_north_east = to the north-east -npc-speech-dir_east = to the east -npc-speech-dir_south_east = to the south-east -npc-speech-dir_south = to the south -npc-speech-dir_south_west = to the south-west -npc-speech-dir_west = to the west -npc-speech-dir_north_west = to the north-west - -## Distance hints, used ONLY in npc-speech-tell* above - -npc-speech-dist_very_far = very far away -npc-speech-dist_far = far away -npc-speech-dist_ahead = some way away -npc-speech-dist_near = nearby -npc-speech-dist_near_to = very close - -## NPC proposals - -npc-speech-arena = Let's sit over there! - -## NPC reactions - -npc-speech-witness_murder = - .a0 = Murderer! - .a1 = How could you do this? - .a2 = Aaargh! -npc-speech-witness_enemy_murder = - .a0 = My Hero! - .a1 = Finally someone did it! - .a2 = Yeaah! -npc-speech-witness_death = - .a0 = No! - .a1 = This is terrible! - .a2 = Oh my goodness! -npc-speech-welcome-aboard = - .a0 = Welcome aboard! - .a1 = Can I see your ticket... just kidding it's free! - .a2 = Have a nice ride! -npc-speech-night = - .a0 = Lanterns are handy for getting around at night! - .a1 = I hope we are alone in the dark... - .a2 = Boo! From ed2fc13217816f8e8a367d2c183206bbedfe2ba7 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 2 Sep 2024 01:11:47 -0400 Subject: [PATCH 4/4] Add Changelog to README; Remove /world announcements --- Cargo.lock | 703 ++++++++++-------- README.md | 24 +- .../common/abilities/ability_set_manifest.ron | 3 +- .../custom/harvester/ensnaringvines_dense.ron | 10 + .../harvester/ensnaringvines_sparse.ron | 10 + .../custom/harvester/explodingpumpkin.ron | 10 +- .../abilities/custom/harvester/firebreath.ron | 8 +- .../abilities/custom/harvester/scythe.ron | 14 +- .../abilities/custom/mandragora/basic.ron | 2 +- .../abilities/custom/mandragora/scream.ron | 2 +- .../abilities/custom/woodgolem/shockwave.ron | 12 +- .../abilities/custom/woodgolem/spin.ron | 10 +- .../abilities/custom/woodgolem/strike.ron | 10 +- .../gnarling/chieftain/firebarrage.ron | 14 +- .../gnarling/chieftain/fireshockwave.ron | 14 +- .../gnarling/chieftain/flamestrike.ron | 14 +- .../common/abilities/gnarling/totem/green.ron | 18 +- .../common/abilities/gnarling/totem/red.ron | 14 +- .../common/abilities/gnarling/totem/white.ron | 14 +- .../entity/dungeon/gnarling/chieftain.ron | 2 +- assets/common/item_i18n_manifest.ron | 3 + .../items/armor/misc/head/gnarling_mask.ron | 4 +- assets/common/items/charms/burning_charm.ron | 2 +- assets/common/items/charms/frozen_charm.ron | 2 +- .../common/items/charms/lifesteal_charm.ron | 2 +- .../items/consumable/potion_combustion.ron | 10 +- .../items/consumable/potion_freezing.ron | 27 + assets/common/items/glider/moth.ron | 2 +- assets/common/items/lantern/pumpkin.ron | 2 +- assets/common/items/recipes/potions.ron | 1 + .../dungeon/gnarling/chieftain.ron | 22 +- .../dungeon/gnarling/harvester.ron | 19 +- .../dungeon/gnarling/woodgolem.ron | 18 +- .../dungeon/sea_chapel/chest_coral.ron | 2 +- .../dungeon/sea_chapel/sea_cleric.ron | 4 +- .../loot_tables/sprite/chest-buried.ron | 2 +- assets/common/loot_tables/sprite/chest.ron | 15 +- assets/common/npc_names.ron | 4 + assets/common/recipe_book_manifest.ron | 9 + .../common/trading/item_price_calculation.ron | 5 +- assets/common/trading/item_price_equality.ron | 49 +- assets/common/trading/unsellable_recipe.ron | 60 +- config/config.toml | 1 + src/bot.rs | 106 +-- 44 files changed, 750 insertions(+), 529 deletions(-) create mode 100644 assets/common/abilities/custom/harvester/ensnaringvines_dense.ron create mode 100644 assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron create mode 100644 assets/common/items/consumable/potion_freezing.ron diff --git a/Cargo.lock b/Cargo.lock index 2b32976..dbcd715 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.4.8" @@ -68,9 +74,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -83,33 +89,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -148,24 +154,25 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assets_manager" -version = "0.11.6" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dde42f7d78f1a1d0149ac8526e21c6c849090ce6aa191ae94b90b0cb2e4aed" +checksum = "eadb8d5c3ec796630a35133c038842b02bcfc2a8a324349fc24fd6db5d679474" dependencies = [ "ahash 0.8.11", "bincode", + "hashbrown 0.14.5", "log", "ron", "serde", @@ -186,13 +193,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -245,15 +252,15 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -287,9 +294,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -334,9 +341,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -345,16 +352,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] [[package]] name = "cesu8" @@ -380,7 +396,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -408,9 +424,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" @@ -433,9 +449,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -449,15 +465,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -547,14 +563,14 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -562,26 +578,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -635,7 +651,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -664,9 +680,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elapsed" @@ -683,7 +699,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -704,35 +720,35 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -740,9 +756,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -789,9 +805,9 @@ dependencies = [ [[package]] name = "fixed" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" +checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a" dependencies = [ "az", "bytemuck", @@ -802,12 +818,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -828,7 +844,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -928,7 +944,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -972,11 +988,11 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223" dependencies = [ - "cc", + "cfg-if", "libc", "log", "rustversion", @@ -1144,9 +1160,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1154,12 +1170,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1167,9 +1183,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -1179,9 +1195,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1216,9 +1232,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1245,7 +1261,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1285,12 +1301,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "zune-core", @@ -1299,9 +1315,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1352,18 +1368,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1402,18 +1409,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "kiddo" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2f8d9e1bc7c6919ad2cdc83472a9a4b5ed2ea2c5392c9514fdf958a7920f9a" +checksum = "60c5fcd3044b774e2c80a502b2387b75d1baa95e99b2bceeb5db00f2e2d27fe9" dependencies = [ "az", "divrem", @@ -1422,7 +1429,7 @@ dependencies = [ "fixed", "generator", "init_with", - "itertools 0.12.1", + "itertools", "log", "num-traits", "ordered-float", @@ -1434,15 +1441,15 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libredox" @@ -1450,7 +1457,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1491,7 +1498,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "culpa", "thiserror", @@ -1522,9 +1529,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minimal-lexical" @@ -1534,23 +1541,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mio" -version = "0.8.11" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1621,9 +1638,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -1646,7 +1663,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1701,9 +1718,9 @@ dependencies = [ [[package]] name = "object" -version = "0.35.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -1722,9 +1739,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" dependencies = [ "num-traits", ] @@ -1761,7 +1778,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1840,7 +1857,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1865,14 +1882,17 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-hack" @@ -1888,9 +1908,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1917,16 +1937,17 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -1934,14 +1955,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", "rustls-platform-verifier", "slab", @@ -1952,9 +1973,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -1965,9 +1986,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2039,18 +2060,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2059,9 +2080,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2071,9 +2092,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2082,9 +2103,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "resolv-conf" @@ -2118,7 +2139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -2153,19 +2174,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustc-hash" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustls" -version = "0.23.9" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -2177,9 +2204,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -2190,9 +2217,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -2200,15 +2227,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-platform-verifier" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ "core-foundation", "core-foundation-sys", @@ -2227,15 +2254,15 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -2280,11 +2307,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2294,9 +2321,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2325,31 +2352,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2362,14 +2390,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2394,6 +2422,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "shred" version = "0.16.1" @@ -2515,11 +2549,11 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spin_sleep" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f" +checksum = "64bd7227d85bfd1b8df51e0d83da36d9baaee85eb75730386ef8e3ab6f2a2ea3" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2547,14 +2581,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_type" @@ -2575,9 +2609,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2592,22 +2626,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2640,9 +2674,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2655,30 +2689,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2705,9 +2738,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2717,18 +2750,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -2754,15 +2787,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2784,7 +2817,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2877,7 +2910,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -2939,9 +2972,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -2956,9 +2989,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -2986,7 +3019,7 @@ dependencies = [ [[package]] name = "veloren-client" version = "0.16.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "authc", "byteorder", @@ -3012,7 +3045,7 @@ dependencies = [ [[package]] name = "veloren-client-i18n" version = "0.13.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "deunicode", "fluent", @@ -3030,10 +3063,10 @@ dependencies = [ [[package]] name = "veloren-common" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "approx", - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "chrono-tz", "crossbeam-utils", @@ -3042,7 +3075,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "indexmap", - "itertools 0.13.0", + "itertools", "lazy_static", "num-derive", "num-traits", @@ -3070,7 +3103,7 @@ dependencies = [ [[package]] name = "veloren-common-assets" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "assets_manager", "dot_vox", @@ -3085,7 +3118,7 @@ dependencies = [ [[package]] name = "veloren-common-base" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "directories-next", "tracing", @@ -3094,7 +3127,7 @@ dependencies = [ [[package]] name = "veloren-common-ecs" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "specs", "tracing", @@ -3104,7 +3137,7 @@ dependencies = [ [[package]] name = "veloren-common-i18n" version = "0.1.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "hashbrown 0.14.5", "rand", @@ -3114,7 +3147,7 @@ dependencies = [ [[package]] name = "veloren-common-net" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "bincode", "flate2", @@ -3132,7 +3165,7 @@ dependencies = [ [[package]] name = "veloren-common-state" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-trait", "bytes", @@ -3154,9 +3187,9 @@ dependencies = [ [[package]] name = "veloren-common-systems" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ - "itertools 0.13.0", + "itertools", "ordered-float", "rand", "rayon", @@ -3172,7 +3205,7 @@ dependencies = [ [[package]] name = "veloren-network" version = "0.3.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-channel", "async-trait", @@ -3197,10 +3230,10 @@ dependencies = [ [[package]] name = "veloren-network-protocol" version = "0.6.1" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "hashbrown 0.14.5", "prometheus", @@ -3211,7 +3244,7 @@ dependencies = [ [[package]] name = "veloren-world" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "arr_macro", "bincode", @@ -3222,7 +3255,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "image", - "itertools 0.13.0", + "itertools", "kiddo", "lazy_static", "noise", @@ -3243,9 +3276,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3274,34 +3307,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3309,22 +3343,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wavefront" @@ -3337,9 +3371,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -3368,11 +3402,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3383,11 +3417,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -3396,7 +3431,61 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3414,7 +3503,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3434,18 +3532,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3456,9 +3554,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3468,9 +3566,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3480,15 +3578,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3498,9 +3596,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3510,9 +3608,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3522,9 +3620,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3534,15 +3632,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -3568,22 +3666,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3600,9 +3699,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/README.md b/README.md index 1f3c424..b33012f 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,13 @@ The bot is able to respond to the following commands, which must be sent via "/t search term. - `admin_access`: Admin-only, prompts the bot to send a trade invite to the sender, after which it will give away and accept any items until the trade ends. -- `announce`: Admin-only, sends the announcement message to "/world". This will reset the +- `announce`: Admin-only, sends the announcement message to "/region". This will reset the announcement timer to 45 minutes. +- `location`: Returns the bot's current town or, if it is not in a town, its current position. - `sort [count (optional)]`: Admin-only, sorts the inventory once or the given number of times. - `pos [x] [y] [z]`: Admin-only, sets the bot's desired position where it will try to stand (must - be close to the bot's current position) -- `ori [0-360]`: Admin-only, sets the bot's desired orientation (or facing direction) + be close to the bot's current position). +- `ori [0-360]`: Admin-only, sets the bot's desired orientation (or facing direction). ## Prerequisites @@ -94,10 +95,8 @@ position = [0, 0, 0] # Its orientation can be changed in-game with the "ori" command. orientation = 0 -# Optional. Announcements are sent every 45 minutes. Use {location} to insert the bot's current -# location. If not set, the bot will not send /world announcements but will still send /region -# announcements with usage instructions. -announcement = "I love cheese! I am at {location}." +# Optional. Announcements are sent every 45 minutes. If not set, the bot will not make announcements. +announcement = "I love cheese!" # The buy_prices and sell_prices tables are required. The keys are item definition IDs and the # values are the price in coins. You may type in-game "/give_item common.items." and press Tab to @@ -143,6 +142,17 @@ podman build . -t trade_bot Then follow the [above](#running) steps with the tag "trade_bot" instead of "git.jeffa.io/jeff/trade_bot". +## Changelog + +- 9/2/2024: + - Added the "location" command. + - Removed the "{location}" feature from the announcement message. Announcements are now sent to + "/region" so this feature is now used by the "location" command. + - Changed announcements to be sent to "/region" instead of "/world". The moderators on the official + server have asked for this, so please don't run an old version to circumvent the change. + - Removed the "Ouch!" and "That hurt!" messages when the bot is attacked. The moderators have also + asked for this. + ## License This project is licensed under the GPL-3.0 license. See the [LICENSE](LICENSE) file for details. diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 2ee9acf..5ba2cff 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -771,8 +771,9 @@ primary: Simple(None, "common.abilities.custom.harvester.scythe"), secondary: Simple(None, "common.abilities.custom.harvester.firebreath"), abilities: [ - Simple(None, "common.abilities.custom.harvester.ensnaringvines"), Simple(None, "common.abilities.custom.harvester.explodingpumpkin"), + Simple(None, "common.abilities.custom.harvester.ensnaringvines_sparse"), + Simple(None, "common.abilities.custom.harvester.ensnaringvines_dense"), ], ), // TODO: Allow ability sets to expand other ability sets diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron new file mode 100644 index 0000000..6c008eb --- /dev/null +++ b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron @@ -0,0 +1,10 @@ +SpriteSummon( + buildup_duration: 0.9, + cast_duration: 0.6, + recover_duration: 0.5, + sprite: EnsnaringVines, + del_timeout: None, + summon_distance: (0, 25), + sparseness: 0.6, + angle: 360, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron new file mode 100644 index 0000000..0cf61ff --- /dev/null +++ b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron @@ -0,0 +1,10 @@ +SpriteSummon( + buildup_duration: 0.6, + cast_duration: 0.4, + recover_duration: 0.3, + sprite: EnsnaringVines, + del_timeout: None, + summon_distance: (0, 30), + sparseness: 0.8, + angle: 360, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/harvester/explodingpumpkin.ron b/assets/common/abilities/custom/harvester/explodingpumpkin.ron index eb83e29..3af60d0 100644 --- a/assets/common/abilities/custom/harvester/explodingpumpkin.ron +++ b/assets/common/abilities/custom/harvester/explodingpumpkin.ron @@ -1,21 +1,21 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.75, + buildup_duration: 1.0, recover_duration: 1.6, projectile: ( kind: Explosive( - radius: 5, + radius: 7.2, min_falloff: 0.6, reagent: Some(Red), terrain: Some((5, Black)), ), attack: Some(( - damage: 37.5, - knockback: Some(25), + damage: 20, + knockback: Some(22), energy: 0, buff: Some(( kind: Burning, - dur_secs: 5, + dur_secs: 4, strength: DamageFraction(0.2), chance: 1.0, )), diff --git a/assets/common/abilities/custom/harvester/firebreath.ron b/assets/common/abilities/custom/harvester/firebreath.ron index 21659fa..640c87f 100644 --- a/assets/common/abilities/custom/harvester/firebreath.ron +++ b/assets/common/abilities/custom/harvester/firebreath.ron @@ -2,18 +2,18 @@ BasicBeam( buildup_duration: 1.4, recover_duration: 0.9, beam_duration: 1.0, - damage: 9.0, + damage: 5.0, tick_rate: 1.5, range: 20.0, max_angle: 15.0, damage_effect: Some(Buff(( kind: Burning, - dur_secs: 10.0, - strength: DamageFraction(1.0), + dur_secs: 3.0, + strength: DamageFraction(0.8), chance: 1.0, ))), energy_regen: 0, energy_drain: 0, - ori_rate: 0.3, + ori_rate: 0.7, specifier: Flamethrower, ) diff --git a/assets/common/abilities/custom/harvester/scythe.ron b/assets/common/abilities/custom/harvester/scythe.ron index 2a6fd89..64c6871 100644 --- a/assets/common/abilities/custom/harvester/scythe.ron +++ b/assets/common/abilities/custom/harvester/scythe.ron @@ -1,19 +1,19 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.9, - swing_duration: 0.1, + buildup_duration: 1.0, + swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 1.2, + recover_duration: 1.0, melee_constructor: ( kind: Slash( - damage: 21.0, + damage: 15.0, poise: 10.0, knockback: 10.0, energy_regen: 0.0, ), - range: 4.0, - angle: 60.0, + range: 4.5, + angle: 50.0, multi_target: Some(Normal), ), - ori_modifier: 1.0, + ori_modifier: 0.5, ) diff --git a/assets/common/abilities/custom/mandragora/basic.ron b/assets/common/abilities/custom/mandragora/basic.ron index c1b067b..6f32af9 100644 --- a/assets/common/abilities/custom/mandragora/basic.ron +++ b/assets/common/abilities/custom/mandragora/basic.ron @@ -7,7 +7,7 @@ BasicMelee( melee_constructor: ( kind: Bash( damage: 8, - poise: 5, + poise: 10, knockback: 0, energy_regen: 0, ), diff --git a/assets/common/abilities/custom/mandragora/scream.ron b/assets/common/abilities/custom/mandragora/scream.ron index 4b0a4c6..4429282 100644 --- a/assets/common/abilities/custom/mandragora/scream.ron +++ b/assets/common/abilities/custom/mandragora/scream.ron @@ -7,7 +7,7 @@ BasicMelee( melee_constructor: ( kind: SonicWave( damage: 10, - poise: 100, + poise: 75, knockback: 20, energy_regen: 0, ), diff --git a/assets/common/abilities/custom/woodgolem/shockwave.ron b/assets/common/abilities/custom/woodgolem/shockwave.ron index 8ac1c5d..9155a20 100644 --- a/assets/common/abilities/custom/woodgolem/shockwave.ron +++ b/assets/common/abilities/custom/woodgolem/shockwave.ron @@ -1,20 +1,20 @@ Shockwave( energy_cost: 0, - buildup_duration: 3.0, + buildup_duration: 1.2, swing_duration: 0.12, - recover_duration: 2.4, - damage: 60.0, + recover_duration: 1.5, + damage: 22.0, poise_damage: 30, - knockback: (strength: 30.0, direction: TowardsUp), + knockback: (strength: 20.0, direction: TowardsUp), shockwave_angle: 90.0, shockwave_vertical_angle: 90.0, shockwave_speed: 15.0, - shockwave_duration: 2.0, + shockwave_duration: 1.9, dodgeable: Jump, move_efficiency: 0.0, damage_kind: Crushing, specifier: Ground, - ori_rate: 1.0, + ori_rate: 0.9, timing: PostBuildup, emit_outcome: true, ) diff --git a/assets/common/abilities/custom/woodgolem/spin.ron b/assets/common/abilities/custom/woodgolem/spin.ron index 6c31acc..51f8125 100644 --- a/assets/common/abilities/custom/woodgolem/spin.ron +++ b/assets/common/abilities/custom/woodgolem/spin.ron @@ -1,18 +1,18 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.9, + buildup_duration: 1.2, swing_duration: 0.3, hit_timing: 0.6, - recover_duration: 0.6, + recover_duration: 1.2, melee_constructor: ( kind: Bash( - damage: 45, + damage: 18, poise: 30, knockback: 20, energy_regen: 0, ), - range: 7.5, + range: 5.0, angle: 360, ), - ori_modifier: 1.0, + ori_modifier: 0.75, ) diff --git a/assets/common/abilities/custom/woodgolem/strike.ron b/assets/common/abilities/custom/woodgolem/strike.ron index 6ad6159..84437ce 100644 --- a/assets/common/abilities/custom/woodgolem/strike.ron +++ b/assets/common/abilities/custom/woodgolem/strike.ron @@ -1,18 +1,18 @@ BasicMelee( energy_cost: 0, - buildup_duration: 1.6, - swing_duration: 0.1, + buildup_duration: 1.0, + swing_duration: 0.2, hit_timing: 0.6, recover_duration: 1.0, melee_constructor: ( kind: Bash( - damage: 30.0, + damage: 12.0, poise: 25.0, knockback: 15.0, energy_regen: 0.0, ), range: 4.0, - angle: 45.0, + angle: 55.0, ), - ori_modifier: 0.4, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/gnarling/chieftain/firebarrage.ron b/assets/common/abilities/gnarling/chieftain/firebarrage.ron index 9aa511d..faf8479 100644 --- a/assets/common/abilities/gnarling/chieftain/firebarrage.ron +++ b/assets/common/abilities/gnarling/chieftain/firebarrage.ron @@ -1,28 +1,28 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.825, + buildup_duration: 1.0, recover_duration: 0.6, projectile: ( kind: Explosive( - radius: 2, - min_falloff: 0.5, + radius: 3, + min_falloff: 0.7, reagent: Some(Red), terrain: Some((2, Black)) ), attack: Some(( - damage: 13.5, + damage: 5.5, energy: 10, buff: Some(( kind: Burning, - dur_secs: 5, - strength: DamageFraction(0.1), + dur_secs: 3, + strength: DamageFraction(0.3), chance: 0.1, )), )), ), projectile_body: Object(BoltFire), projectile_speed: 25, - num_projectiles: 8, + num_projectiles: 5, projectile_spread: 0.125, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron index 26ce3ab..388630e 100644 --- a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron +++ b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron @@ -1,16 +1,16 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.975, + buildup_duration: 1.2, swing_duration: 0.1, - recover_duration: 0.6, - damage: 30, + recover_duration: 0.8, + damage: 16, poise_damage: 0, - knockback: ( strength: 25, direction: Away), + knockback: ( strength: 15, direction: Away), shockwave_angle: 360, shockwave_vertical_angle: 90, - shockwave_speed: 10, - shockwave_duration: 1, - dodgeable: Roll, + shockwave_speed: 12, + shockwave_duration: 1.0, + dodgeable: Jump, move_efficiency: 0, damage_kind: Energy, specifier: Fire, diff --git a/assets/common/abilities/gnarling/chieftain/flamestrike.ron b/assets/common/abilities/gnarling/chieftain/flamestrike.ron index 300e4f5..00982a7 100644 --- a/assets/common/abilities/gnarling/chieftain/flamestrike.ron +++ b/assets/common/abilities/gnarling/chieftain/flamestrike.ron @@ -1,21 +1,21 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.6, - swing_duration: 0.1, + buildup_duration: 0.75, + swing_duration: 0.4, hit_timing: 0.5, - recover_duration: 0.45, + recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 12, + damage: 9, poise: 10, knockback: 0, energy_regen: 0, ), - range: 7.5, - angle: 60.0, + range: 3.0, + angle: 40.0, damage_effect: Some(Buff(( kind: Burning, - dur_secs: 10.0, + dur_secs: 4.0, strength: DamageFraction(0.5), chance: 0.5, ))), diff --git a/assets/common/abilities/gnarling/totem/green.ron b/assets/common/abilities/gnarling/totem/green.ron index 90da58c..db583e0 100644 --- a/assets/common/abilities/gnarling/totem/green.ron +++ b/assets/common/abilities/gnarling/totem/green.ron @@ -1,24 +1,24 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: Regeneration, - strength: 7.5, - duration: Some(5), + strength: 1, + duration: Some(1), category: Magical, ), ( kind: ProtectingWard, - strength: 0.75, - duration: Some(5), + strength: 0.5, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/abilities/gnarling/totem/red.ron b/assets/common/abilities/gnarling/totem/red.ron index 0e58b9d..62e5c99 100644 --- a/assets/common/abilities/gnarling/totem/red.ron +++ b/assets/common/abilities/gnarling/totem/red.ron @@ -1,18 +1,18 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: OutOfGroup, auras: [ ( kind: Burning, - strength: 0.75, - duration: Some(5), + strength: 1.2, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/abilities/gnarling/totem/white.ron b/assets/common/abilities/gnarling/totem/white.ron index 8b95ed0..3fcde11 100644 --- a/assets/common/abilities/gnarling/totem/white.ron +++ b/assets/common/abilities/gnarling/totem/white.ron @@ -1,18 +1,18 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: Hastened, - strength: 0.75, - duration: Some(5), + strength: 0.4, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/entity/dungeon/gnarling/chieftain.ron b/assets/common/entity/dungeon/gnarling/chieftain.ron index bca94f2..0a840a4 100644 --- a/assets/common/entity/dungeon/gnarling/chieftain.ron +++ b/assets/common/entity/dungeon/gnarling/chieftain.ron @@ -2,7 +2,7 @@ #![enable(implicit_some)] ( name: Name("Gnarling Chieftain"), - body: RandomWith("gnarling"), + body: RandomWith("gnarling_chieftain"), alignment: Alignment(Enemy), loot: LootTable("common.loot_tables.dungeon.gnarling.chieftain"), inventory: ( diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index bd54911..a1434ee 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -3183,6 +3183,9 @@ Simple( "common.items.consumable.potion_minor", ): "object-potion_minor", + Simple( + "common.items.consumable.potion_freezing", + ): "object-potion_freezing", Simple( "common.items.lantern.black_0", ): "lantern-black", diff --git a/assets/common/items/armor/misc/head/gnarling_mask.ron b/assets/common/items/armor/misc/head/gnarling_mask.ron index f6d1318..00b89d2 100644 --- a/assets/common/items/armor/misc/head/gnarling_mask.ron +++ b/assets/common/items/armor/misc/head/gnarling_mask.ron @@ -6,10 +6,10 @@ ItemDef( stats: Direct(( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(1.0)), - energy_max: Some(14.0), + energy_max: Some(6.0), )), )), - quality: High, + quality: Moderate, tags: [ Gnarling, SalvageInto(Lifecloth, 1), diff --git a/assets/common/items/charms/burning_charm.ron b/assets/common/items/charms/burning_charm.ron index 4f43b35..16a4125 100644 --- a/assets/common/items/charms/burning_charm.ron +++ b/assets/common/items/charms/burning_charm.ron @@ -17,5 +17,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/charms/frozen_charm.ron b/assets/common/items/charms/frozen_charm.ron index 2608386..6ac1047 100644 --- a/assets/common/items/charms/frozen_charm.ron +++ b/assets/common/items/charms/frozen_charm.ron @@ -17,5 +17,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/charms/lifesteal_charm.ron b/assets/common/items/charms/lifesteal_charm.ron index ce98571..0c7fbab 100644 --- a/assets/common/items/charms/lifesteal_charm.ron +++ b/assets/common/items/charms/lifesteal_charm.ron @@ -16,5 +16,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/consumable/potion_combustion.ron b/assets/common/items/consumable/potion_combustion.ron index 42d3af3..a970c53 100644 --- a/assets/common/items/consumable/potion_combustion.ron +++ b/assets/common/items/consumable/potion_combustion.ron @@ -11,7 +11,15 @@ ItemDef( duration: Some(10) ), cat_ids: [Natural], - )) + )), + Buff(( + kind: PotionSickness, + data: ( + strength: 0.15, + duration: Some(30), + ), + cat_ids: [Natural], + )), ]) ), quality: Moderate, diff --git a/assets/common/items/consumable/potion_freezing.ron b/assets/common/items/consumable/potion_freezing.ron new file mode 100644 index 0000000..86117e4 --- /dev/null +++ b/assets/common/items/consumable/potion_freezing.ron @@ -0,0 +1,27 @@ +ItemDef( + legacy_name: "Freezing Potion", + legacy_description: "Freezes the user's brain", + kind: Consumable( + kind: Drink, + effects: All([ + Buff(( + kind: Frozen, + data: ( + strength: 0.1, + duration: Some(30) + ), + cat_ids: [Natural], + )), + Buff(( + kind: PotionSickness, + data: ( + strength: 0.15, + duration: Some(30), + ), + cat_ids: [Natural], + )), + ]) + ), + quality: Moderate, + tags: [Potion], +) diff --git a/assets/common/items/glider/moth.ron b/assets/common/items/glider/moth.ron index 01f245e..38c7687 100644 --- a/assets/common/items/glider/moth.ron +++ b/assets/common/items/glider/moth.ron @@ -2,6 +2,6 @@ ItemDef( legacy_name: "Green Luna", legacy_description: "The delicate wings flutter faintly.", kind: Glider, - quality: High, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/lantern/pumpkin.ron b/assets/common/items/lantern/pumpkin.ron index 2bb0f2d..fc76f45 100644 --- a/assets/common/items/lantern/pumpkin.ron +++ b/assets/common/items/lantern/pumpkin.ron @@ -8,6 +8,6 @@ ItemDef( flicker_thousandths: 600, ), ), - quality: High, + quality: Moderate, tags: [Utility], ) diff --git a/assets/common/items/recipes/potions.ron b/assets/common/items/recipes/potions.ron index ce11966..e072a45 100644 --- a/assets/common/items/recipes/potions.ron +++ b/assets/common/items/recipes/potions.ron @@ -4,6 +4,7 @@ ItemDef( kind: RecipeGroup( recipes: [ "potion_combustion", + "potion_freezing", "potion_agility", "potion_minor", "potion_medium", diff --git a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron index 7d61aa5..7fd0df6 100644 --- a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron +++ b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron @@ -1,12 +1,14 @@ [ - // Weapons - (5.0, LootTable("common.loot_tables.weapons.tier-1")), - // Armor - (5.0, LootTable("common.loot_tables.armor.tier-1")), - // Misc - (3.0, Item("common.items.armor.misc.neck.scratched")), - (2.0, Item("common.items.armor.misc.head.wanderers_hat")), - (3.0, Item("common.items.armor.misc.head.bamboo_twig")), - // Chieftain Mask - (1.0, Item("common.items.armor.misc.head.gnarling_mask")), + (1, All([ + All([ + LootTable("common.loot_tables.armor.tier-1"), + LootTable("common.loot_tables.weapons.tier-1"), + ]), + Lottery([ + (2.0, Nothing), + (1.0, Item("common.items.armor.misc.neck.scratched")), + (1.0, Item("common.items.armor.misc.head.gnarling_mask")), + (1.0, Item("common.items.glider.moth")), + ]), + ])), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/gnarling/harvester.ron b/assets/common/loot_tables/dungeon/gnarling/harvester.ron index 93f8b04..7fb480f 100644 --- a/assets/common/loot_tables/dungeon/gnarling/harvester.ron +++ b/assets/common/loot_tables/dungeon/gnarling/harvester.ron @@ -1,10 +1,13 @@ [ - // Weapons - (5.0, LootTable("common.loot_tables.weapons.tier-3")), - // Armor - (5.0, LootTable("common.loot_tables.armor.tier-3")), - // Misc - (3.0, Item("common.items.armor.misc.neck.scratched")), - (2.0, Item("common.items.lantern.pumpkin")), - (1.0, Item("common.items.glider.moth")), + (1, All([ + All([ + LootTable("common.loot_tables.armor.tier-2"), + LootTable("common.loot_tables.weapons.tier-2"), + ]), + Lottery([ + (3.0, Nothing), + (1.0, Item("common.items.lantern.pumpkin")), + (1.0, Item("common.items.armor.misc.head.wanderers_hat")), + ]), + ])), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron index 0b863b9..58b5a5b 100644 --- a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron +++ b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron @@ -1,6 +1,16 @@ [ - // Crafting ingredients - (2.4, MultiDrop(Item("common.items.log.wood"), 5, 10)), - (0.1, MultiDrop(Item("common.items.log.hardwood"), 1, 2)), - (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), + (1, Lottery([ + (0.7, All([ + MultiDrop(Item("common.items.log.wood"), 3, 4), + MultiDrop(Item("common.items.crafting_ing.twigs"), 1, 2), + Lottery([ + (0.6, MultiDrop(Item("common.items.log.bamboo"), 1, 2)), + (0.4, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), + ]), + ])), + (0.3, All([ + MultiDrop(Item("common.items.log.wood"), 5, 7), + MultiDrop(Item("common.items.crafting_ing.twigs"), 3, 5), + ])), + ])) ] diff --git a/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron b/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron index ec0dba3..83cfb63 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron @@ -4,7 +4,7 @@ // Ingredients (2.0, Item("common.items.crafting_ing.coral_branch")), (0.5, Item("common.items.crafting_ing.pearl")), - (0.25, Item("common.items.recipes.unique.seashell_necklace")), + (0.5, Item("common.items.recipes.armor.brinestone")), (0.25, Item("common.items.recipes.unique.winged_coronet")), (0.25, Item("common.items.recipes.unique.abyssal_ring")), ]), diff --git a/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron b/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron index 5124752..78ae92a 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron @@ -1,3 +1,5 @@ [ - (1.0, Item("common.items.recipes.armor.brinestone")), + (1.0, Nothing), + (1.0, LootTable("common.loot_tables.food.prepared")), + (0.5, Item("common.items.recipes.unique.seashell_necklace")), ] diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index def2f90..5c2a4f5 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,5 +1,5 @@ [ - (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), (1.0, LootTable("common.loot_tables.armor.cloth")), (0.5, Item("common.items.recipes.explosives")), ] diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 0c1737a..2b72a0c 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -1,7 +1,16 @@ [ - (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), - (1.0, LootTable("common.loot_tables.armor.cloth")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-0")), + (0.25, LootTable("common.loot_tables.weapons.tier-0")), + (0.25, LootTable("common.loot_tables.armor.tier-0")), + (0.25, Item("common.items.armor.misc.head.bamboo_twig")), + // Currency + (3.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)), + // Materials + (0.5, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 5, 10)), + // Consumables + (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), + // Food + (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)), (0.2, Item("common.items.recipes.explosives")), (0.5, Item("common.items.recipes.instruments")), (0.2, Item("common.items.recipes.charms")), diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 0202c72..7381a4b 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -1233,6 +1233,10 @@ keyword: "treasure_egg", generic: "Treasure Egg", ), + gnarling_chieftain: ( + keyword: "gnarling_chieftain", + generic: "Gnarling Chieftain" + ), ) ), fish_small: ( diff --git a/assets/common/recipe_book_manifest.ron b/assets/common/recipe_book_manifest.ron index babab7a..ffc604a 100644 --- a/assets/common/recipe_book_manifest.ron +++ b/assets/common/recipe_book_manifest.ron @@ -31,6 +31,15 @@ ], craft_sprite: Some(Anvil), ), + "potion_freezing": ( + output: ("common.items.consumable.potion_freezing", 1), + inputs: [ + (Item("common.items.crafting_ing.empty_vial"), 1, false), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 3, false), + (Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, false), + ], + craft_sprite: Some(Cauldron), + ), "potion_combustion": ( output: ("common.items.consumable.potion_combustion", 1), inputs: [ diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron index 8b1e8d2..1d61152 100644 --- a/assets/common/trading/item_price_calculation.ron +++ b/assets/common/trading/item_price_calculation.ron @@ -24,8 +24,8 @@ loot_tables: [ (20.375, true, "common.trading.food"), // Recipes - (1.0, true, "common.trading.sellable_recipe"), - (1.0, false, "common.trading.unsellable_recipe"), + (1.8, true, "common.trading.sellable_recipe"), + (1.5, false, "common.trading.unsellable_recipe"), // Potions // @@ -50,5 +50,6 @@ good_scaling: [ (Armor, 0.025), // common.items.armor.misc.pants.worker_blue (Tools, 0.015487), // common.items.weapons.staff.starter_staff (Ingredients, 0.034626), // common.items.crafting_ing.leather_scraps + (Wood, 0.034626), // common.items.log.wood (Recipe, 0.01), // common.items.recipes ]) diff --git a/assets/common/trading/item_price_equality.ron b/assets/common/trading/item_price_equality.ron index 7089e28..a8eb56f 100644 --- a/assets/common/trading/item_price_equality.ron +++ b/assets/common/trading/item_price_equality.ron @@ -1,7 +1,50 @@ [ - // Legendary sceptres + // Purple Linen set Set([ - "common.items.weapons.sceptre.root_evil", - "common.items.weapons.sceptre.caduceus", + "common.items.armor.cloth_purple.belt", + "common.items.armor.cloth_purple.chest", + "common.items.armor.cloth_purple.foot", + "common.items.armor.cloth_purple.hand", + "common.items.armor.cloth_purple.pants", + "common.items.armor.cloth_purple.shoulder", + ]), + + // Green Linen set + Set([ + "common.items.armor.cloth_green.belt", + "common.items.armor.cloth_green.chest", + "common.items.armor.cloth_green.foot", + "common.items.armor.cloth_green.hand", + "common.items.armor.cloth_green.pants", + "common.items.armor.cloth_green.shoulder", + ]), + + // Blue Linen set + Set([ + "common.items.armor.cloth_blue.belt", + "common.items.armor.cloth_blue.chest", + "common.items.armor.cloth_blue.foot", + "common.items.armor.cloth_blue.hand", + "common.items.armor.cloth_blue.pants", + "common.items.armor.cloth_blue.shoulder_0", + "common.items.armor.cloth_blue.shoulder_1", + ]), + + // Worker/starter clothing + Set([ + "common.items.armor.misc.chest.worker_green_0", + "common.items.armor.misc.chest.worker_green_1", + "common.items.armor.misc.chest.worker_orange_0", + "common.items.armor.misc.chest.worker_orange_1", + "common.items.armor.misc.chest.worker_purple_0", + "common.items.armor.misc.chest.worker_purple_1", + "common.items.armor.misc.chest.worker_purple_brown", + "common.items.armor.misc.chest.worker_red_0", + "common.items.armor.misc.chest.worker_red_1", + "common.items.armor.misc.chest.worker_yellow_0", + "common.items.armor.misc.chest.worker_yellow_1", + "common.items.armor.misc.pants.worker_blue", + "common.items.armor.misc.pants.worker_brown", + "common.items.armor.misc.foot.sandals", ]), ] diff --git a/assets/common/trading/unsellable_recipe.ron b/assets/common/trading/unsellable_recipe.ron index c2966de..691b054 100644 --- a/assets/common/trading/unsellable_recipe.ron +++ b/assets/common/trading/unsellable_recipe.ron @@ -6,40 +6,40 @@ [ // Recipes // Misc Groups - (1.0, Item("common.items.recipes.charms")), - (1.0, Item("common.items.recipes.explosives")), - (1.0, Item("common.items.recipes.gliders")), - (1.0, Item("common.items.recipes.instruments")), + (1.25, Item("common.items.recipes.charms")), + (1.25, Item("common.items.recipes.explosives")), + (1.25, Item("common.items.recipes.gliders")), + (1.25, Item("common.items.recipes.instruments")), // Equipment (1.0, Item("common.items.recipes.equipment.moderate")), - (0.2, Item("common.items.recipes.equipment.advanced")), + (0.3, Item("common.items.recipes.equipment.advanced")), // Armors - (0.7, Item("common.items.recipes.armor.steel")), - (0.7, Item("common.items.recipes.armor.silken")), - (0.7, Item("common.items.recipes.armor.scale")), - (0.7, Item("common.items.recipes.weapons.steel")), - (0.7, Item("common.items.recipes.weapons.hardwood")), - (0.4, Item("common.items.recipes.armor.cobalt")), - (0.4, Item("common.items.recipes.armor.druid")), - (0.4, Item("common.items.recipes.armor.carapace")), - (0.4, Item("common.items.recipes.weapons.cobalt")), - (0.4, Item("common.items.recipes.weapons.ironwood")), - (0.2, Item("common.items.recipes.armor.bloodsteel")), - (0.2, Item("common.items.recipes.armor.moonweave")), - (0.2, Item("common.items.recipes.armor.primal")), - (0.2, Item("common.items.recipes.weapons.bloodsteel")), - (0.2, Item("common.items.recipes.weapons.frostwood")), - (0.1, Item("common.items.recipes.armor.orichalcum")), - (0.1, Item("common.items.recipes.armor.sunsilk")), - (0.1, Item("common.items.recipes.armor.dragonscale")), - (0.1, Item("common.items.recipes.armor.brinestone")), - (0.1, Item("common.items.recipes.weapons.orichalcum")), - (0.1, Item("common.items.recipes.weapons.eldwood")), + (1.25, Item("common.items.recipes.armor.steel")), + (1.25, Item("common.items.recipes.armor.silken")), + (1.25, Item("common.items.recipes.armor.scale")), + (1.25, Item("common.items.recipes.weapons.steel")), + (1.25, Item("common.items.recipes.weapons.hardwood")), + (0.65, Item("common.items.recipes.armor.cobalt")), + (0.65, Item("common.items.recipes.armor.druid")), + (0.65, Item("common.items.recipes.armor.carapace")), + (0.65, Item("common.items.recipes.weapons.cobalt")), + (0.65, Item("common.items.recipes.weapons.ironwood")), + (0.38, Item("common.items.recipes.armor.bloodsteel")), + (0.38, Item("common.items.recipes.armor.moonweave")), + (0.38, Item("common.items.recipes.armor.primal")), + (0.38, Item("common.items.recipes.weapons.bloodsteel")), + (0.38, Item("common.items.recipes.weapons.frostwood")), + (0.25, Item("common.items.recipes.armor.sunsilk")), + (0.25, Item("common.items.recipes.armor.orichalcum")), + (0.25, Item("common.items.recipes.armor.dragonscale")), + (0.25, Item("common.items.recipes.weapons.orichalcum")), + (0.25, Item("common.items.recipes.weapons.eldwood")), + (0.25, Item("common.items.recipes.armor.brinestone")), // Unique items - (1.0, Item("common.items.recipes.unique.seashell_necklace")), - (0.8, Item("common.items.recipes.unique.winged_coronet")), + (1.25, Item("common.items.recipes.unique.seashell_necklace")), + (0.6, Item("common.items.recipes.unique.winged_coronet")), (0.5, Item("common.items.recipes.unique.troll_hide_pack")), - (0.3, Item("common.items.recipes.unique.abyssal_gorget")), - (0.1, Item("common.items.recipes.unique.mindflayer_spellbag")), + (0.2, Item("common.items.recipes.unique.abyssal_gorget")), + (0.15, Item("common.items.recipes.unique.mindflayer_spellbag")), (0.1, Item("common.items.recipes.unique.polaris")), ] diff --git a/config/config.toml b/config/config.toml index 70e98b7..a4cec65 100644 --- a/config/config.toml +++ b/config/config.toml @@ -1,3 +1,4 @@ +announcement = "Beep Boop!" position = [17720.0, 14951.0, 237.0] orientation = 0 diff --git a/src/bot.rs b/src/bot.rs index 1e5b504..8f4f0a3 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -21,12 +21,11 @@ use veloren_common::{ tool::AbilityMap, ChatType, ControllerInputs, Item, Ori, Pos, }, - outcome::Outcome, time::DayPeriod, trade::{PendingTrade, TradeAction, TradeResult}, uid::Uid, uuid::Uuid, - DamageSource, ViewDistances, + ViewDistances, }; use veloren_common_net::sync::WorldSyncExt; @@ -37,12 +36,10 @@ const COINS: ItemDefinitionId = const CLIENT_TPS: Duration = Duration::from_millis(33); const TRADE_ACTION_DELAY: Duration = Duration::from_millis(300); const ACCOUNCEMENT_DELAY: Duration = Duration::from_mins(45); -const OUCH_DELAY: Duration = Duration::from_secs(2); /// An active connection to the Veloren server that will attempt to run every time the `tick` /// function is called. pub struct Bot { - username: String, position: Pos, orientation: Ori, admins: Vec, @@ -63,7 +60,6 @@ pub struct Bot { previous_trade_receipt: Option, last_trade_action: Instant, last_announcement: Instant, - last_ouch: Instant, sort_count: u8, } @@ -140,7 +136,6 @@ impl Bot { let now = Instant::now(); Ok(Bot { - username, position, orientation, admins, @@ -157,7 +152,6 @@ impl Bot { previous_trade_receipt: None, last_trade_action: now, last_announcement: now, - last_ouch: now, sort_count: 0, announcement, }) @@ -284,6 +278,11 @@ impl Bot { Some(price_correction_message) } } + "location" => { + self.send_location_info(&sender)?; + + None + } "ori" => { if self.is_user_admin(&sender)? { if let Some(new_rotation) = split_content.next() { @@ -366,36 +365,6 @@ impl Bot { ); } } - VelorenEvent::Outcome(Outcome::ProjectileHit { - target: Some(target), - .. - }) => { - if let Some(uid) = self.client.uid() { - if uid == target && self.last_ouch.elapsed() > OUCH_DELAY { - self.client - .send_command("say".to_string(), vec!["Ouch!".to_string()]); - - self.last_ouch = Instant::now(); - } - } - } - VelorenEvent::Outcome(Outcome::HealthChange { info, .. }) => { - if let Some(DamageSource::Buff(_)) = info.cause { - return Ok(true); - } - - if let Some(uid) = self.client.uid() { - if uid == info.target - && info.amount.is_sign_negative() - && self.last_ouch.elapsed() > OUCH_DELAY - { - self.client - .send_command("say".to_string(), vec!["That hurt!".to_string()]); - - self.last_ouch = Instant::now(); - } - } - } VelorenEvent::TradeComplete { result, trade } => { let my_party = trade .which_party(self.client.uid().ok_or("Failed to find uid")?) @@ -439,47 +408,46 @@ impl Bot { Ok(true) } + fn send_location_info(&mut self, target: &Uid) -> Result<(), String> { + let player_name = self + .find_player_alias(target) + .ok_or("Failed to find player alias")? + .to_string(); + let location = self + .client + .sites() + .into_iter() + .find_map(|(_, SiteInfoRich { site, .. })| { + let x_difference = self.position.0[0] - site.wpos[0] as f32; + let y_difference = self.position.0[1] - site.wpos[1] as f32; + + if x_difference.abs() < 100.0 && y_difference.abs() < 100.0 { + site.name.clone() + } else { + None + } + }) + .unwrap_or(format!("{:?}", self.position)); + + self.client.send_command( + "tell".to_string(), + vec![player_name, format!("I am at {location}.")], + ); + + Ok(()) + } + /// Make the bot's trading and help accouncements /// /// Currently, this can make two announcements: one in /region with basic usage instructions /// is always made. If an announcement was provided when the bot was created, it will make it /// in /world. fn handle_announcement(&mut self) -> Result<(), String> { - debug!("Making an announcement"); - - self.client.send_command( - "region".to_string(), - vec![format!( - "I'm a bot. You can trade with me or check prices: '/tell {} price [search_term]'.", - self.username - )], - ); - if let Some(announcement) = &self.announcement { - let announcement = if announcement.contains("{location}") { - let location = self - .client - .sites() - .into_iter() - .find_map(|(_, SiteInfoRich { site, .. })| { - let x_difference = self.position.0[0] - site.wpos[0] as f32; - let y_difference = self.position.0[1] - site.wpos[1] as f32; - - if x_difference.abs() < 100.0 && y_difference.abs() < 100.0 { - site.name.clone() - } else { - None - } - }) - .unwrap_or(format!("{:?}", self.position)); - - announcement.replace("{location}", &location) - } else { - announcement.clone() - }; + debug!("Making an announcement"); self.client - .send_command("world".to_string(), vec![announcement]); + .send_command("region".to_string(), vec![announcement.to_string()]); } Ok(())