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

Merge branch 'pfau/baobabs' into 'master'

Browse Source 
Baobab Trees, UI fixes, es_la update

See merge request veloren/veloren!1608
This commit is contained in:
Monty Marz 2020-12-11 11:45:11 +00:00
commit c5f5409774
31 changed files with 225 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ItemDef(
kind: "Potion",
effect: [
Buff((
kind: Saturation,
kind: Potion,
data: (
strength: 1000.0,
duration: Some((

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

@ -1,13 +1,13 @@
ItemDef(
name: "Large Potion",
description: "Restores 100 Health",
description: "Restores 200 Health",
kind: Consumable(
kind: "PotionLarge",
effect: [
Buff((
kind: Potion,
data: (
strength: 1000.0,
strength: 2000.0,
duration: Some((
secs: 1,
nanos: 0,

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

@ -1,13 +1,13 @@
ItemDef(
name: "Medium Potion",
description: "Restores 70 Health",
description: "Restores 100 Health",
kind: Consumable(
kind: "PotionMed",
effect: [
Buff((
kind: Potion,
data: (
strength: 700.0,
strength: 1000.0,
duration: Some((
secs: 1,
nanos: 0,

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

@ -1,15 +1,15 @@
ItemDef(
name: "Apple",
description: "Restores 10 Health over 20 seconds\n\nRed and juicy",
description: "Restores 10 Health over 10 seconds\n\nRed and juicy",
kind: Consumable(
kind: "Apple",
effect: [
Buff((
kind: Saturation,
data: (
strength: 5.0,
strength: 10.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Mushroom Curry",
description: "Restores 120 Health over 20 seconds\n\nWho could say no to that?",
description: "Restores 120 Health over 10 seconds\n\nWho could say no to that?",
kind: Consumable(
kind: "AppleShroomCurry",
effect: [
Buff((
kind: Saturation,
data: (
strength: 60.0,
strength: 120.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Apple Stick",
description: "Restores 25 Health over 20 seconds\n\nThe stick makes it easier to carry!",
description: "Restores 25 Health over 10 seconds\n\nThe stick makes it easier to carry!",
kind: Consumable(
kind: "AppleStick",
effect: [
Buff((
kind: Saturation,
data: (
strength: 12.5,
strength: 25.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Dwarven Cheese",
description: "Restores 15 Health over 20 seconds\n\nAromatic and nutritious",
description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious",
kind: Consumable(
kind: "Cheese",
effect: [
Buff((
kind: Saturation,
data: (
strength: 7.5,
strength: 15.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Coconut",
description: "Restores 20 health over 20 seconds\n\nReliable source of water and fat",
description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat",
kind: Consumable(
kind: "Coconut",
effect: [
Buff((
kind: Saturation,
data: (
strength: 10.0,
strength: 20.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Mushroom Stick",
description: "Restores 20 Health over 20 seconds\n\nRoasted mushrooms on a stick for easy carrying",
description: "Restores 20 Health over 10 seconds\n\nRoasted mushrooms on a stick for easy carrying",
kind: Consumable(
kind: "MushroomStick",
effect: [
Buff((
kind: Saturation,
data: (
strength: 10.0,
strength: 20.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

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

@ -1,15 +1,15 @@
ItemDef(
name: "Sunflower Ice Tea",
description: "Restores 50 Health over 20 seconds\n\nBrewed from freshly shelled sunflower seeds",
description: "Restores 50 Health over 10 seconds\n\nBrewed from freshly shelled sunflower seeds",
kind: Consumable(
kind: "SunflowerTea",
effect: [
Buff((
kind: Saturation,
data: (
strength: 25.0,
strength: 50.0,
duration: Some((
secs: 20,
secs: 10,
nanos: 0,
)),
),

6
assets/common/items/npc_weapons/staff/mindflayer_staff.ron
View File

@ -6,10 +6,10 @@ ItemDef(
kind: Staff,
stats: (
equip_time_millis: 300,
power: 1.00,
speed: 1.0,
power: 4.0,
speed: 0.5,
),
)
),
quality: Low,
quality: Epic,
)

BIN
assets/voxygen/element/map/dif_3.png (Stored with Git LFS)
View File

Binary file not shown.

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

@ -55,8 +55,7 @@
"common.gameplay": "Gameplay",
"common.controls": "Controls",
"common.video": "Graphics",
"common.sound": "Sound",
"common.languages": "Languages",
"common.sound": "Sound",
"common.resume": "Resume",
"common.characters": "Characters",
"common.close": "Close",
@ -355,8 +354,7 @@ magically infused items?"#,
"hud.settings.particles": "Particles",
"hud.settings.resolution": "Resolution",
"hud.settings.bit_depth": "Bit Depth",
"hud.settings.refresh_rate": "Refresh Rate",
"hud.settings.save_window_size": "Save window size",
"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",

117
assets/voxygen/i18n/es_la.ron
View File

@ -50,7 +50,7 @@
"common.servers": "Servidores",
"common.quit": "Salir",
"common.settings": "Configuración",
"common.languages": "Idiomas",
"common.languages": "Idiomas", //this one is repeated in en.ron (53 and 59)
"common.interface": "Interfaz",
"common.gameplay": "Jugabilidad",
"common.controls": "Controles",
@ -59,11 +59,12 @@
"common.resume": "Continuar",
"common.characters": "Personajes",
"common.close": "Cerrar",
"common.yes": "Si",
"common.yes": "Sí",
"common.no": "No",
"common.back": "Volver",
"common.create": "Crear",
"common.okay": "Ok",
"common.add": "Agregar",
"common.accept": "Aceptar",
"common.decline": "Rechazar",
"common.disclaimer": "Cuidado",
@ -71,8 +72,8 @@
"common.none": "Ninguno",
"common.error": "Error",
"common.fatal_error": "Error Fatal",
"common.you": "Tu",
"common.automatic": "Automatico",
"common.you": "Tú",
"common.automatic": "Automático",
"common.random": "Aleatorio",
// Settings Window title
"common.interface_settings": "Ajustes de Interfaz",
@ -106,6 +107,9 @@ El cliente está actualizado?"#,
/// Start Main screen section
"main.username": "Usuario",
"main.server": "Servidor",
"main.password": "Contraseña",
"main.connecting": "Conectando",
"main.creating_world": "Creando Mundo",
"main.tip": "Consejo:",
@ -140,20 +144,22 @@ Puedes crearte una cuenta en
https://veloren.net/account/."#,
"main.login.server_not_found": "No se encontró el servidor",
"main.login.authentication_error": "Error de autenticación en el servidor",
"main.login.server_full": "El servidor esta lleno",
"main.login.server_full": "El servidor está lleno",
"main.login.untrusted_auth_server": "El servidor de autenticación no es confiable",
"main.login.outdated_client_or_server": "ServidorEnloquecido: Probablemente las versiones son incompatibles, intenta actualizar tu cliente.",
"main.login.timeout": "Tiempo de espera agotado: El servidor no respondio a tiempo. (Puede estar sobrecargado o tener problemas de red).",
"main.login.server_shut_down": "El servidor se apagó",
"main.login.already_logged_in": "Ya estas en una sesión en el servidor.",
"main.login.already_logged_in": "Ya estás conectado al servidor.",
"main.login.network_error": "Error de red",
"main.login.failed_sending_request": "El pedido al servidor de autenticacion fallo",
"main.login.invalid_character": "El personaje seleccionado no es válido",
"main.login.client_crashed": "El cliente crasheó",
"main.login.not_on_whitelist": "No estas en la lista. Contacta al Dueño del Servidor si quieres unirte.",
"main.login.not_on_whitelist": "No estás en la lista. Contacta al Dueño del Servidor si quieres unirte.",
"main.login.banned": "Usted ha sido baneado por la siguiente razón",
"main.login.kicked": "Te han echado por la siguiente razón",
"main.login.select_language": "Elige un idioma",
"main.servers.select_server": "Elige un servidor",
/// End Main screen section
@ -166,7 +172,7 @@ https://veloren.net/account/."#,
"hud.waypoint_saved": "Marcador Guardado",
"hud.press_key_to_show_keybindings_fmt": "Presiona {key} para mostrar los controles del teclado",
"hud.press_key_to_toggle_lantern_fmt": "[{key}] Encender Linterna",
"hud.press_key_to_toggle_lantern_fmt": "[{key}] Linterna",
"hud.press_key_to_show_debug_info_fmt": "Presiona {key} para mostrar información de depuración",
"hud.press_key_to_toggle_keybindings_fmt": "Presiona {key} para alternar los controles del teclado",
"hud.press_key_to_toggle_debug_info_fmt": "Presiona {key} para alternar la información de depuración",
@ -175,19 +181,23 @@ https://veloren.net/account/."#,
"hud.chat.online_msg": "[{name}] se ha conectado.",
"hud.chat.offline_msg": "[{name}] se ha desconectado.",
"hud.chat.default_death_msg": "[{name}] Murió",
"hud.chat.environmental_kill_msg": "[{name}] Murió en {environment}",
"hud.chat.fall_kill_msg": "[{name}] Murió por el daño de la caída",
"hud.chat.suicide_msg": "[{name}] Murió por heridas autoinfligidas",
"hud.chat.default_death_msg": "[{name}] murió",
"hud.chat.environmental_kill_msg": "[{name}] murió en {environment}",
"hud.chat.fall_kill_msg": "[{name}] murió por daño de caída",
"hud.chat.suicide_msg": "[{name}] murió por heridas autoinfligidas",
"hud.chat.pvp_melee_kill_msg": "[{attacker}] Derroto a [{victim}]",
"hud.chat.pvp_ranged_kill_msg": "[{attacker}] Le Disparo a [{victim}]",
"hud.chat.pvp_explosion_kill_msg": "[{attacker}] Hizo explotar a [{victim}]",
"hud.chat.pvp_energy_kill_msg": "[{attacker}] usó magia para matar [{victim}]",
"hud.chat.pvp_melee_kill_msg": "[{attacker}] derrotó a [{victim}]",
"hud.chat.pvp_ranged_kill_msg": "[{attacker}] le disparó a [{victim}]",
"hud.chat.pvp_explosion_kill_msg": "[{attacker}] hizo explotar a [{victim}]",
"hud.chat.pvp_energy_kill_msg": "[{attacker}] usó magia para matar a [{victim}]",
"hud.chat.pvp_buff_kill_msg": "[{attacker}] mató a [{victim}]",
"hud.chat.npc_melee_kill_msg": "{attacker} Mató a [{victim}]",
"hud.chat.npc_ranged_kill_msg": "{attacker} Le Disparo a [{victim}]",
"hud.chat.npc_explosion_kill_msg": "{attacker} Hizo explotar a [{victim}]",
"hud.chat.npc_melee_kill_msg": "{attacker} mató a [{victim}]",
"hud.chat.npc_ranged_kill_msg": "{attacker} le disparó a [{victim}]",
"hud.chat.npc_explosion_kill_msg": "{attacker} hizo explotar a [{victim}]",
"hud.chat.npc_energy_kill_msg": "[{attacker}] usó magia para matar a [{victim}]",
"hud.chat.npc_other_kill_msg": "[{attacker}] mató a [{victim}]",
"hud.chat.loot_msg": "Recogiste [{item}]",
"hud.chat.loot_fail": "Tu inventario está lleno!",
@ -234,7 +244,7 @@ Quieres liberar tu cursor para cerrar esta ventana? Presiona TAB!
Disfruta tu estadía en el Mundo de Veloren."#,
"hud.temp_quest_headline": r#"Porfavor, ayudanos Viajero!"#,
"hud.temp_quest_headline": r#"Por favor, ayúdanos Viajero!"#,
"hud.temp_quest_text": r#"Calabozos llenos de cultistas malvados
han emergido alrededor de nuestros pacíficos pueblos!
@ -290,6 +300,8 @@ objetos infundidos con magia?"#,
"hud.settings.transparency": "Transparencia",
"hud.settings.hotbar": "Inventario Rápido",
"hud.settings.toggle_shortcuts": "Alternar Atajos",
"hud.settings.buffs_skillbar": "Buffs en la barra de habilidades.",
"hud.settings.buffs_mmap": "Buffs en el Minimapa",
"hud.settings.toggle_bar_experience": "Alternar Barra de Experiencia",
"hud.settings.scrolling_combat_text": "Texto de Combate con Desplazamiento",
"hud.settings.single_damage_number": "Números de Daño Singular",
@ -322,13 +334,19 @@ objetos infundidos con magia?"#,
"hud.settings.maximum_fps": "FPS Máximos",
"hud.settings.fov": "Campo de Visión (grados)",
"hud.settings.gamma": "Gama",
"hud.settings.exposure": "Exposición",
"hud.settings.ambiance": "Brillo del Ambiente",
"hud.settings.antialiasing_mode": "Modo Anti-Aliasing",
"hud.settings.upscale_factor": "Factor de Escala",
"hud.settings.cloud_rendering_mode": "Modo de Renderizado de Nubes",
"hud.settings.fluid_rendering_mode": "Modo de Renderizado del Agua",
"hud.settings.fluid_rendering_mode.cheap": "Bajo",
"hud.settings.fluid_rendering_mode.shiny": "Alto",
"hud.settings.cloud_rendering_mode.regular": "Normal",
"hud.settings.cloud_rendering_mode.minimal": "Mínimo",
"hud.settings.cloud_rendering_mode.low": "Bajo",
"hud.settings.cloud_rendering_mode.medium": "Medio",
"hud.settings.cloud_rendering_mode.high": "Alto",
"hud.settings.cloud_rendering_mode.ultra": "Ultra",
"hud.settings.fullscreen": "Pantalla Completa",
"hud.settings.fullscreen_mode": "Modo de Pantalla Completa",
"hud.settings.fullscreen_mode.exclusive": "Completo",
@ -338,21 +356,20 @@ objetos infundidos con magia?"#,
"hud.settings.bit_depth": "Profundidad de Bits",
"hud.settings.refresh_rate": "Taza de Refresco",
"hud.settings.save_window_size": " Guardar tamaño de ventana",
"hud.settings.shadow_rendering_mode": "Renderizado de Sombras",
"hud.settings.shadow_rendering_mode.none": "Ninguno",
"hud.settings.shadow_rendering_mode.cheap": "Bajo",
"hud.settings.shadow_rendering_mode.map": "Alto",
"hud.settings.lighting_rendering_mode": "Renderizado de la luz de la Linterna",
"hud.settings.lighting_rendering_mode.ashikhmin": "Tipo A",
"hud.settings.lighting_rendering_mode.blinnphong": "Tipo B",
"hud.settings.lighting_rendering_mode.lambertian": "Tipo L",
"hud.settings.lighting_rendering_mode.ashikhmin": "Tipo A - Alto",
"hud.settings.lighting_rendering_mode.blinnphong": "Tipo B - Medio",
"hud.settings.lighting_rendering_mode.lambertian": "Tipo L - Bajo",
"hud.settings.shadow_rendering_mode": "Renderizado de Sombras",
"hud.settings.shadow_rendering_mode.none": "Ninguno",
"hud.settings.shadow_rendering_mode.cheap": "Bajo",
"hud.settings.shadow_rendering_mode.map": "Alto",
"hud.settings.shadow_rendering_mode.map.resolution": "Resolución",
"hud.settings.lod_detail": "Detalle de LoD",
"hud.settings.music_volume": "Volumen de Musica",
"hud.settings.save_window_size": "Recordar tamaño de ventana", //It's repeated in en.ron (359 and 370)
"hud.settings.music_volume": "Volumen de Música",
"hud.settings.sound_effect_volume": "Volumen de Efectos de Sonido",
"hud.settings.audio_device": "Dispositivo de Audio",
@ -371,6 +388,7 @@ objetos infundidos con magia?"#,
"hud.social.zone": "Zona",
"hud.social.account": "Cuenta",
"hud.crafting": "Crafteo",
"hud.crafting.recipes": "Recetas",
"hud.crafting.ingredients": "Ingredientes:",
@ -395,6 +413,20 @@ objetos infundidos con magia?"#,
"hud.free_look_indicator": "Vista libre activa",
"hud.auto_walk_indicator": "Caminata automática activa",
"hud.map.difficulty": "Dificultad",
"hud.map.towns": "Pueblos",
"hud.map.castles": "Castillos",
"hud.map.dungeons": "Calabozos",
"hud.map.caves": "Cuevas",
"hud.map.cave": "Cueva",
"hud.map.town": "Pueblo",
"hud.map.castle": "Castillo",
"hud.map.dungeon": "Calabozo",
"hud.map.difficulty_dungeon": "Dificultad de\n\nCalabozo: {difficulty}",
"hud.map.drag": "Arrastrar",
"hud.map.zoom": "Zoom",
"hud.map.recenter": "Centrar",
/// End HUD section
@ -402,7 +434,7 @@ objetos infundidos con magia?"#,
"gameinput.primary": "Ataque Básico",
"gameinput.secondary": "Ataque Secundario/Bloquear/Apuntar",
"gameinput.slot1": "Ranura de Inventario Rápido 1",
"gameinput.slot1": "Ranura de Inventario Rápido 1",
"gameinput.slot2": "Ranura de Inventario Rápido 2",
"gameinput.slot3": "Ranura de Inventario Rápido 3",
"gameinput.slot4": "Ranura de Inventario Rápido 4",
@ -453,6 +485,7 @@ objetos infundidos con magia?"#,
"gameinput.acceptgroupinvite": "Aceptar invitación al grupo",
"gameinput.declinegroupinvite": "Rechazar invitación al grupo",
"gameinput.crafting": "Craftear",
"gameinput.fly": "Volar",
"gameinput.sneak": "Agacharse",
"gameinput.swimdown": "Sumergirse",
"gameinput.swimup": "Nadar hacia arriba",
@ -467,7 +500,7 @@ objetos infundidos con magia?"#,
"char_selection.change_server": "Cambiar Servidor",
"char_selection.enter_world": "Entrar al Mundo",
"char_selection.logout": "Cerrar Sesión",
"char_selection.create_new_charater": "Crear Nuevo Personaje",
"char_selection.create_new_character": "Crear Nuevo Personaje",
"char_selection.creating_character": "Creando Personaje...",
"char_selection.character_creation": "Creación de Personaje",
@ -506,6 +539,24 @@ Protección
"esc_menu.quit_game": "Salir del Juego",
/// End Escape Menu Section
/// Buffs and Debuffs
"buff.remove": "Click para quitar",
"buff.title.missing": "Sin Título",
"buff.desc.missing": "Sin Descripción",
// Buffs
"buff.title.heal": "Curación",
"buff.desc.heal": "Recupera vida durante un tiempo.",
"buff.title.potion": "Poción",
"buff.desc.potion": "Bebiendo...",
"buff.title.saturation": "Saturación",
"buff.desc.saturation": "Recupera vida durante un tiempo por objetos.",
"buff.title.campfire_heal": "Curación de fogata",
"buff.desc.campfire_heal": "Descansar en una fogata recupera 1% por segundo.",
// Debuffs
"debuff.title.bleed": "Sangrando",
"debuff.desc.bleed": "Inflinge daño regularmente.",
},
@ -526,7 +577,9 @@ Protección
"Presiona 'J' para bailar. Fiesta!",
"Presiona 'Shift-Izquierdo' para abrir tu planeador y conquistar los cielos.",
"Veloren está aún en Alfa temprana. Hacemos lo mejor para mejorar día a día!",
"Si te quieres unir al equipo de desarrolladores o solo chatear con nosotros, únete a nuestro servidor en Discord.",
"Si te quieres unir al equipo de desarrolladores o solo chatear con nosotros, únete a nuestro servidor en Discord.",
"Puedes elegir mostrar tu cantidad de vida en la barra de vida en la configuración.",
"Para ver tus estadísticas, haz click en el botón 'Estadísticas' en el inventario.",
],
"npc.speech.villager_under_attack": [
"Ayuda, ¡Me están atacando!",

BIN
assets/voxygen/voxel/figure/eyes/undead/female-1.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/eyes/undead/female-2.vox (Stored with Git LFS)
View File

Binary file not shown.

56
assets/world/manifests/baobabs.ron Normal file
View File

@ -0,0 +1,56 @@
#![enable(unwrap_newtypes)]
[
(
specifier: "world.tree.baobab.0",
center: (22, 28, 10)
),
(
specifier: "world.tree.baobab.1",
center: (18, 18, 6)
),
(
specifier: "world.tree.baobab.2",
center: (18, 218, 6)
),
(
specifier: "world.tree.baobab.3",
center: (18, 16, 10)
),
(
specifier: "world.tree.baobab.4",
center: (15, 16, 5)
),
(
specifier: "world.tree.baobab.5",
center: (11, 12, 4)
),
(
specifier: "world.tree.baobab.5",
center: (11, 12, 4)
),
(
specifier: "world.tree.baobab.5",
center: (11, 12, 4)
),
(
specifier: "world.tree.baobab.5",
center: (11, 12, 4)
),
(
specifier: "world.tree.baobab.5",
center: (11, 12, 4)
),
(
specifier: "world.tree.baobab.6",
center: (17, 17, 4)
),
(
specifier: "world.tree.acacia.2",
center: (5, 5, 4)
),
(
specifier: "world.tree.acacia.3",
center: (6, 6, 3)
),
]

BIN
assets/world/tree/baobab/0.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/3.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/4.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/5.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/tree/baobab/6.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
common/src/comp/body.rs
View File

@ -314,7 +314,7 @@ impl Body {
biped_large::Species::Wendigo => 2000,
biped_large::Species::Troll => 1500,
biped_large::Species::Dullahan => 2000,
biped_large::Species::Mindflayer => 1500,
biped_large::Species::Mindflayer => 8000,
_ => 1000,
},
Body::Object(_) => 10000,
@ -399,7 +399,7 @@ impl Body {
biped_large::Species::Wendigo => 80,
biped_large::Species::Troll => 60,
biped_large::Species::Dullahan => 120,
biped_large::Species::Mindflayer => 80,
biped_large::Species::Mindflayer => 250,
_ => 100,
},
Body::Object(_) => 10,
@ -476,7 +476,7 @@ impl Body {
biped_large::Species::Wendigo => 70,
biped_large::Species::Troll => 50,
biped_large::Species::Dullahan => 100,
biped_large::Species::Mindflayer => 80,
biped_large::Species::Mindflayer => 150,
_ => 100,
},
Body::Object(_) => 1,
@ -553,7 +553,7 @@ impl Body {
biped_large::Species::Wendigo => 60,
biped_large::Species::Troll => 60,
biped_large::Species::Dullahan => 80,
biped_large::Species::Mindflayer => 50,
biped_large::Species::Mindflayer => 200,
_ => 60,
},
Body::Object(_) => 0,

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

@ -305,6 +305,7 @@ impl Item {
Some(Item::new_from_asset_expect(match block.get_sprite()? {
SpriteKind::Apple => "common.items.food.apple",
SpriteKind::Mushroom => "common.items.food.mushroom",
SpriteKind::CaveMushroom => "common.items.food.mushroom",
SpriteKind::Velorite => "common.items.ore.velorite",
SpriteKind::VeloriteFrag => "common.items.ore.veloritefrag",
SpriteKind::BlueFlower => "common.items.flowers.blue",

1
common/src/terrain/sprite.rs
View File

@ -185,6 +185,7 @@ impl SpriteKind {
SpriteKind::ShortGrass => false,
SpriteKind::Apple => true,
SpriteKind::Mushroom => true,
SpriteKind::CaveMushroom => true,
SpriteKind::Velorite => true,
SpriteKind::VeloriteFrag => true,
SpriteKind::Chest => true,

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

@ -142,6 +142,8 @@ impl<'a> Widget for Group<'a> {
let mut events = Vec::new();
let localized_strings = self.localized_strings;
let buff_ani = ((self.pulse * 4.0/* speed factor */).cos() * 0.5 + 0.8) + 0.5; //Animation timer
let debug_on = self.global_state.settings.gameplay.toggle_debug;
let offset = if debug_on { 270.0 } else { 0.0 };
let buffs_tooltip = Tooltip::new({
// Edge images [t, b, r, l]
// Corner images [tr, tl, br, bl]
@ -328,11 +330,7 @@ impl<'a> Widget for Group<'a> {
let uid_allocator = client_state
.ecs()
.read_resource::<common::sync::UidAllocator>();
let offset = if self.global_state.settings.gameplay.toggle_debug {
320.0
} else {
110.0
};
// Keep track of the total number of widget ids we are using for buffs
let mut total_buff_count = 0;
for (i, &uid) in group_members.iter().copied().enumerate() {
@ -350,13 +348,13 @@ impl<'a> Widget for Group<'a> {
if let Some(health) = health {
let health_perc = health.current() as f64 / health.maximum() as f64;
// change panel positions when debug info is shown
let back = if i == 0 {
Image::new(self.imgs.member_bg)
.top_left_with_margins_on(ui.window, offset, 20.0)
} else {
Image::new(self.imgs.member_bg)
.down_from(state.ids.member_panels_bg[i - 1], 45.0)
};
let x = if debug_on { i / 8 } else { i / 12 };
let y = if debug_on { i % 8 } else { i % 12 };
let back = Image::new(self.imgs.member_bg).top_left_with_margins_on(
ui.window,
50.0 + offset + y as f64 * 65.0,
10.0 + x as f64 * 180.0,
);
let hp_ani = (self.pulse * 4.0/* speed factor */).cos() * 0.5 + 0.8; //Animation timer
let crit_hp_color: Color = Color::Rgba(0.79, 0.19, 0.17, hp_ani);
let health_col = match (health_perc * 100.0) as u8 {

3
world/src/all.rs
View File

@ -1,7 +1,8 @@
#[derive(Copy, Clone, Debug)]
pub enum ForestKind {
Palm,
Savannah,
Acacia,
Baobab,
Oak,
Pine,
Birch,

4
world/src/layer/tree.rs
View File

@ -19,6 +19,7 @@ lazy_static! {
pub static ref PINES: Vec<Arc<Structure>> = Structure::load_group("pines");
pub static ref PALMS: Vec<Arc<Structure>> = Structure::load_group("palms");
pub static ref ACACIAS: Vec<Arc<Structure>> = Structure::load_group("acacias");
pub static ref BAOBABS: Vec<Arc<Structure>> = Structure::load_group("baobabs");
pub static ref FRUIT_TREES: Vec<Arc<Structure>> = Structure::load_group("fruit_trees");
pub static ref BIRCHES: Vec<Arc<Structure>> = Structure::load_group("birch");
pub static ref MANGROVE_TREES: Vec<Arc<Structure>> = Structure::load_group("mangrove_trees");
@ -85,7 +86,8 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
&FRUIT_TREES
},
ForestKind::Palm => &PALMS,
ForestKind::Savannah => &ACACIAS,
ForestKind::Acacia => &ACACIAS,
ForestKind::Baobab => &BAOBABS,
ForestKind::Oak => &OAKS,
ForestKind::Pine => &PINES,
ForestKind::Birch => &BIRCHES,

8
world/src/sim/mod.rs
View File

@ -2238,7 +2238,13 @@ impl SimChunk {
(1.0, 2.0),
),
(
ForestKind::Savannah,
ForestKind::Acacia,
(0.0, 1.5),
(CONFIG.tropical_temp, 1.5),
(0.0, 1.0),
),
(
ForestKind::Baobab,
(0.0, 1.5),
(CONFIG.tropical_temp, 1.5),
(0.0, 1.0),