Commit Graph

594 Commits

Author SHA1 Message Date
Grahame
45ed3c9995 Update WorldInteractions.hpp
Added models for BI placed ATMs and phones
2017-10-04 09:50:51 -04:00
vbawol
e347f9d258 Merge pull request #887 from morgoth0/patch-2
Updated WorldInteractions.hpp
2017-10-04 07:58:38 -05:00
vbawol
3b60f68acf fix blood rise issue with bitePlayer 2017-10-04 07:57:28 -05:00
vbawol
5375693469 remove duplicate 2017-10-04 07:45:40 -05:00
Grahame
60abfb76c3 Updated WorldInteractions.hpp
Added new EPOCH water source buildables
Added Malden ATMs, phones, rocks, trees, trash and bushes
Added CUP vehicle wrecks
Added Chernarus Redux vehicle wrecks
2017-10-04 08:29:18 -04:00
DESKTOP-UH65DCE\MusTanG
a1e43911dc add medical items
Morphine was the goal.
adrenaline, atropine, caffeine pills and orlistat added as well to
pricing, itemsort and iteminteractions
2017-10-03 19:38:32 -05:00
vbawol
50923897ef changelog and bunker loot spawning fixes
respawn bunkers on first spawn, to see if this fixes animation issues
2017-10-03 15:05:37 -05:00
vbawol
bbd958ed52 energy fixes 2017-10-03 09:04:30 -05:00
vbawol
18dd7a5d80 Merge remote-tracking branch 'refs/remotes/origin/release' into experimental
# Conflicts:
#	Sources/epoch_config/Configs/CfgItemSort.hpp
2017-10-03 08:08:13 -05:00
He-Man
f53933a2ee Added more ItemSorts 2017-10-02 21:14:54 +02:00
He-Man
ba4801b008 Removed ; 2017-10-02 21:08:01 +02:00
He-Man
84f1174983 Added more missing ItemSorts 2017-10-02 21:06:25 +02:00
He-Man
288edfb77e Added new Uniforms and Masks to ItemSort 2017-10-02 19:17:00 +02:00
He-Man
99682cca1b Added new Uniforms and Masks to ItemSort 2017-10-02 19:13:11 +02:00
DESKTOP-UH65DCE\MusTanG
9029bc7524 dyna-menu functionality on map 2017-10-02 11:49:27 -05:00
He-Man
a73b6e5008 Added Kit_Garden to Itemsort 2017-10-02 18:43:41 +02:00
vbawol
8e698e95db Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-02 09:54:05 -05:00
vbawol
da0d2c2ad8 add item requirements to crafting
making metal bars from gold now require Smelting Tools in players
inventory.
2017-10-02 09:54:02 -05:00
vbawol
16191f0400 Merge pull request #884 from ravmustang/patch-5
more assets pricing
2017-10-02 07:51:42 -05:00
vbawol
a063a5af58 Merge pull request #883 from ravmustang/patch-4
add remaining plants and clean up tabs
2017-10-02 07:51:35 -05:00
DirtySanchez
ada87955a5 more assets pricing 2017-10-02 07:41:23 -05:00
DirtySanchez
124d8922f1 add remaining plants and clean up tabs 2017-10-02 07:31:17 -05:00
DirtySanchez
09e4b6c4e3 add remaining vehicle ammos 2017-10-02 07:17:15 -05:00
DirtySanchez
78e150ce8c female outfits and new Halloween masks 2017-10-02 06:57:59 -05:00
vbawol
d2daca6f46 add garden kit 2017-10-01 21:25:57 -05:00
vbawol
662ef386b1 set bipod price to 0 2017-10-01 19:09:38 -05:00
DirtySanchez
11b64381c8 add missing , 2017-10-01 18:26:47 -05:00
vbawol
4f98071e8d dynamic radio active locations 2017-10-01 18:14:18 -05:00
vbawol
f11f8a5a6c remove karma Item Interactions 2017-10-01 16:20:34 -05:00
vbawol
121ea31ef2 Radiation Updates
Alcohol - absorb radiation by small amount
Tin canned foods - increases radiation by small amount
2017-10-01 16:11:30 -05:00
vbawol
8e017957aa Merge pull request #879 from morgoth0/patch-1
Patch 1
2017-09-30 10:09:03 -05:00
Grahame
8b2dca3148 Added a working defibrillator
Adds the player_revive class which checks whether the target is a dead player and if a defibrillator is in inventory. if so will remoteexec Epoch_server_revivePlayer. Uses the Group Menu icon but would be better if there were a generic medical icon.
2017-09-30 10:46:47 -04:00
vbawol
57d85a8373 increase 2017-09-30 09:32:00 -05:00
Grahame
742d2b9ef8 Added dyna_magazinesPlayer
Added dyna_magazinesPlayer to return the magazines in a player's inventory
2017-09-30 10:27:43 -04:00
vbawol
8b2253bc69 increase max building height 2017-09-28 14:27:10 -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
853d69d201 use setvar for digest 2017-09-26 09:08:22 -05:00
vbawol
f7691030b3 remove json file 2017-09-25 17:53:46 -05:00
vbawol
a1d4d411fc Merge remote-tracking branch 'refs/remotes/origin/experimental' into exp-digest-test
# Conflicts:
#	Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf
#	Sources/epoch_code/init/client_init.sqf
#	Sources/epoch_config/Configs/CfgEpochClient.hpp
2017-09-25 01:02:55 -05:00
vbawol
9b0b4bd4e7 changelog and headers 2017-09-25 00:52:20 -05:00
DESKTOP-UH65DCE\MusTanG
ed095efb48 update to notused var name 2017-09-24 17:47:08 -05:00
DESKTOP-UH65DCE\MusTanG
bc9f8f1ef7 corrections 2017-09-24 15:21:20 -05:00
DESKTOP-UH65DCE\MusTanG
d75fbeb046 add karma levels in array 2017-09-24 15:16:51 -05:00
DESKTOP-UH65DCE\MusTanG
1c5dc30f3b add karma levels in default array 2017-09-24 15:16:35 -05:00
DESKTOP-UH65DCE\MusTanG
2f292d889a move karma and upgrade community stats coding 2017-09-24 12:26:11 -05:00
DESKTOP-UH65DCE\MusTanG
3b11fc7f75 Inventory space checks 2017-09-24 04:46:20 -05:00
DESKTOP-UH65DCE\MusTanG
bf004a92d8 corrections 2017-09-23 23:07:09 -05:00
DESKTOP-UH65DCE\MusTanG
f6c706379d increase driver and commander selections
add driver select 1 and 2
add commander select 1
2017-09-23 22:58:57 -05:00
DESKTOP-UH65DCE\MusTanG
19b5a06215 Commander Reload and Remove Turret Mags 2017-09-23 22:29:45 -05:00
DESKTOP-UH65DCE\MusTanG
122cb8b96c Gunner and Driver Turrets
Reload and remove mags from gunner and driver turrets.
Will expand for more slots
2017-09-23 20:58:48 -05:00
DESKTOP-UH65DCE\MusTanG
359efd8d68 towers and grahame config udpates 2017-09-23 17:31:43 -05:00
vbawol
8e7de09a2e remove as it was added to normal functions 2017-09-22 16:26:22 -05:00
He-Man
1e4db5573e Added missing server fnc arrayToLogic 2017-09-22 21:20:47 +02:00
xDrokZ
a8fb5c9bcd Added Map support for Chernarus Redux
Added Map support for Chernarus Redux
2017-09-21 21:43:42 +02:00
vbawol
a0e9ec0153 digest concept
-use the second set of GVARs to track adding and removing attributes.
-Epoch_player* vars moved to local vars only accessible inside the
master loop.
-TODO: finish digest system with a config entry to control digest
limits. Some extra logic is needed.

