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 'james/agent-tactic-refactor' into 'master'

Browse Source 
Move weapon tactics to functions and take target body into attack radius consideration

See merge request veloren/veloren!2263
This commit is contained in:
Samuel Keiffer 2021-05-06 21:17:10 +00:00
commit 1ef748c4f3
2 changed files with 1785 additions and 1353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/src/comp/agent.rs
View File

@ -15,34 +15,6 @@ use super::dialogue::Subject;
pub const DEFAULT_INTERACTION_TIME: f32 = 3.0; pub const DEFAULT_INTERACTION_TIME: f32 = 3.0;
pub const TRADE_INTERACTION_TIME: f32 = 300.0; pub const TRADE_INTERACTION_TIME: f32 = 300.0;
#[derive(Eq, PartialEq)]
pub enum Tactic {
Melee,
Axe,
Hammer,
Sword,
Bow,
Staff,
StoneGolem,
CircleCharge { radius: u32, circle_time: u32 },
QuadLowRanged,
TailSlap,
QuadLowQuick,
QuadLowBasic,
QuadLowBeam,
QuadMedJump,
QuadMedBasic,
Lavadrake,
Theropod,
Turret,
FixedTurret,
RotatingTurret,
Mindflayer,
BirdLargeBreathe,
BirdLargeFire,
Minotaur,
}
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]
pub enum Alignment { pub enum Alignment {
/// Wild animals and gentle giants /// Wild animals and gentle giants

3110
server/src/sys/agent.rs
View File

File diff suppressed because it is too large Load Diff