Merge branch 'amarillonmc:nachster' into nachster

2a281768 · winddramon · GitHub · 3061a01c · aeaf8372 · 2a281768
Commit 2a281768 authored Aug 07, 2023 by winddramon Committed by GitHub Aug 07, 2023
41 changed files
--- a/api.php
+++ b/api.php
@@ -27,6 +27,12 @@
        "key" => "cstick",
        "title" => "抡起尸体！"
      );
+    }
+	if ($pickpocket_flag) {
+      $list[] = array(
+        "key" => "pickpocket",
+        "title" => "置入物品"
+      );
    }
    if ($loot_depot_flag) {
      $list[] = array(
@@ -282,6 +288,21 @@
          'now' => $clubinfo[$nchoice],
          'list' => $list,
        );
+      }
+	  // 驱血
+	  if ($skid === 'c21_creation') {
+        $para = get_clbpara($uidata['clbpara']);
+        $nchoice = $para['skillpara']['c21_creation']['choice'];
+        foreach ($cskills['c21_creation']['choice'] as $item) {
+          $list[] = array(
+            'id' => $item,
+            'title' => $itemspkinfo[$item],
+          );
+        }
+        $new_array['specialData'] = array(
+          'now' => $itemspkinfo[$nchoice],
+          'list' => $list,
+        );
      }
      //将新的数组添加到空数组中，以$skid为键
      $array[] = $new_array;
@@ -424,6 +445,29 @@
    }
    return $sameitem;
  }
