diff --git a/data/cbow.bin b/data/cbow.bin index 144976b..e2ea366 100644 Binary files a/data/cbow.bin and b/data/cbow.bin differ diff --git a/data/cbow.txt b/data/cbow.txt index cc6e145..2b26064 100644 --- a/data/cbow.txt +++ b/data/cbow.txt @@ -2540,7 +2540,7 @@ _BSIDE_ (A) (^) (WW) (BB) (instant) fuse \ creatures you control gain deathtouch (A) (^) (^) (BB) (BB) (sorcery) choose a color . target player reveals his or her hand and discards all cards of that color . -(Y) (^) (^) (^) (RR) (GG) (legendary) (creature) hellion (&/) (/&) devour X \ where X is the number of creatures devoured this way +(Y) (^) (^) (^) (RR) (GG) (legendary) (creature) hellion (&/) (/&) devour X , where X is the number of creatures devoured this way (A) (^) (GG) (GG) (sorcery) put a &^^^/ /&^^^ green beast creature token onto the battlefield . then if an opponent controls more creatures than you , return @ to its owner's hand . @@ -14104,7 +14104,7 @@ _BSIDE_ (Y) (planeswalker) chandra ((&^^^^)) +&^ : @ deals &^^ damage to target (O) (^) (UU) (instant) return target nonland permanent to its owner's hand . -(N) (XX) (XX) (UU) (sorcery) x target creatures gain islandwalk until end of turn . +(N) (XX) (XX) (UU) (sorcery) X target creatures gain islandwalk until end of turn . (A) (^) (^) (^) (^) (^) (WW) (WW) (creature) avatar (&^^^^/) (/&^^^^^^^) vigilance \ when @ enters the battlefield , for each opponent , exile up to one target creature that player controls and that player gains life equal to its power . @@ -23642,7 +23642,7 @@ _BSIDE_ (N) (creature) werewolf (&^^^^^/) (/&^^^^^) @ attacks each turn if able (O) (^) (GG) (creature) elf (&^^/) (/&^) T : untap target creature . -(O) (XX) (RR) (sorcery) x target creatures can't block this turn . +(O) (XX) (RR) (sorcery) X target creatures can't block this turn . (O) (^) (^) (^) (WW) (instant) put any number of target artifact cards from your graveyard on top of your library . \ draw a card . @@ -25272,7 +25272,7 @@ _BSIDE_ (A) (^) (^) (^) (UU) (RR) (instant) put a &^^^/ /&^ red elemental creatu (O) (^) (BB) (sorcery) target player reveals his or her hand . you choose a nonland card from it . that player puts that card into his or her library third from the top . -(O) (XX) (GG) (instant) cast @ only during the declare blockers step . \ x target attacking creatures become blocked . @ deals &^ damage to each of those creatures . +(O) (XX) (GG) (instant) cast @ only during the declare blockers step . \ X target attacking creatures become blocked . @ deals &^ damage to each of those creatures . (O) (^) (^) (^) (^) (artifact) (creature) horse (&^^/) (/&^^) metalcraft ~ @ gets +&^^/ /+&^^ as long as you control three or more artifacts . @@ -26638,7 +26638,7 @@ _BSIDE_ (N) (^) (RR) (instant) fuse \ @ deals &^^ damage to target creature or p (O) (GG) (creature) elf druid (&^/) (/&^) morph GG \ tap two untapped elves you control : add one mana of any color to your mana pool . -(N) (XX) (RR) (instant) x target blocked creatures assign their combat damage this turn as though they weren't blocked . +(N) (XX) (RR) (instant) X target blocked creatures assign their combat damage this turn as though they weren't blocked . (O) (^) (^) (RR) (creature) goblin shaman (&^/) (/&^) whenever @ becomes tapped , it deals &^ damage to target creature or player . diff --git a/data/output.txt b/data/output.txt index 67792a1..14819b7 100644 --- a/data/output.txt +++ b/data/output.txt @@ -2536,7 +2536,7 @@ |5sorcery|4|6|7|8|9choose a color. target player reveals his or her hand and discards all cards of that color.|3{^^BBBB}|0A|1persecute| -|5creature|4legendary|6hellion|7|8&/&|9devour X\where X is the number of creatures devoured this way|3{^^^RRGG}|0Y|1thromok the insatiable| +|5creature|4legendary|6hellion|7|8&/&|9devour X, where X is the number of creatures devoured this way|3{^^^RRGG}|0Y|1thromok the insatiable| |5sorcery|4|6|7|8|9put a &^^^/&^^^ green beast creature token onto the battlefield. then if an opponent controls more creatures than you, return @ to its owner's hand.|3{^GGGG}|0A|1pulse of the tangle| @@ -14064,7 +14064,7 @@ |5instant|4|6|7|8|9return target nonland permanent to its owner's hand.|3{^UU}|0O|1disperse| -|5sorcery|4|6|7|8|9x target creatures gain islandwalk until end of turn.|3{XXXXUU}|0N|1part water| +|5sorcery|4|6|7|8|9X target creatures gain islandwalk until end of turn.|3{XXXXUU}|0N|1part water| |5creature|4|6avatar|7|8&^^^^/&^^^^^^^|9vigilance\when @ enters the battlefield, for each opponent, exile up to one target creature that player controls and that player gains life equal to its power.|3{^^^^^WWWW}|0A|1luminate primordial| @@ -23569,7 +23569,7 @@ |5creature|4|6elf|7|8&^^/&^|9T: untap target creature.|3{^GG}|0O|1seeker of skybreak| -|5sorcery|4|6|7|8|9x target creatures can't block this turn.|3{XXRR}|0O|1wave of indifference| +|5sorcery|4|6|7|8|9X target creatures can't block this turn.|3{XXRR}|0O|1wave of indifference| |5instant|4|6|7|8|9put any number of target artifact cards from your graveyard on top of your library.\draw a card.|3{^^^WW}|0O|1frantic salvage| @@ -25190,7 +25190,7 @@ |5sorcery|4|6|7|8|9target player reveals his or her hand. you choose a nonland card from it. that player puts that card into his or her library third from the top.|3{^BB}|0O|1lost hours| -|5instant|4|6|7|8|9cast @ only during the declare blockers step.\x target attacking creatures become blocked. @ deals &^ damage to each of those creatures.|3{XXGG}|0O|1choking vines| +|5instant|4|6|7|8|9cast @ only during the declare blockers step.\X target attacking creatures become blocked. @ deals &^ damage to each of those creatures.|3{XXGG}|0O|1choking vines| |5artifact creature|4|6horse|7|8&^^/&^^|9metalcraft ~ @ gets +&^^/+&^^ as long as you control three or more artifacts.|3{^^^^}|0O|1chrome steed| @@ -26552,7 +26552,7 @@ |5creature|4|6elf druid|7|8&^/&^|9morph {GG}\tap two untapped elves you control: add one mana of any color to your mana pool.|3{GG}|0O|1birchlore rangers| -|5instant|4|6|7|8|9x target blocked creatures assign their combat damage this turn as though they weren't blocked.|3{XXRR}|0N|1outmaneuver| +|5instant|4|6|7|8|9X target blocked creatures assign their combat damage this turn as though they weren't blocked.|3{XXRR}|0N|1outmaneuver| |5creature|4|6goblin shaman|7|8&^/&^|9whenever @ becomes tapped, it deals &^ damage to target creature or player.|3{^^RR}|0O|1goblin medics| diff --git a/lib/transforms.py b/lib/transforms.py index 319955c..7517f96 100644 --- a/lib/transforms.py +++ b/lib/transforms.py @@ -134,6 +134,8 @@ def text_pass_4b_x(s): s = s.replace('x.', x_marker + '.') s = s.replace('x,', x_marker + ',') s = s.replace('x/x', x_marker + '/' + x_marker) + s = s.replace('x target', x_marker + ' target') + s = s.replace('si' + x_marker + ' target', 'six target') return s @@ -425,8 +427,9 @@ def text_pass_11_linetrans(s): for line in lines: if not '.' in line: # because this is inconsistent - line = line.replace(';', ',') - sublines = line.split(',') + line = line.replace(',', ';') + line = line.replace('; where', ', where') # Thromok the Insatiable + sublines = line.split(';') for subline in sublines: if 'equip' in subline or 'enchant' in subline: prelines += [subline.strip()]