From f77b7b9105ca84efbc2d4ae971e8fd9adc8b5a58 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 16 Nov 2015 14:09:47 -0800 Subject: [PATCH] renamed weapons folder to exterminatorGame --- examples/{weapons => exterminatorGame}/pistol.js | 5 ++++- examples/{weapons => exterminatorGame}/rat.js | 0 examples/{weapons => exterminatorGame}/ratSpawner.js | 0 examples/{weapons => exterminatorGame}/socketTest.js | 0 4 files changed, 4 insertions(+), 1 deletion(-) rename examples/{weapons => exterminatorGame}/pistol.js (99%) rename examples/{weapons => exterminatorGame}/rat.js (100%) rename examples/{weapons => exterminatorGame}/ratSpawner.js (100%) rename examples/{weapons => exterminatorGame}/socketTest.js (100%) diff --git a/examples/weapons/pistol.js b/examples/exterminatorGame/pistol.js similarity index 99% rename from examples/weapons/pistol.js rename to examples/exterminatorGame/pistol.js index e3fb5c8a5e..f509e890c1 100644 --- a/examples/weapons/pistol.js +++ b/examples/exterminatorGame/pistol.js @@ -12,6 +12,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // + Script.include("../libraries/utils.js"); Script.include("../libraries/constants.js"); @@ -166,7 +167,9 @@ function fire(side, value) { velocity: Vec3.multiply(shotDirection, GUN_FORCE) }); createEntityHitEffect(intersection.intersection); - } else { + } + + if (intersection.properties.name === "rat") { } //Attempt to call entity method's shot method diff --git a/examples/weapons/rat.js b/examples/exterminatorGame/rat.js similarity index 100% rename from examples/weapons/rat.js rename to examples/exterminatorGame/rat.js diff --git a/examples/weapons/ratSpawner.js b/examples/exterminatorGame/ratSpawner.js similarity index 100% rename from examples/weapons/ratSpawner.js rename to examples/exterminatorGame/ratSpawner.js diff --git a/examples/weapons/socketTest.js b/examples/exterminatorGame/socketTest.js similarity index 100% rename from examples/weapons/socketTest.js rename to examples/exterminatorGame/socketTest.js