Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into polish-merge

Browse Source 
Conflicts:
	addons/respawn/stringtable.xml
This commit is contained in:
KoffeinFlummi 2015-05-01 21:13:36 +02:00
commit c9ff497c83
34 changed files with 341 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE
View File

@ -22,6 +22,10 @@ source code of the individual modules.
When publishing a derivative of this product you may not use a name that
might create the impression that your version is an official release.
Some folders of this project may contain a seperate LICENSE file. Should
that be the case, everything in that folder and all subfolders is subject
to that license instead.
============================================================================
Full Gnu General Public License Text

2
addons/advanced_ballistics/stringtable.xml
View File

@ -4,6 +4,7 @@
<Key ID="STR_ACE_AdvancedBallistics_WindInfoKey">
<English>Show Wind Info</English>
<Polish>Pokaż inf. o wietrze</Polish>
<Czech>Zobrazit větrné info</Czech>
<Italian>Mostra indicazioni del vento</Italian>
<Russian>Показать информацию о ветре</Russian>
<French>Afficher les info sur le vent</French>
@ -14,6 +15,7 @@
<Key ID="STR_ACE_AdvancedBallistics_ProtractorKey">
<English>Show Protractor</English>
<Polish>Pokaż kątomierz</Polish>
<Czech>Zobrazit úhloměr</Czech>
<Italian>Mostra il rapportatore</Italian>
<Russian>Показать транспортир</Russian>
<French>Afficher le rapporteur</French>

1
addons/apl/$PBOPREFIX$ Normal file
View File

@ -0,0 +1 @@
z\ace\addons\apl

7
addons/apl/CfgEventHandlers.hpp Normal file
View File

@ -0,0 +1,7 @@
/*
class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
};
};
*/

110
addons/apl/LICENSE Normal file
View File

@ -0,0 +1,110 @@
ARMA PUBLIC LICENSE
https://www.bistudio.com/community/licenses/arma-public-license
Brief summary of this Licence
PLEASE, NOTE THAT THIS SUMMARY HAS NO LEGAL EFFECT AND IS ONLY OF AN INFORMATORY NATURE DESIGNED FOR YOU TO GET THE BASIC INFORMATION ABOUT THE CONTENT OF THIS LICENCE. THE ONLY LEGALLY BINDING PROVISIONS ARE THOSE IN THE ORIGINAL AND FULL TEXT OF THIS LICENCE.
With this licence you are free to adapt (i.e. modify, rework or update) and share (i.e. copy, distribute or transmit) the material under the following conditions:
Attribution - You must attribute the material in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the material).
Noncommercial - You may not use this material for any commercial purposes.
Arma Only - You may not convert or adapt this material to be used in other games than Arma.
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Arma Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
Section 1 - Definitions
Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
ArmaOnly means primarily intended for or directed towards the use in any of existing and future Arma games, including but not limited to Arma: Cold War Assault, Arma, Arma 2 and Arma 3 and its official sequels and expansion packs.
Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
Licensor means the individual(s) or entity(ies) granting rights under this Public License.
NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
Section 2 – Scope
License grant
Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
reproduce and Share the Licensed Material, in whole or in part, for NonCommercial and ArmaOnly purposes only; and
produce, reproduce, and Share Adapted Material for NonCommercial and ArmaOnly purposes only.
Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
Term. The term of this Public License is specified in Section 6(a).
Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
Downstream recipients.
Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(a)(i).
Other rights
Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
Patent and trademark rights are not licensed under this Public License.
To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial and ArmaOnly purposes.
Section 3 – License Conditions
Your exercise of the Licensed Rights is expressly made subject to the following conditions.
Attribution
If You Share the Licensed Material (including in modified form), You must:
retain the following if it is supplied by the Licensor with the Licensed Material:
identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
a copyright notice;
a notice that refers to this Public License;
a notice that refers to the disclaimer of warranties;
a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(a) to the extent reasonably practicable.
If You Share Adapted Material You produce, the Adapter’s License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
Section 4 – Sui Generis Database Rights
Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial and ArmaOnly purposes only;
if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
Section 5 – Disclaimer of Warranties and Limitation of Liability
Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
Section 6 – Term and Termination
This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
Section 7 – Other Terms and Conditions
The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
Section 8 – Interpretation
For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
Bohemia Interactive Notices
Bohemia Interactive a.s. is not a party to this License, and makes no warranty whatsoever in connection with the Licensed Material. Bohemia Interactive a.s. will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, Bohemia Interactive a.s. may elect to apply the Public License to material it publishes and in those instances it becomes the "Licensor".
Except for the limited purpose of indicating to the public that the Licensed Material is shared under this Public License, Bohemia Interactive a.s. does not authorize the use by either party of the trademarks "Arma", "Bohemia Interactive" or any related trademark or logo of Arma or Bohemia Interactive without the prior written consent of Bohemia Interactive a.s.

