Commit Graph

72 Commits

Author SHA1 Message Date
PabstMirror
b86ef91d7a
Disable cookoff on RCWS turrets (#5605)
* Disable cookoff on RCWS turrets

* getNumber

* Change config name, add doc
2017-11-30 17:07:46 -06:00
Tim Beswick
e85c752ca6 Cook-off probability and cook-off tweaks (#5585)
* Added cookoff probability for vehicles. Tweaks to cookoff to stop total blocking of destruction in some cases.

* Changed var name to probability. Better method for getting config value.

* Fixed naming error

* Changed setting to be a global coefficient. Added some info to cookoff doc

* Reverted hitfuel check

* Reverted damage threshold for cook-off

* Tweaked probability calculation

* Update fnc_handleDamage.sqf
2017-11-30 16:54:47 -06:00
classic
504d54461e Update Japanese translations (#5831)
* Update Japanese translation for captives

* Update Jpn translation for common

* Update Jpn translation for cookoff

* Update Jpn translation for finger

* Update Jpn translation for googles

* Update Jpn translation for hitreactions

* Update Jpn translation for interaction

* Update Jpn translation for magazinerepack

* Update Jpn translation for mk6mortar

* Update Jpn translation for noradio

* Update Jpn translation for overheating

* Update Jpn translation for pylons

* Update Jpn translation for rearm

* Update Jpn translation for respawn

* Update Jpn translation for scopes

* Update Jpn translation for spectator

* Update Jpn translation for switchunits

* Update Jpn translation for vehiclelock

* Update Jpn translation for weaponselect

* Update Jpn translation for weather

* Update Jpn translation for zeus

* Update Jpn translation for reloadlaunchers

* fix the tag
2017-11-30 16:52:27 -06:00
God of Monkeys
257bde4eef Update Chinese stringtable (#5786) 2017-11-17 10:18:54 -06:00
Andrea Verano
4d24840181 Italian Translation Update (#5779)
Added new strings in:
-captives
-common
-cookoff
-finger
-goggles
-hitreactions
-interaction
-magazinerepack
-mk6mortar
-noradio
-overheating
-rearm
-respawn
-scopes
-spectator
-switchunits
-vehiclelock
-weather
-zeus

Fixed some strings in:
-goggles
-magazinerepack
-nightvision
-sandbag
-switchunits
-trenches
-vehiclelock
-weather
2017-11-16 23:35:49 -06:00
ulteq
9d383d5add
Settings - Added more categories (#5771) 2017-11-15 20:10:20 +01:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
PabstMirror
750382ff67 Cookoff - Filter bad ammo, use new rearm config (#5618) 2017-10-14 15:12:32 +02:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
shukari
22c8ef1e8a German stringtable updates (#5539)
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
2017-10-07 13:37:59 +02:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
jonpas
40d927d3fd Use selectRandomWeighted 1.76 command (#5482) 2017-09-08 16:18:07 +02:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375)
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
Joko
2aa0072104 Fix the issue that SFX variants are not global (#5335)
* Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds

to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back

* add todo for 1.74

* inherit in CfgSFX from 1 class
2017-07-08 09:52:25 -05:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Phyma
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
SilentSpike
ae69118fba Implement new cook off SFX (#5179)
* Implement new cook off SFX with variants
* Add hybrid V to authors
2017-06-02 22:20:36 +01:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193)
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05:00
11RDP-LoupVert
bcd73edaba French localization complete (#5079)
* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.
2017-04-12 10:39:41 +02:00
PabstMirror
8d43b899e6 Frag - Cleanup and Performance (#5010)
* Frag - Cleanup and Performance

* Add dots
2017-04-11 10:33:56 -05:00
Glowbal
bb228fa2b3 Merge branch 'release' 2017-03-21 20:49:11 +01:00
classic
67a4e4e5ab Jpn translate to v391 (#5011)
* jpn translate slideshow

Add the Japanese translation for slideshow for v3.9.1

* jpn translate for cookoff

Add the Japanese translation for cookoff of the v3.9.1
2017-03-20 12:20:45 -05:00
simpo
c162739d4f Translation: Missing 3 strings in Polish (#5008) 2017-03-19 23:37:36 -05:00
commy2
c51b755770 also fix cooking off ammo boxes 2017-03-15 09:09:42 +01:00
commy2
371caaa623 Fix cookoff desynch, fix #4900
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
2017-03-15 09:09:02 +01:00
commy2
81f3387dbb Merge pull request #4991 from acemod/fix-cookoff-2
also fix cooking off ammo boxes
2017-03-14 10:09:13 +01:00
commy2
2c4f286593 also fix cooking off ammo boxes 2017-03-14 10:08:06 +01:00
commy2
2334d501d0 Fix cookoff desynch, fix #4900
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
2017-03-14 10:04:56 +01:00
NorXAengell
e20666ba9a French translation to "Advanced throwing" and "Advanced fatigue" (#4415)
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
2017-03-13 20:25:09 +01:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415)
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
2017-02-11 15:16:56 -06:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842)
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
2017-01-23 12:13:02 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821)
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
2017-01-17 15:33:22 -06:00
PabstMirror
bce0913019 Cookoff - add function to get ammo (#4779)
* Cookoff - add function to get ammo

Fix #4565 - Function adds virtual ammo for rearm vehicles
Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition
Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just
the current mag
Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false

* Fix header

* Cleanup getting ammo from turrets
2017-01-04 15:35:54 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799)
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
2017-01-02 17:55:44 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794)
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
2017-01-02 17:52:01 -06:00
markooff
0c069a6bd2 polish translations (#4734)
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
2017-01-02 13:21:47 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
SilentSpike
c66f9e5144 Merge pull request #4638 from acemod/cookoff_fixes
Fix ammo cook off with certain explosives
2016-11-11 17:41:42 +00:00
SilentSpike
e399597678 Clean some cook off code
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
2016-11-06 12:29:37 +00:00
System98
b0bf50c506 Unify and improve some german translations
- unify and improve some german translations
- fix a few typos
2016-11-06 10:10:36 +01:00
SilentSpike
5032619b9a Add cook off 3den setting to ammo boxes 2016-11-05 14:48:48 +00:00
SilentSpike
7de56ad9b5 Fix #4630
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
2016-11-05 14:20:48 +00:00
System98
7efe752f3c Update german translation
- Add missing german translations
2016-11-05 13:42:55 +01:00
Rebel
e84cdef817 Blocks AI getting back into the vehicle on cookoff (#4587)
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
2016-10-30 13:33:28 +01:00
commy2
eb38290aaf cookoff ammo selections default values (#4604)
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
2016-10-28 22:10:40 +02:00
classicarma
19fe4016e5 Japanese translations (#4553) 2016-10-18 20:19:29 +02:00
PabstMirror
a3bbc848a7 Fix ammo box cookoff strings (#4528) 2016-10-09 11:57:29 +02:00
Glowbal
059980b1a5 Add ammo cookoff (#4376)
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
2016-10-06 22:37:38 +02:00