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.

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

Replaced Freedom with Liberty #491

Merged
merged 9 commits into from
Sep 9, 2018
Merged

Replaced Freedom with Liberty #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0cd6904
Replaced KP flag texture
Wyqer Sep 2, 2018
156b159
Default Value for empty save and empty array calls in core init
Wyqer Sep 2, 2018
38a6ce3
Skip distance check when no FOB box wreck is provided
Wyqer Sep 2, 2018
9b4acd5
Todo for Sprint 6: Rework intro and cinematic
Wyqer Sep 2, 2018
161e1b2
Basic replacement of Freedom with Liberty
Wyqer Sep 2, 2018
e943611
Spawn start boats in the racks of the Liberty
Wyqer Sep 2, 2018
152309b
Weapon systems on destroyer. Controllable as UAV.
Wyqer Sep 3, 2018
07536f9
Own ship name applied to model
Wyqer Sep 9, 2018
ddf65e8
Merge branch 'v0.97S5' into v0.97S5-462
Wyqer Sep 9, 2018
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
542 changes: 325 additions & 217 deletions Missionbasefiles/kp_liberation.Altis/mission.sqm
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Missionframework/modules/00_init/fnc/fn_init_load.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
File: fn_init_load.sqf
Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
Date: 2018-03-29
Last Update: 2018-08-31
Last Update: 2018-09-02
License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html

Description:
Expand All @@ -23,7 +23,7 @@ if (KPLIB_param_wipeSave1 > 0 && KPLIB_param_wipeSave2 > 0) then {
};

// Load whole save data
KPLIB_save_data = profileNamespace getVariable KPLIB_save_key;
KPLIB_save_data = profileNamespace getVariable [KPLIB_save_key, nil];

