Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7725ae5
Rename Kiora to Empress Galina in quest texts and fix Rhox printing
vanja-ivancevic Dec 15, 2025
3c34fba
Reduce Ancient Silver Dragon's Dragon Blood drop rate to 30%
vanja-ivancevic Dec 15, 2025
2228bf7
Add balanced deckCard rewards to minibosses
vanja-ivancevic Dec 18, 2025
155206a
Add Elder Dragon lair caves with unique items and dungeon effects
vanja-ivancevic Dec 18, 2025
32bab60
Fix boss spawnRate to prevent overworld spawning
vanja-ivancevic Dec 18, 2025
e7277b6
Rename Elvish Riders to Elven Riders
VigilantSera Dec 21, 2025
34967d7
Merge origin/Sera_Dev into master
vanja-ivancevic Dec 23, 2025
2ea59c1
Merge upstream/master into master
vanja-ivancevic Dec 23, 2025
db9e676
Remove deck override from library_of_varsil_3 enemy
vanja-ivancevic Dec 23, 2025
26117c2
Merge upstream/master into master
vanja-ivancevic Dec 25, 2025
881c2d8
Fix end_palace teleports to correct False God boss rooms
vanja-ivancevic Dec 26, 2025
871a8b1
Merge branch 'master' into master
vanja-ivancevic Dec 26, 2025
70776ce
Fix color castles not appearing on world map
vanja-ivancevic Dec 29, 2025
1ea4e29
Add dialog option to skip castle quest completion
vanja-ivancevic Dec 29, 2025
1ff5b78
Merge branch 'master' into master
Agetian Dec 30, 2025
f7cfdbc
Added stronger starter decks.
VigilantSera Dec 30, 2025
867e02c
Merge branch 'master' into master
vanja-ivancevic Dec 30, 2025
033a4ea
Merge origin/Sera_Dev into master
vanja-ivancevic Dec 30, 2025
fe0248c
Small change to black starter
VigilantSera Dec 30, 2025
1d2dd89
Merge origin/Sera_Dev into master
vanja-ivancevic Dec 30, 2025
d11b713
Fix card names and sets in new starter decks
vanja-ivancevic Dec 30, 2025
552530f
Standardize pile deck lands to 4th Edition
vanja-ivancevic Dec 30, 2025
83ca2ea
Expand edition selector and assign new starter decks
vanja-ivancevic Dec 30, 2025
a426794
Update item names and world data
vanja-ivancevic Dec 30, 2025
3f35d13
Add theme deck starters and standardize deck format
vanja-ivancevic Dec 30, 2025
426cee7
Add Artificer's Bazaar lair events
vanja-ivancevic Dec 31, 2025
1c584e0
Reorganize starter decks and trim edition selector
vanja-ivancevic Jan 1, 2026
e4e54e9
Add Ancient Diamond Mine lair
vanja-ivancevic Jan 1, 2026
a52f3ee
Fix shop positions in Artificer Bazaar maps
vanja-ivancevic Jan 1, 2026
24daa4a
Merge upstream/master into master
vanja-ivancevic Jan 1, 2026
8b1f471
Add Dragon's Lair events for all five color biomes
vanja-ivancevic Jan 1, 2026
27695c5
Changed beta booster price to 300 shards in ancient diamond mine
vanja-ivancevic Jan 1, 2026
6aa1c7b
Merge upstream/master into master
vanja-ivancevic Jan 2, 2026
f18064b
Add gold payment option to Ancient Diamond Mine
vanja-ivancevic Jan 2, 2026
02fe312
Add Sphinx's Sanctum riddles lair
vanja-ivancevic Jan 2, 2026
5f4dfb7
Improve Sphinx's Sanctum riddles presentation
vanja-ivancevic Jan 2, 2026
5eace18
Add Elder Dragon caves and reposition dragon lair objects
vanja-ivancevic Jan 2, 2026
7622fb1
Fix deck card names, set codes, and block-appropriate lands
vanja-ivancevic Jan 3, 2026
0ce1b8d
Fix Elven Invasion quest spawning random enemies
vanja-ivancevic Jan 3, 2026
065bc03
Merge branch 'master' into master
vanja-ivancevic Jan 4, 2026
f42be39
Update Arzakon final dialog button text
vanja-ivancevic Jan 6, 2026
1078376
Merge upstream/master into master
vanja-ivancevic Jan 6, 2026
c869d4a
Rename items per slot revamp spec
vanja-ivancevic Jan 8, 2026
cb4476b
Add Demon's Bargain dungeon to black biome
vanja-ivancevic Jan 8, 2026
fd8c3f7
Change lair POI types from dungeon to cave
vanja-ivancevic Jan 8, 2026
d53337f
Fix NG+ tutorial dialog not showing after using skip option
vanja-ivancevic Jan 8, 2026
a165a2b
Merge remote-tracking branch 'upstream/master'
vanja-ivancevic Jan 8, 2026
bf06a29
Update Demon's Bargain dialogue and remove Leave option
vanja-ivancevic Jan 8, 2026
d2cadbe
Merge branch 'master' into master
Agetian Jan 9, 2026
a0615d0
Merge branch 'master' into master
Agetian Jan 9, 2026
9dc582d
Merge remote-tracking branch 'upstream/master'
vanja-ivancevic Jan 9, 2026
2952b80
Add all preconstructed decks for old border era to work in "chaos" mode
vanja-ivancevic Jan 9, 2026
6198b50
Fix item reward names for Santa and Pharaoh enemies
vanja-ivancevic Jan 10, 2026
597314b
Update bandit_cave.tmx with new paths
vanja-ivancevic Jan 14, 2026
75b5a67
Merge branch 'Card-Forge:master' into master
vanja-ivancevic Jan 14, 2026
30b7797
Merge remote-tracking branch 'upstream/master'
vanja-ivancevic Jan 15, 2026
9257c07
Swap Astral Visionary and Whim of Shandalar positions in blue clouds map
vanja-ivancevic Jan 15, 2026
466227f
Fix item sprite references for renamed items
vanja-ivancevic Jan 15, 2026
7084151
Add alternative quest path for Skep outer map
vanja-ivancevic Jan 15, 2026
d592db9
Add life reward to Sliver Queen drops
vanja-ivancevic Jan 15, 2026
d04e59f
Merge branch 'master' into master
vanja-ivancevic Jan 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<property name="enemy" value="Thought Invoker of Shandalar" />
</properties>
</object>
<object id="55" template="../../../../../../common/maps/obj/enemy.tx" x="92.7585" y="386.594">
<object id="55" template="../../../../../../common/maps/obj/enemy.tx" x="210" y="80">
<properties>
<property name="enemy" value="Whim of Shandalar" />
<property name="threatRange" type="int" value="50" />
Expand All @@ -83,5 +83,5 @@
</properties>
</object>
<object id="64" template="../../../../../../common/maps/obj/manashards.tx" x="297.095" y="174.815" />
<object id="65" template="../../../../../../common/maps/obj/enemy.tx" x="240" y="50"><properties><property name="enemy" value="The Astral Visionary" /><property name="threatRange" type="int" value="50" /><property name="effect">{"startBattleWithCard": ["Mox Sapphire|LEA", "Zephyr Falcon|LEG", "Yotian Soldier|ATQ"]}</property></properties></object></objectgroup>
<object id="65" template="../../../../../../common/maps/obj/enemy.tx" x="92.7585" y="386.594"><properties><property name="enemy" value="The Astral Visionary" /><property name="threatRange" type="int" value="50" /><property name="effect">{"startBattleWithCard": ["Mox Sapphire|LEA", "Zephyr Falcon|LEG", "Yotian Soldier|ATQ"]}</property></properties></object></objectgroup>
</map>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='utf-8'?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="31">
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="31">
<properties>
<property name="preventEscape" type="bool" value="true" />
<property name="preventEscape" type="bool" value="true"/>
</properties>
<tileset firstgid="1" source="../../../../../../common/maps/tileset/main.tsx" />
<tileset firstgid="10113" source="../../../../../../common/maps/tileset/buildings.tsx" />
<tileset firstgid="1" source="../../../../common/maps/tileset/main.tsx"/>
<tileset firstgid="10113" source="../../../../common/maps/tileset/buildings.tsx"/>
<layer id="1" name="Background" width="30" height="20">
<data encoding="base64" compression="zlib">
eJwL42RgCBvFo3gUj+JRPIpH8SgexVTDAKJT3qk=
Expand All @@ -22,7 +22,7 @@
</layer>
<layer id="3" name="Walls" width="30" height="20">
<properties>
<property name="spriteLayer" type="bool" value="true" />
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJylVUFuwzAMy9F5mNuhH63X7ldtujxjFgaiLEc5DWZASJBIIilb8mGepkO3S5mmr/L7PrLwu3a7z89nFnchP+cT/5f+vM3jPGEf3XTdKIaxlvnVR3MfJddpoHUxuBzDuc7dv3X77t8+y1+Oiqv88e60YlVTD+b/IOxToiF4rlL/wOZY+IWWsDXJz/WCvmq0ZnyAfUz0uPy6pw/iqBqQ753vvB+js5f5KQZ4av2dZpfTcc56RTniLIYhB/Y948k5UVNXM+UIHD4n4ATMvZrUrwou+t0Zn+mterras5/ijnpT9SinzJexkX8L91y8lj0rsDHDwS/raaxKZwP2Xx4Ol/XyvLqW532S7SevrTpp/V1P6ozQO8ZhrqZ2I82uJ/dobDLT38Ud3Uv6ne+DJnuyhalzIOulKrVwcSONPPeaiXV6WTPfJW6+Q3srrz3g/MN+ANcA6cw=
Expand All @@ -34,107 +34,107 @@
</data>
</layer>
<objectgroup id="5" name="Objects">
<object id="8" template="../../../../../../common/maps/obj/gold.tx" x="272" y="64" />
<object id="9" template="../../../../../../common/maps/obj/gold.tx" x="176" y="288" />
<object id="10" template="../../../../../../common/maps/obj/booster.tx" x="432" y="48">
<object id="8" template="../../../../common/maps/obj/gold.tx" x="272" y="64"/>
<object id="9" template="../../../../common/maps/obj/gold.tx" x="176" y="288"/>
<object id="10" template="../../../../common/maps/obj/booster.tx" x="432" y="48">
<properties>
<property name="reward">[
{
"editions": [ "NMS" ],
"type": "card",
"count": 10,
"rarity": [ "Common" ]
&quot;editions&quot;: [ &quot;NMS&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 10,
&quot;rarity&quot;: [ &quot;Common&quot; ]
},
{
"editions": [ "NMS" ],
"type": "card",
"count": 3,
"rarity": [ "Uncommon" ]
&quot;editions&quot;: [ &quot;NMS&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Uncommon&quot; ]
},
{
"editions": [ "NMS" ],
"type": "card",
"count": 3,
"rarity": [ "Rare", "Mythic Rare" ]
&quot;editions&quot;: [ &quot;NMS&quot; ],
&quot;type&quot;: &quot;card&quot;,
&quot;count&quot;: 3,
&quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
}
]
</property>
</properties>
</object>
<object id="28" template="../../../../../../common/maps/obj/treasure.tx" x="48" y="48" />
<object id="28" template="../../../../common/maps/obj/treasure.tx" x="48" y="48"/>
</objectgroup>
<objectgroup id="6" name="Waypoints">
<object id="1" template="../../../../../../common/maps/obj/collision.tx" x="-32" y="0" width="32" height="320" />
<object id="2" template="../../../../../../common/maps/obj/collision.tx" x="-32" y="320" width="544" height="32" />
<object id="3" template="../../../../../../common/maps/obj/collision.tx" x="480" y="0" width="32" height="320" />
<object id="4" template="../../../../../../common/maps/obj/collision.tx" x="-32" y="-32" width="544" height="32" />
<object id="5" template="../../../../../../common/maps/obj/waypoint.tx" name="5" x="80" y="200" />
<object id="7" template="../../../../../../common/maps/obj/entry_up.tx" x="54.3422" y="319.154" width="83.5102" height="10.9262" />
<object id="11" template="../../../../../../common/maps/obj/waypoint.tx" name="11" x="160" y="208" />
<object id="12" template="../../../../../../common/maps/obj/waypoint.tx" name="12" x="144" y="112" />
<object id="13" template="../../../../../../common/maps/obj/waypoint.tx" name="13" x="48" y="64" />
<object id="14" template="../../../../../../common/maps/obj/waypoint.tx" name="14" x="192" y="288" />
<object id="15" template="../../../../../../common/maps/obj/waypoint.tx" name="15" x="304" y="224" />
<object id="16" template="../../../../../../common/maps/obj/waypoint.tx" name="16" x="416" y="288" />
<object id="17" template="../../../../../../common/maps/obj/treasure.tx" x="336" y="304" />
<object id="18" template="../../../../../../common/maps/obj/waypoint.tx" name="18" x="368" y="128" />
<object id="19" template="../../../../../../common/maps/obj/waypoint.tx" name="19" x="400" y="32" />
<object id="20" template="../../../../../../common/maps/obj/waypoint.tx" name="20" x="192" y="64" />
<object id="21" template="../../../../../../common/maps/obj/waypoint.tx" name="21" x="256" y="32" />
<object id="22" template="../../../../../../common/maps/obj/waypoint.tx" name="22" x="256" y="152" />
<object id="23" template="../../../../../../common/maps/obj/enemy.tx" x="352" y="80">
<object id="1" template="../../../../common/maps/obj/collision.tx" x="-32" y="0" width="32" height="320"/>
<object id="2" template="../../../../common/maps/obj/collision.tx" x="-32" y="320" width="544" height="32"/>
<object id="3" template="../../../../common/maps/obj/collision.tx" x="480" y="0" width="32" height="320"/>
<object id="4" template="../../../../common/maps/obj/collision.tx" x="-32" y="-32" width="544" height="32"/>
<object id="5" template="../../../../common/maps/obj/waypoint.tx" name="5" x="80" y="200"/>
<object id="7" template="../../../../common/maps/obj/entry_up.tx" x="54.3422" y="319.154" width="83.5102" height="10.9262"/>
<object id="11" template="../../../../common/maps/obj/waypoint.tx" name="11" x="160" y="208"/>
<object id="12" template="../../../../common/maps/obj/waypoint.tx" name="12" x="144" y="112"/>
<object id="13" template="../../../../common/maps/obj/waypoint.tx" name="13" x="48" y="64"/>
<object id="14" template="../../../../common/maps/obj/waypoint.tx" name="14" x="192" y="288"/>
<object id="15" template="../../../../common/maps/obj/waypoint.tx" name="15" x="304" y="224"/>
<object id="16" template="../../../../common/maps/obj/waypoint.tx" name="16" x="416" y="288"/>
<object id="17" template="../../../../common/maps/obj/treasure.tx" x="336" y="304"/>
<object id="18" template="../../../../common/maps/obj/waypoint.tx" name="18" x="368" y="128"/>
<object id="19" template="../../../../common/maps/obj/waypoint.tx" name="19" x="400" y="32"/>
<object id="20" template="../../../../common/maps/obj/waypoint.tx" name="20" x="192" y="64"/>
<object id="21" template="../../../../common/maps/obj/waypoint.tx" name="21" x="256" y="32"/>
<object id="22" template="../../../../common/maps/obj/waypoint.tx" name="22" x="256" y="152"/>
<object id="23" template="../../../../common/maps/obj/enemy.tx" x="352" y="80">
<properties>
<property name="enemy" value="Bandit Scoundrel" />
<property name="spawn.Normal" type="bool" value="true" />
<property name="threatRange" type="int" value="50" />
<property name="waypoints" value="18,19,r18-19,w10" />
<property name="enemy" value="Bandit Scoundrel"/>
<property name="spawn.Normal" type="bool" value="true"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="18,19,r18-19,w10"/>
</properties>
</object>
<object id="24" template="../../../../../../common/maps/obj/enemy.tx" x="384" y="256">
<object id="24" template="../../../../common/maps/obj/enemy.tx" x="384" y="256">
<properties>
<property name="enemy" value="Bandit Archer" />
<property name="spawn.Normal" type="bool" value="true" />
<property name="threatRange" type="int" value="50" />
<property name="waypoints" value="15,r15-16,w5" />
<property name="enemy" value="Bandit Archer"/>
<property name="spawn.Normal" type="bool" value="true"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="15,r15-16,w5"/>
</properties>
</object>
<object id="25" template="../../../../../../common/maps/obj/enemy.tx" x="128" y="208">
<object id="25" template="../../../../common/maps/obj/enemy.tx" x="128" y="208">
<properties>
<property name="enemy" value="Bandit Slingshot" />
<property name="spawn.Normal" type="bool" value="true" />
<property name="threatRange" type="int" value="50" />
<property name="waypoints" value="r5-11-14, w5, r5-11-14, w10" />
<property name="enemy" value="Bandit Slingshot"/>
<property name="spawn.Normal" type="bool" value="true"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="r5-11-14, w5, r5-11-14, w10"/>
</properties>
</object>
<object id="26" template="../../../../../../common/maps/obj/enemy.tx" x="48" y="80">
<object id="26" template="../../../../common/maps/obj/enemy.tx" x="48" y="80">
<properties>
<property name="enemy" value="Bandit Archer" />
<property name="spawn.Normal" type="bool" value="true" />
<property name="threatRange" type="int" value="50" />
<property name="waypoints" value="12,r12-13,w5" />
<property name="enemy" value="Bandit Archer"/>
<property name="spawn.Normal" type="bool" value="true"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="12,r12-13,w5"/>
</properties>
</object>
<object id="27" template="../../../../../../common/maps/obj/enemy.tx" x="224" y="64">
<object id="27" template="../../../../common/maps/obj/enemy.tx" x="224" y="64">
<properties>
<property name="enemy" value="Bandit Scoundrel" />
<property name="spawn.Normal" type="bool" value="true" />
<property name="threatRange" type="int" value="50" />
<property name="waypoints" value="r20-21-22, r20-21-22" />
<property name="enemy" value="Bandit Scoundrel"/>
<property name="spawn.Normal" type="bool" value="true"/>
<property name="threatRange" type="int" value="50"/>
<property name="waypoints" value="r20-21-22, r20-21-22"/>
</properties>
</object>
<object id="29" template="../../../../../../common/maps/obj/enemy.tx" x="288" y="144">
<object id="29" template="../../../../common/maps/obj/enemy.tx" x="285.852" y="174.606">
<properties>
<property name="enemy" value="Chandler" />
<property name="threatRange" type="int" value="40" />
<property name="effect">{"startBattleWithCard": ["Chandler|HML", "Uphill Battle|MMQ"]}</property>
</properties>
<property name="effect" value="{&quot;startBattleWithCard&quot;: [&quot;Chandler|HML&quot;, &quot;Uphill Battle|MMQ&quot;]}"/>
<property name="enemy" value="Chandler"/>
<property name="threatRange" type="int" value="40"/>
</properties>
</object>
<object id="30" template="../../../../../../common/maps/obj/enemy.tx" x="192" y="176">
<object id="30" template="../../../../common/maps/obj/enemy.tx" x="229.586" y="240.97">
<properties>
<property name="enemy" value="Joven" />
<property name="threatRange" type="int" value="40" />
<property name="effect">{"startBattleWithCard": ["Joven|HML", "Joven's Ferrets|HML", "Joven's Tools|HML"]}</property>
</properties>
<property name="effect" value="{&quot;startBattleWithCard&quot;: [&quot;Joven|HML&quot;, &quot;Joven's Ferrets|HML&quot;, &quot;Joven's Tools|HML&quot;]}"/>
<property name="enemy" value="Joven"/>
<property name="threatRange" type="int" value="40"/>
</properties>
</object>
</objectgroup>
</map>
</map>
Loading