vbawol
5c3d7a1a74
remove low value loot from Shipwreck loot
2017-10-25 20:25:52 -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
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
Raymix
e77fcec023
add message_stack to consume items script
2017-10-25 21:57:29 +01: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
Raymix
ba7285ee78
Remove quotes from messages
2017-10-25 17:55:27 +01: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
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
Raymix
8986729467
Fixes low energy issue #945 + new low battery sounds (below 5)
2017-10-24 19:29:56 +01: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
Raymix
17fae05e4e
some weird git bug, won't let me discard these. No changes
2017-10-24 17:23:13 +01: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
DESKTOP-UH65DCE\MusTanG
7eb50281cf
another duplicate
2017-10-24 10:15:45 -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
DESKTOP-UH65DCE\MusTanG
acd7a749ea
remove duplicate entries
2017-10-24 10:11:08 -05:00
vbawol
f076f5bff5
use nearestTerrainObjects for Shipwreck loot
2017-10-24 09:58:39 -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
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
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
f7c71e1d5a
custom radioactive locations with radiated objects
2017-10-23 01:45:14 -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
a210dfa60a
blacklist rework
2017-10-22 19:59:09 -05:00
DirtySanchez
858f0827ab
formatting correction
2017-10-22 19:56:11 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9
geiger counter energy consumption
2017-10-22 19:18:19 -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
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
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
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
He-Man
d3acc2683b
Merge pull request #940 from morgoth0/patch-9
...
Add code to handle enable/disable vehicle TIE
2017-10-21 23:13:22 +02: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
Grahame
4fb7b9df98
Add variable to control accelerated HTA loss
2017-10-21 16:38:58 -04:00
Grahame
6851716f1b
Add code to handle enable/disable vehicle TIE
2017-10-21 15:37:01 -04:00
Grahame
d896c57af9
Add code to handle enable/disable vehicle TIE
2017-10-21 15:35:28 -04:00
Grahame
e951b12fe7
Add code to handle enable/disable vehicle TIE
2017-10-21 15:34:41 -04:00
Grahame
867da0aa91
Add code to handle enable/disable vehicle TIE
2017-10-21 15:33:50 -04:00
Grahame
e4ec7b1d87
Add code to handle enable/disable vehicle TIE
2017-10-21 15:32:35 -04:00
vbawol
414013497c
increase loot bias for bunkers
2017-10-21 06:08:39 -05: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
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
vbawol
e14a730eda
make sure this only runs once
2017-10-20 16:44:30 -05:00
He-Man
2d1835d455
SnapPoints for Floors
2017-10-20 23:15:17 +02: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
eee45dc682
use atl for spawning
2017-10-20 11:29:09 -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
ec756c3134
test using normal object for first spawn
2017-10-20 10:03:32 -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
vbawol
0bb4c7f985
fix ah error
2017-10-20 06:51:09 -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
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
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
efd1745b52
loot marker correction
2017-10-19 21:36:23 -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
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
vbawol
f39a79a7d2
for #931
2017-10-19 17:15:56 -05:00
vbawol
829682429d
bunker update 2
2017-10-19 16:36:53 -05:00
DirtySanchez
cb2779777d
Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental
2017-10-19 13:48:55 -05:00
DirtySanchez
09fd703bff
remove rpt error for a3_characters_f
2017-10-19 13:48:43 -05:00
He-Man
7c43bc6e0d
Trader Kill + BuildMode Keydown fixed
2017-10-19 20:45:41 +02: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
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
b12d17d78c
Better readable color for Service Point
2017-10-19 19:47:56 +02: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
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
DirtySanchez
83363f693b
added same change below for the counter to raise
2017-10-19 10:43:35 -05: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
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
83016ee0a7
Update CfgMarkerSets.hpp
...
Added EPOCH_ to the beginning of the PlayerMarker and DeathMarker markers
2017-10-19 11:24:53 -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
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
vbawol
9addf0f6fa
rework admin menu spawn logic
2017-10-18 22:36:40 -05:00
DirtySanchez
0ad31c38ec
remove nearby for several items
2017-10-18 20:38:30 -05:00
vbawol
3263cc4698
bunker updates
2017-10-18 17:07:37 -05:00
vbawol
6eb11ee7de
fixed typo
2017-10-18 16:39:59 -05:00
vbawol
fdbe31ee69
bunker updates
...
add selectRandomWeighted
disabled one pending hotfix for xmas
disabled invisible walls bunker by default (I think most will see this
as a bug, but maybe not?).
2017-10-18 15:53:32 -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
vbawol
d16a1d026d
add new bunkers
2017-10-17 22:11:53 -05: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
He-Man
61c86c22ce
Added VehDocs to Loottables
2017-10-17 20:21:49 +02: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
He-Man
6590d3d655
Check Slot for Veh Upgrade
2017-10-17 18:31:14 +02: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
DirtySanchez
3eb4d63eba
vector building enhancements
...
rework tempTarget for vectored objects and snapping
2017-10-17 04:50:31 -05:00
vbawol
8fbe8559d9
Merge pull request #917 from morgoth0/patch-4
...
mission.sqm fixes
2017-10-17 04:38:41 -05:00
Grahame
4cc5f3a1dc
Update mission.sqm
2017-10-16 18:29:00 -04:00
Grahame
514d631f97
Update mission.sqm
2017-10-16 18:28:30 -04:00
Grahame
f8993a6c82
Update mission.sqm
2017-10-16 18:27:58 -04:00
Grahame
dc40e0a370
Update mission.sqm
2017-10-16 18:27:26 -04:00
Grahame
eba38f8489
Update mission.sqm
2017-10-16 18:26:55 -04:00
Grahame
4fb34064ab
Update mission.sqm
2017-10-16 18:26:28 -04:00
Grahame
3df0a63395
Update mission.sqm
2017-10-16 18:25:56 -04:00
Grahame
6c2b288e46
Update mission.sqm
2017-10-16 18:25:28 -04:00
Grahame
d66bf8ef2d
Update mission.sqm
2017-10-16 18:24:57 -04:00
He-Man
0935cb3f08
Animations for Consumeitems
2017-10-17 00:24:38 +02:00
Grahame
b283d2bb87
Update mission.sqm
2017-10-16 18:24:29 -04:00
Grahame
0c3b16a99a
Update mission.sqm
2017-10-16 18:24:03 -04:00
Grahame
c436c96533
Update mission.sqm
2017-10-16 18:23:32 -04:00
Grahame
e6be79395a
Update mission.sqm
2017-10-16 18:22:50 -04:00
Grahame
f9e7af0d5b
Update mission.sqm
2017-10-16 18:22:02 -04:00
Grahame
5b5a749852
Update mission.sqm
2017-10-16 18:21:30 -04:00
Grahame
a0fb2050c6
Update mission.sqm
2017-10-16 18:20:55 -04:00
Grahame
cc0d4c809a
Update mission.sqm
2017-10-16 18:20:02 -04:00
Grahame
29dffdebb9
Update mission.sqm
2017-10-16 18:19:31 -04:00
Grahame
98da25bbe2
Update mission.sqm
2017-10-16 18:18:58 -04:00
Grahame
903007c881
Update mission.sqm
2017-10-16 18:18:21 -04:00
Grahame
e84eb92344
Update mission.sqm
2017-10-16 18:17:28 -04:00
Grahame
7f044de99b
Update mission.sqm
2017-10-16 18:16:52 -04:00
Grahame
f2a2f2001c
Update mission.sqm
2017-10-16 18:16:03 -04:00
Grahame
2cef012614
Update mission.sqm
2017-10-16 18:14:26 -04:00
Grahame
c5a933226c
Update mission.sqm
...
Removed additional player slot
2017-10-16 18:11:29 -04:00
He-Man
ae1f874dc8
Morphine Usage
2017-10-16 20:56:04 +02:00
He-Man
0b08199404
item -> magazine
2017-10-16 19:09:42 +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
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
35c9902232
Remove Ammo Tweaks
2017-10-15 18:19:41 +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
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
vbawol
63fc23b8cb
fix snap checks
2017-10-12 07:04:34 -05:00
Grahame
63898bff77
Fixed spawn chamber positioning
...
@xDrokz asked me to add this commit for him since he's off to bed ;) His fix!
2017-10-11 17:01:32 -04: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
9242b01f3b
extra debug
2017-10-11 11:30:34 -05:00
vbawol
a572570e83
fix usage
2017-10-11 08:31:23 -05:00
vbawol
28340c2311
Base Building: spawn only ghost
...
used to spawn static version then swap, now it just spawns ghost version
first.
should also fix Garden_Epoch and other new item kicks.
2017-10-11 00:42:11 -05:00
vbawol
cd4f557f66
revert side changes for male
...
unlocked additional uniforms for side = 0,
Side =1 is still reserved for females
2017-10-10 21:29:04 -05:00
He-Man
a971f5f7cc
Removed multiple Uniform
2017-10-10 23:00:48 +02:00
vbawol
cd32c98def
cleanup 2
2017-10-10 14:57:11 -05:00
vbawol
3cb74266dd
minor cleanup
2017-10-10 14:55:43 -05: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
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
b911897c31
add masks to loot table
2017-10-08 13:27:36 -05:00
vbawol
4fddeafd6e
add female uniforms to loot table
2017-10-08 13:23:44 -05:00
vbawol
004b46ebed
add 75 compatible male uniforms
2017-10-08 13:13:40 -05:00
He-Man
a4ec14e468
Inventory fix
...
Fix blocked Inventory after we set rating to -2001
Thx DirtySanchez for helping to fix it!
2017-10-08 17:38:31 +02: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
He-Man
14c433581b
Set Rating to -2001
2017-10-07 21:23:54 +02:00
DESKTOP-UH65DCE\MusTanG
2fe8f08adf
add halloween and rad masks to ah
2017-10-07 12:11:01 -05:00
He-Man
b1775a68ba
Wait for local _playerObject
...
Hitpoints and EH's were set before playerobjects is local, so wait for
it!
2017-10-07 18:37:09 +02:00
He-Man
4660975b05
Fix for empty _Primary array
2017-10-07 17:45:23 +02:00
vbawol
7ef339d958
changelog and comment cleanup
2017-10-07 10:41:44 -05:00
He-Man
e4fdf4d6a0
Workaround for unitloadout 2.0
2017-10-07 17:38:58 +02: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
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
f49def0c47
Merge pull request #903 from morgoth0/patch-3
...
Thanks @morgoth0 !
Update Malden.h
2017-10-06 21:27:56 -05:00
vbawol
bdb168ba50
fix godmode with player vars
2017-10-06 21:17:14 -05:00
Grahame
42020032be
Update Malden.h
...
Added Malden trader camps, one "North" (would be west if there were a south TP manhole cover), East and "West" (would be south if there were a south TP manhole cover) ;)
2017-10-06 20:53:09 -04:00
vbawol
4e22b33129
Merge pull request #901 from morgoth0/patch-2
...
Update WorldInteractions.hpp
2017-10-06 14:23:50 -05:00
vbawol
bd6afe4417
Merge pull request #900 from morgoth0/patch-1
...
Update CfgBuildingLootPos.hpp
2017-10-06 14:23:41 -05:00
DESKTOP-UH65DCE\MusTanG
7bf39b7cad
replace with FAK in comments
2017-10-06 12:07:32 -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
He-Man
e1bc965fdd
must be _x
...
magazineCargo return strings, not objects
2017-10-06 17:39:26 +02:00
He-Man
ffdecf9dc8
Removed unused Item
2017-10-06 16:20:52 +02:00
He-Man
8564783aa2
Correct Classname
2017-10-06 15:28:56 +02:00
He-Man
f9a5c29fa8
Force Vehicle Save after adding / removing Mags
2017-10-06 14:01:29 +02:00
He-Man
8a4ab15fd1
override default action, if FavBar slot has item
2017-10-05 21:58:24 +02:00
He-Man
c6bcbe81eb
Reworked Vehicle Rearm Scrips
2017-10-05 20:59:52 +02:00
vbawol
48b2ae43b8
fixes for cinder floor and garden
2017-10-04 21:57:08 -05:00
Grahame
85ecd4d870
Update CfgBaseBuilding.hpp
2017-10-04 16:02:49 -04:00
Grahame
90bbf75579
Update CfgItemInteractions.hpp
2017-10-04 16:02:06 -04:00
Grahame
217f47cc92
Update cfgCrafting.hpp
...
Added crafting recipes for most of the new buildables
2017-10-04 15:47:39 -04: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
70b5f02011
interact actions updates
...
added action 16 that will repair most damaged player hitpoint and give
attributes
_unifiedInteract function now returns bool based on if item was removed.
added attributes to other new items
NOTE: will consider a digest system for 1.1
2017-10-04 11:17:41 -05:00
vbawol
46d6b042f5
kit garden and cinder floor
2017-10-04 09:11:08 -05:00
Grahame
45ed3c9995
Update WorldInteractions.hpp
...
Added models for BI placed ATMs and phones
2017-10-04 09:50:51 -04:00
Grahame
c73a2ab44f
Update Malden.h
...
Added ATMs and Phones in gas stations and towns. Note, if a phone looks like it attached to the side of a house then it probably is part of the house model itself and will not work as an ATM
2017-10-04 09:05:43 -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
vbawol
59db3387b8
add variants
2017-10-03 20:26:26 -05: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
5c6cc9bac7
remove debug
2017-10-03 17:01:04 -05:00
vbawol
d72af99663
loot fix test
2017-10-03 16:41:46 -05:00
vbawol
3345cc28b4
debug loot
2017-10-03 16:23:20 -05:00
vbawol
27ef4446e4
changelog and private updates
2017-10-03 15:59:49 -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
fb08ef4a76
handle null objects
2017-10-03 10:42:42 -05:00
vbawol
aa263d6e0b
fix extra space
2017-10-03 10:26:51 -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
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
vbawol
70b11bc5a1
can just use array as targets instead of foreach here
2017-10-03 08:04:54 -05:00
He-Man
6cf522fc16
Fixed Wet Variable
2017-10-03 00:22:14 +02: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
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
He-Man
888629ea2b
Reverted last change and changed hint
2017-10-02 18:57:08 +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
c479e04607
move say3d below second local check
...
Only want this to repair sound to play if the repair worked and did not
get stopped by second check
2017-10-02 11:42:00 -05:00
He-Man
fe8c16d88f
Moved 2nd local check behind sleep
2017-10-02 18:27:09 +02:00
vbawol
8e0c7afc91
force first row to spawn
2017-10-02 11:10:22 -05:00
vbawol
381fdd44ea
change loot bubble
...
use nearObjects instead of nearestObjects
use _lootClasses as filter for objects array, force array to lower to
prevent case issues.
This should allow loot spawn for simple objects.
2017-10-02 11:05:48 -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
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
6ac1e72a97
set read only vars
...
with failback to normal use.
2017-10-01 19:48:32 -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
1ab0c68a45
use local var within loop
2017-10-01 18:18:38 -05:00
vbawol
4f98071e8d
dynamic radio active locations
2017-10-01 18:14:18 -05:00
vbawol
cce0f4aa2b
toxic sapper updates
...
Increase range for toxic smoke from 6m to 12m.
toxic sapper.:
trigger smoke at unit spawn
readd smaller explosive charge
2017-10-01 17:15:42 -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
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
0b71db3917
fix ai spawning
2017-09-30 10:14:43 -05:00
vbawol
675348b160
fix blood pressure
2017-09-30 10:12:32 -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
e11e60d209
debug
2017-09-30 09:34:16 -05: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
84a2c7b721
debug 2
2017-09-29 22:44:17 -05:00
vbawol
4da51a45f3
add debug
2017-09-29 21:48:32 -05:00
vbawol
9e7cc6843d
private arrays
2017-09-29 11:29:20 -05:00
vbawol
8b2253bc69
increase max building height
2017-09-28 14:27:10 -05:00
vbawol
cb17f01b56
fix inverted logic
2017-09-28 12:00:48 -05:00
vbawol
a5894bca15
debug spawn units
2017-09-28 11:30:26 -05:00
vbawol
7b37ed7c07
fix radio active site
2017-09-27 15:59:38 -05:00
vbawol
f122c2db0a
fix nuisance
2017-09-27 15:46:15 -05:00
vbawol
bec28218f4
play local sound on repair
2017-09-27 14:33:38 -05:00
vbawol
2ebbfa70b8
mixed up with Nuisance
2017-09-27 11:22:28 -05:00
vbawol
74aecd3849
init playerspawnarray var
...
since we are using an gvar array here edits to it externally should not
require redefining local var for use in other events.
2017-09-27 11:10:20 -05:00
vbawol
7459f9d3a0
last typo 🎱
2017-09-27 11:01:33 -05:00
vbawol
8f1b71a26e
player stats fixes part 6
2017-09-27 10:38:18 -05:00
vbawol
0ad1a967d8
player stats fixes part 5
2017-09-27 10:13:42 -05:00
vbawol
5db8af19f8
push change back to gvar
...
debug
2017-09-27 08:58:36 -05:00
vbawol
a3a0e7e2d9
Changes to default var loading
2017-09-26 21:20:41 -05:00
vbawol
38d704468d
one more?>
2017-09-26 21:02:58 -05:00
vbawol
8903145ffa
fixes part 4
2017-09-26 20:52:13 -05:00
