mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand.
This commit is contained in:
Sam
parent
70d6f3a854
commit
d1c5d3e020
@ -215,6 +215,7 @@ widget_ids! {
|
||||
main_weap_select,
|
||||
off_weap_select,
|
||||
abilities[],
|
||||
abilities_dual[],
|
||||
ability_titles[],
|
||||
ability_descs[],
|
||||
dragged_ability,
|
||||
@ -921,8 +922,6 @@ impl<'a> Widget for Diary<'a> {
|
||||
}
|
||||
});
|
||||
|
||||
// TODO: Maybe try to keep this as an iterator. Not sure how to get length
|
||||
// though since size_hint didn't work
|
||||
let main_weap_abilities = ActiveAbilities::iter_unlocked_abilities(
|
||||
Some(self.inventory),
|
||||
Some(self.skill_set),
|
||||
@ -939,11 +938,8 @@ impl<'a> Widget for Diary<'a> {
|
||||
.map(|a| (Ability::from(a).ability_id(Some(self.inventory)), a));
|
||||
|
||||
let abilities: Vec<_> = if same_weap_kinds {
|
||||
// When the weapons have the same ability kind, interweave the abilities
|
||||
main_weap_abilities
|
||||
.zip(off_weap_abilities)
|
||||
.flat_map(|(a, b)| [a, b])
|
||||
.collect()
|
||||
// When the weapons have the same ability kind take only the main weapons,
|
||||
main_weap_abilities.collect()
|
||||
} else {
|
||||
main_weap_abilities.chain(off_weap_abilities).collect()
|
||||
};
|
||||
@ -956,12 +952,17 @@ impl<'a> Widget for Diary<'a> {
|
||||
state.update(|s| s.ability_page = 0);
|
||||
}
|
||||
|
||||
let update_length = abilities.len().min(12);
|
||||
let update_length = 12;
|
||||
state.update(|s| {
|
||||
s.ids
|
||||
.abilities
|
||||
.resize(update_length, &mut ui.widget_id_generator())
|
||||
});
|
||||
state.update(|s| {
|
||||
s.ids
|
||||
.abilities_dual
|
||||
.resize(update_length, &mut ui.widget_id_generator())
|
||||
});
|
||||
state.update(|s| {
|
||||
s.ids
|
||||
.ability_titles
|
||||
@ -1040,18 +1041,56 @@ impl<'a> Widget for Diary<'a> {
|
||||
events.push(Event::SelectAbility(None));
|
||||
}
|
||||
}
|
||||
if same_weap_kinds {
|
||||
if let AuxiliaryAbility::MainWeapon(slot) = ability {
|
||||
let ability = AuxiliaryAbility::OffWeapon(*slot);
|
||||
let map_id = state.ids.abilities_dual[id_index];
|
||||
state.update(|s| {
|
||||
s.id_ability_map.insert(map_id, ability);
|
||||
});
|
||||
if Button::image(ability_image)
|
||||
.w_h(100.0, 100.0)
|
||||
.top_right_with_margins_on(align_state, 20.0 + image_offsets, 20.0)
|
||||
.set(state.ids.abilities_dual[id_index], ui)
|
||||
.was_clicked()
|
||||
{
|
||||
if Some(ability) != self.show.diary_fields.selected_ability {
|
||||
events.push(Event::SelectAbility(Some(ability)));
|
||||
} else {
|
||||
events.push(Event::SelectAbility(None));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// The page width...
|
||||
let text_width = 299.0 * 2.0
|
||||
- if same_weap_kinds && matches!(ability, AuxiliaryAbility::MainWeapon(_)) {
|
||||
// with double the width of an ability image and some padding subtracted
|
||||
// if dual wielding two of the same weapon kind
|
||||
(20.0 + 100.0 + 10.0) * 2.0
|
||||
} else {
|
||||
// or the width of an ability image and some padding subtracted
|
||||
// otherwise
|
||||
20.0 * 2.0 + 100.0
|
||||
};
|
||||
Text::new(ability_title)
|
||||
.top_left_with_margins_on(state.ids.abilities[id_index], 5.0, 125.0)
|
||||
.top_left_with_margins_on(state.ids.abilities[id_index], 5.0, 110.0)
|
||||
.font_id(self.fonts.cyri.conrod_id)
|
||||
.font_size(self.fonts.cyri.scale(tweak!(28)))
|
||||
.color(ability_color)
|
||||
.w(text_width)
|
||||
.graphics_for(state.ids.abilities[id_index])
|
||||
.set(state.ids.ability_titles[id_index], ui);
|
||||
Text::new(ability_desc)
|
||||
.top_left_with_margins_on(state.ids.abilities[id_index], 30.0, 125.0)
|
||||
.top_left_with_margins_on(
|
||||
state.ids.abilities[id_index],
|
||||
tweak!(40.0),
|
||||
110.0,
|
||||
)
|
||||
.font_id(self.fonts.cyri.conrod_id)
|
||||
.font_size(self.fonts.cyri.scale(tweak!(18)))
|
||||
.color(ability_color)
|
||||
.w(text_width)
|
||||
.graphics_for(state.ids.abilities[id_index])
|
||||
.set(state.ids.ability_descs[id_index], ui);
|
||||
}
|
||||
|
||||
@ -365,52 +365,41 @@ pub fn ability_description(ability_id: &str) -> (&str, &str) {
|
||||
// Debug stick
|
||||
"common.abilities.debug.possess" => (
|
||||
"Possessing Arrow",
|
||||
"\n\
|
||||
Shoots a poisonous arrow.\n\
|
||||
Lets you control your target.",
|
||||
"Shoots a poisonous arrow. Lets you control your target.",
|
||||
),
|
||||
// Sword
|
||||
"common.abilities.sword.spin" => (
|
||||
"Whirlwind",
|
||||
"\n\
|
||||
Move forward while spinning with your sword.",
|
||||
"Move forward while spinning with your sword.",
|
||||
),
|
||||
// Axe
|
||||
"common.abilities.axe.leap" => (
|
||||
"Axe Jump",
|
||||
"\n\
|
||||
A jump with the slashing leap to position of cursor.",
|
||||
"A jump with the slashing leap to position of cursor.",
|
||||
),
|
||||
// Hammer
|
||||
"common.abilities.hammer.leap" => (
|
||||
"Smash of Doom",
|
||||
"\n\
|
||||
An AOE attack with knockback.\n\
|
||||
Leaps to position of cursor.",
|
||||
"An AOE attack with knockback. Leaps to position of cursor.",
|
||||
),
|
||||
// Bow
|
||||
"common.abilities.bow.shotgun" => (
|
||||
"Burst",
|
||||
"\n\
|
||||
Launches a burst of arrows",
|
||||
"Launches a burst of arrows",
|
||||
),
|
||||
// Staff
|
||||
"common.abilities.staff.fireshockwave" => (
|
||||
"Ring of Fire",
|
||||
"\n\
|
||||
Ignites the ground with fiery shockwave.",
|
||||
"Ignites the ground with fiery shockwave.",
|
||||
),
|
||||
// Sceptre
|
||||
"common.abilities.sceptre.wardingaura" => (
|
||||
"Thorn Bulwark",
|
||||
"\n\
|
||||
Protects you and your group with thorns\n\
|
||||
for a short amount of time.",
|
||||
"Protects you and your group with thorns for a short amount of time.",
|
||||
),
|
||||
_ => (
|
||||
"Ability has no title",
|
||||
"\n\
|
||||
Ability has no description."
|
||||
"Ability has no description."
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user