changeset 5:e91d6f908222 boosterpack

[svn r7] finished!
author robert
date Tue, 08 Sep 2009 06:55:23 -0400
parents 90181bbf7a0c
children 4246c7ef6487
files CARD.perl PokeScrape.pl images/GymChallenge/Thumbs.db index.html index.pl rlm/booster.prefs style.css
diffstat 7 files changed, 44 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
     1.1 Binary file CARD.perl has changed
     2.1 --- a/PokeScrape.pl	Tue Sep 08 06:05:47 2009 -0400
     2.2 +++ b/PokeScrape.pl	Tue Sep 08 06:55:23 2009 -0400
     2.3 @@ -45,16 +45,23 @@
     2.4  	{
     2.5  		print $numTag," ",$nameTag;
     2.6  		$tempCard = Card->new();
     2.7 +		
     2.8 +		if (($nameTag =~ m/Fighting Energy/)or ($nameTag =~ m/Fire Energy/)or ($nameTag =~ m/Grass Energy/)or ($nameTag =~ m/Lightning Energy/)or ($nameTag =~ m/Psychic Energy/)or ($nameTag =~ m/Water Ener/))
     2.9 +		{$rarityTag = "None";print "FAIL::";}
    2.10 +		
    2.11 +		
    2.12 +		
    2.13  		$tempCard->addTags($typeTag,$numTag,$nameTag,$setTag,$rarityTag);
    2.14  		
    2.15 -		if ($setTag eq "Base Set"){for $t(@Base){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.16 -		if ($setTag eq "Jungle"){for $t(@Jungle){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.17 -		if ($setTag eq "Team Rocket"){for $t(@Rocket){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.18 -		if ($setTag eq "Fossil"){for $t(@Fossil){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.19 -		if ($setTag eq "Gym Challenge"){for $t(@GymChallenge){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.20 -		if ($setTag eq "Gym Heroes"){for $t(@GymHeroes){if ($t =~ m/$numTag/){ $tempCard->setPix($t);}}}
    2.21 +		
    2.22 +		if ($setTag eq "Base Set"){for $t(@Base){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.23 +		if ($setTag eq "Jungle"){for $t(@Jungle){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.24 +		if ($setTag eq "Team Rocket"){for $t(@Rocket){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.25 +		if ($setTag eq "Fossil"){for $t(@Fossil){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.26 +		if ($setTag eq "Gym Challenge"){for $t(@GymChallenge){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.27 +		if ($setTag eq "Gym Heroes"){for $t(@GymHeroes){if ($t =~ m/\D$numTag\D/){ $tempCard->setPix($t);}}}
    2.28  			
    2.29 -			
    2.30 +		if ($tempCard->getPix()=~ m/132_Water_Energy/){print "##################AHHHHHHHHHHHHHHHHHHHHHH";}	
    2.31  		
    2.32  		
    2.33  		
    2.34 @@ -304,6 +311,7 @@
    2.35  images/GymChallenge/30_Sabrinas_Golduck.jpg
    2.36  images/GymChallenge/31_Blaines_Charmeleon.jpg
    2.37  images/GymChallenge/33_Blaines_Rapidash.jpg
    2.38 +images/GymChallenge/32_Blaines_Dodrio.jpg
    2.39  images/GymChallenge/34_Brocks_Graveler.jpg
    2.40  images/GymChallenge/35_Brocks_Primape.jpg
    2.41  images/GymChallenge/36_Brocks_Sandslash.jpg
     3.1 Binary file images/GymChallenge/Thumbs.db has changed
     4.1 --- a/index.html	Tue Sep 08 06:05:47 2009 -0400
     4.2 +++ b/index.html	Tue Sep 08 06:55:23 2009 -0400
     4.3 @@ -1,37 +1,34 @@
     4.4  <html>
     4.5  <head>
     4.6 -<title>
     4.7 -Pokèmon Booster Pack Generator
     4.8 -</title>
     4.9 +<title>Pokèmon Booster Pack Generator</title>
    4.10  <link href="./style.css" rel="stylesheet" type="text/css">
    4.11  </head>
    4.12  
    4.13  <body>
    4.14 -
    4.15  <div id="header">
    4.16 -
    4.17  	<h1>Pokèmon Draft Battle!!</h1>
    4.18 -	
    4.19 -	<form id="radiobuttons" onclick="change_rules(['radio1'], ['result'] );">
    4.20 +		
    4.21 +	<form id="radiobuttons">
    4.22  		<h3>Pick a Set:&nbsp;</h3>
    4.23 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Base Set"><a href="#">Base Set</a>
    4.24 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Jungle"><a href="#">Jungle</a>
    4.25 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Fossil"><a href="#">Fossil</a>
    4.26 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Team Rocket"><a href="#">Team Rocket</a>
    4.27 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Gym Challenge"><a href="#">Gym Challenge </a>
    4.28 -		<input TYPE="radio" ID="radio1" NAME="radio1" VALUE="Gym Heroes"><a href="#">Gym Heroes</a>
    4.29 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Base Set" checked="checked"><a href="#">Base Set</a>
    4.30 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Jungle"><a href="#">Jungle</a>
    4.31 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Fossil"><a href="#">Fossil</a>
    4.32 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Team Rocket"><a href="#">Team Rocket</a>
    4.33 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Gym Heroes"><a href="#">Gym Heroes </a>
    4.34 +		<input TYPE="radio" onclick="change_rules(['radio1'], ['result'] );" ID="radio1" NAME="radio1" VALUE="Gym Challenge"><a href="#">Gym Challenge </a>
    4.35  		
    4.36  		<input type="button" id="b2" value="Generate Booster Pack &raquo;" onclick="gen_pack(['NO_CACHE'], ['out1']);">
    4.37  	</form>
    4.38 -	
    4.39  </div>
    4.40  
    4.41  <div id="out1"></div>
    4.42 -
    4.43  <div id="footer">
    4.44  	<h3>Current Settings:</h3>
    4.45 -	<div id="result">There are no Current Settings</div>
    4.46 +	<div id="result">These are no current settings</div>
    4.47  </div>
    4.48  
    4.49 +
    4.50 +
    4.51 +
    4.52  </body>
    4.53  </html>
    4.54 \ No newline at end of file
     5.1 --- a/index.pl	Tue Sep 08 06:05:47 2009 -0400
     5.2 +++ b/index.pl	Tue Sep 08 06:55:23 2009 -0400
     5.3 @@ -93,6 +93,13 @@
     5.4  	my $unum = $mapRules{"Uncommon"};
     5.5  	my $cnum = $mapRules{"Common"};
     5.6  	
     5.7 +	
     5.8 +	##########3
     5.9 +	#my $rnum = 500;
    5.10 +	#my $unum      =500;
    5.11 +	#my $cnum = 500;
    5.12 +	#;
    5.13 +	##############
    5.14  	for $crd(@reduced)
    5.15  	{
    5.16  		if (($crd -> hasTags("Rare") or $crd -> hasTags("Rare Holo"))and  ($rnum>0)){push @r_list, $crd;  $rnum--;}
     6.1 Binary file rlm/booster.prefs has changed
     7.1 --- a/style.css	Tue Sep 08 06:05:47 2009 -0400
     7.2 +++ b/style.css	Tue Sep 08 06:55:23 2009 -0400
     7.3 @@ -34,13 +34,21 @@
     7.4  	display:block;
     7.5  	overflow-y:auto;
     7.6  	overflow-x:hidden;
     7.7 +	text-align:center;
     7.8 +	vertical-align:middle;
     7.9 +	padding-top:16px;
    7.10 +}
    7.11 +
    7.12 +#out1 img {
    7.13 +	padding:2px;
    7.14 +	width:18%;
    7.15  }
    7.16  
    7.17  
    7.18  /* UI */
    7.19  #radiobuttons{display:inline;}
    7.20  #radiobuttons a{text-decoration:none;color:#000;font-size:14px;margin-left:2px;margin-right:.6em;}
    7.21 -#b2{display:none;}
    7.22 +#b2{font-size:15px;padding:4px 2px;margin-left:4px;margin-top:-4px;}
    7.23  
    7.24  
    7.25