Commit Graph

631 Commits

Author SHA1 Message Date
He-Man
bf4cd25dcd Readded lost changes 2017-10-22 16:05:57 +02:00
Raymix
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
DirtySanchez
555e350b5d dynamic trader brain marker corrections
old marker handlers removed and replaced with global marker sets
2017-10-20 23:45:14 -05:00
vbawol
2a1c909068 bunker updates
reduce bunker size a tad
2017-10-20 14:39:06 -05:00
vbawol
4003e6d49c bunker update
revert to normal object for first spawn
inrease size by 10
2017-10-20 14:38:00 -05:00
vbawol
c51b21bd24 revert back to simple object 2017-10-20 14:19:50 -05:00
DirtySanchez
5427db38fe mapOnZoomSetMarkerSize upgrades to maintain preset size scaling
all markers now scaled based on sizing desired in the cfgMarkerSets.
Adjustment of 2.25 to the mapScale was added to achieve smaller markers sooner and maintain non cluttered map markers
2017-10-20 13:49:16 -05:00
vbawol
3307fdc54c move bunker spawn to server init 2017-10-20 12:03:43 -05:00
vbawol
0bb4c7f985 fix ah error 2017-10-20 06:51:09 -05:00
DirtySanchez
834d8bcb40 admin panel update
single out LandVehicle, Air, Ship and Tanks only for vehicle markers.
much better performance toggling vehicle markers on
2017-10-19 22:39:52 -05:00
DirtySanchez
ca2a7acfa3 2nd correction 2017-10-19 21:58:07 -05:00
DirtySanchez
efd1745b52 loot marker correction 2017-10-19 21:36:23 -05:00
DirtySanchez
a2724cf3d7 admin panel update
raise check distances for ai, traders and loot
2017-10-19 21:13:49 -05:00
DirtySanchez
fb0a15aa99 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-19 20:39:16 -05:00
DirtySanchez
c21d6f0e03 fix base marker performance
move to array and a 15 sec delay
2017-10-19 20:38:19 -05:00
DirtySanchez
38f27a1d6e admin panel update 2
add Trader Markers
change AI Markers to handle Mission Soldiers
2017-10-19 20:25:08 -05:00
vbawol
6ca00b8484 make sure dead bit is set 2017-10-19 19:49:07 -05:00
vbawol
17f396b51b player stats changes
logic to select low or high criticalAttributes
forced blood drop if player is hypothermic.
force blood pressure rise if toxicity or radiation is over 55
removed Radiation reduction in master loop so you can only reduce
radiation with treatments
players blood pressure must stay within 11-179 range or be killed.
2017-10-19 19:44:05 -05:00
DirtySanchez
29e9520c85 admin panel update 1
fix base markers toggle
add animal markers toggle
2017-10-19 19:39:49 -05:00
He-Man
7c43bc6e0d Trader Kill + BuildMode Keydown fixed 2017-10-19 20:45:41 +02:00
He-Man
96f72fc98a Option to overwrite Marker Text
Added Option to overwrite marker text and use it for Service Points
2017-10-19 19:10:52 +02:00
Grahame
4d26f9c858 Update EPOCH_server_createGlobalMarkerSet.sqf
Prepended EPOCH_ to global marker names and removed the second underscore in the default setting for marker name
2017-10-19 11:28:45 -04:00
vbawol
9addf0f6fa rework admin menu spawn logic 2017-10-18 22:36:40 -05:00
DirtySanchez
b2cf56a7b6 global marker sets and map upgrade
New global marker sets and functions.
Replace all markers for events and locations(fully configurable in CfgMarkerSets)
New MapScale marker zoom feature.
2017-10-18 11:27:23 -05:00
vbawol
853586def5 reworked mineral node harvesting
Can only use sledge hammer only to harvest nodes
seperated loot tables per mineral nodes
chance to loot on first strike 1 in 3
2017-10-16 11:02:09 -05:00
He-Man
ffa4ad32fd Make Sharks Lootable under Water 2017-10-12 22:48:32 +02:00
He-Man
cc04eac4fb Login Fix 3.0
Bypass BI's SetUnitLoadout used on Items in Clothings, because it is not
correct working atm
2017-10-11 19:16:32 +02:00
vbawol
1eb4e5417b comment fixes 2017-10-10 10:50:07 -05:00
vbawol
ebf28e6dae optimize EPOCH_fnc_weightedArray and usage
added isClass check to make sure item exists before adding to loottable.
updated for use with single array syntax of selectRandomWeighted
2017-10-10 10:50:07 -05:00
DESKTOP-UH65DCE\MusTanG
2fe8f08adf add halloween and rad masks to ah 2017-10-07 12:11:01 -05:00
He-Man
4660975b05 Fix for empty _Primary array 2017-10-07 17:45:23 +02:00
He-Man
e4fdf4d6a0 Workaround for unitloadout 2.0 2017-10-07 17:38:58 +02:00
vbawol
c9039929ab remove unused gm_enabled setvar
merge fix from @ravmustang 👍
2017-10-06 22:37:27 -05:00
vbawol
5d814a9442 just set once 2017-10-06 22:32:57 -05:00
DESKTOP-UH65DCE\MusTanG
b62a029d66 processed locally 2017-10-06 22:12:27 -05:00
vbawol
bdb168ba50 fix godmode with player vars 2017-10-06 21:17:14 -05:00
DESKTOP-UH65DCE\MusTanG
7bf39b7cad replace with FAK in comments 2017-10-06 12:07:32 -05:00
He-Man
d5905df9ff Better Spawn Positions for Chopper 2017-10-04 20:19:16 +02:00
vbawol
3890dbcf0d limit critical part damage to 0.8
per disscussion with @Ignatz-HeMan
2017-10-04 11:18:54 -05:00
vbawol
5060394989 Simple Garden Manager v1
currently set to run 24 minutes between each "grow" cycle, so from seed
to mature should take around 1.2 hours from seed to fully mature. Option
to also have mature items spoil on the next cycle (24 minutes).
2017-10-03 10:25:59 -05:00
vbawol
5f640933d9 optimize remoteexec usage for multiple targets 2017-10-03 09:11:18 -05:00
vbawol
70b11bc5a1 can just use array as targets instead of foreach here 2017-10-03 08:04:54 -05:00
DESKTOP-UH65DCE\MusTanG
f3700efba7 vector corrections and improvements
Correct vector snap issues clientside
Correct vector placement issues server side
Correct remoteExec reveal to clients(fixes incorrect placement during
swap)
2017-10-02 17:05:53 -05:00
vbawol
bf7d35b519 move rads for locations to client
locations cannot use public var option
2017-10-02 10:06:04 -05:00
vbawol
4f98071e8d dynamic radio active locations 2017-10-01 18:14:18 -05:00
vbawol
2c8ace3a8d use player object for RE instead of netID 2017-09-30 22:06:47 -05:00
vbawol
0de36abd6b testing
if this is cause of duping on login
2017-09-30 15:40:42 -05:00
vbawol
84a2c7b721 debug 2 2017-09-29 22:44:17 -05:00
vbawol
4da51a45f3 add debug 2017-09-29 21:48:32 -05:00
vbawol
fc3ba3b3fb customHeader test
moved debug monitor to master loop
dropped digest idea for now
removed file check on masterloop and keydown
2017-09-26 14:31:39 -05:00
vbawol
05cb38f4f7 force hitpoints to reset 2017-09-26 14:21:23 -05:00
vbawol
2154402d85 fixes
fix error if EPOCH_playerEnergyMax was nil
another test case for swapBuilding if still not fixed.
removed hitpoints var from heal and godmode as it is not used.
2017-09-25 17:19:53 -05:00
vbawol
d318d99a86 setVectorDirAndUp after setpos
All uses of setVectorDirAndUp in arma code is after setpos not before.
2017-09-25 16:58:28 -05:00
DESKTOP-UH65DCE\MusTanG
7efdfd5b4c corrections 2017-09-24 17:00:52 -05:00
DESKTOP-UH65DCE\MusTanG
480ee26dbb config controls karma levels 2017-09-24 15:28:42 -05:00
DESKTOP-UH65DCE\MusTanG
01446e50ad karma changes(deaths, suicides, pvp, revives, trades, tradersKilled) 2017-09-24 15:01:54 -05:00
He-Man
a8c4297c7d Fix teleporter pos if debug is above Water
modeltoworld returns "swimming" values above water (dependent on waves).
using modeltoworldworld fix it
2017-09-22 21:23:56 +02:00
He-Man
39ae07e488 Fix Debug Classname from Config 2017-09-19 18:53:56 +02:00
vbawol
6c199b43d4 remove extra debug 2017-09-17 12:45:58 -05:00
vbawol
37d782bde2 event fixes 2017-09-17 12:45:25 -05:00
vbawol
3b64735d64 debug 2017-09-17 12:35:40 -05:00
vbawol
acfba073fc added disallowed events per worldName
bunker test code updates
2017-09-17 12:11:40 -05:00
vbawol
f9fb1d69f1 change method to remove events
old was causing an error and index issues
2017-09-17 11:04:48 -05:00
vbawol
cf2244d3b3 fix lexer warning 2017-09-17 09:53:52 -05:00
vbawol
faf82b97b2 make debug box config based
lightPos: controls the positions of light props inside the box (uses
modelToWorld offset), set to {} to disable.
debugBoxClass: Controls the class that is used for the debug box, "" to
disable debug box.
cloneClasses: What classes to use for clone vat props, set to {} to
disable
2017-09-17 09:47:48 -05:00
He-Man
a67bb3b3c5 Fix for 1st Trader not spawning 2017-09-14 17:56:40 +02:00
vbawol
58c0481b6c add GeigerCounter price and to loot table 2017-09-08 12:21:42 -05:00
He-Man
3543ce892d Fixes and Cleanups for VehRepair + ServicePoint
- Added CinderWall Door to DoorCount in UpgradeBuild
- Added Option to prevent repairing full damaged HitPoints in
ServicePoint
- Added Option to disable removing Parts in Advanced Vehicle Repair
- Added CinderWallDoorwHatch_EPOCH to cfgBaseBuilding
- Fix in cfgCrafting for KitVehicleUpgradeI_200_EPOCH
- Added an "isdamageallowed" check in EPOCH_server_repairVehicle for
repairing untouched Vehicles in Bases
https://github.com/EpochModTeam/Epoch/blob/experimental/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf#L202-L203
- Some Cleanups of commented out lines
2017-09-08 18:34:56 +02:00
He-Man
1efddd17c1 Fix for Duping by remove Building 2017-09-04 23:18:54 +02:00
He-Man
6f3a68bd7f Workaround for login-issue (BlackScreen) 2017-09-03 19:18:35 +02:00
He-Man
e286914461 Fixe for exploding new spaned Vehicles
"HitHull" > 0.95 causes exploding Landvehicles
2017-09-03 16:03:41 +02:00
vbawol
52e02b954c Optimize: nearestObjects use object instead of pos 2017-09-02 17:06:27 -05:00
He-Man
2484804c7a Usage of "unitleadout" on player revive 2017-09-02 19:56:59 +02:00
DESKTOP-UH65DCE\MusTanG
71f6c3db70 fixes
Added the _allPlayers variable to complete the delete and readd to
original Perm Group.

