ADD: Rest of the SP NPCs

gamedata/cache/clubskills_1.php

@@ -2315,7 +2315,7 @@ $cskills = Array
 		优秀的尸源有概率为武器附加<span class="yellow">冲击</span>与<span class="yellow">精英</span>属性',
 		'vars' => Array(
 			'ragecost' => 100, 
-			'limit' => 2000,
+			'limit' => 117007,
 			'notype' => Array(88,92),//不能用来抡的NPC
 		),
 	),

include/game/item.func.php

@@ -2918,23 +2918,53 @@ function itemuse($itmn,&$data=NULL) {
 				$itme = $itms = 0;
 			}
 		} elseif ($itm == '✦【自律AI呼唤器】') {
-			//Call in 20 type 93 NPCs, 5 each. 
+			//Call in 30 type 93 NPCs, 6 each. 
 			//get player's 1st Yume value - different value results in different NPC.
-			//There are 2 sets for now - TODO: Add more set.
+			//There are 5 sets - K, C, G, P, D.
 			include_once GAME_ROOT . './include/system.func.php';
 			$log .= '你将这根权杖一般的钥匙狠狠插在了地面上，<br>很快，大批NPC就从空中降落到了战场上！<br>';
-			if ($clbpara['randver1'] < 64){
-				// 1st set
-				addnpc ( 93,0,5);
-				addnpc ( 93,1,5);
-				addnpc ( 93,2,5);
-				addnpc ( 93,3,5);
+			if ($clbpara['randver1'] < 21){
+				// 1st set - WK High School Oni Girls
+				addnpc ( 93,0,6);
+				addnpc ( 93,1,6);
+				addnpc ( 93,2,6);
+				addnpc ( 93,3,6);
+				addnpc ( 93,4,6);
+			}elseif ($clbpara['randver1'] < 42){
+				// 2nd set - WC Idol Magical Girls
+				addnpc ( 93,5,6);
+				addnpc ( 93,6,6);
+				addnpc ( 93,7,6);
+				addnpc ( 93,8,6);
+				addnpc ( 93,9,6);
+			}elseif ($clbpara['randver1'] < 63){
+				// 3rd set - WG Small Mascots
+				addnpc ( 93,10,6);
+				addnpc ( 93,11,6);
+				addnpc ( 93,12,6);
+				addnpc ( 93,13,6);
+				addnpc ( 93,14,6);
+			}elseif ($clbpara['randver1'] < 84){
+				// 4th set - WD Maids
+				addnpc ( 93,15,6);
+				addnpc ( 93,16,6);
+				addnpc ( 93,17,6);
+				addnpc ( 93,18,6);
+				addnpc ( 93,19,6);
+			}elseif ($clbpara['randver1'] < 105){
+				// 5th set - WP Yandere Experiments
+				addnpc ( 93,20,6);
+				addnpc ( 93,21,6);
+				addnpc ( 93,22,6);
+				addnpc ( 93,23,6);
+				addnpc ( 93,24,6);
 			}else{
-				// 2nd set
-				addnpc ( 93,4,5);
+				// Critial Success!
+				addnpc ( 93,22,5);
+				addnpc ( 93,3,5);
+				addnpc ( 93,11,5);
 				addnpc ( 93,5,5);
-				addnpc ( 93,6,5);
-				addnpc ( 93,7,5);
+				addnpc ( 93,19,5);
 			}
 			//This is considered a troll move - we don't announce it in game newsinfo - however--!
 			$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('0','$now','$name','','「神奇AI们，快过来！」')");
@@ -2944,7 +2974,7 @@ function itemuse($itmn,&$data=NULL) {
 			$log .= '突然你感到全身一寒，<br>你感觉罪恶感爬上了你的脊梁！<br>';
 			$rp += diceroll(1555);
 			$moralcheck = diceroll(6);
-			if ($moralcheck > 4){
+			if ($moralcheck > 4 || $rp < 1000){
 				$log .= '罪恶感让你不禁呕吐起来。<br>你感觉头晕目眩。<br>';
 				$mhp = round($mhp / 1.33);
 				$msp = round($msp / 1.22);

include/game/revclubskills_extra.func.php

@@ -681,8 +681,11 @@
 			$log .= "你干脆利落地把<span class='red'>{$edata['name']}</span>从地上拽了起来！然后卯足力气，在空中挥舞了两下。<br>……<br>";
 			$pdata['itm0'] = "{$edata['name']}尸体模样的棍棒";
 			$pdata['itmk0'] = 'WP'; 
+			// Bugfix 240110
 			$pdata['itme0'] = round($edata['msp']); 
+			if ($pdata['itme0'] > 117007){ $pdata['itme0'] = 117007;}
 			$pdata['itms0'] = round($edata['mhp']); 
+			if ($pdata['itms0'] > 117007){ $pdata['itms0'] = 117007;}
 			$pdata['itmsk0'] = '';
 			$dice = diceroll(99);
 			$N_obbs = pow($edata['lvl'],1.3);