+  /** 获取攻击方式 */
+  function getAttackType() {
+    global $pdata, $attinfo, $nosta;
+    $w1 = substr($pdata['wepk'], 1, 1);
+    $w2 = substr($pdata['wepk'], 2, 1);
+    if (empty($w2) || is_numeric($w2)) {
+      $w2 = '';
+    }
+    if (($w1 == 'G' || $w1 == 'J') && ($pdata['weps'] == $nosta)) {
+      $w1 = 'P';
+    }
+    $type['type1'] = array(
+      'id' => $w1,
+      'name' => $attinfo[$w1],
+    );
+    if ($w2) {
+      $type['type2'] = array(
+        'id' => $w2,
+        'name' => $attinfo[$w2],
+      );
+    }
+    return $type;
+  }
  echo (json_encode(array(
    "page" => "game",
    /** 玩家状态 */
@@ -537,7 +581,7 @@
      /** 击杀数 */
      "killNum" => $killnum,
      /** 负面状态 */
-      "debuff" => $inf ? $inf : ['无'],
+      "debuff" => $inf,
      "debuffList" => $infinfo,
      /** 装备 */
      "equipment" => array(
@@ -678,18 +722,7 @@
        "isHack" => $hack,
      ),
      /** 攻击方式 */
-      "attackType" => array(
-        /** 方式1 */
-        "type1" => array(
-          "id" => substr($wepk,1,1),
-          "name" => $attinfo[substr($wepk,1,1)],
-        ),
-        /** 方式2 */
-        "type2" => array(
-          "id" => substr($wepk,2,1) ? substr($wepk,2,1) : null,
-          "name" => substr($wepk,2,1) ? $attinfo[substr($wepk,2,1)] : null,
-        ),
-      ),
+      "attackType" => getAttackType(),
      /** 视野 */
      "semo" => $clbpara['smeo'],
      /** 合成 */

--- a/command.php
+++ b/command.php
@@ -264,7 +264,7 @@ if($hp > 0){
 						$mode='command';
 					}
                //码语行人提取
-        } elseif ($sp_cmd == 'sp_extract_trait') {
+                } elseif ($sp_cmd == 'sp_extract_trait') {
                    $position = 0;
                    if ($club == 21) {
                        foreach (array(1, 2, 3, 4, 5, 6) as $imn)
@@ -290,7 +290,7 @@ if($hp > 0){
                        if ($choice_position < 1 || $choice_position > 6)
                            $log .= '<span class="red">无此物品。</span><br />';
                        else {
-                            include_once GAME_ROOT . './include/game/special.func.php';
+                            include_once GAME_ROOT . './include/game/club21.func.php';
                            item_extract_trait($choice, $choice_position);
                        }
                        $mode = 'command';
@@ -324,10 +324,41 @@ if($hp > 0){
                        elseif ($choice == $choice2)
                            $log .= '<span class="red">你选择了相同的代码片段。</span><br />';
                        else {
-                            include_once GAME_ROOT . './include/game/special.func.php';
+                            include_once GAME_ROOT . './include/game/club21.func.php';
                            item_add_trait($choice, $choice2);
                        }
                        $mode = 'command';
+                    }
+                //码语行人吃饭
+                } elseif ($sp_cmd == 'sp_consume_trait') {
+                    $position = 0;
+                    if ($club == 21) {
+                        foreach (array(1, 2, 3, 4, 5, 6) as $imn)
+                            //遍历所有道具
+                            if (strpos(${'itmk' . $imn}, '🥚') === 0) {
+                                $position = $imn;
+                                break;
+                            }
+                        if (!$position) {
+                            $log .= '<span class="red">你没有代码片段，无法消耗代码片段！</span><br />';
+                            $mode = 'command';
+                        } else  $mode = 'sp_consume_trait';
+                    } else {
+                        $log .= '<span class="red">你不懂得如何消耗代码片段！</span><br />';
+                        $mode = 'command';
+                    }
+                } elseif ($sp_cmd == 'sp_consume_trait_selected') {
+                    if (!isset($choice) || $choice == 'menu') {
+                        $mode = 'command';
+                    } else {
+						$choice = (int)($choice);
+                        if ($choice < 1 || $choice > 6 )
+                            $log .= '<span class="red">无此物品。</span><br />';
+                        else {
+                            include_once GAME_ROOT . './include/game/club21.func.php';
+                            consume_trait($choice);
+                        }
+                        $mode = 'command';
                    }
 				}elseif($sp_cmd == 'sp_pbomb'){
 					$mode = 'sp_pbomb';
@@ -343,10 +374,19 @@ if($hp > 0){
 					calcskills($skarr);
 					$p12[1]=1; $p12[2]=2;
 					$mode='sp_skpts';
+				//妙手技能
+				}elseif($sp_cmd == 'sp_pickpocket_selected'){		
+					if (!isset($choice)) {
+						$mode = 'command';
+					} else {
+						$choice = (int)($choice);
+						include_once GAME_ROOT . './include/game/revclubskills_extra.func.php';
+						skill_tl_pickpocket_act($choice);
+ 					}
+					$mode = 'command';				
 				}else{
 					$mode = $sp_cmd;
-				}
-				
+				}				
 			} elseif($command == 'team') {
 				include_once GAME_ROOT.'./include/game/team.func.php';
 				if($teamcmd == 'teamquit') {				

--- a/gamedata/cache/addnpc_1.php
+++ b/gamedata/cache/addnpc_1.php
@@ -482,7 +482,7 @@ $anpcinfo = array
 			'itmk2' => 'WF',
 			'itme2' => 500,
 			'itms2' => 100,
-			'itmsk2' => 'cd',
+			'itmsk2' => 'crd',
 			),
 		1 => array
 			(
@@ -509,7 +509,7 @@ $anpcinfo = array
 			'itmk2' => 'WG',
 			'itme2' => 500,
 			'itms2' => 6,
-			'itmsk2' => 'd',
+			'itmsk2' => 'rdy',
 			),
 		),
 	),
@@ -1458,8 +1458,6 @@ $anpcinfo = array
 		'inf' => '',
 		'state' => 1,
 		'rage' => 5,
-		'pose'=> 0,
-		'tactic' => 4,
 		'killnum' => 0,
 		'teamID' => '',
 		'teampsss' => '',
@@ -1500,10 +1498,12 @@ $anpcinfo = array
 			(
 			'name' => '红暮',
 			'club' => 98,
+			'pose'=> 2,
+			'tactic' => 3,
 			'mhp' => 20800,
 			'msp' => 2800,
-			'att' => 1100,
-			'def' => 1500,
+			'att' => 3300,
+			'def' => 2500,
 			'skills' => 15566,
 			'icon' => 7,
 			'wep' => '喷气式红杀重铁剑',
@@ -1545,6 +1545,8 @@ $anpcinfo = array
 			(
 			'name' => '蓝凝',
 			'club' => 10,
+			'pose'=> 1,
+			'tactic' => 3,
 			'mhp' => 9999998,
 			'msp' => 1600,
 			'att' => 199900,
@@ -1913,7 +1915,7 @@ $anpcinfo = array
 			'itme4' => 500,
 			'itms4' => 500,
 			'itmsk4' => 'HZ',
-			'itm6' => '☾愈合数据☽',
+			'itm6' => '❀愈合数据❀',
 			'itmk6' => 'HB',
 			'itme6' => 300,
 			'itms6' => '∞',
@@ -2596,8 +2598,8 @@ $anpcinfo = array
 		'weps' => 50,
 		'itm5' => '◆熟练数据',
 		'itmk5' => '🎆V',
-		'itme5' => 1,
-		'itms5' => 5,
+		'itme5' => 5,
+		'itms5' => 1,
 		),
 	2 => array
 		(
@@ -2609,8 +2611,8 @@ $anpcinfo = array
 		'weps' => 50,
 		'itm5' => '◆生命数据',
 		'itmk5' => '🎆O',
-		'itme5' => 1,
-		'itms5' => 10,
+		'itme5' => 10,
+		'itms5' => 1,
 		),
 	3 => array
 		(
@@ -2622,8 +2624,8 @@ $anpcinfo = array
 		'weps' => 50,
 		'itm5' => '◆意念数据',
 		'itmk5' => '🎆D',
-		'itme5' => 1,
-		'itms5' => 10,
+		'itme5' => 10,
+		'itms5' => 1,
 		),
 	4 => array
 		(

--- a/gamedata/cache/clubskills_1.php
+++ b/gamedata/cache/clubskills_1.php
@@ -27,7 +27,7 @@ $club_skillslist = Array
 	//18 => Array('s_hp','s_ad','f_heal'), #'天赋异禀',
 	19 => Array('s_hp','s_ad','f_heal','c19_nirvana','c19_reincarn','c19_purity','c19_crystal','c19_redeem','c19_dispel','c19_woesea'), #'晶莹剔透', //晶莹剔透、决死结界合并为晶莹剔透
 	20 => Array('s_hp','s_ad','f_heal','c20_fertile','c20_windfall','c20_lighting','c20_zombie','c20_sparkle','c20_lotus'), #'元素大师', #商店购买社团卡
-	21 => Array('s_hp','s_ad','f_heal'), #'码语行人'
+	21 => Array('s_hp','s_ad','f_heal','c21_stormedge','c21_creation','c21_discovery','c21_sacrifice','c21_blaster'), #'码语行人', #商店购买社团卡
 	22 => Array('s_hp','s_ad','f_heal'), #'偶像大师', #暂定名，「除错大师」头衔奖励
 	98 => Array('s_hp','s_ad','f_heal'), #'换装迷宫',
 	99 => Array('s_hp','s_ad','f_heal'), #'第一形态'
@@ -2179,6 +2179,122 @@ $cskills = Array
 			'lvl' => '[:lvl:] >= 17',
 		),
 	),
+	'c21_stormedge' => Array
+	(
+		'name' => '斥血',
+		'tags' => Array('passive'),
+		'desc' => '每次探索时，会损失一定比率的体力并增加体力上限；<br>
+		每次移动时，会损失一定比率的生命和体力并增加生命和体力上限；<br>
+		该损失比率：<span class="yellow">[:burn_rate:]%</span>×<span class="yellow">总行动次数</span><br>
+		你不会因为该效果损失生命而死。<br>
+		可以通过消耗代码片段来降低该系数，<br>
+		降低量：<span class="yellow">[:consume_rate:]%</span>×<span class="yellow">消耗代码片段效耐和的平方根</span>',
+		'vars' => Array(
+			'burn_rate' => 0.03,
+			'consume_rate' => 0.3,
+			'gain_rate' => 0.006
+		),
+		'pvars' => Array('skillpara|c21_stormedge-ms', 'skillpara|c21_stormedge-consumpt'),
+	),
+	'c21_creation' => Array
+	(
+		'name' => '驱血',
+		'tags' => Array('active'),
+		'desc' => '选择一个属性，消耗等同于该属性提取系数<span class="yellow">[:sp_rate:]</span>倍的体力值，<br>制造一个该属性的代码片段。<br>
+		体力不足时会使用技能点代替，每技能点相当于<span class="yellow">[:skillpoint_value:]</span>体力<br>',
+		'input' => '制造',
+		'log' => '……<br>',
+		'clog' => '……<br>',
+		'events' => Array('creation'),
+		'choice' => Array('A','a','B','b','C','c','D','d','E','e','F','f','G','g','H','h','I','i','J','j','K','k','l','M','m','N','n','o','P','p','q','R','r','S','s','U','u','V','v','W','w','X','x','y','Z','z','-','*','+','^','🧰','🍎'),
+		'svars' => Array(
+			'choice' => 'A',
+		),
+		'vars' => Array(
+			'sp_rate' => 2,
+			'skillpoint_value' => 30,
+		),
+		'lockdesc' => Array(
+			'lvl' => '5级时解锁',
+		),
+		'unlock' => Array(
+			'lvl' => '[:lvl:] >= 5',
+		),
+	),
+	'c21_discovery' => Array
+	(
+		'name' => '涌血',
+		'tags' => Array('active'),
+		'desc' => '消耗<span class="yellow">[:spcost:]</span>体力上限和<span class="yellow">[:hpcost:]</span>生命上限，发现一个等级<span class="yellow">[^skillpara|c21_discovery-rank^]</span>的字段名。<br>
+		提取出当前发现的字段达到<span class="yellow">[:task:]</span>次后，你不会再因为「斥血」损失生命和体力。<br>
+		<span class="grey">当前发现的字段：</span><span class="yellow">[^skillpara|c21_discovery-frag^]</span><br>
+		<span class="grey">当前已成功提取：[^skillpara|c21_discovery-count^]次</span>',
+		'input' => '发现',
+		'log' => '<span class="yellow">……</span>',
+		'events' => Array('discovery'),
+		'svars' => Array(
+			'frag' => '暂无',
+			'count' => 0,
+			'rank' => 1
+		),
+		'vars' => Array(
+			'spcost' => 15,
+			'hpcost' => 20,
+			'task' => 7
+		),
+		'pvars' => Array('skillpara|c21_discovery-frag', 'skillpara|c21_discovery-count', 'skillpara|c21_discovery-rank'),
+		'lockdesc' => Array(
+			'lvl' => '9级时解锁',
+		),
+		'unlock' => Array(
+			'lvl' => '[:lvl:] >= 9',
+		),
+	),
+	'c21_sacrifice' => Array
+	(
+		'name' => '燃血',
+		'tags' => Array('switch'),
+		'desc' => '技能开启后，在提取代码片段时，<br>
+		可以支付等量的生命值代替不足的体力，<br>
+		若生命值不足，<span class="yellow">[:death_obbs:]%</span>概率会立即死亡，若幸存则会剩余<span class="yellow">1</span>点生命值<br>
+		[^skill-active^]',
+		'input' => '切换',
+		'log' => '<span class="yellow">切换了「燃血」的状态。</span>',
+		'events' => Array('active|c21_sacrifice'),
+		'vars' => Array(	
+			'death_obbs' => 50 //入乡随俗
+		),
+		'svars' => Array(
+			'active' => 0, 
+		),
+		'pvars' => Array('skill-active'),
+		'lockdesc' => Array(
+			'lvl' => '16级时解锁',
+		),
+		'unlock' => Array(
+			'lvl' => '[:lvl:] >= 16',
+		),
+	),
+	'c21_blaster' => Array
+	(
+		'name' => '爆血',
+		'tags' => Array('battle'),
+		'desc' => '消耗<span class="yellow">[:ragecost:]</span>点怒气，引爆身上的全部代码片段，<br>
+		对敌人和自己造成等同于这些片段上的异常状态，<br>
+		并附加由这些片段的效果和与耐久和决定的最终伤害。<br>
+		你每因此受到<span class="yellow">[:dmgrate:]</span>点伤害，就随机造成敌人一处受伤。',
+		'bdesc' => "引爆身上的全部代码片段，根据片段的属性对双方造成额外伤害和效果；消耗<span class='red'>[:ragecost:]</span>怒气</span>",
+		'vars' => Array(
+			'ragecost' => 100, 
+			'dmgrate' => 100, //造成一处部位受伤需要的伤害量
+		),
+		'lockdesc' => Array(
+			'lvl' => '20级时解锁',
+		),
+		'unlock' => Array(
+			'lvl' => '[:lvl:] >= 20',
+		),
+	),
 	'inf_zombie' => Array
 	(
 		'name' => '灵俑',
@@ -2203,6 +2319,31 @@ $cskills = Array
 			'notype' => Array(88,92),//不能用来抡的NPC
 		),
 	),
+	'tl_pickpocket' => Array
+	(
+		'name' => '妙手',
+		'tags' => Array('battle','passive'),
+		'desc' => '消耗<span class="yellow">[:ragecost:]</span>点怒气，获得敌人随机数量的金钱，<br>
+		至多<span class="yellow">[:picklimit:]%</span>，但本次攻击不造成伤害，且射程与持灵系武器相同；<br>
+		发现尸体时，可消耗<span class="yellow">[:ragecost:]</span>点怒气，将一个物品置入尸体的持有物品中',
+		'bdesc' => '偷取敌人随机数量（至多<span class="yellow">[:picklimit:]%</span>）的金钱；消耗<span class="red">[:ragecost:]</span>怒气</span>',
+		'vars' => Array(
+			'picklimit' => 10,
+			'ragecost' => 30,
+		),
+	),
+	//技能名或许可以换一个
+	'tl_cursetouch' => Array
+	(
+		'name' => '延咒',
+		'tags' => Array('passive'),
+		'desc' => '你每次攻击命中后，有<span class="yellow">[:curse_obbs:]%</span>概率使敌人装备或背包中的随机一件道具添加<span class="red">诅咒属性</span>，<br>
+		若你的装备带有<span class="red">诅咒属性</span>，此概率变为<span class="yellow">[:curserate:]</span>倍',
+		'vars' => Array(
+			'curse_obbs' => 1,
+			'curserate' => 5,
+		),
+	),
 	'inf_dizzy' => Array
 	(
 		'name' => '眩晕',

--- a/gamedata/cache/elementmix_1.php
+++ b/gamedata/cache/elementmix_1.php
@@ -91,6 +91,7 @@
 		'WDG' => 1.5,
 		'WDF' => 1.5,
 		'WJ'  => 1.2,
+		'WB'  => 1.2,
 		//补给品x0.05
 		'HH' => 0.03,
 		'HS' => 0.03,
@@ -262,6 +263,7 @@
 	$dommix_list = array
 	( 	
 		Array('stuff'=>Array('WG','WG','WG','WC','WD'),'result'=>'WJ','obbs'=>15,), //3射+1投+1爆=重枪（15%概率）
+		Array('stuff'=>Array('WC','WC','WC','WG','WK'),'result'=>'WB','obbs'=>25,), //3投+1射+1斩=弓（25%概率）
 		Array('stuff'=>Array('WG','WK'),'result'=>'WGK','obbs'=>77,), //射+斩=枪刃 
 		Array('stuff'=>Array('WC','WF'),'result'=>'WCF','obbs'=>77,), //投+符=符札
 		Array('stuff'=>Array('WC','WP'),'result'=>'WCP','obbs'=>77,), //投+殴=重物
@@ -278,7 +280,7 @@
 		Array('stuff'=>Array('WF','DB','WF'),'result'=>'VF'), 
 		Array('stuff'=>Array('HH','HS'),'result'=>'HB','obbs'=>77,), //回命+回体=命体回复
 		Array('stuff'=>Array('HH','WF'),'result'=>'HM','obbs'=>77,), //回命+灵=歌魂增加
-		Array('stuff'=>Array('HS','WD'),'result'=>'HT','obbs'=>77,), //回体+爆=歌魂恢复
+		Array('stuff'=>Array('HS','WD'),'result'=>'HT'), //回体+爆=歌魂恢复
 		Array('stuff'=>Array('HH','WG'),'result'=>'MH','obbs'=>15,), //回命+射=生命强化
 		Array('stuff'=>Array('HS','WC'),'result'=>'MS','obbs'=>60,), //回体+投=体力强化
 		//我认为这里应该有一个配方 可以合出有毒补给或者地雷（
@@ -346,6 +348,7 @@
 		'WC' => Array('镖','卡牌','球','雪','飞盘','飞弹','弓','矢','青蛙','水滴','钢琴','猫'),//'投掷'
 		'WG' => Array('枪','光枪','燧发枪','步枪','炮','浮游炮','激光','掌心雷','弹弓','导弹发射器'),//'远程'
 		'WJ' => Array('狙击步枪','反坦克步枪','巨炮','武器阵列','手提箱','连装炮'),//'重枪'
+		'WB' => Array('强弓','角弓','箭雨','铁弓','短弓','竖琴','猎弓','暴风','落星'),//'弓'
 		'WD' => Array('炸弹','地雷','打击','此面向敌','贝蒂','绳','陷坑','抽卡游戏','短视频','胜负欲','这是什么？摸一下'),//'爆炸物'
 		'WF' => Array('符','手环','节杖','触','法书','纸人','信徒','精神性','理论','天赋','秘录','蟑螂'),//'灵武'
 		//TODO：复合武器

--- a/gamedata/cache/gamecfg_1.php
+++ b/gamedata/cache/gamecfg_1.php
@@ -72,7 +72,7 @@ $splimit = 400;
 // 初始生命最大值 
 $hplimit = 400;
 // 怒气最大值 
-$mrage = 500;
+$mrage = 255;
 //携带金钱上限
 $moneylimit = 65500;


--- a/gamedata/cache/npc_1.php
+++ b/gamedata/cache/npc_1.php
@@ -2153,8 +2153,8 @@
 		'weps' => 50,
 		'itm5' => '◆熟练数据',
 		'itmk5' => '🎆V',
-		'itme5' => 1,
-		'itms5' => 5,
+		'itme5' => 5,
+		'itms5' => 1,
 		),
 	2 => array
 		(
@@ -2168,8 +2168,8 @@
 		'weps' => 50,
 		'itm5' => '◆生命数据',
 		'itmk5' => '🎆O',
-		'itme5' => 1,
-		'itms5' => 10,
+		'itme5' => 10,
+		'itms5' => 1,
 		),
 	3 => array
 		(
@@ -2183,8 +2183,8 @@
 		'weps' => 50,
 		'itm5' => '◆意念数据',
 		'itmk5' => '🎆D',
-		'itme5' => 1,
-		'itms5' => 10,
+		'itme5' => 10,
+		'itms5' => 1,
 		),
 	4 => array
 		(
@@ -2544,7 +2544,7 @@ $npcdescription = array
 			6 => array
 			(
 				'count' => 0,
-				'description' => '没有反应，就是个特别能抗伤害的种火。',
+				'description' => '没有反应，似乎就是个特别能抗伤害的种火。但真的是这样吗？',
 			),
 		),
 	),

--- a/gamedata/cache/overlay_1.php
+++ b/gamedata/cache/overlay_1.php
 No91.雷闪龙 ☆4,WC,380,∞,Aar,4,5
 No39.希望皇 霍普 ☆4,WC,240,∞,A,4,2
+英豪冠军 英弓王,WB,210,∞,d,4,2
 No9.天盖星 戴森球 ☆9,WC,233,∞,ea,9,2
 星圣 欧米伽星云 ☆4,WC,251,∞,Mi,4,2
 机甲忍者 刃心 ☆4,WC,160,∞,cr,4,2

--- a/gamedata/cache/random00_1.php
+++ b/gamedata/cache/random00_1.php
@@ -80,7 +80,7 @@ $itmmedium = <<<EOT
 防卫数据,MD,142,6,,
 大脸,HB,300,998,,
 铁兽战线 徒花之费莉吉特 Ｌ2,WC,204,60,nd,
-铁兽战线 凶鸟之施莱格 Ｌ3,WC,460,40,e,
+铁兽战线 凶鸟之施莱格 Ｌ4,WC,460,40,e,
 电子龙·凯旋 Ｌ2,WC,446,50,p,
 秘旋谍-双螺旋特工 Ｌ2,WC,502,70,,
 海晶少女 妙晶心 Ｌ2,WC,323,75,rw,
@@ -141,6 +141,7 @@ $itmhigh = <<<EOT
 防火龙·暗流体 Ｌ5,WC,1555,256,Zkw,
 前托枪管龙 Ｌ5,WC,3877,158,Zikdr,
 电子界到临者＠火灵天星 Ｌ6,WC,4788,480,Zkfd,
+召命之神弓-阿波罗萨 Ｌ4,WB,3200,4,kZcb,
 「喧嚣叙事曲」,WD,2222,256,Zuwdr,
 「升天」,WD,2777,188,Zikdr,
 「曳光」,WD,1555,256,Zkfd,

--- a/gamedata/cache/randomWC_1.php
+++ b/gamedata/cache/randomWC_1.php
@@ -21,7 +21,7 @@ EOT;

 $itmmedium = <<<EOT
 铁兽战线 徒花之费莉吉特 Ｌ2,WC,204,60,nd,
-铁兽战线 凶鸟之施莱格 Ｌ3,WC,460,40,e,
+铁兽战线 凶鸟之施莱格 Ｌ4,WC,460,40,e,
 电子龙·凯旋 Ｌ2,WC,446,50,p,
 秘旋谍-双螺旋特工 Ｌ2,WC,502,70,,
 海晶少女 妙晶心 Ｌ2,WC,323,75,rw,
@@ -36,6 +36,7 @@ $itmhigh = <<<EOT
 防火龙·暗流体 Ｌ5,WC,1555,256,Zkw,
 前托枪管龙 Ｌ5,WC,3877,158,Zikdr,
 电子界到临者＠火灵天星 Ｌ6,WC,4788,480,Zkfd,
+召命之神弓-阿波罗萨 Ｌ4,WB,3200,4,kZcb,
 EOT;

 $antimeta = <<<EOT

--- a/gamedata/cache/resources_1.php
+++ b/gamedata/cache/resources_1.php
@@ -207,6 +207,8 @@ $stateinfo = Array
 	39 => '武器反噬',
 	40 => '以身试法',
 	42 => '独自脱离',
+	44 => '自我崩解',
+	45 => '舍身证道',
 	50 => '成为乐子'
 );
 $lwinfo = Array(
@@ -1006,6 +1008,7 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'HB' => '命体恢复',
 	'HM' => '歌魂增加',
 	'HT' => '歌魂恢复',
+	'HR' => '怒气增加',
 	'GA' => '箭矢',	
 	'GBr' => '机枪弹药',
 	'GBi' => '气体弹药',
@@ -1018,6 +1021,7 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'N' => '无',	
 	'PM' => '歌魂增加',
 	'PT' => '歌魂恢复',
+	'PR' => '怒气增加',
 	'PH' => '生命恢复',
 	'PS' => '体力恢复',
 	'PB' => '命体恢复',
@@ -1064,6 +1068,8 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'🎆V' => '余烬', #熟练数据
 	'🎆O' => '余烬', #生命数据
 	'🎆D' => '余烬', #意念数据
+	'🎆B' => '余烬', #种火盒子
+	'🎆C' => '余烬', #种火盒子·报社篇
 	'P🎆' => '余烬', #霍霍完歌魂是不是还要霍霍种火数据（悲
 	'🎆' => '余烬', # Catch-All
 );
@@ -1122,7 +1128,7 @@ $itemspkinfo = Array(
 	'^' => '背包',
 	'🧰' => '工具',
 	'🍎' => '水果',
-	'|' => '<:DUMMY:>', //箭矢用的分隔符
+	//'|' => '<:DUMMY:>', //箭矢用的分隔符
 );

 //club20 元素大师：