Optimized forEach statements.
Fixed use of _groupId with _permGroup
2017-08-30 20:43:19 -05:00
vbawol
7ab0e2694b Merge remote-tracking branch 'origin/experimental' into experimental
# Conflicts:
#	Sources/epoch_config/Configs/CfgClientFunctions.hpp
2017-08-30 17:19:05 -05:00
vbawol
01c8641ff2 Conditional Loot table feature and reworking antagonist spawning
- We no longer spawn antagonists on opening loot containers or trash.
Instead we have the client spawn them from a new weighted array. Note:
Admins can control what AI are spawning by removing from array
(antagonistChances) or setting chance to 0
- moved EPOCH_spawnIndex and EPOCH_spawnLimits to master loop init
instead of both_init as it is only needed client side.
- loot table updates for extra logic condition.
2017-08-30 17:15:14 -05:00
vbawol
e4903fd870 move weightedArray to Cfgfunctions for both server and client use 2017-08-30 17:00:06 -05:00
vbawol
a81088645c call compile to parseSimpleArray 2017-08-30 16:44:55 -05:00
DESKTOP-UH65DCE\MusTanG
f30582cc9f Function name change and fix be filter 2017-08-30 14:30:27 -05:00
DESKTOP-UH65DCE\MusTanG
3b82e8b0b0 clean up server side temp groups 2017-08-30 03:36:37 -05:00
DESKTOP-UH65DCE\MusTanG
d90eb4774f epoch groups system
move "Delete Group" button check to onLoad from button click.
Remove owner from EPOCH_sendRemoteExecClient calls.
Add UI update push to leader on Delete Group.
Add UI update push to client on remove in case they clicked leave group.
2017-08-30 03:14:13 -05:00
DESKTOP-UH65DCE\MusTanG
56283e0c08 Temp Group System
Credit goes to AWOL for the original Epoch Group System.
Temp Groups do not allow outsiders access to bases, vehicles or safes.
Easily switch to Temp Group for Co-Op mission, then back to Perm Group.
Full access to Kick, Set Mod, Leave Group/Delete Group.
When leaving or deleting group, you will be put back into the actual
group of your teammates if online.
Fixed Leave/Delete Button to show Delete Group onLoad of Temp Group UI
Added refresh to Group UI's so all players are in sync after changes
2017-08-30 02:43:37 -05:00
vbawol
ff5d56af46 better way to handle login fsm variables
CfgEpochClient "debug" variable to control extra debug and is currently
used in login fsm.
2017-08-26 09:57:59 -05:00
vbawol
30d8107d75 configClasses fixes thanks to @ravmustang 2017-08-26 07:12:50 -05:00
DESKTOP-UH65DCE\MusTanG
b98f6e042a remove backup 2017-08-25 18:45:11 -05:00
DESKTOP-UH65DCE\MusTanG
e5fea7a53a correct configClasses usage 2017-08-25 18:44:26 -05:00
vbawol
db18932055 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-08-24 09:29:01 -05:00
vbawol
5d044b3d9b proper use of copy operator
https://community.bistudio.com/wiki/Operators
2017-08-24 09:28:57 -05:00
He-Man
ecf904415b Remove forbidden Wpns / Ammo after upgrade 2017-08-22 23:40:41 +02:00
He-Man
2d0ef031c6 Moved Vehicle Upgrade to DynaMenu
- Vehicle Upgrade moved to DynaMenu
- Hitpoints now also will be given to Vehicles from other BaseClasses
(controlled by HitPointNames)
- Added a security Check that Players must have a bit distance to
upgrade
- Fixed some errors in Colorscript for upgraded Vehicles. If it is only
an upgrade, same color is used. If it is another Class, a new random
color will be taken.
- Removed Upgrade Vehicle from Inventory Click
- Changed DynaMenu to make it possible to call a script to get iconpath
(use "iconcode" instead of "icon" then)
2017-08-21 14:26:13 +02:00
vbawol
f7c3f748f7 add currentweapon to data new format 2017-08-18 15:00:30 -05:00
vbawol
94c5fee877 allow/setDamage and disableAI tweaks 2017-08-18 12:06:46 -05:00
vbawol
f0fbbe2cbb fixed spelling on Shipwreak 2017-08-18 11:12:47 -05:00
vbawol
b08e092cd4 Vehicle Damage On Spawn #824 2017-08-18 08:40:14 -05:00
vbawol
1a211407b9 updates to login system and hitpoints
- No longer track hitpoints from client side, now saved server side only
and pushed to clients on login.
https://community.bistudio.com/wiki/getAllHitPointsDamage
- Changed use set / getUnitLoadout and should still have legacy player
data support that will upgrade automatically on first save.
- Default loadout can be controlled via new variables in epochconfig.hpp
- Made data validation check dynamic using isEqualTypeParams as it does
type checking and still fails if input is shorter than the default.
https://community.bistudio.com/wiki/isEqualTypeParams
- Added back server side damage protection for the new player body. If
the new unit dies before the player switch it could cause login issues
and should not cause issues with scripted setdamage or hitpoints as
first thought. https://community.bistudio.com/wiki/allowDamage
2017-08-15 14:19:03 -05:00
vbawol
f28cc43cd5 b826 2017-08-07 18:53:00 -05:00
vbawol
163d702271 b824 2017-08-04 15:16:51 -05:00
vbawol
6e3dcd090a b823 2017-08-04 14:39:46 -05:00
vbawol
02c6e96f0c b822 2017-08-03 19:19:27 -05:00
DESKTOP-UH65DCE\MusTanG
c19847b156 updates
local antagonists killed by non-local entity needed to be handled.
Local and Non-Local stat changes are now sent to server first then back
to the appropriate client after pToken check is verified.
2017-08-03 18:11:10 -05:00
DESKTOP-UH65DCE\MusTanG
c49ee69265 add some tidybowl 2017-08-03 09:42:49 -05:00
DESKTOP-UH65DCE\MusTanG
43958142b8 Community Stats System #1
Fully customizable system.
Base system laid out more so as an example.
Included:
-Murders
-Deaths
-Suicides
-Revives
-AIKills
-AntagonistKills
-ZombieKills
-MissionsAttempted
-CompletedMissions

