Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,414 Commits 8 Branches 78 Tags 202 MiB
e5c8606cd9
Commit Graph

646 Commits

Author SHA1 Message Date
He-Man
2abcf105b5 Removed Trader Limits - handled with new vars 
Have to be tested!!!!
 2018-03-30 05:09:27 +02:00
vbawol
887fd41b7c bump version to 1.1.1 for experimental 2018-03-25 10:00:50 -05:00
He-Man
4df4a3f684
Ejector Seat 2018-03-21 13:32:25 +01:00
He-Man
d2b92db808 Allowdamage after porting 2018-03-19 16:57:46 +01:00
He-Man
ec192de482 Create new Player alwas at respawn first 
Create new Playerobject first on respawn marker and move Player +
Playerobject at least together to final position.
Seems to help against login issues as loadout is more accurate
broadcasted to client.
 2018-03-19 16:53:26 +01:00
He-Man
159555718f InFront TP toggle fix 2018-03-05 20:20:29 +01:00
He-Man
950c01d0c9 Missing Configs + Smal Admin Menu fixes 2018-03-05 20:11:44 +01:00
He-Man
47cce77649 Random Money lump with Mapmarker (like Plants) 
Take the Money with Space Menu
 2018-02-13 22:33:14 +01:00
DESKTOP-UH65DCE\MusTanG
1f96a6e625 Shipwreck loot upgrade 
Configs:
-Custom wrecks : ClassName string expected
-Custom locations : Posistion Array{x,y,z} expected

Description:
-This upgrade was to provide maps without the built-in terrain objects
"SHIPWRECK" to have this feature available with a few custom locations
added to the servers config.

Function Changes:
-Custom Locations and Wrecks Classnames are pulled from the config
variable.
-Wrecks are created and added to the already gathered array of Terrain
Objects "SHIPWRECK".
-On Maps without these terrain objects, the original array will be
empty[], and then the custom locations will populate it from there.
-On Maps with these terrain objects, the custom locations are added to
the already populated array of "SHIPWRECK"'s and will then become part
of the random selection of all known shipwrecks and custom locations.

Remember custom shipwrecks have a distance check and will stop a loot
spawn if there is already another shipwreck within the configured
amount.
 2018-02-11 11:05:53 -06:00
He-Man
d3e9b880a0 Not Serverside... 2018-01-15 18:55:44 +01:00
He-Man
f34ff90390 Use addMagazineOverflow + BE-Filter 2018-01-15 18:48:36 +01:00
He-Man
9ebeb82805 SimulationHandlerOld + Comment 
Server fsm no longer handles simulation for Vehicles, so this config is
useless and can be removed
 2018-01-14 20:35:13 +01:00
He-Man
291c222d9d setVectorDirAndUp first to prevent collide 2018-01-14 14:01:28 +01:00
He-Man
2ccb006697 Handle not full mags in Trader 2018-01-13 15:12:54 +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
ad36d16335 Missing SERVER_VARS on revive 
https://github.com/EpochModTeam/Epoch/issues/963
 2018-01-09 17:28:12 +01:00
He-Man
097102c1aa Vehicle Locktime now use string 2018-01-08 19:26:11 +01:00
He-Man
773d863c58 Trader Config + Reserved Vehicle Slots 2018-01-07 02:41:38 +01:00
He-Man
c615d93ba6 Tweaked SwapBuilding 
- Removed disable Simulation here, because desimulated objects need a
long time to broadcast the correct position. So we only desimulate them
on next restart
- Removed reveal, because it has no effect in my tests.
- Moved the position set code more to the top of this script, as it has
a positive effect on position set performance
 2018-01-02 14:39:31 +01:00
vbawol
10a18b6054 testing forcing open inventory instead of message 2017-12-10 08:25:31 -06:00
SirDice
33a9a8f682
Missing brace 
There's a opening brace missing, causing this error:
```
21:15:44 Error in expression <"true");
_ep setDamage (_dmg min 0.75);
} forEach(getArray(_configWorld >> "prop>
21:15:44   Error position: <} forEach(getArray(_configWorld >> "prop>
21:15:44   Error Missing {
21:15:44 File epoch_server\compile\epoch_server\EPOCH_server_createTeleport.sqf, line 110
21:15:44 Error in expression <"true");
_ep setDamage (_dmg min 0.75);
} forEach(getArray(_configWorld >> "prop>
21:15:44   Error position: <} forEach(getArray(_configWorld >> "prop>
21:15:44   Error Missing {
21:15:44 File epoch_server\compile\epoch_server\EPOCH_server_createTeleport.sqf, line 110
```
 2017-12-06 21:19:36 +01:00
He-Man
cbb0184a0e Changed propDynSimDistance 500->50 2017-11-30 23:02:50 +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
DESKTOP-UH65DCE\MusTanG
f582311331 add optional entries in props array 
add dyn sim, allow dmg and set dmg
 2017-11-27 18:05:31 -06:00