Basically, when you consume some food, it will not increase your hunger
level immediately but raise over time.

Each of these should have limits on how much you can store in the digest
and how much each tick the digest var can affect the local player var in
the master loop.
2017-09-20 09:23:46 -05:00
vbawol
104721eced bunker loot pos 2017-09-18 11:55:58 -05:00
vbawol
d0a69fa7d1 set HandleRating to 0 as we already set players to -2000 and 0 will result in no changes 2017-09-17 21:17:43 -05:00
vbawol
80c3ba0917 testing for civ males 2017-09-12 13:50:25 -05:00
vbawol
ba45f5449c remove Karma changes via HandleRating
also add HandleScore EH hook
2017-09-11 11:40:40 -05:00
DESKTOP-UH65DCE\MusTanG
4f9fa717cb Add new assets configs entries 2017-09-10 18:58:53 -05:00
vbawol
eee733d90a remove unused function 2017-09-08 12:21:49 -05:00
vbawol
58c0481b6c add GeigerCounter price and to loot table 2017-09-08 12:21:42 -05:00
vbawol
a3a2de0841 Merge pull request #859 from Ignatz-HeMan/experimental
Fixes and Cleanups for VehRepair + ServicePoint
2017-09-08 11:43:30 -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
vbawol
26da7904f7 bump arma min version 2017-09-07 11:51:01 -05:00
He-Man
671b2d4030 Block BarrelBombs from FavBar + Sort/Pricing adds 2017-09-06 23:41:55 +02:00
He-Man
35f8e38923 Fixed some Crafting Previews 2017-09-05 20:39:18 +02:00
vbawol
a5fb7a0a53 add tents #829 2017-09-04 08:11:37 -05:00
vbawol
8c28ebc1a9 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-09-02 16:51:58 -05:00
vbawol
ab5ea172a4 move weather temp and toxic feaver stats to master loop 2017-09-02 16:51:54 -05:00
He-Man
15bd919dd1 Fixed some craftings 2017-09-02 18:27:59 +02:00
He-Man
c3f7dede38 Changed Icon Path to epochcore 2017-09-01 19:54:16 +02:00
vbawol
6f95e6b0d3 remove backup 2017-08-31 08:34:13 -05:00
DESKTOP-UH65DCE\MusTanG
6d9ba4b0ec Add to DynaMenu actions target
Could not see the groups menu at all if looking directly at another
player.
This adds all groups menus and invitation menus to dynamenu player
targets.
2017-08-30 20:47:36 -05:00
DESKTOP-UH65DCE\MusTanG
a53149a5d1 Link new paa's to EpochCore 2017-08-30 20:44:39 -05:00
vbawol
9028cec8df add missing plant classes thanks to @morgoth0 2017-08-30 17:27:02 -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
DESKTOP-UH65DCE\MusTanG
f30582cc9f Function name change and fix be filter 2017-08-30 14:30:27 -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
901047eaef revert define test 2017-08-25 16:15:02 -05:00
vbawol
383d67c28c Check to see if define true/false will fix bool conversion errors 2017-08-21 11:25:56 -05: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
35cd51d748 disable nite light by default 2017-08-18 11:09:14 -05:00
vbawol
763bc80e49 fixes 2017-08-18 09:45:27 -05:00
vbawol
aea096ce68 add showHUD settings #822
Thanks to @Ghostrider-DbD-
2017-08-18 08:37:39 -05:00
vbawol
ab195d145b re-add hitpoints stats client side
removing it caused array index issues with other stats. Note: should be
able to repurpose the stat for something else instead of removing and
needing a workaround.
2017-08-18 08:25:07 -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
He-Man
e9499d6b17 Missing config for upgrading Cinder Floor 2017-08-09 19:10:00 +02:00
vbawol
f28cc43cd5 b826 2017-08-07 18:53:00 -05:00
He-Man
236da86acb Upgrade for CinderFloor 2017-08-06 19:22:49 +02:00
He-Man
497db196ad Added missing Loot / Pricing / ItemSort 2017-08-05 20:56:36 +02:00
vbawol
163d702271 b824 2017-08-04 15:16:51 -05:00
He-Man
5388ca2210 changes for Vehicle Repair + iteminteracts 2017-08-04 21:50:26 +02:00
vbawol
6e3dcd090a b823 2017-08-04 14:39:46 -05:00
DESKTOP-UH65DCE\MusTanG
c783e6854b update killed EH
if killer is unit exit handler
2017-08-04 13:44:03 -05:00
vbawol
02c6e96f0c b822 2017-08-03 19:19:27 -05:00
vbawol
6a78895879 Merge branch 'experimental' into Community-Stats-#1 2017-08-03 18:20:00 -05:00
vbawol
0074d505a8 Merge pull request #810 from Ignatz-HeMan/experimental
Option to prevent selling damaged veh
2017-08-03 14:55:42 -05:00
He-Man
c7f467be77 Option to prevent selling damaged veh 2017-08-03 20:43:58 +02:00
Raymix
3abac17557 trade: calc damage %, return new cost 2017-08-03 19:32:55 +01:00
He-Man
ff4b401b5f Some Fav-Bar Tweaks
- Moved configs to cfgepochclient
- Changed Keydown-Check from EPOCH_Buildmode to EPOCH_Target
- Replaced "resetonLogin" to only remove "forbidden items"
2017-08-03 18:18:18 +02:00
DESKTOP-UH65DCE\MusTanG
4f88928bd0 Missions simplified
Category changed to TraderMissions.
Removed CompletedMissions.
2017-08-03 09:37:08 -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
Raymix
49e67d24d4 FavBar: perf optimization - new 5 sec event 2017-08-02 22:07:55 +01:00
Raymix
a0e9ddbbef FavBar: performance optimization 2017-08-02 21:48:09 +01:00
vbawol
4cdc67cf9d Merge pull request #804 from Ignatz-HeMan/experimental
Advanced Vehicle Repair
2017-08-01 16:47:39 -05:00
Raymix
366068fd82 Customize HUD option removed from ESC menu #800 2017-08-01 22:42:06 +01:00
He-Man
826ddcc234 New item Classnames 2017-08-01 14:44:50 +02:00
vbawol
e022e6bfb3 b821 2017-07-31 23:19:08 -05:00
Raymix
45b6bf1fb2 Favorites bar - full release 2017-08-01 03:00:28 +01: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
c38766286d b815 2017-07-27 09:51:19 -05:00
vbawol
ce5312930c b813 2017-07-25 11:41:54 -05:00
vbawol
3808c2c95a b812 2017-07-25 07:58:55 -05:00
Raymix
014f094f04 Fixes #790 2017-07-25 03:19:40 +01:00
vbawol
ec262e59f0 b810 2017-07-24 16:20:15 -05:00
Raymix
c9e382c1b4 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-07-24 21:26:10 +01:00
Raymix
9ebfe6765d cfgCrafting.hpp Maintenance + Fixes #785 2017-07-24 21:25:25 +01: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
9d9ea54612 b809 2017-07-20 22:32:50 -05:00
DESKTOP-UH65DCE\MusTanG
d90d8cf079 Barrel Bomb crafting kit
Add crafting recipe for barrel bombs
2017-07-19 22:39:16 -05:00
vbawol
e45e3d0abe b806 2017-07-17 05:58:51 -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
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
DESKTOP-UH65DCE\MusTanG
ff8c2a27cd Offroad 5th upgrade(Rare)
Remove unknown Document
Add recipe for Police Offroad
Adds police lights and siren to the offroad.
2017-07-06 19:53:00 -05:00
DESKTOP-UH65DCE\MusTanG
98f7e92e9f Rare Document Upgrades
new item was created Top Secret(Rare Document) for special vehicle
upgrades
2017-07-06 19:19:36 -05:00
DESKTOP-UH65DCE\MusTanG
3fd8a502f7 Zamak veh upg recipes 2017-07-06 14:20:29 -05:00
DESKTOP-UH65DCE\MusTanG
8445a328f4 Van veh upg
Van transport and van box vehicle upgrades 3 and 4 added to recipes.
transport can be upgraded into box with more materials
2017-07-06 14:01:41 -05:00
DESKTOP-UH65DCE\MusTanG
0817764cad Clean Up 2017-07-06 10:20:37 -05:00
DESKTOP-UH65DCE\MusTanG
43052e9ec7 More Vehicles Upgrades
Add in Hunter / Ifrit / Strider vehicle upgrades to configs
2017-07-06 10:14:12 -05:00
DESKTOP-UH65DCE\MusTanG
972328ac01 Update VehUpgKits recipes
The kits are already a crafted item of all required upgrade items, so
these should only require themselves when upgrading.
2017-07-05 17:25:20 -05:00
DESKTOP-UH65DCE\MusTanG
a151cd21c5 Fixes
Bad mistakes on my part :(
2017-07-05 16:19:19 -05:00
DESKTOP-UH65DCE\MusTanG
7db5f1c36d Fix config class array 2017-07-05 16:11:34 -05:00
DESKTOP-UH65DCE\MusTanG
aabcb3f069 Added new crafting
new kits crafting recipes and data
fix upgrade IV recipes
2017-07-04 14:30:48 -05:00
DESKTOP-UH65DCE\MusTanG
f0fdc9844d add new crafted veh upg kits
Added to Item Interactions for READ button on click
Added to Reading Documents for info on each kit
Added inherits from the respective ItemVehDoc so that it can be used for
upgrading.
2017-07-04 14:18:36 -05:00
DESKTOP-UH65DCE\MusTanG
1e77e0a22b Add reading documents
Add configs for easy editing of readable documents messages
Array for multiple messages, even a story. lol
Default messages are a hoot!
2017-07-03 19:08:04 -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
711e7aba06 Update VUS#1
Change call to configFile to new missionConfigFile CfgVehicleUpgrades.
Add check for crypto client side before sent off to server for
completion
2017-07-03 07:35:42 -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
He-Man
c53557ed1a Changed path for Drink Icon 2017-06-28 17:44:24 +02:00
vbawol
ae5458a775 b801 2017-06-26 08:08:13 -05:00
vbawol
d3472d2638 Merge pull request #771 from ravmustang/Epoch-Assets-#2
Epoch Assets #2
2017-06-26 06:47:37 -05:00