diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index aa87ddaa..af88ef1a 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 e34f599c..f487d9bc 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -631,9 +631,9 @@ Quadriga Landlock (Christmas) Serathiel Intendent Electricity -Extended Flingy #425 -Extended Flingy #426 -Extended Flingy #427 +Askosi Construction (Large) +Askosi Construction (Medium) +Askosi Construction (Small) Extended Flingy #428 Extended Flingy #429 Extended Flingy #430 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index bfc089f4..f957cd64 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 6fbb70c1..0f1b9a7e 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 67d3b751..d45aa518 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2234,12 +2234,12 @@ Serathiel Shadow Serathiel Engines Divine Discipline Field Intendent Electricity -Extended Image #1234 -Extended Image #1235 -Extended Image #1236 -Extended Image #1237 -Extended Image #1238 -Extended Image #1239 +Askosi Construction (Large) +Askosi Construction (Large) Shadow +Askosi Construction (Medium) +Askosi Construction (Medium) Shadow +Askosi Construction (Small) +Askosi Construction (Small) Shadow Extended Image #1240 Extended Image #1241 Extended Image #1242 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index d5e546c4..27c8d0ab 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 dd91991f..5b05eb17 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1083,9 +1083,9 @@ Landlock (Christmas) Serathiel Divine Discipline Field Intendent Electricity -Extended Sprite #569 -Extended Sprite #570 -Extended Sprite #571 +Askosi Construction (Large) +Askosi Construction (Medium) +Askosi Construction (Small) Extended Sprite #572 Extended Sprite #573 Extended Sprite #574 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 910854bf..3202f70f 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 14aeb861..41fb3178 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index a5246889..a346588a 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2490,4 +2490,118 @@ ElectroballSpecialState1: playsnd 2848 # Panoptus weaponhit 01 domissiledmg wait 1 - goto ElectroballGndAttkInit \ No newline at end of file + goto ElectroballGndAttkInit + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2236 Askosi Construction (Large) (cm\askosi\a-construction-large.grp) +.headerstart +IsId 29 +Type 14 +Init AskosiConstruction_Large_Init +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 AskosiConstruction_Large_SpecialState1 +SpecialState2 AskosiConstruction_Large_SpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AskosiConstruction_Large_Init: + playfram 0x00 + imgulnextid 0 0 # Askosi Construction (Large) Shadow (cm\askosi\a-construction-large-shadow.grp) + goto SkryrokorLocal00 + +AskosiConstruction_Large_SpecialState1: + playfram 1 + goto SkryrokorLocal00 + +AskosiConstruction_Large_SpecialState2: + playfram 2 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2237 Askosi Construction (Medium) (cm\askosi\a-construction-medium.grp) +.headerstart +IsId 30 +Type 14 +Init AskosiConstruction_Medium_Init +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 AskosiConstruction_Medium_SpecialState1 +SpecialState2 AskosiConstruction_Medium_SpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AskosiConstruction_Medium_Init: + playfram 0x00 + imgulnextid 0 0 # Askosi Construction (Medium) Shadow (cm\askosi\a-construction-medium-shadow.grp) + goto SkryrokorLocal00 + +AskosiConstruction_Medium_SpecialState1: + playfram 1 + goto SkryrokorLocal00 + +AskosiConstruction_Medium_SpecialState2: + playfram 2 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2238 Askosi Construction (Small) (cm\askosi\a-construction-small.grp) +.headerstart +IsId 31 +Type 14 +Init AskosiConstruction_Small_Init +Death ChantryDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 AskosiConstruction_Small_SpecialState1 +SpecialState2 AskosiConstruction_Small_SpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AskosiConstruction_Small_Init: + playfram 0x00 + imgulnextid 0 0 # Askosi Construction (Small) Shadow (cm\askosi\a-construction-small-shadow.grp) + goto SkryrokorLocal00 + +AskosiConstruction_Small_SpecialState1: + playfram 1 + goto SkryrokorLocal00 + +AskosiConstruction_Small_SpecialState2: + playfram 2 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/unit/cm/askosi/a-construction-large-shadow.grp b/mpq/unit/cm/askosi/a-construction-large-shadow.grp new file mode 100644 index 00000000..5d82831d Binary files /dev/null and b/mpq/unit/cm/askosi/a-construction-large-shadow.grp differ diff --git a/mpq/unit/cm/askosi/a-construction-large.grp b/mpq/unit/cm/askosi/a-construction-large.grp index 877b01dd..69b96692 100644 Binary files a/mpq/unit/cm/askosi/a-construction-large.grp and b/mpq/unit/cm/askosi/a-construction-large.grp differ diff --git a/mpq/unit/cm/askosi/a-construction-medium-shadow.grp b/mpq/unit/cm/askosi/a-construction-medium-shadow.grp new file mode 100644 index 00000000..98fcc992 Binary files /dev/null and b/mpq/unit/cm/askosi/a-construction-medium-shadow.grp differ diff --git a/mpq/unit/cm/askosi/a-construction-medium.grp b/mpq/unit/cm/askosi/a-construction-medium.grp index c6213da6..068e8500 100644 Binary files a/mpq/unit/cm/askosi/a-construction-medium.grp and b/mpq/unit/cm/askosi/a-construction-medium.grp differ diff --git a/mpq/unit/cm/askosi/a-construction-small-shadow.grp b/mpq/unit/cm/askosi/a-construction-small-shadow.grp new file mode 100644 index 00000000..3fc72534 Binary files /dev/null and b/mpq/unit/cm/askosi/a-construction-small-shadow.grp differ diff --git a/mpq/unit/cm/askosi/a-construction-small.grp b/mpq/unit/cm/askosi/a-construction-small.grp index 731e1f5e..b4004fed 100644 Binary files a/mpq/unit/cm/askosi/a-construction-small.grp and b/mpq/unit/cm/askosi/a-construction-small.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 49798a50..226f45a7 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