mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* added possibility to hook scripts to incoming opcodes

Browse Source 
* fixed a few bugs with script hooks (scripts must be uppercased!!)
* added script funcs: GetOpcodeName, GetOpcodeID
* fixed possible crash at const char *GetOpcodeName()
* added script SendWhoForPlayer until CMSG_WHO correctly implemented into core
This commit is contained in:
False.Genesis 2007-11-13 20:44:55 +00:00
parent 6cf1b2cf96
commit 74bb1a8a42
7 changed files with 107 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/scripts/__core_func.def
View File

@ -143,13 +143,13 @@ return ${outstr}
// args: @0: script name; @def: code
// be sure that the code you append is valid and working DefScript code! (no if/loop block mismatches, etc)
// if you need to use { or }, escape them: "appenddef,myscript log Myscript: finished, @def=$\{@def\}"
if ?{and,{?{strlen ${@def}}} ?{strlen ${@0}}}
if ?{not ?{ScriptExists ${@0}}}
createdef ${@0}
logdebug AppendDef: ${@0} didnt exist, created
set,sc ?{lowercase ${@0}}
if ?{and,{?{strlen ${@def}}} ?{strlen ${sc}}}
if ?{not ?{ScriptExists ${sc}}}
createdef ${sc}
endif
lpushback,{#DEFSCRIPT::SCRIPT::${@0}} ${@def}
lpushback,{#DEFSCRIPT::SCRIPT::${sc}} ${@def}
unset cmd
endif
@ -161,5 +161,5 @@ endif
// @0: script name
// @def: line of text to look for
return ?{lcontains,{#DEFSCRIPT::SCRIPT::${@0}} ${@def}}
return ?{lcontains,{#DEFSCRIPT::SCRIPT::?{lowercase ${@0}}} ${@def}}

22
bin/scripts/opcode_who_forplayer.def Normal file
View File

@ -0,0 +1,22 @@
// temporary wrapper for requesting info about a certain player until implemented into the core
#script=SendWhoForPlayer
// minlvl 0
bbappend,pkt,uint32 0
// maxlvl 100
bbappend,pkt,uint32 100
// player name, case-sensitive string
bbappend,pkt,string ${@def}
// no guild, empty string
bbappend,pkt,string
// racemask - all races
bbappend,pkt,uint32 0xFFFFFFFF
// classmask - all classes
bbappend,pkt,uint32 0xFFFFFFFF
// 0 zones to check
bbappend,pkt,uint32 0
// 0 additional strings
bbappend,pkt,uint32 0
SendWorldPacket,{?{GetOpcodeID CMSG_WHO}} pkt
bbdelete pkt

12
src/Client/DefScriptInterface.cpp
View File

@ -51,6 +51,8 @@ void DefScriptPackage::_InitDefScriptInterface(void)
AddFunc("getrace",&DefScriptPackage::SCGetRace);
AddFunc("getclass",&DefScriptPackage::SCGetClass);
AddFunc("sendworldpacket",&DefScriptPackage::SCSendWorldPacket);
AddFunc("getopcodename",&DefScriptPackage::SCGetOpcodeName);
AddFunc("getopcodeid",&DefScriptPackage::SCGetOpcodeID);
}
DefReturnResult DefScriptPackage::SCshdn(CmdSet& Set)
@ -886,6 +888,16 @@ DefReturnResult DefScriptPackage::SCSendWorldPacket(CmdSet &Set)
return false;
}
DefReturnResult DefScriptPackage::SCGetOpcodeID(CmdSet &Set)
{
uint32 id = GetOpcodeID(Set.defaultarg.c_str());
return id != (uint32)(-1) ? toString(id) : "";
}
DefReturnResult DefScriptPackage::SCGetOpcodeName(CmdSet &Set)
{
return GetOpcodeName((uint32)DefScriptTools::toUint64(Set.defaultarg));
}

2
src/Client/DefScriptInterfaceInclude.h
View File

@ -42,5 +42,7 @@ DefReturnResult SCGetObjectValue(CmdSet&);
DefReturnResult SCGetRace(CmdSet&);
DefReturnResult SCGetClass(CmdSet&);
DefReturnResult SCSendWorldPacket(CmdSet&);
DefReturnResult SCGetOpcodeName(CmdSet&);
DefReturnResult SCGetOpcodeID(CmdSet&);
#endif

19
src/Client/World/Opcodes.cpp
View File

@ -19,7 +19,7 @@
/** \file
\ingroup u2w
*/
#include "common.h"
#include "Opcodes.h"
@ -986,11 +986,24 @@ const char* worldOpcodeNames[] =
"UNKNOWN953", // 953
"SMSG_UNKNOWN_954", // 954
"SMSG_UNKNOWN_955", // 955
//there would be declared new opcode, id 956
//do not forget to change MAX_OPCODE_ID, if you add a line here!
"" // last entry should be empty
};
const char *GetOpcodeName(unsigned int id)
{
if(id > MAX_OPCODE_ID)
return "";
return worldOpcodeNames[id];
}
const unsigned int GetOpcodeID(const char *name)
{
for(unsigned int i=0; strlen(worldOpcodeNames[i]); i++)
{
if(!stricmp(worldOpcodeNames[i], name))
{
return i;
}
}
return -1; // invalid name
}

1
src/Client/World/Opcodes.h
View File

@ -24,6 +24,7 @@
#define _OPCODES_H
const char *GetOpcodeName(unsigned int);
const unsigned int GetOpcodeID(const char *);
/// List of OpCodes
enum OpCodes

79
src/Client/World/WorldSession.cpp
View File

@ -113,56 +113,71 @@ void WorldSession::Update(void)
}
}
DefScriptPackage *sc = GetInstance()->GetScripts();
OpcodeHandler *table = _GetOpcodeHandlerTable();
uint16 hpos;
bool known=false;
while(pktQueue.size())
while(pktQueue.size())
{
WorldPacket *packet = pktQueue.next();
for (hpos = 0; table[hpos].handler != NULL; hpos++)
{
WorldPacket *packet = pktQueue.next();
if (table[hpos].opcode == packet->GetOpcode())
{
known=true;
break;
}
}
for (hpos = 0; table[hpos].handler != NULL; hpos++)
{
if (table[hpos].opcode == packet->GetOpcode())
{
known=true;
break;
}
}
bool hideOpcode = false;
bool hideOpcode = false;
// TODO: Maybe make table or something with all the frequently opcodes
if (packet->GetOpcode() == SMSG_MONSTER_MOVE)
{
hideOpcode = true;
}
// TODO: Maybe make table or something with all the frequently opcodes
if (packet->GetOpcode() == SMSG_MONSTER_MOVE)
{
hideOpcode = true;
}
if( (known && GetInstance()->GetConf()->showopcodes==1)
|| ((!known) && GetInstance()->GetConf()->showopcodes==2)
|| (GetInstance()->GetConf()->showopcodes==3) )
{
if( (known && GetInstance()->GetConf()->showopcodes==1)
|| ((!known) && GetInstance()->GetConf()->showopcodes==2)
|| (GetInstance()->GetConf()->showopcodes==3) )
{
if(!(GetInstance()->GetConf()->hidefreqopcodes && hideOpcode))
logcustom(1,YELLOW,">> Opcode %u [%s] (%s, %u bytes)", packet->GetOpcode(), GetOpcodeName(packet->GetOpcode()), known ? "Known" : "UNKNOWN", packet->size());
}
logcustom(1,YELLOW,">> Opcode %u [%s] (%s, %u bytes)", packet->GetOpcode(), GetOpcodeName(packet->GetOpcode()), known ? "Known" : "UNKNOWN", packet->size());
}
if(known)
try
{
try
{
// call the opcode handler
if(known)
(this->*table[hpos].handler)(*packet);
}
catch (...)
// if there is a script attached to that opcode, call it now.
// note: the pkt rpos needs to be reset in by the scripts!
std::string scname = "opcode::";
scname += stringToLower(GetOpcodeName(packet->GetOpcode()));
if(sc->ScriptExists(scname))
{
logerror("Exception while handling opcode %u!",packet->GetOpcode());
logerror("Data: pktsize=%u, handler=0x%X queuesize=%u",packet->size(),table[hpos].handler,pktQueue.size());
std::string pktname = "PACKET::";
pktname += GetOpcodeName(packet->GetOpcode());
GetInstance()->GetScripts()->bytebuffers.Assign(pktname,packet);
sc->RunScript(scname,NULL);
GetInstance()->GetScripts()->bytebuffers.Unlink(pktname);
}
}
catch (...)
{
logerror("Exception while handling opcode %u!",packet->GetOpcode());
logerror("Data: pktsize=%u, handler=0x%X queuesize=%u",packet->size(),table[hpos].handler,pktQueue.size());
}
delete packet;
delete packet;
known=false;
}
}
_DoTimedActions();