diff --git a/CMBW-editor/ai/cm_protoss.asc3 b/CMBW-editor/ai/cm_protoss.asc3 index 73ac6f57..e61dcce9 100644 --- a/CMBW-editor/ai/cm_protoss.asc3 +++ b/CMBW-editor/ai/cm_protoss.asc3 @@ -3860,37 +3860,37 @@ script_id PMCx local 255 AtL_M 10 warden request_matrix_check local 255 AtL 10 warden blank_return local 255 AtL 4 warden request_warden_check2 - add_bld 255 warden 1 4 95 + add_bld 255 warden 1 3 95 var Ex|Jump under_attack_by_ground_var 1 add_return_wait_480 13 var Ex|Jump under_attack_by_air_var 1 add_return_wait_480 13 goto add_return_wait_960 :request_warden_check2 - var Ex|Jump under_attack_by_ground_var 1 request_warden_check3 13 - var Ex|Jump under_attack_by_air_var 1 request_warden_check3 13 - var AtM|Jump mining_count_var 2 add_return_wait_960 13 - add_bld 255 warden 1 7 95 - goto add_return_wait_480 + var Ex|Jump under_attack_by_ground_var 0 request_warden_check2a 13 + goto request_warden_check2b - :request_warden_check3 - add_bld 255 warden 1 10 95 - goto add_return_wait_480 + :request_warden_check2a + var Ex|Jump under_attack_by_air_var 0 add_return_wait_960 13 + + :request_warden_check2b + add_bld 255 warden 1 6 95 + goto add_return_wait_960 :request_matrix_check local 255 AtL 10 matrix blank local 255 AtL 4 matrix request_matrix_check2 - add_bld 255 matrix 1 4 95 + add_bld 255 matrix 1 2 95 stop :request_matrix_check2 - var Ex|Jump under_attack_by_ground_var 1 request_matrix_check3 13 - var Ex|Jump under_attack_by_air_var 1 request_matrix_check3 13 - var AtM|Jump mining_count_var 2 blank 13 - add_bld 255 matrix 1 7 95 - stop + var Ex|Jump under_attack_by_ground_var 0 request_matrix_check2a 13 + goto request_matrix_check2b - :request_matrix_check3 - add_bld 255 matrix 1 10 95 + :request_matrix_check2a + var Ex|Jump under_attack_by_air_var 0 add_return_wait_960 13 + + :request_matrix_check2b + add_bld 255 matrix 1 5 95 stop :request_engram_check @@ -3900,14 +3900,14 @@ script_id PMCx stop :request_engram_check2 - var Ex|Jump under_attack_by_ground_var 1 request_engram_check3 13 - var Ex|Jump under_attack_by_air_var 1 request_engram_check3 13 - var AtM|Jump mining_count_var 2 blank 13 - add_bld 255 engram 1 4 96 - stop + var Ex|Jump under_attack_by_ground_var 0 request_engram_check2a 13 + goto request_engram_check2b - :request_engram_check3 - add_bld 255 engram 1 6 96 + :request_engram_check2a + var Ex|Jump under_attack_by_air_var 0 add_return_wait_960 13 + + :request_engram_check2b + add_bld 255 engram 1 4 96 stop :request_embassy diff --git a/CMBW-editor/ai/cm_terran.asc3 b/CMBW-editor/ai/cm_terran.asc3 index 9dd5ed9d..8a4e2329 100644 --- a/CMBW-editor/ai/cm_terran.asc3 +++ b/CMBW-editor/ai/cm_terran.asc3 @@ -4456,7 +4456,7 @@ script_id TMCx goto request_anchor :request_anchor_check - local 255 AtL 4 anchor blank_return + local 255 AtL 3 anchor blank_return var Ex|Jump under_attack_by_ground_var 1 request_anchor_check2 13 var Ex|Jump under_attack_by_air_var 1 request_anchor_check2 13 add_bld 255 anchor 1 2 95 @@ -4499,19 +4499,14 @@ script_id TMCx goto request_watchdog :request_watchdog_check - local 255 AtL 4 watchdog request_watchdog_check2 - add_bld 255 watchdog 1 4 97 + local 255 AtL 3 watchdog request_watchdog_check2 + add_bld 255 watchdog 1 3 98 var Ex|Jump under_attack_by_air_var 1 add_return_wait_480 13 goto add_return_wait_960 :request_watchdog_check2 - var Ex|Jump under_attack_by_air_var 1 request_watchdog_check3 13 - var AtM|Jump mining_count_var 2 add_return_wait_480 13 - add_bld 255 watchdog 1 7 97 - goto add_return_wait_480 - - :request_watchdog_check3 - add_bld 255 watchdog 1 10 97 + var Ex|Jump under_attack_by_air_var 0 add_return_wait_960 13 + add_bld 255 watchdog 1 6 98 goto add_return_wait_480 :request_sentinel @@ -4525,21 +4520,14 @@ script_id TMCx :request_sentinel_check local 255 AtL 4 sentinel request_sentinel_check2 - add_bld 255 sentinel 1 4 98 + add_bld 255 sentinel 1 3 98 var Ex|Jump under_attack_by_ground_var 1 add_return_wait_480 13 - var Ex|Jump under_attack_by_air_var 1 add_return_wait_480 13 goto add_return_wait_960 :request_sentinel_check2 - var Ex|Jump under_attack_by_ground_var 1 request_sentinel_check3 13 - var Ex|Jump under_attack_by_air_var 1 request_sentinel_check3 13 - var AtM|Jump mining_count_var 2 add_return_wait_480 13 - add_bld 255 sentinel 1 7 98 - goto add_return_wait_480 - - :request_sentinel_check3 - add_bld 255 sentinel 1 10 98 - goto add_return_wait_480 + var Ex|Jump under_attack_by_ground_var 0 add_return_wait_960 13 + add_bld 255 sentinel 1 6 98 + goto add_return_wait_960 :request_diadem var Ex|Wait can_build_static_defense_var 1 13 @@ -4553,12 +4541,12 @@ script_id TMCx :request_diadem_check local 255 AtL 1 diadem request_diadem_check2 - add_bld 255 diadem 1 1 98 + add_bld 255 diadem 1 1 99 goto add_return_wait_960 :request_diadem_check2 - var Ex|Jump under_attack_var 0 add_return_wait_960 13 - add_bld 255 diadem 1 2 98 + var AtM|Jump mining_count_var 3 add_return_wait_960 13 + add_bld 255 diadem 1 2 99 goto add_return_wait_960 :request_infrastructure diff --git a/CMBW-editor/ai/cm_zerg.asc3 b/CMBW-editor/ai/cm_zerg.asc3 index a59566b8..df907949 100644 --- a/CMBW-editor/ai/cm_zerg.asc3 +++ b/CMBW-editor/ai/cm_zerg.asc3 @@ -4501,37 +4501,27 @@ script_id ZMCx goto request_surkith_loop :request_surkith_check - local 255 AtL 5 surkith_cesiant request_surkith_check_2 + local 255 AtL 3 surkith_cesiant|skortrith_cesiant request_surkith_check_2 call request_skortrith - add_bld 255 surkith_cesiant 1 5 106 + add_bld 255 surkith_cesiant 1 3 106 var Ex|Jump under_attack_by_ground_var 1 add_return_wait_960 13 goto add_return_wait_1440 :request_surkith_check_2 - var Ex|Jump under_attack_by_ground_var 1 request_surkith_check_3 13 - var AtM|Jump mining_count_var 2 add_return_wait_960 13 + local 255 AtL 6 surkith_cesiant|skortrith_cesiant add_return_wait_1440 + var Ex|Jump under_attack_by_ground_var 0 add_return_wait_1440 13 call request_skortrith_2 - add_bld 255 surkith_cesiant 1 7 106 - goto add_return_wait_960 - - :request_surkith_check_3 - call request_skortrith_3 - add_bld 255 surkith_cesiant 1 10 106 + add_bld 255 surkith_cesiant 1 6 106 goto add_return_wait_960 :request_skortrith bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 skortrith_cesiant 1 5 106 + add_bld 255 skortrith_cesiant 1 3 106 return :request_skortrith_2 bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 skortrith_cesiant 1 7 106 - return - - :request_skortrith_3 - bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 skortrith_cesiant 1 10 106 + add_bld 255 skortrith_cesiant 1 6 106 return :request_spraith @@ -4555,37 +4545,27 @@ script_id ZMCx goto request_spraith_loop :request_spraith_check - local 255 AtL 3 spraith_cesiant request_spraith_check_2 + local 255 AtL 3 spraith_cesiant|spirtith_cesiant request_spraith_check_2 call request_spirtith - add_bld 255 spraith_cesiant 1 10 106 + add_bld 255 spraith_cesiant 1 3 106 var Ex|Jump under_attack_by_air_var 1 add_return_wait_960 13 goto add_return_wait_1440 :request_spraith_check_2 - var Ex|Jump under_attack_by_air_var 1 request_spraith_check_3 13 - var AtM|Jump mining_count_var 2 add_return_wait_960 13 + local 255 AtL 6 spraith_cesiant|spirtith_cesiant add_return_wait_1440 + var Ex|Jump under_attack_by_air_var 0 add_return_wait_1440 13 call request_spirtith_2 - add_bld 255 spraith_cesiant 1 7 106 - goto add_return_wait_960 - - :request_spraith_check_3 - call request_spirtith_3 - add_bld 255 spraith_cesiant 1 10 106 + add_bld 255 spraith_cesiant 1 6 106 goto add_return_wait_960 :request_spirtith bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 spirtith_cesiant 1 5 106 + add_bld 255 spirtith_cesiant 1 3 106 return :request_spirtith_2 bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 spirtith_cesiant 1 7 106 - return - - :request_spirtith_3 - bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 blank_return - add_bld 255 spirtith_cesiant 1 10 106 + add_bld 255 spirtith_cesiant 1 6 106 return :production_cycle diff --git a/CMBW-maps/melee/1v1/Needs Testing/(2)Ex Situ.scx b/CMBW-maps/melee/1v1/Needs Testing/(2)Ex Situ.scx index 3b58138e..f389e57c 100644 Binary files a/CMBW-maps/melee/1v1/Needs Testing/(2)Ex Situ.scx and b/CMBW-maps/melee/1v1/Needs Testing/(2)Ex Situ.scx differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 4a51ccf3..af5d962d 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -347,6 +347,7 @@ building geszkath_grotto = 219 building irol_iris = 224 building sibraelosk = 227 building spirtith_cesiant = 292 +building skortrith_cesiant = 293 building rakzogth_roost = 303 building begrozith_barrow = 329 building chokralgant_chazsal = 330 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index a3754e53..c044cd2e 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/patchnotes.md b/patchnotes.md index 1fe72935..78aaa332 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -25,4 +25,8 @@ Patch goals include: - Treasuries now display progress bars while under construction, and no longer display an armor icon - Birthing Zerg units now use the correct armor icon - Custom UI graphics (order lines, transport UI, etc) are now reset between games (c. Veeq7) - - Lardfix: title music now plays again after concluding a multiplayer game (c. DF) \ No newline at end of file + - Lardfix: title music now plays again after concluding a multiplayer game (c. DF) + +## AI +- Increased refinery request priorities to improve gas capping pace +- Reduced number of tower requests per base to reduce clutter \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f2fd78bf..9ebdbd0e 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