Commit Graph

758 Commits

Author SHA1 Message Date
Grahame
4a6cfa13b4
Update EPOCH_maintainIT.sqf
Corrected spelling of crypto
2018-08-16 10:26:55 -04:00
Grahame
be565d98b3
Update EPOCH_cGroup_onLoad.sqf
Corrected spelling of crypto
2018-08-16 10:26:18 -04:00
Grahame
ae31744203
Update EPOCH_takeCrypto.sqf
Correct the spelling of Crypto
2018-08-16 10:24:16 -04:00
He-Man
b2cd465fbf Make UAV's useable with DynaMenu 2018-07-11 14:50:19 +02:00
He-Man
43ae5cc72e Radsuit protect against toxic (not bites) 2018-07-11 13:30:02 +02:00
He-Man
77b1434a08 E-Pad Scans + Earplug Fixes
- Added wait time to E-Pad Scans
- Added needed energy to E-Pad Scans
- Smaller Earplug-fixes
2018-07-11 13:10:03 +02:00
He-Man
3fd9071c51 avoid allmissionobjects 'PlotPole_EPOCH' 2018-06-30 13:37:35 +02:00
vbawol
8de2f07525
Merge pull request #986 from RZSenfo/patch-2
fix missing param
2018-06-23 05:21:00 -05:00
RZSenfo
42acfb372c
fix missing param
as seen here

a9dc9f044b/Sources/epoch_server/compile/epoch_player/EPOCH_fnc_updatePlayerStats.sqf (L15)

