From d7cd30bf3ff41ac695fffbc99a6fd6fc6107a7b7 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 1 Jul 2020 14:53:01 +0200
Subject: [PATCH] use combat skill instead of deadliness for murder check
---
src/events/scheduled/murderAttempt.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js
index c33bcc75acf..79ffdff1bc4 100644
--- a/src/events/scheduled/murderAttempt.js
+++ b/src/events/scheduled/murderAttempt.js
@@ -177,7 +177,7 @@ App.Events.murderAttempt = function() {
let r = [];
r.push("\"If you say so\", ", he,
"continues and starts explaining the plans anew, sometimes with great gestures, without ever getting to the point and you start to get bored");
- if (S.Bodyguard.skill.combat > 0 && canSee(S.Bodyguard)) {
+ if (S.Bodyguard.intelligence + S.Bodyguard.intelligenceImplant > 30 && canSee(S.Bodyguard)) {
r.push("until", he, "does on of", his, "grand gestures again and",
S.Bodyguard.slaveName, canWalk(S.Bodyguard) ? "jumps forward" : "starts");
if (perceptiveCareers.includes(V.PC.career)) {
@@ -200,9 +200,9 @@ App.Events.murderAttempt = function() {
function bgDefense(fragment, paragraphStart) {
paragraphStart.push("Before you can react to anything the", man, "draws a weapon and");
if (hasAnyArms(S.Bodyguard) && canSee(S.Bodyguard)) {
- const {she: sheBG, her: herBG} = getPronouns(S.Bodyguard);
+ const {her: herBG} = getPronouns(S.Bodyguard);
paragraphStart.push(paragraphStart.pop() + ",");
- if (Deadliness(S.Bodyguard) > 4) {
+ if (S.Bodyguard.skill.combat > 0) {
paragraphStart.push("just a moment faster,", S.Bodyguard.slaveName, "draws", herBG, "own, shooting", him,
"in the shoulder. Screaming of pain, ", he, "drops", his, "weapon and", S.Bodyguard.slaveName,
"swiftly moves to secure", him);
--
GitLab