Skip to content

Commit

Permalink
Merge pull request Apricot-ale#25 from moistbois/VAM-integration
Browse files Browse the repository at this point in the history
Integrate VAM
  • Loading branch information
carlmylo authored May 1, 2024
2 parents 7525c76 + bf71df4 commit 74e5083
Show file tree
Hide file tree
Showing 43 changed files with 2,003 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Missionbasefiles/kp_liberation.green_sea/description.ext
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ class CfgTaskDescriptions {
#include "KP\KPGUI\KPGUI_defines.hpp"
#include "KP\KPPLM\ui\KPPLM_dialog.hpp"

#include "VAM_GUI\defines.hpp"
#include "VAM_GUI\VAM_GUI_controls.hpp"
#include "VAM_GUI\VAM_GUI_classes.hpp"

class ACEX_Fortify_Presets {
class KPLIB_Fortify {
displayName = "KPLIB Fortify";
Expand All @@ -259,4 +263,4 @@ class ACEX_Fortify_Presets {
{"Land_BagFence_Round_F", 60}
};
};
};
};
7 changes: 5 additions & 2 deletions Missionbasefiles/kp_liberation.green_sea/init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ CHBN_adjustColor = [1.0,1.2,1.4];

// Temperature and humidity changes
[{
ace_weather_humidityShift = 0;
ace_weather_temperatureShift = 0;
ace_weather_humidityShift = -1;
ace_weather_temperatureShift = -1;
},[], 1] call CBA_fnc_waitAndExecute;

[] call compile preprocessFileLineNumbers "scripts\shared\init_shared.sqf";
Expand Down Expand Up @@ -147,3 +147,6 @@ if (isServer) then {
KPLIB_initServerDone = true;
publicVariable "KPLIB_initServerDone";
};

//VAM_GUI: For changing camo and vehicle appearence without Zeus:
[] execVM "VAM_GUI\VAM_GUI_init.sqf";
111 changes: 111 additions & 0 deletions Missionframework/VAM_GUI/VAM_GUI_classes.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
////////////////////////////////////////////////////////
// GUI EDITOR OUTPUT START (by UNITnormal, v1.063, #Vurive)
////////////////////////////////////////////////////////
//missionConfigFile >> "VAM_GUI"
class VAM_GUI
{
idd = 4900;
OnLoad = "[] spawn fnc_VAM_GUI_check;";
OnUnload = "[] spawn fnc_VAM_variable_cleaner;";
movingEnable = false;
controls[] = {"VAM_BG", "VAM_Title", "VAM_Text_Camo" ,"VAM_Text_Comp", "VAM_Confirm", "VAM_Reset", "VAM_List_Camo", "VAM_List_Comp", "VAM_Current_Vehicle_1", "VAM_Current_Vehicle_2"};
objects[] = {};

class VAM_BG: VAM_IGUIBack
{
idc = -1;
x = 0.329375 * safezoneW + safezoneX;
y = 0.318 * safezoneH + safezoneY;
w = 0.34125 * safezoneW;
h = 0.392 * safezoneH;
};
class VAM_Title: VAM_RscText
{
idc = -1;
text = $STR_VAM_MAIN_MENU_NAME;
x = 0.3425 * safezoneW + safezoneX;
y = 0.332 * safezoneH + safezoneY;
w = 0.144375 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_Text_Camo: VAM_RscText
{
idc = -1;
text = $STR_VAM_CAMOUFLAGE;
x = 0.3425 * safezoneW + safezoneX;
y = 0.374 * safezoneH + safezoneY;
w = 0.065625 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_Text_Comp: VAM_RscText
{
idc = -1;
text = $STR_VAM_COMPONENT;
x = 0.506562 * safezoneW + safezoneX;
y = 0.374 * safezoneH + safezoneY;
w = 0.065625 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_Confirm: VAM_RscButton
{
idc = 4930;
text = $STR_VAM_CONFIRM_MENU;
action = "closeDialog 0;";
x = 0.611562 * safezoneW + safezoneX;
y = 0.332 * safezoneH + safezoneY;
w = 0.0459375 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_List_Camo: VAM_RscListbox
{
idc = 4910;
style = LB_TEXTURES;
sizeEx = 0.035;
x = 0.3425 * safezoneW + safezoneX;
y = 0.416 * safezoneH + safezoneY;
w = 0.150937 * safezoneW;
h = 0.224 * safezoneH;
};
class VAM_List_Comp: VAM_RscListbox
{
idc = 4920;
style = LB_TEXTURES + LB_MULTI;
sizeEx = 0.035;
x = 0.506562 * safezoneW + safezoneX;
y = 0.416 * safezoneH + safezoneY;
w = 0.150937 * safezoneW;
h = 0.224 * safezoneH;
};
class VAM_Reset: VAM_RscButton
{
idc = 4940;
text = $STR_VAM_RESET_VEHICLE;
OnButtonClick = "[] spawn fnc_VAM_reset;";
x = 0.559062 * safezoneW + safezoneX;
y = 0.332 * safezoneH + safezoneY;
w = 0.0459375 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_Current_Vehicle_1: VAM_RscText
{
idc = -1;
text = $STR_VAM_CURRENT_VEHICLE;
x = 0.3425 * safezoneW + safezoneX;
y = 0.654 * safezoneH + safezoneY;
w = 0.091875 * safezoneW;
h = 0.028 * safezoneH;
};
class VAM_Current_Vehicle_2: VAM_RscText
{
idc = 4950;
sizeEx = 0.03;
text = "<Placeholder>";
x = 0.427812 * safezoneW + safezoneX;
y = 0.654 * safezoneH + safezoneY;
w = 0.124687 * safezoneW;
h = 0.028 * safezoneH;
};
};
////////////////////////////////////////////////////////
// GUI EDITOR OUTPUT END
////////////////////////////////////////////////////////
Loading

0 comments on commit 74e5083

Please sign in to comment.