Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stretcher - Rework helistretcher to use ace interaction menu #571

Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
922436a
working rework
MiszczuZPolski Aug 1, 2024
7c8e15a
Merge branch 'heliStretcherRework' of https://github.com/MiszczuZPols…
MiszczuZPolski Aug 1, 2024
46a7856
spaces
MiszczuZPolski Aug 1, 2024
7827478
spaces v2 :kappa:
MiszczuZPolski Aug 1, 2024
dfccecc
move to separate addon, add more actions
MiszczuZPolski Aug 2, 2024
5799725
tabs
MiszczuZPolski Aug 2, 2024
16bb00e
remove iv stands
MiszczuZPolski Aug 2, 2024
0974583
remove settings from misc addon
MiszczuZPolski Aug 2, 2024
2eb4875
fix error with condition returning nil
MiszczuZPolski Aug 2, 2024
2a27219
fix inheritance issues
MiszczuZPolski Aug 2, 2024
85cefd3
add launcher type of stretcher
MiszczuZPolski Aug 3, 2024
a33a1be
remove unused stuff from stringtable
MiszczuZPolski Aug 3, 2024
6e3873e
headers and missing ACEFUNCs
MiszczuZPolski Aug 7, 2024
3b5e555
more review
MiszczuZPolski Aug 7, 2024
d9013a8
revert to old classname
MiszczuZPolski Aug 7, 2024
d4f82bb
Update XEH_postInit.sqf
MiszczuZPolski Aug 7, 2024
dafb642
apply review suggestions
MiszczuZPolski Aug 8, 2024
c82e5fb
Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into heliStretcherRework
MiszczuZPolski Aug 9, 2024
232dc68
fix actions inheritance
MiszczuZPolski Aug 9, 2024
60a988a
Update CfgVehicles.hpp
MiszczuZPolski Aug 9, 2024
f6451b5
move unpacking stretcher to kat equipment + translations
MiszczuZPolski Aug 9, 2024
f078df0
block dragging when stretcher is attached below heli
MiszczuZPolski Aug 10, 2024
a64771d
Merge branch 'dev-Tomcat' into heliStretcherRework
MiszczuZPolski Aug 29, 2024
ea27a22
Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into heliStretcherRework
MiszczuZPolski Aug 29, 2024
6776d2d
kat stretcher category
MiszczuZPolski Aug 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 1 addition & 127 deletions addons/misc/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
class CBA_Extended_EventHandlers_base;
class CfgVehicles {
#include "vehicle_stretcher.hpp"
class Land_IntravenStand_01_base_F;

class Land_IntravenStand_01_empty_F: Land_IntravenStand_01_base_F {
Expand Down Expand Up @@ -46,128 +44,6 @@ class CfgVehicles {
ace_dragging_carryDirection = 0;
};

class weapon_bag_base;
class kat_stretcherBag: weapon_bag_base {
class assembleInfo {
displayName = CSTRING(Stretcher_Display);
assembleTo = "kat_stretcher";
base = "";
primary = 1;
dissasembleTo[] = {};
};
author = "Katalam";
scope = 2;
editorCategory = "EdCat_Equipment";
editorSubcategory = "EdSubcat_DismantledWeapons";
displayName = CSTRING(StretcherPacked_Display);
mass = 60;
};

class Tank_F;
class kat_stretcher: Tank_F {
explosionEffect = "";
fuelExplosionPower = 0;
editorForceEmpty = 1;
editorSubcategory = "edSubcat_Storage";
crew = "C_man_1";
icon = "iconObject_1x1";
hasDriver = 0;
scope = 2;
side = 3;
faction = "CIV_F";
accuracy = 0.001;
camouflage = 10;
armor = 20;
displayName = CSTRING(Stretcher_Display);
model = QPATHTOF(models\stretcher\vurtual_stretcher.p3d);
simulation = "tankX";
crewVulnerable = 1;
explosionShielding = 0;
irTarget = 0;
allowTabLock = 0;
memoryPointsGetInCargo = "pos cargo";
memoryPointsGetInCargoDir = "pos cargo dir";
cargoAction[] = {"kat_stretcher"};
tf_isolatedAmount = 0;
numberPhysicalWheels = 0;
hideProxyInCombat = 0;
hideWeaponsCargo = "true";
ejectDeadCargo = 0;
class Damage {
tex[] = {};
mat[] = {
QPATHTOF(models\stretcher\seat.rvmat),
QPATHTOF(models\stretcher\seat_destruct.rvmat)
};
};
class animationSources {
class seat_hide {
source = "user";
initPhase = 0;
animPeriod = 0.1;
displayName = "Hide Stretcher";
forceAnimatePhase = 1;
forceAnimate[] = {"legs_hide", 1};
};
};
maximumLoad = 0;
transportMaxBackpacks = 0;
transportMaxMagazines = 64;
class TransportItems;
class Turrets {};
transportSoldier = 1;
ace_cargo_canLoad = 0;
ace_Cargo_hasCargo = 0;
ace_dragging_canDrag = 1;
ace_dragging_canCarry = 1;
ace_dragging_dragPosition[] = {0,1.7,0};
ace_dragging_carryPosition[] = {0, 1.7, 0};
ace_dragging_dragDirection = 0;
ace_Carry_carryDirection = 0;
ace_cookoff_probability = 0;
slingLoadCargoMemoryPoints[] = {"SlingLoadCargo1", "SlingLoadCargo2", "SlingLoadCargo3", "SlingLoadCargo4"};
destrType = "destructDefault";
fuelCapacity = 0;

//pretend static weapon since some mods don't like unconscious people in static weapons
nameSound = "veh_static_s";
vehicleClass = "static";
unitInfoType = "RscUnitInfoStatic";
crewExplosionProtection = 0;
class DestructionEffects {};
class VehicleTransport {
class Cargo {
parachuteClass = "B_Parachute_02_F";
parachuteHeightLimit = 5;
canBeTransported = 1;
dimensions[] = {"VTV_Cargo_Base", "VTV_Cargo_Corner"};
};
};
class EventHandlers {
init = QUOTE(_this call FUNC(stretcher));
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
};
};
class Land_Stretcher_01_base_F;
class Land_Stretcher_01_olive_F: Land_Stretcher_01_base_F {
ace_cargo_canLoad = 1;
ace_Cargo_hasCargo = 0;
ace_dragging_canDrag = 1;
ace_dragging_canCarry = 1;
ace_dragging_dragPosition[] = {0,1.7,0};
ace_dragging_carryPosition[] = {0, 1.7, 0};
ace_dragging_dragDirection = 0;
ace_Carry_carryDirection = 0;
ace_cookoff_probability = 0;
class VehicleTransport {
class Cargo {
parachuteClass = "B_Parachute_02_F";
parachuteHeightLimit = 5;
canBeTransported = 1;
dimensions[] = {"VTV_Cargo_Base", "VTV_Cargo_Corner"};
};
};
};
class Items_base_F;
class kat_Armband_Red_Cross_Object: Items_base_F {
scope = 2;
Expand Down Expand Up @@ -1370,8 +1246,6 @@ class CfgVehicles {

class Car_F: Car {};
class Quadbike_01_base_F: Car_F {
stretcherPos[] = {0,0.8,-0.56};
stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
class KAT_UnloadAndCarryPatient {
Expand Down Expand Up @@ -1470,4 +1344,4 @@ class CfgVehicles {
};
};
};
};
};
14 changes: 0 additions & 14 deletions addons/misc/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
class CfgWeapons
{
class ToolKit;
class ACE_ItemCore;
class ACE_NVGoggles_WP;
class CBA_MiscItem_ItemInfo;
class Attachable_Helistretcher: ToolKit {
author = "Battlekeeper";
picture = QPATHTOF(ui\stretcher.paa);
displayName = CSTRING(Helistretcher_Display);
descriptionShort = CSTRING(Helistretcher_Desc);
class ItemInfo {
mass = 20;
uniformModel = "\A3\Weapons_F\Items\Toolkit";
type = 620;
allowedSlots[] = {801,701,901};
scope = 0;
};
};

class kat_Armband_Red_Cross_Item: ACE_ItemCore {
author = "Miss Heda, vccv9040 (Swedish Forces Pack)";
Expand Down
6 changes: 0 additions & 6 deletions addons/misc/XEH_PREP.hpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
PREP(actionLowerBy10);
PREP(addActionRaise);
PREP(addIVbag);
PREP(addVehicleCarryLoadActions);
PREP(addVehicleUnloadCarryPatientActions);
PREP(attachStretcher);
PREP(BubbleWrap);
PREP(canCheckDogtag);
PREP(canStitchFullBody);
Expand All @@ -30,15 +27,12 @@ PREP(handleRespawn);
PREP(handleTourniquetEffects);
PREP(handleUnconscious);
PREP(hasStableVitals);
PREP(heliAddActionDeploy);
PREP(heliStretcherAttach);
PREP(incompatibilityWarning);
PREP(init);
PREP(removeIVbag);
PREP(setUnconscious);
PREP(slingArmband);
PREP(stopCarryingPrompt);
PREP(stretcher);
PREP(stringToArray);
PREP(surgicalKitProgressFullBody);
PREP(switchMagItems);
Expand Down
5 changes: 0 additions & 5 deletions addons/misc/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
[QGVAR(addIV_2), LLSTRING(Action_add_IV_Display_250), "", {[_target, _player, 250] call FUNC(addIVbag)}, {[_player, "ACE_salineIV_250"] call FUNC(conditionIVstand)}] call ACEFUNC(interact_menu,createAction)
] call ACEFUNC(interact_menu,addActionToClass);

["Attachable_Helistretcher", ["CONTAINER","CLOTHES"], [LLSTRING(helistretcher_attach)], [], "", [{true},{params ["_unit", "_container", "_item", "_slot", "_params"];_unit == vehicle _unit}], {
params ["_unit", "_container", "_item", "_slot", "_params"];
[_unit,_item] call kat_misc_fnc_heliStretcherAttach;
},true] call CBA_fnc_addItemContextMenuOption;

if (GVAR(incompatibilityWarning)) then {
call FUNC(incompatibilityWarning);
};
Expand Down
8 changes: 2 additions & 6 deletions addons/misc/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
requiredVersion = REQUIRED_VERSION;
units[] = {
"kat_stretcher",
"kat_stretcherBag"
};
weapons[] = { "Attachable_Helistretcher" };
units[] = {};
weapons[] = {};
magazines[] = { };
requiredAddons[] = {
"kat_main",
Expand All @@ -34,7 +31,6 @@ class CfgPatches {
};
};

#include "CfgMoves.hpp"
#include "CfgFunctions.hpp"
#include "CfgGlasses.hpp"
#include "CfgEventHandlers.hpp"
Expand Down
74 changes: 0 additions & 74 deletions addons/misc/functions/fnc_actionLowerBy10.sqf

This file was deleted.

77 changes: 0 additions & 77 deletions addons/misc/functions/fnc_addActionRaise.sqf

This file was deleted.

Loading
Loading