diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index dee42c88..0102d508 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 0c1fec18..69f18985 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 bbe63097..8f3694a9 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1988,7 +1988,7 @@ Unar Shadow Unar Orbital Ashguard Ashguard Shadow -Extended Image #988 +Rilirokor Birth Extended Image #989 Extended Image #990 Extended Image #991 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 404e3fee..dfdb6435 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 761d27ea..14151a57 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 5a380048..5625265a 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 8df53e4e..7e116dcc 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 4ca3ee2b..df5d6942 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/samase/lurker.txt b/mpq/samase/lurker.txt new file mode 100644 index 00000000..729f0263 --- /dev/null +++ b/mpq/samase/lurker.txt @@ -0,0 +1,119 @@ +0x004243A5 . 66:3D 6700 CMP AX,67 +0x004243BC > 66:3D 6700 CMP AX,67 +0x0042529C |. 75 67 JNZ SHORT 00425305 +0x00426CE4 |. 66:3D 6700 CMP AX,67 +0x00426D1B |. 66:3D 6700 CMP AX,67 +0x00426DBE |> 66:83F9 67 CMP CX,67 +0x00428D4F . 66:83F9 67 CMP CX,67 +0x00428DAF . 66:83F9 67 CMP CX,67 +0x00428F40 |. 66:3D 6700 |CMP AX,67 +0x0042959D |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x0042CFBF |. 66:83FB 67 CMP BX,67 +0x00435E23 |. 83F8 67 CMP EAX,67 +0x00435F2E |. 83FB 2C CMP EBX,2C ; Switch (cases 2C..67) +0x00435FEF |> 83FB 67 CMP EBX,67 +0x00435FF4 |. 8BC7 MOV EAX,EDI ; Case 67 ('g') of switch 00435F2E +0x00438FE7 |. 66:83F9 67 |CMP CX,67 +0x0043C233 |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x0043C783 |. 66:837B 64 67 |CMP WORD PTR DS:[EBX+64],67 +0x0043C995 |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x0043E438 |> 66:83FF 67 CMP DI,67 +0x0043F7C2 |> 66:837B 64 67 CMP WORD PTR DS:[EBX+64],67 +0x004400CD |. 66:3D 6700 CMP AX,67 +0x00440524 |. 66:83FA 67 CMP DX,67 +0x00440B98 . 66:83FF 67 CMP DI,67 +0x00441C9C > 5E POP ESI ; Cases 5,9,C,1E,22,27,2A,2D,2E,3E,3F,43,47,48,53,67 of switch 00441C86 +0x00447D23 |. 66:3D 6700 CMP AX,67 +0x004484A3 |. 83F8 2C CMP EAX,2C ; Switch (cases 2C..67) +0x00448556 |> 83F8 67 CMP EAX,67 +0x0044855B |. 6A 01 PUSH 1 ; Case 67 ('g') of switch 004484A3 +0x0045447C > 818E DC000000>OR DWORD PTR DS:[ESI+DC],10000000 ; Cases 35,39,4D,50,58,67 of switch 00454374 +0x00455664 |. 66:83F9 67 CMP CX,67 +0x004556FE |. 66:8378 64 67 CMP WORD PTR DS:[EAX+64],67 +0x0045576B |. 66:3D 6700 CMP AX,67 +0x00455A23 |. 66:3D 6700 |CMP AX,67 +0x0045617A |. 66:3D 6700 |CMP AX,67 +0x00462FA8 |. 66:3D 6700 CMP AX,67 +0x004635C6 . 66:3D 6700 CMP AX,67 +0x00466054 |. 66:3D 6700 CMP AX,67 +0x004682BC . 66:83FA 67 CMP DX,67 +0x00469047 . 75 67 JNZ SHORT 004690B0 + +0x0046DCDA |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x0047075D |. 74 67 JE SHORT 004707C6 +0x00470B19 |. 74 67 JE SHORT 00470B82 +0x004717C4 |. 73 67 JNB SHORT 0047182D +0x004719D7 |. 74 67 JE SHORT 00471A40 +0x004741EF |. 7C 67 JL SHORT 00474258 +0x00475045 |. 66:83FA 67 CMP DX,67 +0x00475A94 |. 66:3D 6700 CMP AX,67 +0x00475AD4 |. 66:3D 6700 CMP AX,67 +0x00475C33 |> 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x00476184 |. 66:3D 6700 CMP AX,67 +0x00476485 |. 66:3D 6700 CMP AX,67 +0x00476503 |. 66:3D 6700 CMP AX,67 +0x004768D8 |. 66:3D 6700 CMP AX,67 +0x00476F14 |. 66:83F9 67 CMP CX,67 +0x0047706B |. 74 67 JE SHORT 004770D4 +0x004775C7 |. 74 67 JE SHORT 00477630 +0x004776E7 . 66:3D 6700 CMP AX,67 +0x0047773C . 66:3D 6700 CMP AX,67 +0x00477C25 |. 66:3D 6700 CMP AX,67 +0x00477FE3 |. 75 67 JNZ SHORT 0047804C +0x00478781 |. 66:3D 6700 CMP AX,67 +0x00479B50 |. 66:83F9 67 CMP CX,67 +0x00479D79 |. 66:3D 6700 CMP AX,67 +0x0047B822 |. 66:83F9 67 CMP CX,67 +0x0047B987 |. 75 67 JNZ SHORT 0047B9F0 +0x0047BB21 |. 66:3D 6700 CMP AX,67 +0x0047BFE1 . 74 67 JE SHORT 0047C04A +0x0047C5B1 |. 66:3D 6700 CMP AX,67 +0x0047C665 |. 66:3D 6700 CMP AX,67 +0x0047DCD5 |. 74 67 |JE SHORT 0047DD3E +0x0047E4A9 . B8 67000000 MOV EAX,67 +0x00487B30 |. 83FA 67 |CMP EDX,67 +0x00487B47 |> 83C1 99 |ADD ECX,-67 ; Cases 117,118,119 of switch 00487B2A +0x00488E39 |. 8D56 D4 LEA EDX,DWORD PTR DS:[ESI-2C] ; Switch (cases 2C..67) +0x00488E4F |> 0FB757 64 MOVZX EDX,WORD PTR DS:[EDI+64] ; Cases 2C (','),3E ('>'),3F ('?'),44 ('D'),67 ('g') of switch 00488E39 +0x0048B07A . 75 67 JNZ SHORT 0048B0E3 +0x0048C26E |. 83F9 67 CMP ECX,67 +0x0048F456 |. 75 67 JNZ SHORT 0048F4BF +0x0048F532 |. 75 67 JNZ SHORT 0048F59B +0x0049A43F |. 66:83FA 67 CMP DX,67 +0x0049FE47 |. 74 67 |JE SHORT 0049FEB0 +0x004A2220 |. 74 67 |JE SHORT 004A2289 +0x004A54FD . 75 67 JNZ SHORT 004A5566 +0x004A7663 |. 8D45 99 LEA EAX,DWORD PTR SS:[EBP-67] +0x004B18F4 |. 66:8339 67 CMP WORD PTR DS:[ECX],67 +0x004B864B |. 66:8339 67 CMP WORD PTR DS:[ECX],67 +0x004BB440 |. 75 67 JNZ SHORT 004BB4A9 +0x004C10F6 . 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004C12E6 . 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004C14D6 . 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004C1719 |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004C19BD |. 66:837B 01 67 |CMP WORD PTR DS:[EBX+1],67 +0x004C1D60 |. 66:837E 64 67 |CMP WORD PTR DS:[ESI+64],67 +0x004C1DF9 |. EB 67 |JMP SHORT 004C1E62 +0x004C2230 |. 66:837E 64 67 |CMP WORD PTR DS:[ESI+64],67 +0x004CB845 |. 77 67 JA SHORT 004CB8AE +0x004CC513 |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004CF861 |. 73 67 JNB SHORT 004CF8CA +0x004D19D6 |. 75 67 JNZ SHORT 004D1A3F +0x004D1A66 |. 75 67 JNZ SHORT 004D1ACF +0x004D31B1 |. 6A 67 PUSH 67 +0x004D31C0 |. 6A 67 PUSH 67 +0x004D3FE2 |. 6A 67 PUSH 67 +0x004E244D . 7C 67 JL SHORT 004E24B6 +0x004E5EA4 |. 66:83F9 67 CMP CX,67 +0x004E97CE |. B9 67000000 MOV ECX,67 +0x004E9867 . 66:3D 6700 CMP AX,67 +0x004E9A6A |. 66:837E 64 67 CMP WORD PTR DS:[ESI+64],67 +0x004EC688 . EB 67 JMP SHORT 004EC6F1 +0x004ECA6C > 5F POP EDI ; Case 67 of switch 004EC71B +0x004EF2B8 |. 75 67 JNZ SHORT 004EF321 +0x004F0A64 |. 7F 67 JG SHORT 004F0ACD +0x004F0EFB |. C645 FC 67 MOV BYTE PTR SS:[EBP-4],67 +0x004F114D |. C645 FC 67 MOV BYTE PTR SS:[EBP-4],67 +0x004F198B |. 75 67 JNZ SHORT 004F19F4 +0x004F1BE2 |. 75 67 JNZ SHORT 004F1C4B +0x004FA05B |. 74 67 |JE SHORT 004FA0C4 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 127f7f9a..647eb613 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -35983,10 +35983,11 @@ SirenDeath: end SirenGndAttkInit: - playfram 0x00 + playfram 0x99 wait 1 nobrkcodestart playsndbtwn 1396 1398 # Siren weapon fire 01, 02, 03 + wait 4 attackwith 1 playfram 0xaa wait 1 @@ -50855,10 +50856,6 @@ Death Generic_Wait1End # ----------------------------------------------------------------------------- # MagnetarLawOfAttractionInit: - playfram 0x00 - wait 1 - playfram 1 - wait 1 playfram 2 wait 1 playfram 3 diff --git a/mpq/sound/cm/p/_building/hall-of-heretics.wav b/mpq/sound/cm/p/_building/hall-of-heretics.wav new file mode 100644 index 00000000..a60928f1 Binary files /dev/null and b/mpq/sound/cm/p/_building/hall-of-heretics.wav differ diff --git a/mpq/sound/cm/p/_building/xenolith.wav b/mpq/sound/cm/p/_building/xenolith.wav new file mode 100644 index 00000000..fa51f4e0 Binary files /dev/null and b/mpq/sound/cm/p/_building/xenolith.wav differ diff --git a/mpq/sound/cm/t/siren/wf-01.wav b/mpq/sound/cm/t/siren/wf-01.wav index 97ee76cd..478a13e5 100644 Binary files a/mpq/sound/cm/t/siren/wf-01.wav and b/mpq/sound/cm/t/siren/wf-01.wav differ diff --git a/mpq/sound/cm/t/siren/wf-02.wav b/mpq/sound/cm/t/siren/wf-02.wav index 241b0d49..99df2230 100644 Binary files a/mpq/sound/cm/t/siren/wf-02.wav and b/mpq/sound/cm/t/siren/wf-02.wav differ diff --git a/mpq/sound/cm/t/siren/wf-03.wav b/mpq/sound/cm/t/siren/wf-03.wav index e9f4c77b..21df52da 100644 Binary files a/mpq/sound/cm/t/siren/wf-03.wav and b/mpq/sound/cm/t/siren/wf-03.wav differ diff --git a/mpq/unit/cm/zerg/rilirokor-birth.grp b/mpq/unit/cm/zerg/rilirokor-birth.grp new file mode 100644 index 00000000..0776cb6d Binary files /dev/null and b/mpq/unit/cm/zerg/rilirokor-birth.grp differ diff --git a/plugins/aize_debug.qdp b/plugins/aize_debug.qdp index 5d0af793..79824b16 100644 Binary files a/plugins/aize_debug.qdp and b/plugins/aize_debug.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c8447ff0..733157e9 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