diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx index df2743ca..9d10adf5 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx and b/CMBW-maps/melee/1v1/Nonstandard/(2)Badlands Brawl.scx differ diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx b/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx new file mode 100644 index 00000000..e1ff4065 Binary files /dev/null and b/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx differ diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx similarity index 73% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx rename to CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx index 630b6a72..0c6d11c8 100644 Binary files a/CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx and b/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e701e638..a4fcbd1e 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index e267d7a6..2a0bda94 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -490,7 +490,7 @@ Madrigal (Furia Mode) Madrigal Turret (Furia) Philoc Sevenstep Projectile -Extended Flingy #284 +Omnivale Extended Flingy #285 Extended Flingy #286 Extended Flingy #287 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 254cb309..84beebf7 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index 68919ab1..25ecec95 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index beabe89f..8d74e58a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1754,8 +1754,8 @@ Quazilisk Attack Overlay Sevenstep Rail Nathrokor Mutate Quazilisk April Fools -Extended Image #754 -Extended Image #755 +Omnivale +Omnivale Shadow Extended Image #756 Extended Image #757 Extended Image #758 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index cd9c46dd..706a87c3 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 026cfcd6..a3e887fc 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -878,7 +878,7 @@ Quazilisk Attack Overlay Cyclops Passive Arming Overlay Sevenstep Rail Quazilisk (April Fools) -Extended Sprite #1 +Omnivale Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 1721a7ee..8014aa6f 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index b54f3988..6c9848c4 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -381,7 +381,7 @@ Terran Shaman (Visionary Mode) Madrigal Turret (Imperioso) Terran Madrigal (Furia Mode) Madrigal Turret (Furia) -Extended Unit #156 +Omnivale Extended Unit #157 Extended Unit #158 Extended Unit #159 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index e255d33a..95d640f6 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 671cdfcd..ceb25eb7 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 81e46098..9373051e 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index cdda3379..656488ae 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -51980,4 +51980,95 @@ ZergMutateAirSpecialState1: sigorder 8 goto InfestedTerranLocal00 -# Next free isid: 758 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1756 Omnivale (cm\gamemodes\omnipresence\omnivale.grp) +.headerstart +IsId 758 +Type 27 +Init OmnivaleInit +Death NexusDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 OmnivaleSpecialState1 +SpecialState2 OmnivaleSpecialState2 +AlmostBuilt OmnivaleAlmostBuilt +Built OmnivaleBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking OmnivaleIsWorking +WorkingToIdle OmnivaleWorkingToIdle +WarpIn OmnivaleAlmostBuilt +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow [NONE] +UnBurrow [NONE] +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +OmnivaleInit: + imgul 1757 0 0 # Omnivale Shadow (cm\gamemodes\omnipresence\omnivale-shadow.grp) + playfram 0x00 + wait 2 + goto OmnivaleBuilt + +OmnivaleBuilt: + wait 125 + goto OmnivaleBuilt + +OmnivaleSpecialState1: + playsnd 528 # Protoss\SHUTTLE\pshBld00.wav + wait 1 + goto OmnivaleLocal00 + +OmnivaleLocal00: + wait 255 + goto OmnivaleLocal00 + +OmnivaleSpecialState2: + wait 1 + goto OmnivaleWorkingToIdle + +OmnivaleWorkingToIdle: + playfram 0x00 + goto OmnivaleBuilt + +OmnivaleAlmostBuilt: + imgol 172 0 0 # Omnivale Warp Flash (cm\gamemodes\omnipresence\omnivale.grp) + goto OmnivaleBuilt + +OmnivaleIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 0x00 + wait 1 + goto OmnivaleIsWorking + +# Next free isid: 759 \ No newline at end of file diff --git a/mpq/templates/Competitive Mode(1).got b/mpq/templates/Competitive Mode(1).got index a308959c..5605f09e 100644 Binary files a/mpq/templates/Competitive Mode(1).got and b/mpq/templates/Competitive Mode(1).got differ diff --git a/mpq/templates/Omnipresence(1).got b/mpq/templates/Omnipresence(1).got new file mode 100644 index 00000000..86ccd294 Binary files /dev/null and b/mpq/templates/Omnipresence(1).got differ diff --git a/mpq/templates/Scenario Mode(1).got b/mpq/templates/Scenario Mode(1).got index d34b3253..3f3dd356 100644 Binary files a/mpq/templates/Scenario Mode(1).got and b/mpq/templates/Scenario Mode(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst index 00639b96..2ac2877a 100644 --- a/mpq/templates/templates.lst +++ b/mpq/templates/templates.lst @@ -1,2 +1,3 @@ "Competitive Mode(1).got" -"Scenario Mode(1).got" \ No newline at end of file +"Scenario Mode(1).got" +"Omnipresence(1).got" \ No newline at end of file diff --git a/mpq/unit/cm/gamemodes/omnipresence/omnivale-shadow.grp b/mpq/unit/cm/gamemodes/omnipresence/omnivale-shadow.grp new file mode 100644 index 00000000..5d8df5cb Binary files /dev/null and b/mpq/unit/cm/gamemodes/omnipresence/omnivale-shadow.grp differ diff --git a/mpq/unit/cm/gamemodes/omnipresence/omnivale.grp b/mpq/unit/cm/gamemodes/omnipresence/omnivale.grp new file mode 100644 index 00000000..b06a1c00 Binary files /dev/null and b/mpq/unit/cm/gamemodes/omnipresence/omnivale.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8a790aed..9a2812ff 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