From b31a0f64576bebfcb57530361dc1c0882170c2de Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 8 Oct 2015 11:45:00 -0500 Subject: [PATCH] 0.3.4 final? --- Changelogs/0.3.4.0.txt | 1 + .../@epochhive/addons/a3_epoch_server.pbo | Bin 359972 -> 360015 bytes .../addons/a3_epoch_server_settings.pbo | Bin 271570 -> 273602 bytes Sources/epoch_code/gui/changelog-sample.html | 20 +++++++++++++++ Sources/epoch_code/gui/changelog.html | 15 ++++++------ .../epoch_vehicle/EPOCH_spawn_vehicles.sqf | 23 ++++++++---------- .../configs/maps/altis.h | 8 ++++++ .../configs/maps/australia.h | 15 +++++++++++- .../configs/maps/bornholm.h | 15 +++++++++++- .../configs/maps/chernarus.h | 13 ++++++++++ .../configs/maps/esseker.h | 13 ++++++++++ .../configs/maps/stratis.h | 13 ++++++++++ .../configs/maps/takistan.h | 21 ++++++++++++---- .../epoch_server_settings/configs/maps/vr.h | 8 ++++++ Sources/mpmissions/epoch.VR/description.ext | 1 + 15 files changed, 139 insertions(+), 27 deletions(-) create mode 100644 Sources/epoch_code/gui/changelog-sample.html diff --git a/Changelogs/0.3.4.0.txt b/Changelogs/0.3.4.0.txt index 64125b47..f1148836 100644 --- a/Changelogs/0.3.4.0.txt +++ b/Changelogs/0.3.4.0.txt @@ -29,6 +29,7 @@ Server: [Fixed] Issue with trading vehicles that caused the trader data not to save or to save to the wrong slot. [Fixed] Added missing prices for female vests. [Fixed] Error Generic error in expression in EPOCH_server_repairVehicle. +[Changed] Vehicle spawn config that controls how many vehicles can spawn at different location types. See vehicleSpawnTypes array in the Map config in the server settings pbo. [Changed] Use new sort command instead of BIS_fncSortBy. [Changed] Use new worldSize command as default if maps worldSize setting in CfgEpoch does not exist. [Info] Removed old .bikey and added new one for 0340. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 6513f70cdaea730aaefcf1208767c7a9ca382f27..9f81f6aa7751281ab511a5482bf1a2c4d9df9571 100644 GIT binary patch delta 286 zcmZ4TNA&z3(G5-_Y@u_+!u*9NCkjbSP7pC+UOPvudAdmZbP>kw(?yuRByzZM6>XV94yP`53LI7xXbnI3VPl z^YhX&({&V-%2G2jlXFso3lhuoLMjVViR delta 109 zcmV-z0FwXD{1v496|h1S2H5iURU{LWVG8|H|GxiBy=Bu4XC4E?^No9x4=%CQ2-+$#%I-^eaDxu21jZ8cE9 zUwiT*Mm07cppE=1CZA(eV7&?yJ-PWa<10osV*?Wt3xmy%nbY>ym!)Q8Cg-FE7bKSF zg;W-#7DvY_*eX=>a&dB2E4k$)mN*urCOT)9R4VBh*6Lsi2j?c{iOeD#$M?QPMH31zK1;y_b(kdUL|z3%LXB z+Ij-6g@zBv!#?@RAV0waA-JR{KQFx?KQj*;qDTP|mYSYgl30?NpXXGRpO})9nwW-F z)-AJ023aCAwLAc197qflOxuCMw3TtXT{ScR_76skS7o=K3}E~bHT}?P#;KzLhe*9) z=m7^#U)%H6Fe)dFh7+D}0wu8O+R-4w6GV`tB;Ui-E;AZVgu-cZ!r{f+6IL=+YL12# z5n|j6_%Fz?h#i{X#Dj h%l5V^W{XuKGgK}_92QUR=`Qr}N^Ae6kUv56DFD;5(!Brx delta 309 zcmX?fQ{d7`fe9f>rm`YoE({C|$@zI{ndy4T1qDD30sy5amU(eVu(yXk&ShYj{FYr} z;sahb5g)9PILzOpwW_-oSW@utyZf?B!F>~7f>0gW(#W%AZ zxsbaZ$eJq8q5uTjJA)X1L@_E%Z(Pebb-T%WMyn){>_*1zwjxZ&s=<1;TTEnXmjN>; zvmIHyefoN)N=+EIYx}udOjfSUoSdB7ITV=ZdVyI>vzXn*n0UFSziMFChZu6Lk@?0d akxA^+SBl*Ub&eJ&oi7)qqJD^NKNkQ + + + + + +PageTitle + + +
+

+
+

Seems like Arma has very limited HTML features, no colors except for link, active link and bold text. Headings can have different fonts, see Epoch_GUI_ClientConfigs.hpp file for more info on this.

+
+

Depending on size of HTML, you might need to increase height of control to enable scrolling. You can do that in inside Epoch_main_config_html in before mentioned file. Height is calculated in percentages (42% = 0.42 * safezoneH)

+
+

TIP: Use filepatching to edit it live, file is reloaded when ESC is pressed

+ + \ No newline at end of file diff --git a/Sources/epoch_code/gui/changelog.html b/Sources/epoch_code/gui/changelog.html index ff2caadf..5bb8ccb1 100644 --- a/Sources/epoch_code/gui/changelog.html +++ b/Sources/epoch_code/gui/changelog.html @@ -9,12 +9,13 @@ content="text/html; charset=windows-1250">
-

-
-

Seems like Arma has very limited HTML features, no colors except for link, active link and bold text. Headings can have different fonts, see Epoch_GUI_ClientConfigs.hpp file for more info on this.

-
-

Depending on size of HTML, you might need to increase height of control to enable scrolling. You can do that in inside Epoch_main_config_html in before mentioned file. Height is calculated in percentages (42% = 0.42 * safezoneH)

-
-

TIP: Use filepatching to edit it live, file is reloaded when ESC is pressed

+

+ +

Client:
[Added] New secure storage device: The Epoch Safe.
[Added] Totally new crafting system and UI by Raymix.
[Added] Epoch variant of the unarmed Strider vehicle. (I_MRAP_03_EPOCH)
[Added] Melee weapons: a Broad Sword and Fishing Pole.
[Added] Halloween Clown mask and re-added to loot tables: Wolf/Pumpkin masks as well as Meeps Candy.
[Fixed] Group members unable to lock a Lockbox or Safe that was placed by the group leader.
[Fixed] Shadow artifact at top of Jammer.
[Fixed] Reduce client fps lag when first joining the server by preloading objects before exiting loading screen.
[Fixed] Being unable to remove a solar generator.
[Changed] Removed debug hint text for 3d rotation of objects as it was not needed.
[Changed] Re-enable Move button, this system will stay and be refined in the next few patches.

+ +

**Improved Dog AI Dog Brain by Axeman**
[FIXED] Dog not taming due to var reset in wrong place / BIS animal update.
[UPDATED] Dog text format updated.
[UPDATED] Dog whine, instead of bark, when alerting of other nearby players (When player crouched).
[UPDATED] Dog prey kills now use animal looting system. i.e. Dog will loot dead animals, and other objects, then will fetch loot.
[UPDATED] Attached weapon (loot) holder is now dropped if dog finds a new one. Needs update.
[ADDED] New Quiet dog bark and whine.
[UPDATED] Make dog sounds global and use quieter sounds to alert player once dog is tamed. Untamed dog or when attacking is still loud.
[UPDATED] Add occasional quiet dog whine when other players in the area.
[UPDATED] General Dog timeout tweaks to compensate for Arma Animals 'doing their own thing'

+ +

Server:
[Added] Example "Epoch Event" Code to provide an example on how to broadcast a message to all players using BE.
[Added] 'CfgTraderLimits' config can control stock limit per trader per item. Default is 100 per item class per trader.
[Added] storedVehicleLimit variable in CfgEpochServer can now control the total max allowed vehicles on traders. Default limit is 20.
[Fixed] Issue with trading vehicles that caused the trader data not to save or to save to the wrong slot.
[Fixed] Added missing prices for female vests.
[Fixed] Error Generic error in expression in EPOCH_server_repairVehicle.
[Changed] Use new sort command instead of BIS_fncSortBy.
[Changed] Use new worldSize command as default if maps worldSize setting in CfgEpoch does not exist.
[Info] Removed old .bikey and added new one for 0340.
[Info] The source code for the a3_epoch_server.pbo is now on the GitHub.

+ \ No newline at end of file diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf index 20662c7c..495aaaca 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf @@ -23,24 +23,21 @@ if (_allowedVehiclesList isEqualTo []) exitWith { diag_log "DEBUG: All vehicles over limit"; }; -_spawnPositionSize = [ +_spawnPositionSizeDefaults = [ ["FlatAreaCity",1], ["FlatAreaCitySmall",1], ["NameCity",2], ["NameVillage",1], ["NameCityCapital",4], - ["Airport",5] + ["Airport",5], + ["NameLocal",2], + ["StrongpointArea",1], + ["VegetationBroadleaf",1], + ["VegetationFir",1], + ["ViewPoint",1] ]; -if (worldName in ["Bornholm","Australia"]) then { - _spawnPositionSize append [ - ["NameLocal",2], - ["StrongpointArea",1], - ["VegetationBroadleaf",1], - ["VegetationFir",1], - ["ViewPoint",1] - ]; -}; - +_serverMapConfig = configFile >> "CfgEpoch" >> worldName; +_spawnPositionSize = [_serverMapConfig, "vehicleSpawnTypes", _spawnPositionSizeDefaults] call EPOCH_fnc_returnConfigEntry; _allowedTypes = []; { @@ -73,7 +70,7 @@ _position = [0,0,0]; _vehCount = count _allowedVehiclesList; if (_vehCount <= 0) exitWith{}; - + _vehClass = _allowedVehiclesList deleteAt(floor(random(_vehCount))); if (isNil "_vehClass") exitWith{}; diff --git a/Sources/epoch_server_settings/configs/maps/altis.h b/Sources/epoch_server_settings/configs/maps/altis.h index d243f737..087b5c4d 100644 --- a/Sources/epoch_server_settings/configs/maps/altis.h +++ b/Sources/epoch_server_settings/configs/maps/altis.h @@ -1,6 +1,14 @@ class Altis : Default { worldSize = 20000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5} + }; traderBlds[] = { "Land_Kiosk_blueking_F", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; containerPos[] = { { 8599.97, 24513.6, 0 }, diff --git a/Sources/epoch_server_settings/configs/maps/australia.h b/Sources/epoch_server_settings/configs/maps/australia.h index 38ff8082..7eda973f 100644 --- a/Sources/epoch_server_settings/configs/maps/australia.h +++ b/Sources/epoch_server_settings/configs/maps/australia.h @@ -1,6 +1,19 @@ class Australia : Default { worldSize = 55000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { // N [-0.286865,8.17383,-10.3098] @@ -198,7 +211,7 @@ class Australia : Default {"Land_Tank_rust_F", {4039.04, 19377.9, 0}, 0}, - + {"HMMWVWreck", {4066.81, 19391.8, 0.00606537}, 115.432}, diff --git a/Sources/epoch_server_settings/configs/maps/bornholm.h b/Sources/epoch_server_settings/configs/maps/bornholm.h index b62b45f7..7312d422 100644 --- a/Sources/epoch_server_settings/configs/maps/bornholm.h +++ b/Sources/epoch_server_settings/configs/maps/bornholm.h @@ -1,11 +1,24 @@ // Bornholm config created by Uro [www.UroGaming.co.uk] for ARMA 3 EPOCH MOD [EpochMod.com] -// +// // Updated with some minor tweaks 20/01/2015 // Updated for new telepos positions 7/22/2015 class Bornholm : Default { worldSize = 25000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_bo_A_GeneralStore_01", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; containerPos[] = { { 18276.7, 5930.02, 0.105503 }, diff --git a/Sources/epoch_server_settings/configs/maps/chernarus.h b/Sources/epoch_server_settings/configs/maps/chernarus.h index 9baa953e..c6cb1015 100644 --- a/Sources/epoch_server_settings/configs/maps/chernarus.h +++ b/Sources/epoch_server_settings/configs/maps/chernarus.h @@ -1,6 +1,19 @@ class Chernarus : Default { worldSize = 12000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { // N [-0.286865,8.17383,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/esseker.h b/Sources/epoch_server_settings/configs/maps/esseker.h index da9f6ea6..6a447a56 100644 --- a/Sources/epoch_server_settings/configs/maps/esseker.h +++ b/Sources/epoch_server_settings/configs/maps/esseker.h @@ -1,6 +1,19 @@ class Esseker : Default { worldSize = 12000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_i_House_Big_02_V3_dam_F", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_sara_domek_zluty", "Land_Tovarna2", "Land_Shed_Ind02", "Land_i_House_Big_01_V3_dam_F", "Land_HouseV2_02_Interier", "Land_i_House_Small_01_V3_dam_F", "Land_HouseV_1I4", "Land_dum_rasovna", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_u_House_Small_02_V1_F", "Land_i_Stone_HouseSmall_V1_F", "Land_i_Stone_Shed_V1_F"}; containerPos[] = {}; diff --git a/Sources/epoch_server_settings/configs/maps/stratis.h b/Sources/epoch_server_settings/configs/maps/stratis.h index f581a837..5a2b5366 100644 --- a/Sources/epoch_server_settings/configs/maps/stratis.h +++ b/Sources/epoch_server_settings/configs/maps/stratis.h @@ -1,6 +1,19 @@ class Stratis : Default { worldSize = 6000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_Kiosk_blueking_F", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; containerPos[] = { { 2583.59, 6024.51, 0 }, diff --git a/Sources/epoch_server_settings/configs/maps/takistan.h b/Sources/epoch_server_settings/configs/maps/takistan.h index e4f4a2ea..2be8abc3 100644 --- a/Sources/epoch_server_settings/configs/maps/takistan.h +++ b/Sources/epoch_server_settings/configs/maps/takistan.h @@ -1,8 +1,21 @@ class Takistan : Default { worldSize = 12000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5}, + {"NameLocal",2}, + {"StrongpointArea",1}, + {"VegetationBroadleaf",1}, + {"VegetationFir",1}, + {"ViewPoint",1} + }; traderBlds[] = { "Land_Kiosk_blueking_F", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; - + containerPos[] = {}; telePos[] = { @@ -171,7 +184,7 @@ class Takistan : Default { "Land_InvisibleBarrier_F", {6051.98,1118.6,-3.05176e-005}, {{0.630672,0.775946,0.0126463},{0.0271672,-0.0383609,0.998895}}, true }, { "Land_InvisibleBarrier_F", {6052.1,1110.34,0}, {{-0.792943,0.609278,0.004677},{-0.00639553,-0.0159986,0.999852}}, true }, { "Land_InvisibleBarrier_F", {6054.44,1116.41,0}, {{0.630672,0.775946,0.0126463},{0.0271672,-0.0383609,0.998895}}, true }, - + //North Takistan Trader City// { "Land_FieldToilet_F", {4692.69,9216.02,0.00186157}, {{-0.181867,0.983211,-0.0148318},{-0.0384089,0.00796881,0.99923}}, true }, { "Land_WoodenTable_large_F", {4699.68,9209.76,-0.000869751}, {{0.000108613,0.999872,0.0160187},{-0.00918588,-0.0160171,0.99983}}, true }, @@ -324,7 +337,7 @@ class Takistan : Default { "Land_WoodPile_F", {6830.02,5007.43,-0.0032959}, {{0.964708,-0.261382,0.0318968},{-0.039955,-0.0255718,0.998874}}, true }, { "Land_WoodPile_F", {6828.34,5007.86,0.00384521}, {{-0.935741,0.351541,-0.02843},{-0.039955,-0.0255718,0.998874}}, true }, //North Airfield// - + { "Land_Dome_Big_F", {5687.97,11165,0}, 222.826 }, { "Land_Research_HQ_F", {5694.74,11152,0}, 317.013 }, { "Land_Cargo_House_V3_F", {5689.55,11182.2,0}, 0 }, @@ -403,5 +416,3 @@ class Takistan : Default { "C_man_hunter_1_F", { 6829.11,5004.53,0.00158691 }, 179.875 }, }; }; - - diff --git a/Sources/epoch_server_settings/configs/maps/vr.h b/Sources/epoch_server_settings/configs/maps/vr.h index 18298767..88ab1613 100644 --- a/Sources/epoch_server_settings/configs/maps/vr.h +++ b/Sources/epoch_server_settings/configs/maps/vr.h @@ -1,6 +1,14 @@ class VR : Default { worldSize = 10000; + vehicleSpawnTypes[] = { + {"FlatAreaCity",1}, + {"FlatAreaCitySmall",1}, + {"NameCity",2}, + {"NameVillage",1}, + {"NameCityCapital",4}, + {"Airport",5} + }; traderBlds[] = { "Land_Kiosk_blueking_F", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; containerPos[] = {}; telePos[] = { diff --git a/Sources/mpmissions/epoch.VR/description.ext b/Sources/mpmissions/epoch.VR/description.ext index a2282c28..d8fd5c2a 100644 --- a/Sources/mpmissions/epoch.VR/description.ext +++ b/Sources/mpmissions/epoch.VR/description.ext @@ -73,6 +73,7 @@ class CfgRemoteExec class CfgEpochClient { epochVersion = "0.3.4.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired