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' of https://github.com/acemod/ACE3 into medical-rewrite

Browse Source
This commit is contained in:
commy2 2016-10-20 13:56:56 +02:00
commit 576a63c27e
25 changed files with 131 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -4,7 +4,7 @@
<p align="center">
<a href="https://github.com/acemod/ACE3/releases/latest">
<img src="https://img.shields.io/badge/Version-3.7.0-blue.svg?style=flat-square" alt="ACE3 Version">
<img src="https://img.shields.io/badge/Version-3.8.0-blue.svg?style=flat-square" alt="ACE3 Version">
</a>
<a href="https://github.com/acemod/ACE3/issues">
<img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

3
addons/advanced_fatigue/functions/fnc_handleEffects.sqf
View File

@ -60,6 +60,9 @@ if (GVAR(ppeBlackoutLast) == 1) then {
if (GVAR(isSwimming)) exitWith {
_unit setAnimSpeedCoef (1 - _fatigue / 3);
};
if ((getAnimSpeedCoef _unit) != 1) then {
_unit setAnimSpeedCoef 1;
};
if (_overexhausted) then {
[_unit, "forceWalk", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);

8
addons/cookoff/stringtable.xml
View File

@ -31,17 +31,21 @@
<Korean>잔해(포탑)</Korean>
<Japanese>残骸（タレット）</Japanese>
</Key>
<Key ID="STR_ACE_CookOff_enable_name">
<Key ID="STR_ACE_CookOff_enableBoxCookoff_name">
<English>Enable ammo box cook off</English>
<Japanese>弾薬箱に誘爆を有効化</Japanese>
</Key>
<Key ID="STR_ACE_CookOff_enable_tooltip">
<Key ID="STR_ACE_CookOff_enableBoxCookoff_tooltip">
<English>Enables cooking off of ammo boxes.</English>
<Japanese>弾薬箱が誘爆するようになります。</Japanese>
</Key>
<Key ID="STR_ACE_CookOff_enableAmmoCookoff_name">
<English>Enable Ammunition cook off</English>
<Japanese>弾薬の誘爆を有効化</Japanese>
</Key>
<Key ID="STR_ACE_CookOff_enableAmmoCookoff_tooltip">
<English>Enables Ammunition cook off. Fires ammunition projectiles while vehicle is on fire and has ammunition.</English>
<Japanese>弾薬が誘爆します。車両が燃えると、搭載している弾薬が激しく燃え上がりす。</Japanese>
</Key>
</Package>
</Project>

3
addons/dogtags/functions/fnc_addDogtagActions.sqf
View File

@ -32,8 +32,7 @@ private _unitDogtagIDs = [];
//Create action children for all dogtags
private _actions = [];
{
private _tagID = _unitDogtagIDs select _forEachIndex;
private _displayName = format ["%1 #%2", getText (configFile >> "CfgWeapons" >> _x >> "displayName"), _tagID];
private _displayName = format ["%1", getText (configFile >> "CfgWeapons" >> _x >> "displayName")];
private _picture = getText (configFile >> "CfgWeapons" >> _x >> "picture");
private _action = [_x, _displayName, _picture, {_this call FUNC(checkDogtagItem)}, {true}, {}, _x] call EFUNC(interact_menu,createAction);

3
addons/laser/stringtable.xml
View File

@ -3,6 +3,7 @@
<Package name="Laser">
<Key ID="STR_ACE_Laser_dispersionCount_displayName">
<English>Laser Dispersion Simulation Count</English>
<Japanese>レーザーの分散シミュレート数</Japanese>
</Key>
<Key ID="STR_ACE_Laser_laserCode">
<English>Laser Code</English>
@ -44,4 +45,4 @@
<Japanese>レーザ - コードの数値を減らす</Japanese>
</Key>
</Package>
</Project>
</Project>

6
addons/main/script_mod.hpp
View File

@ -4,16 +4,16 @@
#define PREFIX ace
#define MAJOR 3
#define MINOR 7
#define MINOR 8
#define PATCHLVL 0
#define BUILD 6
#define BUILD 10
#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
// MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.64
#define REQUIRED_CBA_VERSION {3,1,0}
#define REQUIRED_CBA_VERSION {3,1,1}
#ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)

2
addons/map/stringtable.xml
View File

@ -409,10 +409,12 @@
<Key ID="STR_ACE_Map_disableBFT">
<English>Disable BFT</English>
<German>BFT deaktivieren</German>
<Japanese>BFTを無効化</Japanese>
</Key>
<Key ID="STR_ACE_Map_disableBFT_description">
<English>Always disable Blue Force Tracking for this group.</English>
<German>Blue Force Tracking für diese Gruppe immer deaktivieren.</German>
<Japanese>このグループへのブルー フォース トラッキングを常に無効化します。</Japanese>
</Key>
</Package>
</Project>

2
addons/maptools/stringtable.xml
View File

@ -160,9 +160,11 @@
</Key>
<Key ID="STR_ACE_MapTools_drawStaightLines_displayName">
<English>Draw straight lines with maptools</English>
<Japanese>マップ ツールを使って直線を書く</Japanese>
</Key>
<Key ID="STR_ACE_MapTools_drawStaightLines_description">
<English>Draw on the edge of maptools to draw straight lines. Note: Must hover at midpoint to delete.</English>
<Japanese>マップ ツールの端から直線を書きます。メモ：線の中央ホバーすると削除します。</Japanese>
</Key>
</Package>
</Project>

3
addons/medical_blood/stringtable.xml
View File

@ -3,12 +3,15 @@
<Package name="medical_blood">
<Key ID="STR_ACE_medical_blood_enabledFor_OnlyPlayers">
<English>Only Players</English>
<Japanese>プレイヤーのみ</Japanese>
</Key>
<Key ID="STR_ACE_medical_blood_MedicalBloodSettings_enabledFor_DisplayName">
<English>Enable Blood Drops</English>
<Japanese>血の滴下を有効化</Japanese>
</Key>
<Key ID="STR_ACE_medical_blood_MedicalBloodSettings_enabledFor_Description">
<English>Enable or disable Blood Drops created on bleeding and taking damage</English>
<Japanese>ダメージを受けたり、出血していると血が滴る様子の有効か無効化</Japanese>
</Key>
</Package>
</Project>

8
addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
View File

@ -86,10 +86,10 @@ if (_lastFireMode != -1) then {
// With no ammo, distance display will be empty, but gun will still fire at wonky angle if aimed at ground
private _testSeekerPosASL = AGLtoASL (positionCameraToWorld [0,0,0]);
private _testSeekerDir = _testSeekerPosASL vectorFromTo (AGLtoASL (positionCameraToWorld [0,0,1]));
private _laserRange = [_testSeekerPosASL, _testSeekerDir, _mortarVeh] call EFUNC(laser,shootRay);
_laserRange params ["", ["_rayDistance", -5]]; // ToDo: move shootRay to common
TRACE_2("",_rayDistance,viewDistance);
_useRealWeaponDir = _rayDistance > viewDistance; // If we are looking at infinity (based on viewDistance)
private _testPoint = _testSeekerPosASL vectorAdd (_testSeekerDir vectorMultiply viewDistance);
if ((terrainIntersectASL [_testSeekerPosASL, _testPoint]) || {lineIntersects [_testSeekerPosASL, _testPoint]}) then {
_useRealWeaponDir = false; // If we are not looking at infinity (based on viewDistance)
};
};
if (_useRealWeaponDir) then {

26
addons/refuel/CfgVehicles.hpp
View File

@ -180,18 +180,13 @@ class CfgVehicles {
class Helicopter: Air {
MACRO_CONNECT_ACTIONS
GVAR(fuelCapacity) = 1500;
};
class Helicopter_Base_F: Helicopter {};
class Helicopter_Base_H: Helicopter_Base_F {
GVAR(fuelCapacity) = 3000;
};
class Helicopter_Base_H: Helicopter_Base_F {};
class Plane: Air {
MACRO_CONNECT_ACTIONS
GVAR(fuelCapacity) = 2000;
GVAR(flowRate) = 16;
};
@ -201,7 +196,6 @@ class CfgVehicles {
class Ship_F: Ship {
MACRO_CONNECT_ACTIONS
GVAR(fuelCapacity) = 2000;
GVAR(flowRate) = 4;
};
@ -373,19 +367,6 @@ class CfgVehicles {
GVAR(fuelCapacity) = 830;
};
class Heli_Attack_01_base_F: Helicopter_Base_F {
// Commanche
};
class Heli_Attack_02_base_F: Helicopter_Base_F {
// Mi-48 Kajman
};
class Heli_Light_01_base_F: Helicopter_Base_H {
// MH-6
GVAR(fuelCapacity) = 242;
};
class Heli_Light_02_base_F: Helicopter_Base_H {
// Ka-60 Kasatka
GVAR(fuelCapacity) = 1450;
@ -439,11 +420,6 @@ class CfgVehicles {
GVAR(fuelCapacity) = 270;
};
class UGV_01_base_F: Car_F {
// Stomper
GVAR(fuelCapacity) = 100;
};
class Plane_Fighter_03_base_F: Plane_Base_F {
// L-159 ALCA
GVAR(fuelCapacity) = 1914;

12
addons/refuel/functions/fnc_refuel.sqf
View File

@ -18,8 +18,16 @@
params [["_unit", objNull, [objNull]], ["_target", objNull, [objNull]], ["_nozzle", objNull, [objNull]], ["_connectToPoint", [0,0,0], [[]], 3]];
private _rate = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >> QGVAR(flowRate)) * GVAR(rate);
private _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >> QGVAR(fuelCapacity));
private _config = configFile >> "CfgVehicles" >> typeOf _target;
private _rate = getNumber (_config >> QGVAR(flowRate)) * GVAR(rate);
private _maxFuel = getNumber (_config >> QGVAR(fuelCapacity));
// Fall back to vanilla fuelCapacity value (only air and sea vehicles don't have this defined by default by us)
// Air and sea vehicles have that value properly defined in liters, unlike ground vehicles which is is formula of (range * tested factor) - different fuel consumption system than ground vehicles
if (_maxFuel == 0) then {
_maxFuel = getNumber (_config >> "fuelCapacity");
};
[{
params ["_args", "_pfID"];

1
docs/.dockerignore Normal file
View File

@ -0,0 +1 @@
src

2
docs/.gitignore vendored
View File

@ -18,3 +18,5 @@ addons
CNAME
tools/temp
Gemfile.lock

14
docs/Dockerfile Normal file
View File

@ -0,0 +1,14 @@
# Build:
# docker build -t ace3mod/jekyll .
#
# Run:
# docker run -p 4000:4000 -it ace3mod/jekyll
FROM starefossen/github-pages:latest
MAINTAINER bux
COPY . /usr/src/app
VOLUME "/usr/src/app"
CMD ["jekyll", "serve", "--future", "--incremental", "--config", "_config_dev.yml", "-H", "0.0.0.0", "-P", "4000"]

135
docs/Gemfile.lock
View File

@ -1,135 +0,0 @@
GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.9)
RedCloth (4.2.9-x86-mingw32)
activesupport (4.2.5.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1)
ethon (0.8.1)
ffi (>= 1.3.0)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x86-mingw32)
gemoji (2.1.0)
github-pages (52)
RedCloth (= 4.2.9)
github-pages-health-check (= 1.0.1)
jekyll (= 3.0.3)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.4.0)
jekyll-gist (= 1.4.0)
jekyll-mentions (= 1.0.1)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.9.1)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.3.1)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.5.1)
kramdown (= 1.9.0)
liquid (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
terminal-table (~> 1.4)
github-pages-health-check (1.0.1)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.3.0)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.3)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.4.0)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-mentions (1.0.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.9.1)
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.3.1)
jekyll (~> 3.0)
jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
jemoji (0.5.1)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 2.0)
json (1.8.3)
kramdown (1.9.0)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.5)
mini_portile2 (2.0.0)
minitest (5.8.4)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7.2-x86-mingw32)
mini_portile2 (~> 2.0.0.rc2)
octokit (4.2.0)
sawyer (~> 0.6.0, >= 0.5.3)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.21)
sawyer (0.6.0)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
terminal-table (1.5.2)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
PLATFORMS
ruby
x86-mingw32
DEPENDENCIES
github-pages
BUNDLED WITH
1.12.5

