From 894221c6f76a4a2e2366a35151f246f78d4ea217 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 15 Sep 2012 02:26:12 +0000 Subject: [PATCH] Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor. - The new Items tag is necessary for that. Necessary items tripwire and claymore have been added. These new items are intended for the map editor, they will however work like their original ingame. - The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1538 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Items.xml | 708 ++++++++++++++++++ .../TableData/MapAction/ActionItems.xml | 168 +++-- 2 files changed, 804 insertions(+), 72 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index d982d2c02..afc699355 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -174,6 +174,7 @@ 0 0 0.0 + 0 0 0 @@ -46007,6 +46008,7 @@ 1 1 100.0 + 256 @@ -46038,6 +46040,7 @@ 1 1 100.0 + 17 @@ -47516,4 +47519,709 @@ + + + 1584NORTHEAST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 512 + + + + + + 1585EAST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 1024 + + + + + + 1586SOUTHEAST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 2048 + + + + + + 1587SOUTH DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 4096 + + + + + + 1588SOUTHWEST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 8192 + + + + + + 1589WEST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 16384 + + + + + + 1590NORTHWEST DIRECTION (map editor only)--> + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. + 512 + 1 + 85 + 18 + 2 + 97 + 16 + 1 + 17 + 1250 + 5 + -4 + 1 + 1 + 1 + 1 + 4 + 1 + 1 + 1 + 1 + 100.0 + 32768 + + + + + + + 1591 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 33 + + + + + + 1592 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 65 + + + + + + 1593 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 129 + + + + + + 1594 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 18 + + + + + + 1595 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 34 + + + + + + 1596 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 66 + + + + + + 1597 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 130 + + + + + + 1598 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 20 + + + + + + 1599 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 36 + + + + + + 1600 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 68 + + + + + + 1601 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 132 + + + + + + 1602 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 24 + + + + + + 1603 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 40 + + + + + + 1604 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 72 + + + + + + 1605 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 86 + 18 + 2 + 66 + 1 + 8 + 10 + 10 + 3 + 1 + 1 + 1 + 40 + 25 + 1 + 1 + 1 + 136 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml index 99ed8f04d..4c9f42200 100644 --- a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml +++ b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml @@ -283,147 +283,171 @@ BombItem: 34 - Empty action - 0 - 0 + M18 Claymore, NORTH + 3 + 1 + 1523 35 - Empty action - 0 - 0 + M18 Claymore, NORTHEAST + 3 + 1 + 1584 36 - Empty action - 0 - 0 + M18 Claymore, EAST + 3 + 1 + 1585 37 - Empty action - 0 - 0 + M18 Claymore, SOUTHEAST + 3 + 1 + 1586 38 - Empty action - 0 - 0 + M18 Claymore, SOUTH + 3 + 1 + 1587 39 - Empty action - 0 - 0 + M18 Claymore, SOUTHWEST + 3 + 1 + 1588 40 - Empty action - 0 - 0 + M18 Claymore, WEST + 3 + 1 + 1589 41 - Empty action - 0 - 0 + M18 Claymore, NORTHWEST + 3 + 1 + 1590 42 - Empty action - 0 - 0 + Tripwire Net 1 Lvl 1 + 3 + 1 + 1524 43 - Empty action - 0 - 0 + Tripwire Net 1 Lvl 2 + 3 + 1 + 1591 44 - Empty action - 0 - 0 + Tripwire Net 1 Lvl 3 + 3 + 1 + 1592 45 - Empty action - 0 - 0 + Tripwire Net 1 Lvl 4 + 3 + 1 + 1593 46 - Empty action - 0 - 0 + Tripwire Net 2 Lvl 1 + 3 + 1 + 1594 47 - Empty action - 0 - 0 + Tripwire Net 2 Lvl 2 + 3 + 1 + 1595 48 - Empty action - 0 - 0 + Tripwire Net 2 Lvl 3 + 3 + 1 + 1596 49 - Empty action - 0 - 0 + Tripwire Net 2 Lvl 4 + 3 + 1 + 1597 50 - Empty action - 0 - 0 + Tripwire Net 3 Lvl 1 + 3 + 1 + 1598 51 - Empty action - 0 - 0 + Tripwire Net 3 Lvl 2 + 3 + 1 + 1599 52 - Empty action - 0 - 0 + Tripwire Net 3 Lvl 3 + 3 + 1 + 1600 53 - Empty action - 0 - 0 + Tripwire Net 3 Lvl 4 + 3 + 1 + 1601 54 - Empty action - 0 - 0 + Tripwire Net 4 Lvl 1 + 3 + 1 + 1602 55 - Empty action - 0 - 0 + Tripwire Net 4 Lvl 2 + 3 + 1 + 1603 56 - Empty action - 0 - 0 + Tripwire Net 4 Lvl 3 + 3 + 1 + 1604 57 - Empty action - 0 - 0 + Tripwire Net 4 Lvl 4 + 3 + 1 + 1605 58