Add files via upload

AleziaKurdis · Sep 15, 2024 · 1853873 · 1853873
1 parent de89c95
commit 1853873
Showing 1 changed file with 55 additions and 6 deletions.
diff --git a/FACING-WORLDS/basicGuns/basicGun.js b/FACING-WORLDS/basicGuns/basicGun.js
@@ -13,15 +13,15 @@
     var ROOT = Script.resolvePath('').split("basicGun.js")[0];
     var channelComm = "ak.ctf.ac.communication";
 
+    var shots = [];
+
     var ammunitions = 0;
-    //var lethalRadius = 0;
-    //var model = "";
     var thisEntityID;
     var lightMaterialID = Uuid.NULL;
 
     var DAY_DURATION = 104400; //D29
     var justEquiped = false;
-    //var bulletHue = 0;
+    var NBR_SHOT_TO_DIE = 2;
 
     var RELOAD_THRESHOLD = 0.95;
     var GUN_TIP_FWD_OFFSET = 0.05;
@@ -96,16 +96,44 @@
             var self = this;
             Script.setTimeout(function() {
                 self.canShoot = true
-            }, 2000);
+            }, 1000);
 
             if (!justEquiped) {
                 if (ammunitions > 0) {
                     playAnouncement(FIRE_SOUND);
                     Controller.triggerShortHapticPulse(1, this.hand);
                     ammunitions = ammunitions -1;
                     setAmmunitionsColor();
-                    genShotFX(this.getGunTipPosition(gunProperties), gunProperties.rotation);
-                    //shot here
+                    genShotFX(this.getGunTipPosition(gunProperties), gunProperties.rotation); // ################# TODO
+                    var pick = Picks.createPick(PickType.Ray, {
+                        "enabled": true,
+                        "filter": Picks.PICK_AVATARS,
+                        "maxDistance": 400,
+                        "joint": "static",
+                        "position": this.getGunTipPosition(gunProperties),
+                        "orientation": gunProperties.rotation
+                    });
+                    var rayPickResult = Picks.getPrevPickResult(pick);
+                    if (rayPickResult.intersects) {
+                        var impactPosition = rayPickResult.intersection;
+                        //impact FX call here ########################################################################## TODO
+                        var killed = getHitNumber(rayPickResult.objectID);
+                        if (killed) {
+                            var messageSent = {
+                                "action": "REVIVE",
+                                "avatarID": rayPickResult.objectID,
+                                "by": ownerID
+                            };
+                            Messages.sendMessage(channelComm, JSON.stringify(messageSent));
+
+                            messageSent = {
+                                "action": "KILL",
+                                "position": impactPosition
+                            };
+                            Messages.sendMessage(channelComm, JSON.stringify(messageSent));
+                        }
+                    }
+                    Picks.removePick(pick);
                 } else {
                     playAnouncement(EMPTY_CLENCH_SOUND);
                     Controller.triggerShortHapticPulse(0.5, this.hand);
@@ -122,6 +150,27 @@
         }
     }
 
+    function getHitNumber(avatarID) {
+        var i, rez;
+        if (shots.length > 0) {
+            rez = false;
+            for (i = 0; i < shots.length; i++ ) {
+                if (shots[i].id === avatarID) {
+                    shots[i].hits = shots[i].hits + 1;
+                    if (shots[i].hits > NBR_SHOT_TO_DIE - 1) {
+                        rez = true;
+                        shots[i].hits = 0;
+                    }
+                    break;
+                }
+            }
+            return rez;
+        } else {
+            shots.push({"id": avatarID, "hits": 1});
+            return false;
+        }
+    }
+
     function playAnouncement(soundCode) {
         var position = Entities.getEntityProperties(thisEntityID, ["position"]).position;
         var injectorOptions = {