5
addons/apl/XEH_preInit.sqf Normal file
View File

@ -0,0 +1,5 @@
#include "script_component.hpp"
ADDON = false;
ADDON = true;

BIN
addons/apl/bodybag.p3d Normal file
View File

Binary file not shown.

15
addons/apl/config.cpp Normal file
View File

@ -0,0 +1,15 @@
#include "script_component.hpp"
class CfgPatches {
class ADDON {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"};
author[] = {"Bohemia Interactive"};
authorUrl = "http://ace3mod.com";
VERSION_CONFIG;
};
};
#include "CfgEventHandlers.hpp"

4
addons/medical/data/bodybag.rvmat → addons/apl/data/bodybag.rvmat
View File

@ -8,7 +8,7 @@ PixelShaderID="Super";
VertexShaderID="Super";
class Stage1
{
texture="z\ace\addons\medical\data\bodybag_nohq.paa";
texture="z\ace\addons\apl\data\bodybag_nohq.paa";
uvSource="tex";
class uvTransform
{
@ -80,7 +80,7 @@ class Stage6
};
class Stage7
{
texture="z\ace\addons\medical\data\env_co.paa";
texture="z\ace\addons\apl\data\env_co.paa";
uvSource="tex";
class uvTransform
{

0
addons/medical/data/bodybag_co.paa → addons/apl/data/bodybag_co.paa
View File

0
addons/medical/data/bodybag_nohq.paa → addons/apl/data/bodybag_nohq.paa
View File

0
addons/medical/data/env_co.paa → addons/apl/data/env_co.paa
View File

1
addons/apl/functions/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\apl\script_component.hpp"

12
addons/apl/script_component.hpp Normal file
View File

@ -0,0 +1,12 @@
#define COMPONENT APL
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_APL
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_APL
#define DEBUG_SETTINGS DEBUG_SETTINGS_APL
#endif
#include "\z\ace\addons\main\script_macros.hpp"

3
addons/ballistics/stringtable.xml
View File

@ -1128,7 +1128,7 @@
<French>Calibre: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Cartouches: 30</French>
<Spanish>Calibre: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Balas: 30&lt;br /&gt;Se usa en: MXM</Spanish>
<Polish>Kaliber: 6,5x47mm (HPBT Scenar)&lt;br /&gt;Pociski: 30</Polish>
<Russian>Калибр: 6,5x47 мм (экспансивные Scenar)&lt;br /&gt;Патронов: 30</Russian>
<Russian>Калибр: 6,5x47 мм (экспансивные Scenar)&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MXM</Russian>
<German>Kaliber: 6,5x47mm (HPBT Scenar)&lt;br /&gt;Patronen: 30&lt;br /&gt;Eingesetzt von: MXM</German>
<Italian>Calibro: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MXM</Italian>
</Key>
@ -1157,6 +1157,7 @@
<French>Calibre: 6.5x47mm Creedmor &lt;br /&gt;Cartouches: 30&lt;br /&gt;Utilisé avec: MXM</French>
<Italian>Calibro: 6.5mm Creedmor&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MXM</Italian>
<Spanish>Calibre: 6.5mm Creedmor&lt;br /&gt;Balas: 30&lt;br /&gt;Se usa en: MXM</Spanish>
<Russian>Калибр: 6,5x47мм Creedmor&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются c: MXM</Russian>
</Key>
<Key ID="STR_ACE_10Rnd_338_300gr_HPBT_Mag_Name">
<English>.338 10Rnd Mag (300gr Sierra MatchKing HPBT)</English>

13
addons/interact_menu/stringtable.xml
View File

@ -20,6 +20,7 @@
<Italian>Mostra sempre il cursore per le interazioni</Italian>
<Polish>Zawsze wyświetlaj kursor dla interakcji</Polish>
<Russian>Показывать курсор (взаимодействие)</Russian>
<Czech>Vždy zobrazovat kurzor pro interakci</Czech>
<German>Immer den Cursor für Fremd-Interaktionen anzeigen</German>
<Hungarian>Mindig legyen a cselekvés kurzorja látható</Hungarian>
</Key>
@ -30,6 +31,7 @@
<French>Afficher le menu d'interaction sous forme de liste</French>
<Italian>Mostra il menù di interazione come lista</Italian>
<Polish>Wyświetlaj menu interakcji jako listę</Polish>
<Czech>Zobrazit menu interakce jako seznam</Czech>
<German>Interaktionsmenü in Listen anzeigen</German>
<Hungarian>Cselekvő menük listaként való megjelenítése</Hungarian>
</Key>
@ -84,6 +86,7 @@
<Key ID="STR_ACE_Interact_Menu_ColorTextMax">
<English>Interaction - Text Max</English>
<Polish>Interakcja - Tekst max</Polish>
<Czech>Interakce - Text max</Czech>
<French>Interaction - Texte Max</French>
<German>Interaktionstextfarbe Max</German>
<Italian>Interazioni - Testo Massimo</Italian>
@ -94,6 +97,7 @@
<Key ID="STR_ACE_Interact_Menu_ColorTextMin">
<English>Interaction - Text Min</English>
<Polish>Interakcja - Tekst min</Polish>
<Czech>Interakce - Text min</Czech>
<French>Interaction - Texte Min</French>
<German>Interaktionstextfarbe Min</German>
<Italian>Interazioni - Testo Minimo</Italian>
@ -104,6 +108,7 @@
<Key ID="STR_ACE_Interact_Menu_ColorShadowMax">
<English>Interaction - Shadow Max</English>
<Polish>Interakcja - Cień max</Polish>
<Czech>Interakce - Stíny max</Czech>
<French>Interaction - Ombre Max</French>
<German>Interaktionstextschatten Max</German>
<Italian>Interazioni - Ombra Massima</Italian>
@ -114,6 +119,7 @@
<Key ID="STR_ACE_Interact_Menu_ColorShadowMin">
<English>Interaction - Shadow Min</English>
<Polish>Interakcja - Cień min</Polish>
<Czech>Interakce - Stíny min</Czech>
<French>Interaction - Ombre Min</French>
<German>Interaktionstextschatten Min</German>
<Italian>Interazioni - Ombra Minima</Italian>
@ -128,9 +134,11 @@
<German>Cursor zentriert halten</German>
<Hungarian>Kurzor középen tartása</Hungarian>
<Polish>Utrzymaj kursor wyśrodkowany</Polish>
<Czech>Kurzor vždy na středu</Czech>
</Key>
<Key ID="STR_ACE_Interact_cursorKeepCenteredDescription">
<English>Keeps cursor centered and pans the option menu around. Useful if screen size is limited.</English>
<Czech>Udržuje kurzor na středu. Užitečné, pokud je velikost obrazovky omezena.</Czech>
<French>Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée.</French>
<Russian>Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана.</Russian>
<German>Hält den Cursor zentriert und verschiebt das Menü beim Bewegen. Nützlich bei kleinen Bildschirmen.</German>
@ -141,11 +149,13 @@
<English>Do action when releasing menu key</English>
<German>Aktion nach Loslassen der Taste ausführen</German>
<Polish>Wykonuj akcje po puszczeniu klawisza menu</Polish>
<Czech>Vyvolá akci po uvolnění tlačítka menu</Czech>
<French>Action au relachement de touche</French>
<Russian>Выполнять действие при отпускании кнопки взаимодействия</Russian>
</Key>
<Key ID="STR_ACE_Interact_textSize">
<English>Interaction Text Size</English>
<Czech>Velikost textu v menu interakce</Czech>
<German>Menü-Schriftgröße</German>
<French>Taille du texte d'interaction</French>
<Russian>Размер текста (меню взаимодействия)</Russian>
@ -153,6 +163,7 @@
</Key>
<Key ID="STR_ACE_Interact_shadowSetting">
<English>Interaction Text Shadow</English>
<Czech>Stíny v menu interakce</Czech>
<German>Menü-Hintergrundschatten</German>
<French>Ombre du texte d'interaction</French>
<Russian>Тень от текста (меню взаимодействия)</Russian>
@ -160,6 +171,7 @@
</Key>
<Key ID="STR_ACE_Interact_shadowSettingDescription">
<English>Allows controlling the text's shadow. Outline ignores custom shadow colors.</English>
<Czech>Umožňuje změnit stíny textu v menu interakce. Barva stínu je u tahu písma ignorována.</Czech>
<German>Stellt den Hintergrundschatten ein. Die Einstellung 'Kontur' ignoriert die Farbe des Schattens.</German>
<French>Permet de controler l'ombre du texte. Le contour ne prend pas en compte la couleur des ombres.</French>
<Russian>Дает возможность изменять тень, отбрасываемую текстом. Контур не зависит от выбранного цвета тени.</Russian>
@ -167,6 +179,7 @@
</Key>
<Key ID="STR_ACE_Interact_shadowOutline">
<English>Outline</English>
<Czech>Tah</Czech>
<German>Kontur</German>
<French>Contour</French>
<Russian>Контур</Russian>

25
addons/laser/CfgVehicles.hpp
View File

@ -17,4 +17,29 @@ class CfgVehicles {
simulation = "LaserTarget";
model = "\A3\Weapons_f\laserTgt.p3d";
};
// Vehicle lockable configurations
class AllVehicles;
class Air: AllVehicles {
class Turrets;
};
class Helicopter: Air {
class Turrets {
class MainTurret;
};
};
class Helicopter_Base_F: Helicopter {};
class Heli_Attack_01_base_F: Helicopter_Base_F {};
class B_Heli_Attack_01_F: Heli_Attack_01_base_F {
class Turrets: Turrets {
class MainTurret: MainTurret {
GVAR(CanLockLaser) = 1; // Enable laser locking selection
};
};
};
};

2
addons/laser/XEH_post_init.sqf
View File

@ -1,5 +1,7 @@
#include "script_component.hpp"
#include "initKeybinds.sqf"
["laser_laserOn", {_this call DFUNC(handleLaserOn)}] call EFUNC(common,addEventHandler);
["laser_laserOff", {_this call DFUNC(handleLaserOff)}] call EFUNC(common,addEventHandler);

4
addons/laser/XEH_pre_init.sqf
View File

@ -24,6 +24,10 @@ PREP(laserTargetPFH);
GVAR(VanillaLasers) = [];
PREP(unitTurretCanLockLaser);
PREP(keyLaserCodeUp);
PREP(keyLaserCodeDown);
// Laser default variables
ACE_DEFAULT_LASER_CODE = 1001;
ACE_DEFAULT_LASER_WAVELENGTH = 1550;

12
addons/laser/functions/fnc_keyLaserCodeDown.sqf Normal file
View File

@ -0,0 +1,12 @@
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
private["_oldLaserCode", "_laserCode"];
_oldLaserCode = ACE_player getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
if(_oldLaserCode > ACE_DEFAULT_LASER_CODE) then {
_laserCode = _oldLaserCode - 1;
ACE_player setVariable [QGVAR(code), _laserCode, false];
};
if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize "STR_ACE_laser_laserCode", _laserCode]] call EFUNC(common,displayTextStructured);
};