second param is _killer (object)
2018-06-23 09:34:29 +02:00
RZSenfo
2cdac43fce
EnableDebugConsole can be an array
also if set to 1, player must be host/admin to see it
2018-06-23 09:31:27 +02:00
He-Man
2f1ba9a20d E-Pad + Earplugs (WIP)
First Test of the E-Pad.
Current Apps are only examples
Everybody is welcome to add suggestions for Scripts / Apps.
2018-06-21 21:59:37 +02:00
He-Man
9915cb1939 If null, try cursorobject 2018-06-18 18:04:28 +02:00
He-Man
f2add15ed9 lazy evaluation - thx to Senfo 2018-06-12 21:38:24 +02:00
He-Man
1e64f6702a Handle Marker in Masterloop (for later E-Pad use) 2018-06-12 20:22:37 +02:00
He-Man
32e1836d1e Preload often used configs in Masterloop 2018-06-12 17:57:09 +02:00
He-Man
7b9ad23a76 Prepared (not used) more custom EH's 2018-06-06 19:57:22 +02:00
He-Man
0d02324f3e config fix + Door / Gate counter for new elements 2018-05-18 19:41:28 +02:00
He-Man
948999945e Cam adjustments 2018-05-18 14:47:50 +02:00
He-Man
09fdb7170c Upgrade Building tweaks 2018-05-17 19:22:15 +02:00
He-Man
5c3d73bcb2 Trader Script tweaks and cleanup 2018-05-16 20:12:06 +02:00
He-Man
c85516337d Hatchback and Mountainbike repair fix 2018-05-14 20:00:29 +02:00
He-Man
a256e46965 Cam tweaks 2018-05-13 21:49:57 +02:00
He-Man
b418f64665 Last BaseCam tweaks 2018-05-06 21:06:09 +02:00
He-Man
d2ae1ebb02 Cam BE and privates 2018-05-06 17:37:38 +02:00
He-Man
815b7f4c67 Cam Init 2018-05-06 02:07:56 +02:00
He-Man
22ab6f454b Cam Scripts 2018-05-06 02:03:53 +02:00
He-Man
14587e6c4e Player Login rework 2018-05-05 17:47:53 +02:00
He-Man
1add566571 Defibrillator 2018-05-01 17:03:30 +02:00
He-Man
7ba61ea46c Preload PostProcess and only disable
Create / destroy cause some weird effects especially for Alcohol
PostProcess
2018-05-01 14:31:59 +02:00
He-Man
e2d214b59a Drunk fix 2018-05-01 13:29:23 +02:00
vbawol
6c13f3d5ae small optimizations
typeName ... isEqualTo >> isEqualType
2018-04-30 22:01:37 -05:00
He-Man
9b47c43ab2 MagHandle moved to _unifiedInteract 2018-04-30 22:29:14 +02:00
He-Man
b16baeab2e Calculate Attribute on comsume EnergyPack 2018-04-23 15:41:46 +02:00
He-Man
9a4ba98515 Config to calculate bullets for crafted mags
Example:
- You need 3x energy pack small + 1x electronic + 1x Gold to craft a
large energy pack.
- The 3 small packs can hold max 30 bullets
- If you have in these 3 small packs only 15 bullets, you will return
only a half full large pack (50 Bullets)
- If you have only 10 Bullets, you will get back 100*10/30 -> 33
Bullets.
2018-04-20 18:31:23 +02:00
He-Man
878723b244 Solar Charger Scripts 2018-04-20 18:19:31 +02:00
He-Man
9945f9246e Energy Tweaks
Added some missing and new configs to CfgEpochClient
Added Energy settings for default map sources to CfgBaseBuilding
Included wind / overcast / distance to energy calculations (depents on
powertype)
- Solars are affected by SunOrMoon and overcast
- Windmills are affected by wind
- Satellites are affected by distance
2018-04-18 19:41:16 +02:00
He-Man
d8632a89d5 Calculate Multigun distance by size of Target 2018-04-17 17:14:45 +02:00
He-Man
12ed6cfdf9 Return attachments from sold primary / secondary 2018-04-15 00:01:03 +02:00
He-Man
3966ad7010 Advanced Veh Repair Fix #2 after Tank DLC 2018-04-13 14:27:27 +02:00
He-Man
f9de95ffc7 HitPoint Fix test 2018-04-13 00:15:07 +02:00
He-Man
c5abeed9f7 Add SecondaryWeapon to TraderArray (untested !!!) 2018-04-12 21:00:24 +02:00
He-Man
001c49f148 1 seconds broadcast-time for setunitloadout 2018-04-09 19:19:42 +02:00
He-Man
946762fa06 Penalty for looking through Floors (Tower-Glitch) 2018-04-08 04:28:01 +02:00
He-Man
bef09d5cd3 Reduce to only one Var 2018-04-07 23:52:22 +02:00
He-Man
1f8293ccc7 Config to restrict Vectorbuilding (max tilting) 2018-04-07 23:46:37 +02:00
He-Man
561012b09c Config to make Temp Vehicles tradeable 2018-04-06 17:57:42 +02:00
He-Man
84d7167a14 Recalculating of _currentStock 2018-03-30 15:58:17 +02:00
He-Man
2abcf105b5 Removed Trader Limits - handled with new vars
Have to be tested!!!!
2018-03-30 05:09:27 +02:00
He-Man
92035636be HeliRopeAction fix 2018-03-18 01:53:24 +01:00
He-Man
25d2f2b24f Config to enable / disable needed items for actions
Also increased needed "bullets" to inflame
2018-03-16 22:11:52 +01:00
He-Man
72fde8640a Minerocks fixed 2018-03-16 14:14:49 +01:00
He-Man
923a41abff Config to block ATMs in Plot Range 2018-03-09 22:37:51 +01:00
He-Man
9ff76f4989 Last Script and BE for Power Sword 2018-03-06 20:18:36 +01:00
He-Man
1460773de3 Power Sword Function 2018-03-05 22:49:32 +01:00
He-Man
0d051e133f Reload Loadout on Pause
Thx to Grahame for the inspiration to add it just before logout.
This should fix the login without clothings.
This will not fix not visible Clothings for others, because it only runs
just before logout, but Players can force it be pressing ESC and waiting
until this command is fired.
2018-02-26 21:09:39 +01:00
He-Man
12e5746c82 Snap Helper + BE kicks
- Helper 3D-Icon + Line on the part, where element is snapped on (while
Base-Building)
- "PLAYER_REJECT_ServerVersion" kick, if connecting with older version
2018-02-01 18:52:55 +01:00
He-Man
03985c460d Snapping in Basebuilding
- Increased the snapping distance for Foundations, so it is much easier
to snap them correctly
- Added a SnapPoint between Floors for 2x Wall height
2018-01-30 17:58:56 +01:00
He-Man
b743a9be31 Small AutoRun fixes 2018-01-19 16:14:21 +01:00
He-Man
b5a99880d8 removed ; 2018-01-18 22:26:41 +01:00
He-Man
096f03e7b9 AutoRun
- Default Key is "W"
- You can change the key in EPOCH ESC Menu
- If choosen key is same as "moveforward" (default), you have to 2x tap
it, else you only have to 1x tap it
- If your legs are broken, you get a hint "can not autorun - legs are
broken"
- If the terrain is too steep, you only walk in AutoRun
- Inside Water, you can not Autorun
2018-01-18 21:40:18 +01:00
He-Man
f34ff90390 Use addMagazineOverflow + BE-Filter 2018-01-15 18:48:36 +01:00
He-Man
2ccb006697 Handle not full mags in Trader 2018-01-13 15:12:54 +01:00
He-Man
b2a2e25a2c Make Lighter Refillable 2018-01-10 21:16:29 +01:00
He-Man
a2172aaef5 Smaller fixes and tweaks
- Fixed usedItemRepack removes all same items with same rounds
- removed action "gear" by opening Cargo Container
- removed StorageInit (EH Killed), if Storage is indestructible
- Spawn Vehicles near 0 and port them after all is loaded to final
position (prevent collide)
- increased Altis World size to 25000 (better Vehicle / Trader Spawn)
2018-01-10 20:10:00 +01:00
He-Man
3eac0b0035 Skip ForceUpdate, if ForcedUpdateNow + fishingtime 2018-01-09 23:27:38 +01:00
He-Man
134627d08b Changed SnapPoints color for better visibility
White is mostly very hard to see.
2018-01-09 20:03:20 +01:00
He-Man
ec3953435a Fix nitelight not working inside Vehicles 2018-01-06 15:11:57 +01:00
He-Man
f59defbb5a CloseDisplay 999 on Playerdeath 2017-12-19 17:22:29 +01:00
Helion4
d224598e4c removed place holder for classname
male & female rad suit class names added in place holder spcae
2017-12-11 15:45:14 +00:00
He-Man
994e6f91e1 Fixes for ForceUpdate 2017-12-10 18:25:16 +01:00
DESKTOP-UH65DCE\MusTanG
f34c1c8e24 default select weapon on keys 1,2,3
Keys 1,2 and 3 now will process for a holstered weapon if the FAV BAR
item in slots assigned to those keys are not present in
inventory/weapons.
Interaction Items not in inventory will throw "Item Not Found" message
2017-12-06 10:22:34 -06:00
DESKTOP-UH65DCE\MusTanG
bdfee35a18 CfgActions overriding - fire on/off req - a3 hooking ++
[FIXED] BurnBarrel and FirePlace02 UserActions requiring lighter_epoch
did not need lighter when performed.
[NEW] CfgActions event handler for "Action" ("PrevAction" and
"NextAction" - not implemented yet)
-Allows ability to override any of the CfgActions/UserActions in Arma 3
and other mods.
[ADDED] usedItemRepack function to remove 1 use from the lighter.
[ADDED] Require fire extinguisher to "Put Out Fire" on the Burn Barrel
[CHANGED] ItemFireExtinguisher now has count = 5 for 5 uses to put out a
small fire
[ADDED] ItemFireExtinguisher to CfgItemSort and CfgPricing
[ADDED] Arma Sling Loading requires ItemRope to sling and returns rope
upon release..
[ADDED] Checks for R3F can_lift and Advanced Slingload InitVar.
[ADDED] If above mod/script is present disable Arma SlingLoad
Hook/Unhook action and key press.
[CHANGED] While working with keyDown EH, debug logs show the DIKCodes
are being pushed as whole numbers and not the 0x01 as the escape keyDown
handler was setup to use and why my tests were failing using the 0x30
for the letter B(Hook/Unhook).
[UPGRADED] Changed over the 0x01 and 0x30 to the actionKeys name in
order to properly handle those with client using custom keys.
[TEASED] Have a commented line in the Light Fire case showing future
plans for a fire system(BURN BABY BURN!).