Client side stat change with optional send to server.
Server side stat change with optional send to client.
Server is backed up with token check if sent from client.
2017-08-02 22:16:21 -05:00
vbawol
4cdc67cf9d Merge pull request #804 from Ignatz-HeMan/experimental
Advanced Vehicle Repair
2017-08-01 16:47:39 -05:00
vbawol
e022e6bfb3 b821 2017-07-31 23:19:08 -05:00
vbawol
2c99640040 b820 2017-07-31 16:12:41 -05:00
He-Man
5dd672cb68 Advanced Vehicle Repair 2017-07-31 18:28:18 +02:00
vbawol
586261f587 b819 2017-07-28 11:57:10 -05:00
vbawol
29e530d62c AH updates
- change a few call compile + callExtension calls to parseSimpleArray +
callExtension as they return arrays.
- allow anti teleport check to be disabled with
antihack_antiTeleportCheck = "false" inside epochah.hpp
- optimized and made EPOCH_server_getRealTime command a normal server
function.
2017-07-28 11:56:30 -05:00
vbawol
1a806fbfec fixed type error on createTeleport 2017-07-27 14:15:30 -05:00
vbawol
c38766286d b815 2017-07-27 09:51:19 -05:00
He-Man
f70d2f7a4a Clear Veh Cargo after upgrade 2017-07-26 22:40:34 +02:00
vbawol
45a02c7b91 for #340 disable refuel client side 2017-07-25 12:02:17 -05:00
vbawol
ce5312930c b813 2017-07-25 11:41:54 -05:00
vbawol
3808c2c95a b812 2017-07-25 07:58:55 -05:00
vbawol
ec262e59f0 b810 2017-07-24 16:20:15 -05:00
He-Man
4982b1ec03 Fixed msg "Not all Items sold" 2017-07-24 20:05:26 +02:00
vbawol
10a762b541 Merge pull request #788 from ravmustang/Dynamic-Simulation-#3
DynSim #3 Configs
2017-07-24 12:50:38 -05:00
DESKTOP-UH65DCE\MusTanG
e52fc1ee25 DynSim #3 Configs
Added cfgDynamicSimulation.
Toggle entire system.
Toggle individual sections player/bases/vehicles
Set mulitpliers and distances.
Will continue to add to these configs as BIS adds more scripting
commands for us to use.
2017-07-24 12:34:58 -05:00
vbawol
97e1b5d328 Merge pull request #787 from ravmustang/non-Epoch-Teleporter-UserAction
Action change
2017-07-24 12:31:25 -05:00
DESKTOP-UH65DCE\MusTanG
f68f616fea Action change
Change selection in array to "" as the current selection is not built
into these non-epoch objects.
2017-07-24 12:26:14 -05:00
vbawol
6ff599a578 use same array for worldpos 2017-07-24 11:20:32 -05:00
vbawol
5fe2d99731 fix error line 110 2017-07-24 10:05:07 -05:00
vbawol
77ae1625a6 allow direction and force addactions on other objects 2017-07-24 09:31:27 -05:00
vbawol
9d9ea54612 b809 2017-07-20 22:32:50 -05:00
vbawol
4d66562459 b808 2017-07-20 18:08:16 -05:00
vbawol
63e8a887c9 rem old simulation code, recount arr after upgrade 2017-07-20 18:06:33 -05:00
vbawol
3ef5fa1fe3 b807 2017-07-20 14:10:06 -05:00
vbawol
292108715b fixed minor typo in vars 2017-07-20 11:07:24 -05:00
vbawol
e45e3d0abe b806 2017-07-17 05:58:51 -05:00
vbawol
015dd1f37c Merge pull request #781 from ravmustang/Missing-;-
This little ; went to the market..... lol
2017-07-17 04:47:05 -05:00
vbawol
312868bc70 Merge pull request #780 from ravmustang/Dynamic-Simulation-System-#1
Dynamic Simulation #1
2017-07-17 04:46:35 -05:00
DESKTOP-UH65DCE\MusTanG
98e8bcb6ab This little ; went to the market.....
This silly guy went home. ROFL
2017-07-16 23:15:51 -05:00
DESKTOP-UH65DCE\MusTanG
44a7b78980 Dynamic Simulation #1
Init dynSim for server and client.
Load configured settings.
Enable dynSim for Buildings, Vehicles, Clients.
2017-07-16 15:26:19 -05:00
vbawol
7ccf6d85c4 b805 2017-07-12 11:19:53 -05:00
vbawol
043290d5d2 b804 2017-07-09 05:30:52 -05:00
vbawol
b2354dc5a6 enable dynamic simulation on vehicles 2017-07-08 18:52:42 -05:00
vbawol
0efc699370 b803 2017-07-08 18:51:32 -05:00
vbawol
2c7bf2e87c Merge pull request #774 from ravmustang/Vehicle-Upgrade-System-#1
Vehicle upgrade system 1
2017-07-08 11:55:05 -05:00
vbawol
cdf1e709ae update private array 2017-07-08 08:07:06 -05:00
He-Man
6820969989 Fix for SetSpawnPoint above Water not working 2017-07-07 20:43:11 +02:00
DESKTOP-UH65DCE\MusTanG
657d4c7b29 Check and Correct Old Vehicle DB array
When hosts upgrade they will have vehicles saved in their DB with the
old dataFormat.
This check by @He-Man will do the trick to solve this issue moving
forward with vehicle upgrades
2017-07-04 10:25:23 -05:00
DESKTOP-UH65DCE\MusTanG
9faac57e27 Add new Vehicles to CfgPricing 2017-07-03 17:39:37 -05:00
DESKTOP-UH65DCE\MusTanG
e906d29c9c More upgrades and new functions 2017-07-03 15:59:40 -05:00
DESKTOP-UH65DCE\MusTanG
1dc4d147be VUS #1
ItemInteractions for VehDoc's set for UPGRADE
CfgVehicleUpgrade added for customizing materials needed
Server function for upgrading vehicle
CfgRemoteExec addition for server function above.
2017-07-03 07:22:20 -05:00
vbawol
ae5458a775 b801 2017-06-26 08:08:13 -05:00
He-Man
929760808a Fixed Trader Count 2017-06-26 00:46:51 +02:00
vbawol
3813a76dce b800 2017-06-24 12:03:27 -05:00
vbawol
b217e743fc b799 2017-06-23 23:57:53 -05:00
vbawol
05322dfb1c test get|setUnitLoadout on player login
since setUnitLoadout arguments can be global and have global effect it
may work better than some of the inventory commands that only work with
local args. (like: https://community.bistudio.com/wiki/addBackpack,
https://community.bistudio.com/wiki/addWeapon, etc.)

If this helps then, a more Ideal fix would be to just use getUnitLoadout
on player save and setUnitLoadout on player logins.
2017-06-23 16:15:23 -05:00
vbawol
b0312d2e13 b797
add switch for auto refuel disableAutoRefuel
2017-06-19 17:38:14 -05:00