Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tuntematonjr/Tun-Firesupport
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: tuntematonjr/Tun-Firesupport
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 8, 2021

  1. Create README.md

    tuntematonjr authored Feb 8, 2021
    Copy the full SHA
    997059d View commit details

Commits on Feb 22, 2021

  1. fixed infinite shooting

    tuntematonjr committed Feb 22, 2021
    Copy the full SHA
    06e2c85 View commit details
  2. Update README.md

    tuntematonjr authored Feb 22, 2021
    Copy the full SHA
    5f65e0e View commit details
  3. .

    tuntematonjr committed Feb 22, 2021
    Copy the full SHA
    888ec12 View commit details
  4. Create LICENSE

    tuntematonjr authored Feb 22, 2021
    Copy the full SHA
    dab07cb View commit details
  5. Merge pull request #6 from tuntematonjr/add-license-1

    Create LICENSE
    tuntematonjr authored Feb 22, 2021
    Copy the full SHA
    63b2383 View commit details
  6. Update README.md

    tuntematonjr authored Feb 22, 2021
    Copy the full SHA
    b7689ff View commit details
  7. Update README.md

    tuntematonjr authored Feb 22, 2021
    Copy the full SHA
    4489340 View commit details

Commits on Mar 4, 2021

  1. Update README.md

    tuntematonjr authored Mar 4, 2021
    Copy the full SHA
    6ed3094 View commit details

Commits on Mar 15, 2021

  1. Update README.md

    tuntematonjr authored Mar 15, 2021
    Copy the full SHA
    0cbf9f5 View commit details

Commits on Aug 7, 2021

  1. Update .gitignore

    tuntematonjr committed Aug 7, 2021
    Copy the full SHA
    64163ff View commit details
  2. Copy the full SHA
    40c609f View commit details
  3. Copy the full SHA
    218c3d5 View commit details

Commits on Aug 21, 2021

  1. TRP eta fix

    tuntematonjr committed Aug 21, 2021
    Copy the full SHA
    e753144 View commit details
  2. Copy the full SHA
    4a715e4 View commit details
  3. trp errors

    tuntematonjr committed Aug 21, 2021
    Copy the full SHA
    96c38fc View commit details
  4. Update README.md

    tuntematonjr authored Aug 21, 2021
    Copy the full SHA
    365067a View commit details

Commits on Jun 5, 2022

  1. 2.1.0

    tuntematonjr committed Jun 5, 2022
    Copy the full SHA
    883c28d View commit details

Commits on Aug 8, 2022

  1. header cleanup

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    57f5cdc View commit details
  2. Fixed locality

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    bbadf37 View commit details
  3. header cleanup

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    b661c77 View commit details
  4. Sort TRPs

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    5dfdaf3 View commit details
  5. small tweak

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    62f2469 View commit details
  6. Copy the full SHA
    69624aa View commit details
  7. updated params

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    87c9a45 View commit details
  8. updated param

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    afdddb9 View commit details
  9. fixed convert

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    8e3f441 View commit details
  10. Copy the full SHA
    d772f44 View commit details
  11. dialogPaths

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    9b602c0 View commit details
  12. updated to ace macros

    tuntematonjr committed Aug 8, 2022
    Copy the full SHA
    7afdf09 View commit details

Commits on Aug 12, 2022

  1. fixed wrong variable

    tuntematonjr committed Aug 12, 2022
    Copy the full SHA
    01984cd View commit details

Commits on Mar 19, 2023

  1. Fix cancelation

    tuntematonjr committed Mar 19, 2023
    Copy the full SHA
    34485e0 View commit details
  2. update

    tuntematonjr committed Mar 19, 2023
    Copy the full SHA
    47bd5dc View commit details

Commits on Aug 31, 2024

  1. things

    tuntematonjr committed Aug 31, 2024
    Copy the full SHA
    82cd977 View commit details