[NEW] EPOCH_usedItemRepack

Description:
Allows adjusting of "ammo" counts in a magazine.
Can be used locally and on the server for a remote unit.
```
[_player,_magazine,_change] call EPOCH_usedItemRepack;
2017-12-05 18:20:08 -06:00
He-Man
755bef4284 Hints for Multigun Useage 2017-12-02 21:22:43 +01:00
He-Man
8ab05047e9 Simulation tweaks
- Added an option to completely disable Simulation for specific Base
Parts.
- Added Base Parts without animations to this array.
- Removed Base Objects Init (mpAddEventhandler "mpKilled") from
indestructible Base Objects, as it is not needed.
- Moved Dynamicsimulation server side (not needed client side)
- Resorted epochonfig.hpp
All changes are running on our Server without any problems and with a
good performance boost, as the dynamicsimulationhandler has not to
handle a few thousand objects anymore
2017-11-30 22:59:29 +01:00
He-Man
a6f43e934b Make Nuisance by shooting configureable
Also reduced it, because it is very high on default
2017-11-15 21:53:14 +01:00
Raymix
de1e15374b Reduces rads over time at a cost of immunity. 2017-11-12 15:10:40 +00:00
He-Man
8ff511d3ee Reworked GetOutMan EH
- Allows to park closer to walls
- Better prevent against Wall Glitching
- Now works for all Buildings (not only Epoch Walls)
2017-11-08 19:27:01 +01:00
He-Man
224032abb7 Fix for CameraView Check 2017-11-05 01:26:19 +01:00
vbawol
197df4863e
Merge pull request #952 from 82ndab-Bravo17/favbar
Fav bar and accessories
2017-10-28 17:25:49 -05:00
82ndab-Bravo17
d2ebcbe0ae Fav bar and accessories 2017-10-28 17:57:55 -04:00
Grahame
9f45414d2d
Update Epoch_setRadiation.sqf
Small fix for radiation post process effects when under 10% irradiated
2017-10-28 15:07:24 -04:00
Grahame
2fb026df0f
Update Event2.sqf
Added the variable _radiationEffectsThreshold as the condition for calling post-process screen effects for radiation
2017-10-28 15:06:20 -04:00
Grahame
6d9c145bca
Update init.sqf
Added the reading of radiationEffectsThreshold variable from CfgEpochClient.hpp
2017-10-28 15:04:58 -04:00
vbawol
d3b621b827 give attributes random data to use 2 decimal places 2017-10-27 09:17:34 -05:00
Raymix
2b0119f574 Consume uses message_stack, trader chat colored in orange now 2017-10-25 22:27:17 +01:00
Raymix
e77fcec023 add message_stack to consume items script 2017-10-25 21:57:29 +01:00
Raymix
78352726bd New message system - multi line support, fix for feedback #945. 2017-10-25 21:04:18 +01:00
Raymix
ba7285ee78 Remove quotes from messages 2017-10-25 17:55:27 +01:00
Raymix
8986729467 Fixes low energy issue #945 + new low battery sounds (below 5) 2017-10-24 19:29:56 +01:00
Raymix
17fae05e4e some weird git bug, won't let me discard these. No changes 2017-10-24 17:23:13 +01:00
DESKTOP-UH65DCE\MusTanG
f8a7a569ce mapOnZoomSetMarkerSize upgrade
Add exitWith to remove wasted resizing during scrolling
Add config entry for custom adjustments
Change how adjustment calculation is made.
Added new min calculation.
Adjust cfg marker sets sizing to fit new setup

🤘
2017-10-23 22:31:38 -05:00
vbawol
b71b86c4a7 move mod checks server side 2017-10-23 15:12:00 -05:00
vbawol
0adc494b75 revert animation state test 2017-10-23 14:32:06 -05:00
vbawol
0861ab0b97 move params 2017-10-23 13:57:55 -05:00
vbawol
258d6c82d9 animation state
added missing var init server side
moved playMoveNow to master loop init and after display checks.
added config switch setAnimStateEnabled to test this, set
setAnimStateEnabled = true in CfgEpochClient to enable. Disabled by
default.
2017-10-23 13:43:27 -05:00
Raymix
31401b5b39 geiger: remove unused fnc, reduce tick volume by half. 2017-10-23 19:09:21 +01:00
Raymix
6826cd6ad9 dynamenu: anim jitter fix, zoom from center fix, increased icon size by 50% 2017-10-23 18:51:24 +01:00
vbawol
e90096c30c Revert "let server handle playMoveNow"
This reverts commit 06d6a642d1.
2017-10-23 11:29:01 -05:00
vbawol
06d6a642d1 let server handle playMoveNow 2017-10-23 11:07:01 -05:00
vbawol
0f6abe3b15 add playMoveNow 2017-10-23 11:01:44 -05:00
vbawol
178c844f66 add animation state tracking
todo make use of animation state via login fsm
2017-10-23 10:53:34 -05:00
DESKTOP-UH65DCE\MusTanG
103cf4610a add max range config 2017-10-23 01:31:39 -05:00
DESKTOP-UH65DCE\MusTanG
d0d7c9d765 remove unused code 2017-10-22 20:54:22 -05:00
DESKTOP-UH65DCE\MusTanG
02d042b186 remove "location" type fixing serialization error 2017-10-22 20:52:08 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9 geiger counter energy consumption 2017-10-22 19:18:19 -05:00
Raymix
cf34a30b57 geiger low energy warning 2017-10-22 19:45:38 +01:00
Raymix
da55cfafb9 spoke too soon, another logic issue fixed 2017-10-22 18:59:37 +01:00
Raymix
1b19df0cba another math issue, hopefully last 2017-10-22 18:49:47 +01:00
Raymix
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
Raymix
faa26dfe5a remove diag_log, oops 2017-10-22 17:39:18 +01:00
Raymix
a6aade38b9 disable geiger by default 2017-10-22 17:28:51 +01:00
Raymix
a3ff403d2c change back 2017-10-22 17:18:52 +01:00
Raymix
a7f5f1ea8f Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-22 17:16:30 +01:00
Raymix
e996d78695 Radioactive sickness calc 2017-10-22 17:15:58 +01:00
DESKTOP-UH65DCE\MusTanG
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
Raymix
02e4b822e4 conflicts 2017-10-22 00:10:45 +01:00
Raymix
8b5f896424 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-21 23:52:37 +01:00
Raymix
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
Grahame
0ff57e294e Variable handling of accelerated HTA loss 2017-10-21 16:41:31 -04:00
Grahame
035ff7aa09 Added variable handling of accelerated HTA loss 2017-10-21 16:40:44 -04:00
vbawol
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -05:00
vbawol
2ce47c3a3f comment 2017-10-20 17:05:01 -05:00
vbawol
ae581880a4 fix possible random var collisions 2017-10-20 17:04:32 -05:00
He-Man
2d1835d455 SnapPoints for Floors 2017-10-20 23:15:17 +02: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
DirtySanchez
6857111a02 remove comments, edit high value 2017-10-20 11:17:42 -05:00
DirtySanchez
9297fa539e onZoomMarkerScaling upgrade
use better mapScale value management and calculation
2017-10-20 11:15:09 -05:00
vbawol
27ef146313 make use of config based snap points 2017-10-20 10:08:52 -05:00
vbawol
760547789f item interaction fixes
Allow eating of all seeds
Fixed no effect from nanite injector, nanite cream, nanite pills, iodide
pills
Provide feedback when attempting to use morphine when you dont need it.

NOTE:
when using Default as parent class InteractAction defaults to ammo
repack = 0
interactActions 1,2 ,6,7,8,9 are all do the same thing via
_unifiedInteract function
2017-10-20 08:06:41 -05:00
DirtySanchez
2f6e0bf4c6 snapping corrections and direction lock for similar constructions
Add direction lock.
If direction lock it only allows 0 and 180 degrees adjustment.
Will force 90 to 180 an 270 to 0
This keeps all snaps in proper order during tests
2017-10-20 00:50:22 -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
He-Man
7c43bc6e0d Trader Kill + BuildMode Keydown fixed 2017-10-19 20:45:41 +02:00
vbawol
d2bdbcb5d6 updates for toilet and kitchen sink
kitchenSink positions can be added to kitchenSinkPos at any time and
should spawn without BE kicks.
2017-10-19 13:16:34 -05:00
DirtySanchez
184b2da59e remove unused code
added a compile for code sent from config entry, this need not apply anymore
2017-10-19 12:58:46 -05:00
He-Man
b28ed47141 Fix for Marker 2017-10-19 19:22:44 +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
DirtySanchez
4aa72d5a5d add config mapOnZoomSetMarkerSize 2017-10-19 11:30:42 -05:00
DirtySanchez
83363f693b added same change below for the counter to raise 2017-10-19 10:43:35 -05:00
Grahame
8f4420f88d Update Event1.sqf
Only do the marker resizing of core Epoch mod markers since it causes issues with mission markers.

Also shrank the sizes a bit after discussion with @xDrokz
2017-10-19 11:27:30 -04:00
Grahame
d92e0f65be Update EPOCH_fnc_createLocalMarkerSet.sqf
Added EPOCH_ to the name of all local Epoch markers
2017-10-19 11:23:14 -04: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
He-Man
6590d3d655 Check Slot for Veh Upgrade 2017-10-17 18:31:14 +02:00
vbawol
2d4a7a0258 crafting changes
reverted changes to check Nearby
added crafted item count, default is 1. Allows for crafting multiples of
the same item (for example 1 plant in and 2 Seeds out)
added item return after crafting, this allows the smelting tools to be a
recipe requirement that gets refunded to player.
2017-10-17 07:51:53 -05:00
DirtySanchez
3eb4d63eba vector building enhancements
rework tempTarget for vectored objects and snapping
2017-10-17 04:50:31 -05:00
He-Man
0935cb3f08 Animations for Consumeitems 2017-10-17 00:24:38 +02:00
He-Man
ae1f874dc8 Morphine Usage 2017-10-16 20:56:04 +02: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
35c9902232 Remove Ammo Tweaks 2017-10-15 18:19:41 +02:00
vbawol
aaf7b215c9 make use of underwater command 2017-10-13 16:15:03 -05:00
He-Man
ffa4ad32fd Make Sharks Lootable under Water 2017-10-12 22:48:32 +02:00