diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e8ae0028..f9670c57 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 8038bbe1..68aa81c4 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -679,8 +679,8 @@ Chalyb Circitor Exigo Athla -Extended Flingy #473 -Extended Flingy #474 +Vicere +Machinamentum Extended Flingy #475 Extended Flingy #476 Extended Flingy #477 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a49383af..0e02655e 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 80eb9273..586f6116 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 9d194ab8..e140048e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2348,12 +2348,12 @@ Exigo Warp Flash Athla Athla Shadow Athla Warp Flash -Extended Image #1348 -Extended Image #1349 -Extended Image #1350 -Extended Image #1351 -Extended Image #1352 -Extended Image #1353 +Vicere +Vicere Shadow +Vicere Warp Flash +Machinamentum +Machinamentum Shadow +Machinamentum Warp Flash Extended Image #1354 Extended Image #1355 Extended Image #1356 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 1f3447aa..151ffbc2 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 bb017b45..1dc5d6b4 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1134,8 +1134,8 @@ Chalyb Circitor Exigo Athla -Extended Sprite #620 -Extended Sprite #621 +Vicere +Machinamentum Extended Sprite #622 Extended Sprite #623 Extended Sprite #624 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c9d06bb1..a88cff63 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 ad5932ba..6fe8cd29 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -608,8 +608,8 @@ Forerunner Chalyb Forerunner Circitor Forerunner Exigo Forerunner Athla -Extended Unit #383 -Extended Unit #384 +Forerunner Vicere +Forerunner Machinamentum Extended Unit #385 Extended Unit #386 Extended Unit #387 diff --git a/mpq/arr/upgrades.datex b/mpq/arr/upgrades.datex index 7b60f7de..cfcee2aa 100644 Binary files a/mpq/arr/upgrades.datex and b/mpq/arr/upgrades.datex differ diff --git a/mpq/arr/upgrades.txt b/mpq/arr/upgrades.txt index 9df5a2a7..36336578 100644 --- a/mpq/arr/upgrades.txt +++ b/mpq/arr/upgrades.txt @@ -58,4 +58,43 @@ Askosi Structure Bolting Protoss Structure Armor Zerg Structure Armor Terran Structure Armor -Unknown Upgrade60 \ No newline at end of file +GlobalUpgrade60 +Forerunner Alloy +Forerunner Lattice +Extended Upgrade #3 +Extended Upgrade #4 +Extended Upgrade #5 +Extended Upgrade #6 +Extended Upgrade #7 +Extended Upgrade #8 +Extended Upgrade #9 +Extended Upgrade #10 +Extended Upgrade #11 +Extended Upgrade #12 +Extended Upgrade #13 +Extended Upgrade #14 +Extended Upgrade #15 +Extended Upgrade #16 +Extended Upgrade #17 +Extended Upgrade #18 +Extended Upgrade #19 +Extended Upgrade #20 +Extended Upgrade #21 +Extended Upgrade #22 +Extended Upgrade #23 +Extended Upgrade #24 +Extended Upgrade #25 +Extended Upgrade #26 +Extended Upgrade #27 +Extended Upgrade #28 +Extended Upgrade #29 +Extended Upgrade #30 +Extended Upgrade #31 +Extended Upgrade #32 +Extended Upgrade #33 +Extended Upgrade #34 +Extended Upgrade #35 +Extended Upgrade #36 +Extended Upgrade #37 +Extended Upgrade #38 +Extended Upgrade #39 \ No newline at end of file diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 98494edb..d2f9a7d6 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 c203b230..4008f4cc 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index ff67e73e..08ddf23a 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -1021,14 +1021,14 @@ Domain requires:<10> Conduit AND Bestiary<0> <0> <0> <0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> +a<1><4>Construct Athla <1>(<3>A<1>)<10>Constructor model.<0> +f<1><4>Construct Ferrum <1>(<3>F<1>)<10>Aggressor model.<0> +c<1><4>Construct Chalyb <1>(<3>C<1>)<10>Defender model.<0> +t<1><4>Construct Circitor <1>(<3>T<1>)<10>Pursuit model.<0> +x<1><4>Construct Exigo <1>(<3>X<1>)<10>Defense platform.<0> +v<1><4>Construct Vicere <1>(<3>V<1>)<10>Assault platform.<0> +Forerunner Alloy<0> +Forerunner Lattice<0> Hive Tissues:<10> Must not have a hive tissue.<0> Intestinal Infinity:<10> Must be burrowed.<0> c<0><4>Hive Tissues <1>(<3>C<1>)<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index a709de6d..29e0f8e3 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 3f441a7a..a38d79cb 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -518,7 +518,7 @@ military vicere = 610 # Forerunner buildings building athla = 609 # -building machimentum = 611 +building machinamentum = 611 # Misc units military goliath_turret = 4 diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index c19d3954..d2e00da3 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index 05b0bcc8..53af4859 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -4621,23 +4621,23 @@ YoungChrysalisDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2335 Forerunner Sentinel (cm\sp\h\sentinel.grp) +# 2335 Forerunner Ferrum (cm\sp\h\ferrum.grp) .headerstart IsId 378 Type 21 -Init ForerunnerSentinelInit -Death ForerunnerSentinelDeath -GndAttkInit ForerunnerSentinelGndAttkInit -AirAttkInit ForerunnerSentinelGndAttkInit +Init FerrumInit +Death FerrumDeath +GndAttkInit FerrumGndAttkInit +AirAttkInit FerrumGndAttkInit Unused1 SkryrokorLocal00 -GndAttkRpt ForerunnerSentinelGndAttkInit -AirAttkRpt ForerunnerSentinelGndAttkInit +GndAttkRpt FerrumGndAttkInit +AirAttkRpt FerrumGndAttkInit CastSpell [NONE] -GndAttkToIdle ForerunnerSentinelGndAttkToIdle -AirAttkToIdle ForerunnerSentinelGndAttkToIdle +GndAttkToIdle FerrumGndAttkToIdle +AirAttkToIdle FerrumGndAttkToIdle Unused2 [NONE] -Walking ForerunnerSentinelWalking -WalkingToIdle ForerunnerSentinelWalkingToIdle +Walking FerrumWalking +WalkingToIdle FerrumWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -4646,17 +4646,17 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn ForerunnerSentinelWarpIn +WarpIn FerrumWarpIn .headerend # ----------------------------------------------------------------------------- # -ForerunnerSentinelInit: - imgulnextid 0 42 # Sentinel Shadow (cm\sp\h\sentinel.grp) -ForerunnerSentinelGndAttkToIdle: +FerrumInit: + imgulnextid 0 42 # Sentinel Shadow (cm\sp\h\ferrum.grp) +FerrumGndAttkToIdle: playfram 0x00 - goto ForerunnerSentinelWalkingToIdle + goto FerrumWalkingToIdle -ForerunnerSentinelWalkingToIdle: +FerrumWalkingToIdle: setvertpos 0 wait 8 setvertpos 0 @@ -4665,17 +4665,17 @@ ForerunnerSentinelWalkingToIdle: wait 8 setvertpos 0 wait 8 - goto ForerunnerSentinelWalkingToIdle + goto FerrumWalkingToIdle -ForerunnerSentinelDeath: - playsnd 533 # Protoss\ForerunnerSentinel\PScDth00.WAV +FerrumDeath: + playsnd 533 # Protoss\Ferrum\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) wait 1 end -ForerunnerSentinelGndAttkInit: +FerrumGndAttkInit: wait 1 attack wait 2 @@ -4683,12 +4683,212 @@ ForerunnerSentinelGndAttkInit: ignorerest goto SkryrokorLocal00 -ForerunnerSentinelWalking: +FerrumWalking: playfram 0x00 setvertpos 0 -# imgol 142 0 0 # Forerunner Sentinel Engines (thingy\pscGlow.grp) +# imgol 142 0 0 # Forerunner Ferrum Engines (thingy\pscGlow.grp) goto SkryrokorLocal00 -ForerunnerSentinelWarpIn: - imgol 2337 0 0 # Forerunner Sentinel Warp Flash (cm\sp\h\sentinel.grp) - goto ForerunnerSentinelWalkingToIdle \ No newline at end of file +FerrumWarpIn: + imgol 2337 0 0 # Forerunner Ferrum Warp Flash (cm\sp\h\sentinel.grp) + goto FerrumWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2347 Athla (hl\fr\athla.grp) +.headerstart +IsId 379 +Type 15 +Init AthlaInit +Death AthlaDeath +GndAttkInit AthlaGndAttkInit +AirAttkInit AthlaGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt AthlaGndAttkInit +AirAttkRpt AthlaGndAttkInit +CastSpell [NONE] +GndAttkToIdle AthlaGndAttkToIdle +AirAttkToIdle AthlaGndAttkToIdle +Unused2 [NONE] +Walking AthlaWalking +WalkingToIdle AthlaGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt AthlaAlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +AthlaInit: + imgulnextid 0 42 # Athla Shadow (hl\fr\athla.grp) + playfram 0x00 + wait 2 +AthlaGndAttkToIdle: + playfram 0x00 + goto AthlaLocal69 +AthlaLocal69: + setvertpos 0 + wait 8 + setvertpos 1 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + goto AthlaLocal69 + +AthlaDeath: + playsnd 533 # Protoss\Ferrum\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +AthlaGndAttkInit: + wait 1 + attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +AthlaWalking: + setvertpos 0 + playfram 0x20 + wait 2 + playfram 0x40 + wait 2 + playfram 0x60 + wait 2 + imgol 1079 0 0 # Athla Engines (hl\fr\athla-engine.grp) + goto SkryrokorLocal00 + +AthlaWalkingToIdle: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Forerunner Ferrum Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +AthlaAlmostBuilt: + setvertpos 0 + playfram 0x00 + wait 1 +AthlaLocal00: + playfram 0x00 + useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) + sigorder 32 + wait 1 + playfram 0x00 + wait 1 + playfram 0x00 + wait 10 + playfram 0x00 + wait 1 + goto AthlaLocal00 + +AthlaWarpIn: + imgol 2349 0 0 # Athla Warp Flash (hl\fr\athla.grp) + goto AthlaGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2353 Machinamentum (hl\fr\machinamentum.grp) +.headerstart +IsId 380 +Type 27 +Init MachinamentumInit +Death MachinamentumDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 MachinamentumSpecialState1 +SpecialState2 MachinamentumSpecialState2 +AlmostBuilt MachinamentumAlmostBuilt +Built SkryrokorLocal00 +Landing [NONE] +LiftOff [NONE] +IsWorking MachinamentumIsWorking +WorkingToIdle MachinamentumWorkingToIdle +WarpIn MachinamentumAlmostBuilt +Unused3 [NONE] +StarEditInit [NONE] +Disable MachinamentumDisable +Burrow [NONE] +UnBurrow [NONE] +Enable MachinamentumEnable +.headerend +# ----------------------------------------------------------------------------- # + +MachinamentumInit: + imgulnextid 0 0 # Machinamentum Shadow (hl\fr\machinamentum-shadow.grp) + playfram 0 + wait 2 + goto SkryrokorLocal00 + +MachinamentumDeath: + playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 + imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) + wait 3 + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + wait 1 + end + +MachinamentumSpecialState1: + playsnd 528 # Protoss\SHUTTLE\pshBld00.wav + wait 1 + goto MachinamentumLocal00 + +MachinamentumLocal00: + wait 255 + goto MachinamentumLocal00 + +MachinamentumSpecialState2: + wait 1 + goto MachinamentumWorkingToIdle + +MachinamentumWorkingToIdle: + playfram 0 + goto SkryrokorLocal00 + +MachinamentumAlmostBuilt: + imgol 2355 0 0 # Machinamentum Warp Flash (hl\fr\machinamentum.grp) + goto SkryrokorLocal00 + +MachinamentumIsWorking: + 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 0 + wait 3 + goto MachinamentumIsWorking + +MachinamentumDisable: + playfram 0 + wait 1 + goto SkryrokorLocal00 + +MachinamentumEnable: + playfram 0 + wait 1 + goto MachinamentumWorkingToIdle \ No newline at end of file diff --git a/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp b/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp new file mode 100644 index 00000000..149d0258 Binary files /dev/null and b/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp differ diff --git a/mpq/unit/cm/n/big-infested-kerrigan.grp b/mpq/unit/cm/n/big-infested-kerrigan.grp new file mode 100644 index 00000000..757434fc Binary files /dev/null and b/mpq/unit/cm/n/big-infested-kerrigan.grp differ diff --git a/mpq/unit/hl/fr/machinamentum-damage.lof b/mpq/unit/hl/fr/machinamentum-damage.lof new file mode 100644 index 00000000..a800f3a5 Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum-damage.lof differ diff --git a/mpq/unit/hl/fr/machinamentum-shadow.grp b/mpq/unit/hl/fr/machinamentum-shadow.grp new file mode 100644 index 00000000..15ef31ac Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum-shadow.grp differ diff --git a/mpq/unit/hl/fr/machinamentum.grp b/mpq/unit/hl/fr/machinamentum.grp new file mode 100644 index 00000000..112f51b8 Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum.grp differ diff --git a/mpq/unit/hl/fr/vicere-attack1.lol b/mpq/unit/hl/fr/vicere-attack1.lol new file mode 100644 index 00000000..75f51655 Binary files /dev/null and b/mpq/unit/hl/fr/vicere-attack1.lol differ diff --git a/mpq/unit/hl/fr/vicere-attack2.lol b/mpq/unit/hl/fr/vicere-attack2.lol new file mode 100644 index 00000000..ff65f1f4 Binary files /dev/null and b/mpq/unit/hl/fr/vicere-attack2.lol differ diff --git a/mpq/unit/hl/fr/vicere.grp b/mpq/unit/hl/fr/vicere.grp new file mode 100644 index 00000000..9977f80d Binary files /dev/null and b/mpq/unit/hl/fr/vicere.grp differ diff --git a/mpq/unit/hl/fr/vincere.grp b/mpq/unit/hl/fr/vincere.grp deleted file mode 100644 index 78c4a1f2..00000000 Binary files a/mpq/unit/hl/fr/vincere.grp and /dev/null differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 83324ad9..173054d8 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 43bdd328..36cf0918 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 1ca345ff..38b70c09 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