@@ -1321,6 +1327,8 @@ $dinfo = Array(
 	39 => '“去死吧！就算你是权限[哔]也挡不住我这一击的！”<br>你狂笑着使出你自认为决定胜负的一击，噗通倒下的却是你自己。<br>“不，这不科学！”被武器背叛的你遁入了无尽的黑暗中。<br><br><div class="seedhint">………………<br>…………<br><span class="blueseed">【Ｐ】越是强大的武器，越是有使用的风险。</span><br><span class="redseed">【Ｅ】越是浓厚的杀意，会带来越大的反噬。</span><br><span class="blueseed">【Ｐ】幻境自有其制衡之道，逾矩会带来无法想象的后果。</span><br><span class="redseed">【Ｅ】帮助上只说会必杀，可没说杀的是哪一方哦。</span><br></div>',
 	40 => '“看起来好像没什么反应嘛……那是！！”<br>天空中突然降下的巨大柱状物瞬间将你的世界吞没。<br>你眼前一黑，便失去了意识。<br><br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】是那位神灵啊，干嘛要招惹她呢？</span><br><span class="blueseed">【Ｐ】使用她的符卡，后果自负哟。</span><br></div>',
 	42 => '你摁下了手中的玩具般的按钮。<br>面前凭空出现了一扇闪光的门扉！<br>你毅然决然地踏了进去……<br>………………<br>…………<br>……<br>随着你独自摘下了VR设备站起身来，你松了一口气。<br>虽然其他的玩家还在这场游戏中冒死厮杀，但起码你自己毫发无伤地逃出了生天。<br>虽然这怎么说都无法让你成为胜利者，但就这一点本身，已经算是不错的成就了。<br>你回头看了一眼正显示着你所谓的死亡信息的屏幕，不禁笑了起来……<br><br>＝＝＝＝＝＝＝＝＝<br><span class="lime">独自逃脱成功！<br>你获得了20积分奖励！胜场+1！</span><br>＝＝＝＝＝＝＝＝＝<br>',
+	44 => '在你想着要获取更大，更多的力量时。<br>你没想到这将让你的身体承担不起。<br>在你身体里面肆虐的<span class="glitchb">数据风暴</span>终于无法制御，<br>从你的体内破体而出……<br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】这里有个教训——</span><br><span class="blueseed">【Ｐ】在使用所谓的第三方库之前，最好先将它的底细摸清楚……</span><span class="redseed">【Ｅ】要说明白的话，那这个「🥚」其实并不是林氏出品的东西……</span><br><span class="blueseed">【Ｐ】总之，下次注意点吧！</span><br></div>',
+	45 => '你怀着必死的决心，向你的对手撞了上去，<br>丝毫未注意到<span class="glitchb">数据风暴</span>穿体而出所带来的疼痛。<br>各种颜色的<span class="glitchb">数据风暴</span>围绕着你们，<br>当一切结束后，战场上已经是一片狼藉……<br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】热血漫画固有戏码——自爆！</span><br><span class="blueseed">【Ｐ】这是你自己的选择，我们也不评价了。</span><br><span class="redseed">【Ｅ】希望被你干掉的人值得你这么做。</span><br><span class="blueseed">【Ｐ】那么下次再见！</span><br></div>',
 	50 => '你的身体化作了天边的红霞。<br>想必会为虚拟幻境中的各位带来笑容吧。<br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】…………………………？</span><br><span class="blueseed">【Ｐ】……………………。</span><br></div>',
 );


--- a/gamedata/cache/setitems_1.php
+++ b/gamedata/cache/setitems_1.php
@@ -27,6 +27,10 @@ $set_items = Array
 		'幻之甲' => 'fan',
 		'永恒之甲' => 'ete',
 		'新华里的西服' => 'xhl',
+		'✦✦✦烈篝火' => 'fs2',
+		'★华篝火★' => 'fs3',
+		'☾真篝火☽' => 'fs4',
+		'☼篝火☼' => 'fs5',
 	),

 	'arh' => Array
@@ -36,6 +40,10 @@ $set_items = Array
 		'幻之盔' => 'fan',
 		'永恒之盔' => 'ete',
 		'新华里的领带' => 'xhl',
+		'✦✦✦烈埋火' => 'fs2',
+		'★华埋火★' => 'fs3',
+		'☾真埋火☽' => 'fs4',
+		'☼埋火☼' => 'fs5',
 	),

 	'ara' => Array
@@ -45,6 +53,10 @@ $set_items = Array
 		'幻之手镯' => 'fan',
 		'永恒之手镯' => 'ete',
 		'新华里的手表' => 'xhl',
+		'✦✦✦烈残火' => 'fs2',
+		'★华残火★' => 'fs3',
+		'☾真残火☽' => 'fs4',
+		'☼残火☼' => 'fs5',
 	),

 	'arf' => Array
@@ -54,6 +66,10 @@ $set_items = Array
 		'幻之靴' => 'fan',
 		'永恒之靴' => 'ete',
 		'新华里的皮鞋' => 'xhl',
+		'✦✦✦烈永火' => 'fs2',
+		'★华永火★' => 'fs3',
+		'☾真永火☽' => 'fs4',
+		'☼永火☼' => 'fs5',
 	),

 	'art' => Array
@@ -95,6 +111,26 @@ $set_items_info = Array
 		'name' => '永恒之物',
 		'active' => Array(1,5),
 	),
+	'fs2' => Array
+	(
+		'name' => '种火Ⅰ',
+		'active' => Array(1,4),
+	),
+	'fs3' => Array
+	(
+		'name' => '种火Ⅱ',
+		'active' => Array(1,4),
+	),
+	'fs4' => Array
+	(
+		'name' => '种火Ⅲ',
+		'active' => Array(1,4),
+	),
+	'fs5' => Array
+	(
+		'name' => '种火Ⅳ',
+		'active' => Array(1,4),
+	),
 );



--- a/gamedata/cache/shopitem_1.php
+++ b/gamedata/cache/shopitem_1.php
 <? if(!defined('IN_GAME')) exit('Access Denied'); ?>
 0,2,,,补给,,,,,
+1,10,300,0,食堂的盒饭,HR,50,1,,
 1,100,13,0,矿泉水,HS,120,1,,
 1,70,17,0,体力回复药,HS,240,1,,
 1,60,26,1,圆形罐头,HS,600,1,,
@@ -50,6 +51,8 @@
 6,500,10,0,风景明信片,WC,20,40,,
 6,200,300,0,☆杀人扑克牌☆,WC,60,52,r,
 6,100,800,0,『藤林杏的广辞苑』,WC,240,40,,
+6,20,3000,0,复合弓,WB,360,1,Nc,
+6,10,8800,0,■落月弓■,WB,720,1,ic,
 6,50,2400,1,★库洛牌★,WC,500,53,,
 6,25,5400,2,■木之本樱小樱牌■,WC,600,53,d,
 6,30,165,0,游戏王卡包,ygo,1,1,
@@ -112,6 +115,7 @@
 10,3,300,0,《爆系指南》,VD,30,1,,
 10,3,300,0,《灵系指南》,VF,30,1,,
 10,10,1444,0,《黑暗兵法·素材复用之卷》,VS,1,1,tl_cstick,
+10,3,777,0,《COC7规则书·偷天换日之卷》,VS,1,1,tl_pickpocket,
 10,10,3800,0,《小黄的收服特训》,X,1,1,,
 10,10,7000,0,《寻星流奥义书》,VK,300,1,,
 10,10,5500,0,《小黄的常磐之力》,VC,300,1,,
@@ -123,17 +127,22 @@
 11,15,400,1,广域生命探测器,ER,1,1,2,
 11,150,20,0,探测器电池,BR,2,1,,
 11,25,1750,1,探雷器,A,1,1,M,
+0,20,,,弹药和箭矢,,,,,
+20,200,10,0,蓄能箭,GA,1,1,c,
+20,200,20,0,火焰箭,GA,1,1,u,
+20,200,30,0,毒箭,GA,1,1,p,
+20,100,50,0,爆裂箭,GA,1,1,d,
+20,500,6,0,手枪子弹,GB,1,12,,
+20,250,12,0,机枪子弹,GBr,1,20,,
+20,10,220,0,重装子弹,GBh,1,1
+20,200,15,0,压缩气罐,GBi,1,10,,
+20,200,15,0,枪械电池,GBe,1,10,,
 0,12,,,杂物,,,,,
 12,250,150,0,水果刀,Z,1,1,,
 12,200,60,0,钉,Y,3,4,,
 12,100,120,1,钢钉,Y,60,1,,
 12,75,250,0,磨刀石,Y,5,5,,
 12,30,600,1,贤者之磨刀石,Y,60,1,,
-12,500,6,0,手枪子弹,GB,1,12,,
-12,250,12,0,机枪子弹,GBr,1,20,,
-12,10,220,0,重装子弹,GBh,1,1
-12,200,15,0,压缩气罐,GBi,1,10,,
-12,200,15,0,枪械电池,GBe,1,10,,
 12,150,120,0,针线包,Y,10,2,,
 12,7,777,0,礼品盒,p,1,1,,
 12,20,600,0,凸眼鱼,Y,1,4,,

--- a/gamedata/cache/tooltip_1.php
+++ b/gamedata/cache/tooltip_1.php
@@ -64,7 +64,7 @@ $tps_name = Array
 	# 福袋SR
 	'「信仰之山」' => 1,'「间断的噩梦」' => 1,'「运钝根的捕物帐」' => 1,'「喧嚣叙事曲」' => 1,'「升天」' => 1,
 	'「曳光」' => 1,'「人生重来箱」' => 1,'「菁英宅之怒」' => 1,'闭锁世界的冥神 Ｌ5' => 1,'铁兽式强袭机动兵装改牛头伯劳2 Ｌ5' => 1,
-	'防火龙·暗流体 Ｌ5' => 1,'前托枪管龙 Ｌ5' => 1,'电子界到临者＠火灵天星 Ｌ6' => 1,'「活跃迎春曲」' => 1,'「飘落」' => 1,'「明动」' => 1,
+	'防火龙·暗流体 Ｌ5' => 1,'前托枪管龙 Ｌ5' => 1,'电子界到临者＠火灵天星 Ｌ6' => 1,'召命之神弓-阿波罗萨 Ｌ4' => 1,'「活跃迎春曲」' => 1,'「飘落」' => 1,'「明动」' => 1,
 	'「正午高阳」' => 1,'神灭兵器－天霆号扼宙斯 ☆12' => 1,'「碧海船歌」' => 1,'「翼展」' => 1,'「安谧」' => 1,
 	'「午前许愿」' => 1,'神之圣剑' => 1,'「金霜协奏曲」'=>1,'「龙怒」' => 1,'「升天」' => 1,'「宁静」' => 1,'「清晨恩典」' => 1,'神之棍棒' => 1,
 	# 福袋SSR
@@ -130,8 +130,10 @@ $tps_ik = Array
 	'HB' => Array('title' =>"使用后恢复等于道具效果值的生命和体力",),
 	'HM' => Array('title' =>"使用后增加等于道具效果值的歌魂上限",),
 	'HT' => Array('title' =>"使用后恢复等于道具效果值的歌魂",),
+	'HR' => Array('title' =>"使用后增加等于道具效果值的怒气",),
 	'PM' => Array('title' =>"使用后曾加等于道具效果值的歌魂上限",),
 	'PT' => Array('title' =>"使用后灰复等于道具效果值的歌魂",),
+	'PR' => Array('title' =>"使用后曾加等于道具效果值的怒气",),
 	'PH' => Array('title' =>"使用后灰复等于道具效果值的生命",),
 	'PS' => Array('title' =>"使用后灰复等于道具效果值的体力",),
 	'PB' => Array('title' =>"使用后灰复等于道具效果值的生命和体力",),
@@ -171,6 +173,8 @@ $tps_ik = Array
 	'🎆V' => Array('class'=>'lime', 'title'=>"神秘存在身上掉落的碎片，似乎和你很匹配。",),
 	'🎆O' => Array('class'=>'lime', 'title'=>"神秘存在身上掉落的碎片，似乎和你很匹配。",),
 	'🎆D' => Array('class'=>'lime', 'title'=>"神秘存在身上掉落的碎片，似乎和你很匹配。",),
+	'🎆B' => Array('class'=>'lime', 'title'=>"神秘存在身上掉落的碎片，你觉得它似乎能变成别的什么东西。",),
+	'🎆C' => Array('class'=>'lime', 'title'=>"鉮秘洊茬裑仩鋽落哋誶爿，沵覺嘚咜姒苸能變荿莂哋什庅崬覀。",),
 	'P🎆' => Array('class'=>'lime', 'title'=>"神秘存在身上掉落的碎片，似乎和你狠匹配。",),
 );


--- a/gamedata/club21cfg.php
+++ b/gamedata/club21cfg.php
 <?php
-//码语行人配置文件
-//各个属性比率
-$itmsk_extract_rate = array(
-    'A' => 150,
-    'a' => 150,
-    'B' => 400,
-    'b' => 400,
-    'C' => 30,
-    'c' => 10,
-    'D' => 30,
-    'd' => 20,
-    'E' => 30,
-    'e' => 20,
-    'F' => 30,
-    'f' => 30,
-    'G' => 20,
-    'g' => 5,
-    'H' => 120,
-    'h' => 80,
-    'I' => 30,
-    'i' => 20,
-    'J' => 200,
-    'j' => 200,
-    'K' => 30,
-    'k' => 30,
-    'L' => 50,
-    'l' => 5,
-    'M' => 100,
-    'm' => 100,
-    'N' => 20,
-    'n' => 40,
-    'o' => 5,
-    'P' => 20,
-    'p' => 30,
-    'q' => 30,
-    'R' => 60,
-    'r' => 60,
-    'S' => 20,
-    's' => 200,
-    'U' => 30,
-    'u' => 20,
-    'V' => 100,
-    'v' => 100,
-    'W' => 30,
-    'w' => 20,
-    'X' => 800,
-    'x' => 50,
-    'y' => 40,
-    'Z' => 50,
-    'z' => 1,
-    '-' => 200,
-    '*' => 200,
-    '+' => 200,
-    '^' => 1200,
-    '🧰' => 200
-);
-//itm
-$itm_extract_rate = array(
-    "棍棒" => 250,
-    "改" => 100,
-    "+" => 100,
-    "n" => 10
-);

-//物品效果和耐久的场合：按照1：1比率消耗体力进行提取
-$itms_extract_rate = 1; //耐久
-$itms_infinite_extract_rate = 50; //无限耐久
-$itme_extract_rate = 1; //效果
+	if(!defined('IN_GAME')) exit('Access Denied');
+	
+	//码语行人配置文件
+	
+	//各个属性比率
+	$itmsk_extract_rate = array(
+		'A' => 150,
+		'a' => 150,
+		'B' => 450,
+		'b' => 450,
+		'C' => 60,
+		'c' => 20,
+		'D' => 80,
+		'd' => 150,
+		'E' => 30,
+		'e' => 50,
+		'F' => 60,
+		'f' => 150,
+		'G' => 60,
+		'g' => 5,
+		'H' => 120,
+		'h' => 1500,
+		'I' => 30,
+		'i' => 50,
+		'J' => 200,
+		'j' => 200,
+		'K' => 60,
+		'k' => 150,
+		'L' => 50,
+		'l' => 5,
+		'M' => 120,
+		'm' => 120,
+		'N' => 180,
+		'n' => 300,
+		'o' => 5,
+		'P' => 60,
+		'p' => 50,
+		'q' => 30,
+		'R' => 100,
+		'r' => 220,
+		'S' => 20,
+		's' => 200,
+		'U' => 30,
+		'u' => 50,
+		'V' => 100,
+		'v' => 100,
+		'W' => 30,
+		'w' => 50,
+		'X' => 800,
+		'x' => 80,
+		'y' => 320,
+		'Z' => 100,
+		'z' => 1,
+		'-' => 800,
+		'*' => 800,
+		'+' => 800,
+		'^' => 1200,
+		'🧰' => 800,
+		'🍎' => 1000
+	);

