Commit Graph

163 Commits

Author SHA1 Message Date
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
f98b268419 Split setUnconscious func, add spontaneousWakeUpChance setting (#5114) 2017-06-05 11:42:46 -05:00
5dc8859984 Add arsenal zeus modules (#4576)
* Add zeus arsenal modules

* Add french strings to arsenal modules

* Fix typo in french string

* Make changes to fit review

* locality check, use showMessage, set categroy
2017-05-31 08:42:45 -05:00
2ca3716277 Fix Zeus teleport players module (#5175)
* Add dummy function to zeus UI modules

This removes the message about the module having no function when in SP.

* Fix zeus teleport module for non-local units

BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
2017-05-26 16:07:33 +01:00
b3f03d5ffb Zeus Suppression Module (#4977)
* add base structure

* Add getModuleDestination

* Add 2d map support, debug

* Cleanup, handle weapon max range

* Handle non-local units

* Use new showMessage func

* Run on groups when placed on leader

* Support for Indirect Fire Vehicles

* Cleanup

* Use doArtilleryFire which was fixed in 1.68
2017-05-10 11:29:04 -05:00
53943c7503 Filter headless clients from zeus teleportation (#5070) 2017-04-11 16:59:06 +02:00
3aa55b1452 New Function to Show BIS Style Curator Messages (#4844)
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
2017-03-02 17:47:49 -06:00
ef4d289836 Add Zeus Module for FRIES (#4597)
* Initial commit

* Revert unrelated changes

* Add newline

* Fix undefined var, localize text

* Shorten strings, add missing parameters

* Fix logical error

* Fix capitalization, Update string, Only add EH on server

* Add missing uses of the private command

* Remove excess formatting

* Add module category
2016-12-14 23:55:06 -06:00
324bf68614 Add Zeus utility modules
- Add categories to zeus modules to group them based on their functionality
- Add new utility modules:
  1. Toggle simulation
  2. Update editable objects
- Clean up some of the zeus module code (standardise function headers, camel case, etc.)
2016-11-15 12:07:48 +00:00
56751eff0e Revert "Delete "Group Side" module after use"
This reverts commit 2880c6152a.
2016-09-17 01:01:37 +03:00
2880c6152a Delete "Group Side" module after use 2016-09-16 01:34:32 +03:00
d533bd1663 Delete "Teleport Players" module after use 2016-09-10 15:33:19 +03:00
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
df66b0876f Minor private variable fixes (#4300) 2016-08-27 17:35:45 +02:00
d15330d245 Fix cargo event name - spare parts not being added 2016-07-01 23:14:20 -05:00
ca01f31b52 Improve zeus auto-add XEH behaviour
The XEH InitPost event only needs to be added if the `GVAR(autoAddObjects)` setting is enabled. This change will save on overhead when the setting is disabled and also removes some complexity from the function that runs in response to the event.
2016-06-18 15:41:13 +01:00
242876fa83 Merge remote-tracking branch 'origin/master' into zeusModuleUiExample 2016-06-11 21:02:16 +01:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
c4999c13e4 QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus 2016-05-25 02:19:50 +02:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
a7c1d0e5bf Remove erroneous tabs 2016-05-21 17:45:50 +01:00
3e16142ff6 Merge branch 'master' into zeusModuleUiExample 2016-05-21 17:37:49 +01:00
b3192adbb7 Add support for a zeus module position attribute
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.

Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.

I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
2016-05-21 17:29:53 +01:00
adaa10aea5 Adjust center of zeus AI task modules
The tasks should center on the logic rather than the group leader.

The search nearby module is also deleted after it's processed.
2016-05-19 22:32:05 +01:00
3a1dba4486 Add zeus defend, patrol and search modules
Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.
2016-05-19 01:24:08 +01:00
e05f2ca637 Add search nearby building zeus module 2016-05-19 01:24:07 +01:00
600b71817f Update zeus module logic deletion behaviour
The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.
2016-05-18 16:30:14 +01:00
8a70cfbcd8 Clean new zeus module config and functions
Adds function headers, stringtables and renames some display control classes.
2016-05-18 16:16:35 +01:00
da70854568 manual merge 2016-05-18 11:48:27 +02:00
81d854c56a Add group side zeus module
The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side.

The dialog code is a little ugly to say the least.
2016-05-17 23:44:17 +01:00
4cbded1811 Fix zeus cargo display for empty vehicles
The cargo wasn't displaying for empty vehicles because they use a different display.
2016-05-17 23:44:16 +01:00
d90d5a7ac1 Rewrite global AI skill zeus module
Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.
2016-05-16 15:16:53 +01:00
5b460205a9 Add teleport player zeus module 2016-05-15 21:02:40 +01:00
4d028be876 Cleanup zeus display modules
Replaces display size and position defines with macros for readability and compactness.

Changes naming convention of functions and displays to distinguish categories and make more readable.

Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.
2016-05-15 18:08:54 +01:00
77de1ec6eb Update vanilla zeus functions
Merges the changes introduced by arma updates to vanilla functions with our overwrites.

I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.
2016-05-15 12:48:32 +01:00
74fd4b4b52 Add run at settings initialized auto add objects 2016-05-08 13:47:35 +02:00
b08af3fea6 Add read auto add objects setting from module 2016-05-08 13:42:45 +02:00
6f412c312a Delay calling addCuratorEditableObjects for a frame
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
424c6fe878 Show Cargo Example 2016-02-26 01:37:00 -06:00
7fc1c87bc4 Global Ai Set Skill Example 2016-02-26 00:57:18 -06:00
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
e422388484 fix waitUntil capitalization 2015-11-30 17:28:01 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00