This commit is contained in:
Simisays
2023-03-27 20:32:18 +02:00
parent 23bf195711
commit 50583f52d1
11 changed files with 381 additions and 160 deletions

1
.gitignore vendored
View File

@@ -83,3 +83,4 @@ forge-gui/tools/PerSetTrackingResults
*.tiled-session
*.tiled-session
*.tiled-session

View File

@@ -1,10 +1,10 @@
{
"activeFile": "map/cave_19.tmx",
"activeFile": "map/magetower_13.tmx",
"expandedProjectPaths": [
"tileset",
"map",
"obj",
"map/main_story"
"map/main_story",
"tileset"
],
"fileStates": {
"map/cave_1..tmx": {
@@ -195,11 +195,25 @@
}
},
"map/magetower_13.tmx": {
"expandedObjectLayers": [
4
],
"scale": 1.6941666666666666,
"selectedLayer": 0,
"selectedLayer": 5,
"viewCenter": {
"x": 240.2361042793901,
"y": 332.02164289227744
"x": 240.82636497786527,
"y": 331.4313821938023
}
},
"map/magetower_14.tmx": {
"expandedObjectLayers": [
4
],
"scale": 3,
"selectedLayer": 4,
"viewCenter": {
"x": 240,
"y": 136.16666666666663
}
},
"map/magetower_4.tmx": {
@@ -210,7 +224,7 @@
"selectedLayer": 5,
"viewCenter": {
"x": 240.21654135338346,
"y": 136.5654135338346
"y": 137.14285714285714
}
},
"map/magetower_5.tmx": {
@@ -221,7 +235,7 @@
"selectedLayer": 4,
"viewCenter": {
"x": 224.20210526315788,
"y": 136.08421052631581
"y": 136.62315789473683
}
},
"map/magetower_6.tmx": {
@@ -239,13 +253,35 @@
"expandedObjectLayers": [
4
],
"scale": 1.7317708333333333,
"scale": 3,
"selectedLayer": 3,
"viewCenter": {
"x": 239.63909774436092,
"x": 239,
"y": 110.5
}
},
"map/phyrexian_w1.tmx": {
"expandedObjectLayers": [
4
],
"scale": 1.7317708333333333,
"selectedLayer": 5,
"viewCenter": {
"x": 240.21654135338346,
"y": 136.5654135338346
}
},
"map/tibalt_f1.tmx": {
"expandedObjectLayers": [
12
],
"scale": 1.1294157608695652,
"selectedLayer": 5,
"viewCenter": {
"x": 368.332030075188,
"y": 224.45233082706767
}
},
"tileset/buildings.tsx": {
"scaleInDock": 1
},
@@ -254,39 +290,26 @@
}
},
"openFiles": [
"map/cave_1..tmx",
"map/cave_2.tmx",
"map/cave_3.tmx",
"map/cave_4.tmx",
"map/cave_5.tmx",
"map/cave_6.tmx",
"map/cave_7.tmx",
"map/cave_8.tmx",
"map/cave_9.tmx",
"map/cave_11.tmx",
"map/cave_12.tmx",
"map/cave_20.tmx",
"map/cave_22.tmx",
"map/cave_10.tmx",
"map/cave_14.tmx",
"map/cave_13.tmx",
"map/cave_15.tmx",
"map/cave_17.tmx",
"map/cave_19.tmx"
"map/magetower_5.tmx",
"map/magetower_4.tmx",
"map/magetower_1.tmx",
"map/magetower_8.tmx",
"map/magetower_6.tmx",
"map/magetower_13.tmx"
],
"project": "",
"recentFiles": [
"map/magetower_5.tmx",
"map/magetower_4.tmx",
"map/magetower_1.tmx",
"map/magetower_8.tmx",
"map/magetower_6.tmx",
"map/magetower_13.tmx",
"map/cave_19.tmx",
"map/cave_17.tmx",
"map/cave_15.tmx",
"map/cave_13.tmx",
"map/cave_10.tmx",
"map/cave_22.tmx",
"map/cave_20.tmx",
"map/cave_12.tmx",
"map/cave_11.tmx",
"map/cave_9.tmx",
"map/cave_8.tmx",
"map/cave_7.tmx"
"map/cave_22.tmx"
]
}

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="74">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="75">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -98,5 +98,6 @@
</object>
<object id="72" template="../obj/waypoint.tx" x="247" y="91.5"/>
<object id="73" template="../obj/waypoint.tx" x="161" y="92"/>
<object id="74" template="../obj/manashards.tx" x="234" y="189.5"/>
</objectgroup>
</map>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="83">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="101">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -9,7 +9,7 @@
}</property>
</properties>
<tileset firstgid="1" source="../tileset/main.tsx"/>
<tileset firstgid="6321" source="../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="6" name="Collision" width="30" height="30">
<data encoding="base64" compression="zlib">
eJztyDENAAAIwDAE4F8M6jgQAC9Jm+xZBAAAAB9UTtu7auBAAxk=
@@ -22,12 +22,12 @@
</layer>
<layer id="2" name="Walls" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzt0mEKgkAQhuH5Gyr439WD1VmqW3QWM72bKzYwLO5k0xcRjPCysqiPu9qXRL3neZ7n/UGnimgo8x2r75iPON4ORO1zTLuDbWkuba0Vbafmnj61LSbCzn3HvTXG9Wr/Lr9T8+I6xHqXg8+li16vts+/ckO9jl2Nd6fYtbD9U+d432h0g2Jr+8xmMLqanXMRpmZvuUgztS/FmnR5Dm1Km5OunH/3mTPAN3+e
eJzt0kEOgjAQheHZEsDENXgMbuJKz6LewrOA4N0s0TGTph1hfC5MpskfSAN8tNBXRL3neZ7n/UHHmuhW5TvUvzHHcLwWRLvXMW4A29KcS60Vbcfmkr61LSbCzn3HpTXG9Wr/Lr9T8+E6xHrnwefS5bn9FrNebZ9TLmqfNbfb0Hug3XvoUtr+qVO4bzK6rWJr+8xma3Q1O+ciTM1OuUgzts/lM+nyHNqUNiddOb/2mQ+rsX6u
</data>
</layer>
<layer id="7" name="Walls(Ex)" width="30" height="30">
<data encoding="base64" compression="zlib">
eJxjYBgFo2AUjIJRMAqGFpDlGWgXjIJRQD6ApV96p+ORZi82AHOD9CBwyygYBYMFAAAfygFw
eJxjYBgFo2AUjIJRMAqGFpDlGWgXjIJRQD6ApV96p+ORZu8oGAWjgDgAACmLASA=
</data>
</layer>
<layer id="3" name="Clutter" width="30" height="30">
@@ -35,7 +35,7 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo2AUjIJRMApGwSiAgDYqqxsFCCDLQ5l+aQr1owP0OKRnnNbxMzDUA3EDPx0tHQFgNP+OAnIAAPloBR8=
eJxjYBgFo2AUjIJRMApGwSiAgEZx4tS10dYZwxLI8lCmX5pC/egAPQ5H43TkAGLz+UCZNwroCwCDVQOr
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -44,32 +44,14 @@
<property name="teleport" value=""/>
</properties>
</object>
<object id="65" template="../obj/gate.tx" gid="4125" x="208" y="384" width="16" height="16">
<properties>
<property name="dialog">[{
&quot;text&quot;:&quot;A big gate is blocking the path&quot;,
&quot;options&quot;:[
{ &quot;name&quot;:&quot;go away&quot; },
{
&quot;name&quot;:&quot;unlock with blue key&quot;,
&quot;condition&quot;:[ { &quot;item&quot;: &quot;Blue Key&quot; } ],
&quot;text&quot;:&quot;The gate is unlocked&quot;,
&quot;options&quot;:[
{
&quot;name&quot;:&quot;continue&quot;,&quot;action&quot;:[{&quot;deleteMapObject&quot;:-1}]
}
]
}
]
}]</property>
</properties>
</object>
<object id="66" template="../obj/enemy.tx" x="176" y="400">
<object id="66" template="../obj/enemy.tx" x="163.605" y="388.194">
<properties>
<property name="enemy" value="Doppelganger"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="95,86,96,86"/>
</properties>
</object>
<object id="75" template="../obj/enemy.tx" x="96" y="320">
<object id="75" template="../obj/enemy.tx" x="106.034" y="305.243">
<properties>
<property name="defeatDialog">[
{
@@ -84,9 +66,11 @@
&quot;startBattleWithCard&quot;: [ &quot;Fellwar Stone&quot; ]
}</property>
<property name="enemy" value="Doppelganger"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="88,91,89"/>
</properties>
</object>
<object id="74" template="../obj/enemy.tx" x="211" y="252">
<object id="74" template="../obj/enemy.tx" x="231.069" y="255.542">
<properties>
<property name="effect">{
&quot;lifeModifier&quot;: 15,
@@ -94,23 +78,29 @@
&quot;startBattleWithCard&quot;: [ &quot;Fellwar Stone&quot;, &quot;Frozen Aether&quot; ]
}</property>
<property name="enemy" value="Doppelganger"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="94,98"/>
</properties>
</object>
<object id="71" template="../obj/enemy.tx" x="123" y="368">
<object id="71" template="../obj/enemy.tx" x="140.117" y="386.888">
<properties>
<property name="effect">{
&quot;lifeModifier&quot;: 10,
&quot;startBattleWithCard&quot;: [ &quot;Hesitation&quot;, &quot;Hesitation&quot; ]
}</property>
<property name="enemy" value="Blue Wiz3"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="87,96"/>
</properties>
</object>
<object id="67" template="../obj/enemy.tx" x="240" y="400">
<object id="67" template="../obj/enemy.tx" x="247.673" y="379.931">
<properties>
<property name="enemy" value="Djinn"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="87,85,87,97"/>
</properties>
</object>
<object id="82" template="../obj/enemy.tx" x="208" y="352">
<object id="82" template="../obj/enemy.tx" x="205.049" y="301.238">
<properties>
<property name="effect">{
&quot;lifeModifier&quot;: 30,
@@ -120,11 +110,15 @@
}
}</property>
<property name="enemy" value="Djinn"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="100,93,92,93"/>
</properties>
</object>
<object id="80" template="../obj/enemy.tx" x="288" y="312">
<object id="80" template="../obj/enemy.tx" x="285.049" y="316.722">
<properties>
<property name="enemy" value="Blue Wiz3"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="90,91,88"/>
</properties>
</object>
<object id="68" template="../obj/scroll.tx" x="96" y="352">
@@ -223,7 +217,7 @@
</property>
</properties>
</object>
<object id="70" template="../obj/gold.tx" x="96" y="384">
<object id="70" template="../obj/gold.tx" x="90.0974" y="384">
<properties>
<property name="reward">[
{
@@ -269,7 +263,7 @@
}]</property>
</properties>
</object>
<object id="73" template="../obj/treasure.tx" x="192" y="256">
<object id="73" template="../obj/treasure.tx" x="186.097" y="254.229">
<properties>
<property name="reward">[{
&quot;type&quot;: &quot;randomCard&quot;,
@@ -282,5 +276,23 @@
}]</property>
</properties>
</object>
<object id="83" template="../obj/waypoint.tx" x="249.944" y="418.758"/>
<object id="84" template="../obj/waypoint.tx" x="249.944" y="418.758"/>
<object id="85" template="../obj/waypoint.tx" x="249.944" y="418.758"/>
<object id="86" template="../obj/waypoint.tx" x="158.454" y="428.203"/>
<object id="87" template="../obj/waypoint.tx" x="295.984" y="393.377"/>
<object id="88" template="../obj/waypoint.tx" x="124.218" y="316.053"/>
<object id="89" template="../obj/waypoint.tx" x="157.273" y="262.93"/>
<object id="90" template="../obj/waypoint.tx" x="265.881" y="301.887"/>
<object id="91" template="../obj/waypoint.tx" x="179.703" y="305.428"/>
<object id="92" template="../obj/waypoint.tx" x="206.855" y="416.988"/>
<object id="93" template="../obj/waypoint.tx" x="208.035" y="339.073"/>
<object id="94" template="../obj/waypoint.tx" x="263.52" y="251.715"/>
<object id="95" template="../obj/waypoint.tx" x="161.405" y="350.288"/>
<object id="96" template="../obj/waypoint.tx" x="114.774" y="388.065"/>
<object id="97" template="../obj/waypoint.tx" x="292.443" y="355.601"/>
<object id="98" template="../obj/waypoint.tx" x="205.084" y="251.715"/>
<object id="99" template="../obj/manashards.tx" x="112.413" y="408.134"/>
<object id="100" template="../obj/waypoint.tx" x="216.299" y="293.623"/>
</objectgroup>
</map>