Showing with 3,089 additions and 3,143 deletions.
  1. +0 −2 .gitattributes
  2. +17 −0 .github/workflows/sqflint.yml
  3. +28 −9 .gitignore
  4. +42 −0 README.md
  5. +0 −1 addons/artycomputer_models/$PREFIX$
  6. BIN addons/artycomputer_models/data/tablet_black.paa
  7. BIN addons/artycomputer_models/data/tablet_buttons.paa
  8. BIN addons/artycomputer_models/data/tablet_green.paa
  9. BIN addons/artycomputer_models/data/tablet_icon.paa
  10. BIN addons/artycomputer_models/data/ui/tablet_ui.paa
  11. BIN addons/artycomputer_models/data/ui/tablet_ui.png
  12. +4 −3 addons/artycomputer_models/script_component.hpp
  13. BIN addons/artycomputer_models/tablet.p3d
  14. +0 −1 addons/firesupport/$PREFIX$
  15. +78 −0 addons/firesupport/Convert_dialog.hpp
  16. +41 −59 addons/firesupport/CustomControlClasses.hpp
  17. +319 −306 addons/firesupport/Firesupport_dialog.hpp
  18. +25 −3 addons/firesupport/Firesupport_idc.hpp
  19. +0 −1,804 addons/firesupport/GUIBaseClasses.hpp
  20. +713 −251 addons/firesupport/Stringtable.xml
  21. +5 −1 addons/firesupport/XEH_postInit.sqf
  22. +53 −7 addons/firesupport/XEH_preInit.sqf
  23. +23 −10 addons/firesupport/XEH_prep.sqf
  24. +14 −0 addons/firesupport/changelog.txt
  25. +24 −2 addons/firesupport/config.cpp
  26. +64 −61 addons/firesupport/functions/fnc_calculate_eta.sqf
  27. +0 −102 addons/firesupport/functions/fnc_check_min_values.sqf
  28. +31 −0 addons/firesupport/functions/fnc_check_time.sqf
  29. +102 −0 addons/firesupport/functions/fnc_check_values.sqf
  30. +57 −0 addons/firesupport/functions/fnc_convertData.sqf
  31. +20 −0 addons/firesupport/functions/fnc_createConvertDiaryEntry.sqf
  32. +27 −0 addons/firesupport/functions/fnc_createShell.sqf
  33. +32 −0 addons/firesupport/functions/fnc_createTRPmarkers.sqf
  34. +20 −0 addons/firesupport/functions/fnc_deleteTRPmarkers.sqf
  35. +20 −17 addons/firesupport/functions/fnc_dialog_close.sqf
  36. +92 −129 addons/firesupport/functions/fnc_fire.sqf
  37. +100 −0 addons/firesupport/functions/fnc_firemission_creepingBarrage.sqf
  38. +37 −0 addons/firesupport/functions/fnc_firemission_end.sqf
  39. +96 −0 addons/firesupport/functions/fnc_firemission_queue.sqf
  40. +97 −0 addons/firesupport/functions/fnc_firemission_standard.sqf
  41. +98 −0 addons/firesupport/functions/fnc_firemission_wall.sqf
  42. +114 −0 addons/firesupport/functions/fnc_firingPosMarker.sqf
  43. +72 −0 addons/firesupport/functions/fnc_getTargetPositon.sqf
  44. +0 −24 addons/firesupport/functions/fnc_get_realpos.sqf
  45. +0 −61 addons/firesupport/functions/fnc_gun_ammo_dialog.sqf
  46. +61 −21 addons/firesupport/functions/fnc_modify_bookmarks.sqf
  47. +32 −31 addons/firesupport/functions/fnc_module_gun.sqf
  48. +20 −0 addons/firesupport/functions/fnc_openConvertDialog.sqf
  49. +60 −48 addons/firesupport/functions/fnc_open_dialog.sqf
  50. +41 −0 addons/firesupport/functions/fnc_playSound.sqf
  51. +73 −0 addons/firesupport/functions/fnc_removeQueue.sqf
  52. +11 −13 addons/firesupport/functions/fnc_save_bookmarks.sqf
  53. +39 −25 addons/firesupport/functions/fnc_selected_bookmark.sqf
  54. +53 −0 addons/firesupport/functions/fnc_setValues.sqf
  55. +21 −0 addons/firesupport/functions/fnc_timeCheckbox.sqf
  56. +36 −19 addons/firesupport/functions/{fnc_toggle_bookmarks.sqf → fnc_toggle_mode.sqf}
  57. +66 −0 addons/firesupport/functions/fnc_trpCheckbox.sqf
  58. +51 −0 addons/firesupport/functions/fnc_updateStatus.sqf
  59. +0 −59 addons/firesupport/functions/fnc_update_ammo_count.sqf
  60. +21 −10 addons/firesupport/functions/fnc_update_bookmarks.sqf
  61. +0 −26 addons/firesupport/functions/fnc_update_everything.sqf
  62. +32 −17 addons/firesupport/functions/fnc_update_firemode.sqf
  63. +7 −6 addons/firesupport/script_component.hpp
  64. +0 −15 mod.cpp
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/sqflint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# main.yml
name: sqflint