10
addons/laser/functions/fnc_keyLaserCodeUp.sqf Normal file
View File

@ -0,0 +1,10 @@
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
private["_oldLaserCode", "_laserCode"];
_oldLaserCode = ACE_player getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
_laserCode = _oldLaserCode + 1;
ACE_player setVariable [QGVAR(code), _laserCode, false];
if(_laserCode != _oldLaserCode) then {
[format ["%1: %2", localize "STR_ACE_laser_laserCode", _laserCode]] call EFUNC(common,displayTextStructured);
};

21
addons/laser/functions/fnc_unitTurretCanLockLaser.sqf Normal file
View File

@ -0,0 +1,21 @@
/*
* Author: jaynus
* Checks if the turret occupied by the given unit can lock a laser designator and select laser code.
*
* Argument:
* 0: Unit <OBJECT>
*
* Return value:
* Has designator? <BOOL>
*/
#include "script_component.hpp"
EXPLODE_1_PVT(_this,_unit);
// Get the player turret path
private ["_turret","_config","_turretConfig"];
_turret = [_unit] call EFUNC(common,getTurretIndex);
_config = configFile >> "CfgVehicles" >> typeOf vehicle _unit;
_turretConfig = [_config, _turret] call EFUNC(common,getTurretConfigPath);
getNumber (_turretConfig >> QGVAR(CanLockLaser)) > 0