View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="66">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="99">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../tileset/main.tsx"/>
<tileset firstgid="3477" source="../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="6" name="Collision" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFo2AUjIJRMApGwWAFu3ggmJAYsQAA2igDGQ==
eJxjYBgFo2AUjIKRA1ZwIDA9gRsnAtPSDhM+2toxWO1Fx8PJ3l08EPuQMUgMhMkBALjxDFA=
</data>
</layer>
<layer id="1" name="Background" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxr4mZgaBrFo3gUj+JRPIpH8YjAAJnxGPY=
eJxr4mZgaBrFo3gUj+JRPOSxDA8DGIDoUXuHp70wTIk5AJTeEms=
</data>
</layer>
<layer id="2" name="Walls" width="30" height="17">
<data encoding="base64" compression="zlib">
eJzN1G0KgCAMBmD/myewLlZnqa7V590yYjBkzW1INBhBNR/fCJfGueWDbrOWzAzBua157z7Uc+H5be7pytUqsDV5c5PKKrWlriSnJrfEtZglW+J2RhMqGvNy/y7sKRbeq50Xu7Xz/tGVlNU9U8/eZo5p7jC6LWNz3xlMal3NOUnZby5nas9Jyqbckql1sT35p7EL90qmxc1nsKvdP+4Lkd3cuQ==
eJzN1F8KgzAMBvC+q3vbk+5i7ixuV/EY/pmX8ERWJCyU2H4JRQx8CGr8NSodSueGC9IEQXrelXNTeZ62yufS9d2c/TFWI2Br5g1NaVbURl1kTs3ciGsxUzbivowmVW2cN/bv0prqxH255+Vu7nnv6CJldRefb4E7/fOfzvf9jG4TsaX3vD6OkCk9V7NPSvbZ942Z2n1SsiU3ZWpdbn+KI9ylcynT4oY9vLTr59kAetHgSA==
</data>
</layer>
<layer id="3" name="Clutter" width="30" height="17">
@@ -25,19 +25,135 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFIxm0UVndKEAAWR7K9EtTqB8doMfhaJwOfTCaf0cBOQAADEIDdQ==
eJxjYBgFIxk48aDy37EzMHxih9DIoI3K9oqzUUfNYAayPITV4APSFOjnEkVlgzB6HLYhyWHTNxzBVF4GhmlIeDov5Wai5yEQqONGYBAw5gPmKTEGhgXQ8DXlo9xeECCULy8C7ekRZ2C4xAfBl6lkLyHQxI1K0wOIAMsLUSAWG+LlBj0AALryE3E=
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="38" template="../obj/entry_up.tx" x="208.333" y="270.665">
<properties>
<property name="teleport" value=""/>
</properties>
</object>
<object id="65" template="../obj/enemy.tx" x="208.065" y="45.9508">
<object id="68" template="../obj/enemy.tx" x="287.074" y="141.29">
<properties>
<property name="enemy" value="Mimic"/>
</properties>
</object>
<object id="69" template="../obj/enemy.tx" x="128.033" y="143.933">
<properties>
<property name="enemy" value="Mimic"/>
</properties>
</object>
<object id="70" template="../obj/entry_up.tx" x="272.342" y="211.743" width="17.0844" height="22.8929" rotation="267.698">
<properties>
<property name="direction" value="down"/>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
</properties>
</object>
<object id="71" template="../obj/treasure.tx" x="210.851" y="46.2797">
<properties>
<property name="reward" value="[{&quot;type&quot;: &quot;randomCard&quot;, &quot;count&quot;: 10 }, {&quot;type&quot;: &quot;item&quot;,&quot;count&quot;: 1,&quot;probability&quot;:0.2,&quot;itemName&quot;: &quot;Dark Armor&quot;}]"/>
</properties>
</object>
<object id="72" template="../obj/enemy.tx" x="166.965" y="95.3624">
<properties>
<property name="enemy" value="Eye"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="75,79,75,77,75,80,78,76,80"/>
</properties>
</object>
<object id="73" template="../obj/enemy.tx" x="256.469" y="90.7429">
<properties>
<property name="enemy" value="Eye"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="79,75,77,75,80,78,76,80,75"/>
</properties>
</object>
<object id="74" template="../obj/enemy.tx" x="146.177" y="188.331">
<properties>
<property name="enemy" value="Eye"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="76,80,75,79,75,77,75,80,78"/>
</properties>
</object>
<object id="75" template="../obj/waypoint.tx" x="208.94" y="114.578"/>
<object id="76" template="../obj/waypoint.tx" x="125.967" y="174.472"/>
<object id="77" template="../obj/waypoint.tx" x="149.642" y="73.4195"/>
<object id="78" template="../obj/waypoint.tx" x="297.468" y="165.491"/>
<object id="79" template="../obj/waypoint.tx" x="272.638" y="60.7158"/>
<object id="80" template="../obj/waypoint.tx" x="209.119" y="173.317"/>
<object id="81" template="../obj/waypoint.tx" x="148.487" y="233.371"/>
<object id="82" template="../obj/gold.tx" x="109.798" y="107.489"/>
<object id="83" template="../obj/gold.tx" x="172.162" y="230.484"/>
<object id="84" template="../obj/gold.tx" x="172.74" y="214.893"/>
<object id="85" template="../obj/gold.tx" x="171.008" y="247.23"/>
<object id="86" template="../obj/gold.tx" x="110.953" y="93.0526"/>
<object id="87" template="../obj/gold.tx" x="91.3203" y="108.066"/>
<object id="88" template="../obj/gold.tx" x="317.678" y="109.221"/>
<object id="89" template="../obj/gold.tx" x="311.904" y="94.785"/>
<object id="90" template="../obj/gold.tx" x="298.045" y="108.066"/>
<object id="91" template="../obj/treasure.tx" x="303.242" y="143.534">
<properties>
<property name="reward" value="[{&quot;type&quot;: &quot;randomCard&quot;, &quot;count&quot;: 10 }, {&quot;type&quot;: &quot;item&quot;,&quot;count&quot;: 1,&quot;probability&quot;:0.2,&quot;itemName&quot;: &quot;Dark Armor&quot;}]"/>
</properties>
</object>
<object id="92" template="../obj/treasure.tx" x="111.775" y="144.778">
<properties>
<property name="reward" value="[{&quot;type&quot;: &quot;randomCard&quot;, &quot;count&quot;: 10 }, {&quot;type&quot;: &quot;item&quot;,&quot;count&quot;: 1,&quot;probability&quot;:0.2,&quot;itemName&quot;: &quot;Dark Armor&quot;}]"/>
</properties>
</object>
<object id="94" template="../obj/manashards.tx" x="152.667" y="45"/>
<object id="96" template="../obj/manashards.tx" x="180.667" y="44.3333"/>
<object id="97" template="../obj/booster.tx" x="99" y="170.333">
<properties>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;M14&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M14&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M14&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 1,
&quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
}
]
</property>
</properties>
</object>
<object id="98" template="../obj/booster.tx" x="254.667" y="44.3333">
<properties>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;M13&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M13&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M13&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 1,
&quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
}
]
</property>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="92">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="93">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -169,5 +169,6 @@
<property name="waypoints" value="81,82"/>
</properties>
</object>
<object id="92" template="../obj/manashards.tx" x="202" y="153"/>
</objectgroup>
</map>

