Merge pull request #2746 from EldritchBimbo/Gwyn-Master

Gitaxian Dungeon, 2 Enemies
This commit is contained in:
Anthony Calosa
2023-03-26 21:35:03 +08:00
committed by GitHub
17 changed files with 491 additions and 10 deletions

View File

@@ -0,0 +1,12 @@
{
"name":"Gitaxian Scientist",
"template":
{
"count":60,
"colors":["Blue", "Green"],
"tribe":"Phyrexian",
"tribeCards":1.0,
"tribeSynergyCards":0.45,
"rares":0.4
}
}

View File

@@ -0,0 +1,12 @@
{
"name":"Gitaxian Underling",
"template":
{
"count":60,
"colors":["Blue"],
"tribe":"Phyrexian",
"tribeCards":1.0,
"tribeSynergyCards":0.45,
"rares":0.25
}
}

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.9" tiledversion="1.9.2" name="GitaxianTilesheet" tilewidth="16" tileheight="16" tilecount="64" columns="8">
<image source="../tileset/GitaxianTilesheet.png" width="128" height="128"/>
</tileset>

View File

@@ -0,0 +1,130 @@
<?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="9" nextobjectid="76">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../tileset/main.tsx"/>
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<tileset firstgid="11905" source="../tileset/GitaxianTilesheet.tsx"/>
<layer id="6" name="Collision" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYCAMpvIyMEzDg6fzEmEIGcCYD7+8KQH5UXuJAxeB5l6CYjOoHeZIYpdpZC9yupoBTUMz6ZDOCIUzOkB3E7nuINVe9PgmN/5JtZeQO4aCvbt4EBgEkPmyPPjtoZV/0e1FzmPk5jM3TtLtpVY5Qqy95lQuR4i1l9rlJcjeem7c8tT2J7K9sLIHGcDEyPEnAEN5Lbs=
</data>
</layer>
<layer id="1" name="Background" width="30" height="17">
<data encoding="base64" compression="zlib">
eJy1lVEOhCAMRP01epYeYw9mun94H4+3IbFhtrYKFkgaIAiPMgNuyzRtFfGZ/aiZ/zYSldjpvz+KeayFx2eN7Tw+istnbkzXPfTm4nqoZ+Za+vbiW1zR2vJa/j7iM2vfieriS4Xf6nmPy6BvUnrfRYQrdwf99MTnDtyavEZwUT+dLz/kHeXqs9Uh49pXLX7GIncW3ym9D2xH7nEuUgvX83RSeUaYwpX3wdJO96Nc69y9f9EInsX1zrd1zR/ubyqt
</data>
</layer>
<layer id="3" name="Clutter" width="30" height="17">
<properties>
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBi8wI2TMnlqg816DAy79ehr50DaS08Ai0t6xCnIjtnA8JwLxFug4boNSuPiU8ve1UDzlkDtJgVQEv8ge3cB9XcD8Uo6piOQvTOB9q0B4lkk2nuAQv8OBADZu1APkrZg/gX5vwmIm7H4Z7oeAlMKOvUgGAYWQtndSGI7aRD3i9HS82Kof5fSOJ116yEwCEwE0nOAeDKUTwu/gsBqaHpei2Q+PfMUtQAAdAkuEg==
</data>
</layer>
<layer id="2" name="Walls" width="30" height="17">
<data encoding="base64" compression="zlib">
eJzbwcPAsIMI3K6HGxOjXwYNE6OnD2g2PjCBCLtH7SUOT9eD4GlQN8zQQ4jRKn6R01Ub1N4OEtMZLcIZHaC7iV72TtDD5NPDXmzuGGr2TkfCIIDMxxau9PAvuj3z0NxJy3IDnU+v8goEZujhLkdoaS++8pIW9uLzJ6X2wsoeZAATI6deAABIX/aO
</data>
</layer>
<layer id="8" name="Archway" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFowAVtOsNtAtGwSgYBaNgFNAKAAAyOgC2
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="38" template="../obj/entry_up.tx" x="208" y="271">
<properties>
<property name="teleport" value=""/>
</properties>
</object>
<object id="48" template="../obj/treasure.tx" x="160.239" y="31.7659"/>
<object id="50" template="../obj/enemy.tx" x="192.235" y="47.7421">
<properties>
<property name="enemy" value="Gitaxian Scientist"/>
<property name="threatRange" value="20"/>
<property name="waypoints" value="68,69,70"/>
</properties>
</object>
<object id="54" template="../obj/enemy.tx" x="303.907" y="143.112">
<properties>
<property name="enemy" value="Gitaxian Underling"/>
<property name="threatRange" value="20"/>
<property name="waypoints" value="64,65,66,67"/>
</properties>
</object>
<object id="56" template="../obj/enemy.tx" x="207.841" y="177.756">
<properties>
<property name="enemy" value="Gitaxian Underling"/>
</properties>
</object>
<object id="62" template="../obj/gold.tx" x="383.945" y="175.462"/>
<object id="71" name="switch" class="dialog" gid="4426" x="368" y="126.848" width="16" height="16">
<properties>
<property name="dialog">[
{
&quot;text&quot;:&quot;A large, conspicuous switch juts from the wall in the back of the lab.&quot;,
&quot;options&quot;:[
{
&quot;text&quot;:&quot;You hear the sound of metal sliding across metal from behind you.&quot;,
&quot;action&quot;:[{&quot;deleteMapObject&quot;:73}],
&quot;name&quot;:&quot;Flip the switch&quot;
},
{ &quot;name&quot;:&quot;Leave&quot; }
]
}
]</property>
</properties>
</object>
<object id="75" template="../obj/booster.tx" x="254.75" y="33.5">
<properties>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;ONE&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;ONE&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;ONE&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>
<objectgroup id="7" name="Waypoints">
<object id="64" template="../obj/waypoint.tx" x="272.667" y="143.333"/>
<object id="65" template="../obj/waypoint.tx" x="367.667" y="143.667"/>
<object id="66" template="../obj/waypoint.tx" x="367.333" y="160.667"/>
<object id="67" template="../obj/waypoint.tx" x="272.667" y="159"/>
<object id="68" template="../obj/waypoint.tx" x="162" y="62"/>
<object id="69" template="../obj/waypoint.tx" x="192" y="62"/>
<object id="70" template="../obj/waypoint.tx" x="192" y="33"/>
<object id="73" template="../obj/gate.tx" x="208.25" y="96.5">
<properties>
<property name="dialog">[{
&quot;text&quot;:&quot;This gate is locked. There must be a way to open it somewhere else in here.&quot;,
&quot;options&quot;:[
{ &quot;name&quot;:&quot;continue&quot; }
]
}]</property>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,11 +1,16 @@
<?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="9" nextobjectid="76">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="78">
<editorsettings>
<export format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../tileset/main.tsx"/>
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<tileset firstgid="11905" source="../tileset/phyrexiantiles.tsx"/>
<layer id="6" name="Collision" width="30" height="17">
<data encoding="base64" compression="zlib">
eJy9lEESgzAIRdl2ES7TaG7gDbXtsWovpIyJjUhsDYzM/IVj4Bn40t0AOqbeAQxRD7d/L6kmh+uOsEaD25qSiMNztNzXXDNkz1K0uD1jwa0Jay7die5P8XTLPS257zlvFOSzfhKT5iqd+1RyST76iTjJP3zOLe795RXM9F/88hOP1AMNV5qxdM5qtvm3X8nNvVXyaynI4xpPJV+dYYfoY62vfKzx7w5p8Juj4R75q8S14J2Zc1DuiiP2KPCDwX6q6bmmtxPwx4tA
</data>
</layer>
<layer id="1" name="Background" width="30" height="17">
<data encoding="base64" compression="zlib">
eJzr0WNg6BnFo3gUj+JRPIpH8YjAAE3lcpw=
@@ -24,12 +29,7 @@
eJy1lcsOwiAQRfki/hG1vla1rYlata5a165bv83bOCSEgpbXTW6gA8NpYAKMTVVxxhpypbixtOq4jPnoqOSV6LfwAAtL++TTnFDuHf33n3V6jD8ic30Um9vSnur9mNwMXsMbOt8Ofil73tN3R3x1fgg3hw/wjX8Zg+Gc1XhN84tAbk1MF8mcEK4w5C4QW5JXlrVFAu4JsTP5koibUY24SObEqKti5hpZxLq6OnBzmh9SV+O9voP3DjU9/ueW8nzfBRP/l2Lx5vJT8XTp97bvOY76ADiCbCA=
</data>
</layer>
<layer id="6" name="Collision" width="30" height="17" visible="0">
<data encoding="base64" compression="zlib">
eJxz42RgcBtEGAZAbBM+whhdD7XsxQdoYS85gNr2IssRo45cjCsuYWGLL65pYSdyvNLKXlIAtewlJt6w2T1U7R2ocCbFblqkZ3raiy+ecdlLDfsIpR9kQAv78NlPD/uobS8AQpd0SA==
</data>
</layer>
<layer id="7" name="Ornamental Walls" width="30" height="17" visible="0">
<layer id="7" name="Ornamental Walls" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
</data>
@@ -40,7 +40,6 @@
<property name="teleport" value=""/>
</properties>
</object>
<object id="65" template="../obj/treasure.tx" x="96.667" y="33"/>
<object id="67" template="../obj/treasure.tx" x="320" y="32.5"/>
<object id="68" template="../obj/enemy.tx" x="207" y="94">
<properties>
@@ -61,6 +60,34 @@
<property name="waypoints" value="72,73,72"/>
</properties>
</object>
<object id="76" template="../obj/booster.tx" x="98" y="33">
<properties>
<property name="reward">[
{
&quot;editions&quot;: [ &quot;ONE&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
&quot;colors&quot;: [ &quot;white&quot; ]
},
{
&quot;editions&quot;: [ &quot;ONE&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
&quot;colors&quot;: [ &quot;white&quot; ]
},
{
&quot;editions&quot;: [ &quot;ONE&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;white&quot; ]
}
]
</property>
</properties>
</object>
</objectgroup>
<objectgroup id="8" name="Waypoints">
<object id="70" template="../obj/waypoint.tx" x="144" y="176"/>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.9" tiledversion="1.9.2" name="GitaxianTilesheet" tilewidth="16" tileheight="16" tilecount="64" columns="8">
<image source="../tileset/GitaxianTilesheet.png" width="128" height="128"/>
</tileset>

View File

@@ -1,9 +1,11 @@
Phyrexian_Buildings.png
size: 32, 32
size: 64, 32
format: RGBA8888
filter: Nearest,Nearest
repeat: none
BasilicaSmall
xy: 0, 0
size: 32, 32
GitLabSmall
xy: 32,0
size: 32, 32

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@@ -0,0 +1,68 @@
gitaxianscientist.png
size: 64,96
format: RGBA8888
filter: Nearest,Nearest
repeat: none
Avatar
xy: 0, 0
size: 16, 16
Idle
xy: 0, 16
size: 16, 16
Idle
xy: 16, 16
size: 16, 16
Idle
xy: 32, 16
size: 16, 16
Idle
xy: 48, 16
size: 16, 16
Walk
xy: 0, 32
size: 16, 16
Walk
xy: 16, 32
size: 16, 16
Walk
xy: 32, 32
size: 16, 16
Walk
xy: 48, 32
size: 16, 16
Attack
xy: 0, 48
size: 16, 16
Attack
xy: 16, 48
size: 16, 16
Attack
xy: 32, 48
size: 16, 16
Attack
xy: 48, 48
size: 16, 16
Hit
xy: 0, 64
size: 16, 16
Hit
xy: 16, 64
size: 16, 16
Hit
xy: 32, 64
size: 16, 16
Hit
xy: 48, 64
size: 16, 16
Death
xy: 0, 80
size: 16, 16
Death
xy: 16, 80
size: 16, 16
Death
xy: 32, 80
size: 16, 16
Death
xy: 48, 80
size: 16, 16

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -0,0 +1,68 @@
gitaxianunderling.png
size: 64,96
format: RGBA8888
filter: Nearest,Nearest
repeat: none
Avatar
xy: 0, 0
size: 16, 16
Idle
xy: 0, 16
size: 16, 16
Idle
xy: 16, 16
size: 16, 16
Idle
xy: 32, 16
size: 16, 16
Idle
xy: 48, 16
size: 16, 16
Walk
xy: 0, 32
size: 16, 16
Walk
xy: 16, 32
size: 16, 16
Walk
xy: 32, 32
size: 16, 16
Walk
xy: 48, 32
size: 16, 16
Attack
xy: 0, 48
size: 16, 16
Attack
xy: 16, 48
size: 16, 16
Attack
xy: 32, 48
size: 16, 16
Attack
xy: 48, 48
size: 16, 16
Hit
xy: 0, 64
size: 16, 16
Hit
xy: 16, 64
size: 16, 16
Hit
xy: 32, 64
size: 16, 16
Hit
xy: 48, 64
size: 16, 16
Death
xy: 0, 80
size: 16, 16
Death
xy: 16, 80
size: 16, 16
Death
xy: 32, 80
size: 16, 16
Death
xy: 48, 80
size: 16, 16

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -95,6 +95,7 @@
"CaveU2",
"CaveU3",
"CaveU4",
"GitaxianLab"
"Kiora Island",
"Teferi Hideout",
"Jacehold",

View File

@@ -5182,6 +5182,150 @@
],
"colors": "G"
},
{
"name": "Gitaxian Scientist",
"sprite": "sprites/gitaxianscientist.atlas",
"deck": [
"decks/gitaxianscientist.json"
],
"spawnRate": 1,
"difficulty": 0.1,
"speed": 24,
"life": 19,
"rewards": [
{
"type": "deckCard",
"probability": 1,
"count": 2,
"addMaxCount": 4,
"rarity": [
"common",
]
},
{
"type": "deckCard",
"probability": 0.75,
"count": 1,
"addMaxCount": 2,
"rarity": [
"uncommon"
],
"cardTypes": [
"Creature",
"Artifact",
"Enchantment",
"Instant",
"Sorcery"
]
},
{
"type": "deckCard",
"probability": 0.50,
"count": 1,
"addMaxCount": 2,
"rarity": [
"rare"
],
"cardTypes": [
"Creature",
"Artifact",
"Enchantment",
"Instant",
"Sorcery"
]
},
{
"type": "deckCard",
"probability": 0.1,
"count": 1,
"rarity": [
"rare"
],
"cardTypes": [
"Land"
]
},
{
"type": "gold",
"probability": 0.3,
"count": 10,
"addMaxCount": 90
}
],
"colors": "UG"
},
{
"name": "Gitaxian Underling",
"sprite": "sprites/gitaxianunderling.atlas",
"deck": [
"decks/gitaxianunderling.json"
],
"spawnRate": 1,
"difficulty": 0.1,
"speed": 24,
"life": 16,
"rewards": [
{
"type": "deckCard",
"probability": 1,
"count": 2,
"addMaxCount": 4,
"rarity": [
"common",
]
},
{
"type": "deckCard",
"probability": 0.5,
"count": 1,
"addMaxCount": 2,
"rarity": [
"uncommon"
],
"cardTypes": [
"Creature",
"Artifact",
"Enchantment",
"Instant",
"Sorcery"
]
},
{
"type": "deckCard",
"probability": 0.25,
"count": 1,
"addMaxCount": 1,
"rarity": [
"rare"
],
"cardTypes": [
"Creature",
"Artifact",
"Enchantment",
"Instant",
"Sorcery"
]
},
{
"type": "deckCard",
"probability": 0.1,
"count": 1,
"rarity": [
"rare"
],
"cardTypes": [
"Land"
]
},
{
"type": "gold",
"probability": 0.3,
"count": 10,
"addMaxCount": 90
}
],
"colors": "U"
},
{
"name": "Grolnok",
"sprite": "sprites/dungeon/frogboss.atlas",

View File

@@ -1850,6 +1850,15 @@
"sprite": "BasilicaSmall",
"map": "maps/map/phyrexian_w1.tmx"
},
{
"name": "GitaxianLab",
"type": "dungeon",
"count": 2,
"radiusFactor": 0.8,
"spriteAtlas": "maps/tileset/Phyrexian_Buildings.atlas",
"sprite": "GitLabSmall",
"map": "maps/map/phyrexian_b1.tmx"
},
{
"name": "Slimefoots Lair",
"type": "dungeon",