27
addons/laser/initKeybinds.sqf Normal file
View File

@ -0,0 +1,27 @@
["ACE3 Equipment", QGVAR(LaserCodeUp), localize "STR_ACE_laser_laserCodeUp",
{
if( EGVAR(laser_selfdesignate,active)
||
{ (currentWeapon ACE_player) == "Laserdesignator" && (call CBA_fnc_getFoV) select 1 > 5 } // If laserdesignator & FOV, we are in scope.
||
{ [ACE_player] call FUNC(unitTurretCanLockLaser) }
) then {
[] call FUNC(keyLaserCodeUp);
};
},
{false},
[16, [false, true, true]], false, 0] call CBA_fnc_addKeybind; // (ALT+CTRL+Q)
["ACE3 Equipment", QGVAR(LaserCodeDown), localize "STR_ACE_laser_laserCodeDown",
{
if( EGVAR(laser_selfdesignate,active)
||
{ (currentWeapon ACE_player) == "Laserdesignator" && (call CBA_fnc_getFoV) select 1 > 5 } // If laserdesignator & FOV, we are in scope.
||
{ [ACE_player] call FUNC(unitTurretCanLockLaser) }
) then {
[] call FUNC(keyLaserCodeDown);
};
},
{false},
[18, [true, true, true]], false, 0] call CBA_fnc_addKeybind; // (ALT+CTRL+E)