-//插入代码片段
-$insert_rate = 50;
-//合并代码片段
-$merge_rate = 0;
\ No newline at end of file
+	//物品效果和耐久的场合：按照1：1比率消耗体力进行提取
+	$itms_extract_rate = 1; //耐久
+	$itms_infinite_extract_rate = 50; //无限耐久
+	$itme_extract_rate = 1; //效果
+
+	//插入代码片段
+	$insert_rate = 50;
+	//合并代码片段
+	$merge_rate = 0;
+
+	//名称提取时的候选字段范围，每局游戏会在其中随机挑选出部分字段
+	$item_name_fragment_list = Array(
+		//0级字段
+		0 => Array('电磁','脉冲','沙漠','手枪','RPG','手套','龙','灵使','盟军','救世','布偶','小型','辐射','镰刀','地板','青蛙','半身像','御姐','腿','杏仁豆腐','希望','电子','太鼓','棍棒','[+1]','[+2]','[+3]','装甲','实验','太刀','骷髅','被封印者的','死灵','吸血鬼','领主','巨大','冲锋','扭曲','蓝白','操控','火神','音波','激光','带翅膀的','桔黄色的','王国','午夜','垃圾','焦臭的','微温的','开孔的','泥泞的','变形的','裂缝的','潮湿的','遥控','原型','普通的','对魔物用','二重','黑魔法','寂寞','节操','防弹','埃克法','木制','超级','爆炸','破坏之','星尘','梦想','光束'),
+		//1级字段
+		1 => Array('飞刀','怪蜀黍','水晶','雪兔','金属','弹射','首领','恶魔','霍普','宝石','细剑','片翼','[+4]','[+5]','德古拉','曾经的','荣光','大口径','水滴','彩色','未知','喵喵','奇迹','钓鱼','高压','高性能','贯穿','连射','震荡','幻之','永恒之','约定','黎明','寻星','勇者','冰封的','直升机','玄人的','断钢','火焰','9mm','标本','波纹','军用','真空','诅咒','荆棘','至尊','西瓜','红石','血腥','幽灵','凤凰','露琪亚','坚强','炙热','活力','风神','凭依','英雄','反坦克','太极','迷你','太阳','飞叶','公主','可怕的'),
+		//2级字段
+		2 => Array('机械','铁拳','彩虹','临摹','狐狸','巫师','未完成','丝带','超次元','蔷薇','大师','[+6]','天空','巨神','二向箔','神之','乱入','传说中的','心灵','风魔','强袭','闪击','达人的','铁锤','女王的','精装','拳王之','黄金','肯德基','麦当劳','东洋','燕返','传家','古典','高级','钻石','正宗','萝莉','伪娘','女仆','宅男','光学迷彩','塑料','性感的','新华里','超能力','天使','狂暴','妖精','LOVELOVE','悔悟','烈焰','流转','轮回','生命','未来','恐惧的','失落的','灭亡','黑暗','终结','爆裂','试作型','限量版','阔剑','巴雷特','奇怪的','波动','认真收集的','无尽','断罪','破灭','武神','世界'),
+		//3级字段，福袋里出来的都记到这边吧
+		3 => Array('最终','灼眼','正直者','原味','鱼的','勇气','信仰','向日葵','贤者','无限','铁兽战线','淘气仙星','死兆星','死亡','水月','霜火','神灭兵器','染血','琪露诺','破解的','秘旋谍','六根清净','炼狱','究极','究级','疾风','火灵天星','会打飞机的','幻月','海晶少女','篝酱','夺魂','动感超人','地球','创造神','MIKU的','205mm','[+9]','[+8]','[+7]','[+10]','（笑）','小马')
+	);
+
+	//字段每个等级的强化倍率
+	$name_fragment_rate = Array(
+		0 => 1.01,
+		1 => 1.15,
+		2 => 1.6,
+		3 => 3
+	);
+
+	//每局游戏放出的每个等级字段的数量
+	$name_fragment_available_num = Array(
+		0 => 45,
+		1 => 30,
+		2 => 30,
+		3 => 20
+	);
+
+?>
\ No newline at end of file
--- a/include/game/battle.func.php
+++ b/include/game/battle.func.php
@@ -82,6 +82,10 @@ function findcorpse(&$w_pdata)
 	$cstick_flag = 0;
 	if(!check_skill_unlock('tl_cstick',$pdata) && !check_skill_cost('tl_cstick',$pdata)) $cstick_flag = in_array($w_type,get_skillvars('tl_cstick','notype')) ? 0 : 1;
 	
+	// 初始化妙手数据
+	$pickpocket_flag = 0;
+	if(!check_skill_unlock('tl_pickpocket',$pdata) && !check_skill_cost('tl_pickpocket',$pdata)) $pickpocket_flag = 1;
+	
 	// 保存发现过女主尸体的记录
 	if($w_pdata['type'] == 14) $clbpara['achvars']['corpse_n14'] += 1;


--- a/include/game/club21.func.php
+++ b/include/game/club21.func.php
--- a/include/game/console.func.php
+++ b/include/game/console.func.php
@@ -62,7 +62,7 @@
 		$skind = Array(0=>'itm',1=>'trap',2=>'pc');

 		//过滤输入名称中的非法字符
-		$nm = preg_replace('/[,\#;\p{Cc}]+|锋利的|电气|毒性|[\r\n]|-改|<|>|\"/u','',$nm);
+		//$nm = preg_replace('/[,\#;\p{Cc}]+|锋利的|电气|毒性|[\r\n]|-改|<|>|\"/u','',$nm);
 		//过滤输入名称首尾的空格
 		$nm = preg_replace('/^\s+|\s+$/m','', $nm);
 		//过滤类别

--- a/include/game/elementmix.calc.php
+++ b/include/game/elementmix.calc.php
@@ -145,7 +145,7 @@
 			# 次优先：检查拆解关键词匹配道具名时的事件（改为手动添加判断条件）
 			if(strpos($t['itm'],'方块')!==false || strpos($t['itm'],'宝石方块')!==false)
 			{
-				$ev = strpos($t['itm'],'方块')!==false ? 400 : 1000;
+				$ev = strpos($t['itm'],'宝石方块')!==false ? 1000 : 400;
 				$ekey = rand(0,5);
 				$ev_arr[$ekey] += $ev;
 				continue; 
@@ -496,7 +496,7 @@
 			}
 		}
 		# 强化药物、技能书籍效耐调整：效果最大不能超过角色等级、耐久最大不超过角色等级的平方根，且向下调整
-		if(strpos($emix_itmk,'M')===0 || strpos($emix_itmk,'HM')===0 || strpos($emix_itmk,'V')===0) 
+		if(strpos($emix_itmk,'M')===0 || strpos($emix_itmk,'HM')===0 || strpos($emix_itmk,'HT')===0 || strpos($emix_itmk,'V')===0) 
 		{
 			$eitme = min($lvl,floor($eitme/$lvl));
 			$eitms = min(ceil(sqrt($lvl)),floor($eitms/$lvl));

--- a/include/game/item.func.php
+++ b/include/game/item.func.php
@@ -232,6 +232,27 @@ function itemuse($itmn,&$data=NULL) {
 		} else {
 			$log .= '你的歌魂不需要恢复。<br>';
 		}
+	}elseif (strpos ( $itmk, 'HR' ) === 0) {
+		$rageup=$itme;
+		require config('gamecfg',$gamecfg);
+		if ($rage < $mrage) {
+			$oldrage = $rage;
+			$rage += $rageup;
+			$rage = $rage > $mrage ? $mrage : $rage;
+			$oldrage = $rage - $oldrage;
+			$log .= "你吃了一口<span class=\"red\">$itm</span>，顿时感觉心中充满了愤怒。你的怒气值增加了<span class=\"yellow b\">$oldrage</span>点！<br>";
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>用光了。<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			
+			}
+		} else {
+			$log .= '你已经出离愤怒了，动怒伤肝，还是歇歇吧！<br>';
+		}
 	} elseif (strpos ( $itmk, 'HB' ) === 0) {
 		//global $hp, $mhp, $sp, $msp,$club;
 		if (($hp < $mhp) || ($sp < $msp)) {
@@ -1082,6 +1103,15 @@ function itemuse($itmn,&$data=NULL) {
 			$log.="你将<span class=\"yellow\">{$itm}</span>吞下了肚，你感觉焕然一新！<br>";
 			$hp = $mhp;
 			$sp = $msp;
+
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			}
 		}

 		# Logic for each of the 4 usages.
@@ -1117,7 +1147,6 @@ function itemuse($itmn,&$data=NULL) {
 				<br>
 				<span class=\"blueseed\">同时，你还隐约听见了一个声音：<br>
 				「你可能需要找个纯度更高的代码片段哟~」<br></span>";
-				$falsify = true;
 			}else{

 			$gainless = ($mhp + $gainmax) - $hp;
@@ -1135,6 +1164,15 @@ function itemuse($itmn,&$data=NULL) {
 				「看起来这个纯度的代码片段已经喂不饱你了。<br>
 				赶快找下一个纯度的代码片段吧！」<br></span>";
 			}
+
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			}
 		}
 			}else{
 				$addsp = $msp - $sp < $itme ? $msp - $sp : $itme;
@@ -1146,6 +1184,15 @@ function itemuse($itmn,&$data=NULL) {

 				$log.="你将<span class=\"yellow\">{$itm}</span>吞下了肚。<br>
 			治愈的代码片段为你恢复了<span class=\"yellow\">$addhp</span>点生命和<span class=\"yellow\">$addsp</span>点体力。<br>";
+
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			}
 			}
 		}

@@ -1185,7 +1232,6 @@ function itemuse($itmn,&$data=NULL) {
 			<br>
 			<span class=\"blueseed\">同时，你还隐约听见了一个声音：<br>
 			「你可能需要找个纯度更高的代码片段哟~」<br></span>";
-			$falsify = true;
 			}else{

 			$gainless = $clbpara['fireseedmaxProfGain'] - $clbpara['fireseedmaxProfAdd'];
@@ -1203,6 +1249,15 @@ function itemuse($itmn,&$data=NULL) {
 				赶快找下一个纯度的代码片段吧！」<br></span>";
 			}

+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			}
+
 			}
 			}else{
 				$addw = $itme;
@@ -1215,6 +1270,15 @@ function itemuse($itmn,&$data=NULL) {

 				$log.="你将<span class=\"yellow\">{$itm}</span>吞下了肚。<br>
 				载有熟练度的代码片段让你获得了<span class=\"yellow\">$addw</span>点全系熟练度！<br>";
+
+				if ($itms != $nosta) {
+					$itms --;
+					if ($itms <= 0) {
+						$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+						$itm = $itmk = $itmsk = '';
+						$itme = $itms = 0;
+					}
+				}
 			}
 		}

@@ -1248,7 +1312,6 @@ function itemuse($itmn,&$data=NULL) {
 			<br>
 			<span class=\"blueseed\">同时，你还隐约听见了一个声音：<br>
 			「你可能需要找个纯度更高的代码片段哟~」<br></span>";
-			$falsify = true;
 			}else{

 			$gainless = $clbpara['fireseedmaxHPGain'] - $clbpara['fireseedmaxHPAdd'];
@@ -1264,6 +1327,16 @@ function itemuse($itmn,&$data=NULL) {
 				$log.="<br><span class=\"redseed\">这时，有另一把声音插了进来：<br>
 				「看起来这个纯度的代码片段已经喂不饱你了。<br>
 				赶快找下一个纯度的代码片段吧！」<br></span>";
+
+			}
+
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
 			}

 			}
@@ -1273,6 +1346,15 @@ function itemuse($itmn,&$data=NULL) {

 				$log.="你将<span class=\"yellow\">{$itm}</span>吞下了肚。<br>
 				载有生命的代码片段让你获得了<span class=\"yellow\">$addmhp</span>点生命最大值！<br>";
+
+				if ($itms != $nosta) {
+					$itms --;
+					if ($itms <= 0) {
+						$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+						$itm = $itmk = $itmsk = '';
+						$itme = $itms = 0;
+					}
+				}
 			}
 		}

@@ -1306,7 +1388,6 @@ function itemuse($itmn,&$data=NULL) {
 			<br>
 			<span class=\"blueseed\">同时，你还隐约听见了一个声音：<br>
 			「你可能需要找个纯度更高的代码片段哟~」<br></span>";
-			$falsify = true;
 			}else{

 			$gainless = $clbpara['fireseedmaxDefGain'] - $clbpara['fireseedmaxDefAdd'];
@@ -1323,6 +1404,14 @@ function itemuse($itmn,&$data=NULL) {
 				「看起来这个纯度的代码片段已经喂不饱你了。<br>
 				赶快找下一个纯度的代码片段吧！」<br></span>";
 			}
+			if ($itms != $nosta) {
+				$itms --;
+				if ($itms <= 0) {
+					$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+					$itm = $itmk = $itmsk = '';
+					$itme = $itms = 0;
+				}
+			}

 			}
 			}else{
@@ -1331,28 +1420,39 @@ function itemuse($itmn,&$data=NULL) {

 				$log.="你将<span class=\"yellow\">{$itm}</span>吞下了肚。<br>
 				载有防御数据的代码片段让你获得了<span class=\"yellow\">$adddef</span>点基础防御力！<br>";
+
+				if ($itms != $nosta) {
+					$itms --;
+					if ($itms <= 0) {
+						$log .= "<span class=\"red\">$itm</span>的余烬崩解消失了……<br>";
+						$itm = $itmk = $itmsk = '';
+						$itme = $itms = 0;
+					}
+				}
 			}
 		}

 		else{
 			$log.="这段代码……要如何使用呢？<br>";
-			$falsify = true;
 		}

