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,521 Commits 8 Branches 78 Tags 202 MiB
4cf01824aa
Commit Graph

753 Commits

Author SHA1 Message Date
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
vbawol
887fd41b7c bump version to 1.1.1 for experimental 2018-03-25 10:00:50 -05:00
He-Man
633f448b82 Missing Crafting entry 2018-03-19 20:37:47 +01:00
He-Man
cefb301181 RadSuits + Extinguisher 
- Added RadSuits and FireExtinguisher to Loot, Pricing and Itemsort
 2018-03-18 21:46:28 +01:00
He-Man
14fdd80060 base_mode_enable with target only at home 2018-03-18 01:12:06 +01:00
He-Man
48efb98237 Build Mode for ActionMenu_Target 2018-03-18 00:10:37 +01:00
He-Man
56b8918478 fixed description 2018-03-16 22:19:52 +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
353960e38a Alive Toxic-Sapper was not toxic 2018-03-16 20:43:12 +01:00
He-Man
0374211bca comment for magazinesAllTurrets 2018-03-14 23:23:14 +01:00
DESKTOP-UH65DCE\MusTanG
501a189861 heliCrash event configs 
Heli Crash MarkerSet, Loot Tables and config settings
container_heliCrash_epoch from EpochCore added to loot tables
 2018-03-11 21:11:48 -05:00
He-Man
2fe4b0ff96 Usefull Dyna Cores 2018-03-11 08:30:02 +01:00
He-Man
1e8a428d3c Power Sword Price + Sort + Loot 2018-03-10 00:17:34 +01:00
He-Man
923a41abff Config to block ATMs in Plot Range 2018-03-09 22:37:51 +01:00
He-Man
419359e84b Pricings / Itemsorts 2018-03-08 17:10:21 +01:00
He-Man
950c01d0c9 Missing Configs + Smal Admin Menu fixes 2018-03-05 20:11:44 +01:00
He-Man
7822902e0f Comma 2018-02-24 12:37:37 +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
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
1efca0123e Preview for Smelting Tools 2018-01-18 22:56:38 +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
2ccb006697 Handle not full mags in Trader 2018-01-13 15:12:54 +01:00
He-Man
795cafe1ba Reworked SnapPoints (especially half / quarter) 
Works very well on our Server for some weeks now...
 2018-01-12 21:43:52 +01:00
He-Man
292d1d8243 Examples for Vehicleupgrade 2018-01-12 21:25:28 +01:00
He-Man
b2a2e25a2c Make Lighter Refillable 2018-01-10 21:16:29 +01:00
He-Man
3eac0b0035 Skip ForceUpdate, if ForcedUpdateNow + fishingtime 2018-01-09 23:27:38 +01:00
He-Man
a12562bc64 Removed Construct Trader mission in default default 2017-12-12 18:13:16 +01: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
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
165ea3ccd5 Adv. Veh. Repair effected Veh. Upgrade 2017-11-27 21:55:56 +01:00
He-Man
8c955fe434 Usage of Epoch_message_stack 2017-11-20 00:00:17 +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
He-Man
bd3e331f5b Tarp Loot Positions 2017-11-13 15:40:10 +01:00
Raymix
de1e15374b Reduces rads over time at a cost of immunity. 2017-11-12 15:10:40 +00:00
vbawol
3eaf9927e6 bump to 3 
DB - Today at 8:00 AM
For some reason, that effects moving vehicles (mostly helis) with crew,
so if you have vehicle set to 1600, with the default multiplier of 2, if
it isn't within 3200m of another player it can sometimes freeze
 2017-11-08 09:19:54 -06:00
vbawol
82041a33b2 add missing isMovingCoefValue CfgDynamicSimulation var 2017-11-06 19:46:03 -06:00
vbawol
6f42a5f47f bump experimental version to 1.1 2017-11-05 12:50:33 -06:00
DESKTOP-UH65DCE\MusTanG
cdf9779b04 adjust order of marker sets 2017-11-04 20:38:27 -05:00
He-Man
f26fa71454 Added FuelTank to Loot / Crafting / Pricing 
Thanks @DB for reporting!
 2017-11-01 17:08:45 +01:00
He-Man
1171d66590 Added missing Prices / Itemsorts + Objectinteracts 2017-10-29 15:32:48 +01:00
Grahame
e955e073f1
Update CfgEpochClient.hpp 
Added new variable radiationEffectsThreshold, default 10%
 2017-10-28 15:02:55 -04:00
