aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsD <stoned@derpymail.org>2020-05-05 19:44:52 +0200
committersD <stoned@derpymail.org>2020-05-05 19:44:52 +0200
commit26025b94a23fedcc45005ca6e7367e7b9a2bc1a4 (patch)
tree87fc986efe5911d776f872fa0c28e3af3dead27e
parentaae8106325acb7f730e4c914fab4ac7b0af425e3 (diff)
evidence got run over in "support 2.7"
-rw-r--r--webAO/client.html2
-rw-r--r--webAO/client.js6
2 files changed, 3 insertions, 5 deletions
diff --git a/webAO/client.html b/webAO/client.html
index 1b639d4..0e47929 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -319,7 +319,7 @@
<br>
<div id="evidences"></div>
<br>
- <button id="button_present" alt="Present" class="client_button" onclick="togglePresent()">Present</button>
+ <button id="button_present" alt="Present" class="client_button" onclick="toggleEffect()">Present</button>
</span>
<!-- Settings section -->
diff --git a/webAO/client.js b/webAO/client.js
index 9eb3768..886f16d 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -106,8 +106,6 @@ class Client extends EventEmitter {
// Preset some of the variables
- this.presentable = false;
-
this.hp = [0, 0];
this.playerID = 1;
@@ -214,10 +212,10 @@ class Client extends EventEmitter {
}
/**
- * Gets the player's currently selected evidence if presentable.
+ * Gets the current evidence ID unless the player doesn't want to present any evidence
*/
get evidence() {
- return this.presentable ? this.selectedEvidence : 0;
+ return (document.getElementById("button_present").classList.contains("dark")) ? this.selectedEvidence : 0;
}
/**