-		//Process item decrease.
-		if ($itms != $nosta) {
+		//Process a special check for total Ash item used, for future usage.
+		$clbpara['fireseedAshUsage'] += $rank;
+
+		//Process item decrease. - Changed to do it only after succeeding item usage.
+/* 		if ($itms != $nosta) {
 			$itms --;
 			if ($itms <= 0) {
 				$log .= "<span class=\"red\">$itm</span>用光了。<br>";
 				$itm = $itmk = $itmsk = '';
 				$itme = $itms = 0;
 			}
-		}
+		} */
 	# Special check for a poisoned fireseed item, WIP for now.	
 	}elseif($itmk == 'P🎆'){
 		$log.="这个<span class=\"yellow\">{$itm}</span>有毒！到底是谁干的！<br>";
 		# For Maximum Funniness, we destroy this item.
-		$log .= "<span class=\"red\">$itm</span>用光了。<br>";
+		$log .= "<span class=\"red\">$itm</span>的余烬向天上盘旋飞舞，消失了。<br>";
 		$itm = $itmk = $itmsk = '';
 		$itme = $itms = 0;
 	}elseif (strpos ( $itmk, 'Y' ) === 0 || strpos ( $itmk, 'Z' ) === 0) {
@@ -1664,12 +1764,18 @@ function itemuse($itmn,&$data=NULL) {
 			$dice = rand ( 0, 99 );
 			$dice2 = rand ( 0, 99 );
 			$skill = array ('WP' => $wp, 'WK' => $wk, 'WG' => $wg, 'WC' => $wc, 'WD' => $wd, 'WF' => $wf );
+			$skill_advanced = array ('WJ' => $wg, 'WB' => $wc );
 			arsort ( $skill );
 			$skill_keys = array_keys ( $skill );
+			$skill_advanced_keys = array_keys ( $skill_advanced );			
 			$nowsk = substr ( $wepk, 0, 2 );
+			if (strlen($wepk) > 2) $subsk = 'W'.$wepk[2];
 			$maxsk = $skill_keys [0];
-			if (($skill [$nowsk] != $skill [$maxsk]) && ($dice < 30)) {
-				$wepk = $maxsk;
+			// 复合武器只要其中一个类别是最高就不会改系
+			// 上位武器熟练超过1200不会改系，可能算加强六系称号
+			if (((!in_array($nowsk, $skill_advanced_keys) && ($skill [$nowsk] != $skill [$maxsk]) && (empty($subsk) || ((!empty($subsk) && !in_array($subsk, $skill_advanced_keys) && ($skill [$subsk] != $skill [$maxsk]))))) || (in_array($nowsk, $skill_advanced_keys) && ($skill_advanced [$nowsk] < 1200))) && ($dice < 30))
+			{
+				$wepk = substr_replace($wepk, $maxsk, 0, 2);
 				$kind = "更改了{$wep}的<span class=\"yellow\">类别</span>！";
 			} elseif (($weps != $nosta) && ($dice2 < 70)) {
 				$weps += ceil ( $wepe / 2 );

--- a/include/game/itemmain.func.php
+++ b/include/game/itemmain.func.php
@@ -1245,7 +1245,7 @@ function itembuy($item,$shop,$bnum=1,&$data=NULL)
 		$log .= '你的钱不够，不能购买此物品！<br><br>';
 		$mode = 'command';
 		return;
-	} elseif(!preg_match('/^(WC|WD|WF|Y|B|C|TN|GB|H|V|M)/',$iteminfo['itmk'])&&$bnum>1) {
+	} elseif(!preg_match('/^(WC|WD|WF|X|Y|B|C|TN|GA|GB|H|V|M|ygo|p)/',$iteminfo['itmk'])&&$bnum>1) {
 		$log .= '此物品一次只能购买一个。<br><br>';
 		$mode = 'command';
 		return;
@@ -1387,6 +1387,15 @@ function getcorpse($item,&$data=NULL)
 		$mode = 'command';
 		return;
 	}
+	
+	if($item == 'pickpocket')
+	{
+		//用视野保存一下，可以吗？
+		check_add_searchmemory($edata['pid'],'corpse',$edata['name'],$data);
+		$log = '';
+		$mode = 'sp_pickpocket';
+		return;
+	}

 	if($item == 'loot_depot')
 	{
@@ -1657,12 +1666,12 @@ function reload_single_set_item(&$pa,$eqp,$enm,$active=0)
 function check_item_edit_event($pa,&$pd,$event)
 {
 	$flag = 0;
-	for($i=0;$i<=6;$i++)
-	{
-		if(!empty($pd['itms'.$i]))
+	# 「渗透」效果判定
+	if($event == 'c8_infilt')
+	{	
+		for($i=0;$i<=6;$i++)
 		{
-			# 「渗透」效果判定
-			if($event == 'c8_infilt')
+			if(!empty($pd['itms'.$i]))
 			{
 				if(strpos($pd['itmk'.$i],'H')===0)
 				{
@@ -1673,6 +1682,36 @@ function check_item_edit_event($pa,&$pd,$event)
 			}
 		}
 	}
+	# 「延咒」效果判定
+	elseif($event == 'tl_cursetouch')
+	{
+		//偷懒，尝试12次添加诅咒属性
+		for($i=1;$i<=12;$i++)
+		{
+			
+			$curse_id = rand(1,12);
+			//1-6表示背包道具
+			if($curse_id <= 6)
+			{
+				if(!empty($pd['itms'.$i]) && strpos($pd['itmsk'.$i],'V')===False)
+				{					
+					$pd['itmsk'.$i] .= 'V';
+					$flag = 1;
+				}
+			}
+			//7-12表示装备
+			else
+			{
+				$curse_equipment = (Array('wep','arb','arh','ara','arf','art'))[$curse_id - 7];
+				if(!empty($pd[$curse_equipment]) && strpos($pd[$curse_equipment.'sk'],'V')===False)
+				{					
+					$pd[$curse_equipment.'sk'] .= 'V';
+					$flag = 1;
+				}				
+			}
+			if($flag == 1) break;
+		}
+	}
 	return $flag;
 }


--- a/include/game/revattr.calc.php
+++ b/include/game/revattr.calc.php
@@ -16,6 +16,13 @@ namespace revattr
 			$sk_rn = get_skillvars('c4_sniper','rangegain');
 			$range += $sk_rn;
 		}
+		
+		#「妙手」效果判定：
+		if(isset($pa['bskill_tl_pickpocket']))
+		{
+			//射程与灵系相同
+			$range = 1;
+		}
 		return $range;
 	}


--- a/include/game/revattr.func.php
+++ b/include/game/revattr.func.php
@@ -339,6 +339,16 @@ namespace revattr
 			$key = array_search('r',$pa['ex_keys']);
 			unset($pa['ex_keys'][$key]);
 		}
+		# 「妙手」效果判定：
+		if(isset($pa['bskill_tl_pickpocket']))
+		{
+			global $exdmgname;
+			foreach (array_keys($exdmgname) as $ex)
+			{
+				$key = array_search($ex,$pa['ex_keys']);
+				unset($pa['ex_keys'][$key]);
+			}
+		}
 		# 「天义」效果判定：
 		if(isset($pa['skill_c6_justice']) && (empty($pa['ex_keys']) || !in_array('N',$pa['ex_keys']))) $pa['ex_keys'][] = 'N';
 		return;
@@ -1105,6 +1115,12 @@ namespace revattr
 			$dmg_p[]= $p; 
 			$log.="<span class='yellow'>「解构」使{$pa['nm']}造成的物理伤害提高了{$sk_p}%！</span><br>";
 		}
+		#「妙手」判定：
+		if(isset($pa['bskill_tl_pickpocket']))
+		{
+			$dmg_p[]= 0; 
+			$log.="<span class='yellow'>「妙手」使{$pa['nm']}的本次攻击几乎没有造成任何伤害！</span><br>";
+		}
 		#「宗师」判定：
 		if(isset($pa['skill_c13_master']) && $pa['wep_kind'] != 'N')
 		{
@@ -1883,6 +1899,90 @@ namespace revattr
 				$fin_dmg -= $offset_dmg;
 			}
 		}
+		# 「爆血」技能效果：
+		if(isset($pa['bskill_c21_blaster']))
+		{
+			$dmgrate = get_skillvars('c21_blaster','dmgrate');
+			$esum = 0;
+			$ssum = 0;
+			$sk_tot = '';
+			
+			if(!isset($data))
+			{
+				global $pdata;
+				$data = &$pdata;
+			}
+			extract($data,EXTR_REFS);
+				
+			//引爆身上的全部代码片段，并记录效耐和与属性
+			$log .= "{$pa['nm']}引爆了身上所有的代码片段！<br>";
+			foreach (array(1, 2, 3, 4, 5, 6) as $item_position)
+			{
+				if (mb_strpos(${'itmk' . $item_position}, '🥚') === 0)
+				{
+					$itme = &${'itme' . $item_position};
+					$itms = &${'itms' . $item_position};
+					$itmsk = &${'itmsk' . $item_position};
+					$esum += $itme;
+					if ($itms === '∞') $ssum += 120;
+					else $ssum += (int)$itms;
+					$sk_tot .= $itmsk;
+					destory_single_item($pdata, $item_position);
+				}
+			}
+			//对双方造成等同于这些片段上的异常状态
+			global $ex_inf, $exdmginf;				
+			$ex_inf_arr = '';
+			for ($i = 0; $i < mb_strlen($sk_tot); $i++)
+			{
+				if ((isset($ex_inf[$sk_tot[$i]])) && (mb_strpos($ex_inf_arr, $ex_inf[$sk_tot[$i]]) === false)) {
+					$ex_inf_arr .= $ex_inf[$sk_tot[$i]];
+					get_inf_rev($pa,$ex_inf[$sk_tot[$i]]);
+					get_inf_rev($pd,$ex_inf[$sk_tot[$i]]);
+					$log .= "<span class='yellow'>爆炸的代码片段使双方{$exdmginf[$ex_inf[$sk_tot[$i]]]}了！</span><br>";
+				}
+			}		
+			
+			//特定系数：耐久和100以下是0.2，500以上是0.4，2500以上是0.6，10000以上是1.0，30000以上是2.0
+			if ($ssum < 100) $s_factor = 0.2;
+			elseif ($ssum < 500) $s_factor = 0.3;
+			elseif ($ssum < 2500) $s_factor = 0.4;
+			elseif ($ssum < 10000) $s_factor = 0.6;
+			elseif ($ssum < 30000) $s_factor = 1.0;
+			else $s_factor = 2.0;
+			
+			//对双方造成等同于这些片段上的效果和除以特定系数的额外伤害
+			if ($esum == 0) $blaster_dmg = 1;
+			else $blaster_dmg = (int)($esum / $s_factor);
+			$pa['hp'] -= $blaster_dmg;
+			if ($pa['hp'] <= 0)
+			{
+				$pa['hp'] = 0;				
+				include_once GAME_ROOT . './include/state.func.php';
+				death('club21_blaster');
+			}
+			
+			//每受到100点伤害就随机炸伤对手身上一个部位
+			$hurt_times = min(floor($blaster_dmg/$dmgrate), 4);
+			$hurts = array('b','h','a','f');
+			$rand_hurt_key = array_rand($hurts, $hurt_times);
+			//array_rand怎么是这样的？
+			if ($hurt_times == 1)
+			{
+				get_inf_rev($pd, $hurts[$rand_hurt_key]);
+				$log .= "<span class=\"yellow\">爆炸的代码片段使{$pd['nm']}{$exdmginf[$hurts[$rand_hurt_key]]}了！</span><br>";
+			}
+			else
+			{
+				foreach ($rand_hurt_key as $key) {
+					get_inf_rev($pd, $hurts[$key]);
+					$log .= "<span class=\"yellow\">爆炸的代码片段使{$pd['nm']}{$exdmginf[$hurts[$key]]}了！</span><br>";
+				}
+			}
+			
+			$log .= "<span class=\"yellow\">爆炸的代码片段对双方造成了<span class=\"red\">$blaster_dmg</span>点额外伤害！</span><br>";
+			$fin_dmg += $blaster_dmg;
+		}
 		# 伤害制御判定：
 		if(in_array('h',$pd['ex_keys']) && $fin_dmg>=1950)
 		{

--- a/include/game/revclubskills_extra.func.php
+++ b/include/game/revclubskills_extra.func.php
@@ -272,6 +272,76 @@
 			}
 			return 1;
 		}
+		# 事件：驱血
+		if($event == 'creation')
+		{
+			include GAME_ROOT.'./gamedata/club21cfg.php';
+			$new_itmsk = get_skillpara($sk,'choice',$clbpara);
+			$sp_rate = get_skillvars($sk,'sp_rate');
+			$skillpoint_value = get_skillvars($sk,'skillpoint_value');
+			if (!empty($itmsk_extract_rate[$new_itmsk]))
+			{
+				$sp_cost = $itmsk_extract_rate[$new_itmsk] * $sp_rate;
+				if ($sp < $sp_cost)
+				{
+					if ($sp + $skillpoint_value * $skillpoint >= $sp_cost)
+					{
+						$skillpoint_cost = ceil(($sp_cost - $sp) / $skillpoint_value);
+						$log .= "消耗" . $skillpoint_cost . "技能点，代替了体力消耗。<br>";
+						$skillpoint -= $skillpoint_cost;
+						$sp_cost = $sp;
+					}
+					else
+					{
+						$log .= "体力与技能点不足，无法制造代码片段。<br>";
+						return 1;
+					}
+				}
+				$log .= "消耗体力" . $sp_cost . "点，制造了该代码片段。<br>";
+				$sp = $sp - $sp_cost;
+				$itm0 = "数据结成的属性代码片段";
+				$itmk0 = '🥚'; 
+				$itme0 = 0; 
+				$itms0 = 1; 
+				$itmsk0 = $new_itmsk;
+				return 1;
+			}
+			else 
+			{
+				$log .= "该属性代码片段无法制造！这可能是一个BUG，请联系管理员。<br>";
+			}
+			return 0;
+		}
+		# 事件：涌血
+		if($event == 'discovery')
+		{
+			global $gamevars;
+			include GAME_ROOT.'./include/game/club21.func.php';
+			if(empty($gamevars['name_fragment_list'])) $gamevars['name_fragment_list'] = generate_name_fragment_list($item_name_fragment_list, $name_fragment_available_num);
+			$rank = get_skillpara($sk,'rank',$clbpara);
+			$spcost = get_skillvars($sk,'spcost');
+			$hpcost = get_skillvars($sk,'hpcost');
+			
+			if (($sp > $spcost) && ($hp > $hpcost))
+			{
+				$log .= "消耗体力上限" . $spcost . "点。<br>";
+				$log .= "消耗生命上限" . $hpcost . "点。<br>";
+				$msp -= $spcost;
+				$mhp -= $hpcost;
+				if ($sp > $msp) $sp = $msp;
+				if ($hp > $mhp) $hp = $mhp;
+				// 随机抽取一个当前技能等级的字段
+				$rand_key = array_rand($gamevars['name_fragment_list'][$rank]);
+				$new_frag = $gamevars['name_fragment_list'][$rank][$rand_key];
+				$log .= "发现了字段<span class='yellow'>「" . $new_frag . "」</span>。<br>";
+				set_skillpara($sk,'frag',$new_frag,$clbpara);
+				return 1;
+			}
+			else{
+				$log .= "你的体力与生命上限无法支撑你的这次尝试。<br>";
+			}
+			return 0;			
+		}
 		# 事件：获取指定技能
 		if(strpos($event,'getskill_') === 0)
 		{
@@ -647,5 +717,80 @@
 		}
 		return;
 	}
