mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 18:15:35 +00:00
Code Issues Releases Wiki Activity

add PCLowerRank script instruction

Browse source
This commit is contained in:
gugus 2012-04-09 14:26:53 +02:00
parent 45d11eaf14
commit aa8418634f
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwscript/docs/vmformat.txt
View file

@ -25,7 +25,8 @@ op 0x20008: LoopAnim
op 0x20009: LoopAnim, explicit reference op 0x20009: LoopAnim, explicit reference
op 0x2000a: Choice op 0x2000a: Choice
op 0x2000b: PCRaiseRank op 0x2000b: PCRaiseRank
opcodes 0x2000c-0x3ffff unused op 0x2000c: PCLowerRank
opcodes 0x2000d-0x3ffff unused
Segment 4: Segment 4:
(not implemented yet) (not implemented yet)

43
apps/openmw/mwscript/statsextensions.cpp
View file

@ -305,14 +305,11 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0) virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
{ {
std::cout << "arg0:" << arg0<< std::endl;
std::cout << "try to rais rank...";
std::string factionID = ""; std::string factionID = "";
MWScript::InterpreterContext& context MWScript::InterpreterContext& context
= static_cast<MWScript::InterpreterContext&> (runtime.getContext()); = static_cast<MWScript::InterpreterContext&> (runtime.getContext());
if(arg0==0) if(arg0==0)
{ {
std::cout << "slurpppp";
factionID = context.getEnvironment().mDialogueManager->getFaction(); factionID = context.getEnvironment().mDialogueManager->getFaction();
} }
else else
@ -322,7 +319,6 @@ namespace MWScript
} }
if(factionID != "") if(factionID != "")
{ {
std::cout << "raiserank!!!!!";
MWWorld::Ptr player = context.getEnvironment().mWorld->getPlayer().getPlayer(); MWWorld::Ptr player = context.getEnvironment().mWorld->getPlayer().getPlayer();
if(MWWorld::Class::get(player).getNpcStats(player).mFactionRank.find(factionID) == MWWorld::Class::get(player).getNpcStats(player).mFactionRank.end()) if(MWWorld::Class::get(player).getNpcStats(player).mFactionRank.find(factionID) == MWWorld::Class::get(player).getNpcStats(player).mFactionRank.end())
{ {
@ -336,7 +332,41 @@ namespace MWScript
std::cout << std::endl; std::cout << std::endl;
} }
}; };
class OpPCLowerRank : public Interpreter::Opcode1
{
public:
virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
{
std::string factionID = "";
MWScript::InterpreterContext& context
= static_cast<MWScript::InterpreterContext&> (runtime.getContext());
if(arg0==0)
{
factionID = context.getEnvironment().mDialogueManager->getFaction();
}
else
{
factionID = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop();
}
if(factionID != "")
{
MWWorld::Ptr player = context.getEnvironment().mWorld->getPlayer().getPlayer();
if(MWWorld::Class::get(player).getNpcStats(player).mFactionRank.find(factionID) == MWWorld::Class::get(player).getNpcStats(player).mFactionRank.end())
{
//do nothing, the player is not in the faction... Throw an exeption?
}
else
{
MWWorld::Class::get(player).getNpcStats(player).mFactionRank[factionID] = MWWorld::Class::get(player).getNpcStats(player).mFactionRank[factionID] -1;
}
}
std::cout << std::endl;
}
};
class OpModDisposition : public Interpreter::Opcode0 class OpModDisposition : public Interpreter::Opcode0
{ {
public: public:
@ -379,6 +409,7 @@ namespace MWScript
const int opcodeModSkillExplicit = 0x2000115; const int opcodeModSkillExplicit = 0x2000115;
//const int opcodePCJoinFaction = 0x2000141; //const int opcodePCJoinFaction = 0x2000141;
const int opcodePCRaiseRank = 0x2000b; const int opcodePCRaiseRank = 0x2000b;
const int opcodePCLowerRank = 0x2000c;
const int opcodeModDisposition = 0x2000145; const int opcodeModDisposition = 0x2000145;
void registerExtensions (Compiler::Extensions& extensions) void registerExtensions (Compiler::Extensions& extensions)
@ -453,6 +484,7 @@ namespace MWScript
} }
//extensions.registerInstruction("PCJoinFaction","S",opcodePCJoinFaction); //extensions.registerInstruction("PCJoinFaction","S",opcodePCJoinFaction);
extensions.registerInstruction("pcraiserank","/S",opcodePCRaiseRank); extensions.registerInstruction("pcraiserank","/S",opcodePCRaiseRank);
extensions.registerInstruction("pclowerrank","/S",opcodePCLowerRank);
extensions.registerInstruction("moddisposition","l",opcodeModDisposition); extensions.registerInstruction("moddisposition","l",opcodeModDisposition);
} }
@ -512,6 +544,7 @@ namespace MWScript
//interpreter.installSegment5(opcodePCJoinFaction,new OpPCJoinFaction); //interpreter.installSegment5(opcodePCJoinFaction,new OpPCJoinFaction);
interpreter.installSegment3(opcodePCRaiseRank,new OpPCRaiseRank); interpreter.installSegment3(opcodePCRaiseRank,new OpPCRaiseRank);
interpreter.installSegment3(opcodePCLowerRank,new OpPCLowerRank);
interpreter.installSegment5(opcodeModDisposition,new OpModDisposition); interpreter.installSegment5(opcodeModDisposition,new OpModDisposition);
} }
} }