diff --git a/.editorconfig b/.editorconfig index af1c2ff31..34aa3b96f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,18 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false + +[*.yml] +indent_size = 2 + +[*.hpp] +indent_style = space +indent_size = 4 + +[*.cpp] +indent_style = space +indent_size = 4 + +[*.sqf] +indent_style = space +indent_size = 4 \ No newline at end of file diff --git a/.github/workflows/create_artifacts.yml b/.github/workflows/create_artifacts.yml index a8d37599e..472195659 100644 --- a/.github/workflows/create_artifacts.yml +++ b/.github/workflows/create_artifacts.yml @@ -1,5 +1,6 @@ name: Create Artifacts on: workflow_dispatch + jobs: build: name: Create And Upload Releases diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b22ddd1e4..bed2e140e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,8 @@ name: Deploy Release on: release: - types: [ published ] + types: [published] + jobs: build: name: Create And Upload Release @@ -37,7 +38,6 @@ jobs: asset_name: cScripts_Debug-${{github.ref_name}}.zip file: release/cScripts_Debug-${{github.ref_name}}.zip - - name: Upload release (cScripts_NoRadio) uses: svenstaro/upload-release-action@v2 with: diff --git a/.github/workflows/deploy_artifacts_main.yml b/.github/workflows/deploy_artifacts_main.yml index 763b0b77e..b6eb41293 100644 --- a/.github/workflows/deploy_artifacts_main.yml +++ b/.github/workflows/deploy_artifacts_main.yml @@ -1,8 +1,9 @@ name: Deploy DevBuild Artifacts on: push: - branches: - - main + branches: + - main + jobs: build: name: Create And Upload Releases @@ -18,4 +19,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: cScripts_DevBuilds - path: release/* \ No newline at end of file + path: release/* diff --git a/.github/workflows/deploy_artifacts_tag.yml b/.github/workflows/deploy_artifacts_tag.yml index 59931c061..b4c7f214e 100644 --- a/.github/workflows/deploy_artifacts_tag.yml +++ b/.github/workflows/deploy_artifacts_tag.yml @@ -1,8 +1,9 @@ name: Deploy Tag Artifacts on: push: - tags: - - '*' + tags: + - "*" + jobs: build: name: Create And Upload Releases @@ -18,4 +19,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: cScripts_Releases - path: release/* \ No newline at end of file + path: release/* diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4d6b89dc6..34cbaa880 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -1,45 +1,57 @@ name: Testing -on: [push, pull_request] +on: + pull_request: + push: + jobs: validate: runs-on: ubuntu-latest + if: github.event_name != 'pull_request' || + github.event.pull_request.head.repo.full_name != + github.event.pull_request.base.repo.full_name steps: - - name: Checkout the source code - uses: actions/checkout@master - - name: Validate SQF - run: python3 tools/sqf_validator.py - - name: Validate Config - run: python3 tools/config_style_checker.py - + - name: Checkout the source code + uses: actions/checkout@master + - name: Validate SQF + run: python3 tools/sqf_validator.py + - name: Validate Config + run: python3 tools/config_style_checker.py + lint: runs-on: ubuntu-latest + if: github.event_name != 'pull_request' || + github.event.pull_request.head.repo.full_name != + github.event.pull_request.base.repo.full_name steps: - - name: Checkout the source code - uses: actions/checkout@master - - name: Lint (sqflint) - uses: arma-actions/sqflint@master - with: - args: --exit e --directory cScripts/functions - continue-on-error: true # No failure due to many false-positives + - name: Checkout the source code + uses: actions/checkout@master + - name: Lint (sqflint) + uses: arma-actions/sqflint@master + with: + args: --exit e --directory cScripts/functions + continue-on-error: true # No failure due to many false-positives testing: runs-on: ubuntu-latest + if: github.event_name != 'pull_request' || + github.event.pull_request.head.repo.full_name != + github.event.pull_request.base.repo.full_name steps: - - name: Checkout the source code - uses: actions/checkout@master - - name: Check DEBUG_MODE - if: always() - run: bash tools/checkDebug.sh - - name: Check TODO - if: always() - run: bash tools/checkTodo.sh - continue-on-error: true - - name: Check for FIXME - if: always() - run: bash tools/checkFixme.sh - - name: Check for LOGGING - if: always() - run: bash tools/checkLogging.sh - - name: Check Pull Request Name - if: always() - run: bash tools/checkPullRequestTitle.sh ${{ github.event.pull_request.title }} \ No newline at end of file + - name: Checkout the source code + uses: actions/checkout@master + - name: Check DEBUG_MODE + if: always() + run: bash tools/checkDebug.sh + - name: Check TODO + if: always() + run: bash tools/checkTodo.sh + continue-on-error: true + - name: Check for FIXME + if: always() + run: bash tools/checkFixme.sh + - name: Check for LOGGING + if: always() + run: bash tools/checkLogging.sh + - name: Check Pull Request Name + if: always() + run: bash tools/checkPullRequestTitle.sh ${{ github.event.pull_request.title }} diff --git a/Compositions/1.Cav_Viking_Platoon/composition.sqe b/Compositions/1.Cav_Viking_Platoon/composition.sqe index 709855f71..74fe4b6e5 100644 --- a/Compositions/1.Cav_Viking_Platoon/composition.sqe +++ b/Compositions/1.Cav_Viking_Platoon/composition.sqe @@ -1,5 +1,5 @@ version=54; -center[]={795.86157,5,6021.6689}; +center[]={2207.0325,5,543.07465}; class items { items=7; @@ -22,7 +22,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9938354,0.0014390945,14.888672}; + position[]={-3.0131836,0.0014390945,14.973816}; angles[]={0,3.1415927,0}; }; side="West"; @@ -35,7 +35,7 @@ class items description="Platoon Leader@VIKING-6"; isPlayable=1; }; - id=175; + id=2; type="Cav_B_B_Scout_PlatoonLead_2_6_F"; class CustomAttributes { @@ -73,14 +73,14 @@ class items { dynamicSimulation=1; }; - id=174; + id=1; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-0.25140381,0.89242268,12.461914}; + position[]={-0.27075195,0.89242268,12.547058}; angles[]={-0,1.5526583,0}; }; side="Empty"; @@ -90,7 +90,7 @@ class items init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=176; + id=3; type="B_supplyCrate_F"; class CustomAttributes { @@ -141,7 +141,7 @@ class items dataType="Object"; class PositionInfo { - position[]={14.301331,0.89242268,2.15625}; + position[]={14.281982,0.89242268,2.241394}; }; side="Empty"; flags=4; @@ -150,7 +150,7 @@ class items init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=177; + id=4; type="B_supplyCrate_F"; class CustomAttributes { @@ -201,18 +201,18 @@ class items dataType="Comment"; class PositionInfo { - position[]={1.737854,0,6.9804688}; + position[]={1.7185059,0,7.0656128}; }; title="Stryker Scout Platoon (Tooltip)"; description="B/1-7's Stryker Scout Platoon is a hybrid fighting force that specializes in scout tasks and missions. They handle everything from Screening Operations, Guard Operations, Ambushes, Area Reconnaissance, and all other general infantry tasks. While the composition utilizes 6 Strykers for the Platoon, unless it's completely full, they'll mostly only use 4 or 5. Viking does NOT require a JTAC to call in CAS as they are trained and capable of doing so internally."; - id=178; + id=5; }; class Item4 { dataType="Object"; class PositionInfo { - position[]={-6.5316772,2.6142888,19.246094}; + position[]={-6.5510254,2.6142888,19.331238}; }; side="Empty"; flags=4; @@ -220,7 +220,7 @@ class items { dynamicSimulation=1; }; - id=179; + id=6; type="cav_dragoon_WD_V6"; class CustomAttributes { @@ -259,7 +259,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9938354,0.0014390945,16.388672}; + position[]={-3.0131836,0.0014390945,16.473816}; angles[]={0,3.1415927,0}; }; side="West"; @@ -271,7 +271,7 @@ class items description="Stryker Vehicle Commander@SIERRA-6"; isPlayable=1; }; - id=182; + id=9; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -322,7 +322,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9938354,0.0014390945,17.888672}; + position[]={-3.0131836,0.0014390945,17.973816}; angles[]={0,3.1415927,0}; }; side="West"; @@ -334,7 +334,7 @@ class items description="Stryker Driver@SIERRA-6"; isPlayable=1; }; - id=183; + id=10; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -384,13 +384,13 @@ class items class Attributes { }; - id=181; + id=8; }; }; - id=180; + id=7; }; }; - id=173; + id=0; }; class Item1 { @@ -411,7 +411,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.0061646,0.0014390945,14.888672}; + position[]={2.9868164,0.0014390945,14.973816}; angles[]={0,3.1415927,0}; }; side="West"; @@ -424,7 +424,7 @@ class items description="Platoon Sergeant@VIKING-5"; isPlayable=1; }; - id=186; + id=13; type="Cav_B_B_Scout_PlatoonLead_2_5_F"; class CustomAttributes { @@ -462,7 +462,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.0064087,0.0014390945,16.388672}; + position[]={2.9870605,0.0014390945,16.473816}; angles[]={0,3.1415927,0}; }; side="West"; @@ -474,7 +474,7 @@ class items description="Stryker Driver"; isPlayable=1; }; - id=187; + id=14; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -525,14 +525,14 @@ class items { dynamicSimulation=1; }; - id=185; + id=12; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={6.2319946,2.6142888,19.179688}; + position[]={6.2126465,2.6142888,19.264832}; angles[]={-0,0.005982683,0}; }; side="Empty"; @@ -541,7 +541,7 @@ class items { dynamicSimulation=1; }; - id=188; + id=15; type="cav_dragoon_WD_V5"; class CustomAttributes { @@ -562,7 +562,7 @@ class items }; }; }; - id=184; + id=11; }; class Item2 { @@ -583,7 +583,7 @@ class items dataType="Object"; class PositionInfo { - position[]={1.6521606,0.0014390945,15.817871}; + position[]={1.6328125,0.0014390945,15.903015}; angles[]={0,3.1415927,0}; }; side="West"; @@ -596,7 +596,7 @@ class items description="Platoon Medic@VIKING-7"; isPlayable=1; }; - id=191; + id=18; type="Cav_B_B_Scout_PlatoonMedic_2_7_F"; class CustomAttributes { @@ -647,10 +647,10 @@ class items { dynamicSimulation=1; }; - id=190; + id=17; }; }; - id=189; + id=16; }; class Item3 { @@ -671,7 +671,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744812,0.0014390945,-0.375}; + position[]={-11.76416,0.0014390945,-0.28985596}; }; side="West"; flags=6; @@ -682,7 +682,7 @@ class items description="Squad Leader@VIKING-1"; isPlayable=1; }; - id=194; + id=21; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -720,7 +720,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744568,0.0014390945,-1.375}; + position[]={-13.763916,0.0014390945,-1.289856}; }; side="West"; flags=5; @@ -732,7 +732,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=195; + id=22; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -770,7 +770,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744568,0.0014390945,-2.875}; + position[]={-13.763916,0.0014390945,-2.789856}; }; side="West"; flags=5; @@ -781,7 +781,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=196; + id=23; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -819,7 +819,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744568,0.0014390945,-4.375}; + position[]={-13.763916,0.0014390945,-4.289856}; }; side="West"; flags=4; @@ -830,7 +830,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=197; + id=24; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -868,7 +868,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744568,0.0014390945,-5.875}; + position[]={-13.763916,0.0014390945,-5.789856}; }; side="West"; flags=5; @@ -879,7 +879,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=198; + id=25; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -917,7 +917,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7445679,0.0014390945,-1.375}; + position[]={-9.763916,0.0014390945,-1.289856}; }; side="West"; flags=5; @@ -929,7 +929,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=199; + id=26; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -967,7 +967,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7445679,0.0014390945,-2.875}; + position[]={-9.763916,0.0014390945,-2.789856}; }; side="West"; flags=5; @@ -978,7 +978,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=200; + id=27; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -1016,7 +1016,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7445679,0.0014390945,-4.375}; + position[]={-9.763916,0.0014390945,-4.289856}; }; side="West"; flags=4; @@ -1027,7 +1027,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=201; + id=28; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1065,7 +1065,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7445679,0.0014390945,-5.875}; + position[]={-9.763916,0.0014390945,-5.789856}; }; side="West"; flags=5; @@ -1076,7 +1076,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=202; + id=29; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -1114,14 +1114,14 @@ class items { dynamicSimulation=1; }; - id=193; + id=20; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-8.6742554,0.89242268,1.0224609}; + position[]={-8.6936035,0.89242268,1.107605}; }; side="Empty"; flags=4; @@ -1130,7 +1130,7 @@ class items init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=203; + id=30; type="B_supplyCrate_F"; class CustomAttributes { @@ -1181,7 +1181,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.606873,2.6142888,7.6699219}; + position[]={-12.626221,2.6142888,7.7550659}; }; side="Empty"; flags=4; @@ -1189,7 +1189,7 @@ class items { dynamicSimulation=1; }; - id=204; + id=31; type="cav_dragoon_WD_V1"; class CustomAttributes { @@ -1228,7 +1228,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744812,0.0014390945,-2.375}; + position[]={-11.76416,0.0014390945,-2.289856}; }; side="West"; flags=7; @@ -1239,7 +1239,7 @@ class items description="Stryker Vehicle Commander@SIERRA-1"; isPlayable=1; }; - id=207; + id=34; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -1290,7 +1290,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744812,0.0014390945,-3.875}; + position[]={-11.76416,0.0014390945,-3.789856}; }; side="West"; flags=5; @@ -1301,7 +1301,7 @@ class items description="Stryker Driver@SIERRA-1"; isPlayable=1; }; - id=208; + id=35; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -1351,13 +1351,13 @@ class items class Attributes { }; - id=206; + id=33; }; }; - id=205; + id=32; }; }; - id=192; + id=19; }; class Item4 { @@ -1378,7 +1378,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1557007,0.0014390945,-4.7939453}; + position[]={-4.1750488,0.0014390945,-4.7088013}; }; side="West"; flags=6; @@ -1389,7 +1389,7 @@ class items description="Squad Leader@VIKING-2"; isPlayable=1; }; - id=211; + id=38; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -1427,7 +1427,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1557007,0.0014390945,-5.7939453}; + position[]={-6.1750488,0.0014390945,-5.7088013}; }; side="West"; flags=5; @@ -1439,7 +1439,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=212; + id=39; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -1477,7 +1477,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1557007,0.0014390945,-7.2939453}; + position[]={-6.1750488,0.0014390945,-7.2088013}; }; side="West"; flags=5; @@ -1488,7 +1488,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=213; + id=40; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -1526,7 +1526,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1557007,0.0014390945,-8.7939453}; + position[]={-6.1750488,0.0014390945,-8.7088013}; }; side="West"; flags=4; @@ -1537,7 +1537,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=214; + id=41; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1575,7 +1575,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1557007,0.0014390945,-10.293945}; + position[]={-6.1750488,0.0014390945,-10.208801}; }; side="West"; flags=5; @@ -1586,7 +1586,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=215; + id=42; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -1624,7 +1624,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1557007,0.0014390945,-5.7939453}; + position[]={-2.1750488,0.0014390945,-5.7088013}; }; side="West"; flags=5; @@ -1636,7 +1636,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=216; + id=43; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -1674,7 +1674,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1557007,0.0014390945,-7.2939453}; + position[]={-2.1750488,0.0014390945,-7.2088013}; }; side="West"; flags=5; @@ -1685,7 +1685,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=217; + id=44; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -1723,7 +1723,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1557007,0.0014390945,-8.7939453}; + position[]={-2.1750488,0.0014390945,-8.7088013}; }; side="West"; flags=4; @@ -1734,7 +1734,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=218; + id=45; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1772,7 +1772,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1557007,0.0014390945,-10.293945}; + position[]={-2.1750488,0.0014390945,-10.208801}; }; side="West"; flags=5; @@ -1783,7 +1783,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=219; + id=46; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -1821,14 +1821,14 @@ class items { dynamicSimulation=1; }; - id=210; + id=37; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-1.6576538,0.89242268,-2.4091797}; + position[]={-1.677002,0.89242268,-2.3240356}; }; side="Empty"; flags=4; @@ -1837,7 +1837,7 @@ class items init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=220; + id=47; type="B_supplyCrate_F"; class CustomAttributes { @@ -1888,7 +1888,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.8329468,2.6142888,3.5048828}; + position[]={-4.8522949,2.6142888,3.5900269}; }; side="Empty"; flags=4; @@ -1896,7 +1896,7 @@ class items { dynamicSimulation=1; }; - id=221; + id=48; type="cav_dragoon_WD_V2"; class CustomAttributes { @@ -1935,7 +1935,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1557007,0.0014390945,-6.7939453}; + position[]={-4.1750488,0.0014390945,-6.7088013}; }; side="West"; flags=7; @@ -1946,7 +1946,7 @@ class items description="Stryker Vehicle Commander@SIERRA-2"; isPlayable=1; }; - id=224; + id=51; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -1997,7 +1997,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1557007,0.0014390945,-8.2939453}; + position[]={-4.1750488,0.0014390945,-8.2088013}; }; side="West"; flags=5; @@ -2008,7 +2008,7 @@ class items description="Stryker Driver@SIERRA-2"; isPlayable=1; }; - id=225; + id=52; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -2058,13 +2058,13 @@ class items class Attributes { }; - id=223; + id=50; }; }; - id=222; + id=49; }; }; - id=209; + id=36; }; class Item5 { @@ -2085,7 +2085,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3442993,0.0014390945,-4.7939453}; + position[]={4.3249512,0.0014390945,-4.7088013}; }; side="West"; flags=6; @@ -2096,7 +2096,7 @@ class items description="Squad Leader@VIKING-3"; isPlayable=1; }; - id=228; + id=55; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -2134,7 +2134,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3442993,0.0014390945,-5.7939453}; + position[]={2.3249512,0.0014390945,-5.7088013}; }; side="West"; flags=5; @@ -2146,7 +2146,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=229; + id=56; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -2184,7 +2184,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3442993,0.0014390945,-7.2939453}; + position[]={2.3249512,0.0014390945,-7.2088013}; }; side="West"; flags=5; @@ -2195,7 +2195,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=230; + id=57; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -2233,7 +2233,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3442993,0.0014390945,-8.7939453}; + position[]={2.3249512,0.0014390945,-8.7088013}; }; side="West"; flags=4; @@ -2244,7 +2244,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=231; + id=58; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2282,7 +2282,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3442993,0.0014390945,-10.293945}; + position[]={2.3249512,0.0014390945,-10.208801}; }; side="West"; flags=5; @@ -2293,7 +2293,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=232; + id=59; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -2331,7 +2331,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3442993,0.0014390945,-5.7939453}; + position[]={6.3249512,0.0014390945,-5.7088013}; }; side="West"; flags=5; @@ -2343,7 +2343,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=233; + id=60; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -2381,7 +2381,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3442993,0.0014390945,-7.2939453}; + position[]={6.3249512,0.0014390945,-7.2088013}; }; side="West"; flags=5; @@ -2392,7 +2392,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=234; + id=61; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -2430,7 +2430,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3442993,0.0014390945,-8.7939453}; + position[]={6.3249512,0.0014390945,-8.7088013}; }; side="West"; flags=4; @@ -2441,7 +2441,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=235; + id=62; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2479,7 +2479,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3442993,0.0014390945,-10.293945}; + position[]={6.3249512,0.0014390945,-10.208801}; }; side="West"; flags=5; @@ -2490,7 +2490,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=236; + id=63; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -2528,14 +2528,14 @@ class items { dynamicSimulation=1; }; - id=227; + id=54; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={1.5327759,0.89242268,-2.2822266}; + position[]={1.5134277,0.89242268,-2.1970825}; }; side="Empty"; flags=4; @@ -2544,7 +2544,7 @@ class items init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=237; + id=64; type="B_supplyCrate_F"; class CustomAttributes { @@ -2595,7 +2595,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.1065063,2.6142888,3.7529297}; + position[]={4.0871582,2.6142888,3.8380737}; }; side="Empty"; flags=4; @@ -2603,7 +2603,7 @@ class items { dynamicSimulation=1; }; - id=238; + id=65; type="cav_dragoon_WD_V3"; class CustomAttributes { @@ -2642,7 +2642,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3442993,0.0014390945,-6.7939453}; + position[]={4.3249512,0.0014390945,-6.7088013}; }; side="West"; flags=7; @@ -2653,7 +2653,7 @@ class items description="Stryker Vehicle Commander@SIERRA-3"; isPlayable=1; }; - id=241; + id=68; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -2704,7 +2704,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3442993,0.0014390945,-8.2939453}; + position[]={4.3249512,0.0014390945,-8.2088013}; }; side="West"; flags=5; @@ -2715,7 +2715,7 @@ class items description="Stryker Driver@SIERRA-3"; isPlayable=1; }; - id=242; + id=69; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -2765,13 +2765,13 @@ class items class Attributes { }; - id=240; + id=67; }; }; - id=239; + id=66; }; }; - id=226; + id=53; }; class Item6 { @@ -2792,7 +2792,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.344299,0.0014390945,-0.29394531}; + position[]={11.27124,0.0014390945,-1.1074829}; }; side="West"; flags=6; @@ -2800,10 +2800,10 @@ class items { rank="SERGEANT"; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Squad Leader@VIKING-4"; + description="Weapons Squad Leader@VIKING-4"; isPlayable=1; }; - id=245; + id=72; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -2841,7 +2841,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3442993,0.0014390945,-1.2939453}; + position[]={9.3249512,0.0014390945,-1.2088013}; }; side="West"; flags=5; @@ -2853,7 +2853,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=246; + id=73; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -2891,7 +2891,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3442993,0.0014390945,-2.7939453}; + position[]={9.3244629,0.0014390945,-2.7086792}; }; side="West"; flags=5; @@ -2899,10 +2899,10 @@ class items { skill=0.40000001; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Alpha Automatic Rifleman"; + description="Alpha Weapons Gunner"; isPlayable=1; }; - id=247; + id=74; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -2940,7 +2940,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3442993,0.0014390945,-4.2939453}; + position[]={9.3244629,0.0014390945,-4.2086792}; }; side="West"; flags=4; @@ -2948,10 +2948,10 @@ class items { skill=0.40000001; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Alpha Grenadier"; + description="Alpha Weapons Assistant"; isPlayable=1; }; - id=248; + id=75; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2989,19 +2989,20 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3442993,0.0014390945,-5.7939453}; + position[]={13.324951,0.0014390945,-1.2088013}; }; side="West"; flags=5; class Attributes { - skill=0.40000001; + skill=0.44999999; + rank="CORPORAL"; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Alpha Rifleman"; + description="Bravo Team Leader"; isPlayable=1; }; - id=249; - type="Cav_B_B_Scout_Alpha_Rifleman_F"; + id=77; + type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { class Attribute0 @@ -3013,7 +3014,7 @@ class items class data { singleType="STRING"; - value="Male09ENG"; + value="Male10ENG"; }; }; }; @@ -3026,7 +3027,7 @@ class items class data { singleType="SCALAR"; - value=1.02; + value=1.01; }; }; }; @@ -3038,20 +3039,19 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344299,0.0014390945,-1.2939453}; + position[]={13.313232,0.0014390945,-2.7208862}; }; side="West"; flags=5; class Attributes { - skill=0.44999999; - rank="CORPORAL"; + skill=0.40000001; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Bravo Team Leader"; + description="Bravo Weapons Gunner"; isPlayable=1; }; - id=250; - type="Cav_B_B_Scout_Bravo_TeamLead_F"; + id=78; + type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { class Attribute0 @@ -3063,7 +3063,7 @@ class items class data { singleType="STRING"; - value="Male10ENG"; + value="Male05ENG"; }; }; }; @@ -3076,7 +3076,7 @@ class items class data { singleType="SCALAR"; - value=1.01; + value=1; }; }; }; @@ -3088,19 +3088,19 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344299,0.0014390945,-2.7939453}; + position[]={13.324463,0.0014390945,-4.2086792}; }; side="West"; - flags=5; + flags=4; class Attributes { skill=0.40000001; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Bravo Automatic Rifleman"; + description="Bravo Weapons Assistant"; isPlayable=1; }; - id=251; - type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; + id=79; + type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { class Attribute0 @@ -3112,7 +3112,7 @@ class items class data { singleType="STRING"; - value="Male05ENG"; + value="Male07ENG"; }; }; }; @@ -3125,7 +3125,7 @@ class items class data { singleType="SCALAR"; - value=1; + value=0.95999998; }; }; }; @@ -3137,19 +3137,20 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344299,0.0014390945,-4.2939453}; + position[]={11.37915,0.0014390945,-3.071167}; }; side="West"; - flags=4; + flags=5; class Attributes { - skill=0.40000001; + skill=0.44999999; + rank="CORPORAL"; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Bravo Grenadier"; + description="Charlie Team Leader"; isPlayable=1; }; - id=252; - type="Cav_B_B_Scout_Rifleman_F"; + id=90; + type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { class Attribute0 @@ -3161,7 +3162,7 @@ class items class data { singleType="STRING"; - value="Male07ENG"; + value="Male10ENG"; }; }; }; @@ -3174,7 +3175,7 @@ class items class data { singleType="SCALAR"; - value=0.95999998; + value=1.01; }; }; }; @@ -3186,7 +3187,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344299,0.0014390945,-5.7939453}; + position[]={11.293701,0.0014390945,-4.3530273}; }; side="West"; flags=5; @@ -3194,10 +3195,10 @@ class items { skill=0.40000001; init="this setGroupid [""VIKING-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""VIKING-4""];"; - description="Bravo Combat Lifesaver"; + description="Charlie Weapons Gunner"; isPlayable=1; }; - id=253; + id=92; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -3235,14 +3236,14 @@ class items { dynamicSimulation=1; }; - id=244; + id=71; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={11.029358,2.6142888,6.7314453}; + position[]={11.01001,2.6142888,6.8165894}; }; side="Empty"; flags=4; @@ -3250,7 +3251,7 @@ class items { dynamicSimulation=1; }; - id=254; + id=81; type="cav_dragoon_WD_V4"; class CustomAttributes { @@ -3289,7 +3290,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.438293,0.0014390945,-3.4980469}; + position[]={12.239258,0.0014390945,-5.8873291}; }; side="West"; flags=7; @@ -3300,7 +3301,7 @@ class items description="Stryker Vehicle Commander@SIERRA-4"; isPlayable=1; }; - id=257; + id=84; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -3351,7 +3352,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.438293,0.0014390945,-4.9980469}; + position[]={10.344971,0.0014390945,-5.8269653}; }; side="West"; flags=5; @@ -3362,7 +3363,7 @@ class items description="Stryker Driver@SIERRA-4"; isPlayable=1; }; - id=258; + id=85; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -3412,12 +3413,12 @@ class items class Attributes { }; - id=256; + id=83; }; }; - id=255; + id=82; }; }; - id=243; + id=70; }; }; diff --git a/Compositions/1.Cav_Viking_Platoon/header.sqe b/Compositions/1.Cav_Viking_Platoon/header.sqe index 806f3cfc9..96a180066 100644 --- a/Compositions/1.Cav_Viking_Platoon/header.sqe +++ b/Compositions/1.Cav_Viking_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="1.VIKING_Platoon_vDEVBUILD"; +name="1.VIKING_Platoon_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/2.Cav_Bandit_Platoon/header.sqe b/Compositions/2.Cav_Bandit_Platoon/header.sqe index ed0ddf6dc..d3182339c 100644 --- a/Compositions/2.Cav_Bandit_Platoon/header.sqe +++ b/Compositions/2.Cav_Bandit_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="2.BANDIT_Platoon_vDEVBUILD"; +name="2.BANDIT_Platoon_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/3.Cav_Misfit_Platoon/header.sqe b/Compositions/3.Cav_Misfit_Platoon/header.sqe index a2beca9d2..89edcae97 100644 --- a/Compositions/3.Cav_Misfit_Platoon/header.sqe +++ b/Compositions/3.Cav_Misfit_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="3.MISFIT_Platoon_vDEVBUILD"; +name="3.MISFIT_Platoon_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/4.SABRE_Platoon/composition.sqe b/Compositions/4.SABRE_Platoon/composition.sqe new file mode 100644 index 000000000..966a10764 --- /dev/null +++ b/Compositions/4.SABRE_Platoon/composition.sqe @@ -0,0 +1,1462 @@ +version=54; +center[]={4510.1631,5,256.25546}; +class items +{ + items=4; + class Item0 + { + dataType="Layer"; + name="1. SABRE-1"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.2612305,0.89242268,1.5154419}; + }; + side="Empty"; + flags=4; + class Attributes + { + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; + dynamicSimulation=1; + }; + id=1; + type="B_supplyCrate_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isRepairFacility"; + expression="if (_value != (if (isNumber (configOf _this >> ""ace_repair_canRepair"")) then {getNumber (configOf _this >> ""ace_repair_canRepair"")} else {(parseNumber (getRepairCargo _this > 0))})) then {_this setVariable ['ace_isRepairFacility', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="ammoBox"; + expression="[_this,_value] call bis_fnc_initAmmoBox;"; + class Value + { + class data + { + singleType="STRING"; + value="[[[[],[]],[[],[]],[[],[]],[[],[]]],false]"; + }; + }; + }; + class Attribute2 + { + property="ace_isMedicalFacility"; + expression="_this setVariable [""ace_medical_isMedicalFacility"", _value, true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Group"; + side="West"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.8808594,0.0014390945,-1.0614624}; + }; + side="West"; + flags=6; + class Attributes + { + rank="SERGEANT"; + init="this setGroupid [""SABRE-1""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-1""];"; + description="Tank Platoon Commander@SABRE-1"; + isPlayable=1; + }; + id=3; + type="Cav_B_B_Tank_Commander_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male10ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.8808594,0.0014390945,-2.5612183}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-1""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-1""];"; + description="Tank Gunner@SABRE-1"; + isPlayable=1; + }; + id=4; + type="Cav_B_B_Tank_Gunner_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.8896484,0.0014390945,-4.0758667}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-1""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-1""];"; + description="Tank Driver@SABRE-1"; + isPlayable=1; + }; + id=5; + type="Cav_B_B_Tank_Driver_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + }; + class Attributes + { + }; + id=2; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-7.6137695,2.2639475,1.4544067}; + }; + side="Empty"; + flags=4; + class Attributes + { + textures="Green"; + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + }; + id=6; + type="B_AFV_Wheeled_01_up_cannon_F"; + class CustomAttributes + { + class Attribute0 + { + property="VehicleCustomization"; + expression="if (local _this) then {([_this] + _value + [true]) call (uinamespace getvariable 'BIS_fnc_initVehicle')};"; + class Value + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="STRING"; + value="Green"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + singleType="ARRAY"; + class value + { + items=6; + class Item0 + { + class data + { + singleType="STRING"; + value="showCamonetHull"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item2 + { + class data + { + singleType="STRING"; + value="showCamonetTurret"; + }; + }; + class Item3 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item4 + { + class data + { + singleType="STRING"; + value="showSLATHull"; + }; + }; + class Item5 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + }; + nAttributes=1; + }; + }; + }; + id=0; + }; + class Item1 + { + dataType="Layer"; + name="2. SABRE-2"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={2.2675781,0.89242268,1.6746216}; + }; + side="Empty"; + flags=4; + class Attributes + { + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; + dynamicSimulation=1; + }; + id=8; + type="B_supplyCrate_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isRepairFacility"; + expression="if (_value != (if (isNumber (configOf _this >> ""ace_repair_canRepair"")) then {getNumber (configOf _this >> ""ace_repair_canRepair"")} else {(parseNumber (getRepairCargo _this > 0))})) then {_this setVariable ['ace_isRepairFacility', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="ammoBox"; + expression="[_this,_value] call bis_fnc_initAmmoBox;"; + class Value + { + class data + { + singleType="STRING"; + value="[[[[],[]],[[],[]],[[],[]],[[],[]]],false]"; + }; + }; + }; + class Attribute2 + { + property="ace_isMedicalFacility"; + expression="_this setVariable [""ace_medical_isMedicalFacility"", _value, true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Group"; + side="West"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.5390625,0.0014390945,-1.1204529}; + }; + side="West"; + flags=6; + class Attributes + { + rank="SERGEANT"; + init="this setGroupid [""SABRE-2""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-2""];"; + description="Tank Commander@SABRE-2"; + isPlayable=1; + }; + id=10; + type="Cav_B_B_Tank_Commander_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male10ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.5390625,0.0014390945,-2.6203003}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-2""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-2""];"; + description="Tank Gunner@SABRE-2"; + isPlayable=1; + }; + id=11; + type="Cav_B_B_Tank_Gunner_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.5097656,0.0014390945,-4.1090698}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-2""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-2""];"; + description="Tank Driver@SABRE-2"; + isPlayable=1; + }; + id=12; + type="Cav_B_B_Tank_Driver_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + }; + class Attributes + { + }; + id=9; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.2866211,2.2639475,9.3406372}; + }; + side="Empty"; + flags=4; + class Attributes + { + textures="Green"; + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + }; + id=13; + type="B_AFV_Wheeled_01_up_cannon_F"; + class CustomAttributes + { + class Attribute0 + { + property="VehicleCustomization"; + expression="if (local _this) then {([_this] + _value + [true]) call (uinamespace getvariable 'BIS_fnc_initVehicle')};"; + class Value + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="STRING"; + value="Green"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + singleType="ARRAY"; + class value + { + items=6; + class Item0 + { + class data + { + singleType="STRING"; + value="showCamonetHull"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item2 + { + class data + { + singleType="STRING"; + value="showCamonetTurret"; + }; + }; + class Item3 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item4 + { + class data + { + singleType="STRING"; + value="showSLATHull"; + }; + }; + class Item5 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + }; + nAttributes=1; + }; + }; + }; + id=7; + }; + class Item2 + { + dataType="Layer"; + name="3. SABRE-3"; + class Entities + { + items=2; + class Item0 + { + dataType="Group"; + side="West"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={1.4350586,0.0014390945,-1.0074615}; + }; + side="West"; + flags=6; + class Attributes + { + rank="SERGEANT"; + init="this setGroupid [""SABRE-3""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-3""];"; + description="Tank Platoon Sergeant@SABRE-3"; + isPlayable=1; + }; + id=16; + type="Cav_B_B_Tank_Commander_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male10ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={1.3574219,0.0014390945,-2.2369995}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-3""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-3""];"; + description="Tank Gunner@SABRE-3"; + isPlayable=1; + }; + id=17; + type="Cav_B_B_Tank_Gunner_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={1.3793945,0.0014390945,-3.5304565}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-3""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-3""];"; + description="Tank Driver@SABRE-3"; + isPlayable=1; + }; + id=18; + type="Cav_B_B_Tank_Gunner_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + }; + class Attributes + { + }; + id=15; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={2.3461914,2.2639475,9.289856}; + }; + side="Empty"; + flags=4; + class Attributes + { + textures="Green"; + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + }; + id=19; + type="B_AFV_Wheeled_01_up_cannon_F"; + class CustomAttributes + { + class Attribute0 + { + property="VehicleCustomization"; + expression="if (local _this) then {([_this] + _value + [true]) call (uinamespace getvariable 'BIS_fnc_initVehicle')};"; + class Value + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="STRING"; + value="Green"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + singleType="ARRAY"; + class value + { + items=6; + class Item0 + { + class data + { + singleType="STRING"; + value="showCamonetHull"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item2 + { + class data + { + singleType="STRING"; + value="showCamonetTurret"; + }; + }; + class Item3 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item4 + { + class data + { + singleType="STRING"; + value="showSLATHull"; + }; + }; + class Item5 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + }; + nAttributes=1; + }; + }; + }; + id=14; + }; + class Item3 + { + dataType="Layer"; + name="4. SABRE-4"; + class Entities + { + items=2; + class Item0 + { + dataType="Group"; + side="West"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={2.6987305,0.0014390945,-1.0094604}; + }; + side="West"; + flags=6; + class Attributes + { + rank="SERGEANT"; + init="this setGroupid [""SABRE-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-4""];"; + description="Tank Commander@SABRE-4"; + isPlayable=1; + }; + id=22; + type="Cav_B_B_Tank_Commander_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male10ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=3; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={2.7802734,0.0014390945,-2.4030151}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-4""];"; + description="Tank Gunner@SABRE-4"; + isPlayable=1; + }; + id=23; + type="Cav_B_B_Tank_Gunner_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={2.6982422,0.0014390945,-3.6071167}; + }; + side="West"; + flags=4; + class Attributes + { + skill=0.40000001; + init="this setGroupid [""SABRE-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""SABRE-4""];"; + description="Tank Driver@SABRE-4"; + isPlayable=1; + }; + id=24; + type="Cav_B_B_Tank_Driver_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if !(_value == ([0, 1] select (_this getUnitTrait 'engineer')) || {_value == -1}) then {_this setVariable ['ace_isEngineer', _value, true]}"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + singleType="STRING"; + value="Male08ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=3; + }; + }; + }; + class Attributes + { + }; + id=21; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={7.6982422,2.2639475,1.2380981}; + }; + side="Empty"; + flags=4; + class Attributes + { + textures="Green"; + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + }; + id=25; + type="B_AFV_Wheeled_01_up_cannon_F"; + class CustomAttributes + { + class Attribute0 + { + property="VehicleCustomization"; + expression="if (local _this) then {([_this] + _value + [true]) call (uinamespace getvariable 'BIS_fnc_initVehicle')};"; + class Value + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="ARRAY"; + class value + { + items=2; + class Item0 + { + class data + { + singleType="STRING"; + value="Green"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + singleType="ARRAY"; + class value + { + items=6; + class Item0 + { + class data + { + singleType="STRING"; + value="showCamonetHull"; + }; + }; + class Item1 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item2 + { + class data + { + singleType="STRING"; + value="showCamonetTurret"; + }; + }; + class Item3 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + class Item4 + { + class data + { + singleType="STRING"; + value="showSLATHull"; + }; + }; + class Item5 + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + }; + nAttributes=1; + }; + }; + }; + id=40; + }; +}; diff --git a/Compositions/4.SABRE_Platoon/header.sqe b/Compositions/4.SABRE_Platoon/header.sqe new file mode 100644 index 000000000..e36335edf --- /dev/null +++ b/Compositions/4.SABRE_Platoon/header.sqe @@ -0,0 +1,13 @@ +version=54; +name="4.SABRE_Platoon_DevBuild"; +author="=7Cav=CPL.Zaren.T"; +category="Cav_EdSubcat_Deploy_Platoon"; +requiredAddons[]= +{ + "A3_Weapons_F_Ammoboxes", + "ace_cargo", + "cav_bravo_characters", + "A3_Armor_F_Tank_AFV_Wheeled_01", + "tfar_external_intercom", + "ace_realisticnames" +}; diff --git a/Compositions/4.ATLAS_Platoon/composition.sqe b/Compositions/5.ATLAS_Platoon/composition.sqe similarity index 100% rename from Compositions/4.ATLAS_Platoon/composition.sqe rename to Compositions/5.ATLAS_Platoon/composition.sqe diff --git a/Compositions/4.ATLAS_Platoon/header.sqe b/Compositions/5.ATLAS_Platoon/header.sqe similarity index 91% rename from Compositions/4.ATLAS_Platoon/header.sqe rename to Compositions/5.ATLAS_Platoon/header.sqe index f4f723fc1..809d67436 100644 --- a/Compositions/4.ATLAS_Platoon/header.sqe +++ b/Compositions/5.ATLAS_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="4.ATLAS_Platoon_vDEVBUILD"; +name="5.ATLAS_Platoon_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/5.Cav_JTAC_Addon/composition.sqe b/Compositions/6.Cav_JTAC_Addon/composition.sqe similarity index 100% rename from Compositions/5.Cav_JTAC_Addon/composition.sqe rename to Compositions/6.Cav_JTAC_Addon/composition.sqe diff --git a/Compositions/5.Cav_JTAC_Addon/header.sqe b/Compositions/6.Cav_JTAC_Addon/header.sqe similarity index 88% rename from Compositions/5.Cav_JTAC_Addon/header.sqe rename to Compositions/6.Cav_JTAC_Addon/header.sqe index 2dde5779a..64de018a0 100644 --- a/Compositions/5.Cav_JTAC_Addon/header.sqe +++ b/Compositions/6.Cav_JTAC_Addon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="5.TACP_vDEVBUILD"; +name="6.TACP_DEVBUILD"; author="=7Cav=2LT.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/6.Cav_Rotary_Aviation/composition.sqe b/Compositions/7.Cav_Rotary_Aviation/composition.sqe similarity index 100% rename from Compositions/6.Cav_Rotary_Aviation/composition.sqe rename to Compositions/7.Cav_Rotary_Aviation/composition.sqe diff --git a/Compositions/6.Cav_Rotary_Aviation/header.sqe b/Compositions/7.Cav_Rotary_Aviation/header.sqe similarity index 73% rename from Compositions/6.Cav_Rotary_Aviation/header.sqe rename to Compositions/7.Cav_Rotary_Aviation/header.sqe index 638994320..7d05f9ee7 100644 --- a/Compositions/6.Cav_Rotary_Aviation/header.sqe +++ b/Compositions/7.Cav_Rotary_Aviation/header.sqe @@ -1,5 +1,5 @@ version=54; -name="6.Rotary_Aviation_vDEVBUILD"; +name="7.Rotary_Aviation_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]={}; diff --git a/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe b/Compositions/8.Cav_Fixed_Wing_Aviation/composition.sqe similarity index 100% rename from Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe rename to Compositions/8.Cav_Fixed_Wing_Aviation/composition.sqe diff --git a/Compositions/7.Cav_Fixed_Wing_Aviation/header.sqe b/Compositions/8.Cav_Fixed_Wing_Aviation/header.sqe similarity index 71% rename from Compositions/7.Cav_Fixed_Wing_Aviation/header.sqe rename to Compositions/8.Cav_Fixed_Wing_Aviation/header.sqe index 8196d377e..ff058edf6 100644 --- a/Compositions/7.Cav_Fixed_Wing_Aviation/header.sqe +++ b/Compositions/8.Cav_Fixed_Wing_Aviation/header.sqe @@ -1,5 +1,5 @@ version=54; -name="7.Fixed_Wing_Aviation_vDEVBUILD"; +name="8.Fixed_Wing_Aviation_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]={}; diff --git a/Compositions/8.Cav_S3_Mission_Controller/composition.sqe b/Compositions/9.Cav_S3_Mission_Controller/composition.sqe similarity index 100% rename from Compositions/8.Cav_S3_Mission_Controller/composition.sqe rename to Compositions/9.Cav_S3_Mission_Controller/composition.sqe diff --git a/Compositions/8.Cav_S3_Mission_Controller/header.sqe b/Compositions/9.Cav_S3_Mission_Controller/header.sqe similarity index 82% rename from Compositions/8.Cav_S3_Mission_Controller/header.sqe rename to Compositions/9.Cav_S3_Mission_Controller/header.sqe index b8e948219..4b95e4476 100644 --- a/Compositions/8.Cav_S3_Mission_Controller/header.sqe +++ b/Compositions/9.Cav_S3_Mission_Controller/header.sqe @@ -1,5 +1,5 @@ version=54; -name="8.S3_Mission_Controllers_vDEVBUILD"; +name="9.S3_Mission_Controllers_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/TacR_Public_Deployment/header.sqe b/Compositions/TacR_Public_Deployment/header.sqe index d457a9b21..b664251ba 100644 --- a/Compositions/TacR_Public_Deployment/header.sqe +++ b/Compositions/TacR_Public_Deployment/header.sqe @@ -1,5 +1,5 @@ version=54; -name="9.TacR_Public_vDEVBUILD"; +name="9.TacR_Public_DEVBUILD"; author="=7Cav=CPL.Zaren.T"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index 601233a2b..34ec8b890 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -2,7 +2,6 @@ class cScripts { class init { file = "cScripts\functions\init"; class init_aceArsenal {}; - class init_aceTagging {}; class init_aceItemReplace {}; class init_skillAdjustment {}; @@ -68,7 +67,7 @@ class cScripts { class player_getRole {}; class player_isCurator {}; - + class player_isMissionAdmin {}; class unit_setTeamColor {}; class unit_getName {}; @@ -245,6 +244,7 @@ class cScripts { // other class gear_getLoadoutRole {}; class gear_getLoadoutName {}; + class gear_getLoadoutDisplayName {}; }; class diag { file = "cScripts\functions\diag"; diff --git a/cScripts/cScripts_postInit.sqf b/cScripts/cScripts_postInit.sqf index e070e0b5e..030bc830a 100644 --- a/cScripts/cScripts_postInit.sqf +++ b/cScripts/cScripts_postInit.sqf @@ -29,7 +29,7 @@ if (EGVAR(Settings,showDiaryRecords)) then { call EFUNC(civ,init); onPlayerConnected { - [QEGVAR(log,player), [name player]] call CBA_fnc_serverEvent; + [QEGVAR(log,player), [getPlayerUID player, player]] call CBA_fnc_serverEvent; }; INFO("postInit", "Initialization completed."); diff --git a/cScripts/cScripts_preInit.sqf b/cScripts/cScripts_preInit.sqf index 670fbf9e0..24f1c47aa 100644 --- a/cScripts/cScripts_preInit.sqf +++ b/cScripts/cScripts_preInit.sqf @@ -9,7 +9,6 @@ INFO(if (is3DEN) then {"EDEN"} else {"preInit"}, "Initializing CBA Settings...") // Check installed moduels EGVAR(patches,usesACE) = isClass (configFile >> "CfgPatches" >> "ace_main"); EGVAR(patches,usesACEArsenal) = isClass (configFile >> "CfgPatches" >> "ace_arsenal"); -EGVAR(patches,usesACETagging) = isClass (configFile >> "CfgPatches" >> "ace_tagging"); EGVAR(patches,usesACEX) = isClass (configFile >> "CfgPatches" >> "acex_main"); EGVAR(patches,usesKat) = isClass (configFile >> "CfgPatches" >> "kat_main"); EGVAR(patches,usesACRE) = isClass (configFile >> "CfgPatches" >> "acre_sys_core"); @@ -46,10 +45,6 @@ EGVAR(PYLONS,DONE) = false; GVAR(PYLONS) = call EFUNC(init,pylons); EGVAR(PYLONS,DONE) = true; -if (EGVAR(Settings,allowCustomTagging)) then { - call EFUNC(init,aceTagging); -}; - call EFUNC(init,chatCommands); call EFUNC(init,zenModuels); diff --git a/cScripts/functions/gear/fn_gear_getLoadoutDisplayName.sqf b/cScripts/functions/gear/fn_gear_getLoadoutDisplayName.sqf new file mode 100644 index 000000000..b7f7d9ae7 --- /dev/null +++ b/cScripts/functions/gear/fn_gear_getLoadoutDisplayName.sqf @@ -0,0 +1,30 @@ +#include "..\script_component.hpp" +/* + * Author: CPL.Brostrom.A + * This function return a units current loadouts displayname. + * + * Arguments: + * 0: Unit + * + * Return Value: + * Loadout name + * + * Example: + * [player] call cScripts_fnc_gear_getLoadoutDisplayName; + * [cursorObject] call cScripts_fnc_gear_getLoadoutDisplayName; + * + */ + +params [["_unit", objNull, [objNull]]]; + +private _loadout = [_unit] call EFUNC(gear,getLoadoutName); + +private _missionConfig = missionConfigFile >> "CfgLoadouts" >> _loadout; +private _displayName = getText (_missionConfig >> "displayName"); + +if (_displayName == "") then { + private _config = configFile >> "CfgLoadouts" >> _loadout; + _displayName = getText (_config >> "displayName"); +}; + +_displayName \ No newline at end of file diff --git a/cScripts/functions/init/fn_init_aceTagging.sqf b/cScripts/functions/init/fn_init_aceTagging.sqf deleted file mode 100644 index cb036ad06..000000000 --- a/cScripts/functions/init/fn_init_aceTagging.sqf +++ /dev/null @@ -1,44 +0,0 @@ -#include "..\script_component.hpp"; -/* - * Author: CPL.Brostrom.A - * This adds custom spray tags to all units. - * - * Example: - * call cScripts_fnc_init_aceTagging - * - * Public: No - */ - -if (!isServer) exitWith {}; -if (!EGVAR(patches,usesACETagging)) exitWith {}; -if (!isNil{missionNamespace getVariable QEGVAR(mission,tagging)}) exitWith {SHOW_WARNING("init", "Tagging already applied.")}; - -[ "cScripts_tagging_cav_black", - "Cav Black", - "ACE_SpraypaintBlack", - ["z\cav\addons\textures\data\tagging\tag_cav_black_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_black_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_blue", - "Cav Blue", - "ACE_SpraypaintBlue", - ["z\cav\addons\textures\data\tagging\tag_cav_blue_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_blue_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_green", - "Cav Green", - "ACE_SpraypaintGreen", - ["z\cav\addons\textures\data\tagging\tag_cav_green_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_green_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -[ "cScripts_tagging_cav_red", - "Cav Red", - "ACE_SpraypaintRed", - ["z\cav\addons\textures\data\tagging\tag_cav_red_ca.paa"], - "z\cav\addons\textures\data\tagging\icon_action_red_ca.paa" -] call ace_tagging_fnc_addCustomTag; - -missionNamespace setVariable [QEGVAR(mission,tagging), true]; diff --git a/cScripts/functions/init/fn_init_chatCommands.sqf b/cScripts/functions/init/fn_init_chatCommands.sqf index 6e6a218bc..0de2c7c77 100644 --- a/cScripts/functions/init/fn_init_chatCommands.sqf +++ b/cScripts/functions/init/fn_init_chatCommands.sqf @@ -12,3 +12,14 @@ ["attendance", { [QGVAR(getAttendance)] call CBA_fnc_localEvent; }, "all"] call CBA_fnc_registerChatCommand; + +// Help and diagnostic commands +["cScripts", { + systemChat format["cScripts version: %1", VERSION]; +}, "all"] call CBA_fnc_registerChatCommand; + +["loadout", { + private _name = [player] call EFUNC(gear,getLoadoutDisplayName); + private _loadout = [player] call EFUNC(gear,getLoadoutName); + systemChat format["Your current loadout is: %1 [%2]",_name,_loadout]; +}, "all"] call CBA_fnc_registerChatCommand; diff --git a/cScripts/functions/init/fn_init_eventHandlers.sqf b/cScripts/functions/init/fn_init_eventHandlers.sqf index 889c5f7d3..3622a21e7 100644 --- a/cScripts/functions/init/fn_init_eventHandlers.sqf +++ b/cScripts/functions/init/fn_init_eventHandlers.sqf @@ -40,8 +40,30 @@ INFO("InitEventHandlers","Creating Server EventHandlers"); }] call CBA_fnc_addEventHandler; [QEGVAR(log,player), { - _this params ["_playerName"]; - private _playerLog = missionNamespace getVariable [QEGVAR(log,players), []]; - _playerLog pushBack _playerName; - missionNamespace setVariable [QEGVAR(log,players), _playerLog]; + params ["_guid","_player"]; + private _playerLog = GETMVAR(EGVAR(log,players),createHashMap); + INFO_3("PlayerLog","Connected %1 [%2] (GUID: %3)",name _player,typeOf _player,_guid); + + if (!isNil{_playerLog get _guid}) then { + INFO_1("PlayerLog","Updating Log Entry [%1]", isNil{_playerLog get _guid}); + private _data = _playerLog get _guid; + + private _connections = _data get "connections"; + _connections pushBack systemTimeUTC; + _data set ["connections", _connections]; + + _data set ["loadout", typeOf _player]; + + _playerLog set [_guid,_data]; + } else { + INFO_1("PlayerLog", "Creating Log Entry [%1]", isNil{_playerLog get _guid}); + private _entry = createHashMapFromArray [ + ['name', name _player], + ['loadout', typeOf _player], + ['connectTime', systemTimeUTC], + ['connections', [systemTimeUTC]] + ]; + _playerLog set [_guid,_entry]; + }; + SETMVAR(EGVAR(log,players),_playerLog); }] call CBA_fnc_addEventHandler; \ No newline at end of file diff --git a/cScripts/functions/init/fn_init_zenModuels.sqf b/cScripts/functions/init/fn_init_zenModuels.sqf index 2a8e61ade..1687bf572 100644 --- a/cScripts/functions/init/fn_init_zenModuels.sqf +++ b/cScripts/functions/init/fn_init_zenModuels.sqf @@ -102,7 +102,7 @@ if (EGVAR(Settings,enableRadios)) then { ["7Cav Mission", "Take attendence", { - private _playerLog = missionNamespace getVariable [QEGVAR(log,players), []]; + [QGVAR(getAttendance)] call CBA_fnc_localEvent; ["All attended players have been saved to your RPT log"] call zen_common_fnc_showMessage; }, "\a3\modules_f\data\portraitmodule_ca.paa" diff --git a/cScripts/functions/players/fn_player_isCurator.sqf b/cScripts/functions/players/fn_player_isCurator.sqf index 558331386..6edb4ef24 100644 --- a/cScripts/functions/players/fn_player_isCurator.sqf +++ b/cScripts/functions/players/fn_player_isCurator.sqf @@ -10,10 +10,12 @@ * true/False * * Example: - * call cScripts_fnc_unit_isCurator + * call cScripts_fnc_player_isCurator * */ +if (!isNull (getAssignedCuratorLogic player)) exitWith {true}; + private _curator = player getVariable [QEGVAR(Player,Unit), ""]; _curator = toLower _curator; if (_curator == "s3") exitWith {true}; diff --git a/cScripts/functions/players/fn_player_isMissionAdmin.sqf b/cScripts/functions/players/fn_player_isMissionAdmin.sqf new file mode 100644 index 000000000..523924839 --- /dev/null +++ b/cScripts/functions/players/fn_player_isMissionAdmin.sqf @@ -0,0 +1,21 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function return true if a player is curator or admin + * + * Arguments: + * None + * + * Return Value: + * True/False + * + * Example: + * call cScripts_fnc_player_isMissionAdmin + * + */ + +if (!isNull (getAssignedCuratorLogic player)) exitWith {true}; +if (call BIS_fnc_admin > 1) exitWith {true}; +if (!isMultiplayer || {is3DENMultiplayer}) exitWith {true}; + +false \ No newline at end of file diff --git a/cScripts/functions/systems/fn_allowLoadout.sqf b/cScripts/functions/systems/fn_allowLoadout.sqf index aa518c7d9..849e34263 100644 --- a/cScripts/functions/systems/fn_allowLoadout.sqf +++ b/cScripts/functions/systems/fn_allowLoadout.sqf @@ -33,6 +33,7 @@ if (EGVAR(Staging,showAllLoadouts)) exitWith {true}; // Check if player is Zeus or Debug if (call EFUNC(player,isCurator)) exitWith {true}; +if (call EFUNC(player,isMissionAdmin)) exitWith {true}; // Check if does not have any company private _playerCompany = call EFUNC(player,getCompany); diff --git a/cScripts/functions/systems/fn_getAttendance.sqf b/cScripts/functions/systems/fn_getAttendance.sqf index c89a4f7f5..3ab16a4d5 100644 --- a/cScripts/functions/systems/fn_getAttendance.sqf +++ b/cScripts/functions/systems/fn_getAttendance.sqf @@ -15,25 +15,59 @@ * */ -private _playerLog = missionNamespace getVariable [QEGVAR(log,players), []]; +private _loggedPlayer = GETMVAR(EGVAR(log,players),[]); -// Rpt -["=================================================== START", "Attendance"] call FUNC(info); -[format ["Attendance (Entries: %1)", count _playerLog], "Attendance"] call FUNC(info); +private _header = format["=== Attendance (Entries: %1) ===", count _loggedPlayer]; + +private _dateTime = systemTimeUTC apply { if (_x < 10) then { "0" + str _x } else { str _x } }; +private _formatDateTime = format["Date: %1-%2-%3 %4:%5z",_dateTime#0,_dateTime#1,_dateTime#2,_dateTime#3,_dateTime#4]; + +// Export +private _entries = [_header, endl, _formatDateTime, endl, endl]; { - _x params ["_name"]; - [_name, "Attendance", false, false] call FUNC(info); -} forEach _playerLog; - -["=================================================== END", "Attendence"] call FUNC(info); - -// Hint -[ - [], - ["All attended players have been"], - ["to your RPT log..."], - [""], - [""] -] call CBA_fnc_notify; - -_playerLog \ No newline at end of file + private _name = _y get "name"; + + private _loadout = _y get "loadout"; + private _missionConfig = missionConfigFile >> "CfgLoadouts" >> _loadout; + private _displayName = getText (_missionConfig >> "displayName"); + if (_displayName == "") then { + private _config = configFile >> "CfgLoadouts" >> _loadout; + _displayName = getText (_config >> "displayName"); + }; + + private _connectTime = (_y get "connectTime") apply { if (_x < 10) then { "0" + str _x } else { str _x } }; + private _formatConnectTime = format["%1-%2-%3 %4:%5z",_connectTime#0,_connectTime#1,_connectTime#2,_connectTime#3,_connectTime#4]; + + private _connections = count (_y get "connections"); + + _entries append [_name, " (", _displayName, ") ", _formatConnectTime, " (Connected ", str _connections, " time(s))", endl]; +} forEach _loggedPlayer; + +private _export = composeText _entries; +["Mission attendees", str _export] call zen_common_fnc_exportText; + + +// RPT +SHOW_INFO("Attendance",_header); +SHOW_INFO("Attendance",_formatDateTime); +{ + private _name = _y get "name"; + + private _loadout = _y get "loadout"; + private _missionConfig = missionConfigFile >> "CfgLoadouts" >> _loadout; + private _displayName = getText (_missionConfig >> "displayName"); + if (_displayName == "") then { + private _config = configFile >> "CfgLoadouts" >> _loadout; + _displayName = getText (_config >> "displayName"); + }; + + private _connectTime = (_y get "connectTime") apply { if (_x < 10) then { "0" + str _x } else { str _x } }; + private _formatConnectTime = format["%1-%2-%3 %4:%5z",_connectTime#0,_connectTime#1,_connectTime#2,_connectTime#3,_connectTime#4]; + + private _connections = count (_y get "connections"); + + private _output = [_name, " (", _displayName, " [", _loadout,"]) ", _formatConnectTime, " (Connected ", str _connections, " time(s))"] joinString ""; + SHOW_INFO("Attendance",_output); +} forEach _loggedPlayer; + +SHOW_INFO("Attendance","================================"); diff --git a/cScripts/initSettings.inc.sqf b/cScripts/initSettings.inc.sqf index 240531abe..351810734 100644 --- a/cScripts/initSettings.inc.sqf +++ b/cScripts/initSettings.inc.sqf @@ -86,16 +86,6 @@ private _cScriptSettings = "cScripts Mission Settings"; {}, true ] call CBA_fnc_addSetting; -[ // Tagging - QEGVAR(Settings,allowCustomTagging), - "CHECKBOX", - ["Custom Tagging","Allow players to spray custom taggs."], - [_cScriptSettings, "3; Player"], - true, - true, - {}, - true -] call CBA_fnc_addSetting; [ // Insignia QEGVAR(Settings,allowInsigniaApplication), "CHECKBOX", diff --git a/cScripts/script_macros.hpp b/cScripts/script_macros.hpp index 180011f71..728c1affb 100644 --- a/cScripts/script_macros.hpp +++ b/cScripts/script_macros.hpp @@ -176,165 +176,165 @@ /* VISABLE LOGS */ #define SHOW_LOG(COMPONANT,MESSAGE) LOG_SYS(COMPONANT,MESSAGE,false,false) -#define SHOW_LOG_1(COMPONANT,MESSAGE,ARG1) LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_LOG_1(COMPONANT,MESSAGE,ARG1) SHOW_LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_INFO(COMPONANT,MESSAGE) INFO_SYS(COMPONANT,MESSAGE,false,false) -#define SHOW_INFO_1(COMPONANT,MESSAGE,ARG1) INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_INFO_1(COMPONANT,MESSAGE,ARG1) SHOW_INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_WARNING(COMPONANT,MESSAGE) WARNING_SYS(COMPONANT,MESSAGE,false,false) -#define SHOW_WARNING_1(COMPONANT,MESSAGE,ARG1) WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) - -#define SHOW_ERROR(COMPONANT,MESSAGE) ERROR_SYS(COMPONANT,MESSAGE,true,false) -#define SHOW_ERROR_1(COMPONANT,MESSAGE,ARG1) ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_WARNING_1(COMPONANT,MESSAGE,ARG1) SHOW_WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) + +#define SHOW_ERROR(COMPONANT,MESSAGE) ERROR_SYS(COMPONANT,MESSAGE,false,false) +#define SHOW_ERROR_1(COMPONANT,MESSAGE,ARG1) SHOW_ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) /* SHOW CHAT LOG */ #define SHOW_CHAT_LOG(COMPONANT,MESSAGE) LOG_SYS(COMPONANT,MESSAGE,true,false) -#define SHOW_CHAT_LOG_1(COMPONANT,MESSAGE,ARG1) LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_LOG_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_INFO(COMPONANT,MESSAGE) INFO_SYS(COMPONANT,MESSAGE,true,false) -#define SHOW_CHAT_INFO_1(COMPONANT,MESSAGE,ARG1) INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_INFO_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_WARNING(COMPONANT,MESSAGE) WARNING_SYS(COMPONANT,MESSAGE,true,false) -#define SHOW_CHAT_WARNING_1(COMPONANT,MESSAGE,ARG1) WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_WARNING_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_ERROR(COMPONANT,MESSAGE) ERROR_SYS(COMPONANT,MESSAGE,true,false) -#define SHOW_CHAT_ERROR_1(COMPONANT,MESSAGE,ARG1) ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_ERROR_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) /* SHOW CHAT SERVER LOG*/ #define SHOW_CHAT_SERVER_LOG(COMPONANT,MESSAGE) LOG_SYS(COMPONANT,MESSAGE,true,true) -#define SHOW_CHAT_SERVER_LOG_1(COMPONANT,MESSAGE,ARG1) LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_SERVER_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_SERVER_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_SERVER_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_SERVER_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_SERVER_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_SERVER_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_SERVER_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_SERVER_LOG_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_SERVER_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_SERVER_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_SERVER_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_SERVER_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_SERVER_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_SERVER_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_SERVER_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_SERVER_LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_SERVER_INFO(COMPONANT,MESSAGE) INFO_SYS(COMPONANT,MESSAGE,true,true) -#define SHOW_CHAT_SERVER_INFO_1(COMPONANT,MESSAGE,ARG1) INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_SERVER_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_SERVER_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_SERVER_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_SERVER_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_SERVER_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_SERVER_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_SERVER_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_SERVER_INFO_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_SERVER_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_SERVER_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_SERVER_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_SERVER_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_SERVER_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_SERVER_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_SERVER_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_SERVER_INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_SERVER_WARNING(COMPONANT,MESSAGE) WARNING_SYS(COMPONANT,MESSAGE,true,true) -#define SHOW_CHAT_SERVER_WARNING_1(COMPONANT,MESSAGE,ARG1) WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_SERVER_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_SERVER_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_SERVER_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_SERVER_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_SERVER_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_SERVER_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_SERVER_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_SERVER_WARNING_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_SERVER_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_SERVER_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_SERVER_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_SERVER_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_SERVER_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_SERVER_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_SERVER_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_SERVER_WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_CHAT_SERVER_ERROR(COMPONANT,MESSAGE) ERROR_SYS(COMPONANT,MESSAGE,true,true) -#define SHOW_CHAT_SERVER_ERROR_1(COMPONANT,MESSAGE,ARG1) ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_CHAT_SERVER_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_CHAT_SERVER_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_CHAT_SERVER_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_CHAT_SERVER_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_CHAT_SERVER_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_CHAT_SERVER_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_CHAT_SERVER_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_CHAT_SERVER_ERROR_1(COMPONANT,MESSAGE,ARG1) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_CHAT_SERVER_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_CHAT_SERVER_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_CHAT_SERVER_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_CHAT_SERVER_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_CHAT_SERVER_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_CHAT_SERVER_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_CHAT_SERVER_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_CHAT_SERVER_ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) /* SHOW SERVER LOG*/ #define SHOW_SERVER_LOG(COMPONANT,MESSAGE) LOG_SYS(COMPONANT,MESSAGE,false,true) -#define SHOW_SERVER_LOG_1(COMPONANT,MESSAGE,ARG1) LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_SERVER_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_SERVER_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_SERVER_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_SERVER_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_SERVER_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_SERVER_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_SERVER_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_SERVER_LOG_1(COMPONANT,MESSAGE,ARG1) SHOW_SERVER_LOG(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_SERVER_LOG_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_SERVER_LOG(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_SERVER_LOG_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_SERVER_LOG(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_SERVER_LOG_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_SERVER_LOG(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_SERVER_LOG_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_SERVER_LOG(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_SERVER_LOG_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_SERVER_LOG(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_SERVER_LOG_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_SERVER_LOG(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_SERVER_LOG_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_SERVER_LOG(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_SERVER_INFO(COMPONANT,MESSAGE) INFO_SYS(COMPONANT,MESSAGE,false,true) -#define SHOW_SERVER_INFO_1(COMPONANT,MESSAGE,ARG1) INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_SERVER_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_SERVER_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_SERVER_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_SERVER_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_SERVER_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_SERVER_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_SERVER_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_SERVER_INFO_1(COMPONANT,MESSAGE,ARG1) SHOW_SERVER_INFO(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_SERVER_INFO_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_SERVER_INFO(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_SERVER_INFO_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_SERVER_INFO(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_SERVER_INFO_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_SERVER_INFO(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_SERVER_INFO_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_SERVER_INFO(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_SERVER_INFO_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_SERVER_INFO(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_SERVER_INFO_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_SERVER_INFO(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_SERVER_INFO_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_SERVER_INFO(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_SERVER_WARNING(COMPONANT,MESSAGE) WARNING_SYS(COMPONANT,MESSAGE,false,true) -#define SHOW_SERVER_WARNING_1(COMPONANT,MESSAGE,ARG1) WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_SERVER_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_SERVER_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_SERVER_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_SERVER_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_SERVER_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_SERVER_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_SERVER_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_SERVER_WARNING_1(COMPONANT,MESSAGE,ARG1) SHOW_SERVER_WARNING(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_SERVER_WARNING_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_SERVER_WARNING(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_SERVER_WARNING_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_SERVER_WARNING(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_SERVER_WARNING_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_SERVER_WARNING(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_SERVER_WARNING_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_SERVER_WARNING(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_SERVER_WARNING_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_SERVER_WARNING(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_SERVER_WARNING_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_SERVER_WARNING(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_SERVER_WARNING_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_SERVER_WARNING(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) #define SHOW_SERVER_ERROR(COMPONANT,MESSAGE) ERROR_SYS(COMPONANT,MESSAGE,false,true) -#define SHOW_SERVER_ERROR_1(COMPONANT,MESSAGE,ARG1) ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) -#define SHOW_SERVER_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) -#define SHOW_SERVER_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) -#define SHOW_SERVER_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) -#define SHOW_SERVER_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) -#define SHOW_SERVER_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) -#define SHOW_SERVER_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) -#define SHOW_SERVER_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8)) +#define SHOW_SERVER_ERROR_1(COMPONANT,MESSAGE,ARG1) SHOW_SERVER_ERROR(COMPONANT,FORMAT_1(MESSAGE,ARG1)) +#define SHOW_SERVER_ERROR_2(COMPONANT,MESSAGE,ARG1,ARG2) SHOW_SERVER_ERROR(COMPONANT,FORMAT_2(MESSAGE,ARG1,ARG2)) +#define SHOW_SERVER_ERROR_3(COMPONANT,MESSAGE,ARG1,ARG2,ARG3) SHOW_SERVER_ERROR(COMPONANT,FORMAT_3(MESSAGE,ARG1,ARG2,ARG3)) +#define SHOW_SERVER_ERROR_4(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4) SHOW_SERVER_ERROR(COMPONANT,FORMAT_4(MESSAGE,ARG1,ARG2,ARG3,ARG4)) +#define SHOW_SERVER_ERROR_5(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5) SHOW_SERVER_ERROR(COMPONANT,FORMAT_5(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5)) +#define SHOW_SERVER_ERROR_6(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6) SHOW_SERVER_ERROR(COMPONANT,FORMAT_6(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6)) +#define SHOW_SERVER_ERROR_7(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7) SHOW_SERVER_ERROR(COMPONANT,FORMAT_7(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7)) +#define SHOW_SERVER_ERROR_8(COMPONANT,MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8) SHOW_SERVER_ERROR(COMPONANT,FORMAT_8(MESSAGE,ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7,ARG8))