[Planeshift-cvs] CVS: planeshift/src/server/database/mysql items.sql,1.23,1.24 players.sql,1.15,1.16

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1:/tmp/cvs-serv16693/src/server/database/mysql

Modified Files:
	items.sql players.sql 
Log Message:
- Removed all use of depricated CS interfaces.
- Implemented the exchange items window.
  - Added a exchange.def to the gui.zip file.
  - All item defs in DB have to have bulk as
    default slot (first slot in slot list) to be able
    to pick them up.
  - Created an exchangemanager in the server to handle exchanges.
  - New psGUIExchangeMessage to handle communication with client.
- Removed some compiler warnings.

Index: items.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/items.sql,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** items.sql	8 Apr 2003 03:45:08 -0000	1.23
--- items.sql	14 Apr 2003 18:06:59 -0000	1.24
***************
*** 43,52 ****
  INSERT INTO items VALUES("6","Hair 2","2.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
  INSERT INTO items VALUES("7","Hair 3","3.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
! INSERT INTO items VALUES("8","Chest","","","1","0","0","0","0","/this/art/things/chest","/this/art/gui/chest.png","0","0","0","N","Bulk","","Wooden chest");
! INSERT INTO items VALUES("9","Cleaver","","","1","0","100","10","0","/this/art/things/weapons/cleaver","/this/art/gui/cleaver.png","0","0","0","N","righthand,lefthand","","Butcher's knife having a large sharp square blade");
! INSERT INTO items VALUES("10","Long Sword","","","1","0","100","10","1","/this/art/things/weapons/long02c","/this/art/gui/longsd.png","0","0","0","N","righthand","","This sharp double edged weapon will be your friend in hostal environments");
! INSERT INTO items VALUES("1000","Ruby Crystal","","","0","0","0","0","0","/this/art/things/rubycrystal","/this/art/gui/rubycr.png","0","0","0","Y","","","");
! INSERT INTO items VALUES("1001","Emerald Crystal","","","0","0","0","0","0","/this/art/things/emeraldcrystal","/this/art/gui/emeraldcr.png","0","0","0","Y","","","");
! INSERT INTO items VALUES("1002","Diamond Crystal","","","0","0","0","0","0","/this/art/things/diamondcrystal","/this/art/gui/diamondcr.png","0","0","0","Y","","","");
  INSERT INTO items VALUES("11","Hair 4","4.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
  INSERT INTO items VALUES("12","Skin 1","1.png","nose","0","0","0","0","0","","","0","0","0","N","nose","","");
--- 43,49 ----
  INSERT INTO items VALUES("6","Hair 2","2.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
  INSERT INTO items VALUES("7","Hair 3","3.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
! INSERT INTO items VALUES("8","Chest","","","1","0","0","0","0","/this/art/things/chest","/this/art/gui/chest.png","0","0","0","N","","","Wooden chest");
! INSERT INTO items VALUES("9","Cleaver","","","1","0","100","10","0","/this/art/things/weapons/cleaver","/this/art/gui/cleaver.png","0","0","0","N","bulk righthand lefthand","","Butcher's knife having a large sharp square blade");
! INSERT INTO items VALUES("10","Long Sword","","","1","0","100","10","1","/this/art/things/weapons/long02c","/this/art/gui/longsd.png","0","0","0","N","bulk righthand","","This sharp double edged weapon will be your friend in hostal environments");
  INSERT INTO items VALUES("11","Hair 4","4.png","hair","0","0","0","0","0","","","0","0","0","N","hair","","");
  INSERT INTO items VALUES("12","Skin 1","1.png","nose","0","0","0","0","0","","","0","0","0","N","nose","","");
***************
*** 63,105 ****
  INSERT INTO items VALUES("23","Eyes 4","4.png","eyes","0","0","0","0","0","","","0","0","0","N","eyes","","");

! INSERT INTO items VALUES("24","Excalibur","","","1","0","100","10","0","/planeshift/weapons/longsword01a","/planeshift/weapons/longsword01a_icon.png","0","0","0","N","righthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("25","doubleaxe01a","","","1","0","100","10","0","/planeshift/weapons/doubleaxe01a","/planeshift/weapons/doubleaxe01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","An Axe");
! 
! INSERT INTO items VALUES("26","doubleaxe02a","","","1","0","100","10","0","/planeshift/weapons/doubleaxe02a","/planeshift/weapons/doubleaxe02a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","An Axe");
! 
! #INSERT INTO items VALUES("27","2handedaxe02a","","","1","0","100","10","0","/this/art/things/weapons/twohandedaxe02a","/this/art/gui/longsd.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","A really big axe");
! 
! INSERT INTO items VALUES("28","broadsword01a","","","1","0","100","10","0","/planeshift/weapons/broadsword01a","/planeshift/weapons/broadsword01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","A big sword");
! 
! INSERT INTO items VALUES("29","claymore01a","","","1","0","100","10","0","/planeshift/weapons/claymore01a","/planeshift/weapons/claymore01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","A really big sword");
! 
! INSERT INTO items VALUES("30","falchion01a","","","1","0","100","10","0","/planeshift/weapons/falchion01a","/planeshift/weapons/falchion01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("31","falchion01b","","","1","0","100","10","0","/planeshift/weapons/falchion01b","/planeshift/weapons/falchion01b_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("32","falchion01c","","","1","0","100","10","0","/planeshift/weapons/falchion01c","/planeshift/weapons/falchion01c_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("33","galkard01a","","","1","0","100","10","0","/planeshift/weapons/galkard01a","/planeshift/weapons/galkard01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("34","longsword01a","","","1","0","100","10","0","/planeshift/weapons/longsword01a","/planeshift/weapons/longsword01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");
! 
! INSERT INTO items VALUES("35","normalaxe01a","","","1","0","100","10","0","/planeshift/weapons/normalaxe01a","/planeshift/weapons/normalaxe01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","A regular axe");
! 
! INSERT INTO items VALUES("36","sabre01a","","","1","0","100","10","0","/planeshift/weapons/sabre01a","/planeshift/weapons/sabre01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

! INSERT INTO items VALUES("37","Jug","","","1","0","100","10","0","/planeshift/weapons/jug01a","/planeshift/weapons/jug01a_icon.png","0","0","0","N","righthand,lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

--- 60,96 ----
  INSERT INTO items VALUES("23","Eyes 4","4.png","eyes","0","0","0","0","0","","","0","0","0","N","eyes","","");

! INSERT INTO items VALUES("24","Excalibur","","","1","0","100","10","0","/planeshift/weapons/longsword01a","/planeshift/weapons/longsword01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

! INSERT INTO items VALUES("25","doubleaxe01a","","","1","0","100","10","0","/planeshift/weapons/doubleaxe01a","/planeshift/weapons/doubleaxe01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","An Axe");

+ INSERT INTO items VALUES("26","doubleaxe02a","","","1","0","100","10","0","/planeshift/weapons/doubleaxe02a","/planeshift/weapons/doubleaxe02a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","An Axe");

+ INSERT INTO items VALUES("28","broadsword01a","","","1","0","100","10","0","/planeshift/weapons/broadsword01a","/planeshift/weapons/broadsword01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","A big sword");

+ INSERT INTO items VALUES("29","claymore01a","","","1","0","100","10","0","/planeshift/weapons/claymore01a","/planeshift/weapons/claymore01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","A really big sword");

+ INSERT INTO items VALUES("30","falchion01a","","","1","0","100","10","0","/planeshift/weapons/falchion01a","/planeshift/weapons/falchion01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("31","falchion01b","","","1","0","100","10","0","/planeshift/weapons/falchion01b","/planeshift/weapons/falchion01b_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("32","falchion01c","","","1","0","100","10","0","/planeshift/weapons/falchion01c","/planeshift/weapons/falchion01c_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("33","galkard01a","","","1","0","100","10","0","/planeshift/weapons/galkard01a","/planeshift/weapons/galkard01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("34","longsword01a","","","1","0","100","10","0","/planeshift/weapons/longsword01a","/planeshift/weapons/longsword01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("35","normalaxe01a","","","1","0","100","10","0","/planeshift/weapons/normalaxe01a","/planeshift/weapons/normalaxe01a_icon.png","0","0","0","N","righthand lefthand","STR +2,AGI +1","A regular axe");

+ INSERT INTO items VALUES("36","sabre01a","","","1","0","100","10","0","/planeshift/weapons/sabre01a","/planeshift/weapons/sabre01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("37","Jug","","","1","0","100","10","0","/planeshift/weapons/jug01a","/planeshift/weapons/jug01a_icon.png","0","0","0","N","bulk righthand lefthand","STR +2,AGI +1","This sharp double edged weapon will be your friend in hostal environments");

+ INSERT INTO items VALUES("1000","Ruby Crystal","","","0","0","0","0","0","/this/art/things/rubycrystal","/this/art/gui/rubycr.png","0","0","0","Y","bulk","","");
+ INSERT INTO items VALUES("1001","Emerald Crystal","","","0","0","0","0","0","/this/art/things/emeraldcrystal","/this/art/gui/emeraldcr.png","0","0","0","Y","bulk","","");
+ INSERT INTO items VALUES("1002","Diamond Crystal","","","0","0","0","0","0","/this/art/things/diamondcrystal","/this/art/gui/diamondcr.png","0","0","0","Y","bulk","","");
+ INSERT INTO items VALUES("1010","Trias","","","0","0","0","0","0","/planeshift/items/tria01a_pile","/planeshift/items/tria01a_icon.png","0","0","0","Y","trias","","");
+ INSERT INTO items VALUES("1011","Hexas","","","0","0","0","0","0","/planeshift/items/hexa01a_pile","/planeshift/items/hexa01a_icon.png","0","0","0","Y","hexas","","");
+ INSERT INTO items VALUES("1012","Octas","","","0","0","0","0","0","/planeshift/items/octa01a_pile","/planeshift/items/octa01a_icon.png","0","0","0","Y","octas","","");
+ INSERT INTO items VALUES("1013","Circles","","","0","0","0","0","0","/planeshift/items/circle01a_pile","/planeshift/items/circle01a_icon.png","0","0","0","Y","circles","","");

***************
*** 113,117 ****
    equipped_ind char(1) DEFAULT '0' ,
    stack_count tinyint(3) unsigned DEFAULT '0' ,
!   in_slot varchar(10) NOT NULL DEFAULT 'Bulk0' ,
    PRIMARY KEY (player_id,in_slot)
  );
--- 104,108 ----
    equipped_ind char(1) DEFAULT '0' ,
    stack_count tinyint(3) unsigned DEFAULT '0' ,
!   in_slot varchar(20) NOT NULL DEFAULT 'Bulk0' ,
    PRIMARY KEY (player_id,in_slot)
  );

Index: players.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/players.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** players.sql	25 Mar 2003 22:58:40 -0000	1.15
--- players.sql	14 Apr 2003 18:06:59 -0000	1.16
***************
*** 54,57 ****
--- 54,58 ----
    sector varchar(40) DEFAULT 'room' ,
    rotation double(10,2) NOT NULL DEFAULT '0.00' ,
+   stack_count tinyint(3) unsigned DEFAULT '1' ,
    PRIMARY KEY (id),
    KEY id_2 (id),
***************
*** 64,77 ****
  # For player 1 the 1 entry is for dungeon the other is for podium

! INSERT INTO objects VALUES("1","PLAYR","","-3.63","-1.13","-2.95","0","Y","1","0","0","room","1.33");
! #INSERT INTO objects VALUES("1","PLAYR","","4.00","0.28","4.49","0","Y","1","0","0","room","1.33");

! #INSERT INTO objects VALUES("3","PLAYR","","-4.52","-1.13","-4.02","0","Y","32","0","0","room","4.55");
! #INSERT INTO objects VALUES("4","PLAYR","","-4.52","-1.13","-1.59","0","Y","33","0","0","room","4.55");
! INSERT INTO objects VALUES("5","ITEM","","-4.52","-0.70","-2.50","0","Y","0","8","0","room","0.00");
! #INSERT INTO objects VALUES("6","PLAYR","","-3.16","-1.13","-2.36","0","Y","38","0","0","room","1.64");
! INSERT INTO objects VALUES("7","ITEM","","-1.39","-1.13","-2.49","0","Y","0","8","0","room","1.64");
! INSERT INTO objects VALUES("8", "ITEM", "","4.5","-0.13","0.00","0","Y","0","9","0","room","0.0");
! INSERT INTO objects VALUES("9", "ITEM", "","6.18","-0.13","-2.85","0","Y","0","10","0","room","0");

--- 65,78 ----
  # For player 1 the 1 entry is for dungeon the other is for podium

! INSERT INTO objects VALUES("1","PLAYR","","-3.63","-1.13","-2.95","0","Y","1","0","0","room","1.33",1);
! #INSERT INTO objects VALUES("1","PLAYR","","4.00","0.28","4.49","0","Y","1","0","0","room","1.33",1);

! #INSERT INTO objects VALUES("3","PLAYR","","-4.52","-1.13","-4.02","0","Y","32","0","0","room","4.55",1);
! #INSERT INTO objects VALUES("4","PLAYR","","-4.52","-1.13","-1.59","0","Y","33","0","0","room","4.55",1);
! INSERT INTO objects VALUES("5","ITEM","","-4.52","-0.70","-2.50","0","Y","0","8","0","room","0.00",1);
! #INSERT INTO objects VALUES("6","PLAYR","","-3.16","-1.13","-2.36","0","Y","38","0","0","room","1.64",1);
! INSERT INTO objects VALUES("7","ITEM","","-1.39","-1.13","-2.49","0","Y","0","8","0","room","1.64",1);
! INSERT INTO objects VALUES("8", "ITEM", "","4.5","-0.13","0.00","0","Y","0","9","0","room","0.0",1);
! INSERT INTO objects VALUES("9", "ITEM", "","6.18","-0.13","-2.85","0","Y","0","10","0","room","0",1);