Skip to content

Respawn dev A #448

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.

Sign up for GitHub

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

Draft
NikkoJT wants to merge 81 commits into
base: dev
Choose a base branch
from
Draft

Respawn dev A #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
bb0bcd1
systems respawn support
NikkoJT Dec 31, 2024
5910cdc
systems respawn support 2
NikkoJT Dec 31, 2024
bdf397a
systems respawn support 3
NikkoJT Dec 31, 2024
d9fa576
medical respawn handling and prevent death
NikkoJT Dec 31, 2024
100cb77
Force respawn button
NikkoJT Jan 1, 2025
1ea534f
respawn tweaks
NikkoJT Jan 1, 2025
a903d41
Add missiondev safety
NikkoJT Jan 1, 2025
1166e34
add scripted EH calls
NikkoJT Jan 1, 2025
f2894c2
fix display stacking
NikkoJT Jan 1, 2025
fb11705
possible config fix
NikkoJT Jan 2, 2025
9001000
Move beacon to Player Actions briefing
NikkoJT Jan 3, 2025
b0e25ee
Update comments
NikkoJT Jan 3, 2025
a7f7514
fix missing function call
NikkoJT Jan 3, 2025
5d8c863
fix function name
NikkoJT Jan 3, 2025
e366de8
Close map after doing beacon action
NikkoJT Jan 3, 2025
101ac51
Cas Cap Support
costno Jan 3, 2025
468d94e
just in case
NikkoJT Jan 3, 2025
6faa31a
optimisations
NikkoJT Jan 3, 2025
7b29c2c
Disable menu respawn button
NikkoJT Jan 4, 2025
0bce17c
fix getvariable
NikkoJT Jan 4, 2025
331c107
fix function name
NikkoJT Jan 4, 2025
ffe9df6
fix faction check
NikkoJT Jan 4, 2025
7479b22
fix respawn EH
NikkoJT Jan 4, 2025
0e7611e
fix respawn EH again
NikkoJT Jan 4, 2025
b3857e3
Fix respawn type
NikkoJT Jan 4, 2025
0667175
bug fixes
NikkoJT Jan 4, 2025
86d1638
fix var space
NikkoJT Jan 4, 2025
04e9e3f
Update respawn display
NikkoJT Jan 5, 2025
ece0806
Respawn fixes
NikkoJT Jan 5, 2025
395425a
Option to using a vehicle as a deployment point
costno Jan 5, 2025
ba6978f
NO INDENTATION IN STRINGS
NikkoJT Jan 5, 2025
ff581d2
use params
NikkoJT Jan 5, 2025
846d5f8
comment
NikkoJT Jan 5, 2025
4a4be69
side name
NikkoJT Jan 5, 2025
db47820
increase display width
NikkoJT Jan 5, 2025
5415d88
Force unset captive after respawn
NikkoJT Jan 5, 2025
cfafceb
fix duplications/no actions on respawn
NikkoJT Jan 5, 2025
e5c34ba
Protect against bleed out
costno Jan 5, 2025
dad98a1
EODflags respawn handling
NikkoJT Jan 10, 2025
3e9b1d7
changed assignGear respawn handling
NikkoJT Jan 11, 2025
d1edee7
assignGear respawn class
NikkoJT Jan 11, 2025
623ac01
Damage around 0.89 - 0.95 could sometimes result in no bloodloss at all
costno Jan 11, 2025
10b2b50
Adjust language
NikkoJT Jan 11, 2025
e7793aa
Death from vehicle death
NikkoJT Jan 12, 2025
64abeab
Restore bleedout
NikkoJT Jan 12, 2025
9687e82
fix variable name
NikkoJT Jan 12, 2025
efd6856
fix spectator
NikkoJT Jan 12, 2025
9b9e4eb
reset bleed state on death
NikkoJT Jan 12, 2025
d58134b
adjust ejection threshold
NikkoJT Jan 12, 2025
ec405a2
fix setVariable
NikkoJT Jan 12, 2025
fcf1e2f
Increase heal action times
NikkoJT Jan 16, 2025
1ab03cf
Allow slow damage when unconscious
NikkoJT Jan 16, 2025
1664180
Add a cooldown to the beacon
NikkoJT Jan 17, 2025
3dc9995
Side-specific beacon colours
NikkoJT Jan 17, 2025
4230bf8
Switch to beacon-side deployment action
NikkoJT Jan 17, 2025
fcc5e8c
Add radius override
NikkoJT Jan 17, 2025
1666de4
Locality/timing
NikkoJT Jan 17, 2025
74c495e
Update briefing.
NikkoJT Jan 17, 2025
05c198b
Add transport pickup briefing mode
NikkoJT Jan 17, 2025
f708d2e
Update comment
NikkoJT Jan 17, 2025
759cb3d
fix briefing mode
NikkoJT Jan 17, 2025
62cc590
Remove dead units from channels
NikkoJT Jan 19, 2025
3135cea
Fix beacon cooldown
NikkoJT Jan 19, 2025
471e7c5
text fix
NikkoJT Jan 19, 2025
837e0c2
fix side check
NikkoJT Jan 19, 2025
f41a947
fix action radius
NikkoJT Jan 19, 2025
fc6782f
change animation method
NikkoJT Jan 19, 2025
69b99e4
excess bracket
costno Jan 19, 2025
7e5e2a6
fix bracket
NikkoJT Jan 19, 2025
a55a9ee
Change animation method again
NikkoJT Jan 19, 2025
0e6696d
Change interrupt too
NikkoJT Jan 19, 2025
9fe8cdc
Change spectator timing
NikkoJT Jan 19, 2025
21b1006
double plus safety
NikkoJT Jan 21, 2025
3dae9f8
var global change (fix for reconnects?)
NikkoJT Feb 2, 2025
664c494
Adjust debug logging
NikkoJT Feb 2, 2025
04d4960
fix closing respawn display on wakeup
NikkoJT Feb 9, 2025
16bc5b5
grammar
NikkoJT Feb 9, 2025
639ae05
Remove downed units from group while downed
costno Feb 24, 2025
3ded614
Revert "Remove downed units from group while downed"
NikkoJT Feb 24, 2025
7a10cb9
Respawn message is now local
NikkoJT Feb 24, 2025
173de13
Adjust display closer
NikkoJT Mar 23, 2025
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
62 changes: 41 additions & 21 deletions description.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,34 @@ minPlayerDistance = 500; // The minimum distance between corpse or wreck and nea

