Merge pull request #183 from winddramon/nachster

itm0 fix

.gitignore

@@ -84,3 +84,5 @@ vendor
 
 # 录像文件
 records
+gamedata/adminlog.php
+templates/default/lastgb.htm

command.php

@@ -142,7 +142,10 @@ if($hp > 0){
 			$mode = 'command';
 			//$action = '';
 		} elseif($mode == 'command') {
-			if($command == 'move') {
+			if(!empty($itms0) && !in_array($command, Array('itemget','itm0','dropitm0','split_itm'))){//手里拿着道具的时候否决一切其他命令，防止道具被覆盖！
+				$log .= "你的双手都已经抓满了东西。为了完成所想，你集中意念召唤幻肢……<br>什么都没有发生，除了你的脑壳痛了起来。<br><br>";
+				$mode = 'command';
+			}	elseif($command == 'move') {
 				include_once GAME_ROOT.'./include/game/search.func.php';
 				move($moveto);
 				if($coldtimeon){$cmdcdtime=$movecoldtime;}
@@ -261,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)

gamedata/adminlog.php

-<? if(!defined("IN_GAME")) exit("Access Denied"); ?>
-1414530645,Amarillo_NMC,gsedit,10,,,
-1414530773,Amarillo_NMC,systemmng,,,,
-1414537000,Amarillo_NMC,addgm,別忘了我,9,,
-1414537473,別忘了我,systemmng,,,,
-1414537500,別忘了我,gamecfgmng,1,,,
-1414543238,才不是食物,infomng,,,,
-1414547511,才不是食物,editpc,左加明,,,
-1414582209,才不是食物,infomng,,,,
-1414597500,別忘了我,systemmng,,,,
-1414864822,別忘了我,gamecfgmng,1,,,
-1416600590,別忘了我,editnpc,班主任 坂持 金发,,,
-1416600595,別忘了我,editnpc,花之领主 风见 幽香,,,
-1418595029,別忘了我,addgm,請借我錢,7,,
-1418737817,請借我錢,killpc,請借我錢,,,
-1419479460,請借我錢,killpc,請借我錢,,,
-1420317004,別忘了我,systemmng,,,,
-1420320898,別忘了我,systemmng,,,,
-1422230817,別忘了我,editnpc,思念体-触手众,,,
-1422230906,別忘了我,livenpc,思念体-触手众,,,
-1424004196,別忘了我,killafker,357,,,
-1424004196,別忘了我,killafker,358,,,
-1424562266,別忘了我,killafker,359,,,
-1424562266,別忘了我,killafker,360,,,
-1426276236,別忘了我,gsedit,30,,,
-1426276240,別忘了我,gsedit,10,,,
-1426277097,別忘了我,systemmng,,,,
-1426278707,請借我錢,editnpc,虚子,,,
-1426278713,請借我錢,editnpc,红暮,,,
-1426278717,請借我錢,wthedit,1,,,
-1426278718,請借我錢,hackedit,1,,,
-1426278745,請借我錢,editpc,請借我錢,,,
-1426278760,請借我錢,editpc,請借我錢,,,
-1426278775,請借我錢,editnpc,感觉像蓝凝的东西,,,
-1426278917,請借我錢,delcp,請借我錢,,,
-1426278924,請借我錢,editnpc,感觉像蓝凝的东西,,,
-1426278931,請借我錢,editnpc,红暮,,,
-1426278939,請借我錢,editnpc,虚子,,,
-1426279124,別忘了我,infomng,,,,
-1426281009,別忘了我,killafker,354,,,
-1426281014,別忘了我,gsedit,30,,,
-1426281017,別忘了我,gsedit,10,,,
-1426281028,別忘了我,systemmng,,,,
+1689639523,admin,gsedit,20,,,
+1689639613,admin,editpc,admin,,,
+1689726316,admin,gsedit,20,,,
+1689726335,admin,editpc,admin,,,
+1689731743,admin,gsedit,20,,,
+1689732513,admin,editpc,admin,,,

templates/default/userwords.htm

@@ -3,10 +3,10 @@
 	<tr>
 		<td>{lang usertitle}</td>
 		<td>
-			<select id="nick" name="nick" onchange="var nicklabel=$('nick').options[$('nick').selectedIndex].label;if(''!=nicklabel) $('nickcmt').innerHTML=nicklabel; else $('nickcmt').innerHTML='<br><br><br>';">
+			<select id="nick" name="nick" onchange="var nicklabel=$('nick').options[$('nick').selectedIndex].getAttribute('comments');if(''!=nicklabel) $('nickcmt').innerHTML=nicklabel; else $('nickcmt').innerHTML='<br><br><br>';">
 				<!--{loop $nicksrev['nicks'] $val}-->
 					<!--{eval $title_desc_tmp = str_replace("\r","<br>",$title_desc[$val]['title']);}-->
-					<option value="{$val}"<!--{if $udata['nick'] == $val}-->selected<!--{/if}--> label="{$title_desc_tmp}">$titles_list[$val]</option>
+					<option value="{$val}"<!--{if $udata['nick'] == $val}-->selected<!--{/if}--> comments="{$title_desc_tmp}">$titles_list[$val]</option>
 				<!--{/loop}-->
 			</select>
 			<span id="nickcmt">选择一个有趣的头衔，部分头衔存在特殊的入场效果。<br><br><br></span>