Merge pull request #1 from EpochModTeam/experimental

Epoch Mod 0.3.9 446
EpochModTeam · Jul 10, 2016 · fd704f3 · fd704f3
2 parents 1310c37 + bfc9776
commit fd704f3
Show file tree

Hide file tree

Showing 606 changed files with 577 additions and 611 deletions.
diff --git a/Sources/a3_epoch_assets_1/build.hpp b/Sources/a3_epoch_assets_1/build.hpp
@@ -1 +1 @@
-build=393;
+build=441;
diff --git a/Sources/a3_epoch_assets_1/treeView.txt b/Sources/a3_epoch_assets_1/treeView.txt
diff --git a/Sources/a3_epoch_assets_3/build.hpp b/Sources/a3_epoch_assets_3/build.hpp
@@ -1 +1 @@
-build=393;
+build=438;
diff --git a/Sources/a3_epoch_assets_3/treeView.txt b/Sources/a3_epoch_assets_3/treeView.txt
diff --git a/Sources/a3_epoch_code/System/Animal_brain.fsm b/Sources/a3_epoch_code/System/Animal_brain.fsm
@@ -221,8 +221,7 @@ class FSM
        "	 	_sounds = [""hed_cluck0"",""hed_cluck1"",""hed_cluck2""];" \n
        "		_sound = selectRandom _sounds;" \n
        "		_animalAgent say3D _sound;" \n
