Adventure overhaul, phase 1

This commit is contained in:
jjayers99
2023-01-19 00:09:07 -05:00
parent 6af99d7f01
commit 13d1949208
94 changed files with 4656 additions and 1119 deletions

View File

@@ -785,6 +785,11 @@ public class AiCostDecision extends CostDecisionMakerBase {
return PaymentDecision.number(0);
}
@Override
public PaymentDecision visit(CostPayShards cost) {
return PaymentDecision.number(0);
}
@Override
public PaymentDecision visit(CostUnattach cost) {
final Card cardToUnattach = cost.findCardToUnattach(source, player, ability);

View File

@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import forge.game.card.*;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicate;
@@ -45,16 +46,6 @@ import forge.card.CardRarity;
import forge.card.CardStateName;
import forge.card.CardType.Supertype;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
import forge.game.card.CardDamageHistory;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.CardUtil;
import forge.game.card.CardView;
import forge.game.card.CardZoneTable;
import forge.game.card.CounterType;
import forge.game.combat.Combat;
import forge.game.event.Event;
import forge.game.event.GameEventDayTimeChanged;
@@ -304,6 +295,9 @@ public class Game {
pl.setMaxHandSize(psc.getStartingHand());
pl.setStartingHandSize(psc.getStartingHand());
if (psc.getManaShards() > 0) {
pl.setCounters(CounterEnumType.MANASHARDS, psc.getManaShards(), true);
}
int teamNum = psc.getTeamNumber();
if (teamNum == -1) {
// RegisteredPlayer doesn't have an assigned team, set it to 1 higher than the highest found team number

View File

@@ -390,6 +390,7 @@ public enum CounterEnumType {
POISON("POISN"),
TICKET("TICKET"),
MANASHARDS("MANASHARDS"), //Adventure-specific mechanic
// Keyword Counters
/*

View File

@@ -325,6 +325,11 @@ public class Cost implements Serializable {
final String[] splitStr = abCostParse(parse, 1);
return new CostPayEnergy(splitStr[0]);
}
if (parse.startsWith("PayShards<")) { //Adventure specific energy-esque tokens
// Payshards<ShardCost>
final String[] splitStr = abCostParse(parse, 1);
return new CostPayShards(splitStr[0]);
}
if (parse.startsWith("GainLife<")) {
// PayLife<LifeCost>

View File

@@ -0,0 +1,99 @@
/*
* Forge: Play Magic: the Gathering.
* Copyright (C) 2011 Forge Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.game.cost;
import com.google.common.base.Strings;
import forge.game.card.Card;
import forge.game.card.CounterEnumType;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
public class CostPayShards extends CostPart {
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
int paidAmount = 0;
/**
* Instantiates a new cost pay shards.
*
* @param amount
* the amount
*/
public CostPayShards(final String amount) {
this.setAmount(amount);
}
@Override
public int paymentOrder() { return 7; }
@Override
public Integer getMaxAmountX(final SpellAbility ability, final Player payer, final boolean effect) {
return payer.getCounters(CounterEnumType.MANASHARDS);
}
/*
* (non-Javadoc)
*
* @see forge.card.cost.CostPart#toString()
*/
@Override
public final String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("Pay ");
sb.append(Strings.repeat("{M}", Integer.parseInt(getAmount())));
return sb.toString();
}
/*
* (non-Javadoc)
*
* @see forge.card.cost.CostPart#refund(forge.Card)
*/
@Override
public final void refund(final Card source) {
// Really should be activating player
source.getController().loseShards(this.paidAmount * -1);
}
/*
* (non-Javadoc)
*
* @see
* forge.card.cost.CostPart#canPay(forge.card.spellability.SpellAbility,
* forge.Card, forge.Player, forge.card.cost.Cost)
*/
@Override
public final boolean canPay(final SpellAbility ability, final Player payer, final boolean effect) {
return payer.getCounters(CounterEnumType.MANASHARDS) >= this.getAbilityAmount(ability);
}
@Override
public boolean payAsDecided(Player ai, PaymentDecision decision, SpellAbility ability, final boolean effect) {
paidAmount = decision.c;
return ai.payShards(paidAmount, null);
}
public <T> T accept(ICostVisitor<T> visitor) {
return visitor.visit(this);
}
}

View File

@@ -33,6 +33,7 @@ public interface ICostVisitor<T> {
T visit(CostUntap cost);
T visit(CostUnattach cost);
T visit(CostTapType cost);
T visit(CostPayShards cost);
class Base<T> implements ICostVisitor<T> {
@@ -190,6 +191,11 @@ public interface ICostVisitor<T> {
public T visit(CostTapType cost) {
return null;
}
@Override
public T visit(CostPayShards cost) {
return null;
}
}
}

View File

@@ -661,6 +661,28 @@ public class Player extends GameEntity implements Comparable<Player> {
return canPayEnergy(energyPayment) && loseEnergy(energyPayment) > -1;
}
public final boolean canPayShards(final int shardPayment) {
int cnt = getCounters(CounterEnumType.MANASHARDS);
return cnt >= shardPayment;
}
public final int loseShards(int lostShards) {
int cnt = getCounters(CounterEnumType.MANASHARDS);
if (lostShards > cnt) {
return -1;
}
cnt -= lostShards;
this.setCounters(CounterEnumType.MANASHARDS, cnt, true);
return cnt;
}
public final boolean payShards(final int shardPayment, final Card source) {
if (shardPayment <= 0)
return true;
return canPayShards(shardPayment) && loseShards(shardPayment) > -1;
}
// This function handles damage after replacement and prevention effects are applied
@Override
public final int addDamageAfterPrevention(final int amount, final Card source, final boolean isCombat, GameEntityCounterTable counterTable) {

View File

@@ -26,6 +26,7 @@ public class RegisteredPlayer {
private int startingLife = 20;
private int startingHand = 7;
private int manaShards = 0;
private Iterable<IPaperCard> cardsOnBattlefield = null;
private Iterable<IPaperCard> extraCardsOnBattlefield = null;
private Iterable<? extends IPaperCard> schemes = null;
@@ -58,6 +59,14 @@ public class RegisteredPlayer {
this.startingLife = startingLife;
}
public final int getManaShards() {
return manaShards;
}
public final void setManaShards(int manaShards) {
this.manaShards = manaShards;
}
public final void setCardsOnBattlefield(Iterable<IPaperCard> cardsOnTable) {
this.cardsOnBattlefield = cardsOnTable;
}

View File

@@ -1466,6 +1466,7 @@ public class FSkin {
addEncodingSymbol("TK", FSkinProp.IMG_TICKET);
addEncodingSymbol("EXPERIENCE", FSkinProp.IMG_EXPERIENCE);
addEncodingSymbol("A-", FSkinProp.IMG_ALCHEMY);
addEncodingSymbol("M", FSkinProp.ICO_MANASHARD);
// Set look and feel after skin loaded
FView.SINGLETON_INSTANCE.setSplashProgessBarMessage("Setting look and feel...");

View File

@@ -7,6 +7,8 @@ import forge.adventure.scene.RewardScene;
import forge.adventure.stage.MapStage;
import forge.adventure.util.Reward;
import java.util.Random;
/**
* Map actor that will open the Shop on collision
*/
@@ -15,15 +17,19 @@ public class ShopActor extends MapActor{
private ShopData shopData;
Array<Reward> rewardData;
float shopPriceModifier = 1.0f;
float townPriceModifier = 1.0f;
public ShopActor(MapStage stage, int id, Array<Reward> rewardData, ShopData data)
{
super(id);
this.stage = stage;
this.shopData = data;
this.rewardData = rewardData;
this.shopPriceModifier = stage.getChanges().getShopPriceModifier(id) ;
this.townPriceModifier = stage.getChanges().getTownPriceModifier();
}
public float getPriceModifier() { return (shopPriceModifier > 0? shopPriceModifier:1.0f) * (townPriceModifier> 0? townPriceModifier:1.0f); }
public MapStage getMapStage()
{
return stage;
@@ -51,4 +57,17 @@ public class ShopActor extends MapActor{
public String getDescription() {
return shopData.description;
}
public int getRestockPrice() {
return shopData.restockPrice;
}
public boolean canRestock() {
return getRestockPrice() > 0;
}
public ShopData getShopData() { return shopData; }
public void setRewardData(Array<Reward> data) { rewardData = data; }
public Array<Reward> getRewardData() { return rewardData;}
}

View File

@@ -10,7 +10,7 @@ import com.badlogic.gdx.utils.ObjectMap;
public class DifficultyData {
public String name="";
public int startingLife=10;
public int startingMana=100;
public int startingShards=1;
public int staringMoney=10;
public float enemyLifeFactor=1;
public boolean startingDifficulty;
@@ -18,6 +18,7 @@ public class DifficultyData {
public float sellFactor=0.2f;
public float goldLoss=0.2f;
public float lifeLoss=0.2f;
public float shardSellRatio = 0.8f;
public float rewardMaxFactor=1f;
public String[] startItems=new String[0];

View File

@@ -19,6 +19,7 @@ public class EffectData implements Serializable {
public float moveSpeed = 1.0f; //Change of movement speed. Map only.
public float goldModifier = -1.0f; //Modifier for shop discounts.
public int cardRewardBonus = 0; //Bonus "DeckCard" drops. Max 3.
public int extraManaShards = 0; //Mana Shard tokens available to spend in battle
//Opponent field.
public EffectData opponent; //Effects to be applied to the opponent's side.
@@ -31,6 +32,7 @@ public class EffectData implements Serializable {
startBattleWithCard=effect.startBattleWithCard;
colorView=effect.colorView;
opponent = (effect.opponent == null) ? null : new EffectData(effect.opponent);
extraManaShards = effect.extraManaShards;
}
public Array<IPaperCard> startBattleWithCards() {

View File

@@ -27,7 +27,7 @@ public class ItemData {
public boolean usableOnWorldMap;
public boolean usableInPoi;
public String commandOnUse;
public int manaNeeded;
public int shardsNeeded;
public ItemData()
@@ -46,7 +46,7 @@ public class ItemData {
usableInPoi = cpy.usableInPoi;
usableOnWorldMap = cpy.usableOnWorldMap;
commandOnUse = cpy.commandOnUse;
manaNeeded = cpy.manaNeeded;
shardsNeeded = cpy.shardsNeeded;
}
public Sprite sprite()
@@ -90,8 +90,8 @@ public class ItemData {
result += "Slot: " + this.equipmentSlot + "\n";
if(effect != null)
result += effect.getDescription();
if(manaNeeded != 0)
result += manaNeeded+" [+Mana]";
if(shardsNeeded != 0)
result += shardsNeeded+" [+Shards]";
return result;
}

View File

@@ -14,6 +14,7 @@ import forge.model.FModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
/**
@@ -43,6 +44,7 @@ public class RewardData {
public String cardText;
public boolean matchAllSubTypes;
public boolean matchAllColors;
public RewardData[] cardUnion;
public RewardData() { }
@@ -66,6 +68,7 @@ public class RewardData {
cardText =rewardData.cardText;
matchAllSubTypes =rewardData.matchAllSubTypes;
matchAllColors =rewardData.matchAllColors;
cardUnion =rewardData.cardUnion==null?null:rewardData.cardUnion.clone();
}
private static Iterable<PaperCard> allCards;
@@ -121,6 +124,17 @@ public class RewardData {
int addedCount = (maxCount > 0 ? WorldSave.getCurrentSave().getWorld().getRandom().nextInt(maxCount) : 0);
switch(type) {
case "Union":
HashSet<PaperCard> pool = new HashSet<>();
for (RewardData r : cardUnion) {
pool.addAll(CardUtil.getPredicateResult(allCards, r));
}
ArrayList<PaperCard> finalPool = new ArrayList(pool);
for(int i = 0; i < count; i++) {
ret.add(new Reward(finalPool.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(finalPool.size()))));
}
break;
case "card":
case "randomCard":
if( cardName != null && !cardName.isEmpty() ) {
@@ -158,8 +172,9 @@ public class RewardData {
case "life":
ret.add(new Reward(Reward.Type.Life, count + addedCount));
break;
case "mana":
ret.add(new Reward(Reward.Type.Mana, count + addedCount));
case "mana": //backwards compatibility for reward data
case "shards":
ret.add(new Reward(Reward.Type.Shards, count + addedCount));
break;
}
}

View File

@@ -11,6 +11,7 @@ public class ShopData {
public String name;
public String description;
public int restockPrice;
public String spriteAtlas;
public String sprite;
public boolean unlimited;

View File

@@ -50,8 +50,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
private int gold = 0;
private int maxLife= 20;
private int life = 20;
private int maxMana= 100;
private int mana = 100;
private int shards = 0;
private EffectData blessing; //Blessing to apply for next battle.
private final PlayerStatistic statistic = new PlayerStatistic();
private final Map<String, Byte> questFlags = new HashMap<>();
@@ -67,7 +66,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
// Signals
final SignalList onLifeTotalChangeList = new SignalList();
final SignalList onManaTotalChangeList = new SignalList();
final SignalList onShardsChangeList = new SignalList();
final SignalList onGoldChangeList = new SignalList();
final SignalList onPlayerChangeList = new SignalList();
final SignalList onEquipmentChange = new SignalList();
@@ -93,8 +92,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
gold = 0;
maxLife = 20;
life = 20;
maxMana = 10;
mana = 10;
shards = 0;
clearDecks();
inventoryItems.clear();
equippedItems.clear();
@@ -129,6 +127,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
this.difficultyData.spawnRank = difficultyData.spawnRank;
this.difficultyData.enemyLifeFactor = difficultyData.enemyLifeFactor;
this.difficultyData.sellFactor = difficultyData.sellFactor;
this.difficultyData.shardSellRatio = difficultyData.shardSellRatio;
gold = difficultyData.staringMoney;
name = n;
@@ -139,12 +138,12 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
setColorIdentity(DeckProxy.getColorIdentity(deck));
life = maxLife = difficultyData.startingLife;
mana = maxMana = difficultyData.startingMana;
shards = difficultyData.startingShards;
inventoryItems.addAll(difficultyData.startItems);
onGoldChangeList.emit();
onLifeTotalChangeList.emit();
onManaTotalChangeList.emit();
onShardsChangeList.emit();
}
public void setSelectedDeckSlot(int slot) {
@@ -156,8 +155,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
}
public void updateDifficulty(DifficultyData diff) {
maxLife = diff.startingLife;
maxMana = diff.startingMana;
this.difficultyData.startingMana = diff.startingMana;
this.difficultyData.startingShards = diff.startingShards;
this.difficultyData.startingLife = diff.startingLife;
this.difficultyData.staringMoney = diff.staringMoney;
this.difficultyData.startingDifficulty = diff.startingDifficulty;
@@ -165,6 +163,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
this.difficultyData.spawnRank = diff.spawnRank;
this.difficultyData.enemyLifeFactor = diff.enemyLifeFactor;
this.difficultyData.sellFactor = diff.sellFactor;
this.difficultyData.shardSellRatio = diff.shardSellRatio;
fullHeal();
}
@@ -180,8 +179,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
public int getGold() { return gold; }
public int getLife() { return life; }
public int getMaxLife() { return maxLife; }
public int getMana() { return mana; }
public int getMaxMana() { return maxMana; }
public int getShards() { return shards; }
public @Null EffectData getBlessing() { return blessing; }
public Collection<String> getEquippedItems() { return equippedItems.values(); }
@@ -228,6 +226,10 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
if(this.difficultyData.sellFactor==0)
this.difficultyData.sellFactor=0.2f;
this.difficultyData.shardSellRatio=data.readFloat("sellFactor");
if(this.difficultyData.shardSellRatio==0)
this.difficultyData.shardSellRatio=0.8f;
name = data.readString("name");
heroRace = data.readInt("heroRace");
avatarIndex = data.readInt("avatarIndex");
@@ -240,8 +242,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
gold = data.readInt("gold");
maxLife = data.readInt("maxLife");
life = data.readInt("life");
maxMana = data.containsKey("maxMana")?data.readInt("maxMana"):100;
mana = data.containsKey("mana")?data.readInt("mana"):100;
shards = data.containsKey("shards")?data.readInt("shards"):0;
worldPosX = data.readFloat("worldPosX");
worldPosY = data.readFloat("worldPosY");
@@ -310,7 +311,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
announceCustom = data.containsKey("announceCustom") ? data.readBool("announceCustom") : false;
onLifeTotalChangeList.emit();
onManaTotalChangeList.emit();
onShardsChangeList.emit();
onGoldChangeList.emit();
onBlessing.emit();
}
@@ -326,6 +327,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
data.store("difficultyName",this.difficultyData.name);
data.store("enemyLifeFactor",this.difficultyData.enemyLifeFactor);
data.store("sellFactor",this.difficultyData.sellFactor);
data.store("shardSellRatio", this.difficultyData.shardSellRatio);
data.store("name",name);
data.store("heroRace",heroRace);
@@ -343,8 +345,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
data.store("gold",gold);
data.store("life",life);
data.store("maxLife",maxLife);
data.store("mana",mana);
data.store("maxMana",maxMana);
data.store("shards",shards);
data.store("deckName",deck.getName());
data.storeObject("inventory",inventoryItems.toArray(String.class));
@@ -418,8 +419,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
case Life:
addMaxLife(reward.getCount());
break;
case Mana:
addMaxMana(reward.getCount());
case Shards:
addShards(reward.getCount());
break;
}
}
@@ -428,8 +429,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
gold+=goldCount;
onGoldChangeList.emit();
}
public void onManaChange(Runnable o) {
onManaTotalChangeList.add(o);
public void onShardsChange(Runnable o) {
onShardsChangeList.add(o);
o.run();
}
@@ -466,29 +467,23 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
return false;
}
public void potionOfFalseLife() {
public boolean potionOfFalseLife() {
if (gold >= falseLifeCost() && life == maxLife) {
life = maxLife + 2;
gold -= falseLifeCost();
onLifeTotalChangeList.emit();
onGoldChangeList.emit();
return true;
} else {
System.out.println("Can't afford cost of false life " + falseLifeCost());
System.out.println("Only has this much gold " + gold);
}
return false;
}
public int falseLifeCost() {
return 200 + (int)(50 * getStatistic().winLossRatio());
}
public void addMana(int addedValue) {
mana = Math.min(maxMana,Math.max(mana + addedValue, 0));
onManaTotalChangeList.emit();
}
public void addManaPercent(float percent) {
mana = Math.min(mana + (int)(maxMana*percent), maxMana);
onManaTotalChangeList.emit();
int ret = 200 + (int)(50 * getStatistic().winLossRatio());
return ret < 0?250:ret;
}
public void heal(int amount) {
life = Math.min(life + amount, maxLife);
@@ -505,18 +500,13 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
onGoldChangeList.emit();
}
public void win() {
Current.player().addManaPercent(0.1f);
Current.player().addShards(1);
}
public void addMaxLife(int count) {
maxLife += count;
life += count;
onLifeTotalChangeList.emit();
}
public void addMaxMana(int count) {
maxMana += count;
mana += count;
onManaTotalChangeList.emit();
}
public void giveGold(int price) {
takeGold(-price);
}
@@ -524,6 +514,18 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
gold -= price;
onGoldChangeList.emit();
}
public void addShards(int number) {
takeShards(-number);
}
public void takeShards(int number) {
shards -= number;
onShardsChangeList.emit();
}
public void setShards(int number) {
shards = number;
onShardsChangeList.emit();
}
public void addBlessing(EffectData bless){
blessing = bless;

View File

@@ -1,5 +1,6 @@
package forge.adventure.pointofintrest;
import forge.adventure.util.Current;
import forge.adventure.util.SaveFileContent;
import forge.adventure.util.SaveFileData;
@@ -14,6 +15,8 @@ public class PointOfInterestChanges implements SaveFileContent {
private final HashSet<Integer> deletedObjects=new HashSet<>();
private final HashMap<Integer, HashSet<Integer>> cardsBought = new HashMap<>();
private final java.util.Map<String, Byte> mapFlags = new HashMap<>();
private final java.util.Map<Integer, Long> shopSeeds = new HashMap<>();
private final java.util.Map<Integer, Float> shopModifiers = new HashMap<>();
public static class Map extends HashMap<String,PointOfInterestChanges> implements SaveFileContent {
@Override
@@ -52,8 +55,12 @@ public class PointOfInterestChanges implements SaveFileContent {
deletedObjects.addAll((HashSet<Integer>) data.readObject("deletedObjects"));
cardsBought.clear();
cardsBought.putAll((HashMap<Integer, HashSet<Integer>>) data.readObject("cardsBought"));
shopSeeds.clear();
shopSeeds.putAll((java.util.Map<Integer, Long>) data.readObject("shopSeeds"));
mapFlags.clear();
mapFlags.putAll((java.util.Map<String, Byte>) data.readObject("mapFlags"));
shopModifiers.clear();
shopModifiers.putAll((java.util.Map<Integer, Float>) data.readObject("shopModifiers"));
}
@Override
@@ -62,6 +69,8 @@ public class PointOfInterestChanges implements SaveFileContent {
data.storeObject("deletedObjects",deletedObjects);
data.storeObject("cardsBought",cardsBought);
data.storeObject("mapFlags", mapFlags);
data.storeObject("shopSeeds", shopSeeds);
data.storeObject("shopModifiers", shopModifiers);
return data;
}
@@ -85,4 +94,41 @@ public class PointOfInterestChanges implements SaveFileContent {
return cardsBought.get(objectID).contains(cardIndex);
}
public long getShopSeed(int objectID){
if (!shopSeeds.containsKey(objectID))
{
generateNewShopSeed(objectID);
}
return shopSeeds.get(objectID);
}
public void generateNewShopSeed(int objectID){
shopSeeds.put(objectID, Current.world().getRandom().nextLong());
cardsBought.put(objectID, new HashSet<>()); //Allows cards to appear in slots of previous purchases
}
public float getShopPriceModifier(int objectID){
if (!shopModifiers.containsKey(objectID))
{
return -1.0f;
}
return shopModifiers.get(objectID);
}
public void setShopModifier(int objectID, float mod){
if (objectID!= 0) shopModifiers.put(objectID, mod);
}
public float getTownPriceModifier(){
if (!shopModifiers.containsKey(0))
{
return -1.0f;
}
return shopModifiers.get(0);
}
public void setTownModifier(float mod){
shopModifiers.put(0, mod);
}
}

View File

@@ -22,6 +22,7 @@ import forge.deck.Deck;
import forge.deck.DeckProxy;
import forge.game.GameRules;
import forge.game.GameType;
import forge.game.card.CounterEnumType;
import forge.game.player.Player;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.match.HostedMatch;
@@ -87,6 +88,13 @@ public class DuelScene extends ForgeScene {
boolean winner = false;
try {
winner = humanPlayer == hostedMatch.getGame().getMatch().getWinner();
//Persists expended (or potentially gained) shards back to Adventure
//TODO: Progress towards applicable Adventure quests also needs to be reported here.
List<PlayerControllerHuman> humans = hostedMatch.getHumanControllers();
if (humans.size() == 1) {
Current.player().setShards(humans.get(0).getPlayer().getCounters(CounterEnumType.MANASHARDS));
}
} catch (Exception e) {
e.printStackTrace();
}
@@ -157,16 +165,19 @@ public class DuelScene extends ForgeScene {
//Apply various combat effects.
int lifeMod = 0;
int changeStartCards = 0;
int extraManaShards = 0;
Array<IPaperCard> startCards = new Array<>();
for (EffectData data : effects) {
lifeMod += data.lifeModifier;
changeStartCards += data.changeStartCards;
startCards.addAll(data.startBattleWithCards());
extraManaShards += data.extraManaShards;
}
player.addExtraCardsOnBattlefield(startCards);
player.setStartingLife(Math.max(1, lifeMod + player.getStartingLife()));
player.setStartingHand(player.getStartingHand() + changeStartCards);
player.setManaShards((player.getManaShards() + extraManaShards));
}
public void setDungeonEffect(EffectData E) {
@@ -197,6 +208,7 @@ public class DuelScene extends ForgeScene {
humanPlayer.setPlayer(playerObject);
humanPlayer.setTeamNumber(0);
humanPlayer.setStartingLife(advPlayer.getLife());
humanPlayer.setManaShards((advPlayer.getShards()));
Array<EffectData> playerEffects = new Array<>();
Array<EffectData> oppEffects = new Array<>();

View File

@@ -2,8 +2,10 @@ package forge.adventure.scene;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.github.tommyettinger.textra.TextraButton;
import com.github.tommyettinger.textra.TextraLabel;
import forge.Forge;
import forge.adventure.stage.GameHUD;
import forge.adventure.util.Controls;
import forge.adventure.util.Current;
/**
@@ -20,6 +22,7 @@ public class InnScene extends UIScene {
TextraButton tempHitPointCost, sell, leave;
Image healIcon, sellIcon, leaveIcon;
private TextraLabel playerGold,playerShards;
private InnScene() {
@@ -30,7 +33,8 @@ public class InnScene extends UIScene {
ui.onButtonPress("sell", InnScene.this::sell);
leave = ui.findActor("done");
sell = ui.findActor("sell");
playerGold = Controls.newAccountingLabel(ui.findActor("playerGold"), false);
playerShards = Controls.newAccountingLabel(ui.findActor("playerShards"),true);
leaveIcon = ui.findActor("leaveIcon");
healIcon = ui.findActor("healIcon");
@@ -45,7 +49,9 @@ public class InnScene extends UIScene {
}
public void potionOfFalseLife() {
Current.player().potionOfFalseLife();
if (Current.player().potionOfFalseLife()){
refreshStatus();
}
}
@Override
@@ -59,12 +65,16 @@ public class InnScene extends UIScene {
super.render();
}
int tempHealthCost = 0;
@Override
public void enter() {
super.enter();
int tempHealthCost = Current.player().falseLifeCost();
if (tempHealthCost < 0) // if computed negative set 250 as minimum
tempHealthCost = 250;
refreshStatus();
}
private void refreshStatus(){
tempHealthCost = Current.player().falseLifeCost();
boolean purchaseable = Current.player().getMaxLife() == Current.player().getLife() &&
tempHealthCost <= Current.player().getGold();
@@ -76,5 +86,4 @@ public class InnScene extends UIScene {
Forge.switchScene(ShopScene.instance());
}
}

View File

@@ -159,7 +159,7 @@ public class InventoryScene extends UIScene {
ItemData data = ItemData.getItem(itemLocation.get(selected));
if(data==null)return;
Current.player().addMana(-data.manaNeeded);
Current.player().addShards(-data.shardsNeeded);
done();
ConsoleCommandInterpreter.getInstance().command(data.commandOnUse);
}
@@ -192,12 +192,12 @@ public class InventoryScene extends UIScene {
boolean isInPoi = MapStage.getInstance().isInMap();
useButton.setDisabled(!(isInPoi&&data.usableInPoi||!isInPoi&&data.usableOnWorldMap));
if(data.manaNeeded==0)
if(data.shardsNeeded==0)
useButton.setText("Use");
else
useButton.setText("Use "+data.manaNeeded+"[+Mana]");
useButton.setText("Use "+data.shardsNeeded+"[+Shards]");
useButton.layout();
if(Current.player().getMana()<data.manaNeeded)
if(Current.player().getShards()<data.shardsNeeded)
useButton.setDisabled(true);
if(data.equipmentSlot==null|| data.equipmentSlot.equals(""))

View File

@@ -12,6 +12,8 @@ import com.github.tommyettinger.textra.TextraButton;
import com.github.tommyettinger.textra.TextraLabel;
import forge.Forge;
import forge.adventure.character.ShopActor;
import forge.adventure.data.RewardData;
import forge.adventure.data.ShopData;
import forge.adventure.player.AdventurePlayer;
import forge.adventure.pointofintrest.PointOfInterestChanges;
import forge.adventure.stage.GameHUD;
@@ -25,11 +27,14 @@ import forge.sound.SoundSystem;
* Displays the rewards of a fight or a treasure
*/
public class RewardScene extends UIScene {
private final TextraButton doneButton, detailButton;
private final TextraLabel goldLabel, shopNameLabel;
private TextraButton doneButton, detailButton, restockButton;
private TextraLabel shopNameLabel, playerGold, playerShards;
private ShopActor shopActor;
private static RewardScene object;
private PointOfInterestChanges changes;
public static RewardScene instance() {
if(object==null)
object=new RewardScene();
@@ -52,13 +57,16 @@ public class RewardScene extends UIScene {
super(Forge.isLandscapeMode() ? "ui/items.json" : "ui/items_portrait.json");
goldLabel=ui.findActor("gold");
playerGold = Controls.newAccountingLabel(ui.findActor("playerGold"), false);
playerShards = Controls.newAccountingLabel(ui.findActor("playerShards"),true);
shopNameLabel = ui.findActor("shopName");
ui.onButtonPress("done", () -> RewardScene.this.done());
ui.onButtonPress("detail",()->RewardScene.this.toggleToolTip());
ui.onButtonPress("restock",()-> RewardScene.this.restockShop());
detailButton = ui.findActor("detail");
detailButton.setVisible(false);
doneButton = ui.findActor("done");
restockButton = ui.findActor("restock");
}
@Override
@@ -222,11 +230,48 @@ public class RewardScene extends UIScene {
}
}
void updateRestockButton(){
int price = shopActor.getRestockPrice();
restockButton.setText("Refresh\n " + price + "[+shards]");
restockButton.setDisabled(WorldSave.getCurrentSave().getPlayer().getShards() < price);
}
void restockShop(){
int price = shopActor.getRestockPrice();
if(changes!=null)
changes.generateNewShopSeed(shopActor.getObjectId());
Current.player().takeShards(price);
Gdx.input.vibrate(5);
SoundSystem.instance.play(SoundEffectType.Shuffle, false);
updateBuyButtons();
if(changes==null)
return;
clearGenerated();
ShopData data = shopActor.getShopData();
Array<Reward> ret = new Array<>();
long shopSeed = changes.getShopSeed(shopActor.getObjectId());
WorldSave.getCurrentSave().getWorld().getRandom().setSeed(shopSeed);
for (RewardData rdata : new Array.ArrayIterator<>(data.rewards)) {
ret.addAll(rdata.generate(false));
}
shopActor.setRewardData(ret);
loadRewards(ret, RewardScene.Type.Shop,shopActor);
}
public void loadRewards(Array<Reward> newRewards, Type type, ShopActor shopActor) {
clearSelectable();
this.type = type;
doneClicked = false;
if (type==Type.Shop) {
this.shopActor = shopActor;
this.changes = shopActor.getMapStage().getChanges();
}
for (Actor actor : new Array.ArrayIterator<>(generated)) {
actor.remove();
if (actor instanceof RewardActor) {
@@ -235,10 +280,8 @@ public class RewardScene extends UIScene {
}
generated.clear();
Actor card = ui.findActor("cards");
if(type==Type.Shop) {
goldLabel.setText(Current.player().getGold()+"[+Gold]");
String shopName = shopActor.getDescription();
if (shopName != null && !shopName.isEmpty()) {
shopNameLabel.setVisible(true);
@@ -252,7 +295,6 @@ public class RewardScene extends UIScene {
if(background!=null)
background.setVisible(true);
} else {
goldLabel.setText("");
shopNameLabel.setVisible(false);
shopNameLabel.setText("");
Actor background = ui.findActor("market_background");
@@ -278,19 +320,20 @@ public class RewardScene extends UIScene {
switch (type) {
case Shop:
doneButton.setText(Forge.getLocalizer().getMessage("lblLeave"));
goldLabel.setText(Current.player().getGold()+"[+Gold]");
String shopName = shopActor.getDescription();
if ((shopName != null && !shopName.isEmpty())) {
shopNameLabel.setVisible(true);
shopNameLabel.setText(shopName);
}
if (shopActor.canRestock()) {
restockButton.setVisible(true);
}
break;
case Loot:
goldLabel.setText("");
shopNameLabel.setVisible(false);
shopNameLabel.setText("");
restockButton.setVisible(false);
doneButton.setText(Forge.getLocalizer().getMessage("lblDone"));
break;
}
@@ -355,7 +398,7 @@ public class RewardScene extends UIScene {
for (Reward reward : new Array.ArrayIterator<>(newRewards)) {
boolean skipCard = false;
if (type == Type.Shop) {
if (shopActor.getMapStage().getChanges().wasCardBought(shopActor.getObjectId(), i)) {
if (changes.wasCardBought(shopActor.getObjectId(), i)) {
skipCard = true;
}
}
@@ -375,7 +418,7 @@ public class RewardScene extends UIScene {
if (currentRow != ((i + 1) / numberOfColumns))
yOff += doneButton.getHeight();
BuyButton buyCardButton = new BuyButton(shopActor.getObjectId(), i, shopActor.isUnlimited()?null:shopActor.getMapStage().getChanges(), actor, doneButton);
BuyButton buyCardButton = new BuyButton(shopActor.getObjectId(), i, actor, doneButton, shopActor.getPriceModifier());
generated.add(buyCardButton);
if (!skipCard) {
stage.addActor(buyCardButton);
@@ -390,7 +433,10 @@ public class RewardScene extends UIScene {
}
i++;
}
updateBuyButtons();
if (type == Type.Shop) {
updateBuyButtons();
updateRestockButton();
}
}
@@ -401,11 +447,9 @@ public class RewardScene extends UIScene {
}
}
}
private class BuyButton extends TextraButton {
private final int objectID;
private final int index;
private final PointOfInterestChanges changes;
public RewardActor reward;
int price;
@@ -413,11 +457,10 @@ public class RewardScene extends UIScene {
setDisabled(WorldSave.getCurrentSave().getPlayer().getGold() < price);
}
public BuyButton(int id, int i, PointOfInterestChanges ch, RewardActor actor, TextraButton style) {
public BuyButton(int id, int i, RewardActor actor, TextraButton style, float shopModifier) {
super("", style.getStyle(),Controls.getTextraFont());
this.objectID = id;
this.index = i;
this.changes = ch;
reward = actor;
setHeight(style.getHeight());
setWidth(actor.getWidth());
@@ -425,13 +468,15 @@ public class RewardScene extends UIScene {
setY(actor.getY() - getHeight());
price = CardUtil.getRewardPrice(actor.getReward());
price *= Current.player().goldModifier();
price *= shopModifier;
setText(price+"[+Gold]");
addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y) {
if (Current.player().getGold() >= price) {
if(changes!=null)
if(!shopActor.isUnlimited())
changes.buyCard(objectID, index);
Current.player().takeGold(price);
Current.player().addReward(reward.getReward());
@@ -439,7 +484,6 @@ public class RewardScene extends UIScene {
SoundSystem.instance.play(SoundEffectType.FlipCoin, false);
updateBuyButtons();
goldLabel.setText(AdventurePlayer.current().getGold()+"[+Gold]");
if(changes==null)
return;
setDisabled(true);

View File

@@ -113,7 +113,6 @@ public class SettingsScene extends UIScene {
addLabel(Forge.getLocalizer().getMessage("lblCreate")+Forge.getLocalizer().getMessage("lblWorld"));
settingGroup.add(newPlane).align(Align.right).pad(2);
addCheckBox(Forge.getLocalizer().getMessage("lblExpandedShops"), ForgePreferences.FPref.EXPANDEDADVENTURESHOPS);
if (!GuiBase.isAndroid()) {
SelectBox videomode = Controls.newComboBox(new String[]{"720p", "768p", "900p", "1080p"}, Config.instance().getSettingData().videomode, o -> {
String mode = (String) o;

View File

@@ -0,0 +1,97 @@
package forge.adventure.scene;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.github.tommyettinger.textra.TextraButton;
import com.github.tommyettinger.textra.TextraLabel;
import forge.Forge;
import forge.adventure.stage.GameHUD;
import forge.adventure.util.Controls;
import forge.adventure.util.Current;
/**
* Scene for the Shard Trader in towns
*/
public class ShardTraderScene extends UIScene {
private static ShardTraderScene object;
public static final String spriteAtlas = "maps/tileset/buildings.atlas";
public static final String sprite = "shard_trader";
public static ShardTraderScene instance() {
if(object==null)
object=new ShardTraderScene();
return object;
}
TextraButton buyShardsCost, sellShardsQuantity, leave;
Image leaveIcon;
private TextraLabel playerGold, playerShards;
int shardsToSell = 5;
int shardsToBuy = 5;
int shardPrice = Math.round(100 * Current.player().getDifficulty().shardSellRatio);
int shardCost = 100;
private ShardTraderScene() {
super(Forge.isLandscapeMode() ? "ui/shardtrader.json" : "ui/shardtrader_portrait.json");
buyShardsCost = ui.findActor("btnBuyShardsCost");
sellShardsQuantity = ui.findActor("btnSellShardsQuantity");
ui.onButtonPress("done", ShardTraderScene.this::done);
ui.onButtonPress("btnBuyShardsCost", ShardTraderScene.this::buyShards);
ui.onButtonPress("btnSellShardsQuantity", ShardTraderScene.this::sellShards);
leave = ui.findActor("done");
playerGold = Controls.newAccountingLabel(ui.findActor("playerGold"), false);
playerShards = Controls.newAccountingLabel(ui.findActor("playerShards"),true);
leaveIcon = ui.findActor("leaveIcon");
}
public void done() {
GameHUD.getInstance().getTouchpad().setVisible(false);
Forge.switchToLast();
}
public void buyShards() {
Current.player().addShards(shardsToBuy);
Current.player().takeGold(shardCost);
refreshStatus(-shardCost,shardsToBuy);
}
public void sellShards() {
Current.player().takeShards(shardsToSell);
Current.player().giveGold(shardPrice);
refreshStatus(shardPrice,-shardsToSell);
}
@Override
public void act(float delta) {
stage.act(delta);
}
@Override
public void render() {
super.render();
}
@Override
public void enter() {
super.enter();
refreshStatus(0,0);
}
private void refreshStatus(int goldAdded, int shardsAdded) {
int currentGold = Current.player().getGold();
int currentShards = Current.player().getShards();
shardPrice = Math.round(100 * Current.player().getDifficulty().shardSellRatio);
sellShardsQuantity.setDisabled(currentShards < shardsToSell);
buyShardsCost.setDisabled(currentGold < shardCost);
buyShardsCost.setText( "Buy " + shardsToBuy+ "[+Shards] for " + shardCost+"[+Gold]");
sellShardsQuantity.setText("Sell " +shardsToSell+"[+Shards] for " +shardPrice+"[+Gold]");
}
}

View File

@@ -12,10 +12,7 @@ import com.github.tommyettinger.textra.TextraLabel;
import forge.Forge;
import forge.StaticData;
import forge.adventure.data.RewardData;
import forge.adventure.util.Config;
import forge.adventure.util.Current;
import forge.adventure.util.Reward;
import forge.adventure.util.RewardActor;
import forge.adventure.util.*;
import forge.card.CardEdition;
import forge.card.ColorSet;
import forge.item.PaperCard;
@@ -38,8 +35,8 @@ public class SpellSmithScene extends UIScene {
}
private List<PaperCard> cardPool = new ArrayList<>();
private final TextraLabel goldLabel;
private final TextraButton pullButton;
private TextraLabel playerGold, playerShards, poolSize;
private final TextraButton pullUsingGold, pullUsingShards;
private final ScrollPane rewardDummy;
private RewardActor rewardActor;
SelectBox<CardEdition> editionList;
@@ -55,6 +52,7 @@ public class SpellSmithScene extends UIScene {
//Other
private final float basePrice = 125f;
private int currentPrice = 0;
private int currentShardPrice = 0;
private SpellSmithScene() { super(Forge.isLandscapeMode() ? "ui/spellsmith.json" : "ui/spellsmith_portrait.json");
@@ -68,7 +66,7 @@ public class SpellSmithScene extends UIScene {
.filter(input2 -> input2.getEdition().equals(input.getCode())).collect(Collectors.toList());
if(it.size()==0)
return false;
return(!Arrays.asList(Config.instance().getConfigData().restrictedEditions).contains(input.getCode()));
return (!Arrays.asList(Config.instance().getConfigData().restrictedEditions).contains(input.getCode()));
}).collect(Collectors.toList());
editionList = ui.findActor("BSelectPlane");
rewardDummy = ui.findActor("RewardDummy");
@@ -86,44 +84,47 @@ public class SpellSmithScene extends UIScene {
}
});
goldLabel = ui.findActor("gold");
pullButton = ui.findActor("pull");
pullButton.setDisabled(true);
goldLabel.setText("Gold: "+ Current.player().getGold());
for(String i : new String[]{"BBlack", "BBlue", "BGreen", "BRed", "BWhite", "BColorless"} ){
pullUsingGold = ui.findActor("pullUsingGold");
pullUsingGold.setDisabled(true);
pullUsingShards = ui.findActor("pullUsingShards");
pullUsingShards.setDisabled(true);
playerGold = Controls.newAccountingLabel(ui.findActor("playerGold"), false);
playerShards = Controls.newAccountingLabel(ui.findActor("playerShards"),true);
poolSize = ui.findActor("poolSize");
for (String i : new String[]{"BBlack", "BBlue", "BGreen", "BRed", "BWhite", "BColorless"}) {
TextraButton button = ui.findActor(i);
if(button != null){
if (button != null) {
colorButtons.put(i, button);
button.addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y){
public void clicked(InputEvent event, float x, float y) {
selectColor(i);
filterResults();
}
});
}
}
for(String i : new String[]{"BCommon", "BUncommon", "BRare", "BMythic"} ){
for (String i : new String[]{"BCommon", "BUncommon", "BRare", "BMythic"}) {
TextraButton button = ui.findActor(i);
if(button != null) {
if (button != null) {
rarityButtons.put(i, button);
button.addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y) {
if(selectRarity(i)) button.setColor(Color.RED);
if (selectRarity(i)) button.setColor(Color.RED);
filterResults();
}
});
}
}
for(String i : new String[]{"B02", "B35", "B68", "B9X"} ){
for (String i : new String[]{"B02", "B35", "B68", "B9X"}) {
TextraButton button = ui.findActor(i);
if(button != null) {
if (button != null) {
costButtons.put(i, button);
button.addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y) {
if(selectCost(i)) button.setColor(Color.RED);
if (selectCost(i)) button.setColor(Color.RED);
filterResults();
}
});
@@ -131,7 +132,8 @@ public class SpellSmithScene extends UIScene {
}
ui.onButtonPress("done", () -> SpellSmithScene.this.done());
ui.onButtonPress("pull", () -> SpellSmithScene.this.pullCard());
ui.onButtonPress("pullUsingGold", () -> SpellSmithScene.this.pullCard(false));
ui.onButtonPress("pullUsingShards", () -> SpellSmithScene.this.pullCard(true));
ui.onButtonPress("BResetEdition", () -> {
editionList.setColor(Color.WHITE);
edition = "";
@@ -141,39 +143,57 @@ public class SpellSmithScene extends UIScene {
public boolean done() {
if(rewardActor != null) rewardActor.remove();
if (rewardActor != null) rewardActor.remove();
cardPool.clear(); //Get rid of cardPool, filtering is fast enough to justify keeping it cached.
Forge.switchToLast();
return true;
}
private boolean selectRarity(String what){
for(Map.Entry<String, TextraButton> B : rarityButtons.entrySet())
private boolean selectRarity(String what) {
for (Map.Entry<String, TextraButton> B : rarityButtons.entrySet())
B.getValue().setColor(Color.WHITE);
switch(what){
switch (what) {
case "BCommon":
if(rarity.equals("C")) { rarity = ""; return false; }
rarity = "C"; break;
if (rarity.equals("C")) {
rarity = "";
return false;
}
rarity = "C";
break;
case "BUncommon":
if(rarity.equals("U")) { rarity = ""; return false; }
rarity = "U"; break;
if (rarity.equals("U")) {
rarity = "";
return false;
}
rarity = "U";
break;
case "BRare":
if(rarity.equals("R")) { rarity = ""; return false; }
rarity = "R"; break;
if (rarity.equals("R")) {
rarity = "";
return false;
}
rarity = "R";
break;
case "BMythic":
if(rarity.equals("M")) { rarity = ""; return false; }
rarity = "M"; break;
if (rarity.equals("M")) {
rarity = "";
return false;
}
rarity = "M";
break;
default:
rarity = ""; break;
rarity = "";
break;
}
return true;
}
private void selectColor(String what){
private void selectColor(String what) {
TextraButton B = colorButtons.get(what);
switch(what){
switch (what) {
case "BColorless":
if(B.getColor().equals(Color.RED)) B.setColor(Color.WHITE); else {
if (B.getColor().equals(Color.RED)) B.setColor(Color.WHITE);
else {
for (Map.Entry<String, TextraButton> BT : colorButtons.entrySet())
BT.getValue().setColor(Color.WHITE);
B.setColor(Color.RED);
@@ -184,45 +204,71 @@ public class SpellSmithScene extends UIScene {
case "BGreen":
case "BRed":
case "BWhite":
if(B.getColor().equals(Color.RED)) B.setColor(Color.WHITE); else B.setColor(Color.RED);
if (B.getColor().equals(Color.RED)) B.setColor(Color.WHITE);
else B.setColor(Color.RED);
break;
}
}
private boolean selectCost(String what){
for(Map.Entry<String, TextraButton> B : costButtons.entrySet())
private boolean selectCost(String what) {
for (Map.Entry<String, TextraButton> B : costButtons.entrySet())
B.getValue().setColor(Color.WHITE);
switch(what){
switch (what) {
case "B02":
if(cost_low == 0 && cost_high == 2) { cost_low = -1; cost_high = 9999; return false; }
cost_low = 0; cost_high = 2; break;
if (cost_low == 0 && cost_high == 2) {
cost_low = -1;
cost_high = 9999;
return false;
}
cost_low = 0;
cost_high = 2;
break;
case "B35":
if(cost_low == 3 && cost_high == 5) { cost_low = -1; cost_high = 9999; return false; }
cost_low = 3; cost_high = 5; break;
if (cost_low == 3 && cost_high == 5) {
cost_low = -1;
cost_high = 9999;
return false;
}
cost_low = 3;
cost_high = 5;
break;
case "B68":
if(cost_low == 6 && cost_high == 8) { cost_low = -1; cost_high = 9999; return false; }
cost_low = 6; cost_high = 8; break;
if (cost_low == 6 && cost_high == 8) {
cost_low = -1;
cost_high = 9999;
return false;
}
cost_low = 6;
cost_high = 8;
break;
case "B9X":
if(cost_low == 9 && cost_high == 9999) { cost_low = -1; cost_high = 9999; return false; }
cost_low = 9; cost_high = 9999; break;
if (cost_low == 9 && cost_high == 9999) {
cost_low = -1;
cost_high = 9999;
return false;
}
cost_low = 9;
cost_high = 9999;
break;
default:
cost_low = -1; break;
cost_low = -1;
break;
}
return true;
}
@Override
public void enter(){
public void enter() {
edition = "";
cost_low = -1; cost_high = 9999;
cost_low = -1;
cost_high = 9999;
rarity = "";
currentPrice = (int)basePrice;
goldLabel.setText(Current.player().getGold()+"[+Gold]");
currentPrice = (int) basePrice;
for(Map.Entry<String, TextraButton> B : colorButtons.entrySet()) B.getValue().setColor(Color.WHITE);
for(Map.Entry<String, TextraButton> B : costButtons.entrySet()) B.getValue().setColor(Color.WHITE);
for(Map.Entry<String, TextraButton> B : rarityButtons.entrySet()) B.getValue().setColor(Color.WHITE);
for (Map.Entry<String, TextraButton> B : colorButtons.entrySet()) B.getValue().setColor(Color.WHITE);
for (Map.Entry<String, TextraButton> B : costButtons.entrySet()) B.getValue().setColor(Color.WHITE);
for (Map.Entry<String, TextraButton> B : rarityButtons.entrySet()) B.getValue().setColor(Color.WHITE);
editionList.setColor(Color.WHITE);
filterResults();
super.enter();
@@ -231,28 +277,27 @@ public class SpellSmithScene extends UIScene {
public void filterResults() {
Iterable<PaperCard> P = RewardData.getAllCards();
goldLabel.setText( Current.player().getGold()+"[+Gold]");
float totalCost = basePrice * Current.player().goldModifier();
final List<String> colorFilter = new ArrayList<>();
for(Map.Entry<String, TextraButton> B : colorButtons.entrySet())
switch (B.getKey()){
for (Map.Entry<String, TextraButton> B : colorButtons.entrySet())
switch (B.getKey()) {
case "BColorless":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Colorless");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("Colorless");
continue;
case "BBlack":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Black");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("Black");
break;
case "BBlue":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Blue");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("Blue");
break;
case "BGreen":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Green");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("Green");
break;
case "BRed":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Red");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("Red");
break;
case "BWhite":
if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("White");
if (B.getValue().getColor().equals(Color.RED)) colorFilter.add("White");
break;
}
P = StreamSupport.stream(P.spliterator(), false).filter(input -> {
@@ -260,43 +305,63 @@ public class SpellSmithScene extends UIScene {
if (input == null) return false;
final CardEdition cardEdition = FModel.getMagicDb().getEditions().get(edition);
if(cardEdition!=null&&cardEdition.getCardInSet(input.getName()).size()==0) return false;
if(colorFilter.size() > 0) if(input.getRules().getColor() != ColorSet.fromNames(colorFilter)) return false;
if(!rarity.isEmpty()) if (!input.getRarity().toString().equals(rarity)) return false;
if(cost_low > -1) {
if (cardEdition != null && cardEdition.getCardInSet(input.getName()).size() == 0) return false;
if (colorFilter.size() > 0)
if (input.getRules().getColor() != ColorSet.fromNames(colorFilter)) return false;
if (!rarity.isEmpty()) if (!input.getRarity().toString().equals(rarity)) return false;
if (cost_low > -1) {
if (!(input.getRules().getManaCost().getCMC() >= cost_low && input.getRules().getManaCost().getCMC() <= cost_high))
return false;
}
return true;
}).collect(Collectors.toList());
//Stream method is very fast, might not be necessary to precache anything.
if(!edition.isEmpty()) totalCost *= 4.0f; //Edition select cost multiplier. This is a huge factor, so it's most expensive.
if(colorFilter.size() > 0) totalCost *= Math.min(colorFilter.size() * 2.5f, 6.0f); //Color filter cost multiplier.
if(!rarity.isEmpty()){ //Rarity cost multiplier.
switch(rarity){
case "C": totalCost *= 1.5f; break;
case "U": totalCost *= 2.5f; break;
case "R": totalCost *= 4.0f; break;
case "M": totalCost *= 5.5f; break;
default: break;
if (!edition.isEmpty())
totalCost *= 4.0f; //Edition select cost multiplier. This is a huge factor, so it's most expensive.
if (colorFilter.size() > 0)
totalCost *= Math.min(colorFilter.size() * 2.5f, 6.0f); //Color filter cost multiplier.
if (!rarity.isEmpty()) { //Rarity cost multiplier.
switch (rarity) {
case "C":
totalCost *= 1.5f;
break;
case "U":
totalCost *= 2.5f;
break;
case "R":
totalCost *= 4.0f;
break;
case "M":
totalCost *= 5.5f;
break;
default:
break;
}
}
if(cost_low > -1) totalCost *= 2.5f; //And CMC cost multiplier.
if (cost_low > -1) totalCost *= 2.5f; //And CMC cost multiplier.
cardPool = StreamSupport.stream(P.spliterator(), false).collect(Collectors.toList());
pullButton.setText("Pull (" + cardPool.size() + ") " + totalCost + "G");
currentPrice = (int)totalCost;
pullButton.setDisabled(false);
if(!(cardPool.size() > 0) || Current.player().getGold() < totalCost)
pullButton.setDisabled(true);
poolSize.setText(((cardPool.size() > 0 ? "[LIME]" : "[RED]")) + cardPool.size() + " possible card" + (cardPool.size() != 1 ? "s" : ""));
currentPrice = (int) totalCost;
currentShardPrice = (int) (totalCost * 0.2f); //Intentionally rounding up via the cast to int
pullUsingGold.setText("Pull: " + currentPrice + "[+gold]");
pullUsingShards.setText("Pull: " + currentShardPrice + "[+shards]");
pullUsingGold.setDisabled(!(cardPool.size() > 0) || Current.player().getGold() < totalCost);
pullUsingShards.setDisabled(!(cardPool.size() > 0) || Current.player().getShards() < currentShardPrice);
}
public void pullCard() {
public void pullCard(boolean usingShards) {
PaperCard P = cardPool.get(MyRandom.getRandom().nextInt(cardPool.size())); //Don't use the standard RNG.
Reward R = new Reward(P);
Current.player().addReward(R);
Current.player().takeGold(currentPrice);
if(Current.player().getGold() < currentPrice) pullButton.setDisabled(true);
if(rewardActor != null) rewardActor.remove();
if (usingShards) {
Current.player().takeShards(currentShardPrice);
} else {
Current.player().takeGold(currentPrice);
}
if (Current.player().getGold() < currentPrice) pullUsingGold.setDisabled(true);
if (Current.player().getShards() < currentShardPrice) pullUsingShards.setDisabled(true);
if (rewardActor != null) rewardActor.remove();
rewardActor = new RewardActor(R, true);
rewardActor.flip(); //Make it flip so it draws visual attention, why not.
rewardActor.setBounds(rewardDummy.getX(), rewardDummy.getY(), rewardDummy.getWidth(), rewardDummy.getHeight());

View File

@@ -154,7 +154,7 @@ public static ConsoleCommandInterpreter getInstance()
Current.player().giveGold(amount);
return "Added "+amount+" gold";
});
registerCommand(new String[]{"give", "mana"}, s -> {
registerCommand(new String[]{"give", "shards"}, s -> {
if(s.length<1) return "Command needs 1 parameter: Amount.";
int amount;
try {
@@ -163,8 +163,8 @@ public static ConsoleCommandInterpreter getInstance()
catch (Exception e) {
return "Can not convert " + s[0] + " to number";
}
Current.player().addMaxMana(amount);
return "Added " + amount + " max mana";
Current.player().addShards(amount);
return "Added " + amount + " shards";
});
registerCommand(new String[]{"give", "life"}, s -> {
if(s.length<1) return "Command needs 1 parameter: Amount.";
@@ -279,26 +279,26 @@ public static ConsoleCommandInterpreter getInstance()
return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
});
registerCommand(new String[]{"getMana", "amount"}, s -> {
registerCommand(new String[]{"getShards", "amount"}, s -> {
if(s.length<1) return "Command needs 1 parameter: Amount";
int value;
try { value = Integer.parseInt(s[0]); }
catch (Exception e) { return "Can not convert " + s[0] + " to integer"; }
Current.player().addMana(value);
return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
});
registerCommand(new String[]{"getMana", "percent"}, s -> {
if(s.length<1) return "Command needs 1 parameter: Amount";
float value = 0;
try { value = Float.parseFloat(s[0]); }
catch (Exception e) { return "Can not convert " + s[0] + " to integer"; }
Current.player().addManaPercent(value);
return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
});
registerCommand(new String[]{"getMana", "full"}, s -> {
Current.player().addManaPercent(1.0f);
return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
Current.player().addShards(value);
return "Player now has " + Current.player().getShards() + " shards";
});
// registerCommand(new String[]{"getMana", "percent"}, s -> {
// if(s.length<1) return "Command needs 1 parameter: Amount";
// float value = 0;
// try { value = Float.parseFloat(s[0]); }
// catch (Exception e) { return "Can not convert " + s[0] + " to integer"; }
// Current.player().addManaPercent(value);
// return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
// });
// registerCommand(new String[]{"getMana", "full"}, s -> {
// Current.player().addManaPercent(1.0f);
// return "Player healed to " + Current.player().getLife() + "/" + Current.player().getMaxLife();
// });
registerCommand(new String[]{"debug","map"}, s -> {
GameHUD.getInstance().setDebug(true);
return "Debug map ON";
@@ -356,7 +356,7 @@ public static ConsoleCommandInterpreter getInstance()
if(!MapStage.getInstance().isInMap())
return "Only supported for PoI";
MapStage.getInstance().deleteObject(id);
return "Femoved enemy "+s[0];
return "Removed enemy "+s[0];
});
}
}

View File

@@ -45,7 +45,7 @@ public class GameHUD extends Stage {
private final Image miniMapPlayer;
private final TextraLabel lifePoints;
private final TextraLabel money;
private final TextraLabel mana;
private final TextraLabel shards;
private final Image miniMap, gamehud, mapborder, avatarborder, blank;
private final InputEvent eventTouchDown;
private final InputEvent eventTouchUp;
@@ -120,12 +120,12 @@ public class GameHUD extends Stage {
ui.onButtonPress("deck", () -> openDeck());
ui.onButtonPress("exittoworldmap", () -> exitToWorldMap());
lifePoints = ui.findActor("lifePoints");
mana = ui.findActor("mana");
shards = ui.findActor("shards");
money = ui.findActor("money");
mana.setText("{Scale=80%}0/0");
shards.setText("{Scale=80%}0/0");
lifePoints.setText("{Scale=80%}20/20");
AdventurePlayer.current().onLifeChange(() -> lifePoints.setText("{Scale=80%}"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife()));
AdventurePlayer.current().onManaChange(() -> mana.setText("{Scale=80%}"+AdventurePlayer.current().getMana() + "/" + AdventurePlayer.current().getMaxMana()));
AdventurePlayer.current().onShardsChange(() -> shards.setText("{Scale=80%}"+AdventurePlayer.current().getShards()));
WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("{Scale=80%}"+String.valueOf(AdventurePlayer.current().getGold())));
addActor(ui);
@@ -349,7 +349,7 @@ public class GameHUD extends Stage {
setVisibility(miniMapPlayer, visible);
setVisibility(gamehud, visible);
setVisibility(lifePoints, visible);
setVisibility(mana, visible);
setVisibility(shards, visible);
setVisibility(money, visible);
setVisibility(blank, visible);
setVisibility(exitToWorldMapActor, GameScene.instance().isInDungeonOrCave());

View File

@@ -382,9 +382,9 @@ public class MapStage extends GameStage {
if (difficultyData.spawnRank == 0 && !spawnEasy) return false;
return true;
}
private void loadObjects(MapLayer layer, String sourceMap) {
player.setMoveModifier(2);
Array<String> shopsAlreadyPresent = new Array<>();
for (MapObject obj : layer.getObjects()) {
MapProperties prop = obj.getProperties();
String type = prop.get("type", String.class);
@@ -477,6 +477,21 @@ public class MapStage extends GameStage {
case "spellsmith":
addMapActor(obj, new OnCollide(() -> Forge.switchScene(SpellSmithScene.instance())));
break;
case "shardtrader":
MapActor shardTraderActor = new OnCollide(() -> Forge.switchScene(ShardTraderScene.instance()));
addMapActor(obj, shardTraderActor);
if (prop.containsKey("hasSign") && Boolean.parseBoolean(prop.get("hasSign").toString()) && prop.containsKey("signYOffset") && prop.containsKey("signXOffset")) {
try {
TextureSprite sprite = new TextureSprite(Config.instance().getAtlas(ShardTraderScene.spriteAtlas).createSprite(ShardTraderScene.sprite));
sprite.setX(shardTraderActor.getX() + Float.parseFloat(prop.get("signXOffset").toString()));
sprite.setY(shardTraderActor.getY() + Float.parseFloat(prop.get("signYOffset").toString()));
addMapActor(sprite);
} catch (Exception e) {
System.err.print("Can not create Texture for Shard Trader");
}
}
break;
case "arena":
addMapActor(obj, new OnCollide(() -> {
ArenaData arenaData = JSONStringLoader.parse(ArenaData.class, prop.get("arena").toString(), "");
@@ -498,40 +513,63 @@ public class MapStage extends GameStage {
addMapActor(obj, dialog);
}
break;
case "quest":
DialogActor dialog;
if (prop.containsKey("questtype")){
TiledMapTileMapObject tiledObj = (TiledMapTileMapObject) obj;
String questOrigin = prop.containsKey("questtype") ? prop.get("questtype").toString() : "";
String placeholderText = "[" +
" {" +
" \"name\":\"Quest Offer\"," +
" \"text\":\"Please, help us!\\n((QUEST DESCRIPTION))\"," +
" \"condition\":[]," +
" \"options\":[" +
" { \"name\":\"No, I'm not ready yet.\nMaybe next snapshot.\" }," +
" ]" +
" }" +
"]";
{
dialog = new DialogActor(this, id, placeholderText,tiledObj.getTextureRegion());
}
dialog.setVisible(false);
addMapActor(obj, dialog);
}
break;
case "shop":
String shopList = new String();
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.EXPANDEDADVENTURESHOPS))
{
int rarity = WorldSave.getCurrentSave().getWorld().getRandom().nextInt(100);
String shopList = "";
int restockPrice = 0;
if (rarity > 95 & prop.containsKey("mythicShopList")){
shopList = prop.get("mythicShopList").toString();
}
if (shopList.isEmpty() && (rarity > 85 & prop.containsKey("rareShopList"))){
shopList = prop.get("rareShopList").toString();
}
if (shopList.isEmpty() && (rarity > 55 & prop.containsKey("uncommonShopList"))){
shopList = prop.get("uncommonShopList").toString();
}
if (shopList.isEmpty() & prop.containsKey("commonShopList")){
shopList = prop.get("commonShopList").toString();
}
int rarity = WorldSave.getCurrentSave().getWorld().getRandom().nextInt(100);
if (rarity > 95 & prop.containsKey("mythicShopList")) {
shopList = prop.get("mythicShopList").toString();
restockPrice = 5;
}
if (shopList.trim().isEmpty()){
shopList = prop.get("shopList").toString();
if (shopList.isEmpty() && (rarity > 85 & prop.containsKey("rareShopList"))) {
shopList = prop.get("rareShopList").toString();
restockPrice = 4;
}
//refactor to tag Universes Beyond shops in some way but still include in rarity list above.
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.EXPANDEDADVENTURESHOPS) & prop.containsKey("universesBeyondShopList"))
{
shopList = String.join(",", shopList, prop.get("universesBeyondShopList").toString());
if (shopList.isEmpty() && (rarity > 55 & prop.containsKey("uncommonShopList"))) {
shopList = prop.get("uncommonShopList").toString();
restockPrice = 3;
}
if (shopList.isEmpty() && prop.containsKey("commonShopList")) {
shopList = prop.get("commonShopList").toString();
restockPrice = 2;
}
if (shopList.trim().isEmpty() && prop.containsKey("shopList")) {
shopList = prop.get("shopList").toString(); //removed but included to not break existing custom planes
restockPrice = 0; //Tied to restock button
}
shopList = shopList.replaceAll("\\s", "");
Array<String> possibleShops = new Array<>(shopList.split(","));
Array<String> filteredPossibleShops = possibleShops;
filteredPossibleShops.removeAll(shopsAlreadyPresent, false);
if (filteredPossibleShops.notEmpty()){
possibleShops = filteredPossibleShops;
}
Array<ShopData> shops;
if (possibleShops.size == 0 || shopList.equals(""))
shops = WorldData.getShopList();
@@ -539,6 +577,7 @@ public class MapStage extends GameStage {
shops = new Array<>();
for (ShopData data : new Array.ArrayIterator<>(WorldData.getShopList())) {
if (possibleShops.contains(data.name, false)) {
data.restockPrice = restockPrice;
shops.add(data);
}
}
@@ -546,13 +585,15 @@ public class MapStage extends GameStage {
if (shops.size == 0) continue;
ShopData data = shops.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(shops.size));
shopsAlreadyPresent.add(data.name);
Array<Reward> ret = new Array<>();
WorldSave.getCurrentSave().getWorld().getRandom().setSeed(changes.getShopSeed(id));
for (RewardData rdata : new Array.ArrayIterator<>(data.rewards)) {
ret.addAll(rdata.generate(false));
}
ShopActor actor = new ShopActor(this, id, ret, data);
addMapActor(obj, actor);
if (prop.containsKey("signYOffset") && prop.containsKey("signXOffset")) {
if (prop.containsKey("hasSign") && (boolean)prop.get("hasSign") && prop.containsKey("signYOffset") && prop.containsKey("signXOffset")) {
try {
TextureSprite sprite = new TextureSprite(Config.instance().getAtlas(data.spriteAtlas).createSprite(data.sprite));
sprite.setX(actor.getX() + Float.parseFloat(prop.get("signXOffset").toString()));

View File

@@ -240,31 +240,30 @@ public class CardUtil {
}
}
public static List<PaperCard> getPredicateResult(Iterable<PaperCard> cards,final RewardData data)
{
List<PaperCard> result = new ArrayList<>();
CardPredicate pre = new CardPredicate(data, true);
for (final PaperCard item : cards)
{
if(pre.apply(item))
result.add(item);
}
return result;
}
public static List<PaperCard> generateCards(Iterable<PaperCard> cards,final RewardData data, final int count)
{
final List<PaperCard> result = new ArrayList<>();
for (int i=0;i<count;i++) {
CardPredicate pre=new CardPredicate(data, true);
PaperCard card = null;
int lowest = Integer.MAX_VALUE;
for (final PaperCard item : cards)
{
if(!pre.apply(item))
continue;
int next = WorldSave.getCurrentSave().getWorld().getRandom().nextInt();
if(next < lowest) {
lowest = next;
card = item;
List<PaperCard> pool = getPredicateResult(cards, data);
if (pool.size() > 0) {
for (int i = 0; i < count; i++) {
PaperCard candidate = pool.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(pool.size()));
if (candidate != null) {
result.add(candidate);
}
}
if (card != null )
result.add(card);
}
return result;
}
public static int getCardPrice(PaperCard card)
@@ -296,7 +295,7 @@ public class CardUtil {
return reward.getItem().cost;
if(reward.getType()== Reward.Type.Life)
return reward.getCount()*500;
if(reward.getType()== Reward.Type.Mana)
if(reward.getType()== Reward.Type.Shards)
return reward.getCount()*500;
if(reward.getType()== Reward.Type.Gold)
return reward.getCount();

View File

@@ -4,10 +4,13 @@ import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction;
import com.badlogic.gdx.scenes.scene2d.ui.*;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
@@ -15,11 +18,13 @@ import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Null;
import com.badlogic.gdx.utils.Timer;
import com.github.tommyettinger.textra.Font;
import com.github.tommyettinger.textra.TextraButton;
import com.github.tommyettinger.textra.TextraLabel;
import com.github.tommyettinger.textra.TypingLabel;
import forge.Forge;
import forge.adventure.player.AdventurePlayer;
import forge.card.ColorSet;
import java.util.function.Function;
@@ -404,4 +409,121 @@ public class Controls {
}
static public class AccountingLabel extends TextraLabel {
private TextraLabel label;
private final TextraLabel placeholder;
private String currencyIcon;
private boolean isShards;
private int currencyAmount;
private float animationDelay = 2f; //seconds to wait before replacing intermediate label
private final String NEGDECOR = "[RED]-";
private final String POSDECOR = "[GREEN]+";
private final Timer t = new Timer();
public AccountingLabel(TextraLabel target, boolean isShards) {
target.setVisible(false);
placeholder = target;
label = Controls.newTextraLabel(target.getName()+"Replacement");
currencyAmount = isShards?Current.player().getShards():Current.player().getGold();
this.isShards = isShards;
if (isShards){
currencyAmount = Current.player().getShards();
currencyIcon = "[+Shards]";
Current.player().onShardsChange(() -> update(AdventurePlayer.current().getShards(),true));
}
else {
currencyAmount = Current.player().getGold();
currencyIcon = "[+Gold]";
Current.player().onGoldChange(() -> update(AdventurePlayer.current().getGold(),true));
}
label.setText(getLabelText(currencyAmount));
setName(label.getName());
replaceLabel(label);
}
public void setAnimationDelay(float animationDelay) {
this.animationDelay = animationDelay;
}
public float getAnimationDelay() {
return animationDelay;
}
public void update(int newAmount){
update(newAmount, false);
}
public void update(int newAmount, boolean animate){
if (animate) {
TextraLabel temporaryLabel = getUpdateLabel(newAmount);
currencyAmount = newAmount;
replaceLabel(temporaryLabel);
t.schedule(new AccountingLabelUpdater(temporaryLabel), animationDelay);
}
else{
currencyAmount = newAmount;
drawFinalLabel(false);
}
}
private void drawFinalLabel(boolean fadeIn){
TextraLabel finalLabel = getDefaultLabel();
if (fadeIn) {
SequenceAction sequence = new SequenceAction();
sequence.addAction(Actions.alpha(0.5f));
sequence.addAction(Actions.alpha(1f, 2f, Interpolation.pow2Out));
finalLabel.addAction(sequence);
}
replaceLabel(finalLabel);
}
private TextraLabel getDefaultLabel(){
return Controls.newTextraLabel(getLabelText(currencyAmount));
}
private TextraLabel getUpdateLabel(int newAmount){
int delta = newAmount - currencyAmount;
String updateText = delta==0?"":(delta<0?NEGDECOR + delta *-1:POSDECOR + delta);
return Controls.newTextraLabel(getLabelText(currencyAmount, updateText));
}
private String getLabelText(int amount){
return getLabelText(amount, "");
}
private String getLabelText(int amount, String updateText){
return amount + " " + currencyIcon + updateText;
}
private void replaceLabel(TextraLabel newLabel) {
newLabel.setName(label.getName());
newLabel.style = placeholder.style;
newLabel.setBounds(placeholder.getX(), placeholder.getY(), label.getWidth(), placeholder.getHeight());
newLabel.setFont(label.getFont());
newLabel.style = placeholder.style;
newLabel.layout.setBaseColor(label.layout.getBaseColor());
newLabel.layout();
label.remove();
label = newLabel;
placeholder.getStage().addActor(label);
}
private class AccountingLabelUpdater extends Timer.Task{
@Override
public void run() {
if (label.equals(target)){
drawFinalLabel(true);
}
}
TextraLabel target;
AccountingLabelUpdater(TextraLabel replacement){
this.target = replacement;
}
}
}
public static TextraLabel newAccountingLabel(TextraLabel target, Boolean isShards) {
AccountingLabel label = new AccountingLabel(target, isShards);
return label;
}
}

View File

@@ -12,7 +12,7 @@ public class Reward {
Gold,
Item,
Life,
Mana
Shards
}
Type type;
PaperCard card;

View File

@@ -257,7 +257,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
break;
}
case Life:
case Mana:
case Shards:
case Gold: {
TextureAtlas atlas = Config.instance().getAtlas(ITEMS_ATLAS);
Sprite backSprite = atlas.createSprite("CardBack");

View File

@@ -230,6 +230,9 @@ public enum FSkinImage implements FImage {
QUEST_BIG_SWORD (FSkinProp.ICO_QUEST_BIG_SWORD, SourceFile.ICONS),
QUEST_BIG_BAG (FSkinProp.ICO_QUEST_BIG_BAG, SourceFile.ICONS),
//adventure
MANASHARD (FSkinProp.ICO_MANASHARD, SourceFile.ADVENTURE),
//menu icon
MENU_GALAXY (FSkinProp.ICO_MENU_GALAXY, SourceFile.ICONS),
MENU_STATS (FSkinProp.ICO_MENU_STATS, SourceFile.ICONS),
@@ -484,7 +487,9 @@ public enum FSkinImage implements FImage {
WATERMARKS(ForgeConstants.SPRITE_WATERMARK_FILE),
DRAFTRANKS(ForgeConstants.SPRITE_DRAFTRANKS_FILE),
CRACKS(ForgeConstants.SPRITE_CRACKS_FILE),
PLANAR_CONQUEST(ForgeConstants.SPRITE_PLANAR_CONQUEST_FILE);
PLANAR_CONQUEST(ForgeConstants.SPRITE_PLANAR_CONQUEST_FILE),
ADVENTURE(ForgeConstants.SPRITE_ADVENTURE_FILE);
private final String filename;

View File

@@ -76,6 +76,7 @@ public class TextRenderer {
Forge.getAssets().symbolLookup().put("AE", FSkinImage.AETHER_SHARD);
Forge.getAssets().symbolLookup().put("PW", FSkinImage.PW_BADGE_COMMON);
Forge.getAssets().symbolLookup().put("CR", FSkinImage.QUEST_COINSTACK);
Forge.getAssets().symbolLookup().put("M", FSkinImage.MANASHARD);
}
public static String startColor(Color color) {

View File

@@ -468,6 +468,7 @@ public class VPlayerPanel extends FContainer {
private int energyCounters = player.getCounters(CounterEnumType.ENERGY);
private int experienceCounters = player.getCounters(CounterEnumType.EXPERIENCE);
private int ticketCounters = player.getCounters(CounterEnumType.TICKET);
private int manaShards = player.getCounters(CounterEnumType.MANASHARDS);
private String lifeStr = String.valueOf(life);
private LifeLabel() {
@@ -496,6 +497,7 @@ public class VPlayerPanel extends FContainer {
energyCounters = player.getCounters(CounterEnumType.ENERGY);
experienceCounters = player.getCounters(CounterEnumType.EXPERIENCE);
manaShards = player.getCounters(CounterEnumType.MANASHARDS);
//when gui player loses life, vibrate device for a length of time based on amount of life lost
if (vibrateDuration > 0 && MatchController.instance.isLocalPlayer(player) &&
@@ -516,7 +518,7 @@ public class VPlayerPanel extends FContainer {
adjustHeight = 1;
float divider = Gdx.app.getGraphics().getHeight() > 900 ? 1.2f : 2f;
if(Forge.altPlayerLayout && !Forge.altZoneTabs && Forge.isLandscapeMode()) {
if (poisonCounters == 0 && energyCounters == 0 && experienceCounters == 0 && ticketCounters ==0) {
if (poisonCounters == 0 && energyCounters == 0 && experienceCounters == 0 && ticketCounters ==0 && manaShards == 0) {
g.fillRect(Color.DARK_GRAY, 0, 0, INFO2_FONT.getBounds(lifeStr).width+1, INFO2_FONT.getBounds(lifeStr).height+1);
g.drawText(lifeStr, INFO2_FONT, getInfoForeColor().getColor(), 0, 0, getWidth(), getHeight(), false, Align.left, false);
} else {
@@ -551,10 +553,16 @@ public class VPlayerPanel extends FContainer {
g.drawText(String.valueOf(ticketCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
mod+=1;
}
if (manaShards > 0) {
g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(manaShards)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(manaShards)).height+1);
g.drawImage(FSkinImage.AETHER_SHARD, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
g.drawText(String.valueOf(manaShards), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
mod+=1;
}
adjustHeight = (mod > 2) && (avatar.getHeight() < halfHeight*mod)? mod : 1;
}
} else {
if (poisonCounters == 0 && energyCounters == 0) {
if (poisonCounters == 0 && energyCounters == 0 && manaShards == 0) {
g.drawText(lifeStr, Forge.altZoneTabs ? LIFE_FONT_ALT : LIFE_FONT, getInfoForeColor(), 0, 0, getWidth(), getHeight(), false, Align.center, true);
} else {
float halfHeight = getHeight() / 2;
@@ -565,10 +573,14 @@ public class VPlayerPanel extends FContainer {
if (poisonCounters > 0) { //prioritize showing poison counters over energy counters
g.drawImage(FSkinImage.POISON, 0, halfHeight, halfHeight, halfHeight);
g.drawText(String.valueOf(poisonCounters), INFO_FONT, getInfoForeColor(), textStart, halfHeight, textWidth, halfHeight, false, Align.center, true);
} else {
} else if (energyCounters > 0) { //prioritize showing energy counters over mana shards
g.drawImage(FSkinImage.ENERGY, 0, halfHeight, halfHeight, halfHeight);
g.drawText(String.valueOf(energyCounters), INFO_FONT, getInfoForeColor(), textStart, halfHeight, textWidth, halfHeight, false, Align.center, true);
}
else {
g.drawImage(FSkinImage.MANASHARD, 0, halfHeight, halfHeight, halfHeight);
g.drawText(String.valueOf(manaShards), INFO_FONT, getInfoForeColor(), textStart, halfHeight, textWidth, halfHeight, false, Align.center, true);
}
}
}
}

View File

@@ -58,7 +58,7 @@
{
"name": "Easy",
"startingLife": 16,
"startingMana": 32,
"startingShards": 5,
"staringMoney": 500,
"enemyLifeFactor": 0.8,
"spawnRank": 0,
@@ -66,6 +66,7 @@
"lifeLoss": 0.1,
"rewardMaxFactor" : 1.5,
"sellFactor": 0.6,
"shardSellRatio": 0.95,
"starterDecks": {
"W":"decks/starter/white_e.json",
"B":"decks/starter/black_e.json",
@@ -94,7 +95,7 @@
},{
"name": "Normal",
"startingLife": 12,
"startingMana": 25,
"startingShards": 2,
"staringMoney": 250,
"startingDifficulty": true,
"enemyLifeFactor": 1.0,
@@ -103,6 +104,7 @@
"goldLoss": 0.1,
"lifeLoss": 0.2,
"sellFactor": 0.5,
"shardSellRatio": 0.8,
"starterDecks": {
"W":"decks/starter/white_n.json",
"B":"decks/starter/black_n.json",
@@ -130,7 +132,7 @@
},{
"name": "Hard",
"startingLife": 8,
"startingMana": 10,
"startingShards": 0,
"staringMoney": 125,
"enemyLifeFactor": 1.5,
"rewardMaxFactor" : 0.5,
@@ -138,6 +140,7 @@
"goldLoss": 0.3,
"lifeLoss": 0.3,
"sellFactor": 0.25,
"shardSellRatio": 0.6,
"starterDecks": {
"W":"decks/starter/white_h.json",
"B":"decks/starter/black_h.json",
@@ -162,7 +165,7 @@
},{
"name": "Insane",
"startingLife": 7,
"startingMana": 10,
"startingShards": 0,
"staringMoney": 0,
"enemyLifeFactor": 2.5,
"rewardMaxFactor" : 0.0,
@@ -170,6 +173,7 @@
"goldLoss": 0.5,
"lifeLoss": 0.3,
"sellFactor": 0.05,
"shardSellRatio": 0.3,
"starterDecks": {
"W":"decks/starter/white_h.json",
"B":"decks/starter/black_h.json",

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@@ -0,0 +1,7 @@
Name:Piper's Charm
ManaCost:no cost
Types:Artifact
S:Mode$ Continuous | Description$ Provided by Piper's Charm (Equipped Item - Neck)
A:AB$ Effect | Cost$ PayShards<3> Sac<1/CARDNAME> | ValidTgts$ Creature | ExileOnMoved$ Battlefield | StaticAbilities$ MustBlock | RememberObjects$ Targeted | StackDescription$ {c:Targeted} blocks this turn if able. | SpellDescription$ Target creature blocks this turn if able.
SVar:MustBlock:Mode$ MustBlock | ValidCreature$ Card.IsRemembered | Description$ This creature blocks this turn if able.
Oracle: Provided by Piper's Charm. Pay {M}{M}{M}, sacrifice Piper's Charm: Target creature blocks this turn if able.

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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYMANbJgYGOYzUgfbMeG25yAa+yYetaQCkFkH8cgj+7GKmTw7jmMRq2DG72dq+pEUs9HltNmxs2lt70l27Gxa25vBwcDQzwbBZwjYSyg88MUxPjeh+xfdHkLhoY5m/lE89k4E+ncSB3ZzQWGhx46bjw3g8he6uD4nA4MBJ25z0cVgbsMV5ujmq+FxTx8bIo4zofGty44qBuPD5LM4sNuLK46Jzb/oYU5KWsdmB7H2khO32OzAF864AKF0hg5g5TM2OwiVo/jshdkNi/cJbNj1YbP3INRuYuowcssvYsIUmztAeAEjxN55ZNTFoHoOAIlHVtg=
eJy1lVkKwjAQhqctdMF76IO4HEA8j3oC8RBuB1ChJ+mDSMELeBsb7NA4TmbSYgOhaZb58s/fJgDusggBrsF/6jJ0cwrSfglz2xYTqxDGbY27iJ8zTmTGg+nbRrJmH42lwu0Sm47Z2rDdJzcf/DJKB1fLexvuKgU4xADr+ontScXYpN9rcB8aX/JY87cU8q7lf0Ti3wXuqdJ2tvTZsTEnz6R5nypsly7aP8sA5hnP5fq0nNP4Q9K/jxtf7Yp+G5+p7/Y4/QawuDz2PaOo7jb/Fsfw5VIvfbzlGDTPPoVq1Nh4PnMM7RyVuMhG348xv47jFjXb5w7r47yU9mHqLfhwLx3uYnPPvQGEo2CM
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJzT5mFg0AFieoE2bgh9EmjnKR7sckMFLCbDvYPNj5+0EWxjHQYGE52Bc8tgA8SGRxad7BkJYDCHBaXxPNjATWDev6WNW55W/v0KtPMbHnsHAuQAcS4Sn15xzcXIwMDNiGknre0HABP1EEs=
eJzT5mFg0AFieoE2bgh9EmjnKR7scqQCXW3K3EQICAPNF8Fix2Iy3EuuH2kFPiH5y1iHgcFEhzxz9GgQB5S4h572Z5FiJpZwGmh/UgtYazEw2GhRZsZgCQsjLPFESjwPBXAT6MdbePItrfz7FWjnNxqX2aSCHCDOReLTK665GBkYuBkx7aS1/QB3HhO+
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBj8IAuH+EEgPgRlZwNxDhrOpYM7ljMyMKwAYh4g5oJibkbSzb6mjWCL6zAwSOhgqjmEKcTASaG9+MBxPHIwf4PwSirbiw5whQc97TlKppnHoLQWmfoHCiCHRRYD7jxICOhxUstF9APk+nUg7D5GWAlOcBNY5tzSRhUbSL9TC5wYaAfgAYMlfAGGKxXV
eJxjYBj8IAtKf9ViYPimhRA/CMSHoOxsIM5Bw7lUsl9Qm4FBSBvhDmSwnJGBYQUQ8wAxFxRzM5JuxzVtBFtch4FBQgdTzSFMIQZOCu3FB47jcQ/M3yC8ksr2ogNc4UFPe46SaeYxKK2FVxV1gTzQMgUKLUQOiywG7GmfGKDHSZk7BgKQ69eBsBuWvshx801gmXNLG1VsIP1ODsDm3hN0dwXxYLCELwD5Hxp7
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -80,14 +75,35 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="137" y="162"/>
<object id="48" template="../obj/shop.tx" x="304" y="48">
<properties>
<property name="shopList" value="Forest"/>
<property name="commonShopList" value="Forest"/>
</properties>
</object>
<object id="49" template="../obj/quest.tx" x="98" y="162">
<properties>
<property name="questtype" value="forest_town_generic"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="98" y="98"/>
<object id="51" template="../obj/shop.tx" x="272" y="98">
<properties>
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="208" y="50">
<properties>
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
<property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYMANbJgYGOYzUgfbMeG25yAa+yYetaQCkFkH8cgj+7GKmTw7jmMRq2DG72dq+pEUs9HltNmxs2lt70l27Gxa25vBwcDQzwbBZwjYSyg88MUxPjeh+xfdHkLhoY5m/lE89k4E+ncSB3ZzQWGhx46bjw3g8he6uD4nA4MBJ25z0cVgbsMV5ujmq+FxTx8bIo4zofGty44qBuPD5LM4sNuLK46Jzb/oYU5KWsdmB7H2khO32OzAF864AKF0hg5g5TM2OwiVo/jshdkNi/cJbNj1YbP3INRuYuowcssvYsIUmztAeAEjxN55ZNTFoHoOAIlHVtg=
eJy1lVkKwjAQhqctdMF76IO4HEA8j3oC8RBuB1ChJ+mDSMELeBsb7NA4TmbSYgOhaZb58s/fJgDusggBrsF/6jJ0cwrSfglz2xYTqxDGbY27iJ8zTmTGg+nbRrJmH42lwu0Sm47Z2rDdJzcf/DJKB1fLexvuKgU4xADr+ontScXYpN9rcB8aX/JY87cU8q7lf0Ti3wXuqdJ2tvTZsTEnz6R5nypsly7aP8sA5hnP5fq0nNP4Q9K/jxtf7Yp+G5+p7/Y4/QawuDz2PaOo7jb/Fsfw5VIvfbzlGDTPPoVq1Nh4PnMM7RyVuMhG348xv47jFjXb5w7r47yU9mHqLfhwLx3uYnPPvQGEo2CM
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJzT5mFg0AFieoE2bgh9EmjnKR7sckMFLCbDvYPNj5+0EWxjHQYGE52Bc8tgA8SGRxad7BkJYDCHBaXxPNjATWDev6WNW55W/v0KtPMbHnsHAuQAcS4Sn15xzcXIwMDNiGknre0HABP1EEs=
eJzT5mFg0AFieoE2bgh9EmjnKR7scoMNCGszMIhoY4ovJsO9g82Pn5D8ZazDwGCiM3BuQQcD7R5i7c8ixUws6Wig/UktYK3FwGCjRZkZgzksSIlneoMsJEwsuAlMi7ewpEdkM4mxl1i1MPAVaOc3PPYSC15oUG4GDOQAcS4Sn15xzcXIwMDNiGknre0HAGN/FdI=
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBj8IAuH+EEgPgRlZwNxDhrOpYM7ljMyMKwAYh4g5oJibkbSzb6mjWCL6zAwSOhgqjmEKcTASaG9+MBxPHIwf4PwSirbiw5whQc97TlKppnHoLQWmfoHCiCHRRYD7jxICOhxUstF9APk+nUg7D5GWAlOcBNY5tzSRhUbSL9TC5wYaAfgAYMlfAGGKxXV
eJxjYBj8IAtKf9ViYPimhRA/CMSHoOxsIM5Bw7lUsl9Qm4FBSBvhDmSwnJGBYQUQ8wAxFxRzM5JuxzVtBFtch4FBQgdTzSFMIQZOCu3FB47jcQ/M3yC8ksr2ogNc4UFPe46SaeYxKK2FVxV1gTzQMgUKLUQOiywG7GmfGKDHSZk7BgKQ69eBsPsYYSU4wU1gmXNLG1WMHL+f0aDAETQAJwbaAXjAQKYtZAAAL4Yamw==
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
@@ -80,14 +75,35 @@
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="137" y="162"/>
<object id="48" template="../obj/shop.tx" x="304" y="48">
<properties>
<property name="shopList" value="Forest"/>
<property name="commonShopList" value="Forest"/>
</properties>
</object>
<object id="49" template="../obj/quest.tx" x="98" y="162">
<properties>
<property name="questtype" value="forest_town_identity"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="98" y="98"/>
<object id="51" template="../obj/shop.tx" x="208" y="50">
<properties>
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="272" y="98">
<properties>
<property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
<property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="55">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYMANbJgYGOYzUgfbMeG25yAa+yYetaQCkFkH8cgj+7GKmTw7jmMRq2DG72dq+pEUs9HltNmxs2lt70l27Gxa25vBwcDQzwbBZwjYSyg88MUxPjeh+xfdHkLhoY5m/lE89k4E+ncSB3ZzQWGhx46bjw3g8he6uD4nA4MBJ25z0cVgbsMV5ujmq+FxTx8bIo4zofGty44qBuPD5LM4sNuLK46Jzb/oYU5KWsdmB7H2khO32OzAF864AKF0hg5g5TM2OwiVo/jshdkNi/cJbNj1YbP3INRuYuowcssvYsIUmztAeAEjxN55ZNTFoHoOAIlHVtg=
eJy1lVkKwjAQhqctdMF76IO4HEA8j3oC8RBuB1ChJ+mDSMELeBsb7NA4TmbSYgOhaZb58s/fJgDusggBrsF/6jJ0cwrSfglz2xYTqxDGbY27iJ8zTmTGg+nbRrJmH42lwu0Sm47Z2rDdJzcf/DJKB1fLexvuKgU4xADr+ontScXYpN9rcB8aX/JY87cU8q7lf0Ti3wXuqdJ2tvTZsTEnz6R5nypsly7aP8sA5hnP5fq0nNP4Q9K/jxtf7Yp+G5+p7/Y4/QawuDz2PaOo7jb/Fsfw5VIvfbzlGDTPPoVqpGzqMZ7PHEM7RyUustH3Y8yv47hFzfa5w/o4L6V9mHoLPtxLh7vY3HNv0GRgvg==
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJzT5mFg0AFieoE2bgh9EmjnKR7sckMFLCbDvYPNj5+0EWxjHQYGE52Bc8tgA8SGRxad7BkJYDCHBaXxPNjATWDev6WNW55W/v0KtPMbHnsHAuQAcS4Sn15xzcXIwMDNiGknre0HABP1EEs=
eJzT5mFg0AFieoE2bgh9EmjnKR7scsiAkZn2biIEhLUZGES0oRwk9yzG4l5CAJsfBxJ80kawjXUYGEx0yDPnHxN13IMMKHEPPe3PIsFMbOE00P6kFrDWYmCw0aLMjEETFljKHVLimVLARIdy7yYw79/Sxi1PK/9+Bdr5DY+9AwFygDgXiU/LuP6PVAZwMTIwcDNi2knrtAYAUVAVYg==
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBj8IAuH+EEgPgRlZwNxDhrOpYM7ljMyMKwAYh4g5oJibkbSzb6mjWCL6zAwSOhgqjmEKcTASaG9+MBxPHIwf4PwSirbiw5whQc97TlKppnHoLQWmfoHCiCHRRYD7jxICOhxUstF9APk+nUg7D5GWAlOcBNY5tzSRhUbSL9TC5wYaAfgAYMlfAGGKxXV
eJxjYBj8IAtKf9ViYPimhRA/CMSHoOxsIM5Bw7lUsl9Qm4FBSBvhDmSwnJGBYQUQ8wAxFxRzM5JuxzVtBFtch4FBQgdTzSFMIQZOCu3FB47jcQ/M3yC8ksr2ogNc4UFPe46SaeYxKA1KttjSDy2APNAyBS3C6vAB5LDIYiDf7XqclLljIAC94okadsPSFyn6YGpvAsucW9rY5YYKwObeE3R3BfFgsIQvALDsG08=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
@@ -80,14 +75,35 @@
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="137" y="162"/>
<object id="48" template="../obj/shop.tx" x="304" y="48">
<properties>
<property name="shopList" value="Forest"/>
<property name="commonShopList" value="Forest"/>
</properties>
</object>
<object id="51" template="../obj/quest.tx" x="98" y="162">
<properties>
<property name="questtype" value="forest_town_tribal"/>
</properties>
</object>
<object id="52" template="../obj/shardtrader.tx" x="98" y="98"/>
<object id="53" template="../obj/shop.tx" x="272" y="98">
<properties>
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
<object id="54" template="../obj/shop.tx" x="208" y="50">
<properties>
<property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
<property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green"/>
<property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFowA/KOWljz2T2BgYJkOxETtCXB8HmxxQRsAvZ9kJs2kBzrEj/J7LgWDncUDkCbmbXEArf2FLM/o4whMmjk5TCxCKU3SaWiAHKR7PY4lfGA2LY1oAWqdbZFDCi6DpaS8yGLWXOAAAywwdJA==
eJxjYBgFQwHosw+MvWeB9pby0s78SWwMDJOx4AtI/tXHwSYHlBHwy1l2wmxagHPsCL/nciDYeRwQeULuJhfQyl/Y0ow+jvCEiaPTlAJYmF4gEKfoNKX2Z0PjLAcpHs9jiV90GhbX1AS0TrfIoIQXQdPTXmQwai9xAADlPiO/
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVr0t3cp0M5lQKw3SMLLWIeBwUQHk00pyOUiT24UkAdwxR1MHJ2mFaB13C7jpq35o4D64Ao7A8NVdvrbOxD1IQgAAJpJDjM=
eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVoQtrEOA4OJDu3s2qjOwLBJHcJeCrRzGRDrDZLwQvY7NcMhl4s8uZEI9LXJ02cNTEc2BNIwTBydphUgFLfLuBkYDMn0L0z/YAUmUH8ZUOC/4QiusDMwXGWnv70DUR+CAAAD6BOP
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFgxV0ajEwdGkNtCsQQFyHgUFCB5M9CoYWwBV3MHF0ehSMglEwvAAARWUEkg==
eJxjYBgFpABxHQYGCR3amT9VnYFhmjqE3anFwNClRTu7SAXIfqd1OIwC6gJ5YDpSgKYlXHEHE0enR8EoGAXDCwAAl/AHJQ==
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -80,14 +75,35 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="215" y="82"/>
<object id="48" template="../obj/shop.tx" x="176" y="192">
<properties>
<property name="shopList" value="Island"/>
<property name="commonShopList" value="Island"/>
</properties>
</object>
<object id="50" template="../obj/quest.tx" x="176" y="162">
<properties>
<property name="questtype" value="island_town_generic"/>
</properties>
</object>
<object id="51" template="../obj/shardtrader.tx" x="398" y="178"/>
<object id="52" template="../obj/shop.tx" x="168" y="82">
<properties>
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="53" template="../obj/shop.tx" x="256" y="66">
<properties>
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB"/>
<property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="56">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFowA/KOWljz2T2BgYJkOxETtCXB8HmxxQRsAvZ9kJs2kBzrEj/J7LgWDncUDkCbmbXEArf2FLM/o4whMmjk5TCxCKU3SaWiAHKR7PY4lfGA2LY1oAWqdbZFDCi6DpaS8yGLWXOAAAywwdJA==
eJxjYBgFQwHosw+MvWeB9pby0s78SWwMDJOx4AtI/tXHwSYHlBHwy1l2wmxagHPsCL/nciDYeRwQeULuJhfQyl/Y0ow+jvCEiaPTlAJYmF4gEKfoNKX2Z0PjLAcpHs9jiV90GhbX1AS0TrfIoIQXQdPTXmQwai9xAADlPiO/
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVr0t3cp0M5lQKw3SMLLWIeBwUQHk00pyOUiT24UkAdwxR1MHJ2mFaB13C7jpq35o4D64Ao7A8NVdvrbOxD1IQgAAJpJDjM=
eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVoQtrEOA4OJDu3s2qjOwLBJHcJeCrRzGRDrDZLwQvY7NcMhl4s8uZEInmiQp88amI5s0NLwWTSzYOLoNLXBS6i9hOJ2GTdl9lCqfxTQH1xhZ2C4yk5/eweiPgQBAMi+FTE=
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFgxV0ajEwdGkNtCsQQFyHgUFCB5M9CoYWwBV3MHF0ehSMglEwvAAARWUEkg==
eJxjYBgFpABxHQYGCR3amT9VnYFhmjqE3anFwNClRTu7SAXIfqd1OIwC7OCEBnn65IHpSAGalnDFHUwcnR4Fo2AUDC8AAJuECBU=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
@@ -80,14 +75,35 @@
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="215" y="82"/>
<object id="48" template="../obj/shop.tx" x="176" y="192">
<properties>
<property name="shopList" value="Island"/>
<property name="commonShopList" value="Island"/>
</properties>
</object>
<object id="52" template="../obj/quest.tx" x="176" y="162">
<properties>
<property name="questtype" value="island_town_identity"/>
</properties>
</object>
<object id="53" template="../obj/shardtrader.tx" x="398" y="178"/>
<object id="54" template="../obj/shop.tx" x="256" y="66">
<properties>
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
<object id="55" template="../obj/shop.tx" x="168" y="82">
<properties>
<property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
<property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="57">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -12,7 +12,7 @@
</layer>
<layer id="2" name="Ground" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFowA/KOWljz2T2BgYJkOxETtCXB8HmxxQRsAvZ9kJs2kBzrEj/J7LgWDncUDkCbmbXEArf2FLM/o4whMmjk5TCxCKU3SaWiAHKR7PY4lfGA2LY1oAWqdbZFDCi6DpaS8yGLWXOAAAywwdJA==
eJxjYBgFQwHosw+MvWeB9pby0s78SWwMDJOx4AtI/tXHwSYHlBHwy1l2wmxagHPsCL/nciDYeRwQeULuJhfQyl/Y0ow+jvCEiaPTlAJYmF4gEKfoNKX2Z0PjLAcpHs9jiV90GhbX1AS0TrfIoIQXQdPTXmQwai9xAADlPiO/
</data>
</layer>
<layer id="3" name="Foreground" width="30" height="17">
@@ -20,54 +20,90 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVr0t3cp0M5lQKw3SMLLWIeBwUQHk00pyOUiT24UkAdwxR1MHJ2mFaB13C7jpq35o4D64Ao7A8NVdvrbOxD1IQgAAJpJDjM=
eJxjYKAfKORgYCgC4mIO+tn5n4mBgZ+TgUEAiAU56WcvzG5SwVR1BoZp6hB2pxYDQ5cWhG2sw8BgokM9t6GDjUA7N0HtXQq0cxkQ69E5vHABZL9TMxxyuciTG0qAkRm33D8y0iepwBqYjmxwpGGY/TBxdJpWgFDcLuOmzHxK9Y8C+oMr7AwMV4GYAU9+oQWgd30IAwDoJheh
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFgxV0ajEwdGkNtCsQQFyHgUFCB5M9CoYWwBV3MHF0ehSMglEwvAAARWUEkg==
eJxjYBgFpABxHQYGCR362NWpxcDQpUUfu4gByH6nZziMAsqBPDAdKUDTEq64g4mj06NgFIyC4QUAK4MFrA==
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="38" template="../obj/entry_up.tx" x="256" y="271"/>
<object id="41" template="../obj/shop.tx" x="304" y="98">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="42" template="../obj/shop.tx" x="368" y="162">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="43" template="../obj/shop.tx" x="353" y="98">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="44" template="../obj/shop.tx" x="208" y="162">
<properties>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue"/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="45" template="../obj/shop.tx" x="304" y="162">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="46" template="../obj/shop.tx" x="336" y="162">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="215" y="82"/>
<object id="48" template="../obj/shop.tx" x="176" y="192">
<properties>
<property name="shopList" value="Island"/>
<property name="commonShopList" value="Island"/>
</properties>
</object>
<object id="52" template="../obj/quest.tx" x="176" y="162">
<properties>
<property name="questtype" value="island_town_tribal"/>
</properties>
</object>
<object id="53" template="../obj/shardtrader.tx" x="398" y="178"/>
<object id="55" template="../obj/shop.tx" x="168" y="82">
<properties>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
<object id="56" template="../obj/shop.tx" x="256" y="66">
<properties>
<property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
<property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue"/>
<property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
</properties>
</object>
</objectgroup>

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="78">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../../tileset/main.tsx"/>
<tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
<layer id="1" name="Background" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztzjENADAIADDeBWOzgn8DM0FgR4/+rRNRAAAAAACMubl/8PP7VdfvAWT0x+U=
@@ -17,7 +17,7 @@
</layer>
<layer id="6" name="Ground2" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzNmF1OwkAQx/cdDETUBCIPWlrQRi+lR/DrAgo8GRMRjiGGCyCgRoJnchu7YRhnvwv0n0zS7m63v87uzG43KjIWc4u4NbnlQWHKE6cWcJtym+WEb8I5GiljwvbN7arE2HVO7Ka0ZBRjultmrJIT2ysv/ThDfAfchluyfcQHtUvUNSXzo11grAOsW1itfyjQz+lEMVB1uv4naTxNJXG1CT7xjt6hus+A4Hnk909p2Qt6/qLO2GV9taxlyceId6qEv2fO/blwyFU2fMkYQsYB8APlA/w9kBnqFFwL34p2NnxZCPI1DNqvg4/yJcVHCc9tGz48r11FMX5J2m5ifBdVxn6qbs/68o3dXqsUnB8ufIOMxtlEPv5rS9YyX8F57sMXgj1syMcjksSs0FmNsfOaHastH4z/SUZ7WFVu942PtmLPcsRj9tgxbk0YZHUwVwkfJvvacTH7uWjLR+XW++LfXIzX8D/lM754Lup82ORzrCWJob4kZ2W5fkBG37wjYsaVL9QwZjXWNnyyfUnAyxqgHPsR+lK2D5D17TO+qv0MjGuZL03WblO+D00/MlZd3HyC6y6xtkCGmQF7D+2/sU6IMtvc05esv2ItUPFR0v3P4XWQav9skF/Ed5ryBTtypkiNrOWS8UUE353jeU4i3zOm25Kez+c8J6szJmp8X8t2ZzkjcP1W/t/HyLK/IeoP+89VlZr63lUUH84521RW/rOROK+D696UaJfkvndHPpNcMrfvdmVvLtjiDfsPn2t2CCZsm5TIGRRHBHwG738BVormxQ==
eJzNmElOw0AQAOcEkRIUKywfSHAC5gY3+Ah3lnBn+wAETogHwBsA8QFIAgjEK3gBOxcQbcWjdIbu2eyEtNSSl/G43Nu0JywIEYGGoFXQYZDphCdKtAzaAm0PCV8TOCoJY8x2D7pZFGJrSHS72GWUPi0FQowPiU4EXTu2Fb4p0PN/0kmFD0uJuFdl4qORF+IA6WG+9/5+nn7OJBQDdc80fzPJpxaTV4Pgk+9YjfRzlgmeIzg/Tq6tKc/PzwmxMNd7rebIJ4h36kT9ngew56NHrXLhi32IGevIDpQN1O/BzFhm0bG0rRznwpeFYL6Kxfh+8FG2pPgoUWPbhU+Na1+hGO+YsYPw7wkk42nNPK4ffFd+r9UKjg8fvnpGfraRNPZrMGtZWsFxnoZP9oxxv/MOc34Y7PoNMfjjGIeufDj/mxn1sLranjY/cN+i+vkZmp0XruGxFB8+XKukDeO+9qqQfSy68lG1da/QicWoD/9TafyrxiJlw0VY/JeSBuATxn8xObTOXM9y/cCMOB6jUbvnscic8eWbNjBiX9dz0J+OdHQj58bpwsf1Ja/gmzfG12puc30AN3ca/+r6GZzXXN7YrN22fDeGeThWLm+k3KLj5Rk9Q9uCXeYs12cSr3CuPevM+ivXAh0fJab/OXUdpMavWNQX+Z22fOUxninUIxu5OL6Q4Nv13M+JJe0e007RzJdmPyerPSbKv2eB217OJTq+CP7Ocek437kyn2o/X3mq6c99heJTa85/Slb2cxHZvuJ1r0WMi2vftSefTS15cJ+2pzeXbNGA7afuax4QTKoOUmTNoDhCZDN8/gsMt+8u
</data>
</layer>
<layer id="3" name="Walls" width="40" height="40">
@@ -30,20 +30,23 @@
</layer>
<layer id="5" name="Overlay" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1DkKgDAQBdDfuAupp8h59FTqlfRytk4vBsHAyOQ/SJFUswYgInpnisAcraOwxRrkw1rmtQtwiHUU+XA+/qfTfvROe2I1b5XubO1obylt0BkbneyQxz/6KadG39qPuXqsFxGVaQnAqmcL1pHcnZK+E1G5Ls9cDMw=
eJzt1EsKgCAUBdC7g4Y1q1lirrHf5lpB/xaT0DCKIOuF3QOCjny+jwAR0TWhASIjHYUs5sAd5tKtSgG1ko7CHfbH94wZMGXSUTxDqt/aFOjS9++l98QaSPS2n+38LJ7MkI9/9NGbeluz4WbdfMwXEf1THgCFXWUgHcleo87PRPRfKyQjEbs=
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="56" template="../../obj/shop.tx" x="208" y="162">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="47" template="../../obj/inn.tx" x="199" y="419"/>
<object id="53" template="../../obj/spellsmith.tx" x="327" y="228"/>
<object id="55" template="../../obj/shop.tx" x="479" y="453">
<properties>
<property name="shopList" value="Forest"/>
<property name="commonShopList" value="Forest"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -56,49 +59,72 @@
<object id="60" template="../../obj/entry_right.tx" x="254" y="623" width="16" height="85"/>
<object id="62" template="../../obj/shop.tx" x="361" y="370">
<properties>
<property name="shopList" value="GreenEquipment"/>
<property name="commonShopList" value="GreenEquipment"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="63" template="../../obj/shop.tx" x="216" y="290">
<properties>
<property name="shopList" value="GreenItems"/>
<property name="commonShopList" value="GreenItems"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="64" template="../../obj/shop.tx" x="466" y="417">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="65" template="../../obj/shop.tx" x="529" y="386">
<object id="65" template="../../obj/shop.tx" x="530" y="386">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="66" template="../../obj/shop.tx" x="449" y="305">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="67" template="../../obj/shop.tx" x="513" y="241">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="68" template="../../obj/shop.tx" x="448" y="130">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="69" template="../../obj/shop.tx" x="257" y="194">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="70" template="../../obj/shop.tx" x="97" y="417">
<properties>
<property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="71" template="../../obj/arena.tx" x="359" y="290">
@@ -163,5 +189,30 @@
}</property>
</properties>
</object>
<object id="74" template="../../obj/quest.tx" class="quest" x="312" y="370">
<properties>
<property name="questtype" value="forest_capital"/>
</properties>
</object>
<object id="76" template="../../obj/shop.tx" x="96" y="209">
<properties>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="signXOffset" type="float" value="-16"/>
<property name="signYOffset" type="float" value="-8"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
<object id="77" template="../../obj/shop.tx" x="112" y="304">
<properties>
<property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
<property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
<property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
<property name="signXOffset" type="float" value="-16"/>
<property name="signYOffset" type="float" value="-8"/>
<property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,23 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="68">
<editorsettings>
<export format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../../tileset/main.tsx"/>
<tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
<layer id="1" name="Background" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztmEEOgjAQRbsAzmOiHse7cAQlKd5TTcSdbaRJGafDVFo6Jiz+poTw+n+npdPXSt0rpQ7NVA8z1tcydDU6VVPpAhy+T74/Uvh8Dh0Yj+Fz870h6+OXdRLiuxi9xvGn0WDUzfhvdWy+5wW1b6ZzoHgtxxD4vmPHfHNcHB4ub2z9OXbIbdlScGGcKWopB9tSL3N5RnFyGddmi2EsxcZlxPbBtRXad0t7R3kohS3EKCFXKmfJfNKyhRlL9M73cOPb+Epp18jmk+6fBncPSbL3oO4Pzo9/4JOWsZ+tNEaMTVLOVN+itIeUd6UZOWylGOfYXK/A/+d3/Y6cnFQvCqsLrN+Qy0vKM+gXrFt4f0rp5ehZS/Xv3H1D1zif/wyuy/OHtbXi8LoMx/fILCGHDvjDraW57GNqEvKFzhDOeuXu6bE97FB/d4lS8mH93TfVKOm8
eJzNmG1SgzAQhvkBtJfxY6oexxPoD71Bj6BtaU/lZVRs/Sc78I7Lukk2ECrM7DiiJE/e/Ug2+yLLPvIsuy379tm82xfzsENj93nfqn/g4DpxfebCxzkqx/sYPqz3XYmPIXHi4ntt7Lt7f2zs1NgmoD/ZXfl3XdJuyv4afLzEcXLMD3aXbsRm4bHyxuYf2DeCCeM8L8azSc6xubRrfm6Ldr2XZcv/lZhxiJaaL4mTxtFyKQWnldEXZ5Uj18/FmCoHpmKcSpsY285UOxlHQ9jqvK0/VItS5rE2R2j/1b67YPUgNaNv37Lw8dxNXWtqB1eMb4lpV/R5YzQkhpduj+LvT51fuD+JifbrMRpcl3GxAX2exD5Jv9M68fdV+avD0HpL8z0uwny1iCmcf/j/4GwjYw1rGsJXsfl2nu8rdsZ4aziWS3c8YJ/HeDH+kXqQdiE2HrPE+bBov7POJ3OQ5g7FesV8FGKTc8F/VxF7AGl48MQiHn6mHZpP2yLeX5xJqxd4+Lk+RjdX3FprEph4jvEeAM8YJo3PouExd9ds5CaeFGw8fi3r9fVBY/2oGeqZdVyNz7q2qc3l2zmcT31xNyUf/IXcc+Ww796C3yOkNuxfMOpXJWMoZ6dmlDpxf1nYzslIekJDS62TfTzq9JSc2B9Wxr5Su2+YSkuuGT+fanrJvJV9ckotuz5o7bu/Q7/h2w+1PCfOrodYk1l40Zeh9/DFmeSoHPpYcynk+5iclHzat9odYMyYFh9Yx0p1/52ST7vf/QF0/Bm1
</data>
</layer>
<layer id="2" name="Ground" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzlWM1KA0EMHrGt0CL9wZM3xbvtU/gW4n0VFYpP4U1fwKpFqeIriHf1afTsDDY0DclusrvjKH4QxJ1k803+ZjvO/S1s953b6admIWN/4NzBIJ3/rV8cm/+Ajc00tlVwlcZtJXCcGxH9wbunwrr0PAV2PdmhUUYxg0d4tVvO3Xs5bOrkzut2WvXw5HqM43XU1L8zU/K09ndZXlItanlquWl4TYmNxh/lWYbja+ObmyWPwebd4Cubc7TYTAy+Pvz6J9KhNnSdg3VPGjuYvRd+/5fN5TrFdQXrAVIaqB8NVag97b6Cjzciki19HGytNSjV3oRXL+SXdz5banAN+dPoQ33hfsT9rqk/iz+rPq4vzg6v09jjmFI7KU9YH9dEq5gq60eLmHMJz2TsR5rVtBY1vcide9q+wnrAT9v/+IwK9YrPoqKzOMs5f2DejRrLsQZ+uP+xLrc36xkVADmQ8gzzBGYxzGX6d0jiQ/dombESuDzjeULnHhbp24LmtQpwnuk3cbuAH2cjxfTay00Fjtw3cR43Lo5YgFus336ZkmMdObQC5kBeHZb5HRALNJZSzOAcOk9wjwAcU+RTQui3W/R/2fP3p5DHb7xe7d1wL7jXzdc79usnjJx2F/zydLQ4Y/YTuBXdX856zj0QefLy2Fvwm82fUb2gU4SY98s4v9pvRopnz+0lEr+shnkX8/57pePcaqfed34BjJbWzg==
eJzVWFlOwzAQNSI1iAh1uQGID/hKOQWXQIj/ggAJcR+6qVVBXAHxn3IJDoItMnQ6GS+J3RSeNKIJduZ5dlmI/4XjrhAn3W2zMOOqJ8R1b3v6jwy2eW6WhhF72yawYXydrj9Lqc4sy+uyRIjzxL63CeSKw2fi/75pVOHXJF3wK/CYinWfNmk/To3Wnyp+B/Lnbz8x/+4zsRgTNNazQv9cyU3LLTPElculKuByjPpKPy8r+G/A8OTsWSW/JfKNthXmAvpuW/zeqSfPEFuCjcCHPly4mmf7dkj+5AU3Ey/THk7nRMkiEr+hQddIybgmPwpXfPjApovOEllSrinUzwFUSsiYnLAB/IUltDbPHPq42Bvyy538RmFUfwGzV9XeNJarugH5PrHUDogHU67bbFeHn8++IVkXEgPQW+GMvmXU91yUn2/dBAxQ73TVANPMYtOp40HHgo4BKd25SPueKQ84gK3xrOWjM0dnmhdccS8KmbWxbcAWKeKEdUpDPcyLc8C6mKBxBhyXhpmQ45CTGovP7FuPoA7QuQ3ze0HvcP3DsyHlljG869QMahc8b+H5COINc8O+7SO9sJ/7Zp16M5bmmXiZrOsDwb4FvgDbnB0yL3C8Z7Lc16i4ZrRYvQ8D6gDuaxwvV5+LgX2PNdSWppoBry7PYjL0wwDNBzHjKAR6np6g579yp2GCjd/joXu/LVThXvCibf/Gnfr/PSMP7RU/2xpfPDHn0dxM95eARUf1DCJvSl47K36L4h1dp9e4UPV+uUp9wv6tW1beFbePDd1/DyL0gE3ef++kQuymcb/5Ddm+2qY=
</data>
</layer>
<layer id="8" name="Bridges" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1skNgDAMRFF3AW2FrSvWRsNWAI6UnLiBUCzxnzT3OVgjiwAA8J2mEGljuiJ3m7tdOx0xp8F+Uykyxyxl7jawzOn9Vpra4B0HXnutmo1+j1jv1+s+DZqRncrKGd6AwBu+4YB+7/Q/2oD021qVfkcAACByAcsGH1s=
</data>
</layer>
<layer id="6" name="Ground2" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1kEKgzAQheE5RDfq4W3PYXsKtbHozrbncBYBlWajjImU/4PZiCSPiUkUAQD8k7YQeRZ27wFLe76bTy7yzY+fB/GVmcjV1y1LneZXpZnuvh4nzOc0U+frdcJ8mMU+k46cr9Zxm8DYTp91nLtBvfZl2NCbUe+898Z7D/FY7y/+WdK6sNdW6Ed6lmvAegI2JkGoI2Y=
eJztlU0OQDAUhN9xcAXuhHPgFH5K2Pk5kYN4i25EF0SbtsyXvIUumjHTdogAAKZoI6Iuur8O/ECVX8zfCbI2zh/8/OI/riHRFtpW4Re+9EcaEGVy8sC2misFayrlVIb0vclEsKZezuCgf8AeJu96zfs2ir0Fr/UOvS8uMbIv0wNvZu68xfPee3MGXesq8G129OcJ+GEfnRkgTwD0cABSpCk/
</data>
</layer>
<layer id="3" name="Walls" width="40" height="40">
@@ -30,55 +35,79 @@
</layer>
<layer id="5" name="Overlay" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1jsOgzAMBmDfgBm4K/Qm0FPwFmy0PVFHPEQC0S60DjbR/0leUIitBCcQAVzHO9Z5F2CrSYnaVG5cKDR7LKT+/uW7eSZEr8R/HoC9gnuvdHE32Icd19S7GAzWB6uzzySf+Sqet/4yd8fPeqGcFu+9f2oaeV2mA2sz8533OHjvwXmk+wv/LLosnjeasB76JPcA+/kpi4hyF7dIuxoAGQufWSj0
eJxjYBgFo2DogBMaqPxOLQaGLi1MddjE0fWOgsELsMWfPJCvQGRcjwLyASXhOZB5jBS7h2OamanJwDBLc6BdMbQAKfXHKMAN8oF5rwCKC2lUBlASJ91AN/VAce9oO2AUIAFa5vV2oLkdWMzuBor1UMnOwdiupcRN/cBwmUBC2EwH1nkzhni9R0kaHK2rRgE9wWAsbwYSjIbHwANqxsFofGKCOn4GhnoobuAfaNeMglFAHQAAkqgpdw==
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="41" template="../../obj/shop.tx" x="232" y="162">
<object id="41" template="../../obj/shop.tx" x="232" y="146">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="56" template="../../obj/shop.tx" x="103" y="226">
<object id="56" template="../../obj/shop.tx" x="106" y="210">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="57" template="../../obj/shop.tx" x="392" y="162">
<object id="57" template="../../obj/shop.tx" x="408" y="146">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="43" template="../../obj/shop.tx" x="152" y="451">
<object id="43" template="../../obj/shop.tx" x="152" y="435">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="47" template="../../obj/inn.tx" x="311" y="227"/>
<object id="49" template="../../obj/shop.tx" x="520" y="225">
<object id="49" template="../../obj/shop.tx" x="360" y="258">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="50" template="../../obj/shop.tx" x="536" y="354">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="51" template="../../obj/shop.tx" x="472" y="450">
<object id="51" template="../../obj/shop.tx" x="552" y="418">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="52" template="../../obj/shop.tx" x="88" y="354">
<object id="52" template="../../obj/shop.tx" x="56" y="306">
<properties>
<property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="53" template="../../obj/spellsmith.tx" x="408" y="402"/>
<object id="55" template="../../obj/shop.tx" x="465" y="515">
<object id="55" template="../../obj/shop.tx" x="462" y="515">
<properties>
<property name="shopList" value="Island"/>
<property name="commonShopList" value="Island"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -141,15 +170,38 @@
</object>
<object id="62" template="../../obj/shop.tx" x="360" y="370">
<properties>
<property name="shopList" value="BlueItems"/>
<property name="commonShopList" value="BlueItems"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="63" template="../../obj/shop.tx" x="263" y="371">
<properties>
<property name="shopList" value="BlueEquipment"/>
<property name="commonShopList" value="BlueEquipment"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="65" template="../../obj/quest.tx" x="312" y="146">
<properties>
<property name="questtype" value="island_capital"/>
</properties>
</object>
<object id="66" template="../../obj/shop.tx" x="264" y="258">
<properties>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
<object id="67" template="../../obj/shop.tx" x="472" y="178">
<properties>
<property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
<property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
<property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
<property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
<editorsettings>
<export format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../../tileset/main.tsx"/>
<tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
<layer id="1" name="Background" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztmG0OwiAMhon/hufRGQ+ye0ydF/VjHkca10jIGF9CUfvjDckC6UMLZH3HRoiR9TPaKLUVcNi4Hkr3yvYBsc5SiJN8jTY+mLdVGqZ5t0J8kLOrpjk+3APO2SkdZXk+W9xefdsTsJl5WaoZ7mO19pe+PmSdKV++lBipsp09vcaUfCDX20LN53ozqPlc95Kaz+fOMx/zMR/zMR/zMV9ZPkq2b+CD3rGtmM/1j0/NBz1kzf/Qvv5GiMwYnUcM6MUOU8+NvoY+Lp3BEHWRfDon+gIujyNFGAe8B8hLiP+AvgCsRdZP82GcGE/p0rw9Fax7Dn8l9mz3mXjm8pCjLv/CV6pONekJ5zkFQw==
@@ -12,12 +12,12 @@
</layer>
<layer id="2" name="Ground" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzdmc1u00AQx4dYFFo1uTT2IalDEEgFDkiIFs4InqDwJnAnLULio6SJaPkQ515KX6ag8gK0nFCbcMiZHbwrj9ez67VlgsNIf62TXa9/+Y+9XU9XGgCv62ltCanY8AGe+VG7qemp0OUgHntNzHejAalYrwG88QDGop1InQpte7HOSJ/SS4btRT15jUtBxIBtV6gnubpBks0WI4Zp4KXHjIlw/EojyXXd8PtpoI+h4DppurFh9KU/v2rpvqE2RrFha/JMjx1yrHy0eXfrHM+oe6aP63vJnLt65hpvHcdx/HrgPYvPwa7Qu4rpfT3yEvluC+9WK6Y1mU/Ma5X5MGaN767QlynrTg4+2jetsDHMKt/REkDgl6tvS+Xx+X75PpnmNDHsVJzP1qfmOt8CmGtFx+0OwHInPf9JCPAjjD+HbYBOW54j2uX23+Obmwe44KA9S9/FeZ5P/R2exv13byF7TJn+PW7mezaRL2vME8OekWP4uZjNnidc/DMFx4DvCqeL1eXD4PZXs8B3RawHV+Wa4HLM8X0X682xXHMOZLst28+yHYR2Pm7/h32uawrV/QXzulLUv6y+PGHK777m2b7mHXqbl6+M/OaJvHxF8vtA43veio8Hmnd9zdN/mV+X+J/4PhZ8X0W+ou/SH+rufEWE8yFfWe+Cs8Bn2h9Uhe+VrEEeNoq/tx7J9qvkO9S+LyqcD/cvx824jsfVlLCG9Iip2XGhP7/cuZ/cpvoTmN/NjFrjyFBTdOHDc7c8gIe1SJT1pqG+NiTHmN+ezzOuyzmxZmy6hgvfhNRr1Tyu+cD8bshack9jpPXiM3INm5ccH62HTwgnZRxCOtS9oWrJnSDp44jMperuWR6Y+MYap+136nlDLlWL75K6MlerpvV3vY7M8fUt/zvQPVRs1AvUb9TxixY=
eJzVmUtv00AQx6exVEjV5NLYNyCc8lDEQ0A5wAXxDQpn6HeAU0EiLRceJTSipSDOfAIeB75FQeEOghOhSQDlzA7eVcbjXXttnMgZabTO7nr983/s9e6kVgZ4XAr7tnBlmy7Afdcvt5jfE37Sm/Sti/GaZQjZWgHgiQMwEuVY+qHwp87EB6RN+UMN24NS8BonPJ8By6rwtuSqekG2KBtqmHaccJ8RcexfKwe5Gob7p4Y6HhNc3yt2bGgdqc+vQrity/ooNixNmnHbJcdKxyjtzi7oGblmvF/HCcbcVjNbe2bZT8fPDZ9ZfA/2hD/Pme+XfC2R75zQ7nzO/IKMJ8Y1z3xo88Z3UfjHGftqAj7aNiuLYphXvt4KgOdm659XsuNz3ex1Mo1pYtjNOV9UmxqrVxdxqfvHP1oA/VZ4/Hei7j2p/9kQa5WGPEeU/cb0+BaLAEcs/HVE29Gink99h2fx/F1Ziu+TpX63KsnezUYxvs9tw5pRx9BfjmdPYjb6mUzHgHuFw+Xp8g1qYt1em/xeaAIUmnZ8aLr1Vdb68Xpdv6R8p8U9npH3+VvMDX/k/GCqV9e9JNouy/Y3Yr552/Lr78q556b8fUf+Xm9F8+nWf9hmO6dQv7qkr//C6r8m0C+uLYmpuH1YDNZvSI2UZhtMO9Q2KZ9NTGk95UvzHifl+5/4qnhSHdeZdjeYprOMbxqbFh9dI9Lvh2mdlwXfywT7VPyeqv0q6rfH6m39RcmeL43jeMiX1V5wHvhM64O88D2SOciDcvp9a0+WnyTfAatP6zgerl++VSZ5PF1OCXNI1zU5O53x+UV37iu7of4ZxncrJtc4NOQUbfjw3G0H4FrBd8p6ypBf65JjjG/b1TOuyTExZ2y6hg3fmORr1Ti28cD4bspccpsx0nzxgFwjSksdH82HjwknZexC2NSzoXLJx72gjkMylsq7x2lg4hsxzqj75HFDLpWLr5K8si5XTfPvPI+s4+tE/HfANVRsVAv0v8dYoa0=
</data>
</layer>
<layer id="6" name="Ground2" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1sEJwCAMheEMUCEDFNdw1dRpLfTmpRFSDPT/Ll48PCM8IgIAQKx+xN5DHGaOv2tld4K8ss3Gm8fuXrsc3ZbtfQDYS954um2VMXM59Tmr7s2Bb/C/AGYDsZYG7w==
eJzt1cEJwCAMhWEHsOAApWt002I7rQVvgpBCbCL+30UQDzGRZwgAAOh6ou456KHnWN25WVfgl7feSOvJb67dgmzzdj/gD/z7c5Nk21d54Ju4Ojnb27eyp7oeybYOjMF8AbQKejsINQ==
</data>
</layer>
<layer id="3" name="Walls" width="40" height="40">
@@ -30,55 +30,71 @@
</layer>
<layer id="5" name="Overlay" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1DsKgDAMgOHoolvnWupR1dv5uIleQgMKDio4WErl/6AhfUEgEBEAAID/ma3IYvd89Rrq65tRzyd/7jMnkrvjT6XBha4SQCoKnQele5/f6XXeDP75HvF80V8Au8aItLo6E7sShEB/AaRmAzrgDb8=
eJzt1O8JgzAQh+HfBo5gv2nEGatb+GeTdolaLdQFdA4PbLFgP0hBRPs+EHI5ErgQchIAAMDxXELpGo7xLZaqeL6nsFz5kb87qXavMzZXbv06gb1pAukRTOvO/kn/B3/laXds3fL4zY+kUzTGmfWb/EsvwvZ+fV8Ac2dPSmyk3taVYA28L4C9GQDl9SK0
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="41" template="../../obj/shop.tx" x="249" y="370">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="56" template="../../obj/shop.tx" x="153" y="371">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="57" template="../../obj/shop.tx" x="201" y="418">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="43" template="../../obj/shop.tx" x="105" y="370">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="47" template="../../obj/inn.tx" x="376" y="370"/>
<object id="49" template="../../obj/shop.tx" x="105" y="418">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="50" template="../../obj/shop.tx" x="152" y="418">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="51" template="../../obj/shop.tx" x="248" y="417">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
</properties>
</object>
<object id="52" template="../../obj/shop.tx" x="201" y="370">
<properties>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="53" template="../../obj/spellsmith.tx" x="152" y="258"/>
<object id="55" template="../../obj/shop.tx" x="368" y="433">
<object id="55" template="../../obj/shop.tx" x="366" y="433">
<properties>
<property name="shopList" value="Mountain"/>
<property name="commonShopList" value="Mountain"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -156,15 +172,52 @@
</object>
<object id="62" template="../../obj/shop.tx" x="361" y="258">
<properties>
<property name="shopList" value="RedEquipment"/>
<property name="commonShopList" value="RedEquipment"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="63" template="../../obj/shop.tx" x="409" y="259">
<properties>
<property name="shopList" value="RedItems"/>
<property name="commonShopList" value="RedItems"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="65" template="../../obj/shop.tx" x="202" y="367.25">
<properties>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="66" template="../../obj/quest.tx" x="328" y="370">
<properties>
<property name="questtype" value="mountain_capital"/>
</properties>
</object>
<object id="67" template="../../obj/shardtrader.tx" x="336" y="402">
<properties>
<property name="signXOffset" type="float" value="14"/>
<property name="signYOffset" type="float" value="-8"/>
</properties>
</object>
<object id="68" template="../../obj/shop.tx" x="400" y="337">
<properties>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
<object id="69" template="../../obj/shop.tx" x="464" y="337">
<properties>
<property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
<property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
<property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
<property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="65">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="69">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../../tileset/main.tsx"/>
<tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
<layer id="1" name="Background" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztzrENACAMwLAOSFzZ7zmEJ6qCwEPmOEdEqqQ174iPj4+Pj4+Pj4+Pj4+Pj+98fHx87/kq6/rw8f3s21DxrDk=
@@ -12,12 +12,12 @@
</layer>
<layer id="2" name="Ground" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztmEtOwzAQQL0iTnqCLiqBYAcUroAQcCTYUtYpqHADPseAq0AL67bAAfAoHWU0jdNxbNMgMdKoVho5L/N3lGqfTLVSh5lSw3TdJNWSpwVbTL6TRKnTBnqWlLaLyTcxz3lvoB9Jyfap28sHbPuZ7FmDTqlN+c67Sl10izUXzlfFBjlzYK7NzO9cL3NxdeW7NWx3Qr4qu9GcuSZx2YStim/D7JlU6FO6zFclUj6pSOPvyNhqu6fUTq+eb9fc960Lvj7xsytXEz6J/UBGxIbcjv98f5+P5ohLfVwH341n7wvNR2caX9/G4MsDxh7y3ZPaa1sjH16T8oXw72tW9ok3y/p4sR5nbnxQo+ce801s//raMCQfz41QfKHiD3rvl2HcIz04RH0OGX8o6Oc21Ocpi3/qZzrDrIsvZ/7jOeJjw9B8YLu6MyHEr8s5cTP140NfosDsUvfOfJ9QauMbkfMlsraNr5+V62GL7Ddj31/yhS3bwkdzFPn6K/xLa61EH4X3jWv4MP6wfwDfi7n+LMw9F7tQfejY/6N8vH8B31Yqrw2r+OBdB7pQyTvD/Vfa3v8vdbmfjwIL8NFaK9mbsvn21zqZJMt8NuFnMpxPfOfjUHz0TAtMmAuxbOfKZ/vuE1Oa8MWMNy4ufOBPmIt/iw3EhW+V/AAJonRV
eJztmF1OwkAQgPfJbssl9I0ERa9gjOI99CLic9FwBdRj6FUU9BkQDuBOyqSToVtmu7tSEyeZsCnN9uv8b5Vqn8y1UmeZUqN03yTVkqcFW0y+y0SpqwY6SErbxeSbmed8NtCvpGT71u3lA7aTTPasYafUpnyDrlLX3WLNhfNVsUHOnJprC/O71NtcXF35bgzbrZCvym40Zx5IXDZhq+I7MHsmFfqSbvNViZRPKtL4Oze2WvWUWvfq+XrmvrUu+PrEz65cTfgk9gMZExtyO/7z/X0+miMu9XEffI+evS80H51pfH0bgy8PGHvINyG117ZGPrwm5Qvh3/es7BMflvXFZj3N3PigRi895pvY/vW1YUg+nhuh+ELFH/TelWE8Jj04RH0OGX8o6Oc21Oc5i3/qZzrD7IsvZ/7jOeJjw9B8YLu6MyHEr8s58TD140NfosDsUvfOfJ9QauMbk/MlsraNr5+V61GL7Ldg31/yjS3bwkdzFPn6O/xLa61En4X3TWv4MP6wfwDfm7n+Ksw9F7tQferY/6N8vH8B31Eqrw27+OBdh7pQyTvD/ffa3v/vdLmfjwIL8NFaK9mbsvn21zqZJdt8NuFnMpxPfOfjUHz0TAtMmAuxbOfKZ/vuE1Oa8MWMNy4ufOBPmIt/iw3EhW+X/ADqlHWN
</data>
</layer>
<layer id="6" name="Ground2" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztlO0KgkAQRS/+y4L2r5jWixWaQj1G9PHeuYhkwyJSaw7bPTDM7AfsYdhdgPjiuvQX9KOfL79bAtybeCQ6/bT3j370C8VvnwKHVK/fN/ybX5UBdTZcd7jmpvbzDf10+fH+0U+rXxW9j+vIvW8uv0/YroBdE/GizV1sTJtz81qzWdb9ORfnXo/KEf3SxFGBr7xzWimE50mBt3SS4zHvl7iRvZySy/p3Z4WK/c8tuZnXg5DQeQKDcgII
eJztlMsKwjAQRS/daQXzAdK6LKW60T9R975AP0P8chtKsQ5BSpvaId4Dw0wekMOQBCC+eMb+gn708+W3y4B9GYdMp5/2/tGPfqH4rXJgnev168O/+W0KYFt8r2tcc0P7+YZ+uvx4/+in1e8SfY6vkXvfWH5dSGfAsozppMp1LEyVE/Nes1nWzTkX90aPTi36pYmzAl9557RyFJ43Bd7SSY7bvF/iRvZySB7z350VKvY/tyRmXA9CQucFNwz/RA==
</data>
</layer>
<layer id="3" name="Walls" width="40" height="40">
@@ -25,60 +25,84 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJztmEsOgjAQhmdnJMGVK4gbT4HixnAO3eol9CC+Nt4J3fk4iRBpLDh9wACW2D+ZpJ06088WhrQA3dDOBdgbYgf3my8YAEwymyV2IVhYIUfIzT8dyPmw8TIKKuRQzR9w//n6A76YW0cRH3Xd6sgliu0637lPn4MSq8o5d+hzUGItHy2W949HHz9rMz5sjPe1wXdPWHr9tz2yduTk+3z76ejNkWrhAyx9Gh8mk/YXk0l8Gw9g6+nxrZK9Whf2q2k+rBbL1q/4+zbfD2YR4mNW5v2ogw+TSc8fJpP4ZPW5OI71f1mfizXaPn96OU3gO0nOeymf7hn06DbDJzoTpuellC8WjIti6ubD/MPsO3dz8v2m1Mb5iCLLR1OX+U6S+yOVdsj9E+ZTxYtqE/V+CIsvk1PnfoiNi+q0qibL+FQ5sXheZWqvbm2umpN6f2Zl9S96AU0B1qI=
eJztmMkOgjAQhudgYiDB90CjV3E5aDzrA7pw8Z3Um8sj+ARCsLHidGNYSuyfTGg7mekHpZO0AO3QNgDYWWL74Jcv6gFM3jZP7EywWYEcM27+aU/Oh/lNFBXIoZo/4t750gDfifuOIj7qdysjlyi27XxHjz4HJVaVc+nT56DEOj5aLD/+HHzGWZvxYT5+rA6+W8LS9TK7v9sr/7vPtx++3hyphn2AUZ/Gh8mm9cVkE986BNiEenzjZK2i3HpVzYfVYp4v78/369wfzFbIvmBmsj/K4MNk0/+HySY+WX3O+7F+k/XZ/X/t5Ysl572UT/cMegiq4ROdCdPzUsp3EvhFMWXzYeOLTva8+t/9qlTH+Ygix0dTm/liyf2RSlvk/gkbU8WLahP1fgiLN8mpcz/E/KI6rarJMj5VTiyel0nt1a3NRXNS78+cnP5FLxlP310=
</data>
</layer>
<layer id="5" name="Overlay" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt1E0OgjAQBeC3EnddF9LD6EYSvARswEsIx/JoLp2dEUqDkTKA70ua9G/xkmkHIKJf1BZoZNysdhLySRxwdNopPj1S7QTxHJx/PnbWv7Nlpww4Z9op/lspf6ua+L8KqdV1pF4XeZe5C899d4nmEOv9hfqzb29P/ZnoW3cDtDI6o51k6GnDayIieltzPyei5bwA2sMSFQ==
eJzt1E0KwjAQBeAHHqDoRqGCLtumm7rRoofyBK3LnsNDaY/jLP1JAlLqJPV9EEjaLB6ZZAAiGmKfAQcZdaadhGzuBuiNdopXXa6dYDw3Y5+7/r3vidm8ABaFdor/Vsnb2jne10Zqs32qTyrztaNeyxJYlf65be8QR8ly4v0hjHf/fP3Z9m1K/ZnoW00CtDIuiXaST9eZfx2bc+5fh6IONFcs50ekJeR+TkS/8wCuWBuR
</data>
</layer>
<objectgroup id="4" name="Objects">
<object id="41" template="../../obj/shop.tx" x="465" y="260">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="56" template="../../obj/shop.tx" x="416" y="260">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="57" template="../../obj/shop.tx" x="545" y="259">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="43" template="../../obj/shop.tx" x="370" y="325">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="47" template="../../obj/inn.tx" x="536" y="144"/>
<object id="49" template="../../obj/shop.tx" x="417" y="324">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="50" template="../../obj/shop.tx" x="465" y="323">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="51" template="../../obj/shop.tx" x="545" y="325">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="52" template="../../obj/shop.tx" x="369" y="261">
<properties>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="53" template="../../obj/spellsmith.tx" x="452" y="212"/>
<object id="55" template="../../obj/shop.tx" x="465" y="515">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -145,13 +169,13 @@
</object>
<object id="62" template="../../obj/shop.tx" x="263" y="257">
<properties>
<property name="shopList" value="WhiteItems"/>
<property name="commonShopList" value="WhiteItems"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="63" template="../../obj/shop.tx" x="82" y="257">
<properties>
<property name="shopList" value="WhiteEquipment"/>
<property name="commonShopList" value="WhiteEquipment"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -166,5 +190,26 @@
<property name="sprite" value=""/>
</properties>
</object>
<object id="66" template="../../obj/quest.tx" x="200" y="257">
<properties>
<property name="questtype" value="plains_capital"/>
</properties>
</object>
<object id="67" template="../../obj/shop.tx" x="208" y="338">
<properties>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
<object id="68" template="../../obj/shop.tx" x="128" y="338">
<properties>
<property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
<property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
<property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
<property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="85">
<editorsettings>
<export format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="../../tileset/main.tsx"/>
<tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
<tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
<layer id="1" name="Background" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztw7ENAAAMAiB3l/5/rX80kNBLqqqqqqqq+ugA4iKowQ==
@@ -12,12 +12,12 @@
</layer>
<layer id="2" name="Ground" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzNWMtS21AMveCEadg4yY7yDcCwhg5fAf2B1oUWvgE2rMtjSdOCyd/Qx7eUwppK1BqOFd3rm9RJrBmNh4skHx097DhLnUu6zrWVLpJ+SP3KPu/oOqSrSBaw1fHZ97b7ou/T0fuzX8vjq+0t1TloHILBirUEebHkYIf3z5W/cJJ3y/n51Iqp8ScG5qHCl6maCG8sLSOmT/fTclzxXYKcNGaspcZlxckgJ41v0priOZ4lETlbPu1IfFV9PG0VfBqHrx6xfTmJWrkLPpynp1fO7SyPquuMaugc/awr6kKnnLtgtfANyPbrjPVbx943Fr7c8D9ede5kdXb4BGMsvivC9mXG+ERi8FXGJ+zX/4H/WuHbpdq+hfry3pHdOwm+uvk7JzyXar/ILpkHPs2fcGjVV+b3huqVGzW7pbNhzb1o9d858If1ncd+sfjD+Zh3favmt2nzofHhO2MTnh9Nw1fVf22ocVP2iwi+N/CMNK2+WurAt7bi3PpKPfzhs25e/RfiD59108J3+rpZ9Z1m/zVtfrVs0e+BbdKkE75ug12LdNGws3zwXP5+sxyPLyR6lkQGBgcbPec2e3HxfHHHFZmlTH1LyIseQkyf+s4d9cPYzijWYzo6o1YOIdFc5Oq3seD7QTYH/bKtzkXkD539Tv240O5R+euYmgv5lobvPIyP7Q6Vrc4F7/uZzveAH+EB+RA75NAXE/+P3xcGY+4IFq7pRaHCofD/kfRX76UHmOf7ijr76iT4xtkRPmF8PwtlfMzdQ1Ffi0fElhTvYJzTXlquSz4Bf5Zwf3wnXHe9fz0i+BgX8/hg9OLz/aGeXJf7tGxbF3/cd1JbFsGH6uMQRc9eLH+hHmHR84VciIZ6UXaR9U4Rw1/V3FmiOQztS995XfX14WPOLgou9U6KkWnh+wtIU1uf
eJzNWM1S20AM3uKEabg4yUswcOn0XDp9BLhAXwBcKHQKbd+jhZ4DHcPbUOBZ+DsWkFpr+Kxo15vUSawZjYdFu/70fZLsOEudS7rOtZXPkX9I/c57Nul6RlexLBCrz+e9p91n30qH78/7Wp69Ot5ynYPGIRiss+YhL7Yc4vD+udovnOTdcn4+t87U+BMD85nClylNhDe2lnGmz7fT8rmydx5y0phRS43LOieDnDS+cTXFdVxLInK29rQj8VXV8aRd8GkcPj1i63Ict3IXfNhPjy+de7cw7K4z7KF13Gdd0V90yrkLVgvfgGKPp+wnHXveWPhyY//qsnNry9PDJxhj8e0Str0p4xOLwVflnwn7/n/g/6XwrZO270Ffnjsye8fBVzd/h4Tnp5ovMktmgU/zJxxa+kr/HpBeXwzNvtLat5pr0aq/Q+AP9Z3FfLH4w/6Ytb5V/du0/tD48J2xCc+PpuGrqr82aNyU+SKG7w3cI03TV1sd+P4sOvewWA9/+KybVf2F+MNn3aTwrS81S99J1l/T+lfbG/o9sEKedMLXFYhrkc8ZcdYeXJe/3y7E4wuZ7iWxgcHBq55zr3tx5/nOHdWklzL1LSEvaggx7fad+9QPY/tBZ92nwz1q5RAyzUWufhsLvguK2emXY3UuYre0dp36cWHcvdqvz9RcyLc0fOdhfBy3p2J1Lnjf77S+AfwID8iHxCGHvjPx//h9YTDijGBjTY8KFw6F/4/kV73nGmCebyp09ukk+EaZET5jfJeFMz7m7q7Q1+IRsSXFOxjntJGWdcnH4M8yro/fhOu8969GBB/jYh7vjFr8e3/Qk3W5ScuxdfHHdSfasgk+dB+HaLr3YvkL1Qib7i/kQjxUizKLrHeKGP6q+s4yzWFoXvrW69LXh485Oyq41DMpxiaF7wlOe1vw
</data>
</layer>
<layer id="6" name="Ground2" width="40" height="40">
<data encoding="base64" compression="zlib">
eJztV21uwyAM9d+EkAu0UrMzbCeYmuxc066ytuutuia9R0EFxbKgITRQNvEkqwSS+uFn8wGQkZHxX/DNAXZPsj2f5vdeA3TCfiNbK2xbu/FzeW9puPrN/B7za3uvLwEu5Xy/fA1Qr8Pz+2QAh8L+HeYv24OwTpnLvB7ldxTcvpj9Ozwu51KI51LZSxWe31T8ML+puSzFT+sk7UNYq/QayG9HxmX73lyW4rcRujTVqBM1PMaKm6ayj0WK3xxITXXMZC60JL4DsY7UT2h+kpOtPkzxbpA2sn5i8otRH68rgLfVrc/Wpvzu6Ut1xm0ffXvynyYftH41P1xXum5MuupnH32xD1rD2kdDeJg0ddU6Rv61hji7roWh8++IdKTxDrG/9ZY8ozmO829uzfry++Fj/pnWLFM/U+uz7/3lwN34nWbeGwZh53rcP06qz+cOcg54Lsbrc4qYOn89G6nHz2fPjYnU9cXnvxSRev5tKrd9LCPjL+EKsTvNGA==
eJztV0tOwzAQHQk2iZNcoWGbK8AK0SB6D7gH5SpA20OBShvugUeNlcHyP25akJ80iuPYnpd5Hn8AEhIS/gteS4C3E9l7aed3WwG03L4mtjm3u8qNn0u72HD1G4PfPgf4zv36TMnvmQG8ML8+Y/n5xITy+2gAPhs/v0+G9jp+6HOV6ftR/th2zsuto2G/sfHbZGbN6Hfkl/H33GJLdnheFeP52eJH+dn+RWBJ2sh+dRrTdqhZ19t9PmjWSc9W+o5l07/Y+C0aPUfabsbjXhd6feg3lh00xToWIX46hK4vqKmImcgPGt9OMqxDfrr8WDjoa8M1H+OmGTjZ8oPGuybaxMgPFWjOUH6u+RHiV7S74HG57GOjK8v8TPrKOtNyyPq3l8ZU+dDlLM0rkTcqXcV7iL7Uh5zDwkct8VBp6qr1sfNXtad1uftaeIz5R7EhOsrxRv1i86N7h27+0TqMk2/OhvJbl8P8U61ZqnrWr8+h95dV6cZv63lv6LjtqmH/2PZ1IXeQnee8f2h+P00wnZnlcVzG8+X2aBnTdv6KyS0EIXeOKRGy504Jm76nBj3/nSPOff7NCrd9LCHhL+EHYaXfpQ==
</data>
</layer>
<layer id="3" name="Walls" width="40" height="40">
@@ -25,12 +25,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJzty0EGACAABMA+ED0gvb7+2SkRHYoOMcOyh90QAAAAAO60eJahHv7W/ws5zV7SfgcA/KEDgLsSbg==
eJztzsEJgDAMBdAsIHQA8d7OrZPpDnr0JAXBQxEV4T0I5EM+JAIAuGsuEUupec0RW/7uHwCAt0xd2xzGxt65/4Q+1X1I13cAwD/scwwWyg==
</data>
</layer>
<layer id="5" name="Overlay" width="40" height="40">
<data encoding="base64" compression="zlib">
eJzt0ksKhDAQRdGa2xB00kotQFdpC/3R7eoKrIETUVoRY4HcA4HiQUjIiwgAAH7eKvLRZd5bNqzk8Pe1Xn4r3bSWdXQWXWJv/ND989VKO7fS/TPmYvb7tD25/p+30O9xaSGSFd638HPG/8M91EHkNa0meN8GAADc3Qj2GhFY
eJzt0rENgzAQBdC/ASNAh+x1IAnThKwWGtgBGtIkG5AyV6SwBCIUdk62/pMsnb9k+aQ7gIiISE9lgdqu87tknZP3Ug/OfTTAZML3R2snmcN5Y2YXyZqNnPxyd/9I/W+L/Ps2x2vfctnBIuI9DDnfp7x5mf36F+35xmwugUep3YUeH/tHabhmQPs9t0y7GyIiIkrdB4cVPLM=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -38,7 +38,7 @@
<object id="53" template="../../obj/spellsmith.tx" x="392" y="194"/>
<object id="55" template="../../obj/shop.tx" x="416" y="402">
<properties>
<property name="shopList" value="Swamp"/>
<property name="commonShopList" value="Swamp"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
@@ -106,54 +106,101 @@
</object>
<object id="62" template="../../obj/shop.tx" x="216" y="241">
<properties>
<property name="shopList" value="BlackItems"/>
<property name="commonShopList" value="BlackItems"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="63" template="../../obj/shop.tx" x="115" y="241">
<properties>
<property name="shopList" value="BlackEquipment"/>
<property name="commonShopList" value="BlackEquipment"/>
<property name="hasSign" type="bool" value="false"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="64" template="../../obj/shop.tx" x="376" y="274">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
</properties>
</object>
<object id="65" template="../../obj/shop.tx" x="376" y="322">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="66" template="../../obj/shop.tx" x="424" y="274">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="67" template="../../obj/shop.tx" x="424" y="322">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="68" template="../../obj/shop.tx" x="472" y="274">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="69" template="../../obj/shop.tx" x="472" y="322">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="70" template="../../obj/shop.tx" x="520" y="274">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="71" template="../../obj/shop.tx" x="520" y="322">
<properties>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="77" template="../../obj/shop.tx" x="376" y="274">
<properties>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="81" template="../../obj/quest.tx" class="quest" x="248" y="306">
<properties>
<property name="questtype" value="swamp_capital"/>
</properties>
</object>
<object id="83" template="../../obj/shop.tx" x="519" y="194">
<properties>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
<object id="84" template="../../obj/shop.tx" x="456" y="194">
<properties>
<property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
<property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
<property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
<property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="55">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFQwXsYGFgkMaDd7FQph8X/saK39xQCuR3sSHYmZoMDFma+M0i1V5jHQYGEx0IH5kNA3qcDAytQDvbqGyvPjuCj8xGBmdxiFNibw4HA8NkNgi+QCd7v7CipkFk85HDHJc4LjYhe9HdeBZHmOMSx8Um1V7kMM9FYp9nxy6OzM7jIM9e5DBHLwNA/iUlrxPK38SGA8heUvxADTBqL3kAAOTKMnc=
eJxjYBgFQwXsYGFgkMaDd7FQph8X/saKas4uNgYGeS0GBgUtCD+UFdMuZIAsr6uNaRYMZGoyMGQB8Xp1BoYN6hAxPaB6Yx0GBhMgPsvOwGANtNOGBHthekEAmQ0DepwMDK1AO9uAWJ8d1X05HAwMk4HuO88OofM4iLcXZBYMILORwVl2VBquXhu7ODH2wtwMwhdw2HsOzT+43EWsvV9YUdMgsn7kMMcljhy/yHxC9qK78SyOMMclro8W/jA+qfYih3kuEhuWbtDFYWwYTWy6QgbIYY5eBoD8Q0peR8/f5ABY+JPiB2qAUXvJAwB5S0IJ
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2QFyHgUFCB5M9CugDcIU5rngZjaNRMAqGLwAAMLIDKw==
eJxjYBgFowA7mKzOwDBFHcEX12FgkNAhzyxkvZSYMwrIA7jCHF+8jMbTKBgFwxMAAMK5BSc=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -71,23 +67,48 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="46" template="../obj/shop.tx" x="351" y="162">
<object id="46" template="../obj/shop.tx" x="367" y="162">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="214" y="114"/>
<object id="48" template="../obj/shop.tx" x="160" y="96">
<properties>
<property name="shopList" value="Mountain"/>
<property name="commonShopList" value="Mountain"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="335" y="81">
<properties>
<property name="signXOffset" type="float" value="-16"/>
<property name="signYOffset" type="float" value="-8"/>
</properties>
</object>
<object id="51" template="../obj/quest.tx" x="364" y="98">
<properties>
<property name="questtype" value="mountain_town_generic"/>
</properties>
</object>
<object id="53" template="../obj/shop.tx" x="239" y="100">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="54" template="../obj/shop.tx" x="304" y="98">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB"/>
<property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
<property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFQwXsYGFgkMaDd7FQph8X/saK39xQCuR3sSHYmZoMDFma+M0i1V5jHQYGEx0IH5kNA3qcDAytQDvbqGyvPjuCj8xGBmdxiFNibw4HA8NkNgi+QCd7v7CipkFk85HDHJc4LjYhe9HdeBZHmOMSx8Um1V7kMM9FYp9nxy6OzM7jIM9e5DBHLwNA/iUlrxPK38SGA8heUvxADTBqL3kAAOTKMnc=
eJxjYBgFQwXsYGFgkMaDd7FQph8X/saKas4uNlR+KJo8OsAnj2xWpiYDQxYQr1dnYNigjhA31mFgMAHis+wMDNZaDAw2WsTbC9OLbA4y0ONkYGgF2tkGxPrsqHI5HAwMk4HuO88OofM4iLcX2Sx0c2HgLDsqjUse2VxC9sLcDMIXcJh7Ds0/lNr7hRU1DSLrRw5zkPgrDUxx5PhF5hOyF92NZ3GEOS5xfbTwh/FJtRc5zHOR2LB0gy4OY8NoYtMVMkAOc/QyAOQfUvI6ev4mB8DCnxQ/UAOM2kseAAD38kEl
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2QFyHgUFCB5M9CugDcIU5rngZjaNRMAqGLwAAMLIDKw==
eJxjYBgFowA7mKzOwDBFHcEX12FgkNCBsOW1GBgUtIg3C1kvMnsU0Aegh/k5DUxxdDWj8TQKRsHwBADmvgaw
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
@@ -71,23 +67,48 @@
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
<object id="46" template="../obj/shop.tx" x="351" y="162">
<object id="46" template="../obj/shop.tx" x="367" y="162">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="214" y="114"/>
<object id="48" template="../obj/shop.tx" x="160" y="96">
<properties>
<property name="shopList" value="Mountain"/>
<property name="commonShopList" value="Mountain"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="335" y="81">
<properties>
<property name="signXOffset" type="float" value="-16"/>
<property name="signYOffset" type="float" value="-8"/>
</properties>
</object>
<object id="51" template="../obj/quest.tx" x="364" y="98">
<properties>
<property name="questtype" value="mountain_town_identity"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="240" y="97">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
<object id="53" template="../obj/shop.tx" x="304" y="97">
<properties>
<property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
<property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="50">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFQwXsYGFgkMaDd7FQph8X/saK39xQCuR3sSHYmZoMDFma+M0i1V5jHQYGEx0IH5kNA3qcDAytQDvbqGyvPjuCj8xGBmdxiFNibw4HA8NkNgi+QCd7v7CipkFk85HDHJc4LjYhe9HdeBZHmOMSx8Um1V7kMM9FYp9nxy6OzM7jIM9e5DBHLwNA/iUlrxPK38SGA8heUvxADTBqL3kAAOTKMnc=
eJxjYKAf+MdEW/MZmSE0EzOqeI8mkGDGUE5T8J8Gft3BwsAgjQfvYqFMPy78jRXVnF1sqPxQNHl0gE8e2axMYDxlAfF6dQaGDerQMATGm7EOA4MJEJ9lZ2Cw1mJgsNEi3l6YXhBAZsOAHicDQyvQzjZNiPmMSOkkh4OBYTLQfefZIXQeB/H26rMj+MhsZHCWHZXGJY9sLiF7YW4G4Qs4zD2H5h9K7f3CipoGkfUjhzkuceT4ReYTshfdjWdxhDkucX208IfxSbUXOcxzkdiwdIMuDmPDaGLTFTJADnP0MgDkH1LyOnr+JgXAynRY+MP8gF4G0wog20svO9HtpSeglr0AD9lFhQ==
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2QFyHgUFCB5M9CugDcIU5rngZjaNRMAqGLwAAMLIDKw==
eJxjYBgFowA7mKzOwDBFHcEX12FgkNCBsOW1GBgUtIg3C1kvMnsU0AfgCnN88TIaT6NgFAxPAAAOuQW6
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
@@ -71,23 +67,48 @@
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
<object id="46" template="../obj/shop.tx" x="351" y="162.446">
<object id="46" template="../obj/shop.tx" x="367" y="162">
<properties>
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="214" y="114"/>
<object id="48" template="../obj/shop.tx" x="160" y="96">
<properties>
<property name="shopList" value="Mountain"/>
<property name="commonShopList" value="Mountain"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="335" y="81">
<properties>
<property name="signXOffset" type="float" value="-16"/>
<property name="signYOffset" type="float" value="-8"/>
</properties>
</object>
<object id="51" template="../obj/quest.tx" x="364" y="98">
<properties>
<property name="questtype" value="mountain_town_tribal"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="304" y="97">
<properties>
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
<object id="53" template="../obj/shop.tx" x="240" y="97">
<properties>
<property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
<property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red"/>
<property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
</properties>
</object>
</objectgroup>

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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gicp/rYFfnpB55KojFlBqr542gv1JG5UmxrwqXtxqKnkHn39Hur1fgXH7jYT4JVedsQ4Dg4kO6W6gRTjrcVLPvMEev8PB3iqkcuMTlvIJxoaVxSAanzpke8vxlFfEuo8UgGxeBRa7YWKk2CuII1/hshcf+MBKfJ1KTF39iYrhB/MDteMEBiqxxEefJmF7semjBkC2NwdHO4PW9o6CUYANAABgVy0t
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gSRxfXouBQUGLsHmE7F3CTZw+GLAG2mlDBXthQE8bwf6kjUoTY14VL241lbzEu49YQKl/R7q9X4Fx+42E+CVXnbEOA4OJDuluoEU463FSz7zBHr/Dwd4qpHIDVBbpI5VLhkCsqw1hw8piEA3i66Cpg7GR7S3HU14R6z5SALJ5FVjshomRYq8gjnyFy1584AMr8XUqMXX1JyqGH8wP1I4TGKjEEh99moTtxaaPGgDZ3hxN/GppZe8oGAXYAAB7/jCB
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
<data encoding="base64" compression="zlib">
eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftRc/OK9BX3tbeRgYdKHsU1A+PewFgWvaqDS97CUHDEV7NTUZGLQ0CYtRYq8OHjPMgWnZAogt8aRpXTQ+sfaiJxlxoEMkoI4JBtoXAsShUHtvAhXfQtNwikx7VXGUp6L4AgIJoOcvbPbu0h7c6Yoe9uKrF2F1GjFqSLUXuSzCxSZF3WAP51F7R+0dyvZeA4pfJxIjA2L13KCxv0bB4AIAgOhQFg==
eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftXdw2dvKw8CgC2WfgvLpYS8IXNNGpellLzlgKNqrqcnAoKVJWIwSe3XwmGGuAVQPxJYauNXoovGJtRc9yYgDHSIBdUww0L4QIA6F2nsTqPgWmoZTZNqriqM8FcUXEEgAPX9hs3eX9uBOV/SwF1+9CKvTiFFDqr3IZREuNinqBns4j9o7au9QtvcaUPw6kRgZEKvnBo39NQoGFwAAZ+tPHw==
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -62,14 +59,13 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="224" y="211"/>
<object id="48" template="../obj/shop.tx" x="290" y="225">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signXOffset" type="float" value="-32"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
@@ -79,7 +75,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -88,7 +83,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -97,7 +91,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -106,7 +99,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
<property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -123,9 +115,15 @@
</object>
<object id="55" template="../obj/shop.tx" x="160" y="151">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="58" template="../obj/quest.tx" x="328" y="130">
<properties>
<property name="questtype" value="plains_town_generic"/>
</properties>
</object>
<object id="59" template="../obj/shardtrader.tx" x="128" y="130"/>
</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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,7 +20,7 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gicp/rYFfnpB55KojFlBqr542gv1JG5UmxrwqXtxqKnkHn39Hur1fgXH7jYT4JVedsQ4Dg4kO6W6gRTjrcVLPvMEev8PB3iqkcuMTlvIJxoaVxSAanzpke8vxlFfEuo8UgGxeBRa7YWKk2CuII1/hshcf+MBKfJ1KTF39iYrhB/MDteMEBiqxxEefJmF7semjBkC2NwdHO4PW9o6CUYANAABgVy0t
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gicp/rYFdXl6LgUFBi7B5hOxdwk2cPhiwBtppQwV7YUBPG8H+pI1KE2NeFS9uNZW8xLuPWECpf0e6vV+BcfuNhPglV52xDgODiQ7pbqBFOOtxUs+8wR6/w8HeKqRy4xOW8gnGhpXFIBqfOmR7y/GUV8S6jxSAbF4FFrthYqTYK4gjX+GyFx/4wEp8nUpMXf2JiuEH8wO14wQGKrHER58mYXux6aMGQLY3RxO/WlrZOwpGATYAADv+Lzo=
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -62,14 +59,13 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="224" y="211"/>
<object id="48" template="../obj/shop.tx" x="290" y="225">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signXOffset" type="float" value="-32"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
@@ -79,7 +75,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -88,7 +83,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -97,7 +91,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -106,7 +99,6 @@
<property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
</properties>
</object>
@@ -123,9 +115,15 @@
</object>
<object id="55" template="../obj/shop.tx" x="160" y="151">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="58" template="../obj/quest.tx" x="328" y="130">
<properties>
<property name="questtype" value="plains_town_identity"/>
</properties>
</object>
<object id="59" template="../obj/shardtrader.tx" x="128" y="130"/>
</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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gicp/rYFfnpB55KojFlBqr542gv1JG5UmxrwqXtxqKnkHn39Hur1fgXH7jYT4JVedsQ4Dg4kO6W6gRTjrcVLPvMEev8PB3iqkcuMTlvIJxoaVxSAanzpke8vxlFfEuo8UgGxeBRa7YWKk2CuII1/hshcf+MBKfJ1KTF39iYrhB/MDteMEBiqxxEefJmF7semjBkC2NwdHO4PW9o6CUYANAABgVy0t
eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gSRqfkHmE1C3hJk4fDFhrMTDYaFFuLwzoaSPYn7RRaWLMq+LFraaSF6GOiZmwmcQASv1LKvjHNDD2kmoeseq+AuP2GwnxS646Yx0GBhMd0t1Aqr2MRKQrPU7ccv/JjF+YPkrBcElX1LS3Cqnc+ISlfIKxYWUxiManDtnecjzlFbHuIwUgm1eBxW6YGCn2CuLIV7jsxQc+sBJfpxJTV3+iYvjB/EDtOIGBSizx0adJ2F5s+qgBkO3NwdHOoLW9o2AUYAMAMPkxOA==
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
<data encoding="base64" compression="zlib">
eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftRc/OK9BX3tbeRgYdKHsU1A+PewFgWvaqDS97CUHDEV7NTUZGLQ0CYtRYq8OHjPMgWnZAogt8aRpXTQ+sfaiJxlxoEMkoI4JBtoXAsShUHtvAhXfQtNwikx7VXGUp6L4AgIJoOcvbPbu0h7c6Yoe9uKrF2F1GjFqSLUXuSzCxSZF3WAP51F7R+0dyvZeA4pfJxIjA2L13KCxv0bB4AIAgOhQFg==
eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftXdw2dvKw8CgC2WfgvKRgbwWA4OCFvXtBYFr2qg0MWCohvNA2KupycCgpUlYjBJ7dfCYYa4BVA/Elhq41eii8Ym1Fz3JiAMdIgF1TDDQvhAgDoXaexOo+BaahlNk2quKozwVxRcQSAA9f2Gzd5f24E5X9LAXX70Iq9OIUUOqvchlES42KeoGeziP2jtq71C29xpQ/DqRGBkQq+cGjf01CgYXAACumU+y
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -62,14 +59,13 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="224" y="211"/>
<object id="48" template="../obj/shop.tx" x="290" y="225">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signXOffset" type="float" value="-32"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
@@ -79,7 +75,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -88,7 +83,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -97,7 +91,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -106,7 +99,6 @@
<property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
<property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White"/>
<property name="shopList" value="Human,Boros,Orzhov,Selesnya,Azorius,White,Creature,Instant,Angel"/>
<property name="uncommonShopList" value="Creature2White,Creature,White"/>
</properties>
</object>
@@ -123,9 +115,15 @@
</object>
<object id="55" template="../obj/shop.tx" x="160" y="151">
<properties>
<property name="shopList" value="Plains"/>
<property name="commonShopList" value="Plains"/>
<property name="signYOffset" type="float" value="0"/>
</properties>
</object>
<object id="58" template="../obj/shardtrader.tx" x="128" y="130"/>
<object id="59" template="../obj/quest.tx" x="328" y="130">
<properties>
<property name="questtype" value="plains_town_trobal"/>
</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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHjF3NZ3UGhi/q+M0h1V5i1OuzU8ccGADFKTHqzyLZa6zDwGCig8mmxL+4zES2Vx8HmxJ7cZmJbO85IHsyGwTncVDH3hygOUbsmOyzONwAArBwIddemH6QfTD/XECz14Ad1Y8gAAsXcu3FlmbPotkLc5MhlrAm116YmaCwBfkLRKPbi+we9LINV94nZC8MgOwH+QFE53JA/JaLFPYwP5JTtiGDGmb8ZS42v5Hivzoy6qm7UHsp9RsAxT9RKw==
eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7kL1emqhYnxgETeqXmIBsh/rmBH2wgCI/VmdgeGLOm4zdLRJtxek3hpotg0ef+mzE2cOsQAUpzD1+Mw+iyRnrMPAYKKDySbHvzCzcZmJbK8+DjYl9uIyE9nec0D2ZDYIzuOg3N4coBm5QGzEjuDD2DB7dbVR3QACsHAh116YfpB9MP9cQLPXgB3hR1j+gYULufZiS1dn0eyFuckQS1hTEs4gc0BhC/IXiEa3F9k96GUbLO+Tai8MgOwH+QEW3yC/5SKFPcyPpPoPHdQw4y9zsfmNFP/VkVFP3YXaS6nfAKsYWFc=
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBg8oIZ3oF0wCmDgujoDww112trRNEjjW1yHgUFCB5NNKzP1OCk3fzgASsOaWnGFDFoGSRodLO4gBtRTwa0w/zYPIX8PJQAAaYAJRg==
eJxjYBg8oIZ3oF0wCmDgujoDww116psrr8XAoKAFYTcN0vgW12FgkNDBZNPKTD1Oys0fDoDSsKZWXCGDlkGSRgeLO4gB9VRwK8y/zUPI30MJAACVSQnZ
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
@@ -80,14 +75,37 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="230" y="98"/>
<object id="48" template="../obj/shop.tx" x="336" y="80">
<properties>
<property name="shopList" value="Swamp"/>
<property name="commonShopList" value="Swamp"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="304" y="194"/>
<object id="51" template="../obj/quest.tx" x="114" y="114">
<properties>
<property name="questtype" value="swamp_town_generic"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="201" y="88">
<properties>
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="signXOffset" type="float" value="-4"/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
<object id="53" template="../obj/shop.tx" x="167" y="88">
<properties>
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB "/>
<property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
<property name="signXOffset" type="float" value="4"/>
<property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHjF3NZ3UGhi/q+M0h1V5i1OuzU8ccGADFKTHqzyLZa6zDwGCig8mmxL+4zES2Vx8HmxJ7cZmJbO85IHsyGwTncVDH3hygOUbsmOyzONwAArBwIddemH6QfTD/XECz14Ad1Y8gAAsXcu3FlmbPotkLc5MhlrAm116YmaCwBfkLRKPbi+we9LINV94nZC8MgOwH+QFE53JA/JaLFPYwP5JTtiGDGmb8ZS42v5Hivzoy6qm7UHsp9RsAxT9RKw==
eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHjF3NZ3UGhi/q+M0h1V6QemstBgYbLdxq9NmJM4dYAIpTmHp8Zp9FkjPWYWAw0cFkk+NfmNm4zES2Vx8HmxJ7cZmJbO85IHsyGwTncVBubw7QjFwgNmJH8GHsszjcAAKwcCHXXph+kH0w/1xAs9eAHeFHWP6BhQu59mJLV2fR7IW5yRBLWFMSziBzQGEL8heIRrcX2T3oZRuuvE/IXhgA2Q/yAyy+QX7LRQp7mB/JKduQQQ0z/jIXm99I8V8dGfXUXai9lPoNAFBAVPY=
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBg8oIZ3oF0wCmDgujoDww112trRNEjjW1yHgUFCB5NNKzP1OCk3fzgASsOaWnGFDFoGSRodLO4gBtRTwa0w/zYPIX8PJQAAaYAJRg==
eJxjYBg8oIZ3oF0w8GAxIyqmF/DUQsXX1RkYbqhT3x55oNkKWhB2Ey/ELmQ3DAYgrsPAIKGDyaaVmXqclJs/HAClYY1L/wUN8s1soaBMekOBvdR0B71BPRXcCvNv8xDy91ACAEHHESc=
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
@@ -80,14 +75,37 @@
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="230" y="98"/>
<object id="48" template="../obj/shop.tx" x="336" y="80">
<properties>
<property name="shopList" value="Swamp"/>
<property name="commonShopList" value="Swamp"/>
</properties>
</object>
<object id="49" template="../obj/quest.tx" x="114" y="114">
<properties>
<property name="questtype" value="swamp_town_identity"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="304" y="194"/>
<object id="51" template="../obj/shop.tx" x="201" y="88">
<properties>
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="signXOffset" type="float" value="-4"/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="167" y="88">
<properties>
<property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
<property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
<property name="signXOffset" type="float" value="4"/>
<property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
</properties>
</object>
</objectgroup>

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="6" nextobjectid="49">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHjF3NZ3UGhi/q+M0h1V5i1OuzU8ccGADFKTHqzyLZa6zDwGCig8mmxL+4zES2Vx8HmxJ7cZmJbO85IHsyGwTncVDH3hygOUbsmOyzONwAArBwIddemH6QfTD/XECz14Ad1Y8gAAsXcu3FlmbPotkLc5MhlrAm116YmaCwBfkLRKPbi+we9LINV94nZC8MgOwH+QFE53JA/JaLFPYwP5JTtiGDGmb8ZS42v5Hivzoy6qm7UHsp9RsAxT9RKw==
eJy1lU0KwjAQhacNWEE8R0EK9W+nC3HnXawnkKpn8AZ6nooX6Cl0rWYwQ9K0KU2iD4JTat43b1ojgL9OQ7/7v9Y/eCH7vSfpyPtdhQDXwG2tQ3vmQcyoFHs3o+qqScl/GVT3dpWaMWeSS8L6EQM843YfWy5+f8G9l025hNKom8+7IxufKfXZ5l0o92YJwDyp1y55ydvkqXJTQ+3DNXmq3Buvz73v2vX9uVvukfE1jeQ11YWhBxTNxZVL+5FHee4adxzJjPT7obm4cpveq0LjUk8Tbdb4HrtwX6H0xNliLvzUuQGT1/rZlluepXqfyMcM9LwxW6bMnjLa5tO1Z+1nblM2m3y5w/9UKbi+2T6mSVq2
</data>
</layer>
<layer id="5" name="AboveSprites" width="30" height="17">
<data encoding="base64" compression="zlib">
eJxjYBg8oIZ3oF0wCmDgujoDww112trRNEjjW1yHgUFCB5NNKzP1OCk3fzgASsOaWnGFDFoGSRodLO4gBtRTwa0w/zYPIX8PJQAAaYAJRg==
eJxjYBg8oIZ3oF0wCmDgujoDww116psrr8XAoKAFYTcN0vgW12FgkNDBZNPKTD1Oys0fDoDSsKZWXCGDlkGSRgeLO4gB9VRwK8y/zUPI30MJAACVSQnZ
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
@@ -80,14 +75,37 @@
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Simic,Zombie "/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="230" y="98"/>
<object id="48" template="../obj/shop.tx" x="336" y="80">
<properties>
<property name="shopList" value="Swamp"/>
<property name="commonShopList" value="Swamp"/>
</properties>
</object>
<object id="49" template="../obj/quest.tx" x="114" y="114">
<properties>
<property name="questtype" value="swamp_town_tribal"/>
</properties>
</object>
<object id="50" template="../obj/shardtrader.tx" x="304" y="194"/>
<object id="51" template="../obj/shop.tx" x="167" y="88">
<properties>
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="signXOffset" type="float" value="4"/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
<object id="52" template="../obj/shop.tx" x="201" y="88">
<properties>
<property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
<property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
<property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black"/>
<property name="signXOffset" type="float" value="-4"/>
<property name="uncommonShopList" value="Creature2Black,Creature,Black"/>
</properties>
</object>
</objectgroup>

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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="61">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="64">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy+2eMIGcMUtNv1DMZxB4D07Kk0IaDBit+MrCfZSkq5J8e9hoFvdNRkYPIBYjxNTfiTELyX2oudDmL3ExB+5eZhY/xJjPiytkmvvF1by6lBS6u1vSPai+4lQOKO7mZx0QU48UcNecgAp9lKj7iTHXmoCcu2l1O9Dzb+DxV4AiyIukg==
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5NtpA2hYeFCjr2khik2QK9wNoT610SbcnsnU+BvYuxFjicQsNZiYLDRwtSHK25R2FTwLyWAUnvfs6PShIAGI3Y7vpJgLyXpmhT/Hga61V2TgcEDiPU4MeWJiV9y7KUG2ME2MPYi24GeD2H2EhN/hPKwjjZue4kRI6aMgKVVYgA2O76wkleHklJvf0OyF91PhMIZ3c3kpAtyylpq2EsOIMVeatSd5NhLTUCuvZT6faj5d7DYCwAfmzHo
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzt0bENwCAQBMHtAlpA//33AtU4cIgtET7STnTBZQuSKmgJPfetuk47/bW1c20zYMW7Y0CO7599JUk3ewCmfgdy
eJzt0bERgCAUBNHtQjNI4f/+e4FqDMzUMYaZfdEFly1IWsGRcOZ7a13PTqVD7f8/O+9jBMy4dzTI9v2zryRpZxerjQgF
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -80,7 +75,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -89,7 +83,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -98,14 +91,13 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="150" y="273"/>
<object id="48" template="../obj/shop.tx" x="104" y="272">
<properties>
<property name="shopList" value="Equipment"/>
<property name="commonShopList" value="Equipment"/>
</properties>
</object>
<object id="58" template="../obj/shop.tx" x="97" y="209">
@@ -113,9 +105,14 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
<property name="mythicShopList" value="Planeswalker,WUBRG"/>
<property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
</properties>
</object>
<object id="62" template="../obj/shardtrader.tx" x="400" y="288"/>
<object id="63" template="../obj/quest.tx" x="168" y="209">
<properties>
<property name="questtype" value="waste_town_generic"/>
</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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="63">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy+2eMIGcMUtNv1DMZxB4D07Kk0IaDBit+MrCfZSkq5J8e9hoFvdNRkYPIBYjxNTfiTELyX2oudDmL3ExB+5eZhY/xJjPiytkmvvF1by6lBS6u1vSPai+4lQOKO7mZx0QU48UcNecgAp9lKj7iTHXmoCcu2l1O9Dzb+DxV4AiyIukg==
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/m+N3BRpm9pzUosx9kB3o+hNmLL/6eQ+0lNw8T619izIelVXLt/cJKXh1KSr39DcledD8RyifobiYnPZITT9SwlxxAir3UqDvJsZeagFx7KfX7UPPvYLEXAMqrMh0=
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzt0bENwCAQBMHtAlpA//33AtU4cIgtET7STnTBZQuSKmgJPfetuk47/bW1c20zYMW7Y0CO7599JUk3ewCmfgdy
eJzt0bERgCAUBNHtQjNI4f/+e4FqDMzUMYaZfdEFly1IWsGRcOZ7a13PTqVD7f8/O+9jBMy4dzTI9v2zryRpZxerjQgF
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -80,7 +75,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="Creature2Eldrazi,Legend"/>
<property name="rareShopList" value="White,Blue,Red,Green,Black,LegendLand4Colorless,Land4Colorless"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -89,7 +83,6 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
@@ -98,14 +91,13 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="150" y="273"/>
<object id="48" template="../obj/shop.tx" x="104" y="272">
<properties>
<property name="shopList" value="Equipment"/>
<property name="commonShopList" value="Equipment"/>
</properties>
</object>
<object id="58" template="../obj/shop.tx" x="97" y="209">
@@ -113,9 +105,14 @@
<property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
<property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
<property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
</properties>
</object>
<object id="61" template="../obj/shardtrader.tx" x="400" y="288"/>
<object id="62" template="../obj/quest.tx" x="168" y="209">
<properties>
<property name="questtype" value="waste_town_identity"/>
</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="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="62">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="65">
<editorsettings>
<export target="wastetown..tmx" format="tmx"/>
</editorsettings>
@@ -20,12 +20,12 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy+2eMIGcMUtNv1DMZxB4D07Kk0IaDBit+MrCfZSkq5J8e9hoFvdNRkYPIBYjxNTfiTELyX2oudDmL3ExB+5eZhY/xJjPiytkmvvF1by6lBS6u1vSPai+4lQOKO7mZx0QU48UcNecgAp9lKj7iTHXmoCcu2l1O9Dzb+DxV4AiyIukg==
eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/r+GXGL/2fCcFmxKIWZAd6PoTZiy3+kM0DAXS9TEh2/ENTi80OQmL4zIcBWFrFBtDdi82OL6zk1aGk1NvfkOxF9xOhfILuZnLSIzllLTXsJQeQYi816k5y7KUmINdeSv0+1Pw7WOwFAAL/M3E=
</data>
</layer>
<layer id="5" name="Overlay" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzt0bENwCAQBMHtAlpA//33AtU4cIgtET7STnTBZQuSKmgJPfetuk47/bW1c20zYMW7Y0CO7599JUk3ewCmfgdy
eJzt0SEOgEAQQ9GvuAI4sLsz9w9XgdMgcCwhOJbkP1VR0aQgqQdjwpRtVr+uP80Vlvrc8+f/2AL2OHMUyHLf89/WOny9QJL01gHnWwjD
</data>
</layer>
<objectgroup id="4" name="Objects">
@@ -35,7 +35,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -44,7 +43,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -53,7 +51,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -62,7 +59,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -71,7 +67,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -80,7 +75,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -89,7 +83,6 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
@@ -98,14 +91,13 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
<object id="47" template="../obj/inn.tx" x="150" y="273"/>
<object id="48" template="../obj/shop.tx" x="104" y="272">
<properties>
<property name="shopList" value="Equipment"/>
<property name="commonShopList" value="Equipment"/>
</properties>
</object>
<object id="58" template="../obj/shop.tx" x="97" y="209">
@@ -113,9 +105,14 @@
<property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
<property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
<property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
<property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
<property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
</properties>
</object>
<object id="63" template="../obj/shardtrader.tx" x="400" y="288"/>
<object id="64" template="../obj/quest.tx" x="168" y="209">
<properties>
<property name="questtype" value="waste_town_tribal"/>
</properties>
</object>
</objectgroup>
</map>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<tileset firstgid="1" source="../tileset/buildings.tsx"/>
<object name="Quest" class="quest" gid="1418" width="16" height="16">
<properties>
<property name="questtype" value=""/>
<property name="type" value="quest"/>
</properties>
</object>
</template>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<tileset firstgid="1" source="../tileset/buildings.tsx"/>
<object name="Shardtrader" class="shardtrader" gid="1446" width="16" height="16">
<properties>
<property name="hasSign" type="bool" value="true"/>
<property name="signXOffset" type="float" value="16"/>
<property name="signYOffset" type="float" value="-16"/>
<property name="type" value="shardtrader"/>
</properties>
</object>
</template>

View File

@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<tileset firstgid="1" source="../tileset/buildings.tsx"/>
<object name="Shop" type="shop" gid="1251" width="16" height="16">
<object name="Shop" class="shop" gid="1251" width="16" height="16">
<properties>
<property name="shopList" value=""/>
<property name="commonShopList" value=""/>
<property name="hasSign" type="bool" value="true"/>
<property name="mythicShopList" value=""/>
<property name="rareShopList" value=""/>
<property name="signXOffset" type="float" value="16"/>
<property name="signYOffset" type="float" value="-16"/>
<property name="type" value="shop"/>
<property name="uncommonShopList" value=""/>
</properties>
</object>
</template>

View File

@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<tileset firstgid="1" source="../tileset/buildings.tsx"/>
<object name="Spellsmith" type="spellsmith" gid="1391" width="16" height="16"/>
<object name="Spellsmith" class="spellsmith" gid="1391" width="16" height="16">
<properties>
<property name="hasSign" type="bool" value="true"/>
<property name="signXOffset" type="float" value="16"/>
<property name="signYOffset" type="float" value="-16"/>
<property name="type" value="spellsmith"/>
</properties>
</object>
</template>

View File

@@ -577,3 +577,6 @@ red_castle
final_castle
xy: 128, 864
size: 64, 64
shard_trader
xy: 288, 896
size: 16, 16

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

After

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 KiB

After

Width:  |  Height:  |  Size: 510 KiB

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.9" tiledversion="1.9.1" name="main" tilewidth="16" tileheight="16" tilecount="6320" columns="158">
<image source="main.png" width="2528" height="640"/>
<tileset version="1.9" tiledversion="1.9.2" name="main" tilewidth="16" tileheight="16" tilecount="10112" columns="158">
<image source="main.png" width="2528" height="1024"/>
<tile id="105">
<objectgroup draworder="index" id="2">
<object id="1" x="1" y="0" width="14" height="14"/>
@@ -7061,6 +7061,12 @@
<object id="2" x="0" y="0" width="7" height="16"/>
</objectgroup>
</tile>
<tile id="5976">
<objectgroup draworder="index" id="2">
<object id="1" x="13" y="0" width="3" height="16"/>
<object id="2" x="0" y="0" width="16" height="3.86957"/>
</objectgroup>
</tile>
<tile id="6108">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
@@ -7107,6 +7113,11 @@
<object id="1" x="0" y="0" width="15" height="15"/>
</objectgroup>
</tile>
<tile id="6134">
<objectgroup draworder="index" id="2">
<object id="1" x="13" y="0" width="3" height="16"/>
</objectgroup>
</tile>
<tile id="6276">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0"/>
@@ -7123,6 +7134,23 @@
<object id="1" x="0" y="0"/>
</objectgroup>
</tile>
<tile id="6290">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="3" height="16"/>
<object id="2" x="0" y="13" width="16" height="3"/>
</objectgroup>
</tile>
<tile id="6291">
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="13" width="16" height="3"/>
</objectgroup>
</tile>
<tile id="6292">
<objectgroup draworder="index" id="4">
<object id="3" x="13" y="0" width="3" height="16"/>
<object id="4" x="0" y="13" width="16" height="3"/>
</objectgroup>
</tile>
<wangsets>
<wangset name="Walls" type="corner" tile="2531">
<wangcolor name="" color="#ff0000" tile="-1" probability="1"/>

View File

@@ -27,6 +27,9 @@ CardBack
Gold
xy: 48, 0
size: 16, 16
Shards
xy: 32, 768
size: 16, 16
Life
xy: 48, 16
size: 16, 16

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -66,7 +66,7 @@
},
{
"type": "Label",
"name": "mana",
"name": "shards",
"font": "default",
"width": 64,
"height": 16,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

@@ -66,7 +66,7 @@
},
{
"type": "Label",
"name": "mana",
"name": "shards",
"font": "default",
"width": 64,
"height": 16,

View File

@@ -65,7 +65,7 @@
},
{
"type": "Label",
"name": "mana",
"name": "shards",
"font": "default",
"width": 48,
"height": 3,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -75,6 +75,26 @@
"height": 30,
"x": 320,
"y": 200
},
{
"type": "Label",
"name": "playerGold",
"style":"background",
"text": "[+Gold]",
"width": 48,
"height": 30,
"x": 420,
"y": 200
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"text": "[+Shards]",
"width": 48,
"height": 30,
"x": 420,
"y": 240
}
]
}

View File

@@ -75,6 +75,26 @@
"height": 30,
"x": 165,
"y": 335
},
{
"type": "Label",
"name": "playerGold",
"style":"background",
"text": "[+Gold]",
"width": 128,
"height": 32,
"x": 16,
"y": 405
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"text": "[+Shards]",
"width": 128,
"height": 32,
"x": 16,
"y": 435
}
]
}

View File

@@ -46,13 +46,32 @@
} ,
{
"type": "Label",
"name": "gold",
"name": "playerGold",
"style":"background",
"text": "[+Gold]",
"width": 48,
"height": 30,
"x": 420,
"y": 200
},
{
"type": "TextButton",
"name": "restock",
"text": "Restock",
"width": 48,
"height": 30,
"x": 420,
"y": 160
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"text": "[+Shards]",
"width": 48,
"height": 30,
"x": 420,
"y": 240
},
{
"type": "Label",

View File

@@ -42,17 +42,46 @@
"width": 128,
"height": 32,
"x": 140,
"y": 405
"y": 435
} ,
{
"type": "Label",
"name": "gold",
"style":"background",
"name": "playerGold",
"text": "[+Gold]",
"width": 128,
"height": 32,
"x": 16,
"y": 405
},
{
"type": "TextButton",
"name": "restock",
"text": "Restock",
"style":"background",
"width": 128,
"height": 30,
"x": 140,
"y": 405
},
{
"type": "Label",
"name": "playerShards",
"text": "[+Shards]",
"style":"background",
"width": 128,
"height": 32,
"x": 16,
"y": 435
},
{
"type": "Label",
"name": "shopName",
"style":"background",
"text": "A Street Market",
"width": 48,
"height": 20,
"x": 200,
"y": 0
}
]
}

View File

@@ -0,0 +1,100 @@
{
"width": 480,
"height": 270,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/market.png",
"width": 480,
"height": 270
},
{
"type": "Image",
"name": "shardIcon",
"image": "ui/buyshards.png",
"x": 60,
"y": 85,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "btnBuyShardsCost",
"text": "btnBuyShardsCost",
"binding": "Status",
"width": 100,
"height": 30,
"x": 60,
"y": 200
},
{
"type": "Image",
"name": "sellIcon",
"image": "ui/sell.png",
"x": 190,
"y": 85,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "btnSellShardsQuantity",
"text": "btnSellShardsQuantity",
"binding": "Equip",
"width": 100,
"height": 30,
"x": 190,
"y": 200
},
{
"type": "Image",
"name": "leaveIcon",
"image": "ui/leave.png",
"x": 320,
"y": 85,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "done",
"text": "tr(lblBack)",
"binding": "Back",
"width": 100,
"height": 30,
"x": 320,
"y": 200
},
{
"type": "Label",
"name": "shopName",
"style":"background",
"text": "Shard Trader",
"width": 48,
"height": 20,
"x": 200,
"y": 0
},
{
"type": "Label",
"name": "playerGold",
"style":"background",
"text": "[+Gold]",
"width": 48,
"height": 30,
"x": 420,
"y": 200
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"text": "[+Shards]",
"width": 48,
"height": 30,
"x": 420,
"y": 240
}
]
}

View File

@@ -0,0 +1,90 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/market_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Image",
"name": "shardIcon",
"image": "ui/buyshards.png",
"x": 60,
"y": 85,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "btnBuyShardsCost",
"text": "btnBuyShardsCost",
"binding": "Status",
"width": 100,
"height": 30,
"x": 165,
"y": 105
},
{
"type": "Image",
"name": "sellIcon",
"image": "ui/sell.png",
"x": 60,
"y": 200,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "btnSellShardsQuantity",
"text": "btnSellShardsQuantity",
"binding": "Equip",
"width": 100,
"height": 30,
"x": 165,
"y": 220
},
{
"type": "Image",
"name": "leaveIcon",
"image": "ui/leave.png",
"x": 60,
"y": 315,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "done",
"text": "tr(lblBack)",
"binding": "Back",
"width": 100,
"height": 30,
"x": 165,
"y": 335
},
{
"type": "Label",
"name": "playerGold",
"style":"background",
"text": "[+Gold]",
"width": 128,
"height": 32,
"x": 16,
"y": 405
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"text": "[+Shards]",
"width": 128,
"height": 32,
"x": 16,
"y": 435
}
]
}

View File

@@ -132,18 +132,47 @@
},
{
"type": "Label",
"name": "gold",
"x": 0,
"y": 0,
"width": 120,
"name": "playerGold",
"style":"background",
"x": 5,
"y": 5,
"width": 80,
"height": 20
},
{
"type": "TextButton",
"selectable": true,
"name": "pull",
"name": "pullUsingGold",
"binding": "Status",
"text": "tr(lblDraw) [+gold]",
"x": 70,
"y": 5,
"width": 90,
"height": 20
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"x": 280,
"y": 5,
"width": 80,
"height": 20
},
{
"type": "TextButton",
"selectable": true,
"name": "pullUsingShards",
"binding": "Equip",
"text": "tr(lblDraw)",
"text": "tr(lblDraw) [+shards]",
"x": 345,
"y": 5,
"width": 90,
"height": 20
},
{
"type": "Label",
"name": "poolSize",
"x": 360,
"y": 180,
"width": 90,

View File

@@ -65,9 +65,9 @@
"name": "done",
"text": "tr(lblBack)",
"binding": "Back",
"x": 175,
"x": 180,
"y": 150,
"width": 70,
"width": 90,
"height": 20
},
{
@@ -139,11 +139,48 @@
"height": 20
},
{
"type": "Label",
"name": "playerGold",
"style":"background",
"x": 180,
"y": 0,
"width": 90,
"height": 20
},
{
"type": "TextButton",
"name": "pull",
"text": "tr(lblDraw)",
"selectable": true,
"name": "pullUsingGold",
"binding": "Status",
"text": "tr(lblDraw) [+gold]",
"x": 180,
"y": 25,
"width": 90,
"height": 20
},
{
"type": "Label",
"name": "playerShards",
"style":"background",
"x": 180,
"y": 50,
"width": 90,
"height": 20
},
{
"type": "TextButton",
"selectable": true,
"name": "pullUsingShards",
"binding": "Equip",
"text": "tr(lblDraw) [+shards]",
"x": 180,
"y": 75,
"width": 90,
"height": 20
},
{
"type": "Label",
"name": "poolSize",
"x": 16,
"y": 150,
"width": 97,

View File

@@ -1,5 +1,14 @@
[
{
"name": "PCharm",
"equipmentSlot": "Neck",
"iconName": "SolRing",
"effect": {
"startBattleWithCard": [
"Piper's Charm"
]
}
},{
"name": "Sol Ring",
"equipmentSlot": "Left",
"iconName": "SolRing",
@@ -765,7 +774,7 @@
"commandOnUse": "teleport to poi Spawn",
"iconName": "ColorlessRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -778,7 +787,7 @@
"commandOnUse": "teleport to poi \"Plains Capital\"",
"iconName": "WhiteRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -791,7 +800,7 @@
"commandOnUse": "teleport to poi \"Swamp Capital\"",
"iconName": "BlackRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -804,7 +813,7 @@
"commandOnUse": "teleport to poi \"Island Capital\"",
"iconName": "BlueRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -817,7 +826,7 @@
"commandOnUse": "teleport to poi \"Mountain Capital\"",
"iconName": "RedRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -830,7 +839,7 @@
"commandOnUse": "teleport to poi \"Forest Capital\"",
"iconName": "GreenRune",
"questItem": true,
"manaNeeded": 1,
"shardsNeeded": 1,
"cost": 100
},
{
@@ -844,7 +853,7 @@
"commandOnUse": "heal percent 0.5",
"iconName": "WhiteStaff",
"questItem": true,
"manaNeeded": 5,
"shardsNeeded": 5,
"cost": 1000
},
{
@@ -858,7 +867,7 @@
"commandOnUse": "hide 10",
"iconName": "BlackStaff",
"questItem": true,
"manaNeeded": 5,
"shardsNeeded": 5,
"cost": 1000
},
{
@@ -871,7 +880,7 @@
"commandOnUse": "fly 10",
"iconName": "BlueStaff",
"questItem": true,
"manaNeeded": 5,
"shardsNeeded": 5,
"cost": 1000
},
{
@@ -884,7 +893,7 @@
"commandOnUse": "remove enemy nearest",
"iconName": "RedStaff",
"questItem": true,
"manaNeeded": 5,
"shardsNeeded": 5,
"cost": 1000
},
{
@@ -898,7 +907,7 @@
"commandOnUse": "sprint 10",
"iconName": "GreenStaff",
"questItem": true,
"manaNeeded": 5,
"shardsNeeded": 5,
"cost": 1000
}
]

File diff suppressed because it is too large Load Diff

View File

@@ -2415,6 +2415,7 @@ lblCardChooseAnOpponentToGainNLife={0} - Choose an opponent to gain {1} life
lblMillNCardsFromYourLibraryConfirm=Mill {0} card(s) from your library?
lblPayNLifeConfirm=Pay {0} life?
lblPayEnergyConfirm={0}?\n(You have {1} {2})
lblPayShardsConfirm={0}?\n(You have {1} {2})
lblPutCardToLibraryConfirm=Put {0} to library?
lblPutNCardsFromYourZone=Put {0} card(s) from your {1}
lblFromZonePutToLibrary=Put from {0} to library

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -503,4 +503,8 @@ public class HostedMatch {
});
}
}
public List<PlayerControllerHuman> getHumanControllers(){
return humanControllers;
}
}

View File

@@ -127,6 +127,7 @@ public final class ForgeConstants {
public static final String SPRITE_SLEEVES2_FILE = "sprite_sleeves2.png";
public static final String SPRITE_FAVICONS_FILE = "sprite_favicons.png";
public static final String SPRITE_PLANAR_CONQUEST_FILE = "sprite_planar_conquest.png";
public static final String SPRITE_ADVENTURE_FILE = "sprite_adventure.png";
public static final String SPRITE_SETLOGO_FILE = "sprite_setlogo.png";
public static final String SPRITE_WATERMARK_FILE = "sprite_watermark.png";
public static final String SPRITE_DRAFTRANKS_FILE = "sprite_draftranks.png";

View File

@@ -189,7 +189,6 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
AUTO_UPDATE("none"),
USE_SENTRY("false"), // this controls whether automated bug reporting is done or not
EXPANDEDADVENTURESHOPS("false"),
MATCH_HOT_SEAT_MODE("false"), //this only applies to mobile game
MATCHPREF_PROMPT_FREE_BLOCKS("false"),

View File

@@ -267,6 +267,9 @@ public enum FSkinProp {
ICO_QUEST_BIG_SWORD (new int[] {320, 1360, 160, 160}, PropType.ICON),
ICO_QUEST_BIG_BAG (new int[] {480, 1360, 160, 160}, PropType.ICON),
//adventure icons
ICO_MANASHARD (new int[] {0,0, 100,100}, PropType.ICON),
//menu icon
ICO_MENU_GALAXY (new int[] {0, 1520, 80, 80}, PropType.ICON),
ICO_MENU_STATS (new int[] {80, 1520, 80, 80}, PropType.ICON),
@@ -575,6 +578,7 @@ public enum FSkinProp {
MANAICONS,
PHYREXIAN,
PLANAR_CONQUEST,
ADVENTURE,
DECKBOX,
SETLOGO,
WATERMARKS,

View File

@@ -587,6 +587,17 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return null;
}
@Override
public PaymentDecision visit(final CostPayShards cost) {
Integer c = cost.getAbilityAmount(ability);
if (player.canPayShards(c) &&
confirmAction(cost, Localizer.getInstance().getMessage("lblPayShardsConfirm", cost.toString(), String.valueOf(player.getCounters(CounterEnumType.MANASHARDS)), "{M} (Mana Shards)"))) {
return PaymentDecision.number(c);
}
return null;
}
@Override
public PaymentDecision visit(final CostPartMana cost) {
// only interactive payment possible for now =(

View File

@@ -516,6 +516,17 @@ public class HumanPlay {
p.payEnergy(amount, source);
}
else if (part instanceof CostPayShards) {
CounterType counterType = CounterType.get(CounterEnumType.MANASHARDS);
int amount = getAmountFromPartX(part, source, sourceAbility);
if (!mandatory && !p.getController().confirmPayment(part, Localizer.getInstance().getMessage("lblDoYouWantSpendNTargetTypeCounter", String.valueOf(amount), counterType.getName()), sourceAbility)) {
return false;
}
p.payShards(amount, source);
}
else {
throw new RuntimeException("GameActionUtil.payCostDuringAbilityResolve - An unhandled type of cost was met: " + part.getClass());
}