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