Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into fixed…
Browse files Browse the repository at this point in the history
…-error-messages
  • Loading branch information
commy2 committed Aug 23, 2019
2 parents 2595495 + 1ccbafa commit eee311b
Show file tree
Hide file tree
Showing 39 changed files with 235 additions and 44 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Community Base Addons
[![](https://img.shields.io/travis/CBATeam/CBA_A3.svg?style=flat-square)](https://travis-ci.org/CBATeam/CBA_A3)
[![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/issues?q=is%3Aclosed+milestone%3A3.12.0)
[![](https://img.shields.io/badge/Release-3.12.0-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest)
[![](https://img.shields.io/badge/Changelog-Link-orange.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/issues?q=is%3Aclosed+milestone%3A3.12.1)
[![](https://img.shields.io/badge/Release-3.12.1-blue.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/releases/latest)
[![](https://img.shields.io/badge/Github-Wiki-lightgrey.svg?style=flat-square)](https://github.com/CBATeam/CBA_A3/wiki)
[![](https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square)](https://forums.bistudio.com/topic/168277-cba-community-base-addons-arma-3)
[![](https://img.shields.io/badge/Function-Documentation-yellow.svg?style=flat-square)](https://cbateam.github.io/CBA_A3/docs/files/overview-txt.html)
Expand Down
9 changes: 9 additions & 0 deletions addons/accessory/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<French>Community Base Addons - Fonctions des accessoires</French>
<Turkish>Community Base Addons - Aksesuar Fonksiyonları</Turkish>
<Italian>Community Base Addons - Funzioni per Accessori</Italian>
<Czech>Community Base Addons - Funkce doplňků</Czech>
</Key>
<Key ID="STR_CBA_accessory_railNext">
<English>Next rail item state</English>
Expand All @@ -24,6 +25,7 @@
<French>Mode de l'accessoire sur rail suivant</French>
<Turkish>Sonraki ray aksesuarı</Turkish>
<Italian>Stato successivo dell'oggetto sulla slitta</Italian>
<Czech>Další režim doplňku na liště</Czech>
</Key>
<Key ID="STR_CBA_accessory_railNext_tooltip">
<English>Cycles to the next mode available for your rail slot attachment</English>
Expand All @@ -36,6 +38,7 @@
<French>Passe au prochain mode disponible de votre accessoire sur rail</French>
<Turkish>Ray aksesuarınızı sonraki moda geçirir</Turkish>
<Italian>Passa alla modalità successiva del tuo accessorio sulla slitta</Italian>
<Czech>Přepíná na další možný režim doplňku na liště</Czech>
</Key>
<Key ID="STR_CBA_accessory_railPrev">
<English>Prev rail item state</English>
Expand All @@ -48,6 +51,7 @@
<French>Mode de l'accessoire sur rail précèdent</French>
<Turkish>Önceki ray aksesuarı</Turkish>
<Italian>Stato precedente dell'oggetto sulla slitta</Italian>
<Czech>Předchozí režim doplňku na liště</Czech>
</Key>
<Key ID="STR_CBA_accessory_railPrev_tooltip">
<English>Cycles to the previous mode available for your rail slot attachment</English>
Expand All @@ -60,6 +64,7 @@
<French>Passe au précèdent mode disponible de votre accessoire sur rail</French>
<Turkish>Ray aksesuarınızı önceki moda geçirir</Turkish>
<Italian>Passa alla modalità precedente del tuo accessorio sulla slitta</Italian>
<Czech>Přepíná na předchozí možný režim doplňku na liště</Czech>
</Key>
<Key ID="STR_CBA_accessory_opticNext">
<English>Next optics state</English>
Expand All @@ -72,6 +77,7 @@
<French>Mode de l'optique suivant</French>
<Turkish>Sonraki nişangah modu</Turkish>
<Italian>Stato successivo dell'ottica</Italian>
<Czech>Další režim zaměřovače</Czech>
</Key>
<Key ID="STR_CBA_accessory_opticNext_tooltip">
<English>Cycles to the next mode available for your optics slot attachment</English>
Expand All @@ -84,6 +90,7 @@
<French>Passe au prochain mode disponible de votre optique</French>
<Turkish>Varolan nişangahınızı sonraki moduna geçirir</Turkish>
<Italian>Passa alla modalità successiva della tua ottica</Italian>
<Czech>Přepíná na další možný režim doplňku slotu pro zaměřovač</Czech>
</Key>
<Key ID="STR_CBA_accessory_opticPrev">
<English>Prev optics state</English>
Expand All @@ -96,6 +103,7 @@
<French>Mode de l'optique sur rail précèdent</French>
<Turkish>Önceki nişangah modu</Turkish>
<Italian>Stato precedente dell'ottica</Italian>
<Czech>Předchozí režim zaměřovače</Czech>
</Key>
<Key ID="STR_CBA_accessory_opticPrev_tooltip">
<English>Cycles to the previous mode available for your optics slot attachment</English>
Expand All @@ -108,6 +116,7 @@
<French>Passe au précèdent mode disponible de votre optique</French>
<Turkish>Varolan nişangahınızı önceki moduna geçirir</Turkish>
<Italian>Passa alla modalità precedenta della tua ottica</Italian>
<Czech>Přepíná na předchozí možný režim doplňku slotu pro zaměřovač</Czech>
</Key>
</Package>
</Project>
2 changes: 2 additions & 0 deletions addons/ai/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<Polish>Community Base Addons - Sztuczna Inteligencja</Polish>
<Turkish>Community Base Addons - Yapay Zeka</Turkish>
<Italian>Community Base Addons - Intelligenza Artificiale</Italian>
<Czech>Community Base Addons - Umělá inteligence</Czech>
</Key>
<Key ID="STR_CBA_AI_BuildingPos">
<English>AI Building Position</English>
<German>KI Gebäudeposition</German>
<Czech>Poloha stavby AI</Czech>
</Key>
</Package>
</Project>
1 change: 1 addition & 0 deletions addons/arrays/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Polish>Community Base Addons - Tablice</Polish>
<Turkish>Community Base Addons - Diziler</Turkish>
<Italian>Community Base Addons - Array</Italian>
<Czech>Community Base Addons - Pole</Czech>
</Key>
</Package>
</Project>
3 changes: 3 additions & 0 deletions addons/common/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Polish>Community Base Addons - Ogólne Komponenty</Polish>
<Turkish>Community Base Addons - Ortak Bileşenler</Turkish>
<Italian>Community Base Addons - Componenti Comuni</Italian>
<Czech>Community Base Addons - Společná součást</Czech>
</Key>
<Key ID="STR_cba_common_need_mission_start">
<English>You must first start a mission.</English>
Expand All @@ -21,13 +22,15 @@
<Turkish>Önce bir görev başlatmalısınız.</Turkish>
<Japanese>ミッションを開始しておく必要があります。</Japanese>
<Italian>Prima deve far partire una missione.</Italian>
<Czech>První musíte zapnout misi.</Czech>
</Key>
<Key ID="STR_cba_common_WeaponsCategory">
<English>CBA Weapons</English>
<German>CBA Waffen</German>
<Polish>CBA Bronie</Polish>
<Italian>Armi CBA</Italian>
<Japanese>CBA 武器</Japanese>
<Czech>Zbraně CBA</Czech>
</Key>
</Package>
</Project>
7 changes: 7 additions & 0 deletions addons/diagnostic/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<French>Community Base Addons - Diagnostics</French>
<Turkish>Community Base Addons - Teşhis</Turkish>
<Italian>Community Base Addons - Diagnostica</Italian>
<Czech>Community Base Addons - Diagnostika</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_ExtendedDebugConsole">
<English>Extended Debug Console</English>
Expand All @@ -24,6 +25,7 @@
<Polish>Rozszerzona Konsola Debugowania</Polish>
<Turkish>Geliştirilmiş Debug Konsolu</Turkish>
<Italian>Console debug estesa</Italian>
<Czech>Rozšířená ladící konzole</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_PrevStatement">
<English>Previous Statement</English>
Expand All @@ -36,6 +38,7 @@
<Polish>Poprzednie polecenie</Polish>
<Turkish>Önceki İfade</Turkish>
<Italian>Espressione Prec.</Italian>
<Czech>Předchozí zpráva</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_NextStatement">
<English>Next Statement</English>
Expand All @@ -48,6 +51,7 @@
<Polish>Następne polecenie</Polish>
<Turkish>Sonraki İfade</Turkish>
<Italian>Espressione Succ.</Italian>
<Czech>Následující zpráva</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_TargetExec">
<English>Target Exec</English>
Expand All @@ -60,6 +64,7 @@
<French>Cible Exec</French>
<Turkish>Hedefte Çalıştır</Turkish>
<Italian>Esegui Remoto</Italian>
<Czech>Cílový exec</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_EnableTargetDebug">
<English>Enable Target Debugging</English>
Expand All @@ -72,6 +77,7 @@
<French>Activer le débogage de la cible</French>
<Turkish>Hedefte Çalıştırmayı Aktifleştir</Turkish>
<Italian>Attiva il debug remoto</Italian>
<Czech>Zapnout cílové ladění</Czech>
</Key>
<Key ID="STR_CBA_Diagnostic_EnableTargetDebug_tooltip">
<English>[CBA] Allows remote target debugging. Requires Debug Console.</English>
Expand All @@ -84,6 +90,7 @@
<French>[CBA] Permet le débogage de la cible distante. Nécessite la console de débogage.</French>
<Turkish>[CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir.</Turkish>
<Italian>[CBA] Abilita il debug remoto. Richiede la console di debug.</Italian>
<Czech>[CBA] Povoluje ladění vzdáleného cíle. Vyžaduje ladící konzoli.</Czech>
</Key>
</Package>
</Project>
10 changes: 10 additions & 0 deletions addons/disposable/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,61 @@
<English>Community Base Addons - Disposable Weapons</English>
<German>Community Base Addons - Einwegwaffen</German>
<Japanese>Community Base Addons - 使い捨て武器</Japanese>
<Czech>Community Base Addons - Jednorázové zbraně</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropUsedLauncher">
<English>Drop Used Disposable Launcher</English>
<German>Benutzten Einwegwerfer ablegen</German>
<Japanese>使った使い捨てランチャーを落とす</Japanese>
<Czech>Odhodit použitý jednorázový raketomet</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropNever">
<English>Never</English>
<German>Niemals</German>
<Japanese>行わない</Japanese>
<Czech>Nikdy</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropNeverTooltip">
<English>Don't automatically drop the used disposable launcher.</English>
<German>Benutzten Einwegwerfer nicht automatisch ablegen.</German>
<Japanese>使った使い捨てランチャーを自動的に落とさないようにします。</Japanese>
<Czech>Automaticky neodhazovat použitý jednorázový raketomet.</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropAIOnly">
<English>AI Only</English>
<German>Nur KI</German>
<Japanese>AI のみ</Japanese>
<Czech>Pouze AI</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropAIOnlyTooltip">
<English>Only AI drops the used disposable launcher.</English>
<German>Nur KI legt den benutzten Einwegwerfer ab.</German>
<Japanese>AI のみ使った使い捨てランチャーを落とすようにします。</Japanese>
<Czech>Pouze AI odhodí použitý jednorázový raketomet.</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropSelectedAnotherWeapon">
<English>Selected Another Weapon</English>
<German>Andere Waffe ausgewählt</German>
<Japanese>別の武器が選択後</Japanese>
<Czech>Vybrána jiná zbraň</Czech>
</Key>
<Key ID="STR_CBA_disposable_DropSelectedAnotherWeaponTooltip">
<English>Automatically drop the used disposable launcher as soon as another weapon is selected.</English>
<German>Benutzten Einwegwerfer automatisch ablegen, sobald eine andere Waffe ausgewählt wurde.</German>
<Japanese>他の武器を選択すると即時に使った使い捨てランチャーを自動的に落とすようにします。</Japanese>
<Czech>Automaticky odhodit použitý jednorázový raketomet, jakmile je zvolena jiná zbraň.</Czech>
</Key>
<Key ID="STR_CBA_disposable_ReplaceDisposableLauncher">
<English>Replace Disposable Launcher</English>
<German>Einwegwerfer ersetzten</German>
<Japanese>使い捨てランチャーを置換</Japanese>
<Czech>Vyměnit jednorázový raketomet</Czech>
</Key>
<Key ID="STR_CBA_disposable_ReplaceDisposableLauncherTooltip">
<English>If enabled, disposable launchers can only be used once. Ammunition for disposable launchers in containers and vehicles will be replaced with loaded disposable launchers. If disabled, disposable launchers can be reloaded after use.</English>
<German>Wenn aktiviert, dann können Einwegwerfer nur einmal benutzt werden. Munition für Einwegwerfer in Kisten und Fahrzeugen wird durch geladene Einwegwerfer ersetzt. Wenn deaktiviert, dann können Einwegwerfer nach der Benutzung nachgeladen werden.</German>
<Japanese>有効化すると、使い捨てランチャーは一度のみ使用できます。コンテナ内にある使い捨てランチャーは装填された使い捨てランチャーに置き換えられます。無効化すると、使用後に使い捨てランチャーをリロードできます。</Japanese>
<Czech>Pokud je tato možnost zapnuta, jednorázové raketomety mohou být použity pouze jednou. Munice pro jednorázové raketomety v bednách a vozidlech budou vyměněny za nabité jednorázové raketomety. Pokud je tato možnost vypnuta, jednorázové raketomety mohou být přebity po použití.</Czech>
</Key>
</Package>
</Project>
Empty file added addons/ee/$NOBIN$
Empty file.
1 change: 1 addition & 0 deletions addons/ee/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x\cba\addons\ee
33 changes: 33 additions & 0 deletions addons/ee/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#include "script_component.hpp"

class CfgPatches {
class cba_ee {
requiredAddons[] = {"cba_xeh"};
units[] = {};
};
};
class XEH_CLASS_BASE;

class CfgVehicles {
class B_W_Soldier_F;
class B_W_Story_Protagonist_01_F: B_W_Soldier_F {
XEH_ENABLED;
scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')"; // Inherits from a public base class. Downgrade to protected if Contact component is not loaded.
};
class B_W_Story_Major_01_F: B_W_Soldier_F {
XEH_ENABLED;
scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
};
class B_W_Story_Instructor_01_F: B_W_Soldier_F {
XEH_ENABLED;
scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
};
class B_W_Story_Soldier_01_F: B_W_Soldier_F {
XEH_ENABLED;
scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
};
class B_W_Story_Leader_01_F: B_W_Soldier_F {
XEH_ENABLED;
scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
};
};
1 change: 1 addition & 0 deletions addons/ee/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "\x\cba\addons\xeh\script_component.hpp"
9 changes: 9 additions & 0 deletions addons/events/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,54 +12,63 @@
<Polish>Community Base Addons - Zdarzenia</Polish>
<Turkish>Community Base Addons - Durumlar</Turkish>
<Italian>Community Base Addons - Eventi</Italian>
<Czech>Community Base Addons - Události</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionMode">
<English>Weapon Repetition Mode</English>
<German>Repetierwaffe laden</German>
<Polish>Tryb powtarzania strzału</Polish>
<Japanese>武器反復モード</Japanese>
<Czech>Mód opakování zbraně</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeTooltip">
<English>Mode of bolting or pumping weapons.</English>
<German>Art eine Waffe zu repetieren.</German>
<Polish>Tryb przeładowania/ryglowania broni po wystrzale.</Polish>
<Japanese>ボルト、またはポンプ式武器のモードを決定します。</Japanese>
<Czech>Mód natahování nebo pumpování zbraní.</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeOptic">
<English>Leave Optics View</English>
<German>Optikansicht verlassen</German>
<Polish>Opuszczenie optyki</Polish>
<Japanese>照準画面を離れる</Japanese>
<Czech>Opustit pohled optiky</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeOpticTooltip">
<English>Bolt or rack weapon by leaving optics view.</English>
<German>Waffe beim Verlassen der Optikansicht repetieren.</German>
<Polish>Przeładowanie/ryglowanie broni nastąpi po opuszczeniu widoku optyki.</Polish>
<Japanese>ボルトかポンプ動作時は照準画面から離れます</Japanese>
<Czech>Natáhnout zbraň opuštěním pohledu optiky.</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeTriggerRelease">
<English>Release Trigger</English>
<German>Abzug losslassen</German>
<Polish>Puszczenie spustu</Polish>
<Japanese>トリガー解放時</Japanese>
<Czech>Pustit spoušť</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeTriggerReleaseTooltip">
<English>Bolt or rack weapon by releasing trigger (hold trigger to prevent immediate action).</English>
<German>Waffe beim Loslassen des Abzugs repetieren (Abzug halten, um Repetieren zu verzögern).</German>
<Polish>Przeładowanie/ryglowanie nastąpi po puszczeniu spustu (przytrzymaj spust aby nie przełdowywać).</Polish>
<Japanese>トリガーを離してボルトかポンプ動作を行います。(トリガー長押しで即時動作を防止)</Japanese>
<Czech>Natáhnout zbraň puštěním spouště (podržte spoušť k zabránění okamžitému natáhnutí zbraně).</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeTriggerPress">
<English>Press Trigger</English>
<German>Abzug betätigen</German>
<Polish>Wciśnięcie spustu</Polish>
<Japanese>トリガー引いた時</Japanese>
<Czech>Zmáčknout spoušť</Czech>
</Key>
<Key ID="STR_CBA_Events_RepetitionModeTriggerPressTooltip">
<English>Bolt or rack weapon by pressing the trigger again.</English>
<German>Waffe beim erneuten Betätigen des Abzugs repetieren.</German>
<Polish>Przeładowanie/ryglowanie nastąpi po ponownym wciśnięciu spustu.</Polish>
<Japanese>トリガーを再度引いてボルトかポンプ動作を行います。</Japanese>
<Czech>Natáhnout zbraň dalším zmáčkutím spouště.</Czech>
</Key>
</Package>
</Project>
1 change: 1 addition & 0 deletions addons/hashes/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<French>Community Base Addons - Hashes</French>
<Turkish>Community Base Addons - Hashler</Turkish>
<Italian>Community Base Addons - Hash</Italian>
<Czech>Community Base Addons - Hashe</Czech>
</Key>
</Package>
</Project>
Loading

0 comments on commit eee311b

Please sign in to comment.