Merge pull request #517 from EpochModTeam/experimental

0.3.8.0429

Changelogs/0.3.8.0.txt

@@ -43,16 +43,23 @@
 [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient.
 [Info] Removed old .bikey and added new one for 0380.
 
-Build: 427
+Build: 429
+[Added] Install batch for all CUP mods and CBA. https://github.com/EpochModTeam/Epoch/tree/master/Tools/Install
+[Changed] Make use of new getOutMan EH for vehicle epoch anti wall glitch checks.
+[Changed] Change last few uses of hintSilent to Epoch_dynamicText. Now only the debug monitor uses hintSilent.
+[Changed] 1.58 Difficulty Overhaul changes to enable 3rd person. Thanks to klinGiii on the forum: http://epochmod.com/forum/index.php?/topic/41922-158-difficulty-overhaul
+[Changed] Epoch AH reworked displayAddEventHandler checks to use.
 [Changed] Increased range for vehicle interactions to fix issues with access to larger vehicles. Thanks to Grahame for the report: http://epochmod.com/forum/index.php?/topic/41894-cannot-unlock-large-vehicles/
 [Changed] Preloading sapper by spawning one on the map at server start.
 [Changed] Change to github markdown for credits and license.
+[Fixed] Fixed Arma install batch script not closing after update.
 [Fixed] Mission loot payout not working. Thanks to @He-Man for the fix: http://epochmod.com/forum/index.php?/topic/41892-payout-trader-mission-broken/
 [Fixed] Crafting recipe for Vehicle Repair Kit had wrong part in usedIn array. Thanks to LeBarbare for the report: http://epochmod.com/forum/index.php?/topic/41896-wrong-recipe-place/
-[Fixed] Green Marked traders unable to be accessed.
+[Fixed] Green Marked traders unable to be accessed. Thanks to @He-Man for the report: http://epochmod.com/forum/index.php?/topic/41887-radom-unexpected-script-failure-with-traders-ai_slot/
 [Fixed] Trailing commas in CfgLootTable.
 [Fixed] Disallow building inside of vehicles.
 [Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled.
 [Fixed] removeExec Battleye kick fixed.
 [Fixed] Player getting stuck waiting for inventory to load.
 [Fixed] Delete base object if over limit.
+[Info] Defined proper settings in full redis-example.conf

README.md

@@ -15,4 +15,4 @@ http://www.bistudio.com/community/licenses/arma-public-license-share-alike
 
 Credits:
 =====
-https://github.com/EpochModTeam/Epoch/CREDITS.md
+https://github.com/EpochModTeam/Epoch/blob/master/CREDITS.md

Server_Install_Pack/@epochhive/EpochServer.ini

@@ -3,7 +3,7 @@ BattlEyePath = C:\BattlEye
 InstanceID = NA123
 LogAbuse = 1
 IP = 127.0.0.1
-Port = 2303
+Port = 2304
 Password = changeme
 
 [Redis]

Server_Install_Pack/DB/redis-example.conf

@@ -34,7 +34,7 @@
 
 # On Windows, daemonize and pidfile are not supported.
 # However, you can run redis as a Windows service, and specify a logfile.
-# The logfile will contain the pid. 
+# The logfile will contain the pid.
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.
@@ -57,7 +57,7 @@ tcp-backlog 511
 # Examples:
 #
 # bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1
+bind 127.0.0.1
 
 
 # Specify the path for the Unix socket that will be used to listen for
@@ -95,12 +95,12 @@ tcp-keepalive 0
 loglevel notice
 
 # Specify the log file name. Also 'stdout' can be used to force
-# Redis to log on the standard output. 
+# Redis to log on the standard output.
 logfile ""
 
-# To enable logging to the Windows EventLog, just set 'syslog-enabled' to 
+# To enable logging to the Windows EventLog, just set 'syslog-enabled' to
 # yes, and optionally update the other syslog parameters to suit your needs.
-# If Redis is installed and launched as a Windows Service, this will 
+# If Redis is installed and launched as a Windows Service, this will
 # automatically be enabled.
 # syslog-enabled no
 
@@ -136,7 +136,7 @@ databases 16
 
 save 900 1
 save 300 10
-save 60 10000
+save 60 1000
 
 # By default Redis will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
@@ -175,9 +175,9 @@ dbfilename dump.rdb
 #
 # The DB will be written inside this directory, with the filename specified
 # above using the 'dbfilename' configuration directive.
-# 
+#
 # The Append Only File will also be created inside this directory.
-# 
+#
 # Note that you must specify a directory here, not a file name.
 dir ./
 
@@ -378,12 +378,12 @@ slave-priority 100
 #
 # This should stay commented out for backward compatibility and because most
 # people do not need auth (e.g. they run their own servers).
-# 
+#
 # Warning: since Redis is pretty fast an outside user can try up to
 # 150k passwords per second against a good box. This means that you should
 # use a very strong password otherwise it will be very easy to break.
 #
-# requirepass foobared
+requirepass Changeme9832
 
 # Command renaming.
 #
@@ -419,59 +419,59 @@ slave-priority 100
 
 # The Linux version of Redis relies on the system call fork() to perform
 # point-in-time snapshots of the heap. In addition to the AOF and RDB backup
-# mechanism, the master-slave synchronization and clustering features are 
-# dependent on this behavior of fork(). In order for the Windows version to 
+# mechanism, the master-slave synchronization and clustering features are
+# dependent on this behavior of fork(). In order for the Windows version to
 # perform like the Linux version we had to simulate this aspect of fork().
 # Doing so meant moving the Redis heap into a memory mapped file that can
-# be shared with a child process. 
+# be shared with a child process.
 #
-# *** There must be disk space available for this file in order for Redis 
-# to launch. *** The default configuration places this file in the local 
+# *** There must be disk space available for this file in order for Redis
+# to launch. *** The default configuration places this file in the local
 # appdata directory. If you wish to move this file to another local disk,
 # use the heapdir flag as described below.
 #
 # The maxheap flag controls the maximum size of this memory mapped file,
 # as well as the total usable space for the Redis heap. Running Redis
-# without either maxheap or maxmemory will result in a memory mapped file 
-# being created that is equal to the size of physical memory. During 
+# without either maxheap or maxmemory will result in a memory mapped file
+# being created that is equal to the size of physical memory. During
 # fork() operations the total page file commit will max out at around:
 #
 #    (size of physical memory) + (2 * size of maxheap)
 #
-# For instance, on a machine with 8GB of physical RAM, the max page file 
+# For instance, on a machine with 8GB of physical RAM, the max page file
 # commit with the default maxheap size will be (8)+(2*8) GB , or 24GB. The
-# default page file sizing of Windows will allow for this without having 
+# default page file sizing of Windows will allow for this without having
 # to reconfigure the system. Larger heap sizes are possible, but the maximum
 # page file size will have to be increased accordingly.
-# 
-# The Redis heap must be larger than the value specified by the maxmemory 
-# flag, as the heap allocator has its own memory requirements and 
-# fragmentation of the heap is inevitable. If only the maxmemory flag is 
-# specified, maxheap will be set at 1.5*maxmemory. If the maxheap flag is 
-# specified along with maxmemory, the maxheap flag will be automatically 
-# increased if it is smaller than 1.5*maxmemory. 
-#  
+#
+# The Redis heap must be larger than the value specified by the maxmemory
+# flag, as the heap allocator has its own memory requirements and
+# fragmentation of the heap is inevitable. If only the maxmemory flag is
+# specified, maxheap will be set at 1.5*maxmemory. If the maxheap flag is
+# specified along with maxmemory, the maxheap flag will be automatically
+# increased if it is smaller than 1.5*maxmemory.
+#
 # maxheap <bytes>
 
-# The heap memory mapped file must reside on a local path for heap sharing 
-# between processes to work. A UNC path will not suffice here. For maximum 
+# The heap memory mapped file must reside on a local path for heap sharing
+# between processes to work. A UNC path will not suffice here. For maximum
 # performance this should be located on the fastest local drive available.
 # This value defaults to the local application data folder(e.g.,
 # "%USERPROFILE%\AppData\Local"). Since this file can be very large, you
-# may wish to place this on a drive other than the one the operating system  
+# may wish to place this on a drive other than the one the operating system
 # is installed on.
 #
 # Note that you must specify a directory here, not a file name.
 # heapdir <directory path(absolute or relative)>
 
-# If Redis is to be used as an in-memory-only cache without any kind of 
-# persistence, then the fork() mechanism used by the background AOF/RDB 
+# If Redis is to be used as an in-memory-only cache without any kind of
+# persistence, then the fork() mechanism used by the background AOF/RDB
 # persistence is unneccessary. As an optimization, all persistence can be
 # turned off in the Windows version of Redis. This will disable the creation of
-# the memory mapped heap file, redirect heap allocations to the system heap 
+# the memory mapped heap file, redirect heap allocations to the system heap
 # allocator, and disable commands that would otherwise cause fork() operations:
-# BGSAVE and BGREWRITEAOF. This flag may not be combined with any of the other 
-# flags that configure AOF and RDB operations. 
+# BGSAVE and BGREWRITEAOF. This flag may not be combined with any of the other
+# flags that configure AOF and RDB operations.
 # persistence-available [(yes)|no]
 
 # Don't use more memory than the specified amount of bytes.
@@ -512,18 +512,18 @@ slave-priority 100
 # Peak Working Set reported by the Windows Task Manager and the used_memory_peak
 # reported by the INFO command.
 #
-# maxmemory <bytes>
+maxmemory 1gb
 
 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
 # is reached. You can select among five behaviors:
-# 
+#
 # volatile-lru -> remove the key with an expire set using an LRU algorithm
 # allkeys-lru -> remove any key according to the LRU algorithm
 # volatile-random -> remove a random key with an expire set
 # allkeys-random -> remove a random key, any key
 # volatile-ttl -> remove the key with the nearest expire time (minor TTL)
 # noeviction -> don't expire at all, just return an error on write operations
-# 
+#
 # Note: with any of the above policies, Redis will return an error on write
 #       operations, when there are no suitable keys for eviction.
 #
@@ -612,15 +612,15 @@ appendfsync everysec
 # the same as "appendfsync none". In practical terms, this means that it is
 # possible to lose up to 30 seconds of log in the worst scenario (with the
 # default Linux settings).
-# 
+#
 # If you have latency problems turn this to "yes". Otherwise leave it as
 # "no" that is the safest pick from the point of view of durability.
 no-appendfsync-on-rewrite no
 
 # Automatic rewrite of the append only file.
 # Redis is able to automatically rewrite the log file implicitly calling
 # BGREWRITEAOF when the AOF log size grows by the specified percentage.
-# 
+#
 # This is how it works: Redis remembers the size of the AOF file after the
 # latest rewrite (if no rewrite has happened since the restart, the size of
 # the AOF at startup is used).
@@ -687,7 +687,7 @@ lua-time-limit 5000
 # but just the time needed to actually execute the command (this is the only
 # stage of command execution where the thread is blocked and can not serve
 # other requests in the meantime).
-# 
+#
 # You can configure the slow log with two parameters: one tells Redis
 # what is the execution time, in microseconds, to exceed in order for the
 # command to get logged, and the other parameter is the length of the
@@ -818,7 +818,7 @@ hll-sparse-max-bytes 3000
 # that is rehashing, the more rehashing "steps" are performed, so if the
 # server is idle the rehashing is never complete and some more memory is used
 # by the hash table.
-# 
+#
 # The default is to use this millisecond 10 times every second in order to
 # actively rehash the main dictionaries, freeing memory when possible.
 #

Server_Install_Pack/sc/battleye/example-beserver.cfg → Server_Install_Pack/sc/BattlEye/example-beserver.cfg

@@ -1,4 +1,4 @@
-RConPort 2303
+RConPort 2304
 RConPassword changemen0w
 MaxPing 350
 

Server_Install_Pack/sc/battleye/scripts.txt → Server_Install_Pack/sc/BattlEye/scripts.txt

@@ -49,9 +49,10 @@
 7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\"" !="_ctrlBtn ctrlSetEventHandler [\"MouseButtonDblClick\", _verAct];"
 7 addMPEventHandler
 7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !"[\"FiredNear"\" !"[\"EpeContactStart"\" !"[\"GetOut"\" !"[\"local"\" !"[\"PostReset"\" !"[\"TaskSetAsCurrent"\" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler"
-7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown}];" !="_display displayaddeventhandler\n[\n\"mousemoving\"," !="_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" !="_display displayaddeventhandler [_x,_fnc_animate];" !="Development\") then\n{\n_display displayaddeventhandler [\n\"keydown\"" !="_display displayaddeventhandler [\"mousemoving\",\"with uinamespace do {['watchFields'" !="/"CBA_fnc_addDisplayHandler/""
+7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="_display displayaddeventhandler\n[\n\"mousemoving\"," !="_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" !="_display displayaddeventhandler [_x,_fnc_animate];" !="Development\") then\n{\n_display displayaddeventhandler [\n\"keydown\"" !="_display displayaddeventhandler [\"mousemoving\",\"with uinamespace do {['watchFields'" !="/"CBA_fnc_addDisplayHandler/""
 7 ctrlAddEventHandler !"rCfg >> \"refreshDelay\");" !" [\n\"draw\"," !" [\"buttonclick\"," !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug"
-7 removeAllEventHandlers !="ctrlRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="_display46 displayRemoveAllEventHandlers 'KeyDown';" !="if !(isMultiplayer) then { { (findDisplay 46) displayRemoveAllEventHandlers _x } forEach [\"KeyUp\", \"KeyDown\"] };"
+7 removeAllEventHandlers !="ctrlRemoveAllEventHandlers" !="displayRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";"
+7 displayRemoveAllEventHandlers !="_display displayRemoveAllEventHandlers _x;" !="if !(isMultiplayer) then { { (findDisplay 46) displayRemoveAllEventHandlers _x } forEach [\"KeyUp\", \"KeyDown\"] };"
 7 removeAllMissionEventHandlers
 7 ctrlRemoveAllEventHandlers !="(uiNamespace getVariable 'ESP_map') ctrlRemoveAllEventHandlers 'Draw';" !="ctrlAddEventHandler ['MouseButtonDown'"
 7 removeEventHandler !="displayRemoveEventHandler" !="player removeEventHandler ['Fired', 0];" !"_currentTarget removeEventHandler[\"EpeContactStart\", _onContactEH]" !" [_adminVar,objnull];\npublicvariable _adminVar;\nplayer removeeventhandler [\"respawn\",_respawn];" !="_plyr removeEventHandler [\"FiredNear\", _smokeEH];" !="player removeEventHandler [_ehKey, 0];" !="\"CBA_fnc_removeEventHandler\"" !="\\fnc_removeEventHandler" !="\"removeEventHandler"

Server_Install_Pack/SC/server-example.cfg → Server_Install_Pack/sc/server-example.cfg

@@ -1,14 +1,14 @@
 // EPOCH SERVER CONFIG
 
 // GLOBAL SETTINGS
-hostname        	= "EpochMod.com (0.3.8|1.54) ID02 YourHost";
+hostname        	= "EpochMod.com (0.3.8|1.58) ID02 YourHost";
 password         	= "";
 passwordAdmin      	= "!CHANGE_THIS_PASSWORD!";
 serverCommandPassword = "!CHANGE_THIS_PASSWORD!";
 logFile            	= "A3Master.log";
 verifySignatures   	= 2;
 BattlEye            = 1;
-requiredBuild = 133741;
+requiredBuild = 135656;
 
 // WHITELIST FILE TYPES
 allowedLoadFileExtensions[] = {:};
@@ -39,7 +39,7 @@ allowedVotedAdminCmds[] = {};
 
 // INGAME SETTINGS
 disableVoN	= 0;        	// If set to 1, Voice over Net will not be available
-vonCodecQuality = 20;       // Quality from 1 to 30
+vonCodecQuality = 30;       // Quality from 1 to 30
 forceRotorLibSimulation = 0; // Enforces the Advanced Flight Model on the server. Default = 0 (up to the player). 1 - forced AFM, 2 - forced SFM.
 persistent	= 1;        	// If 1, missions still run on even after the last player disconnected.
 
@@ -48,7 +48,7 @@ class Missions
 {
 	class Epoch {
 		template = epoch.Altis; // DO NOT CHANGE THIS, IT WILL BREAK YOUR SERVER
-		difficulty = "veteran";    // difficulty settings: veteran == NORMAL, mercenary == HARDCORE
+		difficulty = "custom";    // difficulty settings: Recruit, Regular Veteran, Custom
 	};
 };