Merge branch 'master' into newmaster2

forge-gui/res/adventure/common/maps/map/hostiletown/elftown.tmx

@@ -3,8 +3,8 @@
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="1" source="../../tileset/main.tsx"/>
- <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYMANonkZGHbxkIejePEYTADI8pCvdycZdsP8uZsCe0FAmkT9lPhz1F7627uTxPRNLXuRATF+H7V31N5Reym3dy9QTR03Atdz08deYupXWJhIk1AnIwMAhyEnfQ==
@@ -34,40 +34,40 @@
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="240" y="272"/>
+  <object id="38" template="../../obj/entry_up.tx" x="240" y="272"/>
-  <object id="41" template="../obj/shop.tx" x="128" y="67"/>
+  <object id="41" template="../../obj/shop.tx" x="128" y="67"/>
-  <object id="42" template="../obj/shop.tx" x="303.5" y="98"/>
+  <object id="42" template="../../obj/shop.tx" x="303.5" y="98"/>
-  <object id="43" template="../obj/shop.tx" x="352.5" y="144"/>
+  <object id="43" template="../../obj/shop.tx" x="352.5" y="144"/>
-  <object id="44" template="../obj/shop.tx" x="176" y="66.5"/>
+  <object id="44" template="../../obj/shop.tx" x="176" y="66.5"/>
-  <object id="45" template="../obj/shop.tx" x="240" y="115"/>
+  <object id="45" template="../../obj/shop.tx" x="240" y="115"/>
-  <object id="46" template="../obj/shop.tx" x="383" y="210"/>
+  <object id="46" template="../../obj/shop.tx" x="383" y="210"/>
-  <object id="47" template="../obj/inn.tx" x="143.5" y="162.5"/>
+  <object id="47" template="../../obj/inn.tx" x="143.5" y="162.5"/>
-  <object id="48" template="../obj/enemy.tx" x="259.5" y="190">
+  <object id="48" template="../../obj/enemy.tx" x="259.5" y="190">
    <properties>
     <property name="enemy" value="Elf"/>
    </properties>
   </object>
-  <object id="49" template="../obj/enemy.tx" x="215.5" y="230.5">
+  <object id="49" template="../../obj/enemy.tx" x="215.5" y="230.5">
    <properties>
     <property name="enemy" value="Elf"/>
    </properties>
   </object>
-  <object id="50" template="../obj/enemy.tx" x="318" y="219">
+  <object id="50" template="../../obj/enemy.tx" x="318" y="219">
    <properties>
     <property name="enemy" value="Elf"/>
    </properties>
   </object>
-  <object id="51" template="../obj/enemy.tx" x="215" y="173.5">
+  <object id="51" template="../../obj/enemy.tx" x="215" y="173.5">
    <properties>
     <property name="enemy" value="Elf warrior"/>
    </properties>
   </object>
-  <object id="52" template="../obj/enemy.tx" x="326.5" y="135.5">
+  <object id="52" template="../../obj/enemy.tx" x="326.5" y="135.5">
    <properties>
     <property name="enemy" value="Elf warrior"/>
    </properties>
   </object>
-  <object id="53" template="../obj/enemy.tx" x="194.5" y="109.5">
+  <object id="53" template="../../obj/enemy.tx" x="194.5" y="109.5">
    <properties>
     <property name="enemy" value="High Elf"/>
    </properties>

forge-gui/res/adventure/common/maps/map/hostiletown/yule_town.tmx

