From 5f5bcc35ad40c6c04f2f51cb626b478799dda273 Mon Sep 17 00:00:00 2001 From: tehdiplomat Date: Sat, 29 Sep 2018 14:06:29 -0400 Subject: [PATCH] Fix migrateupcoming script and remove scripted reprints --- forge-gui/res/cardsfolder/upcoming/hitchclaw_recluse.txt | 6 ------ forge-gui/res/cardsfolder/upcoming/ironshell_beetle.txt | 7 ------- forge-gui/res/cardsfolder/upcoming/might_of_the_masses.txt | 6 ------ forge-gui/tools/migrateUpcoming.py | 2 +- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 forge-gui/res/cardsfolder/upcoming/hitchclaw_recluse.txt delete mode 100644 forge-gui/res/cardsfolder/upcoming/ironshell_beetle.txt delete mode 100644 forge-gui/res/cardsfolder/upcoming/might_of_the_masses.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hitchclaw_recluse.txt b/forge-gui/res/cardsfolder/upcoming/hitchclaw_recluse.txt deleted file mode 100644 index 96575340242..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/hitchclaw_recluse.txt +++ /dev/null @@ -1,6 +0,0 @@ -Name:Hitchclaw Recluse -ManaCost:2 G -Types:Creature Spider -PT:1/4 -K:Reach -Oracle:Reach (This creature can block creatures with flying.) diff --git a/forge-gui/res/cardsfolder/upcoming/ironshell_beetle.txt b/forge-gui/res/cardsfolder/upcoming/ironshell_beetle.txt deleted file mode 100644 index 61ddcf70609..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/ironshell_beetle.txt +++ /dev/null @@ -1,7 +0,0 @@ -Name:Ironshell Beetle -ManaCost:1 G -Types:Creature Insect -PT:1/1 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature. -SVar:TrigPut:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 -Oracle:When Ironshell Beetle enters the battlefield, put a +1/+1 counter on target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/might_of_the_masses.txt b/forge-gui/res/cardsfolder/upcoming/might_of_the_masses.txt deleted file mode 100644 index 055663bcfc4..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/might_of_the_masses.txt +++ /dev/null @@ -1,6 +0,0 @@ -Name:Might of the Masses -ManaCost:G -Types:Instant -A:SP$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ Target creature gets +1/+1 until end of turn for each creature you control. -SVar:X:Count$TypeYouCtrl.Creature -Oracle:Target creature gets +1/+1 until end of turn for each creature you control. diff --git a/forge-gui/tools/migrateUpcoming.py b/forge-gui/tools/migrateUpcoming.py index 9303b7a2544..27eee53eb3b 100644 --- a/forge-gui/tools/migrateUpcoming.py +++ b/forge-gui/tools/migrateUpcoming.py @@ -12,6 +12,6 @@ for dirName, subdirList, fileList in os.walk(upcoming): newFile = os.path.join(cardsfolder, filename[0], filename) if os.path.exists(newFile): - subprocess.call('git rm %s' % (newFile), shell=True) + subprocess.call('git rm %s' % (curLocation), shell=True) else: subprocess.call('git mv %s %s' % (curLocation, newFile), shell=True) \ No newline at end of file