He-Man
dfbbe9c273 Added missing Price / Itemsort 2017-10-28 14:58:22 +02:00
He-Man
6d748531d4 Hint for Building to move / remove / upgrade 2017-10-27 17:29:32 +02:00
vbawol
2f59263638 fix inherits for metal and cinder floor 2017-10-27 09:17:34 -05:00
He-Man
592290f69e Added missing prices / Itemsorts 2017-10-27 15:55:43 +02:00
vbawol
2acaff9650 add pistol flash light attachment 2017-10-26 14:57:21 -05:00
vbawol
47b733d1e3 loot table additions 2017-10-26 14:00:35 -05:00
vbawol
eae477ef22 loot pos fixes and additions 2017-10-26 12:26:30 -05:00
DESKTOP-UH65DCE\MusTanG
f41c4c19cf change lost snap point names 
these are for clarity. They were lost during yesterdays hiccups with my
repo
 2017-10-26 10:55:35 -05:00
DirtySanchez
8c33d3e7ea 8 percent not 80... 2017-10-26 08:34:42 -05:00
DESKTOP-UH65DCE\MusTanG
e3373e9a97 remove extra ,0 in array EQ1 2017-10-25 17:06:01 -05:00
DESKTOP-UH65DCE\MusTanG
9a69b5d618 Update EQ1,EQ2 snapping points 2017-10-25 16:58:39 -05:00
Raymix
2b0119f574 Consume uses message_stack, trader chat colored in orange now 2017-10-25 22:27:17 +01:00
DESKTOP-UH65DCE\MusTanG
529078dbc2 fix missing data from merge 2017-10-25 16:14:58 -05:00
vbawol
ca60602095 remove comment 2017-10-25 15:42:25 -05:00
vbawol
14026115e6 Merge remote-tracking branch 'origin/experimental' into experimental 
# Conflicts:
#	Sources/epoch_config/Configs/CfgBaseBuilding.hpp
 2017-10-25 15:41:19 -05:00
vbawol
8f9227e5be config merge cleanup 2017-10-25 15:33:39 -05:00
DESKTOP-UH65DCE\MusTanG
93bdf4500a remove github lines 2017-10-25 15:28:25 -05:00
Raymix
78352726bd New message system - multi line support, fix for feedback #945. 2017-10-25 21:04:18 +01:00
DESKTOP-UH65DCE\MusTanG
520819ddea remove backup 2017-10-25 14:53:38 -05:00
DESKTOP-UH65DCE\MusTanG
d45603eecc add quarter floor snapping points 
clean up config with inherits for snapping points
 2017-10-25 14:53:08 -05:00
He-Man
765bf01eb9 Snap Fix 2017-10-25 21:38:49 +02:00
He-Man
2e14b752d7 Metal + Cinder Upgrades / Crafting 2017-10-25 21:12:55 +02:00
DESKTOP-UH65DCE\MusTanG
1c3ef76e1d metal - cinder full floors snapPointsPara update 2017-10-24 16:15:44 -05:00
DESKTOP-UH65DCE\MusTanG
d3b0a6f871 update metal and cinder snapping points 2017-10-24 15:48:30 -05:00
DESKTOP-UH65DCE\MusTanG
169a655551 metal / cinder full - half - quarter mission configs 3 2017-10-24 15:05:53 -05:00
DESKTOP-UH65DCE\MusTanG
cc1c4f8896 metal / cinder full - half - quarter mission configs 2 2017-10-24 15:05:31 -05:00
DESKTOP-UH65DCE\MusTanG
021fc1dfdc metal / cinder full - half - quarter mission configs 
Add pricing and change full cinder price
Add itemsort and add missing Wood half and quarter
 2017-10-24 15:04:21 -05:00
