Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/server/database/mysql characters.sql, 1.57, 1.58 sc_location_type.sql, 1.1, 1.2 sc_locations.sql, 1.3, 1.4 sc_npc_definitions.sql, 1.17, 1.18
|
From: Anders R. <ma...@us...> - 2006-11-10 22:58:53
|
Update of /cvsroot/planeshift/planeshift/src/server/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/src/server/database/mysql Modified Files: characters.sql sc_location_type.sql sc_locations.sql sc_npc_definitions.sql Log Message: - Fixed so that server send NPC TALK perception to NPC client on both public and private responces. - Added invincible flag to the actor persist message. - Added ToString function for the psAllEntityPosMessage - Added param to entlist for the NPC Client that will list only the entities with matching the pattern. - Changed so that all entities are sent to the NPC client. - The NPC client will no check for visible and invincible before perceptions. - Send flags for visible and invincible in the npccommandlist message => BUMPED NPC NET VERSION Index: characters.sql =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/characters.sql,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** characters.sql 4 Nov 2006 19:22:50 -0000 1.57 --- characters.sql 10 Nov 2006 22:58:50 -0000 1.58 *************** *** 95,102 **** INSERT INTO `characters` VALUES (12,'QuestMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-30,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); INSERT INTO `characters` VALUES (13,'QuestMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-35,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); ! INSERT INTO `characters` VALUES (14,'DictMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-40,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); ! INSERT INTO `characters` VALUES (15,'DictMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-45,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); INSERT INTO `characters` VALUES (20,'TribeMember','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-45,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',0,20,'N',9,0,0,0,0,0,'Tribe member. Used in tribe testing.',500,'',0); ! INSERT INTO `characters` VALUES (21,'MoveMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-30.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used to test movement.',500,'',0); INSERT INTO `characters` VALUES (22,'MoveMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-35.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used to test meovement.',500,'',0); INSERT INTO `characters` VALUES (23,'MoveMaster3','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-40.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used to test meovement.',500,'',0); --- 95,102 ---- INSERT INTO `characters` VALUES (12,'QuestMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-30,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); INSERT INTO `characters` VALUES (13,'QuestMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-35,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); ! INSERT INTO `characters` VALUES (14,'DictMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-40,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,14,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); ! INSERT INTO `characters` VALUES (15,'DictMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-45,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,14,'N',9,0,0,0,0,0,'Used for quest testing. Type \"step1\" to start Test.',500,'',0); INSERT INTO `characters` VALUES (20,'TribeMember','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-45,0,-150,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',0,20,'N',9,0,0,0,0,0,'Tribe member. Used in tribe testing.',500,'',0); ! INSERT INTO `characters` VALUES (21,'MoveMaster1','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-30.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,21,'N',9,0,0,0,0,0,'Used to test movement.',500,'',0); INSERT INTO `characters` VALUES (22,'MoveMaster2','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-35.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used to test meovement.',500,'',0); INSERT INTO `characters` VALUES (23,'MoveMaster3','','',7,1,44,40,44,40,40,40,50,100,100,100,100,100,100,100,100,100,100,100,100,100,3,-40.0,0.0,-130.0,0,0,0,0,'','',NULL,'1,30,3,30,4,-50','',1,8,'N',9,0,0,0,0,0,'Used to test meovement.',500,'',0); Index: sc_location_type.sql =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/sc_location_type.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sc_location_type.sql 18 Oct 2006 20:41:54 -0000 1.1 --- sc_location_type.sql 10 Nov 2006 22:58:50 -0000 1.2 *************** *** 21,23 **** --- 21,24 ---- INSERT INTO `sc_location_type` VALUES (3, 'market'); INSERT INTO `sc_location_type` VALUES (4, 'pvp_region'); + INSERT INTO `sc_location_type` VALUES (5, 'wander region'); Index: sc_locations.sql =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/sc_locations.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sc_locations.sql 5 Nov 2006 16:58:49 -0000 1.3 --- sc_locations.sql 10 Nov 2006 22:58:50 -0000 1.4 *************** *** 34,42 **** INSERT INTO `sc_locations` VALUES (7, 2, -1, 'Main mine','-80.00', '0.0', '-145.00', 15, 0.0,'', 3); INSERT INTO `sc_locations` VALUES (8, 3, -1, 'Main market','-30.00', '0.0', '-160.00', 2, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (9, 4, 13, 'Wander region','33.5', '0.0', '-213.57', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (10, 4, 9, 'Wander region','27.18', '0.0', '-263.67', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (11, 4, 10, 'Wander region','-22.18', '0.0', '-256.67', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (12, 4, 11, 'Wander region','-27.89', '0.0', '-209.85', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (13, 4, 12, 'Wander region','1.12', '0.0', '-191.12', 0, 0.0,'', 3); INSERT INTO `sc_locations` VALUES (14, 1, -1, 'Field 5','-5.00', '0.0', '-40.00', 30, 0.0,'', 6); --- 34,46 ---- INSERT INTO `sc_locations` VALUES (7, 2, -1, 'Main mine','-80.00', '0.0', '-145.00', 15, 0.0,'', 3); INSERT INTO `sc_locations` VALUES (8, 3, -1, 'Main market','-30.00', '0.0', '-160.00', 2, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (9, 5, 13, 'Wander region 1','33.5', '0.0', '-213.57', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (10, 5, 9, 'Wander region 1','27.18', '0.0', '-263.67', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (11, 5, 10, 'Wander region 1','-22.18', '0.0', '-256.67', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (12, 5, 11, 'Wander region 1','-27.89', '0.0', '-209.85', 0, 0.0,'', 3); ! INSERT INTO `sc_locations` VALUES (13, 5, 12, 'Wander region 1','1.12', '0.0', '-191.12', 0, 0.0,'', 3); INSERT INTO `sc_locations` VALUES (14, 1, -1, 'Field 5','-5.00', '0.0', '-40.00', 30, 0.0,'', 6); + INSERT INTO `sc_locations` VALUES (15, 4, 18, 'PVP 1','20.0', '0.0', '-250.0', 0, 0.0,'', 3); + INSERT INTO `sc_locations` VALUES (16, 4, 15, 'PVP 1','20.0', '0.0', '-270.0', 0, 0.0,'', 3); + INSERT INTO `sc_locations` VALUES (17, 4, 16, 'PVP 1','40.0', '0.0', '-270.0', 0, 0.0,'', 3); + INSERT INTO `sc_locations` VALUES (18, 4, 17, 'PVP 1','40.0', '0.0', '-250.0', 0, 0.0,'', 3); Index: sc_npc_definitions.sql =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/sc_npc_definitions.sql,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** sc_npc_definitions.sql 4 Nov 2006 19:22:50 -0000 1.17 --- sc_npc_definitions.sql 10 Nov 2006 22:58:50 -0000 1.18 *************** *** 31,34 **** --- 31,36 ---- INSERT INTO sc_npc_definitions VALUES("8","Merchant","Wanderer","wander region","0.00","0.00","0","N"); INSERT INTO sc_npc_definitions VALUES("10","FAMILIAR:Rogue","Minion","wander region","0.00","0.00","0","N"); + INSERT INTO sc_npc_definitions VALUES("14","DictMaster1","Answerer","","0.00","0.00","0","N"); + INSERT INTO sc_npc_definitions VALUES("15","DictMaster2","Answerer","","0.00","0.00","0","N"); INSERT INTO sc_npc_definitions VALUES("20","TribeMember","Tribe","","0.00","0.00","0","N"); INSERT INTO sc_npc_definitions VALUES("21","MoveMaster1","MoveTest1","","0.00","0.00","0","N"); |