+	
+	# 妙手给尸体/塞东西
+	function skill_tl_pickpocket_act($itmn)
+	{
+		global $log,$pdata,$cskills,$db,$tablepre;
+		$lock = check_skill_unlock('tl_pickpocket',$pdata);
+	
+		$id = (end($pdata['clbpara']['smeo']))[0];
+		$result = $db->query("SELECT * FROM {$tablepre}players WHERE pid = '$id'");
+		$edata = $db->fetch_array($result);
+		
+		if(!$edata)
+		{
+			$log .= "就当你刚拿出道具的时候，却发现先前看到的尸体已经不见了。这是怎么做到的？<br>";
+			$action = ''; $bid = 0;
+			$mode = 'command';
+			return;
+		}
+		
+		if(!$lock)
+		{
+			# 扣除怒气
+			$pdata['rage'] -= get_skillvars('tl_pickpocket','ragecost');
+			if(!$pdata['itms'.$itmn])
+			{
+				$log .= '此道具不存在！';
+				$action = ''; $bid = 0;
+				$mode = 'command';
+				return;
+			}
+			//诅咒物品都放？做个人吧！
+			elseif(strpos($pdata['itmsk'.$itmn],'V')!==false)
+			{
+				$log .= "你刚拿起这个道具，就感觉脑内一片空白。<br>……你本来打算干什么来着？<br>不知为何，你感到了强烈的负罪感。<br>";
+				$pdata['rp'] += 2333;
+				$action = ''; $bid = 0;
+				return;
+			}
+			//灵魂绑定物品放上去会消失，赛博烧纸
+			elseif(strpos($pdata['itmsk'.$itmn],'v')!==false)
+			{
+				$log .= "你将这个道具放到了尸体上，它瞬间化作灰烬消散了。<br>……<br>你感到内心稍微平静了一些。<br>";
+				destory_single_item($pdata, $itmn);
+				$pdata['rp'] -= 777;
+				$action = ''; $bid = 0;
+				return;
+			}
+
+			for($i = 1;$i <= 6; $i++)
+			{
+				if(!$edata['itms'.$i]) 
+				{
+					$edata['itm'.$i] = $pdata['itm'.$itmn];
+					$edata['itmk'.$i] = $pdata['itmk'.$itmn];
+					$edata['itme'.$i] = $pdata['itme'.$itmn];
+					$edata['itms'.$i] = $pdata['itms'.$itmn];
+					$edata['itmsk'.$i] = $pdata['itmsk'.$itmn];
+					player_save($edata);
+					$log .= '你冷静下来张望四周，然后迅速将一个道具放入了尸体身上的物品中。<br>希望不要有人发现……？<br>';
+					destory_single_item($pdata, $itmn);	
+					//坏东西！
+					$pdata['rp'] += 233;				
+					$action = ''; $bid = 0;
+					return;
+				}
+			}
+			$log .= "尸体身上已经放了不少东西，你找不到一个合适的位置来放下你的物品。<br>";
+		}
+		else 
+		{
+			$log .= isset($cskills['tl_pickpocket']['lockdesc'][$lock]) ? $cskills['tl_pickpocket']['lockdesc'][$lock] : $lock;
+		}
+		return;
+	}
+

 ?>
--- a/include/game/revcombat_extra.func.php
+++ b/include/game/revcombat_extra.func.php
@@ -228,6 +228,38 @@ namespace revcombat
 			}
 		}
 		
+		# 「延咒」效果判定
+		if(isset($pa['skill_tl_cursetouch']))
+		{
+			$curse_obbs = get_skillvars('tl_cursetouch','curse_obbs');
+			$curserate = get_skillvars('tl_cursetouch','curserate');
+			$dice = diceroll(99);
+			if (in_array('V',$pa['ex_keys'])) $curse_obbs *= $curserate;
+			if($dice < $curse_obbs)
+			{
+				include_once GAME_ROOT.'./include/game/itemmain.func.php';
+				$flag = check_item_edit_event($pa,$pd,'tl_cursetouch');
+				if($flag) $log .= "<span class='yellow'>「延咒」使{$pd['nm']}受到了诅咒！</span><br>";
+			}
+		}
+	
+		# 「妙手」效果判定
+		if (isset($pa['bskill_tl_pickpocket']))
+		{
+			$picklimit = get_skillvars('tl_pickpocket','picklimit');
+			//这叫earn合适吗？
+			$earn = round($pd['money'] * rand(0, $picklimit) / 100);
+			if ($earn == 0) $log .= "<span class='yellow'>{$pa['nm']}没有从{$pd['nm']}身上获得金钱！</span><br>";
+			else
+			{
+				$pd['money'] -= $earn;
+				$pa['money'] += $earn;				
+				$log .= "<span class='yellow'>你从{$pd['nm']}身上获得了{$earn}元金钱！</span><br>";
+				if(!$pd['type'] && $pd['nm']!='你') $pd['logsave'] .= "你被窃走了{$earn}元金钱！<br>";
+				elseif(!$pa['type'] && $pa['nm']!='你') $pa['logsave'] .= "你从{$pd['name']}身上获得了{$earn}元金钱！<br>";
+			}
+		}
+		
 		# 「冰心」效果判定
 		if (isset($pd['skill_c9_iceheart']) && !empty($pd['inf']))
 		{

--- a/include/game/search.func.php
+++ b/include/game/search.func.php
@@ -398,6 +398,32 @@ function move_search_events(&$data,$act)
 			}			
 		}
 	}
+	
+	# club21的移动烧血放在这里，对吗？
+	if((!check_skill_unlock('c21_stormedge',$data)) && (get_skillpara('c21_discovery','count',$data['clbpara']) < 7)) {
+		$burn_rate = get_skillvars('c21_stormedge','burn_rate');
+		$consume_rate = get_skillvars('c21_stormedge','consume_rate');
+		$gain_rate = get_skillvars('c21_stormedge','gain_rate');
+		$sk = 'c21_stormedge';
+		$ms = get_skillpara($sk,'ms',$data['clbpara']) + 1;
+		$sp_down = round($msp * ($burn_rate * $ms - $consume_rate * sqrt($clbpara['consumpt']))/100);
+		if ($sp <= $sp_down) $sp_down = max($sp - 1, 0);
+		elseif ($sp_down < 0) $sp_down = 0;
+		$sp = $sp - $sp_down;
+		$msp = $msp + round($gain_rate * $sp_down);
+		$log .= "因为体内<span class=\"glitchb\">数据风暴</span>肆虐减少了<span class=\"red\">$sp_down</span>点体力！<br>";
+		if($act == 'move')
+		{
+			$damage = round($mhp * ($burn_rate * $ms - $consume_rate * sqrt($clbpara['consumpt']))/100);
+			if ($hp <= $damage) $damage = $hp - 1;
+			elseif ($damage <= 0) $damage = 1;
+			$hp = $hp - $damage;
+			$mhp = $mhp + round($gain_rate * $damage);
+			$log .= "因为体内<span class=\"glitchb\">数据风暴</span>肆虐减少了<span class=\"red\">$damage</span>点生命！<br>";
+		}
+		set_skillpara($sk,'ms',$ms,$data['clbpara']);
+		return;
+	}

 	# 光玉雨天气效果判定：
 	if($weather == 18)

--- a/include/game/special.func.php
+++ b/include/game/special.func.php
@@ -478,261 +478,6 @@ function press_bomb(){
 	return;
 }