DESKTOP-UH65DCE\MusTanG
7eb50281cf another duplicate 2017-10-24 10:15:45 -05:00
DESKTOP-UH65DCE\MusTanG
acd7a749ea remove duplicate entries 2017-10-24 10:11:08 -05:00
DESKTOP-UH65DCE\MusTanG
24d059f0c9 malden underwater shipwrecks 2017-10-24 09:22:39 -05:00
DESKTOP-UH65DCE\MusTanG
04e922d544 correct inherit and malden wreck 2017-10-24 09:11:13 -05:00
DESKTOP-UH65DCE\MusTanG
70df6a8038 add malden blue barrel 2017-10-24 09:03:46 -05:00
vbawol
029fa396be also add models for baked in map items 2017-10-24 08:58:52 -05:00
DESKTOP-UH65DCE\MusTanG
28042eb84a add large and small pipes to salvage 2017-10-24 08:53:09 -05: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
DESKTOP-UH65DCE\MusTanG
103cf4610a add max range config 2017-10-23 01:31:39 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9 geiger counter energy consumption 2017-10-22 19:18:19 -05:00
Grahame
81855104e9 Fix path for geiger buttons 2017-10-22 10:15:30 -04: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
vbawol
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -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
vbawol
7c3ea0e936 convert memory points to config 2017-10-20 10:03:06 -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
2148634c58 add barbed wire sim and ghost 2017-10-20 08:04:58 -05:00
vbawol
f9e4e51d55 add looting of Satellite with sledge hammer 2017-10-20 07:30:12 -05:00
DirtySanchez
9fa65ed1bd Rename cfgCrafting.hpp to CfgCrafting.hpp 2017-10-19 21:51:38 -05:00
DirtySanchez
0050071f50 add vehdocrara (top secret) price 2017-10-19 21:50:07 -05:00
DirtySanchez
9a3869bf30 update for helion4 new barbed wire ghost model 2017-10-19 21:47:19 -05:00
DirtySanchez
df3a7a3731 add raw meats 
saw Axles stream and he couldnt grab a raw meat for the dog. CfgPricing needs to have the entry for the admin menu to show the item
 2017-10-19 21:21:12 -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
6fef4d8adb update text or code var details 2017-10-19 13:27:34 -05:00
DirtySanchez
f11ea12220 detailed info for marker sets 2017-10-19 13:17:18 -05: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
He-Man
b12d17d78c Better readable color for Service Point 2017-10-19 19:47:56 +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
6216fecf6a modify a few sizes 2017-10-19 11:32:18 -05:00
DirtySanchez
4aa72d5a5d add config mapOnZoomSetMarkerSize 2017-10-19 11:30:42 -05:00
Grahame
83016ee0a7 Update CfgMarkerSets.hpp 
Added EPOCH_ to the beginning of the PlayerMarker and DeathMarker markers
 2017-10-19 11:24:53 -04:00
Grahame
fe45bdf30f Update CfgPricing.hpp 
Rationalized some pricing items:
(1) Raw and cooked fish
(2) Plywood packs
(3) Building Kits
 2017-10-19 09:46:47 -04:00
DirtySanchez
0ad31c38ec remove nearby for several items 2017-10-18 20:38:30 -05:00
vbawol
b1ea567035 Merge pull request #925 from morgoth0/patch-5 
Update CfgItemInteractions.hpp
 2017-10-18 15:27:07 -05:00
DirtySanchez
5f6380cebf correct inherit 2017-10-18 13:27:25 -05:00
DirtySanchez
8a4954455c add metal floor 2017-10-18 11:51:00 -05:00
He-Man
fd4c06c41c Crafting Preview Positions 2017-10-18 18:34:36 +02: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
Grahame
8579db0b1f Update CfgItemInteractions.hpp 
Added the eating of pumpkin and sunflower seeds with a small boost to hunger and some health benefits
 2017-10-18 12:26:05 -04:00
Helion4
90f7b5c0a3 Added missing A3 Buildings loot table additions #528 2017-10-18 13:04:14 +01:00
Helion4
adbf8e9c79 added 15 bunkers to loot tables 2017-10-18 01:26:48 +01:00
Raymix
7f74469bc1 geiger counter hud (had to hold this due to prerequisite requirements in epochcore back then). 
Just need 2 ez functions to show/hide it and change display. Dunno about sounds though
 2017-10-17 20:23:07 +01:00
DirtySanchez
7390f1a71f cfgCrafting updates 
add Half wood floor to usedIn for planks.
remove duplicate ItemSeedBag and change the original one to Part type
 2017-10-17 11:51:49 -05:00