71
docs/README.md
View File

@ -1,10 +1,52 @@
# Source of http://ace3mod.com/
## Setting up the development environment
## Updating compiled JavaScript and CSS files
### Installing prerequisites
- Install [Node.js](https://nodejs.org/download/)
- Open Command Prompt and navigate to `src` directory
```
cd <ACE3_directory>/docs/src
```
#### Windows (CMD)
- Install Node packages
```
npm install
```
_On Bash on Ubuntu on Windows also install `nodejs-legacy` in case of errors._
- Update files
```
grunt
```
## Setting up the Jekyll environment
### Using Docker
We include files for [Docker](https://www.docker.com/) to run Jekyll in a separate container. This allows you to not having to install anything apart from Docker on your computer.
#### Running the Dockerfile
- Install [Docker](https://www.docker.com/)
- cd into the `/docs/` directory
- Open Command Prompt and navigate to this directory
```
cd <ACE3_directory>/docs
```
- Build and run the container
```
docker-compose up
```
- Navigate to [http://localhost:4000](http://localhost:4000)
### Manually
#### Installing prerequisites
##### Windows (CMD)
- Install [Ruby 2.0.0-p648 (x64)](http://rubyinstaller.org/downloads/)
- Install [Ruby DevKit for 2.0 (x64)](http://rubyinstaller.org/downloads/)
@ -23,6 +65,7 @@
bundle install
```
#### Debian / Bash on Ubuntu on Windows
- Open Bash and navigate to this directory
@ -35,7 +78,7 @@
sudo apt-get install make gcc
```
- Install `ruby2.0`, `rbuy2.0-dev` and `ruby-switch`
- Install `ruby2.0`, `ruby2.0-dev` and `ruby-switch`
```
sudo apt-add-repository ppa:brightbox/ruby-ng
sudo apt-get update
@ -62,7 +105,7 @@
find ~/.bundle/cache -type d -exec chmod 0755 {} +
```
### Running
#### Running
- Run Jekyll through bundler
```
@ -72,21 +115,3 @@
- Navigate to http://localhost:4000
### Updating compiled JavaScript and CSS files
- Install [Node.js](https://nodejs.org/download/)
- Open Command Prompt and navigate to `src` directory
```
cd <ACE3_directory>/docs/src
```
- Install Node packages
```
npm install
```
_On Bash on Ubuntu on Windows also install `nodejs-legacy` in case of errors._
- Update files
```
grunt
```

2
docs/README_DE.md
View File

@ -4,7 +4,7 @@
<p align="center">
<a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Version-3.7.0-blue.svg?style=flat-square" alt="ACE3 Version">
<img src="https://img.shields.io/badge/Version-3.8.0-blue.svg?style=flat-square" alt="ACE3 Version">
</a>
<a href="https://github.com/acemod/ACE3/issues">
<img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Fehlermeldungen">

2
docs/README_PL.md
View File

@ -3,7 +3,7 @@
</p>
<p align="center">
<a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Wersja-3.7.0-blue.svg?style=flat-square" alt="ACE3 Wersja">
<img src="https://img.shields.io/badge/Wersja-3.8.0-blue.svg?style=flat-square" alt="ACE3 Wersja">
</a>
<a href="https://github.com/acemod/ACE3/issues">
<img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia">

10
docs/_config.yml
View File

@ -10,17 +10,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3
version:
major: 3
minor: 7
minor: 8
patch: 0
build: 6
build: 10
acex:
githubUrl: https://github.com/acemod/ACEX
version:
major: 3
minor: 0
patch: 0
build: 0
minor: 1
patch: 1
build: 3
markdown: kramdown

10
docs/_config_dev.yml
View File

@ -10,17 +10,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3
version:
major: 3
minor: 7
minor: 8
patch: 0
build: 6
build: 10
acex:
githubUrl: https://github.com/acemod/ACEX
version:
major: 3
minor: 0
patch: 0
build: 0
minor: 1
patch: 1
build: 3
markdown: kramdown

10
docs/docker-compose.yml Normal file
View File

@ -0,0 +1,10 @@
version: '2'
services:
docs:
build: .
restart: always
ports:
- "4000:4000"
volumes:
- ./:/usr/src/app

1
docs/wiki/feature/medical-system.md
View File

@ -339,6 +339,7 @@ For the following procedure to work revive needs to be enabled.
- Each successful round of CPR (filled up completion bar) increases the time left in the revive state.
## 3. Guides
### 3.1 Example loadouts
#### 3.1.1 Basic

4
mod.cpp
View File

@ -1,8 +1,8 @@
name = "Advanced Combat Environment 3.7.0";
name = "Advanced Combat Environment 3.8.0";
picture = "logo_ace3_ca.paa";
actionName = "GitHub";
action = "https://github.com/acemod/ACE3";
description = "ACE3 - Version 3.7.0";
description = "ACE3 - Version 3.8.0";
logo = "logo_ace3_ca.paa";
logoOver = "logo_ace3_ca.paa";
tooltip = "ACE3";

5
tools/make.py
View File

@ -583,8 +583,8 @@ def set_version_in_files():
newVersionShort = newVersion[:-2] # MAJOR.MINOR.PATCH
# Regex patterns
pattern = re.compile(r"(\b[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+)") # MAJOR.MINOR.PATCH.BUILD
patternShort = re.compile(r"(\b[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+)") # MAJOR.MINOR.PATCH
pattern = re.compile(r"([\d]+\.[\d]+\.[\d]+\.[\d]+)") # MAJOR.MINOR.PATCH.BUILD
patternShort = re.compile(r"([\d]+\.[\d]+\.[\d]+)") # MAJOR.MINOR.PATCH
# Change versions in files containing version
for i in versionFiles:
@ -608,6 +608,7 @@ def set_version_in_files():
# First item in the list findall returns
versionFound = versionFound[0]
newVersionUsed = ""
# Use the same version length as the one found
if len(versionFound) == len(newVersion):
newVersionUsed = newVersion