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

Added secondary skills to agent code (except bow)

Browse Source
This commit is contained in:
jiminycrick 2020-10-07 13:52:29 -07:00 committed by Robin Gilh
parent 6c54e6d8fe
commit 50aac17d94
5 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,16 @@ impl Body {
}
}
pub fn base_energy(&self) -> u32 {
match self {
Body::BipedLarge(biped_large) => match biped_large.species {
biped_large::Species::Dullahan => 4000,
_ => 3000,
},
_ => 1000,
}
}
#[allow(unreachable_patterns)]
pub fn base_health(&self) -> u32 {
match self {

2
common/src/comp/inventory/item/tool.rs
View File

@ -262,8 +262,6 @@ impl Tool {
max_angle: 30.0,
charge_duration: Duration::from_millis(1200),
swing_duration: Duration::from_millis(400),
recover_duration: Duration::from_millis(100),
},
LeapMelee {
energy_cost: 700,
buildup_duration: Duration::from_millis(100),

2
common/src/comp/mod.rs
View File

@ -2,7 +2,7 @@ mod ability;
mod admin;
pub mod agent;
pub mod beam;
mod body;
pub mod body;
mod character_state;
pub mod chat;
mod controller;

43
common/src/sys/agent.rs
View File

@ -39,6 +39,7 @@ impl<'a> System<'a> for Sys {
ReadExpect<'a, SysMetrics>,
Write<'a, EventBus<ServerEvent>>,
Entities<'a>,
ReadStorage<'a, Energy>,
ReadStorage<'a, Pos>,
ReadStorage<'a, Vel>,
ReadStorage<'a, Ori>,
@ -71,6 +72,7 @@ impl<'a> System<'a> for Sys {
sys_metrics,
event_bus,
entities,
energies,
positions,
velocities,
orientations,
@ -96,6 +98,7 @@ impl<'a> System<'a> for Sys {
span!(_guard, "run", "agent::Sys::run");
for (
entity,
energy,
pos,
vel,
ori,
@ -112,6 +115,7 @@ impl<'a> System<'a> for Sys {
energy,
) in (
&entities,
&energies,
&positions,
&velocities,
&orientations,
@ -301,6 +305,8 @@ impl<'a> System<'a> for Sys {
#[derive(Eq, PartialEq)]
enum Tactic {
Melee,
Hammer,
Sword,
RangedPowerup,
Staff,
StoneGolemBoss,
@ -315,11 +321,11 @@ impl<'a> System<'a> for Sys {
}) {
Some(ToolKind::Bow(_)) => Tactic::RangedPowerup,
Some(ToolKind::Staff(_)) => Tactic::Staff,
Some(ToolKind::NpcWeapon(kind)) => {
match kind.as_str() {
"StoneGolemsFist" => Tactic::StoneGolemBoss,
_ => Tactic::Melee,
}
Some(ToolKind::Hammer(_)) => Tactic::Hammer,
Some(ToolKind::Sword(_)) => Tactic::Sword,
Some(ToolKind::NpcWeapon(kind)) => match kind.as_str() {
"StoneGolemsFist" => Tactic::StoneGolemBoss,
_ => Tactic::Melee,
},
_ => Tactic::Melee,
};
@ -400,8 +406,12 @@ impl<'a> System<'a> for Sys {
* 0.1;
match tactic {
Tactic::Melee | Tactic::StoneGolemBoss => {
inputs.primary.set_state(true)
Tactic::Melee
| Tactic::Staff
| Tactic::Hammer
| Tactic::StoneGolemBoss => inputs.primary.set_state(true),
Tactic::Sword => {
inputs.primary.set_state(true);
},
Tactic::Staff => {
if energy.current() > 10 {
@ -433,6 +443,13 @@ impl<'a> System<'a> for Sys {
inputs.primary.set_state(true);
*powerup += dt.0;
}
} else if let Tactic::Sword = tactic {
if *powerup > 4.0 {
inputs.secondary.set_state(true);
*powerup = 0.0;
} else {
*powerup += dt.0;
}
} else if let Tactic::Staff = tactic {
if *powerup > 2.5 {
inputs.primary.set_state(false);
@ -441,6 +458,18 @@ impl<'a> System<'a> for Sys {
inputs.primary.set_state(true);
*powerup += dt.0;
}
if energy.current() > 400 {
inputs.ability3.set_state(true);
} else {
inputs.secondary.set_state(true);
}
} else if let Tactic::Hammer = tactic {
if *powerup > 5.0 {
inputs.secondary.set_state(true);
*powerup = 0.0;
} else {
*powerup += dt.0;
}
} else if let Tactic::StoneGolemBoss = tactic {
if *powerup > 5.0 {
inputs.secondary.set_state(true);

2
server/src/state_ext.rs
View File

@ -107,7 +107,7 @@ impl StateExt for State {
.with(body)
.with(stats)
.with(comp::Alignment::Npc)
.with(comp::Energy::new(500))
.with(comp::Energy::new(body.base_energy()))
.with(comp::Gravity(1.0))
.with(comp::CharacterState::default())
.with(loadout)