Menu
▾
▴
[PlaneShift-svn] SF.net SVN: planeshift:[3145] personal/Kayden/src
|
From: <ken...@us...> - 2009-03-07 05:07:39
|
Revision: 3145
http://planeshift.svn.sourceforge.net/planeshift/?rev=3145&view=rev
Author: kennygraunke
Date: 2009-03-07 05:07:27 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
- Made item equip scripts include the <apply> node itself so one can give the
effect a name and declare it as a buff or debuff.
- Fixed a grand inefficiency where everything had a blank equip script.
- Fixed the active magic window (requires netversion bump).
Modified Paths:
--------------
personal/Kayden/src/client/gui/pawsactivemagicwindow.cpp
personal/Kayden/src/common/net/messages.cpp
personal/Kayden/src/common/net/messages.h
personal/Kayden/src/common/util/psconst.h
personal/Kayden/src/server/bulkobjects/activespell.h
personal/Kayden/src/server/bulkobjects/psitem.cpp
personal/Kayden/src/server/bulkobjects/psitemstats.cpp
personal/Kayden/src/server/database/mysql/item_stats.sql
personal/Kayden/src/server/gem.cpp
personal/Kayden/src/server/scripting.cpp
Modified: personal/Kayden/src/client/gui/pawsactivemagicwindow.cpp
===================================================================
--- personal/Kayden/src/client/gui/pawsactivemagicwindow.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/client/gui/pawsactivemagicwindow.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -61,79 +61,40 @@
void pawsActiveMagicWindow::HandleMessage( MsgEntry* me )
{
psGUIActiveMagicMessage incoming(me);
- pawsListBox *list;
- if (!IsVisible() && incoming.openWindow && psengine->loadstate == psEngine::LS_DONE)
+ if (!IsVisible() && psengine->loadstate == psEngine::LS_DONE)
Show();
- //buffCategories->Clear();
- //debuffCategories->Clear();
- // Get number of spells
- // For each record
- // Get Name
- // Determine buff/debuff
- // Add to correct listbox
-
+ pawsListBox *list = incoming.type == BUFF ? buffCategories : debuffCategories;
switch ( incoming.command )
{
- case psGUIActiveMagicMessage::addCategory:
- for (size_t i = 0; i < incoming.categoryList.GetSize(); i++)
+ case psGUIActiveMagicMessage::Add:
{
- csString buffName ;
- if ( incoming.categoryList[i].StartsWith( BUFF_CATEGORY_PREFIX ) )
- {
- list = buffCategories;
- buffName = incoming.categoryList[i].Slice(strlen(BUFF_CATEGORY_PREFIX), incoming.categoryList[i].Length() - strlen(BUFF_CATEGORY_PREFIX));
- }
- else
- {
- list = debuffCategories;
- buffName = incoming.categoryList[i].Slice(strlen(DEBUFF_CATEGORY_PREFIX), incoming.categoryList[i].Length() - strlen(DEBUFF_CATEGORY_PREFIX));
- }
-
- pawsListBoxRow* row = list->NewRow();
+ pawsListBoxRow *row = list->NewRow();
- pawsTextBox* name = dynamic_cast <pawsTextBox*> (row->GetColumn(0));
- if (name == NULL) return;
- name->SetText( buffName );
+ pawsTextBox *name = dynamic_cast<pawsTextBox*>(row->GetColumn(0));
+ if (!name)
+ return;
+ name->SetText(incoming.name);
+
+ break;
}
- break;
- case psGUIActiveMagicMessage::removeCategory:
- pawsListBoxRow* row;
- for (size_t i = 0; i < incoming.categoryList.GetSize(); i++)
+ case psGUIActiveMagicMessage::Remove:
{
- csString buffName ;
- if ( incoming.categoryList[i].StartsWith( BUFF_CATEGORY_PREFIX ) )
+ for (int i = 0; i < list->GetRowCount(); i++)
{
- list = buffCategories;
- buffName = incoming.categoryList[i].Slice(strlen(BUFF_CATEGORY_PREFIX), incoming.categoryList[i].Length() - strlen(BUFF_CATEGORY_PREFIX));
+ pawsListBoxRow *row = list->GetRow(i);
+ pawsTextBox *name = dynamic_cast<pawsTextBox*>(row->GetColumn(0));
+ if (incoming.name == name->GetText())
+ list->Remove(row);
}
- else
- {
- list = debuffCategories;
- buffName = incoming.categoryList[i].Slice(strlen(DEBUFF_CATEGORY_PREFIX), incoming.categoryList[i].Length() - strlen(DEBUFF_CATEGORY_PREFIX));
- }
- for ( int i = 0; i < list->GetRowCount(); i++ )
- {
- row = list->GetRow( i );
- pawsTextBox* name = dynamic_cast <pawsTextBox*> (row->GetColumn(0));
- csString nameText = name->GetText();
-
- if ( nameText.Compare(buffName) )
- {
- list->Remove( row );
- }
- }
-
- // If no Active Magics hide the window.
- if ( debuffCategories->GetRowCount() + buffCategories->GetRowCount() == 0 )
- {
+ // If no active magic, hide the window.
+ if (debuffCategories->GetRowCount() + buffCategories->GetRowCount() == 0)
Hide();
- }
+ break;
}
- break;
}
}
Modified: personal/Kayden/src/common/net/messages.cpp
===================================================================
--- personal/Kayden/src/common/net/messages.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/common/net/messages.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -4875,16 +4875,14 @@
csString psGUIActiveMagicMessage::ToString(AccessPointers * /*access_ptrs*/)
{
- csString msgtext;
- size_t numCategories = categoryList.GetSize();
+ csString msgtext(command == Add ? "Add " : "Remove ");
- msgtext.AppendFmt("Window: %s Command: %d Categories: %zu ",
- (openWindow ? "open" : "closed"), command, numCategories);
- for (size_t i = 0; i < numCategories; i++)
- {
- msgtext.AppendFmt("'%s', ", categoryList[i].GetDataSafe());
- }
+ if (type == BUFF)
+ msgtext.Append("buff ");
+ else if (type == DEBUFF)
+ msgtext.Append("debuff ");
+ msgtext.Append(name);
return msgtext;
}
Modified: personal/Kayden/src/common/net/messages.h
===================================================================
--- personal/Kayden/src/common/net/messages.h 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/common/net/messages.h 2009-03-07 05:07:27 UTC (rev 3145)
@@ -3314,70 +3314,28 @@
class psGUIActiveMagicMessage : public psMessageCracker
{
public:
- enum commandType { addCategory, removeCategory };
+ enum commandType { Add, Remove };
- psGUIActiveMagicMessage( uint32_t clientNum,
+ psGUIActiveMagicMessage(uint32_t clientNum,
commandType cmd,
- csArray<csString> categories,
- bool open )
+ SPELL_TYPE type,
+ const csString & name)
{
- size_t sizeCategories = 0;
- int numCategories = 0;
- for ( size_t i = 0; i < categories.GetSize(); i++ )
- {
- if ( categories[ i ].Length() != 0 )
- {
- sizeCategories += categories[ i ].Length() + 1;
- numCategories++;
- }
- }
-
- msg.AttachNew(new MsgEntry( sizeof(bool) + sizeof(uint8_t) + sizeof(int32_t) + sizeCategories ));
+ msg.AttachNew(new MsgEntry( sizeof(bool) + +sizeof(uint8_t) + sizeof(int32_t) + name.Length() + 1));
msg->SetType(MSGTYPE_ACTIVEMAGIC);
msg->clientnum = clientNum;
- msg->Add( open );
- msg->Add( (uint8_t)cmd );
- msg->Add( (int32_t)numCategories );
- for ( size_t i = 0; i < categories.GetSize(); i++ )
- {
- if ( categories[ i ].Length() != 0 )
- {
- msg->Add( categories[ i ] );
- }
- }
+ msg->Add((uint8_t)cmd);
+ msg->Add((uint8_t)type);
+ msg->Add(name);
valid = !(msg->overrun);
}
- psGUIActiveMagicMessage( uint32_t clientNum,
- commandType cmd,
- csString category,
- bool open )
- {
- size_t sizeCategories = category.Length() + 1;
- int numCategories = 1;
-
- msg.AttachNew(new MsgEntry( sizeof(bool) + +sizeof(uint8_t) + sizeof(int32_t) + sizeCategories ));
- msg->SetType(MSGTYPE_ACTIVEMAGIC);
- msg->clientnum = clientNum;
- msg->Add( open );
- msg->Add( (uint8_t)cmd );
- msg->Add( (int32_t)numCategories );
- msg->Add( category );
- valid = !(msg->overrun);
- }
-
/// Crack this message off the network.
psGUIActiveMagicMessage( MsgEntry* message )
{
- int numCategories = 0;
-
- openWindow = message->GetBool();
- command = (commandType)message->GetUInt8();
- numCategories = message->GetInt32();
- for ( int i = 0; i < numCategories; i++ )
- {
- categoryList.Push( message->GetStr() );
- }
+ command = (commandType) message->GetUInt8();
+ type = (SPELL_TYPE) message->GetUInt8();
+ name = message->GetStr();
valid = true;
}
@@ -3392,8 +3350,8 @@
virtual csString ToString(AccessPointers * access_ptrs);
commandType command;
- csArray<csString> categoryList;
- bool openWindow;
+ SPELL_TYPE type;
+ csString name;
};
//-----------------------------------------------------------------------------
Modified: personal/Kayden/src/common/util/psconst.h
===================================================================
--- personal/Kayden/src/common/util/psconst.h 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/common/util/psconst.h 2009-03-07 05:07:27 UTC (rev 3145)
@@ -112,6 +112,12 @@
#define WEATHER_MAX_RAIN_DROPS 8000
#define WEATHER_MAX_SNOW_FALKES 6000
+enum SPELL_TYPE
+{
+ BUFF,
+ DEBUFF,
+};
+
// Make unique integer types for various types of IDs. This allows the
// compiler to statically check for the right kind of ID, preventing various
// kinds of mistakes. It also documents which kind of ID is required.
Modified: personal/Kayden/src/server/bulkobjects/activespell.h
===================================================================
--- personal/Kayden/src/server/bulkobjects/activespell.h 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/bulkobjects/activespell.h 2009-03-07 05:07:27 UTC (rev 3145)
@@ -36,13 +36,6 @@
struct iDocumentNode;
class gemActor;
-enum SPELL_TYPE
-{
- ITEM,
- BUFF,
- DEBUFF,
-};
-
/* iCancelAction
*
* A generic way to make necessary stuff happen when an ActiveSpell
Modified: personal/Kayden/src/server/bulkobjects/psitem.cpp
===================================================================
--- personal/Kayden/src/server/bulkobjects/psitem.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/bulkobjects/psitem.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -1226,8 +1226,11 @@
return;
}
+ ApplicativeScript *script = base_stats->GetEquipScript();
+ if (!script)
+ return;
+
MathEnvironment env;
- ApplicativeScript *script = base_stats->GetEquipScript();
env.Define("Actor", actor);
env.Define("Item", this);
equipActiveSpell = script->Apply(&env);
Modified: personal/Kayden/src/server/bulkobjects/psitemstats.cpp
===================================================================
--- personal/Kayden/src/server/bulkobjects/psitemstats.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/bulkobjects/psitemstats.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -432,14 +432,17 @@
SetDescription(row["description"]);
consumeScriptName = row["consume_script"];
+ equipScript = NULL;
- csString equipXML;
- equipXML.Format("<apply aim=\"Actor\" name=\"%s\" type=\"item\">%s</apply>", name.GetData(), row["equip_script"]);
- equipScript = ApplicativeScript::Create(equipXML);
- if (!equipScript)
+ csString equipXML(row["equip_script"]);
+ if (!equipXML.IsEmpty())
{
- Error4("Could not create ApplicativeScript for ItemStats %d (%s)'s equip script %s.", uid, name.GetData(), equipXML.GetData());
- return false;
+ equipScript = ApplicativeScript::Create(equipXML);
+ if (!equipScript)
+ {
+ Error4("Could not create ApplicativeScript for ItemStats %d (%s)'s equip script: %s.", uid, name.GetData(), equipXML.GetData());
+ return false;
+ }
}
item_quality = row.GetFloat("item_max_quality");
Modified: personal/Kayden/src/server/database/mysql/item_stats.sql
===================================================================
--- personal/Kayden/src/server/database/mysql/item_stats.sql 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/database/mysql/item_stats.sql 2009-03-07 05:07:27 UTC (rev 3145)
@@ -83,13 +83,12 @@
UNIQUE KEY `name` (`name`),
KEY `stat_type` (`stat_type`)
) ENGINE=MyISAM AUTO_INCREMENT=7333 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
--
-- Dumping data for table `item_stats`
--
---LOCK TABLES `item_stats` WRITE;
+-- LOCK TABLES `item_stats` WRITE;
/*!40000 ALTER TABLE `item_stats` DISABLE KEYS */;
INSERT INTO `item_stats` VALUES (1,'B','Fist',0.00,100.00,0,0,'LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,4,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,0,0,0,0,0,'Hammer',1,0.00,'HAMMER','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,1);
INSERT INTO `item_stats` VALUES (2,'B','Small Battle Axe',5.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,2,-1,-1,'0','0','0',0.00,0.00,0.00,5.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,28,29,0,0,0,'Axe',1,350.00,'AXE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','smallaxe',50,'',NULL,NULL,-1,2);
@@ -163,7 +162,7 @@
INSERT INTO `item_stats` VALUES (68,'B','Superb batter',2.00,25.00,1,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (69,'B','Batter',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (70,'B','Wooden bowl',1.00,25.00,40,35,'BULK LEFTHAND RIGHTHAND','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,42,43,0,0,0,'Hammer',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (71,'B','Gareths waybread recipe',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (71,'B','Gareths waybread recipe',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (72,'B','Burnt bread',2.00,25.00,8,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'FOOD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (73,'B','Pile of dust',2.00,25.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (74,'B','Oven',1.00,500.00,65535,300,'','CONTAINER CANTRANSFORM',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
@@ -211,20 +210,20 @@
INSERT INTO `item_stats` VALUES (117,'B','Potters Wheel',1.00,500.00,65535,300,'','CONTAINER CANTRANSFORM',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (118,'B','Clay Mold',5.00,5.00,1,0,'BULK, RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (119,'B','Casting Mold',5.00,5.00,1,0,'BULK, RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (120,'B','Fishing reel design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (120,'B','Fishing reel design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (121,'B','Fishing Reel',5.00,5.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (122,'B','Fishing Rod',1.00,25.00,40,35,'BULK LEFTHAND RIGHTHAND','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,42,43,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (123,'B','Iron Pole',10.00,5.00,1,0,'BULK,RIGHTHAND,LEFTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,28,29,0,0,0,'0',7,50.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (124,'B','Hammer Head',5.00,5.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (125,'B','Hammer head design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (125,'B','Hammer head design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (126,'B','Wood Shaft',5.00,5.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (127,'B','Anvil design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (127,'B','Anvil design',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (128,'B','Simple Lock',1.00,10.00,70,65,'BULK RIGHTHAND LEFTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,42,43,0,0,0,'3c',3,200.00,'CONTAINER','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (129,'B','Ring of HP',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<hp-max value=\"100\"/>',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (130,'B','Ring of mana',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<mana-max value=\"20\"/>',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (131,'B','Ring of strength',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<str value=\"10\"/><msg text=\"You feel stronger.\" undo=\"You feel weaker.\"/>',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (132,'B','Ring of agility',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<agi value=\"10\"/><msg text=\"You feel faster.\" undo=\"You feel slower.\"/>',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (133,'B','Ring of faction',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<faction name=\"orcs\" value=\"100\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (129,'B','Ring of HP',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<apply aim=\"Actor\" type=\"buff\" name=\"Extra HP\"><hp-max value=\"100\"/></apply>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (130,'B','Ring of mana',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<apply aim=\"Actor\" type=\"buff\" name=\"Extra Mana\"><mana-max value=\"50\"/></apply>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (131,'B','Ring of strength',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<apply aim=\"Actor\" type=\"buff\" name=\"Strong\"><str value=\"10\"/><msg text=\"You feel stronger.\" undo=\"You feel weaker.\"/></apply>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (132,'B','Ring of agility',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<apply aim=\"Actor\" type=\"buff\" name=\"Agile\"><agi value=\"10\"/><msg text=\"You feel faster.\" undo=\"You feel slower.\"/></apply>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (133,'B','Ring of faction',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<apply aim=\"Actor\" type=\"debuff\" name=\"Orc Faction\"><faction name=\"orcs\" value=\"50\"/></apply>',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (134,'B','Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (135,'B','Nutty Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (136,'B','Sweet Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
@@ -250,10 +249,10 @@
INSERT INTO `item_stats` VALUES (462,'B','Armors repair kit',5.00,100.00,5,0,'BULK RIGHTHAND LEFTHAND','STACKABLE',0.10,30,-1,-1,'','','',0.00,0.00,0.00,0.00,0.00,0.00,1.00,0.00,0.00,0.00,0.00,0.00,149,157,0,0,0,'0',2,50.00,'HAMMER','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'A kit of spare parts and tools that allows you to repair an armor','nosound',100,'',NULL,'',-1,2);
INSERT INTO `item_stats` VALUES (423,'B','Public Blank Map',1.00,5.00,1,0,'BULK LEFTHAND RIGHTHAND','STACKABLE BUY_PERSONALISE CREATIVE WRITEABLE',0.00,-1,1,1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,50.00,'GENERIC',NULL,0.00,NULL,0.00,'0',0.00,'0',0,0.0000,0,0,0,0,NULL,'nosound',99,NULL,NULL,'<creative type=\"sketch\" creator=\"public\"><content><pages><page l=\"20\" t=\"50\" w=\"300\" h=\"400\"></page></pages></content></creative>',-1,2);
INSERT INTO `item_stats` VALUES (531,'B','Weapons repair kit',4.00,100.00,4,0,'BULK RIGHTHAND LEFTHAND','STACKABLE',0.10,33,-1,-1,'0','0','0',0.00,0.00,0.00,0.10,0.00,0.00,1.00,0.00,0.10,0.00,0.10,0.00,149,157,0,0,0,'Hammer',1,40.00,'HAMMER','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'A kit of spare parts and tools that allows you to repair a weapon','nosound',1,'',NULL,'',-1,2);
-INSERT INTO `item_stats` VALUES (600,'B','Buffed Sword of Strength',7.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,0,-1,-1,'0','0','0',0.00,0.00,0.00,6.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,32,33,0,0,0,'Sabre',1,150.00,'SWORD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'<str value=\"30\"/><skill name=\"Sword\" value=\"3\"/>',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (601,'B','Buffed Sword of Negativity',7.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,0,-1,-1,'0','0','0',0.00,0.00,0.00,6.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,32,33,0,0,0,'Sabre',1,150.00,'SWORD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'<str value=\"-50\"/><skill name=\"Sword\" value=\"-5\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (600,'B','Buffed Sword of Strength',7.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,0,-1,-1,'0','0','0',0.00,0.00,0.00,6.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,32,33,0,0,0,'Sabre',1,150.00,'SWORD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'<apply aim=\"Actor\" type=\"buff\" name=\"Sword Strength\"><str value=\"30\"/><skill name=\"Sword\" value=\"3\"/></apply>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (601,'B','Buffed Sword of Negativity',7.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','MELEEWEAPON',0.10,0,-1,-1,'0','0','0',0.00,0.00,0.00,6.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,32,33,0,0,0,'Sabre',1,150.00,'SWORD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'<apply aim=\"Actor\" type=\"debuff\" name=\"Sword Negativity\"><str value=\"-50\"/><skill name=\"Sword\" value=\"-5\"/></apply>',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (2008,'B','Book of the bug fixer',2.00,100.00,1,0,'BULK','READABLE CREATIVE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,131,151,0,0,0,'0',13,100.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'A book.','nosound',50,'',NULL,'<creative type=\"literature\"><content>Bards tell that there are magical ways to fix bugs. The knowledge you have to obtain can be found in the Dark Way.</content></creative>',-1,2);
-INSERT INTO `item_stats` VALUES (3013,'B','Catalog of Shields',1.00,100.00,15,0,'BULK MIND','STACKABLE',0.10,4,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,149,157,0,0,0,'0',15,400.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'Extensive catalog of shield designs. Armed with these designs, a skilled smith will be able to construct most common shields. The illustrations show how a variety of shield cores can be created by hammering different amounts of hot metal that is shaped upon the anvil with a hammer. The shield core can then be combined with a shield handle to create the final piece of equipment.','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (3013,'B','Catalog of Shields',1.00,100.00,15,0,'BULK MIND','STACKABLE',0.10,4,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,149,157,0,0,0,'0',15,400.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'Extensive catalog of shield designs. Armed with these designs, a skilled smith will be able to construct most common shields. The illustrations show how a variety of shield cores can be created by hammering different amounts of hot metal that is shaped upon the anvil with a hammer. The shield core can then be combined with a shield handle to create the final piece of equipment.','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4000,'B','Round Shield',7.00,5.00,100,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,0,-1,-1,'0','0','0',0.00,0.00,0.00,6.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,1162,1163,0,0,0,'0',1,150.00,'SHIELD','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4085,'B','Heated Iron Stock',3.00,100.00,5,0,'BULK LEFTHAND RIGHTHAND','STACKABLE EQUIP_STACKABLE',0.10,4,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,131,151,0,0,0,'0',16,10.00,'','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'Long metal bars of iron used in smiting that are yellow hot.','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4320,'B','Iron Half Circle',1.00,100.00,5,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,4,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,131,156,0,0,0,'0',17,10.00,'','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'Almost half the size of a small buckler these metal half circles help protect the center of the shield.','nosound',50,'',NULL,NULL,-1,2);
@@ -267,12 +266,12 @@
INSERT INTO `item_stats` VALUES (4002,'B','Sandwich Plate',1.00,500.00,65535,300,'BULK,RIGHTHAND,LEFTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4003,'B','Artisan Waybread',5.00,5.00,1,0,'BULK, RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4005,'B','Corned Beef',5.00,5.00,1,0,'BULK, RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
-INSERT INTO `item_stats` VALUES (4006,'B','Smoked Provolone',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'<msg text=\"You now have something in mind.\" undo=\"Your mind is now clear.\"/>',NULL,NULL,-1,2);
+INSERT INTO `item_stats` VALUES (4006,'B','Smoked Provolone',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4007,'B','Sublime Sandwich',10.00,5.00,1,0,'BULK,RIGHTHAND,LEFTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,28,29,0,0,0,'0',7,50.00,'GENERIC','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4008,'B','Condiment Recipe',1.00,500.00,65535,300,'BULK,RIGHTHAND,LEFTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,0,'0','nosound',50,'',NULL,NULL,-1,2);
INSERT INTO `item_stats` VALUES (4009,'B','Silver Penny',5.00,5.00,1,0,'BULK, RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,10.00,0.00,10.00,1.00,2.00,3.00,0.00,28,29,0,0,0,'0',6,0.00,'TOOL','',0.00,'',0.00,'',0.00,'0',0,0.0000,0,0,0,1,'0','nosound',50,'',NULL,NULL,-1,2);
/*!40000 ALTER TABLE `item_stats` ENABLE KEYS */;
---UNLOCK TABLES;
+-- UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -283,4 +282,4 @@
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2009-03-06 23:58:26
+-- Dump completed on 2009-03-07 4:22:44
Modified: personal/Kayden/src/server/gem.cpp
===================================================================
--- personal/Kayden/src/server/gem.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/gem.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -3496,7 +3496,7 @@
void gemActor::AddActiveSpell(ActiveSpell *asp)
{
activeSpells.Push(asp);
- psGUIActiveMagicMessage outgoing(this->GetClientID(), psGUIActiveMagicMessage::addCategory, asp->Name(), true);
+ psGUIActiveMagicMessage outgoing(GetClientID(), psGUIActiveMagicMessage::Add, asp->Type(), asp->Name());
outgoing.SendMessage();
}
@@ -3504,10 +3504,8 @@
{
if (activeSpells.Delete(asp))
{
- psGUIActiveMagicMessage outgoing(this->GetClientID(), psGUIActiveMagicMessage::removeCategory, asp->Name(), true);
+ psGUIActiveMagicMessage outgoing(GetClientID(), psGUIActiveMagicMessage::Remove, asp->Type(), asp->Name());
outgoing.SendMessage();
-
- // You're responsible for freeing the ActiveSpell...
return true;
}
return false;
Modified: personal/Kayden/src/server/scripting.cpp
===================================================================
--- personal/Kayden/src/server/scripting.cpp 2009-03-07 03:28:23 UTC (rev 3144)
+++ personal/Kayden/src/server/scripting.cpp 2009-03-07 05:07:27 UTC (rev 3145)
@@ -689,8 +689,6 @@
type = BUFF;
else if (typ == "debuff")
type = DEBUFF;
- else if (typ == "item")
- type = ITEM;
else
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|