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 'phoenix13032005/dungeon-tweaks' into 'master'

Browse Source 
Dungeon difficulty on map.rs tweaks and minor changes to loot tables and entity names

See merge request veloren/veloren!3075
This commit is contained in:
Samuel Keiffer 2022-02-09 16:29:28 +00:00
commit e772fd9218
19 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/custom/yeti/frostbreath.ron
View File

@ -14,6 +14,6 @@ BasicBeam(
))),
energy_regen: 0,
energy_drain: 0,
ori_rate: 0.1,
ori_rate: 0.2,
specifier: Frost,
)

2
assets/common/entity/wild/aggressive/archaeos.ron
View File

@ -3,6 +3,6 @@
body: RandomWith("archaeos"),
alignment: Alignment(Enemy),
loadout: FromBody,
loot: LootTable("common.loot_tables.creature.theropod.horned"),
loot: LootTable("common.loot_tables.creature.theropod.plate"),
meta: [],
)

2
assets/common/entity/wild/aggressive/ntouka.ron
View File

@ -3,6 +3,6 @@
body: RandomWith("ntouka"),
alignment: Alignment(Enemy),
loadout: FromBody,
loot: LootTable("common.loot_tables.creature.theropod.horned"),
loot: LootTable("common.loot_tables.creature.theropod.plate"),
meta: [],
)

2
assets/common/entity/wild/peaceful/forest_fox.ron
View File