He-Man
8a452e6394 Prevent Basebuilding Storages from Auto-Cleanup 2017-11-24 19:30:44 +01:00
SirDice
1085060421
Missed variable rename 
_showBoatMarkers was replaced with _showMarkers with commit bd3e331 but one was forgotten.
 2017-11-20 21:31:53 +01:00
DESKTOP-UH65DCE\MusTanG
5b0931cfcc add missing and sort private arrays 2017-11-13 14:54:50 -06:00
DESKTOP-UH65DCE\MusTanG
8fb45fc35c events overhaul 
Streamline all events to Events Monitor within Server Monitor fsm.
Cycles and removes events as they decay or are looted.
 2017-11-12 17:39:03 -06:00
He-Man
362ec1217b Reworked Lock Storage + Lock / Unlock hints 2017-11-08 19:24:36 +01:00
vbawol
6f42a5f47f bump experimental version to 1.1 2017-11-05 12:50:33 -06:00
He-Man
056f3a0cb0 Make temp Vehicles Lockable + Lock hints 2017-11-05 02:47:15 +01:00
He-Man
0e2af36da9 rpt error for communitystats 
Thx to a Friend ;)
 2017-11-02 22:25:18 +01:00
DESKTOP-UH65DCE\MusTanG
3984cb89b3 complete todo with aiTables config entry 2017-10-31 21:52:47 -05:00
DESKTOP-UH65DCE\MusTanG
946c39efa9 use safe pos for loot container 
move _tooClose inside for statement, remove min, add BIS_fnc_findSafePos
call for loot spots
 2017-10-28 11:44:44 -05:00
DESKTOP-UH65DCE\MusTanG
e8ff66dc26 shipwrecks distance to others check and config 2017-10-28 09:01:38 -05:00
vbawol
8b4d6d457e seperate timer for forced restart 2017-10-27 10:06:13 -05:00
vbawol
0456e416f4 add note about possible crash point 
This will be the last line from Epoch before the server crashes due to
Redis not running or connection issues.
 2017-10-27 09:17:34 -05:00
vbawol
f579588c00 trigger trap to destroy base object 
should fix issue reported in #945
 2017-10-25 20:53:11 -05:00
vbawol
5c3d589443 exit loop if _shipwrecks array is empty 
ref https://github.com/EpochModTeam/Epoch/issues/947
 2017-10-25 19:43:13 -05:00
DESKTOP-UH65DCE\MusTanG
0f31efd467 hmmm 2017-10-24 14:57:50 -05:00
DESKTOP-UH65DCE\MusTanG
fb5345f8c5 shipwreck update and max config 2017-10-24 14:47:56 -05:00
vbawol
6821e1895d isNil check needed for nearestTerrainObjects? 2017-10-24 14:15:50 -05:00
vbawol
68e33cf4f0 use only SHIPWRECK type 2017-10-24 13:36:12 -05:00
vbawol
c198fd69e0 remove second rng 2017-10-24 12:02:07 -05:00
vbawol
e6852a4f5e limit Shipwreck spawns to 12 2017-10-24 12:00:20 -05:00
vbawol
06464c3266 separate restart and events 
make events timer 1 second
 2017-10-24 11:49:00 -05:00
vbawol
b21e394b7d EPOCH_dynamicEvents 2017-10-24 11:25:38 -05:00
vbawol
67b8d6711f add call and spawn support 
also added append usage to inject events into the scheduler
 2017-10-24 11:18:54 -05:00
vbawol
b668130984 removed containerPos array from CfgEpoch 
added shipwreckLootEnabled = 1 by default, set to 0 to disable for maps
with no water.
 2017-10-24 10:14:10 -05:00
vbawol
f076f5bff5 use nearestTerrainObjects for Shipwreck loot 2017-10-24 09:58:39 -05:00
vbawol
b71b86c4a7 move mod checks server side 2017-10-23 15:12:00 -05:00
vbawol
d3d1e98310 missed something 2017-10-23 14:38:02 -05:00
vbawol
0adc494b75 revert animation state test 2017-10-23 14:32:06 -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
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
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
f7c71e1d5a custom radioactive locations with radiated objects 2017-10-23 01:45:14 -05:00
DESKTOP-UH65DCE\MusTanG
02d042b186 remove "location" type fixing serialization error 2017-10-22 20:52:08 -05:00
DESKTOP-UH65DCE\MusTanG
a210dfa60a blacklist rework 2017-10-22 19:59:09 -05:00
DESKTOP-UH65DCE\MusTanG
431e10ee58 rad zone blacklist obj and distance 2017-10-22 18:55:12 -05:00
DESKTOP-UH65DCE\MusTanG
b113bd5209 config number -1 for true number of locations 2017-10-22 17:07:44 -05:00
DESKTOP-UH65DCE\MusTanG
ba339d518b fix trader brain array error 2017-10-22 17:06:10 -05:00
Raymix
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
DESKTOP-UH65DCE\MusTanG
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
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