Up2468

Xeno69 · Sep 5, 2023 · cdbbe8c · cdbbe8c
1 parent bcae432
commit cdbbe8c
Show file tree

Hide file tree

Showing 36 changed files with 27 additions and 14 deletions.
diff --git a/OldChangelogs.txt b/OldChangelogs.txt
@@ -2,6 +2,16 @@ Changelogs
 
 Old...
 
+4.67
+
+- Changed: Prefer to spawn civilians in safe buildings (church, chapel, mosque, hospital etc), by longtimegamer
+- Fixed: Launchers like Titan Compact or RHS Javelin didn't lock (never use player disableAI "CHECKVISIBLE")
+- Fixed: The Western Sahara Sefrouramal version was missing in the 7zip file
+- Fixed: Main target order "Complete, ordered" and "Order like placed in the editor" didn't mwork at all anymore
+- Fixed: Preemptive event cleanup not working when persistent corpses is enabled, by longtimegamer
+- Fixed: Admin may use end maintarget function when a preemptive event is running, by longtimegamer
+- Fixed: If guerrilla events are enabled there is a 50/50 chance for a preemptive (defense) event, by longtimegamer
+
 4.66
 
 - Added: SPE GER and USA Normandy versions

diff --git a/co30_Domination.Altis/changelog.txt b/co30_Domination.Altis/changelog.txt
@@ -1,9 +1,12 @@
-4.67
+4.68
 
-- Changed: Prefer to spawn civilians in safe buildings (church, chapel, mosque, hospital etc), by longtimegamer
-- Fixed: Launchers like Titan Compact or RHS Javelin didn't lock (never use player disableAI "CHECKVISIBLE")
-- Fixed: The Western Sahara Sefrouramal version was missing in the 7zip file
-- Fixed: Main target order "Complete, ordered" and "Order like placed in the editor" didn't mwork at all anymore
-- Fixed: Preemptive event cleanup not working when persistent corpses is enabled, by longtimegamer
-- Fixed: Admin may use end maintarget function when a preemptive event is running, by longtimegamer
-- Fixed: If guerrilla events are enabled there is a 50/50 chance for a preemptive (defense) event, by longtimegamer
+- Added: 2.14 scripting commands
+- Added: Opfor T-100X Futura Railgun tank (vanilla A3)
+- Added: 2035 mercenaries are now available as Opfor enemies (appear as FIA infantry), by longtimegamer
+- Added: 2035 mercenaries now have some AA infantry, by longtimegamer
+- Added: if enemy skill is very low, low, normal then aim/reload skills are reduced, by longtimegamer
+- Added: Maintarget event - rabbit rescue is back, by longtimegamer
+- Fixed: Better success and failure messages for the VIP escort event, by longtimegamer
+- Fixed: Rabbit marker was not cleaning up after event ended, by longtimegamer
+- Fixed: event with guerrillas embedded as civs - guerrillas start with no weapons until triggered by firedNear 30m away, by longtimegamer
+- Fixed: Tanks couldn't be destroyed in destroy tanks side missions
diff --git a/co30_Domination.Altis/client/fn_intro.sqf b/co30_Domination.Altis/client/fn_intro.sqf
@@ -119,7 +119,7 @@ switch (d_MissionType) do {
 	};
 };
 
-0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.67  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
+0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.68  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
 
 _camera camSetTarget player;
 _p_tpos = [_pspsxx # 0, _pspsxx # 1, (player modelToWorld [0,0,2]) # 2];

diff --git a/co30_Domination.Altis/client/fn_intro2.sqf b/co30_Domination.Altis/client/fn_intro2.sqf
@@ -72,7 +72,7 @@ sleep 1;
 sleep 2;
 "d_rscmtexts" cutRsc ["d_rscmtexts", "PLAIN"];
 
-0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.67  </t>"], [safeZoneX + 0.1, safeZoneY + safeZoneH - 0.2, 0.9, 0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
+0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.68  </t>"], [safeZoneX + 0.1, safeZoneY + safeZoneH - 0.2, 0.9, 0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
 
 waitUntil {scriptDone _bfehandle};
 enableSaving [false, false];

diff --git a/co30_Domination.Altis/client/fn_setupplayer.sqf b/co30_Domination.Altis/client/fn_setupplayer.sqf
@@ -496,7 +496,7 @@ d_points_needed_18 = (d_points_needed # 6) + 200000;
 	}, 5.12] call d_fnc_eachframeadd;
 };
 