if !(isNil "KPLIB_save_data") then {
if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- Saved data loading -----", diag_tickTime];};
Expand All @@ -36,7 +36,7 @@ if !(isNil "KPLIB_save_data") then {
if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- New campaign initializing -----", diag_tickTime];};

// Call the load functions, which will generate a fresh campaign
call KPLIB_fnc_init_loadData;
[] call KPLIB_fnc_init_loadData;

if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- New campaign initialized -----", diag_tickTime];};
};
Expand Down
8 changes: 4 additions & 4 deletions Missionframework/modules/01_core/fnc/fn_core_initModule.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ if(KPLIB_param_clearVehicleCargo > 0) then {

// Server section (dedicated and player hosted)
if (isServer) then {
call KPLIB_fnc_core_spawnStartFobBox;
call KPLIB_fnc_core_spawnStartVeh;
call KPLIB_fnc_core_spawnPotato;
call KPLIB_fnc_core_updateSectorMarkers;
[] call KPLIB_fnc_core_spawnStartFobBox;
[] call KPLIB_fnc_core_spawnStartVeh;
[] call KPLIB_fnc_core_spawnPotato;
[] call KPLIB_fnc_core_updateSectorMarkers;
execVM "modules\01_core\scripts\server\sectorMonitor.sqf";
execVM "modules\01_core\scripts\server\eventLoop.sqf";
};
Expand Down
6 changes: 6 additions & 0 deletions Missionframework/modules/01_core/fnc/fn_core_intro.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
NOTHING
*/

/*
--- TODO IN SPRINT 6 ---
Rework the intro and cinematic. Currently it doesn't work reliable. Mostly an endless loop of the cinematic.
Postponed, as it's not in the current scope of the sprint 5 tasks.

// Wait until mission is loaded
waitUntil {time > 0};

Expand Down Expand Up @@ -44,5 +49,6 @@ if (KPLIB_intro_tutorial == 0) then {
KPLIB_intro_running = false;
};

*/
// Finish the intro
KPLIB_intro_done = true;
4 changes: 2 additions & 2 deletions Missionframework/modules/01_core/fnc/fn_core_spawnStartFobBox.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
File: fn_core_spawnStartFobBox.sqf
Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
Date: 2018-05-09
Last Update: 2018-05-09
Last Update: 2018-09-02
License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html

Description:
Expand All @@ -14,7 +14,7 @@
0: OBJECT - OPTIONAL - Wreck of previous FOB box. Will be deleted.

Returns:
BOOL
NOTHING
*/
params [["_boxWreck", objNull]];

Expand Down
55 changes: 34 additions & 21 deletions Missionframework/modules/01_core/fnc/fn_core_spawnStartVeh.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
File: fn_core_spawnStartVeh.sqf
Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
Date: 2017-05-01
Last Update: 2018-05-03
Last Update: 2018-09-03
License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html

Description:
Spawning of the start vehicles like the little birds and rubber dinghies.
Spawning of the start vehicles like the little birds and rubber dinghies. Also spawns crew for the destroyer weapon systems.

Parameter(s):
NONE
Expand All @@ -17,24 +17,37 @@
BOOL
*/

{
// Set the right spawn point name depending on the current vehicle
private _spawnPointString = "";
switch (_forEachIndex) do {
case 0: {_spawnPointString = "KPLIB_eden_littlebird_";};
case 1: {_spawnPointString = "KPLIB_eden_boat_";};
};

// Go through the available markers for the little bird spawn. Adapts to the amount of placed markers.
for [{_i=0}, {!isNil (_spawnPointString + str _i)}, {_i = _i + 1}] do {
// Spawn point from mission.sqm
private _spawnPoint = missionNamespace getVariable (_spawnPointString + str _i);
// Current position for the spawn.
private _spawnPos = getPosATL _spawnPoint;

// Spawn the vehicle at the spawn position with a slight height offset.
[_x, [_spawnPos select 0, _spawnPos select 1, (_spawnPos select 2) + 0.1], getDir _spawnPoint] call KPLIB_fnc_common_spawnVehicle;
};
} forEach [KPLIB_preset_addHeli, KPLIB_preset_addBoat];
// Go through the available markers for the little bird spawn. Adapts to the amount of placed markers.
for [{_i=0}, {!isNil ("KPLIB_eden_littlebird_" + str _i)}, {_i = _i + 1}] do {
// Get the spawn point grasscutter
private _spawnPoint = missionNamespace getVariable ("KPLIB_eden_littlebird_" + str _i);

// Current position for the spawn
private _spawnPos = getPosATL _spawnPoint;

// Spawn the vehicle at the spawn position with a slight height offset.
[KPLIB_preset_addHeli, [_spawnPos select 0, _spawnPos select 1, (_spawnPos select 2) + 0.1], getDir _spawnPoint] call KPLIB_fnc_common_spawnVehicle;
};

// Spawn the boats and move them in the boat racks
for [{_i=0}, {!isNil ("KPLIB_eden_boat_" + str _i)}, {_i = _i + 1}] do {
// Get the current rack
_spawnPoint = missionNamespace getVariable ("KPLIB_eden_boat_" + str _i);

// Spawn the boat
private _boat = [KPLIB_preset_addBoat, KPLIB_zeroPos, getDir _spawnPoint, true] call KPLIB_fnc_common_spawnVehicle;

// Move the boat to the rack
_spawnPoint setVehicleCargo _boat;
};

// Spawn crew for the destroyer weapons, so they're available through the UAV terminal
for [{_i=0}, {!isNil ("KPLIB_eden_destroyer_w" + str _i)}, {_i = _i + 1}] do {
// Get the current weapon
private _weapon = missionNamespace getVariable ("KPLIB_eden_destroyer_w" + str _i);

// Create crew
createVehicleCrew _weapon;
};
Wyqer marked this conversation as resolved.
Show resolved Hide resolved

true
Binary file added Missionframework/res/destroyer_decal_ca.paa
View file
Open in desktop
Binary file not shown.
Binary file added Missionframework/res/flag_kp_co.paa
View file
Open in desktop
Binary file not shown.
Binary file removed Missionframework/res/kpflag.jpg
View file
Open in desktop
Binary file not shown.