diff --git a/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java new file mode 100644 index 0000000000..8cecef8d1d --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2012/AmphinCutthroat.java @@ -0,0 +1,61 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.magic2012; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.cards.CardImpl; + +/** + * + * @author North + */ +public class AmphinCutthroat extends CardImpl { + + public AmphinCutthroat(UUID ownerId) { + super(ownerId, 43, "Amphin Cutthroat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); + this.expansionSetCode = "M12"; + this.subtype.add("Salamander"); + this.subtype.add("Rogue"); + + this.color.setBlue(true); + this.power = new MageInt(2); + this.toughness = new MageInt(4); + } + + public AmphinCutthroat(final AmphinCutthroat card) { + super(card); + } + + @Override + public AmphinCutthroat copy() { + return new AmphinCutthroat(this); + } +} diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index d0ab61ee7f..2aca6e7129 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -6,6 +6,13 @@ use Text::Template; use Data::Dumper; use strict; +sub getClassName { + my $string = $_[0]; + $string =~ s/\b(\w+)\b/ucfirst($1)/ge; + $string =~ s/[-,\s\']//g; + $string; +} + my $datafile = "mtg-cards-data.txt"; my @sets; @@ -326,8 +333,7 @@ print "card fetched\n"; my $template = Text::Template->new(SOURCE => 'cardclass.tmpl', DELIMITERS => [ '[=', '=]' ]); my %vars; $vars{'name'} = $cardname; -$cardname =~ s/[-,\s\']//g; -$vars{'classname'} = $cardname; +$vars{'classname'} = getClassName($cardname); $parser->parse($mech->content()); diff --git a/Utils/gen-existing-cards-by-set.pl b/Utils/gen-existing-cards-by-set.pl index 77da37274b..9044fde139 100644 --- a/Utils/gen-existing-cards-by-set.pl +++ b/Utils/gen-existing-cards-by-set.pl @@ -21,13 +21,7 @@ my $template = Text::Template->new(SOURCE => 'cardExtendedClass.tmpl', DELIMITER sub getClassName { my $string = $_[0]; $string =~ s/\b(\w+)\b/ucfirst($1)/ge; - $string =~ s/[, ]//g; - $string; -} - -sub getOldClassName { - my $string = $_[0]; - $string =~ s/[, ]//g; + $string =~ s/[-,\s\']//g; $string; } @@ -90,10 +84,9 @@ foreach my $cardName (@setCards) { } if($found eq 1) { - #print $vars{'set'} . "|" . $vars{'baseSet'} . "|" . $vars{'className'} . "|" . $vars{'baseClassName'} . "|" . $vars{'expansionSetCode'} . "\n"; my $result = $template->fill_in(HASH => \%vars); if (defined($result)) { - #print $result; + print $vars{'set'} . "." . $vars{'className'} . "\n"; open CARD, "> $currentFileName"; print CARD $result; close CARD;