14
addons/laser/stringtable.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="laser">
<Key ID="STR_ACE_laser_laserCode">
<English>Laser Code</English>
</Key>
<Key ID="STR_ACE_laser_laserCodeUp">
<English>Laser - Cycle Code Up</English>
</Key>
<Key ID="STR_ACE_laser_laserCodeDown">
<English>Laser - Cycle Code Down</English>
</Key>
</Package>
</Project>

25
addons/laser_selfdesignate/CfgVehicles.hpp
View File

@ -21,4 +21,29 @@ class CfgVehicles {
};
};
};
class Plane: Air {};
class Plane_Base_F: Plane {
class Turrets {
class CopilotTurret;
};
};
/* @TODO: LGB GBU
class Plane_CAS_01_base_F: Plane_Base_F {
class Turrets: Turrets {
class MainTurret: MainTurret {
GVAR(Enabled) = 1; // Enable laser self-designation
};
};
};
class Plane_CAS_02_base_F: Plane_Base_F {
class Turrets: Turrets {
class MainTurret: MainTurret {
GVAR(Enabled) = 1; // Enable laser self-designation
};
};
};
*/
};

2
addons/medical/CfgVehicles.hpp
View File

@ -657,7 +657,7 @@ class CfgVehicles {
XEH_ENABLED;
scope = 1;
side = -1;
model = QUOTE(PATHTOF(data\bodybag.p3d));
model = QUOTE(PATHTOEF(apl,bodybag.p3d));
icon = "";
displayName = $STR_ACE_Medical_Bodybag_Display;
EGVAR(dragging,canDrag) = 1;

2
addons/medical/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {"ACE_medicalSupplyCrate", "ACE_medicalSupplyCrate_advanced", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem", "ACE_bodyBagObject"};
weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction","ace_modules"};
requiredAddons[] = {"ace_interaction","ace_modules", "ace_apl"};
author[] = {"Glowbal", "KoffienFlummi"};
authorUrl = "";
VERSION_CONFIG;

BIN
addons/medical/data/bodybag.p3d
View File

Binary file not shown.

2
addons/medical/data/surgical_kit.rvmat
View File

@ -80,7 +80,7 @@ class Stage6
};
class Stage7
{
texture="z\ace\addons\medical\data\env_co.tga";
texture="z\ace\addons\apl\data\env_co.tga";
uvSource="tex";
class uvTransform
{

7
addons/missileguidance/functions/fnc_onFired.sqf
View File

@ -29,6 +29,10 @@ _seekerType = (vehicle _shooter) getVariable [QGVAR(seekerType), nil];
_attackProfile = (vehicle _shooter) getVariable [QGVAR(attackProfile), nil];
_lockMode = (vehicle _shooter) getVariable [QGVAR(lockMode), nil];
// @TODO: make this vehicle shooter, but we need to differentiate where its set in ace_laser
_laserCode = _shooter getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
_laserInfo = [_laserCode, ACE_DEFAULT_LASER_WAVELENGTH, ACE_DEFAULT_LASER_WAVELENGTH];
_launchPos = getPosASL (vehicle _shooter);
TRACE_3("Begin guidance", _target, _seekerType, _attackProfile);
@ -69,7 +73,8 @@ _args = [_this,
[_target, _targetPos, _launchPos],
_seekerType,
_attackProfile,
_lockMode
_lockMode,
_laserInfo
],
[
getNumber ( _config >> "minDeflection" ),

6
addons/missileguidance/functions/fnc_seekerType_SALH.sqf
View File

@ -2,17 +2,19 @@
#include "script_component.hpp"
EXPLODE_7_PVT(((_this select 1) select 0),_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
private["_angleFov", "_canSeeTarget", "_foundTargetPos", "_laserResult", "_launchParams", "_seekerParams", "_seekerTargetPos", "_sensorPos", "_target"];
private["_angleFov", "_canSeeTarget", "_foundTargetPos", "_laserResult", "_launchParams", "_seekerParams", "_laserCode", "_laserParams", "_seekerTargetPos", "_sensorPos", "_target"];
_seekerTargetPos = _this select 0;
_launchParams = _this select 1;
_seekerParams = _launchParams select 3;
_angleFov = _seekerParams select 0;
_laserParams = (_launchParams select 1) select 5;
TRACE_2("", _launchParams, _laserParams);
if(!isNil "_target") then {
// Handle AI or moving vanilla lasers
_foundTargetPos = getPosASL _target;
} else {
_laserResult = [(getPosASL _projectile), (velocity _projectile), _angleFov, [ACE_DEFAULT_LASER_WAVELENGTH,ACE_DEFAULT_LASER_WAVELENGTH], ACE_DEFAULT_LASER_CODE] call EFUNC(laser,seekerFindLaserSpot);
_laserResult = [(getPosASL _projectile), (velocity _projectile), _angleFov, [(_laserParams select 1),(_laserParams select 2)], (_laserParams select 0)] call EFUNC(laser,seekerFindLaserSpot);
_foundTargetPos = _laserResult select 0;
TRACE_1("Search", _laserResult);
};

2
addons/optionsmenu/stringtable.xml
View File

@ -139,6 +139,7 @@
<Spanish>Introducir cadena de texto.</Spanish>
<Russian>Строчный ввод.</Russian>
<Polish>Wpisywanie tekstu.</Polish>
<Czech>Vkládání textu.</Czech>
<French>Entrée</French>
<Hungarian>String bevitel.</Hungarian>
<Italian>Stringa di unput.</Italian>
@ -232,6 +233,7 @@
<English>Option Menu UI Scaling</English>
<French>Menu option: taille de l'UI</French>
<Polish>Skalowanie UI menu ustawień</Polish>
<Czech>Měřítko UI v menu nastavení</Czech>
<Russian>Размер интерфейса меню настройки</Russian>
<Spanish>Opción de escalado del menú IU</Spanish>
<German>UI Skalierung</German>

12
addons/respawn/stringtable.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Interaction">
<Key ID="STR_ACE_Respawn_Deploy">
@ -27,13 +27,17 @@
</Key>
<Key ID="STR_ACE_Respawn_TeleportToBase">
<English>Teleport to Base</English>
<Czech>Teleportovat na základnu</Czech>
<German>Zur Basis teleportieren</German>
<Polish>Teleport do bazy</Polish>
<Russian>Телепортироваться на базу</Russian>
</Key>
<Key ID="STR_ACE_Respawn_TeleportToRallypoint">
<English>Teleport to Rallypoint</English>
<Czech>Teleportovat na rallypoint</Czech>
<German>Zum Rallypoint teleportieren</German>
<Polish>Teleport do punktu zbiórki</Polish>
<Russian>Телепортироваться на точку сбора</Russian>
</Key>
<Key ID="STR_ACE_Respawn_TeleportedToBase">
<English>Teleported to Base</English>
@ -68,6 +72,7 @@
<French>Point de ralliement OUEST (Base)</French>
<Italian>Rallypoint West (Base)</Italian>
<Hungarian>Gyülekezőpont, Nyugat (Bázis)</Hungarian>
<Czech>Rallypoint BLUFOR (Base)</Czech>
</Key>
<Key ID="STR_ACE_Respawn_RallypointEastBase">
<English>Rallypoint East (Base)</English>
@ -78,6 +83,7 @@
<French>Point de ralliement EST (Base)</French>
<Italian>Rallypoint East (Base)</Italian>
<Hungarian>Gyülekezőpont, Kelet (Bázis)</Hungarian>
<Czech>Rallypoint OPFOR (Base)</Czech>
</Key>
<Key ID="STR_ACE_Respawn_RallypointIndependentBase">
<English>Rallypoint Independent (Base)</English>
@ -88,6 +94,7 @@
<French>Point de ralliement Indépendant (Base)</French>
<Italian>Rallypoint Independent (Base)</Italian>
<Hungarian>Gyülekezőpont, Független (Bázis)</Hungarian>
<Czech>Rallypoint INDFOR (Base)</Czech>
</Key>
<Key ID="STR_ACE_Respawn_RallypointWest">
<English>Rallypoint West</English>
@ -98,6 +105,7 @@
<French>Point de ralliement OUEST</French>
<Italian>Rallypoint West</Italian>
<Hungarian>Gyülekezőpont, Nyugat</Hungarian>
<Czech>Rallypoint BLUFOR</Czech>
</Key>
<Key ID="STR_ACE_Respawn_RallypointEast">
<English>Rallypoint East</English>
@ -108,6 +116,7 @@
<French>Point de ralliement EST</French>
<Italian>Rallypoint East</Italian>
<Hungarian>Gyülekezőpont, Kelet</Hungarian>
<Czech>Rallypoint OPFOR</Czech>
</Key>
<Key ID="STR_ACE_Respawn_RallypointIndependent">
<English>Rallypoint Independent</English>
@ -118,6 +127,7 @@
<French>Point de ralliement Indépendant</French>
<Italian>Rallypoint Independent</Italian>
<Hungarian>Gyülekezőpont, Független</Hungarian>
<Czech>Rallypoint INDFOR</Czech>
</Key>
</Package>
</Project>

1
addons/weather/stringtable.xml
View File

@ -4,6 +4,7 @@
<Key ID="STR_ACE_Weather_WindInfoKey">
<English>Show Wind Info</English>
<Polish>Pokaż inf. o wietrze</Polish>
<Czech>Zobrazit větrné info</Czech>
<Russian>Показать информацию о ветре</Russian>
<French>Afficher information sur le vent</French>
<Spanish>Mostrar información del viento</Spanish>