on:
push:
branches:
- master
pull_request: ~

jobs:
test-sqflint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- uses: arma-actions/sqflint@v1.0
name: Validate with SQFLint
37 changes: 28 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
.bak
.bikey
.hemttout
.lnk
.md
.txt
.vscode/*
@*
*.biprivatekey
*.cache
*.pbo
*.bak
*.lnk
*.bikey
*.txt
*.md
*.p3d
*.paa
*.png
*.ogg
*.sqfc
*.swo
*.swp
*.zip
ArmaScriptCompiler.exe
CHANGELOG.md
extensions/vcproj32/*
extensions/vcproj64/*
hemtt
hemtt.exe
pohja.sqf
release/*
releases/*
sqfvm.exe
template/*
texHeaders.bin
Thumbs.db
tools/temp
42 changes: 42 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<a href="https://armafinland.fi/"><img src="https://i.gyazo.com/183657f73a8905792c0e1fbb5df33fe6.jpg" title="Armafinland" alt="Armafinland"></a>

# Tun Advanced Firesupport Interface
![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/tuntematonjr/Tun-Firesupport?include_prereleases&style=for-the-badge)![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/tuntematonjr/Tun-Firesupport?style=for-the-badge)
[Steam Workshop](https://steamcommunity.com/sharedfiles/filedetails/?id=2404759841)

Immersive way for players call firesupport and mission makkers to set up.

> Firesupport system with customizability for every mission needs.
> No more need to man your artillery units and you can put those men to the front line.
**Required Mods**

- [CBA](https://github.com/CBATeam/CBA_A3)

- [ACE3](https://github.com/acemod/ACE3)

---
## Fetures/Settings

[Video](https://youtu.be/9p8C84hZdGw)

**Firesupport system for player**
- Ability to use call different types of firemissions.
- Modify delay between shots
- Choose shell count and type
- Bookmark system, for planing ahed and saving your firemissions.
- [More in WIKI](https://github.com/tuntematonjr/Tun-Firesupport/wiki/Usage-ingame)

**Firesupport system for mission maker**
- Support every artillery magazines in game, including mods. (No MLRS, yet)
- Modify almost all values which affects the game
- Easy to use modules
- [More in WIKI](https://github.com/tuntematonjr/Tun-Firesupport/wiki/Mission-making)

## License

[![License](https://www.bohemia.net/assets/img/licenses/APL-SA.png)](https://www.bohemia.net/community/licenses/arma-public-license-share-alike)

- **[APL-SA](https://www.bohemia.net/community/licenses/arma-public-license-share-alike)**
- Arma Public License Share Alike (APL-SA)
- Can be re-uploaded to workshop if original content is credited and linked.
1 change: 0 additions & 1 deletion addons/artycomputer_models/$PREFIX$

This file was deleted.

Binary file added addons/artycomputer_models/data/tablet_black.paa
Binary file not shown.
Binary file not shown.
Binary file added addons/artycomputer_models/data/tablet_green.paa
Binary file not shown.
Binary file added addons/artycomputer_models/data/tablet_icon.paa
Binary file not shown.
Binary file added addons/artycomputer_models/data/ui/tablet_ui.paa
Binary file not shown.
Binary file added addons/artycomputer_models/data/ui/tablet_ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions addons/artycomputer_models/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#define COMPONENT artycomputer_models
#define PREFIX Tun

#define MAJOR 1
#define MAJOR 2
#define MINOR 0
#define PATCHLVL 0
#define BUILD 08022021
#define BUILD 07082021

#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
@@ -29,4 +29,5 @@
#define DEFAULT_VERSIONING_LEVEL 2

//AAR update macro
#define AAR_UPDATE(OBJ,VARNAME,VALUE) if ( !isnil "afi_aar2" ) then { [OBJ, VARNAME, VALUE] call afi_aar2_fnc_addcustomdata; };
#define AAR_UPDATE(OBJ,VARNAME,VALUE) if ( !isnil "afi_aar2" ) then { [OBJ, VARNAME, VALUE] call afi_aar2_fnc_addcustomdata; };
#define AAR_FOLLOWPROJECTILE(PROJECTILECLASSNAME,PROJECTILEOBJ) if ( !isnil "afi_aar2" ) then { [objNull, "", PROJECTILECLASSNAME, PROJECTILEOBJ, objNull] call afi_aar2_fnc_add_projectile; };
Binary file added addons/artycomputer_models/tablet.p3d
Binary file not shown.
1 change: 0 additions & 1 deletion addons/firesupport/$PREFIX$

This file was deleted.

78 changes: 78 additions & 0 deletions addons/firesupport/Convert_dialog.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
//Exported via Arma Dialog Creator (https://github.com/kayler-renslow/arma-dialog-creator)

#include "CustomControlClasses.hpp"
class tun_firesupport_convertDialog
{
idd = MAINCONVERT_IDD;
enableSimulation = false;
class ControlsBackground
{
class tun_firesupport_convert_background
{
type = 0;
idc = -1;
x = safeZoneX + safeZoneW * 0.3;
y = safeZoneY + safeZoneH * 0.175;
w = safeZoneW * 0.4;
h = safeZoneH * 0.575;
style = 0;
text = "";
colorBackground[] = GUI_BCG_MENU;
colorText[] = {0.2431,0.1725,0.3333,1};
font = "PuristaMedium";
sizeEx = (((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1);
};

};
class Controls
{
class tun_firesupport_convert_header : tun_firesupport_header_base
{
x = safeZoneX + safeZoneW * 0.325;
y = safeZoneY + safeZoneH * 0.2;
w = safeZoneW * 0.35;
h = safeZoneH * 0.05;
text = "$STR_tun_firesupport_converter_header";


};
class tun_firesupport_convert_swtEditBox : tun_default_editBox
{
idc = SWTDATA;
x = safeZoneX + safeZoneW * 0.325;
y = safeZoneY + safeZoneH * 0.52777778;
w = safeZoneW * 0.35;
h = safeZoneH * 0.19722223;
text = "$STR_tun_firesupport_converter_swtEditBoxText";
style = 16+2;
};
class tun_firesupport_convert_tunEditBox : tun_firesupport_convert_swtEditBox
{
idc = TUNDATA;
y = safeZoneY + safeZoneH * 0.26851852;
text = "$STR_tun_firesupport_converter_firesupportEditBoxText";

};
class tun_firesupport_swt_to_firesupport_button : RscButton
{
idc = -1;
x = safeZoneX + safeZoneW * 0.3625;
y = safeZoneY + safeZoneH * 0.47222223;
w = safeZoneW * 0.096875;
h = safeZoneH * 0.0462963;
text = "To Firesupport";
onButtonClick = "[false] call tun_firesupport_fnc_convertData";
colorBackground[] = GUI_BCG_COLOR;
colorBackgroundActive[] = GUI_BCG_COLOR;
};
class tun_firesupport_firesupport_to_swt_button : tun_firesupport_swt_to_firesupport_button
{
idc = -1;
x = safeZoneX + safeZoneW * 0.540625;
text = "To SWT";
onButtonClick = "[true] call tun_firesupport_fnc_convertData";
};

};

};
100 changes: 41 additions & 59 deletions addons/firesupport/CustomControlClasses.hpp
Original file line number Diff line number Diff line change
@@ -3,80 +3,62 @@
#define HG_CustomControlClasseshpp 1
//Create a header guard to prevent duplicate include.

#include "GUIBaseClasses.hpp"
#include "Firesupport_idc.hpp"
class RscListBox;
class RscButtonMenu;
class RscButton;
class RscMapControl;
class RscEdit;
class RscText;
class RscTree;
class RscCombo;
class RscXSliderH;
class RscCheckBox;
#include "\a3\ui_f\hpp\definecommoncolors.inc"
#include "\a3\ui_f\hpp\definecommoncolors.inc"

class tun_default_text
{
style = 2;
colorBackground[] =
{
"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.13])",
"(profilenamespace getvariable ['GUI_BCG_RGB_G',0.54])",
"(profilenamespace getvariable ['GUI_BCG_RGB_B',0.21])",
1
};
colorText[] = {1,1,1,1};
font = "PuristaMedium";
sizeEx = (((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1);
tooltipColorBox[] = {0.6,0.6,0.6,1};
tooltipColorText[] = {0.702,0.102,0.102,1};

};
class tun_firesupport_coordinate_preset
//#define GUI_BCG_COLOR { "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.13])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.54])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.21])", 1 }

class tun_default_editBox : RscEdit
{
style = 0+2;
text = "000";
autocomplete = "";
colorBackground[] = {0.2,0.2,0.2,1};
borderSize = 0.01;
colorBorder[] = GUI_BCG_COLOR;
colorBackground[] = {0.2,0.2,0.2,0.2};
colorDisabled[] = {0,0,0,0};
colorSelection[] = {0,0,0,0};
colorSelection[] = GUI_BCG_COLOR;
colorText[] = {1,1,1,1};
font = "PuristaMedium";
sizeEx = (((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1);
canModify = true;
maxChars = 5;
shadow = 0;
tooltipColorBox[] = {0.6,0,0,1};
tooltipColorShade[] = {0,0,0,0};
tooltipColorText[] = {1,1,1,1};

};
class tun_firesupport_default_combo

class tun_firesupport_coordinate_preset : tun_default_editBox
{
text = "000";
maxChars = 5;
w = safeZoneW * 0.0625;
h = safeZoneH * 0.025;
};

class tun_default_text : RscText
{
style = 16;
arrowEmpty = "\A3\ui_f\data\GUI\RscCommon\rsccombo\arrow_combo_ca.paa";
arrowFull = "\A3\ui_f\data\GUI\RscCommon\rsccombo\arrow_combo_active_ca.paa";
colorBackground[] = {0.4,0.4,0.4,1};
colorDisabled[] = {0,0,0,1};
colorSelect[] = {1,1,1,1};
colorSelectBackground[] = {0.8,0.502,0.2,1};
colorText[] = {1,1,1,1};
font = "PuristaSemiBold";
maxHistoryDelay = 0;
sizeEx = (((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1);
soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1.0};
soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1.0};
soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1.0};
wholeHeight = 0.3;
shadow = 0;
tooltipColorBox[] = {0.2,0.2,0.2,1};
tooltipColorShade[] = {0.2,0.2,0.2,1};
tooltipColorText[] = {1,1,1,1};
class ComboScrollBar
{

};

colorBackground[] = GUI_BCG_COLOR;
colorText[] = {1,1,1,1};
};

class tun_firesupport_button_base : RscButton
class tun_default_CheckBox : RscCheckBox
{

w = safeZoneW * 0.015;
h = safeZoneH * 0.025;
};

class tun_firesupport_listbox : RscListBox
class tun_firesupport_header_base : RscText
{

type = 0;
idc = -1;
style = 32+2;
shadow = 2;
colorBackground[] = GUI_BCG_COLOR;
colorText[] = GUI_TITLETEXT_COLOR;
};
#endif
Loading