FEATURE: Noise seems to be working with patrols and mimetics.

albertoamo · Apr 10, 2018 · a8d5977 · a8d5977
1 parent 9a46430
commit a8d5977
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 187 deletions.
diff --git a/Bin/data/prefabs/mimetic.prefab b/Bin/data/prefabs/mimetic.prefab
@@ -19,7 +19,7 @@
       "name": "Cone of Vision",
       "transform": {},
       "render": {
-        "mesh": "cone_of_vision.mesh"
+        "mesh": "cone_of_vision_patrol.mesh"
       },
       "hierarchy": {
         "parent": "Mimetic"

diff --git a/Bin/data/prefabs/patrol.prefab b/Bin/data/prefabs/patrol.prefab
@@ -144,7 +144,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               }
             ],
@@ -172,7 +172,7 @@
 			  {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               }
             ],
@@ -193,7 +193,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -236,7 +236,21 @@
                 "variable_op": ""
               }
             ],
-            "assert": "assertNotPlayerInFovNorArtificialNoise"
+            "assert": "assertNotPlayerInFovNorArtificialNoise",
+			"assertArg": [
+              {
+                "variable_name": "fov",
+                "variable_type": "float",
+                "variable_value": 110.0,
+                "variable_op": ""
+              },
+              {
+                "variable_name": "maxChaseDistance",
+                "variable_type": "float",
+                "variable_value": 34.0,
+                "variable_op": ""
+              }
+            ]
           },
           {
             "parent": "manageDoPatrol",
@@ -255,7 +269,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -338,7 +352,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -466,7 +480,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -552,7 +566,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -586,7 +600,7 @@
               {
                 "variable_name": "fov",
                 "variable_type": "float",
-                "variable_value": 179.0,
+                "variable_value": 120.0,
                 "variable_op": ""
               },
               {
@@ -727,7 +741,7 @@
       "name": "Cone of Vision",
       "transform": {},
       "render": {
-        "mesh": "cone_of_vision.mesh"
+        "mesh": "cone_of_vision_patrol.mesh"
       },
       "hierarchy": {
         "parent": "The Enemy"

diff --git a/Bin/data/scenes/enemy.scene b/Bin/data/scenes/enemy.scene
@@ -5,7 +5,7 @@
 		}
 	},
 	{
-		"xentity": {
+		"entity": {
 		  "prefab": "data/prefabs/patrol.prefab",
 		  "name": "The Enemy 1",
       "transform": {
@@ -42,22 +42,6 @@
             "position": "0 0 110",
             "lookAt": "-1 0 0"
           }
-        ],
-        "argCond": [
-          {
-            "nodeName": "managePlayerSeen",
-            "conditionName": "conditionPlayerSeen",
-            "variableName": "fov",
-            "newValue": 120.0
-          }
-        ],
-        "argAct": [
-          {
-            "nodeName": "goToWpt",
-            "actionName": "actionGoToWpt",
-            "variableName": "speed",
-            "newValue": 17.0
-          }
         ]
       },
 		  "collider": {
@@ -73,7 +57,7 @@
 			}
 		}
 	}, {
-		"xentity": {
+		"entity": {
 		  "prefab": "data/prefabs/patrol.prefab",
 		  "name": "The Enemy 3",
 		  "transform": {
@@ -138,7 +122,7 @@
 			}
 		}
 	}, {
-		"xentity": {
+		"entity": {
 		  "prefab": "data/prefabs/patrol.prefab",
 		  "name": "The Enemy 4",
 		  "transform": {
@@ -228,7 +212,7 @@
 			}
 		}
 	}, {
-		"entity": {
+		"xentity": {
 			"prefab": "data/prefabs/mimetic.prefab",
 			"name": "Mimetic 2",
 			"transform": {

diff --git a/Bin/data/scenes/player_fsm.scene b/Bin/data/scenes/player_fsm.scene
@@ -3,7 +3,7 @@
 		"entity": {
 			"name": "The Player",
 			"transform": {
-				"pos": "-7 1 82"
+				"pos": "-7 1 12"
 			},
 			"render": {
 				"mesh": "data/meshes/pj_idle.mesh",