From 9230db9c7acc980127188a144b2e5e9a26666a66 Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Wed, 30 Aug 2017 23:39:08 -0500 Subject: [PATCH 1/4] missing ; 's --- Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf b/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf index 832d01ca..bc4ffbab 100644 --- a/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf +++ b/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf @@ -35,17 +35,17 @@ if(_return isEqualTo[]) then { // check extra logic _value = switch _extraLogicType do { case "getDate": { - date select _extraLogicName + date select _extraLogicName; }; case "getSunorMoon": { - sunOrMoon + sunOrMoon; }; case "getMissionNamespaceVariable": { - missionNamespace getVariable [_extraLogicName, _extraLogicData] + missionNamespace getVariable [_extraLogicName, _extraLogicData]; }; // not really needed default { - _extraLogicName + _extraLogicName; }; }; _allow = [_value,_extraLogicCond,_extraLogicData] call EPOCH_fnc_arrayToLogic; From 7d136cddb3e5feb82756486e4d7187013eb2fd0f Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Wed, 30 Aug 2017 23:46:13 -0500 Subject: [PATCH 2/4] selectRandomWeighted not ready Switch to BIS_fnc_selectRandomWeighted --- Sources/epoch_code/compile/setup/masterLoop/Event6.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf index 16b915e5..bd27f050 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf @@ -3,7 +3,7 @@ false call EPOCH_pushCustomVar; _spawnChance = ((EPOCH_playerNuisance + EPOCH_playerSoiled)/2) max 1; // add more antagonist spawn chances if (random _antagonistRndChance < _spawnChance) then { - (selectRandomWeighted _antagonistChances) call EPOCH_unitSpawnIncrease; + (_antagonistChances call BIS_fnc_selectRandomWeighted) call EPOCH_unitSpawnIncrease; }; // diag_log format["DEBUG: _spawnChance %1",_spawnChance]; From f2fc2c9d6a867ac08c135503f83e6b0aa047bee8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Thu, 31 Aug 2017 00:28:30 -0500 Subject: [PATCH 3/4] Add TODO reminder --- Sources/epoch_code/compile/setup/masterLoop/Event6.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf index bd27f050..c0df4447 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event6.sqf @@ -3,6 +3,7 @@ false call EPOCH_pushCustomVar; _spawnChance = ((EPOCH_playerNuisance + EPOCH_playerSoiled)/2) max 1; // add more antagonist spawn chances if (random _antagonistRndChance < _spawnChance) then { + // TODO PRE 1.0 - replace below (selectRandomWeighted _antagonistChances) (_antagonistChances call BIS_fnc_selectRandomWeighted) call EPOCH_unitSpawnIncrease; }; // diag_log format["DEBUG: _spawnChance %1",_spawnChance]; From 33a663f72de543edad84a6cde6253888040de776 Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Thu, 31 Aug 2017 00:42:45 -0500 Subject: [PATCH 4/4] Revert "missing ; 's" This reverts commit 9230db9c7acc980127188a144b2e5e9a26666a66. --- Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf b/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf index bc4ffbab..832d01ca 100644 --- a/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf +++ b/Sources/epoch_code/compile/both/EPOCH_weightedArray.sqf @@ -35,17 +35,17 @@ if(_return isEqualTo[]) then { // check extra logic _value = switch _extraLogicType do { case "getDate": { - date select _extraLogicName; + date select _extraLogicName }; case "getSunorMoon": { - sunOrMoon; + sunOrMoon }; case "getMissionNamespaceVariable": { - missionNamespace getVariable [_extraLogicName, _extraLogicData]; + missionNamespace getVariable [_extraLogicName, _extraLogicData] }; // not really needed default { - _extraLogicName; + _extraLogicName }; }; _allow = [_value,_extraLogicCond,_extraLogicData] call EPOCH_fnc_arrayToLogic;