Merge pull request #3412 from schnautzr/amonkhet

Amonkhet
This commit is contained in:
Anthony Calosa
2023-07-08 07:57:20 +08:00
committed by GitHub
7 changed files with 1509 additions and 98 deletions

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.1" name="desertbuildingtiles" tilewidth="16" tileheight="16" tilecount="1036" columns="28">
<image source="../tileset/desertbuildingtiles.png" width="448" height="592"/>
</tileset>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="16" nextobjectid="47">
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="16" nextobjectid="48">
<tileset firstgid="1" name="autotiles" tilewidth="16" tileheight="16" tilecount="432" columns="12">
<image source="../../world/tilesets/autotiles.png" width="192" height="576"/>
</tileset>
@@ -518,7 +518,82 @@
</tile>
</tileset>
<tileset firstgid="10581" source="../tileset/buildings.tsx"/>
<tileset firstgid="12373" source="../tileset/buildings.tsx"/>
<tileset firstgid="12373" source="../tileset/buildings-nocollide.tsx"/>
<objectgroup id="7" name="Invisible">
<object id="4" template="../obj/exit.tx" name="Hekma" x="8" y="0" width="1016" height="1" visible="0"/>
<object id="5" template="../obj/exit.tx" name="Hekma" x="1023" y="-1" width="1" height="1025" visible="0"/>
<object id="6" template="../obj/exit.tx" name="Hekma" x="0" y="1018" width="1022" height="6" visible="0"/>
<object id="7" template="../obj/exit.tx" name="Hekma" x="0" y="0" width="4" height="1016" visible="0"/>
<object id="25" template="../obj/shop.tx" x="721" y="80" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="26" template="../obj/shop.tx" x="721" y="192" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="27" template="../obj/shop.tx" x="673" y="144" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="33" template="../obj/shop.tx" x="641" y="96" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="28" template="../obj/shop.tx" x="753" y="63" width="14" height="13" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="31" template="../obj/shop.tx" x="833" y="48" width="14" height="15" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="29" template="../obj/shop.tx" x="769" y="128" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="30" template="../obj/inn.tx" x="721" y="128" width="14" height="16" visible="0"/>
<object id="36" template="../obj/portal.tx" x="709" y="333" visible="1">
<properties>
<property name="direction" value="left"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun.tmx"/>
<property name="teleportObjectId" value="37"/>
</properties>
</object>
<object id="37" template="../obj/portal.tx" x="653" y="349" visible="1">
<properties>
<property name="direction" value="right"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun.tmx"/>
<property name="teleportObjectId" value="36"/>
</properties>
</object>
<object id="38" template="../obj/waypoint.tx" x="150" y="396" visible="0"/>
<object id="8" template="../obj/entry_down.tx" x="592" y="32" width="16" height="16" visible="1"/>
<object id="47" template="../obj/portal.tx" name="Training Area" x="144" y="417" visible="1">
<properties>
<property name="direction" value="down"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun/gym.tmx"/>
<property name="teleportObjectId" value="1"/>
</properties>
</object>
</objectgroup>
<layer id="1" name="Ground" width="64" height="64" locked="1">
<data encoding="csv">
74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,4657,32,4184,4184,4184,4184,4184,4184,4184,32,4657,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
@@ -933,73 +1008,6 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<objectgroup id="7" name="Invisible">
<object id="4" template="../obj/exit.tx" name="Hekma" x="8" y="0" width="1016" height="1" visible="0"/>
<object id="5" template="../obj/exit.tx" name="Hekma" x="1023" y="-1" width="1" height="1025" visible="0"/>
<object id="6" template="../obj/exit.tx" name="Hekma" x="0" y="1018" width="1022" height="6" visible="0"/>
<object id="7" template="../obj/exit.tx" name="Hekma" x="0" y="0" width="4" height="1016" visible="0"/>
<object id="25" template="../obj/shop.tx" x="721" y="80" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="26" template="../obj/shop.tx" x="721" y="192" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="27" template="../obj/shop.tx" x="673" y="144" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="33" template="../obj/shop.tx" x="641" y="96" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="28" template="../obj/shop.tx" x="753" y="63" width="14" height="13" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="31" template="../obj/shop.tx" x="833" y="48" width="14" height="15" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="29" template="../obj/shop.tx" x="769" y="128" width="14" height="14" visible="0">
<properties>
<property name="signXOffset" type="float" value="3"/>
<property name="signYOffset" type="float" value="8"/>
</properties>
</object>
<object id="30" template="../obj/inn.tx" x="721" y="128" width="14" height="16" visible="0"/>
<object id="36" template="../obj/portal.tx" x="709" y="333" visible="1">
<properties>
<property name="direction" value="left"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun.tmx"/>
<property name="teleportObjectId" value="37"/>
</properties>
</object>
<object id="37" template="../obj/portal.tx" x="653" y="349" visible="1">
<properties>
<property name="direction" value="right"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun.tmx"/>
<property name="teleportObjectId" value="36"/>
</properties>
</object>
<object id="38" template="../obj/waypoint.tx" x="150" y="396" visible="0"/>
<object id="8" template="../obj/entry_down.tx" x="592" y="32" width="16" height="16" visible="1"/>
</objectgroup>
<objectgroup id="15" name="Enemies">
<object id="42" template="../obj/enemy.tx" name="Khenra" x="137" y="396">
<properties>
@@ -1052,7 +1060,7 @@
]
}
]</property>
<property name="enemy" value="Master White Wizard"/>
<property name="enemy" value="Warrior"/>
</properties>
</object>
<object id="45" template="../obj/enemy.tx" name="Mummy" gid="2147495535" x="151" y="396" width="16" height="16">
@@ -1061,6 +1069,5 @@
<property name="waypoints" value="38"/>
</properties>
</object>
<object id="46" template="../obj/portal.tx" name="Training Area" x="144" y="416"/>
</objectgroup>
</map>

