Merge pull request #175 from winddramon/nachster

change_subwep display fix

.gitignore

@@ -74,6 +74,7 @@ web.config
 
 *.psd
 *.xlsx
+*.bak
 
 # composer
 vendor

include/game/itemmain.func.php

@@ -1496,7 +1496,8 @@ function change_subwep($s=2,&$data=NULL)
         $sweplog .="拿出了<span class='yellow'>{$wep}</span>";
     }
 
-    $log .= $sweplog."。<br>";
+    if(!$sweplog) $log .= '你左手交叠右手，大喝一声：“我特殊召唤两个拳头！”<br>';
+    else $log .= $sweplog."。<br>";
 
     return;
 }

install/bra.sql

@@ -5,34 +5,30 @@
 
 DROP TABLE IF EXISTS bra_game;
 CREATE TABLE bra_game (
-  `gamenum` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `gamestate` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `groomid` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `groomnums` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `groomownid` char(15) NOT NULL default '',
-  `starttime` int(10) unsigned NOT NULL DEFAULT '0',
-  `winmode` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `gamenum` mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
+  `gamestate` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `groomid` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `groomnums` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `groomownid` char(15) NOT NULL DEFAULT '',
+  `starttime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `winmode` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
   `winner` char(15) NOT NULL DEFAULT '',
   `arealist` varchar(255) NOT NULL DEFAULT '',
-  `areanum` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `areatime` int(10) unsigned NOT NULL DEFAULT '0',
-  `areawarn` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `validnum` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `alivenum` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `deathnum` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `afktime` int(10) unsigned NOT NULL DEFAULT '0',
-  `optime` int(10) unsigned NOT NULL DEFAULT '0',
-  `weather` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `hack` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `hdamage` int(10) unsigned NOT NULL DEFAULT '0',
+  `areanum` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `areatime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `areawarn` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `validnum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `alivenum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `deathnum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `afktime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `optime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `weather` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `hack` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+  `hdamage` int(10) UNSIGNED NOT NULL DEFAULT '0',
   `hplayer` char(15) NOT NULL DEFAULT '',
-  `combonum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `combonum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
   `gamevars` text NOT NULL,
   `noisevars` varchar(1000) NOT NULL DEFAULT '',
-  `rdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `bdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `ldown` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `kdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
 
   PRIMARY KEY (`groomid`)
 
@@ -60,11 +56,11 @@ CREATE TABLE bra_users (
   `ip` char(15) NOT NULL DEFAULT '',
   `credits` int(10) NOT NULL DEFAULT '0',
   `credits2` mediumint(9) NOT NULL DEFAULT '0',
-  `achievement` text NOT NULL,
-  `achrev` text NOT NULL,
+  `achievement` text NOT NULL default '',
+  `achrev` text NOT NULL default '',
   `daily` varchar(255) NOT NULL DEFAULT '',
-  `nick` text NOT NULL,
-  `nicks` text NOT NULL,
+  `nick` text NOT NULL default '',
+  `nicks` text NOT NULL default '',
   `nicksrev` text NOT NULL default '',
   `validgames` smallint(5) unsigned NOT NULL DEFAULT '0',
   `wingames` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -93,9 +89,9 @@ CREATE TABLE bra_users (
 DROP TABLE IF EXISTS bra_winners;
 CREATE TABLE bra_winners (
   `gid` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
   `nick` text NOT NULL,
-  `skillpoint` smallint unsigned NOT NULL default '0',
+  `skillpoint` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
   `name` char(15) NOT NULL DEFAULT '',
   `pass` char(32) NOT NULL DEFAULT '',
   `gd` char(1) NOT NULL DEFAULT 'm',
@@ -117,210 +113,118 @@ CREATE TABLE bra_winners (
   `money` smallint(5) unsigned NOT NULL DEFAULT '0',
   `bid` smallint(5) unsigned NOT NULL DEFAULT '0',
   `inf` char(10) NOT NULL DEFAULT '',
-  `rage` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `pose` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `tactic` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `killnum` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `killnum2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `state` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `wp` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `wk` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `wg` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `wc` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `wd` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `wf` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `rage` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `pose` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+  `tactic` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+  `killnum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `killnum2` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `state` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `wp` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wk` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wg` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wc` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wd` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wf` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
   `teamID` char(15) NOT NULL DEFAULT '',
   `teamPass` char(15) NOT NULL DEFAULT '',
-  `teamMate` text NOT NULL default '',
-  `teamIcon` smallint unsigned NOT NULL default '0',
-  wep char(30) NOT NULL default '',
-  wepk char(40) not null default '',
-  wepe int(10) unsigned NOT NULL DEFAULT '0',
-  weps char(10) not null default '0',
-  wepsk char(40) not null default '',
-  wep2 char(30) NOT NULL default '',
-  wep2k char(40) not null default '',
-  wep2e int(10) unsigned NOT NULL DEFAULT '0',
-  wep2s char(10) not null default '0',
-  wep2sk char(40) not null default '',
-  arb char(30) NOT NULL default '',
-  arbk char(40) not null default '',
-  arbe int(10) unsigned NOT NULL DEFAULT '0',
-  arbs char(10) not null default '0',
-  arbsk char(40) not null default '',
-  arh char(30) NOT NULL default '',
-  arhk char(40) not null default '',
-  arhe int(10) unsigned NOT NULL DEFAULT '0',
-  arhs char(10) not null default '0',
-  arhsk char(40) not null default '',
-  ara char(30) NOT NULL default '',
-  arak char(40) not null default '',
-  arae int(10) unsigned NOT NULL DEFAULT '0',
-  aras char(10) not null default '0',
-  arask char(40) not null default '',
-  arf char(30) NOT NULL default '',
-  arfk char(40) not null default '',
-  arfe int(10) unsigned NOT NULL DEFAULT '0',
-  arfs char(10) not null default '0',
-  arfsk char(40) not null default '',
-  art char(30) NOT NULL default '',
-  artk char(40) not null default '',
-  arte int(10) unsigned NOT NULL DEFAULT '0',
-  arts char(10) not null default '0',
-  artsk char(40) not null default '',
-  itm0 char(30) NOT NULL default '',
-  itmk0 char(40) not null default '',
-  itme0 int(10) unsigned NOT NULL DEFAULT '0',
-  itms0 char(10) not null default '0',
-  itmsk0 char(40) not null default '',
-  itm1 char(30) NOT NULL default '',
-  itmk1 char(40) not null default '',
-  itme1 int(10) unsigned NOT NULL DEFAULT '0',
-  itms1 char(10) not null default '0',
-  itmsk1 char(40) not null default '',
-  itm2 char(30) NOT NULL default '',
-  itmk2 char(40) not null default '',
-  itme2 int(10) unsigned NOT NULL DEFAULT '0',
-  itms2 char(10) not null default '0',
-  itmsk2 char(40) not null default '',
-  itm3 char(30) NOT NULL default '',
-  itmk3 char(40) not null default '',
-  itme3 int(10) unsigned NOT NULL DEFAULT '0',
-  itms3 char(10) not null default '0',
-  itmsk3 char(40) not null default '',
-  itm4 char(30) NOT NULL default '',
-  itmk4 char(40) not null default '',
-  itme4 int(10) unsigned NOT NULL DEFAULT '0',
-  itms4 char(10) not null default '0',
-  itmsk4 char(40) not null default '',
-  itm5 char(30) NOT NULL default '',
-  itmk5 char(40) not null default '',
-  itme5 int(10) unsigned NOT NULL DEFAULT '0',
-  itms5 char(10) not null default '0',
-  itmsk5 char(40) not null default '',
-  itm6 char(30) NOT NULL default '',
-  itmk6 char(40) not null default '',
-  itme6 int(10) unsigned NOT NULL DEFAULT '0',
-  itms6 char(10) not null default '0',
-  itmsk6 char(40) not null default '',
+  `teamMate` text NOT NULL,
+  `clbpara` text NOT NULL,
+  `teamIcon` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `wep` char(30) NOT NULL DEFAULT '',
+  `wepk` char(40) NOT NULL DEFAULT '',
+  `wepe` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `weps` char(10) NOT NULL DEFAULT '0',
+  `wepsk` char(40) NOT NULL DEFAULT '',
+  `arb` char(30) NOT NULL DEFAULT '',
+  `arbk` char(40) NOT NULL DEFAULT '',
+  `arbe` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `arbs` char(10) NOT NULL DEFAULT '0',
+  `arbsk` char(40) NOT NULL DEFAULT '',
+  `arh` char(30) NOT NULL DEFAULT '',
+  `arhk` char(40) NOT NULL DEFAULT '',
+  `arhe` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `arhs` char(10) NOT NULL DEFAULT '0',
+  `arhsk` char(40) NOT NULL DEFAULT '',
+  `ara` char(30) NOT NULL DEFAULT '',
+  `arak` char(40) NOT NULL DEFAULT '',
+  `arae` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `aras` char(10) NOT NULL DEFAULT '0',
+  `arask` char(40) NOT NULL DEFAULT '',
+  `arf` char(30) NOT NULL DEFAULT '',
+  `arfk` char(40) NOT NULL DEFAULT '',
+  `arfe` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `arfs` char(10) NOT NULL DEFAULT '0',
+  `arfsk` char(40) NOT NULL DEFAULT '',
+  `art` char(30) NOT NULL DEFAULT '',
+  `artk` char(40) NOT NULL DEFAULT '',
+  `arte` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `arts` char(10) NOT NULL DEFAULT '0',
+  `artsk` char(40) NOT NULL DEFAULT '',
+  `itm0` char(30) NOT NULL DEFAULT '',
+  `itmk0` char(40) NOT NULL DEFAULT '',
+  `itme0` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms0` char(10) NOT NULL DEFAULT '0',
+  `itmsk0` char(40) NOT NULL DEFAULT '',
+  `itm1` char(30) NOT NULL DEFAULT '',
+  `itmk1` char(40) NOT NULL DEFAULT '',
+  `itme1` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms1` char(10) NOT NULL DEFAULT '0',
+  `itmsk1` char(40) NOT NULL DEFAULT '',
+  `itm2` char(30) NOT NULL DEFAULT '',
+  `itmk2` char(40) NOT NULL DEFAULT '',
+  `itme2` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms2` char(10) NOT NULL DEFAULT '0',
+  `itmsk2` char(40) NOT NULL DEFAULT '',
+  `itm3` char(30) NOT NULL DEFAULT '',
+  `itmk3` char(40) NOT NULL DEFAULT '',
+  `itme3` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms3` char(10) NOT NULL DEFAULT '0',
+  `itmsk3` char(40) NOT NULL DEFAULT '',
+  `itm4` char(30) NOT NULL DEFAULT '',
+  `itmk4` char(40) NOT NULL DEFAULT '',
+  `itme4` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms4` char(10) NOT NULL DEFAULT '0',
+  `itmsk4` char(40) NOT NULL DEFAULT '',
+  `itm5` char(30) NOT NULL DEFAULT '',
+  `itmk5` char(40) NOT NULL DEFAULT '',
+  `itme5` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms5` char(10) NOT NULL DEFAULT '0',
+  `itmsk5` char(40) NOT NULL DEFAULT '',
+  `itm6` char(30) NOT NULL DEFAULT '',
+  `itmk6` char(40) NOT NULL DEFAULT '',
+  `itme6` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms6` char(10) NOT NULL DEFAULT '0',
+  `itmsk6` char(40) NOT NULL DEFAULT '',
   `motto` char(30) NOT NULL DEFAULT '',
-  `wmode` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `vnum` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `gtime` int(10) unsigned NOT NULL DEFAULT '0',
-  `gstime` int(10) unsigned NOT NULL DEFAULT '0',
-  `getime` int(10) unsigned NOT NULL DEFAULT '0',
-  `hdmg` int(10) unsigned NOT NULL DEFAULT '0',
+  `wmode` tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+  `vnum` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
+  `gtime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `gstime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `getime` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `hdmg` int(10) UNSIGNED NOT NULL DEFAULT '0',
   `hdp` char(15) NOT NULL DEFAULT '',
-  `hkill` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `hkill` smallint(5) UNSIGNED NOT NULL DEFAULT '0',
   `hkp` char(15) NOT NULL DEFAULT '',
   
   UNIQUE KEY (gid)
 ) TYPE=MyISAM;
 
-
---
--- 表的结构 `bra_players`
--- 储存角色数据的激活信息，包括PC和NPC。
---
-
-DROP TABLE IF EXISTS bra_players;
-CREATE TABLE bra_players (
-  pid smallint unsigned NOT NULL auto_increment,
-  type tinyint NOT NULL default 0,
-  name char(15) NOT NULL default '',
-  pass char(32) NOT NULL default '',
-  gd char(1) NOT NULL default 'm',
-  sNo smallint unsigned NOT NULL default 0,
-  icon smallint unsigned NOT NULL default 0,
-  club tinyint unsigned NOT NULL default 0,
-  endtime int(10) unsigned NOT NULL default 0,
-  hp smallint unsigned NOT NULL default 0,
-  mhp smallint unsigned NOT NULL default 0,
-  sp smallint unsigned NOT NULL default 0,
-  msp smallint unsigned NOT NULL default 0,
-  att smallint unsigned NOT NULL default 0,
-  def smallint unsigned NOT NULL default 0,
-  pls tinyint unsigned NOT NULL default 0,
-  lvl tinyint unsigned NOT NULL default 0,
-  `exp` smallint unsigned NOT NULL default 0,
-  money smallint unsigned NOT NULL default 0,
-  bid smallint unsigned NOT NULL default 0,
-  `inf` char(10) not null default '',
-  rage tinyint unsigned NOT NULL default 0,
-  pose tinyint(1) unsigned NOT NULL default 0,
-  tactic tinyint(1) unsigned NOT NULL default 0,
-  killnum smallint unsigned NOT NULL default 0,
-  state tinyint unsigned NOT NULL default 0,
-  `wp` smallint unsigned not null default 0,
-  `wk` smallint unsigned not null default 0,
-  `wg` smallint unsigned not null default 0,
-  `wc` smallint unsigned not null default 0,
-  `wd` smallint unsigned not null default 0,
-  `wf` smallint unsigned not null default 0,
-  `teamID` char(15) not null default '',
-  `teamPass` char(15) not null default '',
-  wep char(30) NOT NULL default '',
-  wepk char(5) not null default '',
-  wepe smallint unsigned NOT NULL default 0,
-  weps char(5) not null default 0,
-  wepsk char(5) not null default '',
-  arb char(30) NOT NULL default '',
-  arbk char(5) not null default '',
-  arbe smallint unsigned NOT NULL default 0,
-  arbs char(5) not null default 0,
-  arbsk char(5) not null default '',
-  arh char(30) NOT NULL default '',
-  arhk char(5) not null default '',
-  arhe smallint unsigned NOT NULL default 0,
-  arhs char(5) not null default 0,
-  arhsk char(5) not null default '',
-  ara char(30) NOT NULL default '',
-  arak char(5) not null default '',
-  arae smallint unsigned NOT NULL default 0,
-  aras char(5) not null default 0,
-  arask char(5) not null default '',
-  arf char(30) NOT NULL default '',
-  arfk char(5) not null default '',
-  arfe smallint unsigned NOT NULL default 0,
-  arfs char(5) not null default 0,
-  arfsk char(5) not null default '',
-  art char(30) NOT NULL default '',
-  artk char(5) not null default '',
-  arte smallint unsigned NOT NULL default 0,
-  arts char(5) not null default 0,
-  artsk char(5) not null default '',
-  itm0 char(30) NOT NULL default '',
-  itmk0 char(5) not null default '',
-  itme0 smallint unsigned NOT NULL default 0,
-  itms0 char(5) not null default 0,
-  itmsk0 char(5) not null default '',
-  itm1 char(30) NOT NULL default '',
-  itmk1 char(5) not null default '',
-  itme1 smallint unsigned NOT NULL default 0,
-  itms1 char(5) not null default 0,
-  itmsk1 char(5) not null default '',
-  itm2 char(30) NOT NULL default '',
-  itmk2 char(5) not null default '',
-  itme2 smallint unsigned NOT NULL default 0,
-  itms2 char(5) not null default 0,
-  itmsk2 char(5) not null default '',
-  itm3 char(30) NOT NULL default '',
-  itmk3 char(5) not null default '',
-  itme3 smallint unsigned NOT NULL default 0,
-  itms3 char(5) not null default 0,
-  itmsk3 char(5) not null default '',
-  itm4 char(30) NOT NULL default '',
-  itmk4 char(5) not null default '',
-  itme4 smallint unsigned NOT NULL default 0,
-  itms4 char(5) not null default 0,
-  itmsk4 char(5) not null default '',
-  itm5 char(30) NOT NULL default '',
-  itmk5 char(5) not null default '',
-  itme5 smallint unsigned NOT NULL default 0,
-  itms5 char(5) not null default 0,
-  itmsk5 char(5) not null default '',
-
-  PRIMARY KEY  (pid),
-  INDEX TYPE (type, sNo),
-  INDEX NAME (name, type)
-) TYPE=MyISAM;
+DROP TABLE IF EXISTS bra_vnmixitem;
+CREATE TABLE bra_vnmixitem (
+  `iid` mediumint(8) UNSIGNED NOT NULL,
+  `creator` varchar(40) NOT NULL DEFAULT '',
+  `istatus` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `class` varchar(30) NOT NULL DEFAULT '',
+  `stf0` varchar(30) NOT NULL DEFAULT '',
+  `stf1` varchar(30) NOT NULL DEFAULT '',
+  `stf2` varchar(30) NOT NULL DEFAULT '',
+  `stf3` varchar(30) NOT NULL DEFAULT '',
+  `stf4` varchar(30) NOT NULL DEFAULT '',
+  `itm` varchar(30) NOT NULL DEFAULT '',
+  `itmk` varchar(40) NOT NULL DEFAULT '',
+  `itme` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `itms` char(10) NOT NULL DEFAULT '0',
+  `itmsk` varchar(40) NOT NULL DEFAULT '',
+  
+  PRIMARY KEY  (iid)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file