@@ -3,8 +3,8 @@
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="1" source="../../tileset/main.tsx"/>
- <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBhYEM3LwLCLh7o4ipewvbI81PeLNBFmjto7au+ovaP2jtqLHxBTzqO7TZoIPdQA2OylB6CmvQCT/yIe
@@ -34,13 +34,13 @@
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="192" y="271.659" width="48" height="16"/>
+  <object id="38" template="../../obj/entry_up.tx" x="192" y="271.659" width="48" height="16"/>
-  <object id="41" template="../obj/shop.tx" x="88" y="177.667"/>
+  <object id="41" template="../../obj/shop.tx" x="88" y="177.667"/>
-  <object id="42" template="../obj/shop.tx" x="119" y="113.667"/>
+  <object id="42" template="../../obj/shop.tx" x="119" y="113.667"/>
-  <object id="43" template="../obj/shop.tx" x="160.333" y="81.6667"/>
+  <object id="43" template="../../obj/shop.tx" x="160.333" y="81.6667"/>
-  <object id="44" template="../obj/shop.tx" x="263.667" y="82.3333"/>
+  <object id="44" template="../../obj/shop.tx" x="263.667" y="82.3333"/>
-  <object id="45" template="../obj/shop.tx" x="304.667" y="112.667"/>
+  <object id="45" template="../../obj/shop.tx" x="304.667" y="112.667"/>
-  <object id="46" template="../obj/shop.tx" x="343" y="178.667"/>
+  <object id="46" template="../../obj/shop.tx" x="343" y="178.667"/>
-  <object id="47" template="../obj/inn.tx" x="215.333" y="81.3333"/>
+  <object id="47" template="../../obj/inn.tx" x="215.333" y="81.3333"/>
  </objectgroup>
 </map>

forge-gui/res/adventure/common/maps/map/hostiletown/zombietown.tmx

@@ -3,8 +3,8 @@
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="1" source="../../tileset/main.tsx"/>
- <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="60" height="34">
   <data encoding="base64" compression="zlib">
    eJzt1tsJgDAMBdD8SusEres4hO6iewndTYMUfFTUVsHYeyAfgkIuiaVEAAAAAADf05ZEg56rKdfPZ8XvS+OmvjtF1Kv73xr9fD9vsHpfVUTvUvLGZAvJIW9dzMWk5HWZzbdNPFf5fOOSktfvs43s1++03+uv47xmcTbHkjbfVH/PawJ3LAlS8kp0dB/e/stW6DyvCuX9sxzzbgsAACBnI8jCIVI=
@@ -34,41 +34,41 @@
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="416" y="406" width="48" height="16"/>
+  <object id="38" template="../../obj/entry_up.tx" x="416" y="406" width="48" height="16"/>
-  <object id="48" template="../obj/treasure.tx" x="362.5" y="205.25"/>
+  <object id="48" template="../../obj/treasure.tx" x="362.5" y="205.25"/>
-  <object id="49" template="../obj/gold.tx" x="581.5" y="281"/>
+  <object id="49" template="../../obj/gold.tx" x="581.5" y="281"/>
-  <object id="50" template="../obj/gold.tx" x="314" y="315"/>
+  <object id="50" template="../../obj/gold.tx" x="314" y="315"/>
-  <object id="51" template="../obj/enemy.tx" x="317" y="331">
+  <object id="51" template="../../obj/enemy.tx" x="317" y="331">
    <properties>
     <property name="enemy" value="Ghoul"/>
    </properties>
   </object>
-  <object id="52" template="../obj/enemy.tx" x="319.667" y="300.667">
+  <object id="52" template="../../obj/enemy.tx" x="319.667" y="300.667">
    <properties>
     <property name="enemy" value="Zombie"/>
    </properties>
   </object>
-  <object id="53" template="../obj/enemy.tx" x="382.917" y="201.833">
+  <object id="53" template="../../obj/enemy.tx" x="382.917" y="201.833">
    <properties>
     <property name="enemy" value="Ghoul"/>
    </properties>
   </object>
-  <object id="54" template="../obj/enemy.tx" x="548.333" y="276.667">
+  <object id="54" template="../../obj/enemy.tx" x="548.333" y="276.667">
    <properties>
     <property name="enemy" value="Ghoul"/>
    </properties>
   </object>
-  <object id="55" template="../obj/enemy.tx" x="579.333" y="238.333">
+  <object id="55" template="../../obj/enemy.tx" x="579.333" y="238.333">
    <properties>
     <property name="enemy" value="Big Zombie"/>
    </properties>
   </object>
-  <object id="56" template="../obj/enemy.tx" x="432.333" y="352.333">
+  <object id="56" template="../../obj/enemy.tx" x="432.333" y="352.333">
    <properties>
     <property name="enemy" value="Ghoul"/>
    </properties>
   </object>
