diff --git a/ag/include/array.php b/ag/include/array.php
index f09fbad..c923c21 100644
--- a/ag/include/array.php
+++ b/ag/include/array.php
@@ -29,57 +29,6 @@ $kampf_lose2 = 1;		//////// MP Wegmachen
 $kampf_majin = 1;		/////// Jemnand als majin machen.
 $kampf_tausch2 = 3;	/////// Attacke Kopieren.
 
-
-$rassen_werte = array(
-"Mensch",  		///0
-"Saiyajin", 		///1
-"Dämon",  		///2
-"Mutant", 		///3
-"Cyborg",  		///4
-"Namekianer",		///5
-"Pirat", 		///6
-"Shichibukai", 		///7
-"Kaioshin", 		///8
-"Schwertkämpfer", 	///9
-"Grandline Maschine", 	///10
-"01", 			///11
-"Leaf Dorf", 	///12
-"Sand Dorf", 	///13
-"Sound Dorf" 	///14
-);
-
-#############################
-
-if($char_1[rasse] == "$rassen_werte[0]") { $sup_rasse = 1; }
-else if($char_1[rasse] == "$rassen_werte[1]") { $sup_rasse = 2; }
-else if($char_1[rasse] == "$rassen_werte[2]") { $sup_rasse = 3; }
-else if($char_1[rasse] == "$rassen_werte[3]") { $sup_rasse = 4; }
-else if($char_1[rasse] == "$rassen_werte[4]") { $sup_rasse = 5; }
-else if($char_1[rasse] == "$rassen_werte[5]") { $sup_rasse = 6; }
-else if($char_1[rasse] == "$rassen_werte[6]") { $sup_rasse = 7; }
-else if($char_1[rasse] == "$rassen_werte[7]") { $sup_rasse = 8; }
-else if($char_1[rasse] == "$rassen_werte[8]") { $sup_rasse = 9; }
-else if($char_1[rasse] == "$rassen_werte[9]") { $sup_rasse = 10; }
-else if($char_1[rasse] == "$rassen_werte[10]") { $sup_rasse = 11; }
-else if($char_1[rasse] == "$rassen_werte[12]") { $sup_rasse = 13; }
-else if($char_1[rasse] == "$rassen_werte[13]") { $sup_rasse = 14; }
-else if($char_1[rasse] == "$rassen_werte[14]") { $sup_rasse = 15; }
-else{ $sup_rasse = 16; }
-############################# FUSION
-
-if($char_1[fusion_rasse] == "$rassen_werte[0]") { $sup_rasse1 = 1; }
-else if($char_1[fusion_rasse] == "$rassen_werte[1]") { $sup_rasse1 = 2; }
-else if($char_1[fusion_rasse] == "$rassen_werte[2]") { $sup_rasse1 = 3; }
-else if($char_1[fusion_rasse] == "$rassen_werte[3]") { $sup_rasse1 = 4; }
-else if($char_1[fusion_rasse] == "$rassen_werte[4]") { $sup_rasse1 = 5; }
-else if($char_1[fusion_rasse] == "$rassen_werte[5]") { $sup_rasse1 = 6; }
-else if($char_1[fusion_rasse] == "$rassen_werte[6]") { $sup_rasse1 = 7; }
-else if($char_1[fusion_rasse] == "$rassen_werte[7]") { $sup_rasse1 = 8; }
-else if($char_1[fusion_rasse] == "$rassen_werte[8]") { $sup_rasse1 = 9; }
-else if($char_1[fusion_rasse] == "$rassen_werte[9]") { $sup_rasse1 = 10; }
-else if($char_1[fusion_rasse] == "$rassen_werte[10]") { $sup_rasse1 = 11; }
-else{ $sup_rasse1 = 16; }
-
 ########Energie Anzeige
 $k3 = $hp1[1] / 100;
 if($hp1[0]  <= $k3 * 99.9) { $energie = 90; }
@@ -97,4 +46,4 @@ if($hp1[0] == $hp1[1]) { $energie = 100; }
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/ag/info/attacken.php b/ag/info/attacken.php
index eb9407b..d8ea1fa 100644
--- a/ag/info/attacken.php
+++ b/ag/info/attacken.php
@@ -80,25 +80,24 @@ function showAttDetails($at_id) {
 	<?php
 	
 		$rassen_1 = explode(",", $at_info['rassen']);
-		$runde = 0;
-		include (ROOT_PATH . '//include/array.php');
-	
-		while ($runde +1 < count($rassen_1)) {
-	
-			$runden = $runde +1;
-			$rassen_na = $rassen_1[$runde] - 1;
-			$rassen_name = $rassen_werte[$rassen_na];
+		$npc_type = getRaceTypeName('NPC'); // do not remove npc (there is a separate setting for this)
+
+		for($runden = 1; $runden <= count($rassen_1); $runden++) {
+			$rasse = getRaceById($runden);
+			if($rasse['type'] == $npc_type['id']){
+				continue;
+			}
+			$rassen_name = $rasse['name'];
 	?>
 	
 	    <tr>
 	      <td width="158" height="25">
-	      <p align="center"><b>Rassen <?php echo $runden; ?></b></td>
+	      <p align="center"><b>Rassen</b></td>
 	      <td width="340" height="25">&nbsp;<?php echo $rassen_name; ?></td>
 	    </tr>
 	
 	<?php
 	
-			$runde++;
 		}
 		$x = 0;
 		$req_x = 0;