@ -1,5 +1,5 @@
(
name: Name("Forest Fox"),
name: Name("Red Fox"),
body: Exact(QuadrupedSmall((
species: Fox,
body_type: Male,

2
assets/common/entity/wild/peaceful/river_salamander.ron
View File

@ -1,5 +1,5 @@
(
name: Name("River Salamander"),
name: Name("Elbst"),
body: Exact(QuadrupedLow((
species: Salamander,
body_type: Female,

2
assets/common/entity/wild/peaceful/sand_hare.ron
View File

@ -1,5 +1,5 @@
(
name: Name("Sand Hare"),
name: Name("Desert Hare"),
body: Exact(QuadrupedSmall((
species: Hare,
body_type: Male,

2
assets/common/entity/wild/peaceful/sand_salamander.ron
View File

@ -1,5 +1,5 @@
(
name: Name("Desert Salamander"),
name: Name("Salamander"),
body: Exact(QuadrupedLow((
species: Salamander,
body_type: Male,

2
assets/common/items/armor/twigsflowers/shoulder.ron
View File

@ -7,7 +7,7 @@ ItemDef(
protection: Some(Normal(9.0)),
),
)),
quality: Common,
quality: Moderate,
tags: [
],
)

1
assets/common/loot_tables/creature/quad_medium/catoblepas.ron
View File

@ -1,4 +1,5 @@
[
(1.5, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
(4.0, LootTable("common.loot_tables.creature.quad_medium.generic")),
(1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
]

2
assets/common/loot_tables/creature/quad_medium/ice.ron
View File

@ -1,4 +1,4 @@
[
(1.0, Item("common.items.crafting_ing.hide.tough_hide")),
(1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
(1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")),
]

4
assets/common/loot_tables/creature/theropod/plate.ron Normal file
View File

@ -0,0 +1,4 @@
[
(1.0, ItemQuantity("common.items.crafting_ing.hide.plate", 1, 3)),
(1.0, Item("common.items.crafting_ing.animal_misc.large_horn")),
]

16
assets/common/loot_tables/spots/bandit.ron
View File

@ -2,18 +2,18 @@
// Crafting Ingredients
(5.0, LootTable("common.loot_tables.materials.common")),
// Consumables
(0.2, Item("common.items.consumable.potion_minor")),
(0.5, Item("common.items.consumable.potion_minor")),
// Ring
(0.02, Item("common.items.armor.misc.ring.gold")),
(0.2, Item("common.items.armor.misc.ring.gold")),
// Necklace
(0.02, Item("common.items.armor.misc.neck.gold")),
(0.2, Item("common.items.armor.misc.neck.gold")),
// Utility
(0.05, Item("common.items.utility.collar")),
(0.5, Item("common.items.utility.collar")),
// Armor
(0.01, Item("common.items.armor.misc.head.bandana.thief")),
(0.01, Item("common.items.armor.misc.head.bandana.red")),
(0.01, Item("common.items.armor.misc.head.hood")),
(0.01, Item("common.items.armor.misc.head.hood_dark")),
(0.1, Item("common.items.armor.misc.head.bandana.thief")),
(0.1, Item("common.items.armor.misc.head.bandana.red")),
(0.1, Item("common.items.armor.misc.head.hood")),
(0.1, Item("common.items.armor.misc.head.hood_dark")),
// Food
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.25, LootTable("common.loot_tables.food.prepared")),

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

Binary file not shown.

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

Binary file not shown.

BIN
assets/voxygen/element/ui/map/icons/dif_map_icon.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

10
assets/world/dungeon/difficulty_distribution.ron
View File

@ -16,10 +16,10 @@
/// 1) Set every probability to 0.0 and left one with any other number
/// and you will have map full of dungeons of same level
([
(0, 0.20),
(1, 0.15),
(2, 0.15),
(0, 0.25),
(1, 0.20),
(2, 0.20),
(3, 0.15),
(4, 0.15),
(5, 0.20),
(4, 0.10),
(5, 0.10),
])

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

@ -623,11 +623,11 @@ impl Body {
quadruped_medium::Species::Wolf => 45,
quadruped_medium::Species::Frostfang => 40,
quadruped_medium::Species::Mouflon => 40,
quadruped_medium::Species::Catoblepas => 100,
quadruped_medium::Species::Catoblepas => 300,
quadruped_medium::Species::Bonerattler => 50,
quadruped_medium::Species::Deer => 50,
quadruped_medium::Species::Hirdrasil => 70,
quadruped_medium::Species::Roshwalr => 80,
quadruped_medium::Species::Roshwalr => 280,
quadruped_medium::Species::Donkey => 55,
quadruped_medium::Species::Zebra => 55,
quadruped_medium::Species::Antelope => 45,

1
voxygen/src/hud/img_ids.rs
View File

@ -397,6 +397,7 @@ image_ids! {
map_dif_4: "voxygen.element.ui.map.icons.dif_4",
map_dif_5: "voxygen.element.ui.map.icons.dif_5",
map_dif_6: "voxygen.element.ui.map.icons.dif_6",
map_dif_icon: "voxygen.element.ui.map.icons.dif_map_icon",
map_dif_unknown: "voxygen.element.ui.map.icons.dif_unknown",
mmap_site_town: "voxygen.element.ui.map.buttons.town",
mmap_site_town_hover: "voxygen.element.ui.map.buttons.town_hover",

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

@ -1,7 +1,7 @@
use super::{
img_ids::{Imgs, ImgsRot},
Show, QUALITY_COMMON, QUALITY_DEBUG, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE,
TEXT_BG, TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, UI_HIGHLIGHT_0, UI_MAIN,
Show, QUALITY_COMMON, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE, TEXT_BG,
TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, UI_HIGHLIGHT_0, UI_MAIN,
};
use crate::{
game_input::GameInput,
@ -477,7 +477,7 @@ impl<'a> Widget for Map<'a> {
.set(state.ids.map_settings_align, ui);
// Checkboxes
// Show difficulties
Image::new(self.imgs.map_dif_6)
Image::new(self.imgs.map_dif_icon)
.top_left_with_margins_on(state.ids.map_settings_align, 5.0, 5.0)
.w_h(20.0, 20.0)
.set(state.ids.show_difficulty_img, ui);
@ -873,11 +873,21 @@ impl<'a> Widget for Map<'a> {
});
let (difficulty, desc) = match &site.kind {
SiteKind::Town => (None, i18n.get("hud.map.town").to_string()),
SiteKind::Dungeon { difficulty } => (
Some(*difficulty),
i18n.get("hud.map.difficulty_dungeon")
.replace("{difficulty}", (difficulty + 1).to_string().as_str()),
),
SiteKind::Dungeon { difficulty } => {
if *difficulty < 5 {
(
Some(*difficulty),
i18n.get("hud.map.difficulty_dungeon")
.replace("{difficulty}", (difficulty + 1).to_string().as_str()),
)
} else {
(
Some(*difficulty),
i18n.get("hud.map.difficulty_dungeon")
.replace("{difficulty}", (difficulty).to_string().as_str()),
)
}
},
SiteKind::Castle => (None, i18n.get("hud.map.castle").to_string()),
SiteKind::Cave => (None, i18n.get("hud.map.cave").to_string()),
SiteKind::Tree => (None, i18n.get("hud.map.tree").to_string()),
@ -917,8 +927,7 @@ impl<'a> Widget for Map<'a> {
Some(1) => QUALITY_COMMON,
Some(2) => QUALITY_MODERATE,
Some(3) => QUALITY_HIGH,
Some(4) => QUALITY_EPIC,
Some(5) => QUALITY_DEBUG,
Some(4 | 5) => QUALITY_EPIC,
_ => TEXT_COLOR,
},
SiteKind::Cave => TEXT_COLOR,
@ -985,8 +994,7 @@ impl<'a> Widget for Map<'a> {
Some(1) => QUALITY_COMMON,
Some(2) => QUALITY_MODERATE,
Some(3) => QUALITY_HIGH,
Some(4) => QUALITY_EPIC,
Some(5) => QUALITY_DEBUG,
Some(4 | 5) => QUALITY_EPIC,
_ => TEXT_COLOR,
}));
match &site.kind {