DirtySanchez
a1b8227831 return items corrections 2017-10-17 11:24:17 -05:00
vbawol
5d30eadcb2 add smelting tools part 2017-10-17 08:43:58 -05:00
vbawol
5e4d042868 crafting configs 
crafting of 2x seed from one plants.
crafting of Kilo of Hemp from 2x Hemp plant.
crafting of seed bag from 1x canvas
crafting of canvas from 1x kilo hemp
add seed bags, canvas, and burlap to loot table
 2017-10-17 08:29:49 -05: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
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
Helion4
144db2b065 Ply window upgrade options added to WoodWall1 2017-10-16 11:35:13 +01:00
Helion4
7482a4a9c4 cinder wall > window upgrade > ply to follow 2017-10-16 01:52:42 +01:00
He-Man
2ec7809852 Fix Mini Map 2017-10-15 22:42:33 +02:00
He-Man
bcb311a703 BarbedWire Price & Itemsort 2017-10-15 22:10:49 +02:00
He-Man
f3742f8223 BarbedWire Configs 2017-10-15 22:00:36 +02:00
He-Man
3957d3e028 Crafting Update 2017-10-15 18:07:22 +02:00
He-Man
6d609921b5 Missing Interaction for Garden 2017-10-15 18:04:46 +02:00
He-Man
7326d9cc3f More Config Fixes / Changes 2017-10-14 21:31:42 +02:00
He-Man
cb7ae983b7 Toilet Loot positions Altis 2017-10-14 20:28:45 +02:00
He-Man
3ebb48fe3f Some Config Fixes / Adds 2017-10-14 18:56:11 +02:00
He-Man
7c332e5c3e Recipes update 2017-10-14 12:13:51 +02:00
He-Man
ffa4ad32fd Make Sharks Lootable under Water 2017-10-12 22:48:32 +02:00
DirtySanchez
3aa0d8dbb4 Change to call function 
Switch over from deletmarkerlocal to function call
 2017-10-10 04:50:13 -05:00
He-Man
49442da4d4 Restrict SP to local resources 
Rearming not local turrets do not work, so make it similar to new
Dyna-Options to add / remove Magazines
- Driver can Refuel / Repair and Reload only Driver-Weapons
- All other Seats can only rearm they current available weapons
 2017-10-09 22:51:22 +02:00
vbawol
9aeb1024c7 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-09 08:31:17 -05:00
vbawol
6149c2ce3b enable debug of login fsm 2017-10-09 08:31:14 -05:00
DirtySanchez
9fb35877ee remove duplicate entry 2017-10-08 14:37:47 -05:00
DESKTOP-UH65DCE\MusTanG
df12dc1b61 marker sets (local) 
Player Location Marker with Assigned GPS
Death Marker location saved only when assigned GPS on death

CfgEpochClient on/off toggle for hosts
DynaMenu on map toggle for players

New Marker Sets come to life!
First set of functions for Local Marker Sets as needed for the above
feature additions
 2017-10-08 13:37:48 -05:00
vbawol
004b46ebed add 75 compatible male uniforms 2017-10-08 13:13:40 -05:00
He-Man
4cf3c6c02e BuildingLootPos + Bicycle compatible 2017-10-08 17:27:27 +02:00
DESKTOP-UH65DCE\MusTanG
756e6d6084 remove cmflare mags 2017-10-07 19:39:42 -05:00
DESKTOP-UH65DCE\MusTanG
3a0c4f1398 prep for lootable toilet 2017-10-07 14:54:07 -05:00
DESKTOP-UH65DCE\MusTanG
dc0063df99 clean up 2017-10-07 09:55:26 -05:00
DESKTOP-UH65DCE\MusTanG
698c1ee03c rad treatments 2017-10-07 09:53:48 -05:00
DESKTOP-UH65DCE\MusTanG
88a9a53b10 add radiation mask 2017-10-07 07:47:43 -05:00
DESKTOP-UH65DCE\MusTanG
25f2dd6691 add configurable values 
allows for hosts to setup their own default values instead of new player
defaults
 2017-10-07 07:14:59 -05:00
vbawol
bdb168ba50 fix godmode with player vars 2017-10-06 21:17:14 -05:00
vbawol
4e22b33129 Merge pull request #901 from morgoth0/patch-2 
Update WorldInteractions.hpp
 2017-10-06 14:23:50 -05:00
Grahame
79d26a7fde Update WorldInteractions.hpp 
Added (correctly this time around) the trees and bushes for Chernarus Redux.
 2017-10-06 12:58:10 -04:00
Grahame
6347db1fc6 Update CfgBuildingLootPos.hpp 
Added most of the Malden buildings. Need some help with the loot positioning script, problems with copying to the clipboard. Will discuss separately
 2017-10-06 12:42:01 -04:00