aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorneauoire <[email protected]>2019-12-06 07:27:29 -0500
committerneauoire <[email protected]>2019-12-06 07:27:29 -0500
commit35f0f52be7b5539323c8312aa24c351ee44956eb (patch)
tree86b7b29b08ba8dfa7ba382eecc2ac7eec15b6f4c
parent9479b55a43f8799330ec9d79598f600e9a19c02a (diff)
downloadOrca-35f0f52be7b5539323c8312aa24c351ee44956eb.tar.gz
Orca-35f0f52be7b5539323c8312aa24c351ee44956eb.zip
Banging ports do not lock
-rw-r--r--desktop/sources/scripts/client.js2
-rw-r--r--desktop/sources/scripts/commander.js2
-rw-r--r--desktop/sources/scripts/core/operator.js1
-rw-r--r--sw.js2
4 files changed, 4 insertions, 3 deletions
diff --git a/desktop/sources/scripts/client.js b/desktop/sources/scripts/client.js
index 2bf9ab5..ea0f555 100644
--- a/desktop/sources/scripts/client.js
+++ b/desktop/sources/scripts/client.js
@@ -12,7 +12,7 @@
/* global Theme */
function Client () {
- this.version = 162
+ this.version = 163
this.library = library
this.theme = new Theme(this)
diff --git a/desktop/sources/scripts/commander.js b/desktop/sources/scripts/commander.js
index e9ea0d2..6e6aa6b 100644
--- a/desktop/sources/scripts/commander.js
+++ b/desktop/sources/scripts/commander.js
@@ -60,7 +60,7 @@ function Commander (client) {
const block = client.source.cache[p._str + '.orca']
if (!block) { console.warn('Commander', 'Unknown block: ' + p._str); return }
client.orca.writeBlock(origin ? origin.x : client.cursor.x, origin ? origin.y : client.cursor.y, block)
- client.cursor.scaleTo(0,0)
+ client.cursor.scaleTo(0, 0)
},
write: (p) => { client.cursor.select(p._x, p._y, p._str.length); client.orca.writeBlock(p._str) }
}
diff --git a/desktop/sources/scripts/core/operator.js b/desktop/sources/scripts/core/operator.js
index 7292b2c..4077f99 100644
--- a/desktop/sources/scripts/core/operator.js
+++ b/desktop/sources/scripts/core/operator.js
@@ -42,6 +42,7 @@ function Operator (orca, x, y, glyph = '.', passive = false) {
const payload = this.operation(force)
// Permissions
for (const port of Object.values(this.ports)) {
+ if (port.bang) { continue }
orca.lock(this.x + port.x, this.y + port.y)
}
diff --git a/sw.js b/sw.js
index c33c253..be4d90f 100644
--- a/sw.js
+++ b/sw.js
@@ -1,4 +1,4 @@
-// 162
+// 163
const assets = [
'./',