-diag_log "Internal D Version: 4.67";
+diag_log "Internal D Version: 4.68";
 
 if (!d_no_ai) then {
 	if (d_with_ai) then {

diff --git a/co30_Domination.Altis/mission.sqm b/co30_Domination.Altis/mission.sqm
diff --git a/co30_Domination.Altis/server/fn_setupserver.sqf b/co30_Domination.Altis/server/fn_setupserver.sqf
@@ -97,7 +97,7 @@ if (d_MissionType == 2) then {
 
 0 spawn d_fnc_cleanerfnc;
 
-diag_log "Internal D Version: 4.67";
+diag_log "Internal D Version: 4.68";
 
 private _av_check_fnc = {
 	_this addEventHandler ["handleDamage", {call d_fnc_pshootatarti;0}];

diff --git a/dom_maker/make_dom.bat b/dom_maker/make_dom.bat
@@ -5,8 +5,8 @@ rem The ArmaScriptCompiler.exe which is needed for SQFC files can be found at ht
 
 set BASE_MASTER=co30_Domination.Altis
 set MASTER=co30_Domination.Altis
-set D_VER=4_67
-set D_BNVER=4.67
+set D_VER=4_68
+set D_BNVER=4.68
 set D_NUM_PLAYERS=40
 set D_NUM_PLAYERS_TT=50
 set D_NUM_PLAYERS_CO=40

diff --git a/mission_sqm/mission_blufor_altis_bin.sqm b/mission_sqm/mission_blufor_altis_bin.sqm
diff --git a/mission_sqm/mission_blufor_cam_lao_nam_bin.sqm b/mission_sqm/mission_blufor_cam_lao_nam_bin.sqm
diff --git a/mission_sqm/mission_blufor_carrier_altis_bin.sqm b/mission_sqm/mission_blufor_carrier_altis_bin.sqm
diff --git a/mission_sqm/mission_blufor_chernarus_a3_bin.sqm b/mission_sqm/mission_blufor_chernarus_a3_bin.sqm
diff --git a/mission_sqm/mission_blufor_chernarus_bin.sqm b/mission_sqm/mission_blufor_chernarus_bin.sqm
diff --git a/mission_sqm/mission_blufor_chernarus_winter_bin.sqm b/mission_sqm/mission_blufor_chernarus_winter_bin.sqm
diff --git a/mission_sqm/mission_blufor_enoch_bin.sqm b/mission_sqm/mission_blufor_enoch_bin.sqm
diff --git a/mission_sqm/mission_blufor_malden_bin.sqm b/mission_sqm/mission_blufor_malden_bin.sqm
diff --git a/mission_sqm/mission_blufor_nbv_malden_bin.sqm b/mission_sqm/mission_blufor_nbv_malden_bin.sqm
diff --git a/mission_sqm/mission_blufor_normandy_bin.sqm b/mission_sqm/mission_blufor_normandy_bin.sqm
diff --git a/mission_sqm/mission_blufor_rhs_altis_bin.sqm b/mission_sqm/mission_blufor_rhs_altis_bin.sqm
diff --git a/mission_sqm/mission_blufor_sara_bin.sqm b/mission_sqm/mission_blufor_sara_bin.sqm
diff --git a/mission_sqm/mission_blufor_sefrouramal_bin.sqm b/mission_sqm/mission_blufor_sefrouramal_bin.sqm
diff --git a/mission_sqm/mission_blufor_stratis_bin.sqm b/mission_sqm/mission_blufor_stratis_bin.sqm
diff --git a/mission_sqm/mission_blufor_takistan_bin.sqm b/mission_sqm/mission_blufor_takistan_bin.sqm
diff --git a/mission_sqm/mission_blufor_tanoa_bin.sqm b/mission_sqm/mission_blufor_tanoa_bin.sqm
diff --git a/mission_sqm/mission_blufor_unsung_bin.sqm b/mission_sqm/mission_blufor_unsung_bin.sqm
diff --git a/mission_sqm/mission_blufor_weferlingen_summer.sqm b/mission_sqm/mission_blufor_weferlingen_summer.sqm
diff --git a/mission_sqm/mission_blufor_weferlingen_winter.sqm b/mission_sqm/mission_blufor_weferlingen_winter.sqm
diff --git a/mission_sqm/mission_indep_pracs_sara_bin.sqm b/mission_sqm/mission_indep_pracs_sara_bin.sqm
diff --git a/mission_sqm/mission_independent_normandy_bin.sqm b/mission_sqm/mission_independent_normandy_bin.sqm
diff --git a/mission_sqm/mission_opfor_altis_bin.sqm b/mission_sqm/mission_opfor_altis_bin.sqm
diff --git a/mission_sqm/mission_opfor_csla_bin.sqm b/mission_sqm/mission_opfor_csla_bin.sqm
diff --git a/mission_sqm/mission_opfor_ifa3_bin.sqm b/mission_sqm/mission_opfor_ifa3_bin.sqm
diff --git a/mission_sqm/mission_opfor_rhs_altis_bin.sqm b/mission_sqm/mission_opfor_rhs_altis_bin.sqm
diff --git a/mission_sqm/mission_tt_altis_bin.sqm b/mission_sqm/mission_tt_altis_bin.sqm
diff --git a/mission_sqm/mission_tt_malden_bin.sqm b/mission_sqm/mission_tt_malden_bin.sqm
diff --git a/mission_sqm/mission_tt_tanoa_bin.sqm b/mission_sqm/mission_tt_tanoa_bin.sqm