-//提取代码片段逻辑
-function item_extract_trait($which, $item_position)
-{
-    include_once GAME_ROOT . './gamedata/club21cfg.php';
-    //去掉string which的最后一位
-    $which = substr($which, 0, -1);
-
-    global $log, $mode, $club, $sp;
-    if ($club != 21) {
-        $log .= '你的称号不能使用该技能。';
-        $mode = 'command';
-        return;
-    }
-
-    if ($item_position < 1 || $item_position > 6) {
-        $log .= '此道具不存在，请重新选择。';
-        $mode = 'command';
-        return;
-    }
-    global ${'itm' . $item_position}, ${'itmk' . $item_position}, ${'itme' . $item_position}, ${'itms' . $item_position}, ${'itmsk' . $item_position};
-
-    $oriitm = &${'itm' . $item_position};
-	$itm = &${'itm' . $item_position};
-    $itmk = &${'itmk' . $item_position};
-    $itme = &${'itme' . $item_position};
-    $itms = &${'itms' . $item_position};
-    $itmsk = &${'itmsk' . $item_position};
-
-    $tmp_trait = ${$which . $item_position};
-
-    // 判断itmk是否以'D'或'W'开头
-    if (strpos($itmk, 'D') === 0 || strpos($itmk, 'W') === 0) {
-        // 给代码片段命名
-        if ($which == 'itm') {            
-            preg_match_all('/(改|棍棒|\+(\\d+))/u', $itm, $matches);
-            if (!empty($matches[0])) {
-                $sp_cost = 0;
-                foreach ($matches[0] as $match) {
-                    if ($match == '改') {
-                        $sp_cost += $itm_extract_rate['改'] * 1;
-                    } elseif ($match == '棍棒') {
-                        $sp_cost += $itm_extract_rate['棍棒'] * 1;
-                    } else {
-                        preg_match('/\+(\d+)/', $match, $numberMatch);
-                        $number = isset($numberMatch[1]) ? (int) $numberMatch[1] : 0;
-                        $sp_cost += $itm_extract_rate['+'] + $itm_extract_rate['n'] * $number;
-                    }
-                }
-                if ($sp < $sp_cost) {
-                    $log .= '体力不足，无法转换为代码片段。<br>';
-                    return;
-                }
-                $sp -= $sp_cost;
-                $log .= '消耗体力' . $sp_cost . '点。<br>';
-
-                $itm = implode('', $matches[0]);
-                $itm = (string)$itm;
-                
-                $itm = "🥚" . $itm . '🥚的代码片段';
-                $itmk = '🥚';
-                $itme = '0';
-                $itms = '1';
-                $itmsk = '';
-                return;
-            }
-            else {
-                $log .= '该物品无法转换为代码片段。<br>';
-                return;
-            }
-        } elseif ($which == 'itme') {
-            if ($sp < $itme_extract_rate * $itme) {
-                $log .= '体力不足，无法转换为代码片段。<br>';
-                return;
-            }
-            //$itm = "效果" . ${$which . $item_position} . '代码片段';
-			$itm = '🥚' . $oriitm . '🥚的效果代码片段';
-            $log .= '消耗体力' . $itme_extract_rate * $itme . '点。<br>';
-            $sp -= $itme_extract_rate * $itme;
-        } elseif ($which == 'itms') {
-            //如果itms为∞
-            if ($itms == '∞') {
-                if ($sp < $itms_infinite_extract_rate* 1) {
-                    $log .= '体力不足，无法转换为代码片段。<br>';
-                    return;
-                }
-                $itm = '🥚' . $oriitm . '🥚的耐久代码片段';
-                $log .= '消耗体力' . $itms_infinite_extract_rate* 1 . '点。<br>';
-                $sp -= $itms_infinite_extract_rate* 1;
-                $itmk = '';
-                $itme = '0';
-                $itms = '∞';
-                $itmsk = '';
-                ${$which . $item_position} = $tmp_trait;
-                // 将itmk替换为代码片段的itmk
-                $itmk = '🥚';
-                $log .= '成功将物品转换为代码片段。<br>';
-                return;
-            }
-            if ($sp < $itms_extract_rate * $itms) {
-                $log .= '体力不足，无法转换为代码片段。<br>';
-                return;
-            }
-            //$itm = "耐久" . ${$which . $item_position} . '代码片段';
-			$itm = '🥚' . $oriitm . '🥚的耐久代码片段';
-            $log .= '消耗体力' . $itms_extract_rate * $itms . '点。<br>';
-            $sp -= $itms_extract_rate * $itms;
-        } elseif ($which == 'itmsk') {
-            preg_match_all('/./u', $itmsk, $matches);
-            //var_dump($matches);
-            //如果matches没有
-            if (empty($matches[0])) {
-                $log .= '该物品无法转换为代码片段。<br>';
-                return;
-            }
-            foreach ($matches[0] as $single_itmsk) {
-                if (isset($itmsk_extract_rate[$single_itmsk])) {
-                    $sum += 1 * $itmsk_extract_rate[$single_itmsk];
-                }
-            }
-            if ($sp < $sum) {
-                $log .= '体力不足，无法转换为代码片段。<br>';
-                return;
-            }
-            //$itm = "属性" . ${$which . $item_position} . '代码片段';
-			$itm = '🥚' . $oriitm . '🥚的属性代码片段';
-            $log .= '消耗体力' . $sum . '点。<br>';
-            $sp -= $sum;
-        }
-        $itmk = '';
-        $itme = '0';
-        $itms = '0';
-        $itmsk = '';
-        ${$which . $item_position} = $tmp_trait;
-        $itms += 1;
-        // 将itmk替换为代码片段的itmk
-        $itmk = '🥚';
-        $log .= '成功将物品转换为代码片段。<br>';
-    } else {
-        $log .= '该物品无法转换为代码片段。<br>';
-    }
-    return;
-}
-
-//合并代码片段逻辑
-function  item_add_trait($choice1, $choice2)
-{
-    //var_dump($choice1, $choice2);
-    global $log, $mode, $club, $sp, $rage, $pdata;
-    if ($club != 21) {
-        $log .= '你的称号不能使用该技能。';
-        $mode = 'command';
-        return;
-    }
-    //获取choice1和choice2的itm itmk itme itms itmsk
-    global ${'itm' . $choice1}, ${'itmk' . $choice1}, ${'itme' . $choice1}, ${'itms' . $choice1}, ${'itmsk' . $choice1};
-    global ${'itm' . $choice2}, ${'itmk' . $choice2}, ${'itme' . $choice2}, ${'itms' . $choice2}, ${'itmsk' . $choice2};
-    $itmc1 = &${'itm' . $choice1};
-    $itmkc1 = &${'itmk' . $choice1};
-    $itmec1 = &${'itme' . $choice1};
-    $itmsc1 = &${'itms' . $choice1};
-    $itmskc1 = &${'itmsk' . $choice1};
-    $itmc2 = &${'itm' . $choice2};
-    $itmkc2 = &${'itmk' . $choice2};
-    $itmec2 = &${'itme' . $choice2};
-    $itmsc2 = &${'itms' . $choice2};
-    $itmskc2 = &${'itmsk' . $choice2};
-    //检查itmk1是否为🥚,itmk2是否为D或W开头或者是否为🥚
-    if ($itmkc1 != '🥚' || (strpos($itmkc2, 'D') !== 0 && strpos($itmkc2, 'W') !== 0 && ($itmkc2 !== '🥚'))) {
-        $log .= '该物品无法合并。<br>';
-        return;
-    }
-    //让itm2属性合并itm1
-    //如果都是🥚，则去掉$itm的所有“代码片段”四个字，然后itm相加
-    if ($itmkc1 == '🥚' && $itmkc2 == '🥚') {
-        //var_dump($itmkc1, $itmkc2);
-        //var_dump($itmc1, $itmc2);
-        preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc1, $matches1);
-        preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc2, $matches2);
-        if (!empty($matches1[0]) || !empty($matches2[0])) {
-            $itmn_result = '';
-            foreach ($matches1[0] as $match) {
-                $itmn_result .= $match;
-            }
-            foreach ($matches2[0] as $match) {
-                $itmn_result .= $match;
-            }
-            $itmc2 = '🥚' . $itmn_result . '🥚复合代码片段';
-        }
-        else {
-            $itmc2 = '🥚复合代码片段🥚';
-        }   
-        $itmkc2 = $itmkc1 . $itmkc2;
-        $itmec2 = (int)$itmec1 + (int)$itmec2;
-        //当任意一个itms为∞
-        if ($itmsc1 == '∞' || $itmsc2 == '∞') {
-            $itmsc2 = '∞';
-        }
-        else {
-            $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
-        }
-        $itmskc2 = $itmskc1 . $itmskc2;
-        $itmkc2 = '🥚';
-        //清空itm1
-        destory_single_item($pdata, $choice1);
-        return;
-    }
-    elseif ($rage < 50 ) {
-        $log .= '怒气不足，无法合并代码片段。<br>';
-        return;
-    }
-    $rage -= 50;
-    //如果itm1含有棍棒或者改或者n
-    preg_match_all('/(改|棍棒|\+(\\d+))/u', $itmc1, $matches);
-    if (!empty($matches[0])) 
-    {
-        $itmn_result = '';
-        //合并match
-        foreach ($matches[0] as $match) {
-            $itmn_result .= $match;
-        }
-        $itmc2 = $itmc2 . $itmn_result;
-        $itmkc2 = $itmkc1 . $itmkc2;
-        $itmec2 = (int)$itmec1 + (int)$itmec2;
-        //当任意一个itms为∞
-        if ($itmsc1 == '∞' || $itmsc2 == '∞') {
-            $itmsc2 = '∞';
-        }
-        else {
-            $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
-        }
-        $itmskc2 = $itmskc1 . $itmskc2;
-        //清空itm1
-        destory_single_item($pdata, $choice1);
-
-        $itmkc2 = str_replace('🥚', '', $itmkc2);
-        return;
-    }
-    $itmkc2 = $itmkc1 . $itmkc2;
-    $itmec2 = (int)$itmec1 + (int)$itmec2;
-    //当任意一个itms为∞
-    if ($itmsc1 == '∞' || $itmsc2 == '∞') {
-        $itmsc2 = '∞';
-    }
-    else {
-        $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
-    }
-    $itmskc2 = $itmskc1 . $itmskc2;
-    //清空itm1
-    destory_single_item($pdata, $choice1);
-    //去除itm2重复的属性
-    $itmskc2 = implode(array_unique(str_split($itmskc2)));
-    //去除itm2属性里的🥚
-    $itmkc2 = str_replace('🥚', '', $itmkc2);
-}
-
 function shoplist($sn,$getlist=NULL) {
 	global $gamecfg,$mode,$itemdata,$areanum,$areaadd,$iteminfo,$itemspkinfo,$club,$horizon;
 	global $db,$tablepre;

--- a/include/news.func.php
+++ b/include/news.func.php
@@ -219,6 +219,10 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>被御柱创死了！";
 			} elseif($news == 'death42'){
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>活用了单人脱出程序机构，提前离开了虚拟幻境！";
+			} elseif($news == 'death44'){
+				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因为提取过于强大的力量而透支了生命";
+			} elseif($news == 'death45'){
+				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>在战斗中引爆代码片段而炸死了自己";
 			} elseif($news == 'death50'){
 				$newsinfo .= "<li><span class=\"rainbow\">{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>牺牲了自己，在虚拟幻境的天空中炸出了一片红霞</span>！";
 			} else {

--- a/include/state.func.php
+++ b/include/state.func.php
@@ -59,6 +59,10 @@
 			$state = 40;
 		} elseif ($death == 's_escape'){
 			$state = 42;
+		} elseif ($death == 'club21_burnout'){
+			$state = 44;
+		} elseif ($death == 'club21_blaster'){
+			$state = 45;
 		} elseif ($death == 'sdestruct'){
 			$state = 50;
 		} else {
@@ -521,8 +525,11 @@
 		if(isset($pa['bskill_c10_decons']) && $pa['final_damage'] > $pd['hp'])
 		{
 			$sk_up = ceil($pd['lvl'] - ($pa['lvl']*0.15));
-			$log.='<span class="yellow">「解构」使'.$pa['nm'].'获得了额外'.$sk_up.'点经验！</span><br>';
-			$expup += $sk_up;
+			if($sk_up > 0)
+			{
+				$log.='<span class="yellow">「解构」使'.$pa['nm'].'获得了额外'.$sk_up.'点经验！</span><br>';
+				$expup += $sk_up;
+			}		
 		}
 		if(!empty($expup)) $pa['exp'] += $expup;
 		//$log .= "$isplayer 的经验值增加 $expup 点<br>";

--- a/templates/default/command.htm
+++ b/templates/default/command.htm
@@ -161,10 +161,13 @@
        </span>
        <span tooltip="插回其他物品让其他物品获得这些属性">
            <input type="button" class="cmdbutton" id="sp_add_trait" name="sp_add_trait" value="插入「🥚」" onclick="$('command').value='special';$('subcmd').name='sp_cmd';$('subcmd').value='sp_add_trait';postCmd('gamecmd','command.php');this.disabled=true;">
+        </span>
+		<span tooltip="消耗代码片段，以永久减少移动/探索时的生命/体力损失">
+            <input type="button" class="cmdbutton" id="sp_consume_trait" name="sp_consume_trait" value="消耗「🥚」" onclick="$('command').value='special';$('subcmd').name='sp_cmd';$('subcmd').value='sp_consume_trait';postCmd('gamecmd','command.php');this.disabled=true;">
        </span>
        <br />
 	<!--{elseif $club == 99}-->
-		<span tooltip="舍弃当前称号，使属性大副提升">
+		<span tooltip="舍弃当前称号，使属性大幅提升">
 			<input type="button" class="cmdbutton" id="sp_pbomb" name="sp_pbomb" value="X 按钮" onclick="$('command').value='special';$('subcmd').name='sp_cmd';$('subcmd').value='sp_pbomb';postCmd('gamecmd','command.php');this.disabled=true;">
 		</span>
 		<br />

--- a/templates/default/corpse.htm
+++ b/templates/default/corpse.htm
@@ -12,6 +12,9 @@
 <!--{if $cstick_flag}-->
 <input type="radio" name="command" id="cstick" value="cstick"><a onclick=sl('cstick'); href="javascript:void(0);" ><span tooltip="消耗100点怒气，将这具尸体变成一把殴系武器">抡起尸体！</span></a><br>
 <!--{/if}-->
+<!--{if $pickpocket_flag}-->
+<input type="radio" name="command" id="pickpocket" value="pickpocket"><a onclick=sl('pickpocket'); href="javascript:void(0);" ><span tooltip="消耗30点怒气，将自己的一个物品置入其中">置入物品</span></a><br>
+<!--{/if}-->
 <!--{if $loot_depot_flag}-->
 <input type="radio" name="command" id="loot_depot" value="loot_depot"><a onclick=sl('loot_depot'); href="javascript:void(0);" >转移安全箱权限</a><br>
 <!--{/if}-->

--- a/templates/default/dialogue.htm
+++ b/templates/default/dialogue.htm
@@ -30,10 +30,10 @@
    </table>
    <br>
    <!--{if $dkey > 0}-->
-        <input type="button" class="cmdbutton" id="c" style="margin-right: 5%;" value="[C]上一页" onclick="changePages('d',-1);">
+        <input type="button" class="cmdbutton" id="i" style="margin-right: 5%;" value="[I]上一页" onclick="changePages('d',-1);">
    <!--{/if}-->
    <!--{if (($dkey <= ($endpage-1)) || (isset($dialogue_branch[$dialogue_id])))}-->
-        <input type="button" class="cmdbutton" id="z" value="[Z]下一页" onclick="changePages('d',1);">
+        <input type="button" class="cmdbutton" id="p" value="[P]下一页" onclick="changePages('d',1);">
    <!--{elseif isset($dialogue_end[$dialogue_id])}-->
        $dialogue_end[$dialogue_id]    
    <!--{/if}-->

--- a/templates/default/header.htm
+++ b/templates/default/header.htm
@@ -15,176 +15,14 @@
 <!--{if (CURSCRIPT == 'game')}-->
 <script type="text/javascript" src="include/record.js"></script>
 <!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='1')}-->
