[Planeshift-cvs] CVS: planeshift/src/server/database/mysql npc_disallowed_words.sql,NONE,1.1 npc_triggers.sql,1.9,1.10 server_options.sql,1.62,1.63

[Keith F. <ven...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17062

Modified Files:
	npc_triggers.sql server_options.sql 
Added Files:
	npc_disallowed_words.sql 
Log Message:
Added disallowed_words support to triggers.  These words are skipped when
building the dictionary and removed from the underlying triggers.  See examples
in npc_triggers and npc_disallowed_triggers for how it works.

--- NEW FILE: npc_disallowed_words.sql ---
# MySQL-Front Dump 1.16 beta
#
# Host: localhost Database: planeshift
#--------------------------------------------------------
# Server version 4.0.18-max-nt
#
# Table structure for table 'npc_disallowed_words'
#

CREATE TABLE npc_disallowed_words (
  word varchar(30) NOT NULL DEFAULT '' ,
  PRIMARY KEY (word)
);


#
# Dumping data for table 'npc_disallowed_words'
#

INSERT INTO npc_disallowed_words VALUES("a");
INSERT INTO npc_disallowed_words VALUES("an");
INSERT INTO npc_disallowed_words VALUES("and");
INSERT INTO npc_disallowed_words VALUES("anything");
INSERT INTO npc_disallowed_words VALUES("i");
INSERT INTO npc_disallowed_words VALUES("is");
INSERT INTO npc_disallowed_words VALUES("isn't");
INSERT INTO npc_disallowed_words VALUES("please");
INSERT INTO npc_disallowed_words VALUES("the");

Index: npc_triggers.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/npc_triggers.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** npc_triggers.sql	9 Oct 2004 17:34:24 -0000	1.9
--- npc_triggers.sql	12 Oct 2004 07:09:40 -0000	1.10
***************
*** 29,40 ****
  INSERT INTO npc_triggers VALUES("3","goodbye","3","0","0","200","general","0");
  INSERT INTO npc_triggers VALUES("4","about you","11","0","0","200","general","0");
! INSERT INTO npc_triggers VALUES("5","about you","12","0","10","200","Smith","0");
  INSERT INTO npc_triggers VALUES("7","done","14","0","0","200","general","0");
! INSERT INTO npc_triggers VALUES("8","train","15","0","0","200","Smith","0");
! INSERT INTO npc_triggers VALUES("9","train","16","0","-200","0","Smith","0");
  INSERT INTO npc_triggers VALUES("10","train","15","0","-200","200","merchant","0");
! INSERT INTO npc_triggers VALUES("11","give me quest","13","0","-200","200","merchant","2");
  INSERT INTO npc_triggers VALUES("12","<l money=\"0,0,0,3\"></l>","17","0","-200","200","merchant","0");
  INSERT INTO npc_triggers VALUES("13","error","18","0","-200","200","merchant","2");
! INSERT INTO npc_triggers VALUES("14","can bring you","19","0","-200","200","merchant","7");
  INSERT INTO npc_triggers VALUES("15","here you are","20","0","-200","200","merchant","7");
--- 29,42 ----
  INSERT INTO npc_triggers VALUES("3","goodbye","3","0","0","200","general","0");
  INSERT INTO npc_triggers VALUES("4","about you","11","0","0","200","general","0");
! INSERT INTO npc_triggers VALUES("5","about you","12","0","10","200","smith","0");
  INSERT INTO npc_triggers VALUES("7","done","14","0","0","200","general","0");
! INSERT INTO npc_triggers VALUES("8","train","15","0","0","200","smith","0");
! INSERT INTO npc_triggers VALUES("9","train","16","0","-200","0","smith","0");
  INSERT INTO npc_triggers VALUES("10","train","15","0","-200","200","merchant","0");
! INSERT INTO npc_triggers VALUES("11","give me a quest please","13","0","-200","200","merchant","2");
  INSERT INTO npc_triggers VALUES("12","<l money=\"0,0,0,3\"></l>","17","0","-200","200","merchant","0");
  INSERT INTO npc_triggers VALUES("13","error","18","0","-200","200","merchant","2");
! INSERT INTO npc_triggers VALUES("14","can i bring you anything","19","0","-200","200","merchant","7");
  INSERT INTO npc_triggers VALUES("15","here you are","20","0","-200","200","merchant","7");
+ INSERT INTO npc_triggers VALUES("16","givemeexp","21","0","-100","100","smith","0");
+ INSERT INTO npc_triggers VALUES("17","<L MONEY=\"0,0,0,0\"><ITEM N=\"Small Battle Axe\" C=\"1\" /></L>","22","0","-100","100","smith","0");

Index: server_options.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/server_options.sql,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** server_options.sql	12 Sep 2004 17:48:34 -0000	1.62
--- server_options.sql	12 Oct 2004 07:09:40 -0000	1.63
***************
*** 1,25 ****
! # MySQL-Front 3.0
! 
! 
! # Host: localhost    Database: planeshift
! # ------------------------------------------------------
  # Server version 4.0.18-max-nt
- 
  #
! # Table structure for table server_options
  #
  
  CREATE TABLE server_options (
!   option_name varchar(50) NOT NULL default '',
!   option_value varchar(255) NOT NULL default '',
!   PRIMARY KEY  (option_name)
! ) TYPE=MyISAM;
  
  
  #
! # Dumping data for table server_options
  #
  
! INSERT INTO server_options VALUES ('db_version','1060');
! INSERT INTO server_options VALUES ('standard_motd','This is the message of the day from server_options table.');
! 
--- 1,22 ----
! # MySQL-Front Dump 1.16 beta
! #
! # Host: localhost Database: planeshift
! #--------------------------------------------------------
  # Server version 4.0.18-max-nt
  #
! # Table structure for table 'server_options'
  #
  
  CREATE TABLE server_options (
!   option_name varchar(50) NOT NULL DEFAULT '' ,
!   option_value varchar(255) NOT NULL DEFAULT '' ,
!   PRIMARY KEY (option_name)
! );
  
  
  #
! # Dumping data for table 'server_options'
  #
  
! INSERT INTO server_options VALUES("db_version","1061");
! INSERT INTO server_options VALUES("standard_motd","This is the message of the day from server_options table.");