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

Minor Update 240711 #26

Merged
merged 8 commits into from
Jul 11, 2024
Merged

Minor Update 240711 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1901721
hotfix revert manage_one_patrol
Apricot-ale Jul 7, 2024
3dd3625
round range for taskgarrison
Apricot-ale Jul 7, 2024
315ec3c
tweak civinfo
Apricot-ale Jul 7, 2024
6e4756a
Revert "hotfix revert manage_one_patrol"
Apricot-ale Jul 8, 2024
84e1d69
Fix signs set wrong way
Apricot-ale Jul 11, 2024
25aafb4
Update Localization Japanese
Apricot-ale Jul 11, 2024
4fdf265
Update manage_one_patrol.sqf
Apricot-ale Jul 11, 2024
a4f5d73
partial revert civinfo improve
Apricot-ale Jul 11, 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
3 changes: 2 additions & 1 deletion Missionframework/scripts/server/ai/building_defence_ai.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ params ["_unit", ["_sector", ""]];
private _sectorPos = (markerPos _sector);
//Check LAMBS_Danger.fsm is running. if running, skip KPLIB built in troop garrisoning and call lambs wp garrisoning.
if (isClass (configfile >> "CfgPatches" >> "lambs_wp")) then {
[_unit, _sectorPos, (KPLIB_range_sectorCapture / 3 * 2), [], true, false, -1, false] call lambs_wp_fnc_taskGarrison;
_taskRange = round (KPLIB_range_sectorCapture / 3 * 2);
[_unit, _sectorPos, _taskRange, [], true, false, -1, false] call lambs_wp_fnc_taskGarrison;

private _move_is_disabled = true;
private _hostiles = 0;
Expand Down
8 changes: 4 additions & 4 deletions Missionframework/scripts/server/civinformant/civinfo_loop.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ while {true} do {

waitUntil {!alive _informant || _timeover};

if (!alive _informant && !KPLIB_civinfo_under_control) exitWith {
if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_loop is reset by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};
[3] remoteExec ["civinfo_notifications"];
};
if (_timeover) exitWith {
if (isNull objectParent _informant) then {deleteVehicle _informant} else {(objectParent _informant) deleteVehicleCrew _informant};
if (KPLIB_civinfo_debug > 0) then {["Informant despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};
[2] remoteExec ["civinfo_notifications"];
};
if (!alive _informant && !KPLIB_civinfo_under_control) exitWith {
if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_loop is reset by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};
[3] remoteExec ["civinfo_notifications"];
};
} else {
if (KPLIB_civinfo_debug > 0) then {["Informant spawn chance missed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};
};
Expand Down
10 changes: 8 additions & 2 deletions Missionframework/scripts/server/patrols/manage_one_patrol.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ while { KPLIB_endgame == 0 } do {

_grp = grpNull;

private _minSpawnRange = round (KPLIB_range_pointActivation * 0.5);
private _maxSpawnRange = round (KPLIB_range_pointActivation * 4);

_spawn_marker = "";
while { _spawn_marker == "" } do {
_spawn_marker = [(KPLIB_range_pointActivation*1),(KPLIB_range_pointActivation*4),true] call KPLIB_fnc_getOpforSpawnPoint;
_spawn_marker = [_minSpawnRange,_maxSpawnRange,true] call KPLIB_fnc_getOpforSpawnPoint;
if ( _spawn_marker == "" ) then {
sleep (150 + (random 150));
};
Expand All @@ -30,9 +33,12 @@ while { KPLIB_endgame == 0 } do {

if (_is_infantry) then {

private _minRange = round (KPLIB_range_pointActivation * 0.75);
private _maxRange = round (KPLIB_range_pointActivation * 3);

private _sectors_spawn = [];
{
if ((_sector_spawn_pos distance (markerpos _x) < KPLIB_range_pointActivation) && (_sector_spawn_pos distance (markerpos _x) > (KPLIB_range_pointActivation*3))) then {
if ((_sector_spawn_pos distance (markerpos _x) > _minRange) && (_sector_spawn_pos distance (markerpos _x) < _maxRange)) then {
_sectors_spawn pushBack _x;
};
} foreach (KPLIB_sectors_all - (KPLIB_sectors_player + KPLIB_sectors_active));
Expand Down
14 changes: 7 additions & 7 deletions Missionframework/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Portuguese>Libere a região da opressão inimiga! Estratégia será essencial! Boa sorte infantaria.</Portuguese>
<Korean>적의 수중에서 이 지역을 탈환하자! 전략이 승리의 관건이다! 병사들이여, 행운을 빈다.</Korean>
<Czech>Osvoboďte oblast od nepřátelského útisku. Strategie je klíčová! Hodně štěstí vojáci.</Czech>
<Japanese>この地域を敵軍の圧制から解放しろ!戦略がカギとなるぞ!兵士よ、幸運を祈る。</Japanese>
<Japanese>この地域を敵軍の圧制から解放しろ! 戦略がカギとなるぞ! 兵士よ、幸運を祈る。</Japanese>
</Key>
<Key ID="STR_MISSION_PRESENT">
<Original>[GREUH] and the Killah Potatoes present</Original>
Expand Down Expand Up @@ -1050,7 +1050,7 @@
<Portuguese>Próximo de</Portuguese>
<Korean>부근</Korean>
<Czech>Blízko</Czech>
<Japanese>近くに</Japanese>
<Japanese>直近に</Japanese>
</Key>
<Key ID="STR_RECYCLE">
<Original>-- RECYCLE</Original>
Expand Down Expand Up @@ -1125,7 +1125,7 @@
<Portuguese>Cancelar</Portuguese>
<Korean>취소</Korean>
<Czech>Zrušit</Czech>
<Japanese>やめる</Japanese>
<Japanese>取り消し</Japanese>
</Key>
<Key ID="STR_NOTIFICATION_SECTORCAPTURED_TITLE">
<Original>SECTOR CAPTURED</Original>
Expand Down Expand Up @@ -3075,7 +3075,7 @@
<Portuguese>-- MOBILIZAR FOB --</Portuguese>
<Korean>-- 전초기지 재배치 --</Korean>
<Czech>-- ZABALIT FOB --</Czech>
<Japanese>-- FOBを収納する --</Japanese>
<Japanese>-- FOBを撤収する --</Japanese>
</Key>
<Key ID="STR_FOB_REPACKAGE_TITLE">
<Original>REPACKAGE FOB</Original>
Expand All @@ -3090,7 +3090,7 @@
<Portuguese>MOBILIZAR FOB</Portuguese>
<Korean>전초기지 재배치</Korean>
<Czech>ZABALIT FOB</Czech>
<Japanese>FOBを収納します</Japanese>
<Japanese>FOBを撤収します</Japanese>
</Key>
<Key ID="STR_FOB_REPACKAGE_CONFIRM">
<Original>Are you sure you want to repackage this FOB?</Original>
Expand All @@ -3105,7 +3105,7 @@
<Portuguese>Você tem certeza que quer mobilizar esta FOB?</Portuguese>
<Korean>이 전초기지를 재배치하시겠습니까?</Korean>
<Czech>Jste si jistý že chcete zabalit FOB?</Czech>
<Japanese>FOBを収納しますか?</Japanese>
<Japanese>FOBを撤収しますか?</Japanese>
</Key>
<Key ID="STR_HALO_PARAM">
<Original>HALO Jump</Original>
Expand Down Expand Up @@ -7552,7 +7552,7 @@
<Italian>FOB ripiegata.\nL'autorizzazione eventualmente creata verrà ripristinata al riavvio del server.</Italian>
<Korean>FOB가 재포장됩니다. 이 상태로 서버 재시작시 이 부근의 건물이나 장비들은 사라집니다.</Korean>
<Czech>FOB je zabalen.\Po restartování serveru bude pravděpodobně vytvořené oprávnění zrušeno.</Czech>
<Japanese>FOBを収納しました。\n設置可能範囲はリスタートまで復活しない場合があります。</Japanese>
<Japanese>FOBを撤収しました。\n設置可能範囲はリスタートまで復活しない場合があります。</Japanese>
</Key>
<Key ID="STR_FOG_PARAM">
<Original>Dynamic fog (A3 Vanilla)</Original>
Expand Down