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

Crashsite mission #126

Merged
merged 118 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
33cab94
fn_effects
wersal454 Mar 3, 2024
3cd67ed
sonic(not the hedgehog) sound
wersal454 Mar 3, 2024
7989e32
Update CfgFunctions.hpp
wersal454 Mar 3, 2024
abc701b
Update CfgSounds.hpp
wersal454 Mar 3, 2024
e4a9772
crashsite mission
wersal454 Mar 3, 2024
f42d4f7
fix fn_effects
wersal454 Mar 3, 2024
89862ac
Update A3A/addons/core/functions/Missions/fn_effects
wersal454 Mar 3, 2024
d0738b1
mission request.sqf
wersal454 Mar 3, 2024
3ccbdcf
Update fn_LOG_Crashsite.sqf
wersal454 Mar 4, 2024
2abae59
Update fn_effects
wersal454 Mar 4, 2024
326e146
temporary update
wersal454 Mar 23, 2024
45d5858
temporary update
wersal454 Mar 23, 2024
46350ac
temporary update for testing
wersal454 Mar 23, 2024
17ed044
Merge branch 'unstable' into crashsite-mission
wersal454 Mar 23, 2024
65bbb2a
oups
wersal454 Mar 23, 2024
ed8d275
moving fn_effects
wersal454 Mar 23, 2024
b3d0ab5
Update CfgFunctions.hpp
wersal454 Mar 23, 2024
7570455
Update CfgFunctions.hpp
wersal454 Mar 23, 2024
45b1c64
Delete A3A/addons/core/functions/Missions/fn_effects
wersal454 Mar 23, 2024
d17de22
Update Stringtable.xml
wersal454 Mar 23, 2024
258d3b0
Update Stringtable.xml
wersal454 Mar 23, 2024
d623f15
Update fn_LOG_Helicrash.sqf
wersal454 Mar 25, 2024
598e3a1
Update fn_LOG_Crashsite.sqf
wersal454 Mar 25, 2024
850dd78
Split crashsite mission into 2
wersal454 Mar 25, 2024
637826b
Update CfgFunctions.hpp
wersal454 Mar 25, 2024
c3b6b2b
Update fn_effects
wersal454 Mar 25, 2024
73f8c0b
Update fn_LOG_Crashsite.sqf
wersal454 Mar 25, 2024
f1d5482
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 25, 2024
74fd518
typo
wersal454 Mar 25, 2024
6b11493
Update fn_LOG_Crashsite.sqf
wersal454 Mar 26, 2024
c1193e4
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 26, 2024
6fd8241
Update Vanilla_AI_NATO_Arid.sqf
wersal454 Mar 26, 2024
a27bef7
Update fn_compileMissionAssets.sqf
wersal454 Mar 26, 2024
6317e6f
Update fn_initVarServer.sqf
wersal454 Mar 26, 2024
c8f5d15
Update Vanilla_AI_CSAT_Arid.sqf
wersal454 Mar 26, 2024
39ee7f0
Update Vanilla_AI_CSAT_Arid.sqf
wersal454 Mar 26, 2024
2e48f42
Update Vanilla.hpp
wersal454 Mar 26, 2024
460d6bf
Update Vanilla.hpp
wersal454 Mar 26, 2024
4dc7f3f
Update fn_LOG_Crashsite.sqf
wersal454 Mar 26, 2024
8ace587
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 26, 2024
90e6888
Update fn_effects
wersal454 Mar 26, 2024
dc75e06
typo
wersal454 Mar 26, 2024
73c8493
Update fn_LOG_Crashsite.sqf
wersal454 Mar 26, 2024
23dfafb
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 26, 2024
84aa5f1
Update Vanilla.hpp
wersal454 Mar 26, 2024
f8f35f6
Update fn_LOG_Crashsite.sqf
wersal454 Mar 27, 2024
a4734f0
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 27, 2024
6a281fa
Update Vanilla.hpp
wersal454 Mar 28, 2024
90be474
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 28, 2024
d581c2f
Update fn_LOG_Crashsite.sqf
wersal454 Mar 28, 2024
40741e2
Update fn_LOG_Crashsite.sqf
wersal454 Mar 28, 2024
5ea4715
Update fn_missionRequest.sqf
wersal454 Mar 28, 2024
66002aa
Update fn_LOG_Crashsite.sqf
wersal454 Mar 28, 2024
61bca84
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Mar 28, 2024
1081b87
Update A3A/addons/core/functions/Missions/fn_missionRequest.sqf
wersal454 Apr 4, 2024
7495e24
typo fix
wersal454 Apr 4, 2024
881bfc0
Update CfgFunctions.hpp
wersal454 Apr 4, 2024
229d190
Rename fn_effects to effect_crashingEffects.sqf
wersal454 Apr 4, 2024
09a29f6
Update fn_LOG_Crashsite.sqf
wersal454 Apr 4, 2024
f5a1ca9
Update fn_LOG_Crashsite.sqf
wersal454 Apr 4, 2024
a98e7c2
Rename effect_crashingEffects.sqf to fn_effect_crashingEffects.sqf
wersal454 Apr 4, 2024
074b530
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 4, 2024
75efd12
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 4, 2024
e4639df
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 4, 2024
69a4c32
Update fn_LOG_Crashsite.sqf
wersal454 Apr 4, 2024
ca9e41f
Update fn_LOG_Crashsite.sqf
wersal454 Apr 5, 2024
a3c1fd2
Update fn_LOG_Crashsite.sqf
wersal454 Apr 5, 2024
d023d40
Merge branch 'unstable' into crashsite-mission
wersal454 Apr 5, 2024
67646e4
Update fn_effect_crashingEffects.sqf
wersal454 Apr 7, 2024
bd0b171
stringtable fix
wersal454 Apr 7, 2024
d378221
checks for trader
wersal454 Apr 7, 2024
e77f310
Update Stringtable.xml
wersal454 Apr 7, 2024
c67566f
Update A3A/addons/scrt/Stringtable.xml
wersal454 Apr 7, 2024
f433e5b
Update A3A/addons/scrt/Stringtable.xml
wersal454 Apr 7, 2024
b499052
fixes
wersal454 Apr 7, 2024
97ae018
fixes + trader checks
wersal454 Apr 7, 2024
7946ae4
reveal enemy markers reward
wersal454 Apr 7, 2024
c256bd8
reveal enemy markers reward
wersal454 Apr 7, 2024
535ddbc
Update fn_LOG_Crashsite.sqf
wersal454 Apr 7, 2024
5a17a25
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 7, 2024
9127999
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 7, 2024
97a29d9
Update fn_LOG_Crashsite.sqf
wersal454 Apr 7, 2024
d1283bb
Update fn_LOG_Crashsite.sqf
wersal454 Apr 7, 2024
3a4f25d
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 7, 2024
179b215
typofix
wersal454 Apr 8, 2024
a1409b8
Update fn_effect_crashingEffects.sqf
wersal454 Apr 8, 2024
aa17d15
Update fn_effect_crashingEffects.sqf
wersal454 Apr 8, 2024
530dee1
Rename sonic.ogg to Sonic.ogg
wersal454 Apr 8, 2024
8841573
Add files via upload
wersal454 Apr 8, 2024
a579f9f
Update A3A/addons/scrt/Stringtable.xml
wersal454 Apr 10, 2024
87b1425
Trader task id update
wersal454 Apr 10, 2024
9b89d6f
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 12, 2024
7d0c012
Update fn_LOG_Crashsite.sqf
wersal454 Apr 12, 2024
737eca7
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 12, 2024
9bc60b1
Update fn_LOG_Crashsite.sqf
wersal454 Apr 12, 2024
00fbd95
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 12, 2024
d3b5eb1
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 12, 2024
e74f036
Update fn_LOG_Crashsite.sqf
wersal454 Apr 12, 2024
19184cc
reward update
wersal454 Apr 13, 2024
a87d248
Merge branch 'unstable' into crashsite-mission
wersal454 Apr 13, 2024
96fbbda
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 13, 2024
8df95fe
Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
wersal454 Apr 13, 2024
0986ee1
Update fn_LOG_Crashsite.sqf
wersal454 Apr 13, 2024
f4d5a6c
Update fn_LOG_Crashsite_Satelite.sqf
wersal454 Apr 13, 2024
a2c4b86
Merge branch 'unstable' into crashsite-mission
wersal454 Apr 14, 2024
68e7231
Merge branch 'unstable' into crashsite-mission
wersal454 Apr 22, 2024
a421ba0
Merge branch 'unstable' into crashsite-mission
wersal454 Apr 29, 2024
f1d9fdb
Merge branch 'unstable' into crashsite-mission
wersal454 May 4, 2024
717c102
Merge branch 'unstable' into crashsite-mission
wersal454 May 7, 2024
7af402a
Merge branch 'unstable' into crashsite-mission
wersal454 May 8, 2024
f7584a5
Merge branch 'unstable' into crashsite-mission
wersal454 May 9, 2024
59096cd
Merge branch 'unstable' into crashsite-mission
wersal454 May 9, 2024
222619c
bugfixes
wersal454 May 9, 2024
ae7ed5c
Merge branch 'unstable' into crashsite-mission
wersal454 May 9, 2024
4324b41
cleanup + small bugfixes
SilenceIsFatto May 10, 2024
5db1b7d
quick fix
wersal454 May 10, 2024
fa0712e
add box from satellite mission
SilenceIsFatto May 10, 2024
a0a3ed1
Merge branch 'crashsite-mission' of https://github.com/wersal454/A3-A…
SilenceIsFatto May 10, 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
4 changes: 3 additions & 1 deletion A3A/addons/core/CfgFunctions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,9 @@ class CfgFunctions
class SUPP_Supplies {};
class LOG_Salvage {};
class LOG_Airdrop {};
class LOG_Helicrash {};
class LOG_Crashsite {};
class LOG_Crashsite_Satellite{};
class LOG_Helicrash {};;
class missionRequest {};
class REP_Antenna {};
class RES_Prisoners {};
Expand Down
9 changes: 8 additions & 1 deletion A3A/addons/core/CfgSounds.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ class CfgSounds
titles[] = { 1, "" };
};