-  <style>
-  body {background-image: url("../../img/location/1.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='2')}-->
-  <style>
-  body {background-image: url("../../img/location/2.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='3')}-->
-<style>
-  body {background-image: url("../../img/location/3.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='4')}-->
-<style>
-  body {background-image: url("../../img/location/4.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='5')}-->
-<style>
-  body {background-image: url("../../img/location/5.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='6')}-->
-<style>
-  body {background-image: url("../../img/location/6.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='7')}-->
-<style>
-  body {background-image: url("../../img/location/7.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='8')}-->
-<style>
-  body {background-image: url("../../img/location/8.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='9')}-->
-<style>
-  body {background-image: url("../../img/location/9.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='10')}-->
-<style>
-  body {background-image: url("../../img/location/10.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='11')}-->
-<style>
-  body {background-image: url("../../img/location/11.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='12')}-->
-<style>
-  body {background-image: url("../../img/location/12.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='13')}-->
-<style>
-  body {background-image: url("../../img/location/13.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='14')}-->
-<style>
-  body {background-image: url("../../img/location/14.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='15')}-->
-<style>
-  body {background-image: url("../../img/location/15.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='16')}-->
-<style>
-  body {background-image: url("../../img/location/16.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='17')}-->
-<style>
-  body {background-image: url("../../img/location/17.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='18')}-->
-<style>
-  body {background-image: url("../../img/location/18.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='19')}-->
-<style>
-  body {background-image: url("../../img/location/19.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='20')}-->
-<style>
-  body {background-image: url("../../img/location/20.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='21')}-->
-<style>
-  body {background-image: url("../../img/location/21.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='22')}-->
-<style>
-  body {background-image: url("../../img/location/22.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='23')}-->
-<style>
-  body {background-image: url("../../img/location/23.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='24')}-->
-<style>
-  body {background-image: url("../../img/location/24.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='25')}-->
-<style>
-  body {background-image: url("../../img/location/25.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='26')}-->
-<style>
-  body {background-image: url("../../img/location/26.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='27')}-->
-<style>
-  body {background-image: url("../../img/location/27.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='28')}-->
-<style>
-  body {background-image: url("../../img/location/28.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='29')}-->
-<style>
-  body {background-image: url("../../img/location/29.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='30')}-->
-<style>
-  body {background-image: url("../../img/location/30.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='31')}-->
-<style>
-  body {background-image: url("../../img/location/31.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='32')}-->
-<style>
-  body {background-image: url("../../img/location/32.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='33')}-->
-<style>
-  body {background-image: url("../../img/location/33.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
-<!--{if (CURSCRIPT == 'game' && $pls=='34')}-->
-<style>
-  body {background-image: url("../../img/location/34.jpg");background-position: center;}
-  </style>
-<!--{/if}-->
+<!--{loop $plsinfo $places $info}-->
+	<!--{if (CURSCRIPT == 'game' && $sdata['pls']==$places)}-->
+	<!--{eval $bgurl = "img/location/".$places.".jpg"}-->
+	<style>
+		body {background-image: url("$bgurl");background-position: center;}
+	</style>
+	<!--{/if}-->
+<!--{/loop}-->
 </head>
 <BODY <!--{if CURSCRIPT == 'game' && $hotkeyon}-->onkeyup="hotkey(event);"<!--{/if}-->>
 <div class="title" >{lang title}</div>

--- a/templates/default/help.htm
+++ b/templates/default/help.htm
@@ -77,7 +77,7 @@
 			<span><A href="help.php#毒药和陷阱">毒药和陷阱</A></span>
 			</TD>
 			<TD class="b3">
-			<span><A href="help.php#内定称号">内定称号与技能点</A></span>
+			<span><A href="help.php#内定称号">内定称号与技能</A></span>
 			</TD>
 			<TD class="b3">
 			<span><A href="help.php#道具合成">道具合成</A></span>
@@ -1875,6 +1875,22 @@ NPC也会发出重击和必杀技，请随时小心。</p>
 		<td class="b3">
 		<span><input type="button" class="cmdbutton" value="点击查看称号技能" onclick="showModalDialog($('skillhelp-c20'));"></span>
 	</tr>
+	<tr>
+		<td class="b2" height=20px>
+		<span class="glitch1">码语行人</span>
+		</td>
+		<td class="b3">
+		<span>道具</span>
+		</td>
+		<td class="b3">
+		<span>可以从防具或武器中提取名称、效果、耐久或属性的代码片段，<br>
+			并使用代码片段强化其他防具或武器。<br>
+			<span class="glitch1">【警告】检测到非法的数据更改！已通知林氏软件技术部门。</span>
+		</span>
+		</td>
+		<td class="b3">
+		<span><input type="button" class="cmdbutton" value="点击查看称号技能" onclick="showModalDialog($('skillhelp-c21'));"></span>
+	</tr>
 </table>
 <br>

@@ -2229,6 +2245,16 @@ NPC也会发出重击和必杀技，请随时小心。</p>
 				<td class="b3"><span>No39.希望皇 霍普 ☆4</span></td>
 				<td class="b3"><span>投掷兵器/240/∞/全系防御</span></td>
 			</tr>
+			<tr>
+				<td class="b3" height=20px><span>游戏王四星素材</span></td>
+				<td class="b3"><span>游戏王四星素材</span></td>
+				<td class="b3"><span>-</span></td>
+				<td class="b3"><span>-</span></td>
+				<td class="b3"><span>-</span></td>
+				<td class="b3">→</td>
+				<td class="b3"><span>英豪冠军 英弓王</span></td>
+				<td class="b3"><span>弓/210/∞/爆炸</span></td>
+			</tr>
 			<tr>
 				<td class="b3" height=20px><span>游戏王四星素材</span></td>
 				<td class="b3"><span>游戏王四星素材</span></td>

--- a/templates/default/shop.htm
+++ b/templates/default/shop.htm
@@ -9,7 +9,7 @@
 <br><br>
 <!--{loop $itemdata $idata}-->
 <!--{if $idata['sid']}-->
-	<!--{eval $idsid = $idata['sid'];$buynumflag = $shop==1||$shop==2||$shop==6||$shop==7||$shop==8||$shop==10||$shop==11||$shop==12 ? 1 : 0;}-->
+	<!--{eval $idsid = $idata['sid'];$buynumflag = $shop==1||$shop==2||$shop==6||$shop==7||$shop==8||$shop==10||$shop==11||$shop==12||$shop==20 ? 1 : 0;}-->
 	<div class="shoprow">
 		<div class="leftbox">
 			<input type="button" class="cmdbutton" value="购买" onclick="$('command').value='$idsid';<!--{if $buynumflag}-->$('buynum').value=$('buynum{$idsid}').value;<!--{/if}-->postCmd('gamecmd','command.php');this.disabled=true;">

--- a/templates/default/skill_c21_creation.htm
+++ b/templates/default/skill_c21_creation.htm
+<!--{eval $skid = 'c21_creation'; $cskill = $cskills[$skid];}-->
+<tr>
+    <td class="b1" width="40">
+        <span>{$cskill['name']}</span>
+    </td>
+    <td>
+        <!--{eval $unlock_skid_flag = check_skill_unlock('c21_creation',$uidata);}-->
+        <!--{eval $para = get_clbpara($uidata['clbpara']); $nchoice = $para['skillpara']['c21_creation']['choice'];}-->
+        <!--{if $unlock_skid_flag}-->
+        <div style="position:relative; height:100%; width:100%;" onmouseover="skill_unacquired_mouseover.call(this,event)" onmouseout="skill_unacquired_mouseout.call(this,event)">
+        <div class="skill_unacquired">
+        <!--{/if}-->
+            <table class="skilltable">
+                <tr>
+                    <td class="skilldesc_left b3">
+                        <span class="skilldesc">
+							<!--{eval $cdesc = parse_skilldesc($skid,$uidata);}-->
+							{$cdesc}
+							&nbsp;
+							<!--{if empty($no_skill_input)}-->
+								选择的属性为：
+								<select name="{$skid}upgpara" id="{$skid}upgpara" onchange="$('mode').value='revskpts';$('command').value='swtskill_{$skid}';postCmd('gamecmd','command.php');this.disabled=true;">
+								<!--{if empty($nchoice)}-->
+								<option value="" selected>无<br />
+								<!--{/if}-->
+								<!--{loop $cskills[$skid]['choice'] $key}-->
+									<!--{if $key != $nchoice}-->
+										<option value="$key">$itemspkinfo[$key]<br />
+									<!--{else}-->
+										<option value="$key" selected>$itemspkinfo[$key]<br />
+									<!--{/if}-->
+								<!--{/loop}-->
+								</select>
+								&nbsp;
+							<!--{/if}-->
+						</span>
+                    </td>
+                    <td class="skilldesc_right b3">
+					    <!--{if empty($no_skill_input)}-->
+                            <!--{if !empty($cskill['input']) && empty($max_lvl_flag)}-->
+                                <input type="button" onclick="$('mode').value='revskpts';$('command').value='upgskill_{$skid}';postCmd('gamecmd','command.php');this.disabled=true;" value="{$cskill['input']}">
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            </table>
+        <!--{if $unlock_skid_flag}-->
+            <!--{eval $unlock_desc = parse_skilllockdesc($skid,$unlock_skid_flag);}-->
+        </div>
+        <div class="skill_unacquired_hint">
+            <table class="skilltable">
+                <tr>
+                    <td valign="center" align="center">
+                        <span class="yellow">
+                            $unlock_desc
+                        </span>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        </div>
+        <!--{/if}-->
+    </td>
+</tr>
\ No newline at end of file
--- a/templates/default/sp_add_trait.htm
+++ b/templates/default/sp_add_trait.htm
@@ -49,4 +49,4 @@
        </select>
 </div>

-<input type="button" class="cmdbutton" id="zz" name="submit" value="[Z]提交" onclick="postCmd('gamecmd','command.php');this.disabled=true;">
+<input type="button" class="cmdbutton" id="zz" name="submit" value="[Z]提交" onclick="postCmd('gamecmd','command.php');this.disabled=true;">
\ No newline at end of file
--- a/templates/default/sp_consume_trait.htm
+++ b/templates/default/sp_consume_trait.htm
+<input type="hidden" name="mode" value="command" />
+<input type="hidden" name="command" value="special" />
+<input type="hidden" name="sp_cmd" value="sp_consume_trait_selected" />
+<input type="hidden" id="choice" name="choice" value="menu" />
+
+<span class="glitchb">／＊</span><br>
+<span class="blueseed">
+	「指指点点省略号……<br>
+    <br>
+    …………等等，这个界面你是怎么点进来的？NPC应该永远用不到它才对啊！<br>
+    如雪如果是你的话，回头给我报个BUG我再来看看……<br>
+    <br> 
+</span>
+<span class="glitchb">＊／</span><br>
+你的脑海中奇怪地闪过了以上内容。<br>……那么，你准备消耗哪个代码片段？<br>
+<br>
+<div style="padding: 5px;">
+    <select name="choice" onclick=sl('choice'); href="javascript:void(0);">
+    <!--{if (strpos($itmk1, '🥚') === 0)}--><option value="1">$itm1/$itme1/$itms1<br /><!--{/if}-->
+    <!--{if (strpos($itmk2, '🥚') === 0)}--><option value="2">$itm2/$itme2/$itms2<br /><!--{/if}-->
+    <!--{if (strpos($itmk3, '🥚') === 0)}--><option value="3">$itm3/$itme3/$itms3<br /><!--{/if}-->
+    <!--{if (strpos($itmk4, '🥚') === 0)}--><option value="4">$itm4/$itme4/$itms4<br /><!--{/if}-->
+    <!--{if (strpos($itmk5, '🥚') === 0)}--><option value="5">$itm5/$itme5/$itms5<br /><!--{/if}-->
+    <!--{if (strpos($itmk6, '🥚') === 0)}--><option value="6">$itm6/$itme6/$itms6<br /><!--{/if}-->
+    </select>
+    <br>
+</div>
+
+<input type="button" class="cmdbutton" id="zz" name="submit" value="[Z]提交" onclick="postCmd('gamecmd','command.php');this.disabled=true;">
\ No newline at end of file
--- a/templates/default/sp_extract_trait.htm
+++ b/templates/default/sp_extract_trait.htm
@@ -31,41 +31,41 @@
 <input type="button" onclick="$('choice').value='itme1';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme1<br>
 <input type="button" onclick="$('choice').value='itms1';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms1<br>
 <input type="button" onclick="$('choice').value='itmsk1';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk1_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <!--{if (strpos ( $itmk2, 'D' ) === 0  ) || (strpos ( $itmk2, 'W' ) === 0) }-->
 <input type="button" onclick="$('choice').value='itm2';postCmd('gamecmd','command.php');this.disabled=true;" value="名称">$itm2<br>
 <input type="button" onclick="$('choice').value='itme2';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme2<br>
 <input type="button" onclick="$('choice').value='itms2';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms2<br>
 <input type="button" onclick="$('choice').value='itmsk2';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk2_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <!--{if (strpos ( $itmk3, 'D' ) === 0  ) || (strpos ( $itmk3, 'W' ) === 0) }-->
 <input type="button" onclick="$('choice').value='itm3';postCmd('gamecmd','command.php');this.disabled=true;" value="名称">$itm3<br>
 <input type="button" onclick="$('choice').value='itme3';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme3<br>
 <input type="button" onclick="$('choice').value='itms3';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms3<br>
 <input type="button" onclick="$('choice').value='itmsk3';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk3_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <!--{if (strpos ( $itmk4, 'D' ) === 0  ) || (strpos ( $itmk4, 'W' ) === 0) }-->
 <input type="button" onclick="$('choice').value='itm4';postCmd('gamecmd','command.php');this.disabled=true;" value="名称">$itm4<br>
 <input type="button" onclick="$('choice').value='itme4';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme4<br>
 <input type="button" onclick="$('choice').value='itms4';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms4<br>
 <input type="button" onclick="$('choice').value='itmsk4';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk4_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <!--{if (strpos ( $itmk5, 'D' ) === 0  ) || (strpos ( $itmk5, 'W' ) === 0) }-->
 <input type="button" onclick="$('choice').value='itm5';postCmd('gamecmd','command.php');this.disabled=true;" value="名称">$itm5<br>
 <input type="button" onclick="$('choice').value='itme5';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme5<br>
 <input type="button" onclick="$('choice').value='itms5';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms5<br>
 <input type="button" onclick="$('choice').value='itmsk5';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk5_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <!--{if (strpos ( $itmk6, 'D' ) === 0  ) || (strpos ( $itmk6, 'W' ) === 0) }-->
 <input type="button" onclick="$('choice').value='itm6';postCmd('gamecmd','command.php');this.disabled=true;" value="名称">$itm6<br>
 <input type="button" onclick="$('choice').value='itme6';postCmd('gamecmd','command.php');this.disabled=true;" value="效果">$itme6<br>
 <input type="button" onclick="$('choice').value='itms6';postCmd('gamecmd','command.php');this.disabled=true;" value="耐久">$itms6<br>
 <input type="button" onclick="$('choice').value='itmsk6';postCmd('gamecmd','command.php');this.disabled=true;" value="属性">$itmsk6_words<br>
-<!--{/if}-->
 <br>
+<!--{/if}-->
 <input type="button" class="cmdbutton" onclick="postCmd('gamecmd','command.php');this.disabled=true;" value="放弃">
\ No newline at end of file
--- a/templates/default/sp_pickpocket.htm
+++ b/templates/default/sp_pickpocket.htm
+想要置入哪个物品？<br><br>
+<input type="hidden" name="mode" value="command" />
+<input type="hidden" name="command" value="special" />
+<input type="hidden" name="sp_cmd" value="sp_pickpocket_selected" />
+<input type="hidden" id="choice" name="choice" value="menu" />
+
+<!--{if $itms1}-->
+置入：<input type="button" name="itm1" value="{$itm1}/{$itme1}/{$itms1}" onclick="$('choice').value='1';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<!--{if $itms2}-->
+置入：<input type="button" name="itm2" value="{$itm2}/{$itme2}/{$itms2}" onclick="$('choice').value='2';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<!--{if $itms3}-->
+置入：<input type="button" name="itm3" value="{$itm3}/{$itme3}/{$itms3}" onclick="$('choice').value='3';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<!--{if $itms4}-->
+置入：<input type="button" name="itm4" value="{$itm4}/{$itme4}/{$itms4}" onclick="$('choice').value='4';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<!--{if $itms5}-->
+置入：<input type="button" name="itm5" value="{$itm5}/{$itme5}/{$itms5}" onclick="$('choice').value='5';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<!--{if $itms6}-->
+置入：<input type="button" name="itm6" value="{$itm6}/{$itme6}/{$itms6}" onclick="$('choice').value='6';postCmd('gamecmd','command.php');"><br>
+<!--{/if}-->
+<input type="button" class="cmdbutton" id="zz" name="back" value="[Z]返回" onclick="postCmd('gamecmd','command.php');this.disabled=true;"><br><br> 
\ No newline at end of file
--- a/templates/default/sp_shop.htm
+++ b/templates/default/sp_shop.htm
@@ -3,7 +3,7 @@
 <input type="hidden" id="command" name="command" value="menu">
 <input type="button" class="cmdbutton" value="离开" onclick="$('command').value='menu';postCmd('gamecmd','command.php');this.disabled=true;">
 <br>
-<!--{loop Array(1=>'补给品',2=>'药剂',3=>$iteminfo['WP'],4=>$iteminfo['WK'],5=>$iteminfo['WG'],6=>$iteminfo['WC'],7=>$iteminfo['WD'],8=>$iteminfo['WF'].'材料',9=>'防具',10=>'书籍',11=>'电子装备',12=>'杂物',17=>'限量福袋',13=>'埃克法轻工特供武器',14=>'林苍月的提示',15=>'Key社纪念品专卖',16=>'NPC解锁钥匙',18=>'上级者向物品') $sid $scmt}-->
+<!--{loop Array(1=>'补给品',2=>'药剂',3=>$iteminfo['WP'],4=>$iteminfo['WK'],5=>$iteminfo['WG'],6=>$iteminfo['WC'],7=>$iteminfo['WD'],8=>$iteminfo['WF'].'材料',9=>'防具',10=>'书籍',11=>'电子装备',20=>'弹药和箭矢',12=>'杂物',17=>'限量福袋',13=>'埃克法轻工特供武器',14=>'林苍月的提示',15=>'Key社纪念品专卖',16=>'NPC解锁钥匙',18=>'上级者向物品') $sid $scmt}-->
 <!--{if $sid % 2}--><br><!--{/if}-->
 <input type="button" class="cmdbutton" name="$sid" value="{$scmt}" style="
 <!--{if mb_strlen($scmt)>8}-->width:140px;<!--{else}-->width:100px;<!--{/if}-->