View File

@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="20">
<tileset firstgid="1" source="autotiles.tsx"/>
<tileset firstgid="433" source="../tileset/main.tsx"/>
<tileset firstgid="10545" source="desertbuildingtiles.tsx"/>
<tileset firstgid="11581" source="../tileset/buildings.tsx"/>
<tileset firstgid="1" source="../autotiles.tsx"/>
<tileset firstgid="433" source="../../tileset/main.tsx"/>
<tileset firstgid="10545" source="../../tileset/desertbuildingtiles.tsx"/>
<tileset firstgid="11581" source="../../tileset/buildings.tsx"/>
<objectgroup id="3" name="Hidden Objects" locked="1">
<object id="1" template="../../obj/portal.tx" x="672" y="333" width="16" height="16" visible="1">
<properties>
<property name="direction" value="up"/>
<property name="portalState" value="active"/>
<property name="teleport" value="../common/maps/map/naktamun.tmx"/>
<property name="teleportObjectId" value="47"/>
</properties>
</object>
</objectgroup>
<layer id="1" name="Ground" width="100" height="50" locked="1">
<data encoding="csv">
2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,
@@ -58,14 +68,6 @@
2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452
</data>
</layer>
<objectgroup id="3" name="Hidden Objects" locked="1">
<object id="1" template="../obj/portal.tx" x="671.5" y="351.5">
<properties>
<property name="direction" value="up"/>
</properties>
</object>
<object id="10" template="../obj/entry_up.tx" x="672" y="352"/>
</objectgroup>
<layer id="2" name="Buildings" width="100" height="50" locked="1">
<properties>
<property name="spriteLayer" type="bool" value="true"/>
@@ -178,37 +180,37 @@
</data>
</layer>
<objectgroup id="4" name="Enemies" locked="1">
<object id="12" template="../obj/enemy.tx" name="Falcon-headed Aven Initiate" x="592" y="320">
<object id="12" template="../../obj/enemy.tx" name="Falcon-headed Aven Initiate" x="592" y="320">
<properties>
<property name="enemy" value="Falcon-headed Aven Warrior"/>
</properties>
</object>
<object id="13" template="../obj/enemy.tx" name="Ibis-headed Aven Initiate" x="592" y="272">
<object id="13" template="../../obj/enemy.tx" name="Ibis-headed Aven Initiate" x="592" y="272">
<properties>
<property name="enemy" value="Ibis-headed Aven Warrior"/>
</properties>
</object>
<object id="14" template="../obj/enemy.tx" name="Minotaur Initiate" x="592" y="224">
<object id="14" template="../../obj/enemy.tx" name="Minotaur Initiate" x="592" y="224">
<properties>
<property name="enemy" value="Amonkhet Minotaur Warrior"/>
</properties>
</object>
<object id="15" template="../obj/enemy.tx" name="Khenra Initiate" x="752" y="224">
<object id="15" template="../../obj/enemy.tx" name="Khenra Initiate" x="752" y="224">
<properties>
<property name="enemy" value="Khenra Warrior"/>
</properties>
</object>
<object id="16" template="../obj/enemy.tx" name="Naga Initiate" x="752" y="272">
<object id="16" template="../../obj/enemy.tx" name="Naga Initiate" x="752" y="272">
<properties>
<property name="enemy" value="Naga Warrior"/>
</properties>
</object>
<object id="17" template="../obj/enemy.tx" name="Human Initiate" x="752" y="320">
<object id="17" template="../../obj/enemy.tx" name="Human Initiate" x="752" y="320">
<properties>
<property name="enemy" value="Warrior"/>
</properties>
</object>
<object id="18" template="../obj/enemy.tx" name="Anointed" x="672" y="224">
<object id="18" template="../../obj/enemy.tx" name="Anointed" x="672" y="224">
<properties>
<property name="enemy" value="Mummy"/>
</properties>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -43,8 +43,8 @@
"x": 0.5,
"y": 0.5,
"structureAtlasPath": "world/tilesets/terrain.atlas",
"sourcePath": "world/models/fill.png",
"maskPath": "world/masks/fill.png",
"sourcePath": "world/structures/models/fill.png",
"maskPath": "world/structures/masks/fill.png",
"height": 0.99,
"width": 0.9,
"periodicOutput": false,

View File

@@ -32,8 +32,8 @@
"x": 0.5,
"y": 0.5,
"structureAtlasPath": "world/structures/structures.atlas",
"sourcePath": "world/models/fill.png",
"maskPath": "world/masks/fill.png",
"sourcePath": "world/structures/models/fill.png",
"maskPath": "world/structures/masks/fill.png",
"height": 0.99,
"width": 0.9,
"periodicOutput": false,