-       "		_say3D_PVS = [player, _animalAgent, (EPOCH_sounds find _sound),Epoch_personalToken];" \n
-       "		_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "		[player, _animalAgent, _sound,Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "	};" \n
        "};" \n
        "" \n
@@ -357,8 +356,7 @@ class FSM
        "		_fightOrFlight = false;" \n
        "		if (_isDog) then {" \n
        "			_animalAgent say3D ""dog_cry"";" \n
-       "			_say3D_PVS = [player, _animalAgent, 3,Epoch_personalToken];" \n
-       "			_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "			[player, _animalAgent, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "		};" \n
        "	};" \n
        "	_courageTest = false;" \n
@@ -368,8 +366,7 @@ class FSM
        "" \n
        "	if (_isDog) then {" \n
        "		_animalAgent say3D ""dog_bark"";" \n
-       "		_say3D_PVS = [player, _animalAgent, 2,Epoch_personalToken];" \n
-       "		_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "		[player, _animalAgent, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "		_animalAgent playMoveNow ""Dog_Bark"";	" \n
        "	};" \n
        "	_animalAgent setDir _dirTo;	" \n
@@ -378,8 +375,7 @@ class FSM
        "	if (_isDog) then {" \n
        "		if (random 1 < 0.5) then { " \n
        "			_animalAgent say3D ""dog_bark"";" \n
-       "			_say3D_PVS = [player, _animalAgent, 2,Epoch_personalToken];" \n
-       "			_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "			[player, _animalAgent, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "		};" \n
        "	};" \n
        "};"/*%FSM</STATEINIT""">*/;

diff --git a/Sources/a3_epoch_code/System/Copter_brain.fsm b/Sources/a3_epoch_code/System/Copter_brain.fsm
@@ -474,8 +474,7 @@ class FSM
                          "[[(getPos _trgt),80,150,1,true] call EPOCH_fnc_findSafePos,_copter] call EPOCH_supportCopter;" \n
                          "" \n
                          "_copter say3D ""drone_alert0"";" \n
-                         "_say3D_PVS = [player, _copter, 10,Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player, _copter, ""drone_alert0"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "" \n
                          "_troopsOnGround = true;" \n
                          "(driver _copter) action [""lightOn"", _copter];" \n
@@ -570,4 +569,4 @@ class FSM
                 "end",
         };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
diff --git a/Sources/a3_epoch_code/System/Dog_Brain.fsm b/Sources/a3_epoch_code/System/Dog_Brain.fsm
@@ -687,8 +687,7 @@ class FSM
        "//Dog whine warning of nearby players." \n
        "if((random 100) < (_countNrPlyrs * 10))then{" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        ""/*%FSM</STATEINIT""">*/;
@@ -729,8 +728,7 @@ class FSM
        "" \n
        "if (floor(random 100)< 8) then {" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "_hunger = _hunger + 2;" \n
        "};" \n
        "" \n
@@ -789,8 +787,7 @@ class FSM
        "" \n
        "if (floor(random 100)<_dogNoise) then {" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "" \n
@@ -849,8 +846,7 @@ class FSM
        "" \n
        "if (floor(random 100) < 6) then {" \n
        "[_dog, _plyr] say3D ""dog_bark"";" \n
-       "_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "if (floor(random 100)<_forgive) then {" \n
@@ -975,8 +971,7 @@ class FSM
        "" \n
        "if (floor(random 100)<_dogNoise) then {" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "_criteria = ""(moveToCompleted _dog) || (_dog distance _moveTo < 1.5)"";" \n
@@ -1012,10 +1007,10 @@ class FSM
       init = /*%FSM<STATEINIT""">*/"deleteVehicle _foodHolder;" \n
        "" \n
        "if (_plyrVar == _dogName) then {" \n
-       "[format[""<t size='1.6' color='#99ffffff'>You have fed %1</t>"",_dogName], 5] call Epoch_dynamicText;" \n
+       "[format[""You have fed %1"",_dogName], 5] call Epoch_message;" \n
        "}else{" \n
        "_plyr setVariable [""dog"", _dogName];" \n
-       "[format[""<t size='1.6' color='#99ffffff'>You have tamed %1</t>"",_dogName], 5] call Epoch_dynamicText;" \n
+       "[format[""You have tamed %1"",_dogName], 5] call Epoch_message;" \n
        "};" \n
        "_hunger = _hunger - 40;" \n
        "" \n
@@ -1050,9 +1045,8 @@ class FSM
       name = "do_alert";
       init = /*%FSM<STATEINIT""">*/"_dog forceSpeed 0;" \n
        "if (floor(random 75)<_dogNoise) then {" \n
-       "[_dog, _plyr] say3D ""dog_cry_quiet"";" \n
-       "_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[_dog, _plyr] say3D ""dog_cry"";" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "_dirTo =  [_dog, getPos (_nrPlyrs select 1)] call BIS_fnc_dirTo;" \n
@@ -1091,8 +1085,7 @@ class FSM
        "" \n
        "if (_rnd < 42) then {" \n
        "[_dog, _plyr] say3D ""dog_bark"";" \n
-       "_say3D_PVS = [player, _dog, 18,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "if (_rnd < 6) then {" \n
@@ -1225,21 +1218,18 @@ class FSM
        "" \n
        "if (_rnd< 12) then {" \n
        "[_dog, _plyr] say3D ""dog_bark"";" \n
-       "_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "if (_rnd < 6) then {" \n
        "_hunger = _hunger + 1;" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 3,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_cry"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "if ((_hunger > 56) && (_rnd < 48)) then {" \n
        "[_dog, _plyr] say3D ""dog_cry"";" \n
-       "_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
-       "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+       "[player, _dog, ""dog_bark"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
        "};" \n
        "" \n
        "" \n

diff --git a/Sources/a3_epoch_code/System/Sapper_Brain.fsm b/Sources/a3_epoch_code/System/Sapper_Brain.fsm
@@ -323,8 +323,7 @@ class FSM
                          "_sound = selectRandom _sounds;" \n
                          "" \n
                          "_sapper say3D _sound;" \n
-                         "_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player, _sapper,_sound, Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "};" \n
                          "" \n
                          "_doInterrupt = {" \n
@@ -771,8 +770,7 @@ class FSM
                          "" \n
                          "_sound = ""sapper_explode"";" \n
                          "_sapper say3D _sound;" \n
-                         "_say3D_PVS = [player,_sapper,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player,_sapper,_sound,Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "_sapper playMoveNow ""Unconscious"";" \n
                          "" \n
                          ""/*%FSM</STATEINIT""">*/;
@@ -1314,8 +1312,7 @@ class FSM
                          "" \n
                          "_sound = ""sapper_explode"";" \n
                          "_x say3D _sound;" \n
-                         "_say3D_PVS = [player,_x,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player,_x,_sound,Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "_x playMoveNow ""Unconscious"";" \n
                          "" \n
                          "_x spawn {" \n
@@ -1714,8 +1711,7 @@ class FSM
                                          "	_lastAlert = diag_tickTime;" \n
                                          "	_sound = ""sapper_groan2"";" \n
                                          "	_sapper say3D _sound;" \n
-                                         "     	_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
-                                         "	_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                                         "	[player, _sapper,_sound, Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                                          "};" \n
                                          ""/*%FSM</ACTION""">*/;
                                 };
@@ -1961,4 +1957,4 @@ class FSM
                 "end",
         };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
diff --git a/Sources/a3_epoch_code/System/Sapper_Brain2.fsm b/Sources/a3_epoch_code/System/Sapper_Brain2.fsm
@@ -272,8 +272,7 @@ class FSM
                          "_sound = selectRandom _sounds;" \n
                          "" \n
                          "_sapper say3D _sound;" \n
-                         "_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player, _sapper,_sound, Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "};" \n
                          "" \n
                          "_doInterrupt = {" \n
@@ -664,8 +663,7 @@ class FSM
                          "" \n
                          "_sound = ""sapper_explode"";" \n
                          "_sapper say3D _sound;" \n
-                         "_say3D_PVS = [player,_sapper,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
-                         "_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                         "[player,_sapper,_sound,Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "_sapper playMoveNow ""Unconscious"";" \n
                          "" \n
                          ""/*%FSM</STATEINIT""">*/;
@@ -1332,8 +1330,7 @@ class FSM
                                          "	_lastAlert = diag_tickTime;" \n
                                          "	_sound = ""sapper_groan2"";" \n
                                          "	_sapper say3D _sound;" \n
-                                         "     	_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
-                                         "	_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
+                                         "	[player, _sapper,_sound, Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                                          "};" \n
                                          ""/*%FSM</ACTION""">*/;
                                 };
@@ -1513,4 +1510,4 @@ class FSM
                 "end",
         };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
diff --git a/Sources/a3_epoch_code/System/Shark_Brain.fsm b/Sources/a3_epoch_code/System/Shark_Brain.fsm
@@ -74,7 +74,7 @@ link39[] = {27,2};
 link40[] = {28,29};
 link41[] = {29,7};
 globals[] = {0.000000,0,0,0,16777215,640,480,1,113,6316128,1,-323.378784,541.908020,588.921448,-376.164001,789,880,1};
-window[] = {2,-1,-1,-1,-1,551,1706,2731,26,3,807};
+window[] = {2,-1,-1,-1,-1,707,182,1207,182,3,807};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -434,7 +434,9 @@ class FSM
       name = "end";
       init = /*%FSM<STATEINIT""">*/"_shark spawn {" \n
        "	uiSleep 60;" \n
-       "	(typeOf _this) call EPOCH_unitSpawnDecrease;" \n
+       "	if !(alive _this) then {" \n
+       "		(typeOf _this) call EPOCH_unitSpawnDecrease;" \n
+       "	};" \n
        "	deleteVehicle _this;" \n
        "};" \n
        "" \n
@@ -720,7 +722,7 @@ class FSM
   initState="shark";
   finalStates[] =
   {
-    "end"
+    "end",
   };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/