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

Abbreviate logic

Browse Source
This commit is contained in:
holychowders 2021-05-16 02:11:05 -07:00 committed by Avi Weinstock
parent 7cfa67ad49
commit e2972b0a81
1 changed files with 73 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -644,21 +644,10 @@ impl<'a> AgentData<'a> {
let dist_sqrd = self.pos.0.distance_squared(tgt_pos.0); let dist_sqrd = self.pos.0.distance_squared(tgt_pos.0);
// Should the agent flee? // Should the agent flee?
if 1.0 - agent.psyche.aggro > self.damage && self.flees { if 1.0 - agent.psyche.aggro > self.damage && self.flees {
if agent.action_state.timer == 0.0 if agent.action_state.timer == 0.0 {
&& agent.behavior.can(BehaviorCapability::SPEAK)
{
let msg = "npc.speech.villager_under_attack".to_string(); let msg = "npc.speech.villager_under_attack".to_string();
event_emitter self.chat_general_if_can_speak(agent, msg, event_emitter);
.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg))); self.emit_villager_alarm(read_data.time.0, event_emitter);
event_emitter.emit(ServerEvent::Sound {
sound: Sound::new(
SoundKind::VillagerAlarm,
self.pos.0,
100.0,
read_data.time.0,
Some(*self.entity),
),
});
agent.action_state.timer = 0.01; agent.action_state.timer = 0.01;
} else if agent.action_state.timer < FLEE_DURATION || dist_sqrd < MAX_FLEE_DIST } else if agent.action_state.timer < FLEE_DURATION || dist_sqrd < MAX_FLEE_DIST
{ {
@ -681,6 +670,7 @@ impl<'a> AgentData<'a> {
.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg))); .emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
} }
agent.target = None; agent.target = None;
self.idle(agent, controller, &read_data);
// Choose a new target every 10 seconds, but only for // Choose a new target every 10 seconds, but only for
// enemies // enemies
// TODO: This should be more principled. Consider factoring // TODO: This should be more principled. Consider factoring
@ -956,7 +946,7 @@ impl<'a> AgentData<'a> {
let msg = agent.inbox.pop_front(); let msg = agent.inbox.pop_front();
match msg { match msg {
Some(AgentEvent::Talk(by, subject)) => { Some(AgentEvent::Talk(by, subject)) => {
if agent.behavior.can(BehaviorCapability::SPEAK) { if can_speak(agent) {
if let Some(target) = read_data.uid_allocator.retrieve_entity_internal(by.id()) if let Some(target) = read_data.uid_allocator.retrieve_entity_internal(by.id())
{ {
agent.target = build_target(target, false, read_data.time.0); agent.target = build_target(target, false, read_data.time.0);
@ -1005,19 +995,13 @@ impl<'a> AgentData<'a> {
destination_name destination_name
) )
}; };
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} else if agent.behavior.can_trade() { } else if agent.behavior.can_trade() {
let msg = "npc.speech.merchant_advertisement".to_string(); let msg = "npc.speech.merchant_advertisement".to_string();
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} else { } else {
let msg = "npc.speech.villager".to_string(); let msg = "npc.speech.villager".to_string();
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} }
}, },
Subject::Trade => { Subject::Trade => {
@ -1029,26 +1013,16 @@ impl<'a> AgentData<'a> {
)); ));
let msg = let msg =
"npc.speech.merchant_advertisement".to_string(); "npc.speech.merchant_advertisement".to_string();
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} else { } else {
event_emitter.emit(ServerEvent::Chat( let msg = "npc.speech.merchant_busy".to_string();
UnresolvedChatMsg::npc( self.chat_general(msg, event_emitter);
*self.uid,
"npc.speech.merchant_busy".to_string(),
),
));
} }
} else { } else {
// TODO: maybe make some travellers willing to trade with // TODO: maybe make some travellers willing to trade with
// simpler goods like potions // simpler goods like potions
event_emitter.emit(ServerEvent::Chat( let msg = "npc.speech.villager_decline_trade".to_string();
UnresolvedChatMsg::npc( self.chat_general(msg, event_emitter);
*self.uid,
"npc.speech.villager_decline_trade".to_string(),
),
));
} }
}, },
Subject::Mood => { Subject::Mood => {
@ -1097,33 +1071,21 @@ impl<'a> AgentData<'a> {
MemoryItem::Mood { state } => state.describe(), MemoryItem::Mood { state } => state.describe(),
_ => "".to_string(), _ => "".to_string(),
}; };
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} }
} }
}, },
Subject::Location(location) => { Subject::Location(location) => {
if let Some(tgt_pos) = read_data.positions.get(target) { if let Some(tgt_pos) = read_data.positions.get(target) {
event_emitter.emit(ServerEvent::Chat( let raw_dir = location.origin.as_::<f32>() - tgt_pos.0.xy();
UnresolvedChatMsg::npc( let dist = Distance::from_dir(raw_dir).name();
*self.uid, let dir = Direction::from_dir(raw_dir).name();
format!(
"{} ? I think it's {} {} from here!", let msg = format!(
location.name, "{} ? I think it's {} {} from here!",
Distance::from_dir( location.name, dist, dir
location.origin.as_::<f32>() );
- tgt_pos.0.xy() self.chat_general(msg, event_emitter);
)
.name(),
Direction::from_dir(
location.origin.as_::<f32>()
- tgt_pos.0.xy()
)
.name()
),
),
));
} }
}, },
Subject::Person(person) => { Subject::Person(person) => {
@ -1158,9 +1120,7 @@ impl<'a> AgentData<'a> {
person.name() person.name()
) )
}; };
event_emitter.emit(ServerEvent::Chat( self.chat_general(msg, event_emitter);
UnresolvedChatMsg::npc(*self.uid, msg),
));
} }
}, },
Subject::Work => {}, Subject::Work => {},
@ -1189,24 +1149,16 @@ impl<'a> AgentData<'a> {
controller controller
.events .events
.push(ControlEvent::InviteResponse(InviteResponse::Decline)); .push(ControlEvent::InviteResponse(InviteResponse::Decline));
if agent.behavior.can(BehaviorCapability::SPEAK) { let msg = "npc.speech.merchant_busy".to_string();
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc( self.chat_general_if_can_speak(agent, msg, event_emitter);
*self.uid,
"npc.speech.merchant_busy".to_string(),
)));
}
} }
} else { } else {
// TODO: Provide a hint where to find the closest merchant? // TODO: Provide a hint where to find the closest merchant?
controller controller
.events .events
.push(ControlEvent::InviteResponse(InviteResponse::Decline)); .push(ControlEvent::InviteResponse(InviteResponse::Decline));
if agent.behavior.can(BehaviorCapability::SPEAK) { let msg = "npc.speech.villager_decline_trade".to_string();
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc( self.chat_general_if_can_speak(agent, msg, event_emitter);
*self.uid,
"npc.speech.villager_decline_trade".to_string(),
)));
}
} }
}, },
Some(AgentEvent::TradeAccepted(with)) => { Some(AgentEvent::TradeAccepted(with)) => {
@ -1224,15 +1176,13 @@ impl<'a> AgentData<'a> {
if agent.behavior.is(BehaviorState::TRADING) { if agent.behavior.is(BehaviorState::TRADING) {
match result { match result {
TradeResult::Completed => { TradeResult::Completed => {
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc( let msg = "npc.speech.merchant_trade_successful".to_string();
*self.uid, self.chat_general(msg, event_emitter);
"npc.speech.merchant_trade_successful".to_string(), },
))) _ => {
let msg = "npc.speech.merchant_trade_declined".to_string();
self.chat_general(msg, event_emitter);
}, },
_ => event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(
*self.uid,
"npc.speech.merchant_trade_declined".to_string(),
))),
} }
agent.behavior.unset(BehaviorState::TRADING); agent.behavior.unset(BehaviorState::TRADING);
} }
@ -1269,6 +1219,7 @@ impl<'a> AgentData<'a> {
balance0 / balance1 * 100.0 balance0 / balance1 * 100.0
); );
if let Some(tgt_data) = &agent.target { if let Some(tgt_data) = &agent.target {
// If talking with someone in particular, "tell" it only to them
if let Some(with) = read_data.uids.get(tgt_data.target) { if let Some(with) = read_data.uids.get(tgt_data.target) {
event_emitter.emit(ServerEvent::Chat( event_emitter.emit(ServerEvent::Chat(
UnresolvedChatMsg::npc_tell(*self.uid, *with, msg), UnresolvedChatMsg::npc_tell(*self.uid, *with, msg),
@ -1297,7 +1248,7 @@ impl<'a> AgentData<'a> {
} }
}, },
_ => { _ => {
if agent.behavior.can(BehaviorCapability::SPEAK) { if can_speak(agent) {
// No new events, continue looking towards the last interacting player for some // No new events, continue looking towards the last interacting player for some
// time // time
if let Some(Target { target, .. }) = &agent.target { if let Some(Target { target, .. }) = &agent.target {
@ -1463,7 +1414,7 @@ impl<'a> AgentData<'a> {
&& !invulnerability_is_in_buffs(read_data.buffs.get(*e)) && !invulnerability_is_in_buffs(read_data.buffs.get(*e))
&& (try_owner_alignment(self.alignment, read_data).and_then(|a| try_owner_alignment(*e_alignment, read_data).map(|b| a.hostile_towards(*b))).unwrap_or(false) || ( && (try_owner_alignment(self.alignment, read_data).and_then(|a| try_owner_alignment(*e_alignment, read_data).map(|b| a.hostile_towards(*b))).unwrap_or(false) || (
if let Some(rtsim_entity) = &self.rtsim_entity { if let Some(rtsim_entity) = &self.rtsim_entity {
if agent.behavior.can(BehaviorCapability::SPEAK) { if can_speak(agent) {
if rtsim_entity.brain.remembers_fight_with_character(&e_stats.name) { if rtsim_entity.brain.remembers_fight_with_character(&e_stats.name) {
agent.rtsim_controller.events.push( agent.rtsim_controller.events.push(
RtSimEvent::AddMemory(Memory { RtSimEvent::AddMemory(Memory {
@ -1472,7 +1423,7 @@ impl<'a> AgentData<'a> {
}) })
); );
let msg = format!("{}! How dare you cross me again!", e_stats.name.clone()); let msg = format!("{}! How dare you cross me again!", e_stats.name.clone());
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg))); self.chat_general(msg, event_emitter);
true true
} else { } else {
false false
@ -1487,7 +1438,7 @@ impl<'a> AgentData<'a> {
( (
self.alignment.map_or(false, |alignment| { self.alignment.map_or(false, |alignment| {
if matches!(alignment, Alignment::Npc) && e_inventory.equipped_items().filter(|item| item.tags().contains(&ItemTag::Cultist)).count() > 2 { if matches!(alignment, Alignment::Npc) && e_inventory.equipped_items().filter(|item| item.tags().contains(&ItemTag::Cultist)).count() > 2 {
if agent.behavior.can(BehaviorCapability::SPEAK) { if can_speak(agent) {
if self.rtsim_entity.is_some() { if self.rtsim_entity.is_some() {
agent.rtsim_controller.events.push( agent.rtsim_controller.events.push(
RtSimEvent::AddMemory(Memory { RtSimEvent::AddMemory(Memory {
@ -1497,16 +1448,8 @@ impl<'a> AgentData<'a> {
); );
} }
let msg = "npc.speech.villager_cultist_alarm".to_string(); let msg = "npc.speech.villager_cultist_alarm".to_string();
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg))); self.chat_general(msg, event_emitter);
event_emitter.emit(ServerEvent::Sound { self.emit_villager_alarm(read_data.time.0, event_emitter);
sound: Sound::new(
SoundKind::VillagerAlarm,
self.pos.0,
100.0,
read_data.time.0,
Some(*self.entity),
),
});
} }
true true
} else { } else {
@ -4001,6 +3944,20 @@ impl<'a> AgentData<'a> {
} }
} }
fn chat_general_if_can_speak(
&self,
agent: &Agent,
msg: String,
event_emitter: &mut Emitter<'_, ServerEvent>,
) -> bool {
if can_speak(agent) {
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
true
} else {
false
}
}
fn jump_if(&self, controller: &mut Controller, condition: bool) { fn jump_if(&self, controller: &mut Controller, condition: bool) {
if condition { if condition {
controller controller
@ -4012,6 +3969,22 @@ impl<'a> AgentData<'a> {
.push(ControlAction::CancelInput(InputKind::Jump)) .push(ControlAction::CancelInput(InputKind::Jump))
} }
} }
fn chat_general(&self, msg: String, event_emitter: &mut Emitter<'_, ServerEvent>) {
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
}
fn emit_villager_alarm(&self, time: f64, event_emitter: &mut Emitter<'_, ServerEvent>) {
event_emitter.emit(ServerEvent::Sound {
sound: Sound::new(
SoundKind::VillagerAlarm,
self.pos.0,
100.0,
time,
Some(*self.entity),
),
});
}
} }
fn can_see_tgt(terrain: &TerrainGrid, pos: &Pos, tgt_pos: &Pos, dist_sqrd: f32) -> bool { fn can_see_tgt(terrain: &TerrainGrid, pos: &Pos, tgt_pos: &Pos, dist_sqrd: f32) -> bool {
@ -4133,3 +4106,5 @@ fn build_target_data<'a>(
scale: read_data.scales.get(target), scale: read_data.scales.get(target),
} }
} }
fn can_speak(agent: &Agent) -> bool { agent.behavior.can(BehaviorCapability::SPEAK) }