-  <object id="57" template="../obj/enemy.tx" x="464.5" y="293">
+  <object id="57" template="../../obj/enemy.tx" x="464.5" y="293">
    <properties>
     <property name="enemy" value="Ghoul"/>
    </properties>

forge-gui/res/cardsfolder/upcoming/horn_of_the_mark.txt

@@ -0,0 +1,7 @@
+Name:Horn of the Mark
+ManaCost:2
+Types:Legendary Artifact
+T:Mode$ AttackersDeclaredOneTarget | Execute$ TrigReveal | AttackedTarget$ Player | ValidAttackers$ Creature.YouCtrl | ValidAttackersAmount$ GE2 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever two or more creatures you control attack a player, look at the top five cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigReveal:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature | ForceRevealToController$ True | DestinationZone$ Hand | RestRandomOrder$ True 
+SVar:PlayMain1:TRUE
+Oracle:Whenever two or more creatures you control attack a player, look at the top five cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.

forge-gui/res/cardsfolder/upcoming/landroval_horizon_witness.txt

@@ -0,0 +1,9 @@
+Name:Landroval, Horizon Witness
+ManaCost:4 W
+Types:Legendary Creature Bird Noble
+PT:3/4
+K:Flying
+T:Mode$ AttackersDeclaredOneTarget | Execute$ TrigPump | AttackedTarget$ Player | ValidAttackers$ Creature.YouCtrl | ValidAttackersAmount$ GE2 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever two or more creatures you control attack a player, target attacking creature without flying gains flying until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | KW$ Flying
+SVar:PlayMain1:TRUE
+Oracle:Flying\nWhenever two or more creatures you control attack a player, target attacking creature without flying gains flying until end of turn.

forge-gui/res/cardsfolder/upcoming/sail_into_the_west.txt

@@ -0,0 +1,13 @@
+Name:Sail into the West
+ManaCost:2 G U
+Types:Instant
+A:SP$ Vote | Defined$ Player | VoteType$ Return,Embark | VoteReturn$ DBChangeZone | VoteEmbark$ DBWheel | Tied$ DBWheel | SpellDescription$ Will of the council — Starting with you, each player votes for return or embark. If return gets more votes, each player returns up to two cards from their graveyard to their hand, then you exile CARDNAME. If embark gets more votes or the vote is tied, each player may discard their hand and draw seven cards.
+SVar:DBChangeZone:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBChangeZoneAll | SpellDescription$ If return gets more votes, each player returns up to two cards from their graveyard to their hand, then you exile CARDNAME.
+SVar:DBChoose:DB$ ChooseCard | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Graveyard | Defined$ Player.IsRemembered | MinAmount$ 0 | Amount$ 2 | ChoiceTitle$ Select up to two cards from your graveyard | RememberChosen$ True
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True | SubAbility$ ExileSelf
+SVar:ExileSelf:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
+SVar:DBWheel:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDraw | SpellDescription$ If embark gets more votes or the vote is tied, each player may discard their hand and draw seven cards.
+SVar:DBDraw:DB$ Draw | UnlessCost$ Discard<1/Hand> | UnlessPayer$ Remembered | UnlessSwitched$ True | Defined$ Remembered | NumCards$ 7
+DeckHas:Ability$Discard|Graveyard
+Oracle:Will of the council — Starting with you, each player votes for return or embark. If return gets more votes, each player returns up to two cards from their graveyard to their hand, then you exile Sail into the West. If embark gets more votes or the vote is tied, each player may discard their hand and draw seven cards.

forge-gui/res/cardsfolder/upcoming/taunting_sliver.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Sliver
 PT:3/3
 S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ ETBTrig | Description$ Sliver creatures you control have "When this creature enters the battlefield, goad target creature an opponent controls." (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)
-SVar:ETBTrig:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Sliver.Self | TriggerZones$ Battlefield | Execute$ TrigGoad | TriggerDescription$ When this creature enters the battlefield, goad target creature an opponent controls." (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)
+SVar:ETBTrig:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Sliver.Self | TriggerZones$ Battlefield | Execute$ TrigGoad | TriggerDescription$ When this creature enters the battlefield, goad target creature an opponent controls. (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)
 SVar:TrigGoad:DB$ Goad | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Target creature an opponent controls
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Sliver