class Sonic
{
name = "Sonic";
sound[] = {EQPATHTOFOLDER(core,Sounds\Misc\Sonic.ogg), 1, 1, 100};
titles[] = { 1, "" };
};

class A3AP_UiSuccess
{
name = "A3AP_UiSuccess";
Expand Down Expand Up @@ -358,4 +365,4 @@ class CfgSounds
sound[] = {EQPATHTOFOLDER(core,Sounds\Civilian\Fear\fear6.ogg), 0.6, 1, 30};
titles[] = {};
};
};
};
Binary file added A3A/addons/core/Sounds/Misc/Sonic.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
// Vehicles //
//////////////////////////

["vehiclesDropPod", ["Land_Pod_Heli_Transport_04_covered_F"]] call _fnc_saveToTemplate;

["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate; //Don't touch or you die a sad and lonely death!
["surrenderCrate", "Box_East_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
["equipmentBox", "Box_CSAT_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
Expand Down Expand Up @@ -205,6 +207,7 @@ if (_hasWs) then {
]] call _fnc_saveToTemplate;

["variants", [
["Land_Pod_Heli_Transport_04_covered_F", ["Black",1]],
["O_SFIA_Truck_02_aa_lxWS", ["Opfor",1]],
["O_SFIA_ZU23_lxWS", ["hex",1, "SFIA",0]],
["I_Truck_02_MRL_F", ["Opfor", 1, "Indep",0]],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
// Vehicles //
//////////////////////////

["vehiclesDropPod", ["SpaceshipCapsule_01_F"]] call _fnc_saveToTemplate;

["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate; //Don't touch or you die a sad and lonely death!
["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ if (_hasGM) then {
};

if (_hasCSLA) then {
_backpacks append ["US85_bpSf","FIA_bpPack US85_bpAlice"];
_backpacks append ["US85_bpSf","FIA_bpPack", "US85_bpAlice"];
};

_loadoutData set ["offuniforms", _offuniforms]; ///check offuniforms later.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ if (_hasGM) then {
};

if (_hasCSLA) then {
_backpacks append ["US85_bpSf","FIA_bpPack US85_bpAlice"];
_backpacks append ["US85_bpSf","FIA_bpPack" ,"US85_bpAlice"];
};

_loadoutData set ["offuniforms", _offuniforms]; ///check offuniforms later
Expand Down
Loading