View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="82">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="107">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../tileset/main.tsx"/>
<tileset firstgid="3477" source="../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="6" name="Collision" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBj8QJaHgUGaB8KWRmIPV3ujeBkYonkR9sLYtAY7gXbt5sFkj4JRMApGwSgYGLCLB4GJEScGAADolQpX
eJxjYBj8QJaHgUGaB8KWRmLTCpjwQTA2e2FytARRvAwM0bwIe2FsWoOdQLt282CyhxNAjz8Yn5Zxis2OUXtH7R0Fo4AYsIsHgYkRJwYAABuBFGU=
</data>
</layer>
<layer id="1" name="Background" width="30" height="17">
<data encoding="base64" compression="zlib">
eJybzMnAMHkUj+JRPIpH8SgexSMCAwDxIjbY
eJybzMnAMHkUj+JRPIpH8bDHO3gG3g2jeOAxAEJuNwA=
</data>
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJzt1FsKgCAQBVD/zRVoG6u1WNuy194yYkik8s4QfUTCRVDGM4IYKqXCC3FZkJrWKDVW12nMcy7tb+YU57sxADbnvoiJ2qjLMREbcSVmyUbcWmjSsML7/u633SWm1zLTx7pZ6DqhTebZuZx/kmPfmdx/ErVLJtdN7U7voR68PtZKpsTNa+itW0H/aVYIl805
eJzl1GsKgCAQBGDpX2gnqC5WZ+lxLHvdLSWWIipntwgiYQiM7XMgtEYp+0KyXZCZMlGqN+cpkudceu/NwT2vVgfYnL6IidqoyzERG3ElZshG3Fxo0kqFfe+6rf5X36+5k0ujZWbl5kahmwltb0bx8Xc59yTHpp5XXdB7ErVDJtfd2rVeQmeo9LoXMiXufob+9VRw/m1mPKPM4A==
</data>
</layer>
<layer id="3" name="Clutter" width="30" height="17">
@@ -25,7 +25,7 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBj8YA8/BKOzh6u9vAIMDHwCmGxags/spImPAuIAcviRyh4FpIEF/OSzRwF5AFcYjobt4AYAEOASbg==
eJxjYBj8YIUmBKOzaQWCBCEYm70g8QBB2tr/E2jPL01U9jt22to5EsAhCQTGJ0Zt8E8SgfGJgYA0DwPDLh4IG0aTC5QlEBifGMxeagFSwtmYD0KniFBuLynhDLOXGoCccG4Rp579xACYvXJUjGdS7B0FgwsAAL1qK7A=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -34,94 +34,155 @@
<property name="teleport" value=""/>
</properties>
</object>
<object id="50" template="../obj/enemy.tx" x="207.402" y="69.0586">
<object id="50" template="../obj/enemy.tx" x="291.132" y="96.7759">
<properties>
<property name="enemy" value="Red Wiz1"/>
<property name="enemy" value="Illusionist"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="92,95,97,93,97,95,92,102,101"/>
</properties>
</object>
<object id="65" template="../obj/treasure.tx" x="208" y="47.5"/>
<object id="66" template="../obj/door_up.tx" x="160" y="176">
<object id="65" template="../obj/treasure.tx" x="208" y="47.5">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="reward" value="[{&quot;type&quot;: &quot;randomCard&quot;,&quot;colors&quot;: [&quot;Blue&quot;], &quot;count&quot;: 5 }, {&quot;type&quot;: &quot;item&quot;,&quot;count&quot;: 1,&quot;probability&quot;:0.2,&quot;itemName&quot;: &quot;Staff of the Mind Magus&quot;}]"/>
</properties>
</object>
<object id="67" template="../obj/door_up.tx" x="111" y="175.5">
<object id="83" template="../obj/booster.tx" x="227.311" y="125.723">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;M11&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M10&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M10&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 1,
&quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
}
]
</property>
</properties>
</object>
<object id="69" template="../obj/door_up.tx" x="207.5" y="175">
<object id="84" template="../obj/enemy.tx" x="179.092" y="220.668">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Illusionist"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="93,94"/>
</properties>
</object>
<object id="70" template="../obj/door_up.tx" x="256.5" y="175.5">
<object id="85" template="../obj/enemy.tx" x="266.286" y="196.992">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Illusionist"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="97,95,92,95"/>
</properties>
</object>
<object id="71" template="../obj/door_up.tx" x="303.5" y="176.5">
<object id="86" template="../obj/enemy.tx" x="168.12" y="149.642">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Illusionist"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="96,98,102,92,102,98"/>
</properties>
</object>
<object id="72" template="../obj/door_up.tx" x="160.5" y="223.5">
<object id="87" template="../obj/enemy.tx" x="168.12" y="93.6301">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Illusionist"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="101,102,92,95,92,102"/>
</properties>
</object>
<object id="73" template="../obj/door_up.tx" x="257" y="80">
<object id="88" template="../obj/enemy.tx" x="209.119" y="63.0256">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Djinn"/>
<property name="threatRange" type="int" value="30"/>
</properties>
</object>
<object id="74" template="../obj/door_up.tx" x="143.5" y="127.5">
<object id="89" template="../obj/booster.tx" x="108.019" y="174.228">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;M10&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M10&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
},
{
&quot;editions&quot;: [ &quot;M10&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 1,
&quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
&quot;colors&quot;: [ &quot;Blue&quot; ]
}
]
</property>
</properties>
</object>
<object id="75" template="../obj/door_up.tx" x="191.5" y="128.5">
<object id="91" template="../obj/enemy.tx" x="87.8556" y="145.6">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="enemy" value="Illusionist"/>
<property name="reward">[
{
&quot;type&quot;: &quot;item&quot;,
&quot;probability&quot;: 1,
&quot;count&quot;: 1,
&quot;itemName&quot;: &quot;Illusionist's Key&quot;
}
]
</property>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="99,100,101,100"/>
</properties>
</object>
<object id="76" template="../obj/door_up.tx" x="240.5" y="128">
<object id="92" template="../obj/waypoint.tx" x="266.286" y="89.0105"/>
<object id="93" template="../obj/waypoint.tx" x="250.117" y="227.597"/>
<object id="94" template="../obj/waypoint.tx" x="129.432" y="217.78"/>
<object id="95" template="../obj/waypoint.tx" x="262.244" y="128.277"/>
<object id="96" template="../obj/waypoint.tx" x="169.853" y="194.683"/>
<object id="97" template="../obj/waypoint.tx" x="266.863" y="169.853"/>
<object id="98" template="../obj/waypoint.tx" x="161.923" y="98.817"/>
<object id="99" template="../obj/waypoint.tx" x="87.8556" y="173.895"/>
<object id="100" template="../obj/waypoint.tx" x="96.0997" y="112.019" width="10.6667" height="11.6667"/>
<object id="101" template="../obj/waypoint.tx" x="130.108" y="77.4516"/>
<object id="102" template="../obj/waypoint.tx" x="197.57" y="89.588"/>
<object id="104" template="../obj/entry_up.tx" x="320.565" y="158.304">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="teleport" value="maps/map/magetower_14.tmx"/>
</properties>
</object>
<object id="77" template="../obj/door_up.tx" x="288.5" y="128.5">
<object id="105" template="../obj/manashards.tx" x="158.667" y="68.6667"/>
<object id="106" template="../obj/gate.tx" x="320.167" y="133" width="14.9999" height="22">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
</properties>
</object>
<object id="79" template="../obj/door_up.tx" x="96" y="128">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
</properties>
</object>
<object id="80" template="../obj/door_up.tx" x="161" y="79">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
</properties>
</object>
<object id="81" template="../obj/door_up.tx" x="256.5" y="225.5">
<properties>
<property name="teleport" value="maps/map/magetower_8.tmx"/>
<property name="teleportObjectId" value="73"/>
<property name="dialog">[{
&quot;text&quot;:&quot;This door is locked&quot;,
&quot;options&quot;:[
{ &quot;name&quot;:&quot;go away&quot; },
{
&quot;name&quot;:&quot;unlock with Illusionist's key&quot;,
&quot;condition&quot;:[{&quot;item&quot;:&quot;Illusionist's Key&quot;}],
&quot;text&quot;:&quot;The gate is unlocked&quot;,
&quot;options&quot;:[{&quot;name&quot;:&quot;continue&quot;, &quot;action&quot;:[ {&quot;deleteMapObject&quot;:-1},{&quot;removeItem&quot;:&quot;Illusionist's Key&quot;}]} ]
}
]
}]</property>
</properties>
</object>
</objectgroup>

View File

@@ -89,9 +89,7 @@
"MageTowerU3",
"MageTowerU4",
"MageTowerU5",
"MageTowerU6",
"MageTowerU7",
"MageTowerUD",
"MerfolkPool",
"MerfolkPool1",
"MerfolkPool2",

View File

@@ -3613,6 +3613,14 @@
"rarity": [
"common",
"uncommon",
"rare"
]
},
{
"type": "deckCard",
"probability": 0.25,
"count": 1,
"rarity": [
"rare",
"mythicrare",
"special"
@@ -4283,9 +4291,9 @@
"decks/eye.dck"
],
"ai": "",
"flying": false,
"flying": true,
"spawnRate": 1,
"scale":0.80,
"scale":0.85,
"difficulty": 0.1,
"speed": 25,
"life": 25,
@@ -4294,7 +4302,11 @@
"type": "deckCard",
"probability": 1,
"count": 2,
"addMaxCount": 4
"addMaxCount": 4,
"rarity": [
"uncommon",
"common"
]
},
{
"type": "card",

View File

@@ -207,12 +207,17 @@
"iconName": "StrangeKey",
"questItem": true
},
{
{
"name": "Torturer's Key",
"iconName": "StrangeKey",
"questItem": true
},
{
{
"name": "Illusionist's Key",
"iconName": "StrangeKey",
"questItem": true
},
{
"name": "Tibalt's Key",
"iconName": "StrangeKey",
"questItem": true

View File

@@ -1362,15 +1362,6 @@
"map": "maps/map/magetower_6.tmx",
"radiusFactor": 0.8
},
{
"name": "MageTowerU6",
"type": "dungeon",
"count": 2,
"spriteAtlas": "maps/tileset/buildings.atlas",
"sprite": "MageTower",
"map": "maps/map/magetower_7.tmx",
"radiusFactor": 0.8
},
{
"name": "MageTowerU7",
"type": "dungeon",