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

Create 'push_utterance' function

Browse Source
This commit is contained in:
Dr. Dystopia 2022-01-26 21:12:19 +01:00
parent 765e858c19
commit 0516526985
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/controller.rs
View File

@ -280,6 +280,10 @@ impl Controller {
pub fn push_event(&mut self, event: ControlEvent) { self.events.push(event); }
pub fn push_utterance(&mut self, utterance: UtteranceKind) {
self.push_event(ControlEvent::Utterance(utterance));
}
pub fn push_action(&mut self, action: ControlAction) { self.actions.push(action); }
pub fn push_basic_input(&mut self, input: InputKind) {

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

@ -513,7 +513,7 @@ impl<'a> AgentData<'a> {
Some(AgentEvent::Hurt) => {
// Hurt utterances at random upon receiving damage
if rng.gen::<f32>() < 0.4 {
controller.push_event(ControlEvent::Utterance(UtteranceKind::Hurt));
controller.push_utterance(UtteranceKind::Hurt);
}
},
//Note: this should be unreachable
@ -581,7 +581,7 @@ impl<'a> AgentData<'a> {
if let Some(AgentEvent::Hurt) = agent.inbox.pop_front() {
// Hurt utterances at random upon receiving damage
if rng.gen::<f32>() < 0.4 {
controller.push_event(ControlEvent::Utterance(UtteranceKind::Hurt));
controller.push_utterance(UtteranceKind::Hurt);
}
}
@ -905,7 +905,7 @@ impl<'a> AgentData<'a> {
}
if rng.gen::<f32>() < 0.0015 {
controller.push_event(ControlEvent::Utterance(UtteranceKind::Calm));
controller.push_utterance(UtteranceKind::Calm);
}
// Sit
@ -971,7 +971,7 @@ impl<'a> AgentData<'a> {
if self.look_toward(controller, read_data, target) {
controller.push_action(ControlAction::Stand);
controller.push_action(ControlAction::Talk);
controller.push_event(ControlEvent::Utterance(UtteranceKind::Greeting));
controller.push_utterance(UtteranceKind::Greeting);
match subject {
Subject::Regular => {
@ -1328,7 +1328,7 @@ impl<'a> AgentData<'a> {
if small_chance {
self.chat_npc_if_allowed_to_speak("npc.speech.menacing", agent, event_emitter);
controller.push_event(ControlEvent::Utterance(UtteranceKind::Angry));
controller.push_utterance(UtteranceKind::Angry);
}
}
@ -1634,7 +1634,7 @@ impl<'a> AgentData<'a> {
.map(|(e, _)| e);
if agent.target.is_none() && target.is_some() {
controller.push_event(ControlEvent::Utterance(UtteranceKind::Angry));
controller.push_utterance(UtteranceKind::Angry);
}
agent.target = target.map(|target| Target {
@ -2147,7 +2147,7 @@ impl<'a> AgentData<'a> {
if let Some(by) = tgt_health.last_change.damage_by() {
if let Some(attacker) = get_entity_by_id(by.uid().0, read_data) {
if agent.target.is_none() {
controller.push_event(ControlEvent::Utterance(UtteranceKind::Angry));
controller.push_utterance(UtteranceKind::Angry);
}
agent.target = Some(Target::new(attacker, true, read_data.time.0, true));