// FA3 - Respawn Settings

respawn = 1;
respawndelay = 3;
respawnOnStart = 0;
respawnTemplates[] = {"F_Spectator"};
respawn = 3;
respawnDialog = 0;
respawndelay = -1;
respawnOnStart = -1;
respawnButton = 0;
respawnTemplates[] = {"F_Respawn", "Tickets", "Counter"};

// ============================================================================================

// FA3 - Respawn templates
// DO NOT REMOVE OR DISABLE THIS BLOCK OF CODE


// ============================================================================================
class CfgRespawnTemplates
{
class F_Respawn
{
respawnDelay = 30;
onPlayerRespawn = "f_fnc_respawn";
onPlayerKilled = "f_fnc_respawnKilled";
};
class F_Spectator
{
onPlayerRespawn = "f_fnc_activateSpectator";
};
};


// ============================================================================================

Expand Down Expand Up @@ -269,6 +293,17 @@ class Params
default = 0;
};

// FA3 - Respawn Tickets Parameters
// Credits and documentation: https://github.com/folkarps/F3/wiki

class f_param_respawnTickets
{
title = "Respawn tickets per side";
values[] = {0,10,25,50,2000};
texts[] = {"None", "10", "25", "50", "2000"};
default = 10;
};

// ============================================================================================

// FA3 - Caching
Expand Down Expand Up @@ -357,23 +392,6 @@ class CfgDebriefing

};



// ============================================================================================

// FA3 - Respawn templates
// DO NOT REMOVE OR DISABLE THIS BLOCK OF CODE


// ============================================================================================
class CfgRespawnTemplates
{
class F_Spectator
{
onPlayerRespawn = "f\spect\fn_activateSpectator.sqf";
};
};

// ============================================================================================

// FA3 - Functions
Expand Down Expand Up @@ -420,3 +438,5 @@ class RscTitles
// UI elements for the medical system
#include "f\medical\f_FAMUI.hpp"
};

#include "f\respawn\f_respawnDisplays.hpp"
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_3IFB_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_3IFB_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_aaf_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_aaf_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_csatPacific_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_csat_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_csat_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_csat_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_ctrg_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_ctrg_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_fia_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_fia_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_gendarmerie.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,19 @@ switch (_typeofUnit) do
_unit addmagazines [_chemred,1];
_unit addmagazines [_chemyellow,1];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};
// CARGO: CAR - room for 10 weapons and 50 cargo items
case "v_car":
{
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_ldf_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_ldf_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_natoPacific_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_nato_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_natoWoodland_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_nato_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_nato_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_nato_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_npr_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_npr_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_spetsnaz_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 10];
_unit addmagazines [_grenade, 2];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_spetsnaz_v.sqf";
Expand Down
13 changes: 13 additions & 0 deletions f/assignGear/f_assignGear_syndikat_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,19 @@ switch (_typeofUnit) do
_unit addmagazines [_glriflemag_tr, 2];
_unit addmagazines [_glmag, 5];
};
// Respawn Loadout:
case "respawn":
{
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 1];
_unit addmagazines [_grenade, 2];
{
_unit setUnitTrait [_x#0, _x#1];
} forEach (_unit getVariable ["f_var_unitTraits",[]]);
};

// Include the loadouts for vehicles and crates:
#include "f_assignGear_syndikat_v.sqf";
Expand Down
Loading