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

randomised harvester's far pumpkin throw; armor and weapon drops of same tier

Browse Source
This commit is contained in:
horblegorble 2024-06-22 19:41:14 +10:00
parent 60f4be1116
commit 2509eb8d3d
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/common/loot_tables/dungeon/gnarling/chieftain.ron
View File

@ -1,14 +1,8 @@
[ [
(1, All([ (1, All([
Lottery([ All([
(1.0, All([ LootTable("common.loot_tables.armor.tier-1"),
LootTable("common.loot_tables.armor.tier-0"), LootTable("common.loot_tables.weapons.tier-1"),
LootTable("common.loot_tables.weapons.tier-1"),
])),
(1.0, All([
LootTable("common.loot_tables.weapons.tier-0"),
LootTable("common.loot_tables.armor.tier-1"),
])),
]), ]),
Lottery([ Lottery([
(2.0, Nothing), (2.0, Nothing),

12
assets/common/loot_tables/dungeon/gnarling/harvester.ron
View File

@ -1,14 +1,8 @@
[ [
(1, All([ (1, All([
Lottery([ All([
(1.0, All([ LootTable("common.loot_tables.armor.tier-2"),
LootTable("common.loot_tables.armor.tier-1"), LootTable("common.loot_tables.weapons.tier-2"),
LootTable("common.loot_tables.weapons.tier-2"),
])),
(1.0, All([
LootTable("common.loot_tables.weapons.tier-1"),
LootTable("common.loot_tables.armor.tier-2"),
])),
]), ]),
Lottery([ Lottery([
(3.0, Nothing), (3.0, Nothing),

39
server/agent/src/attack.rs
View File

@ -4786,12 +4786,9 @@ impl<'a> AgentData<'a> {
const FIREBREATH_TIME: f32 = 4.0; const FIREBREATH_TIME: f32 = 4.0;
const FIREBREATH_SHORT_TIME: f32 = 2.5; // cutoff sooner at close range const FIREBREATH_SHORT_TIME: f32 = 2.5; // cutoff sooner at close range
const FIREBREATH_COOLDOWN: f32 = 3.5; const FIREBREATH_COOLDOWN: f32 = 3.5;
const FAR_PUMPKIN_COOLDOWN: f32 = 1.0; // allows for pathing to player between throws const CLOSE_MIXUP_COOLDOWN_SPAN: [f32; 2] = [1.5, 7.0]; // variation in attacks at close range
// const CLOSE_MIXUP_COOLDOWN: f32 = 2.5; // variation in attacks at close range const MID_MIXUP_COOLDOWN_SPAN: [f32; 2] = [2.0, 6.0]; // ^ mid
// const MID_MIXUP_COOLDOWN: f32 = 3.0; // ^ mid const FAR_PUMPKIN_COOLDOWN_SPAN: [f32; 2] = [3.6, 5.0]; // allows for pathing to player between throws
const CLOSE_MIXUP_COOLDOWN_SPAN: [f32; 2] = [1.5, 7.0];
const MID_MIXUP_COOLDOWN_SPAN: [f32; 2] = [2.0, 6.0];
// notes on cooldown values: // notes on cooldown values:
// - scalar values are from the end of an attack // - scalar values are from the end of an attack
// - span values are from the beginning of an attack // - span values are from the beginning of an attack
@ -4800,7 +4797,7 @@ impl<'a> AgentData<'a> {
enum ActionStateConditions { enum ActionStateConditions {
FirstVines = 0, FirstVines = 0,
SecondVines, SecondVines,
MixupInit, RandomInit,
} }
// timers // timers
@ -4814,6 +4811,7 @@ impl<'a> AgentData<'a> {
enum ActionStateCounters { enum ActionStateCounters {
CloseMixupCooldown = 0, CloseMixupCooldown = 0,
MidMixupCooldown, MidMixupCooldown,
FarPumpkinCooldown,
} }
// line of sight check // line of sight check
@ -4831,26 +4829,24 @@ impl<'a> AgentData<'a> {
// === main === // === main ===
// initialise mixup cooldowns // initialise randomised cooldowns
if !agent.combat_state.conditions[ActionStateConditions::MixupInit as usize] { if !agent.combat_state.conditions[ActionStateConditions::RandomInit as usize] {
agent.combat_state.conditions[ActionStateConditions::RandomInit as usize] = true;
agent.combat_state.counters[ActionStateCounters::CloseMixupCooldown as usize] = agent.combat_state.counters[ActionStateCounters::CloseMixupCooldown as usize] =
midpoint(CLOSE_MIXUP_COOLDOWN_SPAN); rng.gen_range(CLOSE_MIXUP_COOLDOWN_SPAN[0]..=CLOSE_MIXUP_COOLDOWN_SPAN[1]);
agent.combat_state.counters[ActionStateCounters::MidMixupCooldown as usize] = agent.combat_state.counters[ActionStateCounters::MidMixupCooldown as usize] =
midpoint(MID_MIXUP_COOLDOWN_SPAN); rng.gen_range(MID_MIXUP_COOLDOWN_SPAN[0]..=MID_MIXUP_COOLDOWN_SPAN[1]);
agent.combat_state.conditions[ActionStateConditions::MixupInit as usize] = true; agent.combat_state.counters[ActionStateCounters::FarPumpkinCooldown as usize] =
rng.gen_range(FAR_PUMPKIN_COOLDOWN_SPAN[0]..=FAR_PUMPKIN_COOLDOWN_SPAN[1]);
} }
// --- timers --- // --- timers ---
// mixup timer reset is handled within attack logic // mixup and far pumpkin timer resets are handled within attack logic
match self.char_state { match self.char_state {
CharacterState::BasicBeam(_) => { CharacterState::BasicBeam(_) => {
// reset when using firebreath // reset when using firebreath
agent.combat_state.timers[ActionStateTimers::Firebreath as usize] = 0.0; agent.combat_state.timers[ActionStateTimers::Firebreath as usize] = 0.0;
}, },
CharacterState::BasicRanged(_) => {
// reset when using explodingpumpkin
agent.combat_state.timers[ActionStateTimers::FarPumpkin as usize] = 0.0;
},
_ => { _ => {
// increment otherwise // increment otherwise
agent.combat_state.timers[ActionStateTimers::Firebreath as usize] += read_data.dt.0; agent.combat_state.timers[ActionStateTimers::Firebreath as usize] += read_data.dt.0;
@ -4957,10 +4953,17 @@ impl<'a> AgentData<'a> {
else if attack_data.dist_sqrd < MAX_PUMPKIN_RANGE.powi(2) else if attack_data.dist_sqrd < MAX_PUMPKIN_RANGE.powi(2)
&& line_of_sight_with_target() && line_of_sight_with_target()
&& agent.combat_state.timers[ActionStateTimers::FarPumpkin as usize] && agent.combat_state.timers[ActionStateTimers::FarPumpkin as usize]
> FAR_PUMPKIN_COOLDOWN > agent.combat_state.counters[ActionStateCounters::FarPumpkinCooldown as usize]
{ {
// throw pumpkin // throw pumpkin
controller.push_basic_input(InputKind::Ability(0)); controller.push_basic_input(InputKind::Ability(0));
// check if pumpkin is being used
if matches!(self.char_state, CharacterState::BasicRanged(_) ) {
// reset pumpkin timer and setup new cooldown
agent.combat_state.timers[ActionStateTimers::FarPumpkin as usize] = 0.0;
agent.combat_state.counters[ActionStateCounters::FarPumpkinCooldown as usize] =
rng.gen_range(FAR_PUMPKIN_COOLDOWN_SPAN[0]..=FAR_PUMPKIN_COOLDOWN_SPAN[1]);
}
} }
// --- movement --- // --- movement ---