Changeset 910

Timestamp:

11/06/08 23:28:50 (8 months ago)

Author:

Ramsey

Message:

added hardcoded mission "The Box". If the TC doesn't crash while players run this mission, the rest of the mission features can be rolled out. Added enough to test for crashes. ty David Karivalis for helping with testing. Known missing features: Mission saving isn't committed so this can be ran multiple times on relog, packet bug with mission titles, mission waypoint missing (migrating from normal waypoints to the actual waypoint setting in MISO packets).

Files:

• core3/trunk/MMOCoreORB/build/unix/Makefile (modified) (4 diffs)
• core3/trunk/MMOCoreORB/build/unix/config.log (deleted)
• core3/trunk/MMOCoreORB/build/unix/config.status (deleted)
• core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.cpp (modified) (20 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.h (modified) (5 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.idl (modified) (3 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManagerImplementation.cpp (modified) (4 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManagerImplementation.h (modified) (3 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.cpp (modified) (5 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.h (modified) (4 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.idl (modified) (2 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.cpp (modified) (10 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.h (modified) (2 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.cpp (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.h (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.idl (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.cpp (modified) (7 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.h (modified) (4 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.idl (modified) (3 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreatureImplementation.cpp (modified) (4 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreatureImplementation.h (modified) (5 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionImplementation.cpp (modified) (9 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/mission/MissionObjectImplementation.cpp (modified) (2 diffs)
• core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerImplementation.cpp (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerImplementation.h (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/objects/tangible/InventoryImplementation.h (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/packets/mission/MissionObjectDeltaMessage3.h (modified) (1 diff)
• core3/trunk/MMOCoreORB/src/server/zone/packets/mission/MissionObjectMessage3.h (modified) (1 diff)

core3/trunk/MMOCoreORB/build/unix/Makefile

@@ -117 +117 @@
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-SWGEmu/w
-SWGEmu/w
-SWGEmu/w
-SWGEmu/w
-SWGEmu/w
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
-AWK = gawk
-CC = gcc
@@ -146 +146 @@
-LIBS = 
-LTLIBOBJS = 
-SWGEmu/w
+Work/SWGEmu/liveW
-MKDIR_P = /usr/bin/mkdir -p
-OBJEXT = o
@@ -165 +165 @@
-USER_LIBS_PATH = /usr/local/lib
-VERSION = 1.0
-SWGEmu/w
-SWGEmu/w
-SWGEmu/w
-SWGEmu/w
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
+Work/SWGEmu/liveW
-ac_ct_CC = gcc
-ac_ct_CXX = g++
@@ -196 +196 @@
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-SWGEmu/w
+Work/SWGEmu/liveW
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec

core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.cpp

@@ -19 +19 @@
-#include "../../objects/creature/action/ActionCreature.h"
-
-#include "../../objects/creature/action/Action.h"
-
-#include "../../objects/creature/trainer/TrainerCreature.h"
-
@@ -127 +125 @@
-}
-
-MissionCreatures(
+(Creature* creature
-        if (_impl == NULL) {
-                if (!deployed)
@@ -133 +131 @@
-
-                DistributedMethod method(this, 13);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        if (_impl == NULL) {
-                if (!deployed)
@@ -149 +148 @@
-                method.executeWithVoidReturn();
-        } else
-load
-
-
-void CreatureManager::unloadCreature(Creature* creatur
+unloadCreature
+
+
+bool CreatureManager::verifyCreatureSpawn(string& nam
-        if (_impl == NULL) {
-                if (!deployed)
@@ -158 +157 @@
-
-                DistributedMethod method(this, 15);
-ObjectParameter(creatur
-
-method.executeWithVoid
-
-((CreatureManagerImplementation*) _impl)->unloadCreature(creatur
-
-
-bool CreatureManager::verifyCreatureSpawn(string& name
+AsciiParameter(nam
+
+return method.executeWithBoolean
+
+return ((CreatureManagerImplementation*) _impl)->verifyCreatureSpawn(nam
+
+
+Creature* CreatureManager::spawnCreature(unsigned int objcrc, unsigned long long cellid, float x, float y, int bitmask, bool baby, bool doLock, float height
-        if (_impl == NULL) {
-                if (!deployed)
@@ -171 +170 @@
-
-                DistributedMethod method(this, 16);
-                method.addAsciiParameter(name);
-
-                return method.executeWithBooleanReturn();
-        } else
-                return ((CreatureManagerImplementation*) _impl)->verifyCreatureSpawn(name);
-}
-
-Creature* CreatureManager::spawnCreature(unsigned int objcrc, unsigned long long cellid, float x, float y, int bitmask, bool baby, bool doLock, float height) {
-        if (_impl == NULL) {
-                if (!deployed)
-                        throw ObjectNotDeployedException(this);
-
-                DistributedMethod method(this, 17);
-                method.addUnsignedIntParameter(objcrc);
-                method.addUnsignedLongParameter(cellid);
@@ -203 +189 @@
-                        throw ObjectNotDeployedException(this);
-
-8
+7
-                method.addAsciiParameter(profession);
-                method.addAsciiParameter(stfname);
@@ -226 +212 @@
-                        throw ObjectNotDeployedException(this);
-
-9
+8
-                method.addAsciiParameter(Planet);
-                method.addAsciiParameter(City);
@@ -248 +234 @@
-                        throw ObjectNotDeployedException(this);
-
-20
+19
-                method.addFloatParameter(x);
-                method.addFloatParameter(y);
@@ -267 +253 @@
-                        throw ObjectNotDeployedException(this);
-
-1
+0
-                method.addAsciiParameter(type);
-                method.addFloatParameter(x);
@@ -279 +265 @@
-}
-
-
-
-
-
-
-2
+const 
+
+
+
+
+1
-                method.addAsciiParameter(name);
-                method.addAsciiParameter(stfname);
@@ -306 +292 @@
-                        throw ObjectNotDeployedException(this);
-
+                DistributedMethod method(this, 22);
+                method.addAsciiParameter(name);
+
+                return method.executeWithUnsignedIntReturn();
+        } else
+                return ((CreatureManagerImplementation*) _impl)->getCreatureCrc(name);
+}
+
+bool CreatureManager::hotLoadCreature(string& name) {
+        if (_impl == NULL) {
+                if (!deployed)
+                        throw ObjectNotDeployedException(this);
+
-                DistributedMethod method(this, 23);
-                method.addAsciiParameter(name);
-
-UnsignedInt
-
-getCreatureCrc
-
-
-bool CreatureManager::hotLoadCreature(string& name
+Boolean
+
+hotLoadCreature
+
+
+void CreatureManager::registerFunctions(
-        if (_impl == NULL) {
-                if (!deployed)
@@ -320 +319 @@
-
-                DistributedMethod method(this, 24);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        if (_impl == NULL) {
-                if (!deployed)
@@ -336 +334 @@
-                method.executeWithVoidReturn();
-        } else
-Function
-
-
-registerGlobals
+Global
+
+
+loadCreatureFile
-        if (_impl == NULL) {
-                if (!deployed)
@@ -348 +346 @@
-                method.executeWithVoidReturn();
-        } else
-registerGlobals
-
-
-void CreatureManager::loadCreatureFile(
+loadCreatureFile
+
+
+Creature* CreatureManager::getCreature(unsigned long long oid
-        if (_impl == NULL) {
-                if (!deployed)
@@ -357 +355 @@
-
-                DistributedMethod method(this, 27);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        if (_impl == NULL) {
-                if (!deployed)
@@ -369 +368 @@
-
-                DistributedMethod method(this, 28);
-                method.addUnsignedLongParameter(oid);
-
-                return (Creature*) method.executeWithObjectReturn();
-        } else
-                return ((CreatureManagerImplementation*) _impl)->getCreature(oid);
-}
-
-void CreatureManager::addCreature(Creature* creature) {
-        if (_impl == NULL) {
-                if (!deployed)
-                        throw ObjectNotDeployedException(this);
-
-                DistributedMethod method(this, 29);
-                method.addObjectParameter(creature);
-
@@ -422 +408 @@
-                break;
-        case 13:
-MissionCreatures(
+((Creature*) inv->getObjectParameter()
-                break;
-        case 14:
-load
+unloadCreature
-                break;
-        case 15:
-unloadCreature((Creature*) inv->getObjectParameter(
+resp->insertBoolean(verifyCreatureSpawn(inv->getAsciiParameter(_param0_verifyCreatureSpawn__string_)
-                break;
-        case 16:
-Boolean(verifyCreatureSpawn(inv->getAsciiParameter(_param0_verifyCreatureSpawn__string_)
+Long(spawnCreature(inv->getUnsignedIntParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getSignedIntParameter(), inv->getBooleanParameter(), inv->getBooleanParameter(), inv->getFloatParameter())->_getObjectID(
-                break;
-        case 17:
-Creature(inv->getUnsignedIntParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getSignedIntParameter(), inv->getBooleanParameter(), inv->getBooleanParameter(), inv->getFloat
+Trainer(inv->getAsciiParameter(_param0_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getAsciiParameter(_param1_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getAsciiParameter(_param2_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getSignedIntParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getBoolean
-                break;
-        case 18:
-Trainer(inv->getAsciiParameter(_param0_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getAsciiParameter(_param1_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getAsciiParameter(_param2_spawnTrainer__string_string_string_int_long_float_float_float_float_float_bool_), inv->getSignedIntParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloat
+Shuttle(inv->getAsciiParameter(_param0_spawnShuttle__string_string_Coordinate_long_float_float_float_int_bool_bool_), inv->getAsciiParameter(_param1_spawnShuttle__string_string_Coordinate_long_float_float_float_int_bool_bool_), (Coordinate*) inv->getObjectParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getSignedIntParameter(), inv->getBoolean
-                break;
-        case 19:
-Shuttle(inv->getAsciiParameter(_param0_spawnShuttle__string_string_Coordinate_long_float_float_float_int_bool_bool_), inv->getAsciiParameter(_param1_spawnShuttle__string_string_Coordinate_long_float_float_float_int_bool_bool_), (Coordinate*) inv->getObjectParameter(), inv->getUnsignedLongParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getSignedIntParameter(), inv->getBoolean
+Recruiter(inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getUnsignedCharParameter(), inv->getUnsignedLong
-                break;
-        case 20:
-Recruiter(inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getUnsignedCharParameter(), inv->getUnsignedLong
+Lair(inv->getAsciiParameter(_param0_spawnLair__string_float_float_float_bool_), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloat
-                break;
-        case 21:
-Lair(inv->getAsciiParameter(_param0_spawnLair__string_float_float_float_bool_), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloat
+ActionCreature(inv->getAsciiParameter(_param0_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getAsciiParameter(_param1_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getUnsignedIntParameter(), inv->getAsciiParameter(_param3_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getUnsignedLong
-                break;
-        case 22:
-Long(spawnActionCreature(inv->getAsciiParameter(_param0_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getAsciiParameter(_param1_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getUnsignedIntParameter(), inv->getAsciiParameter(_param3_spawnActionCreature__string_string_int_string_float_float_float_float_long_bool_), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getFloatParameter(), inv->getUnsignedLongParameter(), inv->getBooleanParameter())->_getObjectID(
+Int(getCreatureCrc(inv->getAsciiParameter(_param0_getCreatureCrc__string_)
-                break;
-        case 23:
-Int(getCreatureCrc(inv->getAsciiParameter(_param0_getCreatureCrc
+Boolean(hotLoadCreature(inv->getAsciiParameter(_param0_hotLoadCreature
-                break;
-        case 24:
-sp->insertBoolean(hotLoadCreature(inv->getAsciiParameter(_param0_hotLoadCreature__string_))
+gisterFunctions(
-                break;
-        case 25:
-Function
+Global
-                break;
-        case 26:
-registerGlobals
+loadCreatureFile
-                break;
-        case 27:
-loadCreatureFile(
+resp->insertLong(getCreature(inv->getUnsignedLongParameter())->_getObjectID()
-                break;
-        case 28:
-                resp->insertLong(getCreature(inv->getUnsignedLongParameter())->_getObjectID());
-                break;
-        case 29:
-                addCreature((Creature*) inv->getObjectParameter());
-                break;
@@ -507 +490 @@
-}
-
-void CreatureManagerAdapter::loadMissionCreatures() {
-        return ((CreatureManagerImplementation*) impl)->loadMissionCreatures();
-}
-
-void CreatureManagerAdapter::load(Creature* creature) {
-        return ((CreatureManagerImplementation*) impl)->load(creature);
@@ -543 +522 @@
-}
-
-
+const 
-        return ((CreatureManagerImplementation*) impl)->spawnActionCreature(name, stfname, objCrc, misoKey, x, y, oY, oW, cellid, doLock);
-}

core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.h

@@ -24 +24 @@
-class ActionCreature;
-
-class Action;
-
-class TrainerCreature;
-
@@ -50 +48 @@
-        void loadBlueFrogs();
-
-        void loadMissionCreatures();
-
-        void load(Creature* creature);
-
@@ -68 +64 @@
-        LairObject* spawnLair(const string& type, float x, float y, float z, bool doLock = true);
-
-
+const 
-
-        unsigned int getCreatureCrc(string& name);
@@ -114 +110 @@
-        void loadBlueFrogs();
-
-        void loadMissionCreatures();
-
-        void load(Creature* creature);
-
@@ -132 +126 @@
-        LairObject* spawnLair(const string& type, float x, float y, float z, bool doLock);
-
-
+const 
-
-        unsigned int getCreatureCrc(string& name);

core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManager.idl

@@ -54 +54 @@
-
-import "../../objects/creature/action/ActionCreature";
-import "../../objects/creature/action/Action";
-import "../../objects/creature/trainer/TrainerCreature";
-import "../../objects/creature/recruiter/RecruiterCreature";
@@ -76 +75 @@
-        void loadRecruiters();
-        void loadBlueFrogs();
-        void loadMissionCreatures();
-
-        void load(Creature creature);
@@ -89 +87 @@
-        RecruiterCreature spawnRecruiter(float x, float y, float oY, float oW, unsigned char type = 1, unsigned long cellid = 0, boolean doLock = true);
-        LairObject spawnLair(const string type, float x, float y, float z, boolean doLock = true);
-
+const 
-        //CreatureGroup spawnCreatureGroup(int count, const string stfname, const string name, int objCrc, float x, float y, int bitmask = 0x00, int layout = 1);
-

core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManagerImplementation.cpp

@@ -60 +60 @@
-#include "../../objects/creature/shuttle/ShuttleCreature.h"
-#include "../../objects/creature/action/ActionCreature.h"
-#include "../../objects/creature/action/Action.h"
-
-#include "../../objects/creature/CreatureGroup.h"
@@ -143 +142 @@
-        loadStaticCreatures();
-        loadBlueFrogs();
-        //loadMissionCreatures();
-}
-
@@ -273 +271 @@
-                        TrainerCreature* trainer = spawnTrainer(prof->getName(), "", prof->getName(), 0x8C73B91, 0, -4967 - (i*1), 4043, 6, 0, 0);
-                }
-        }
-}
-
-void CreatureManagerImplementation::loadMissionCreatures() {
-        //temporary to work with hardcode missions
-        if (zone->getZoneID() == 5) {
-                string name = "MAN O' ACTION";
-                string stf = "";
-                ActionCreature* tac;
-                tac = spawnActionCreature(name, stf, 0x8C73B91, "testM27", -4844.0f, 4155.0f, -.0339502, .999424);
-
-                int actmsk = 0;
-                actmsk |= ActionImplementation::TYPE_CONVERSE;
-                Action* act = new Action((SceneObject*)tac, actmsk, 0);
-                string scrnId = "0";
-                string leftBox = "Do you have...it?";
-                string Options = "Yes, here.|The weather is quite nice!|No, sorry I forgot."; //separate by |
-                string optLink = "1,none|2,none|ENDCNV,none"; //separate by | (nextScreenID,actionKey)
-                act->addConvoScreen(scrnId, leftBox, 3, Options, optLink);
-
-                //Converstaion window in response to Yes, Here:
-                scrnId = "1";
-                leftBox = "Cool you have it? Give it to me!";
-                Options = "Here|No, bye.";
-                optLink = "EXECACTION,finm27|ENDCNV,none";
-                act->addConvoScreen(scrnId, leftBox, 1, Options, optLink);
-
-                //Conversation window in response to weather:
-                scrnId = "2";
-                leftBox = "Yea the weather is pretty nice..";
-                Options = "Bye.";
-                optLink = "ENDCNV,none";
-                act->addConvoScreen(scrnId, leftBox, 1, Options, optLink);
-
-                string actionKey = "KEYA";
-                tac->addAction(actionKey, act);
-                tac->onConverse(actionKey); //link onConverse to action "KEYA"
-
-                //Complete Mission Key:
-                actmsk = 0;
-                actmsk |= ActionImplementation::TYPE_TAKEITEM;
-                actmsk |= ActionImplementation::TYPE_COMPMISSION;
-                Action* act2 = new Action((SceneObject*)tac, actmsk, 0);
-
-                actionKey = "finm27";
-                tac->addAction(actionKey, act2);
-        }
-}
@@ -368 +320 @@
-                lock(doLock);
-
-, server->getMissionManager()
+
-
-                actCr->setTerrainName(Terrain::getTerrainName(zone->getZoneID()));

core3/trunk/MMOCoreORB/src/server/zone/managers/creature/CreatureManagerImplementation.h

@@ -61 +61 @@
-#include "../../objects/creature/action/ActionCreature.h"
-#include "../../objects/creature/action/ActionCreatureImplementation.h"
-#include "../../objects/creature/action/Action.h"
-#include "../../objects/creature/action/ActionImplementation.h"
-
-#include "CreatureMap.h"
@@ -110 +108 @@
-        void loadStaticCreatures();
-        void loadBlueFrogs();
-        void loadMissionCreatures();
-
-        void load(Creature* creature);
@@ -125 +122 @@
-        RecruiterCreature* spawnRecruiter(float x, float y, float oY, float oW, uint8 type = 1, uint64 cellid = 0, bool doLock = true);
-        BlueFrogCreature* spawnBlueFrog(float x, float y, float oY, float oW, int type = 0, uint64 cellid = 0, bool doLock = true);
-
+const 
-        //CreatureGroup* spawnCreatureGroup(int count, const string& stfname, const string& name, int objCrc, float x, float y, int bitmask = 0x00, int layout = LINE_LAYOUT);
-        LairObject* spawnLair(const string& type, float x, float y, float z, bool doLock = true);

core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.cpp

@@ -12 +12 @@
-
-#include "../../objects/tangible/TangibleObject.h"
+
+#include "../../objects/creature/action/ActionCreature.h"
+
+#include "../../objects/creature/action/Action.h"
-
-#include "server/zone/ZoneServer.h"
@@ -156 +160 @@
-}
-
-
+, bool doLock
-        if (_impl == NULL) {
-                if (!deployed)
@@ -164 +168 @@
-                method.addObjectParameter(player);
-                method.addAsciiParameter(tKey);
-
-
-
-
+
+
+
+
+
-}
-
@@ -300 +305 @@
-                break;
-        case 14:
-
+bool_), inv->getBooleanParameter(
-                break;
-        case 15:
@@ -362 +367 @@
-}
-
-
-
+, bool doLock
+, doLock
-}
-

core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.h

@@ -13 +13 @@
-
-class TangibleObject;
+
+class ActionCreature;
+
+class Action;
-
-class ZoneServer;
@@ -38 +42 @@
-        void doMissionAccept(Player* player, unsigned long long oid, bool doLock = true);
-
-
+, bool doLock = true
-
-        void doMissionAbort(Player* player, unsigned long long oid, bool doLock = true);
@@ -86 +90 @@
-        void doMissionAccept(Player* player, unsigned long long oid, bool doLock);
-
-
+, bool doLock
-
-        void doMissionAbort(Player* player, unsigned long long oid, bool doLock);
@@ -109 +113 @@
-        string _param16_poolMission__string_int_string_int_int_int_float_float_int_string_int_float_float_int_int_string_string_int_TangibleObject_bool_;
-        string _param1_sendMission__Player_string_bool_;
-
+bool_
-        string _param1_doMissionAbort__Player_string_bool_;
-        string _param0_getMissionItemCrc__string_bool_;

core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManager.idl

@@ -46 +46 @@
-import "../../objects/mission/MissionObject";
-import "../../objects/tangible/TangibleObject";
+import "../../objects/creature/action/ActionCreature";
+import "../../objects/creature/action/Action";
-
-import "server/zone/ZoneServer";
@@ -73 +75 @@
-        //events
-        void doMissionAccept(Player player, unsigned long oid, boolean doLock = true);
-
+, boolean doLock = true
-        void doMissionAbort(Player player, unsigned long oid, boolean doLock = true);
-        void doMissionAbort(Player player, string tKey, boolean doLock = true);

core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.cpp

@@ -48 +48 @@
-
-#include "../../objects/player/Player.h"
+#include "../../objects/creature/action/ActionCreature.h"
+#include "../../objects/creature/action/Action.h"
-
-#include "../../packets.h"
@@ -158 +160 @@
-
-void MissionManagerImplementation::setupHardcodeMissions() {
-/*
-string 
+string dbKey = "";
+
-        int tmask = TMASK_GENERAL; //terminal mask (GENERAL)
-        string typeStr = "mission_deliver"; 
@@ -170 +172 @@
-        
-        uint32 diffLv = 1; 
-1337.0f; 
-1337
+-5049.0f;
+4225
-        uint32 destPlanetCrc = Planet::getPlanetCRC("naboo");
-        string creatorName = "Ramsey";
-        uint32 rewardAmount = 50;
-123
-1234
+-484
+4155
-        uint32 targetPlanetCrc = Planet::getPlanetCRC("naboo");
-2D589F5B; //0x5B, 0x9F, 0x58, 0x2D, butterfly
+9BA06548; //holocron/secret box crc
-        
-        //string descriptionStf = "mission/mission_deliver_neutral_easy"; 
-        //string titleStf = "mission/mission_deliver_neutral_easy"; 
-        //For custom missions:
-
+ The last time I checked he was at -5049, 4225.
-        string titleStf = "The Box";
-        
@@ -195 +197 @@
-                        descriptionStf, titleStf, typeCrc, dvli, true);
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -339 +377 @@
-                //Check if player is already on mission:
-                if(player->isOnCurMisoKey(miso->getDBKey())) {
-
+//
-                        return;
-                }
@@ -371 +409 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -533 +579 @@
-
-void MissionManagerImplementation::removeMisoFromPlayer(Player* player, string& tKey, bool doLock) {
- = NULL
-
-
-
-
+
+
+
+
+       
-                miso = misoMap->get(tKey);
-                
@@ -569 +615 @@
-
-void MissionManagerImplementation::removeMisoFromPlayer(Player* player, uint64& oid, bool doLock) {
- = NULL
+
-        
-        try {
@@ -605 +651 @@
-
-void MissionManagerImplementation::removeMisoFromPlayer(MissionObject* miso, Player* player) {
+        miso->sendDestroyTo(player);
+        
-        if(miso->getTypeStr() == "mission_deliver" && (miso->getDeliverItem() != NULL)) {
-                TangibleObject* tmpi = (TangibleObject*)player->getMissionItem(miso->getDBKey());
@@ -610 +658 @@
-                        return;
-                }
-
-                player->removeInventoryItem(tmpi->getObjectID());
-                tmpi->sendDestroyTo(player);
-                tmpi->finalize();
-        }
-        
-        miso->sendDestroyTo(player);
-}
-

core3/trunk/MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.h

@@ -61 +61 @@
-#include "../../objects/tangible/TangibleObjectImplementation.h"
-
+#include "../../objects/creature/action/ActionCreature.h"
+#include "../../objects/creature/action/ActionCreatureImplementation.h"
+#include "../../objects/creature/action/Action.h"
+#include "../../objects/creature/action/ActionImplementation.h"
+
-#include "MissionMap.h"
-
@@ -97 +102 @@
-        //events
-        void doMissionAccept(Player* player, uint64& oid, bool doLock = true);
-
+, bool doLock = true
-        void doMissionAbort(Player* player, uint64& oid, bool doLock = true);
-        void doMissionAbort(Player* player, string& tKey, bool doLock = true);

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.cpp

@@ -9 +9 @@
-#include "ActionCreature.h"
-
-
+Implementation
-
-#include "../../scene/SceneObject.h"

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.h

@@ -10 +10 @@
-class ActionCreature;
-
-
+Implementation
-
-class SceneObject;

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/Action.idl

@@ -45 +45 @@
-import "ActionCreature";
-
-
+Implementation
-
-import "../../scene/SceneObject";

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.cpp

@@ -9 +9 @@
-#include "Action.h"
-
-
+Implementation
-
-#include "../../scene/SceneObject.h"
@@ -21 +21 @@
- */
-
-, MissionManager* mMgr
-, mMgr
+
+
-        _impl->_setStub(this);
-}
@@ -137 +137 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (_impl == NULL) {
-                if (!deployed)
@@ -143 +159 @@
-
-                DistributedMethod method(this, 14);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        if (_impl == NULL) {
-                if (!deployed)
@@ -155 +172 @@
-
-                DistributedMethod method(this, 15);
-                method.addObjectParameter(obj);
-
-                method.executeWithVoidReturn();
-        } else
-                ((ActionCreatureImplementation*) _impl)->sendConversationStartTo(obj);
-}
-
-void ActionCreature::selectConversationOption(int option, SceneObject* obj) {
-        if (_impl == NULL) {
-                if (!deployed)
-                        throw ObjectNotDeployedException(this);
-
-                DistributedMethod method(this, 16);
-                method.addSignedIntParameter(option);
-                method.addObjectParameter(obj);
@@ -212 +216 @@
-                break;
-        case 14:
-resp->insertLong(getMisoMgr()->_getObjectID
+sendConversationStartTo((SceneObject*) inv->getObjectParameter
-                break;
-        case 15:
-                sendConversationStartTo((SceneObject*) inv->getObjectParameter());
-                break;
-        case 16:
-                selectConversationOption(inv->getSignedIntParameter(), (SceneObject*) inv->getObjectParameter());
-                break;
@@ -259 +260 @@
-}
-
-MissionManager* ActionCreatureAdapter::getMisoMgr() {
-        return ((ActionCreatureImplementation*) impl)->getMisoMgr();
-}
-
-void ActionCreatureAdapter::sendConversationStartTo(SceneObject* obj) {
-        return ((ActionCreatureImplementation*) impl)->sendConversationStartTo(obj);

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.h

@@ -10 +10 @@
-class Action;
-
-
+Implementation
-
-class SceneObject;
@@ -22 +22 @@
-class ActionCreature : public Creature {
-public:
-, MissionManager* mMgr = NULL
+
-
-        void addAction(string& key, Action* act);
@@ -40 +40 @@
-        string& getMissionKey();
-
-
+
+
+
-
-        void sendConversationStartTo(SceneObject* obj);
@@ -79 +81 @@
-
-        string& getMissionKey();
-
-        MissionManager* getMisoMgr();
-
-        void sendConversationStartTo(SceneObject* obj);

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreature.idl

@@ -45 +45 @@
-import "Action";
-
-
+Implementation
-
-import "../../scene/SceneObject";
@@ -55 +55 @@
-interface ActionCreature implements Creature {
-
-, MissionManager mMgr = NULL
+
-                super(oid);
-        }
@@ -72 +72 @@
-        boolean isMissionNpc(); //Returns true if NPC has a mission assigned to it.
-        string getMissionKey();
-
+
+
-        
-        //Conversation Specific:

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreatureImplementation.cpp

@@ -49 +49 @@
-#include "../../player/Player.h"
-
-
+Implementation
-
-#include "../../../packets.h"
@@ -56 +56 @@
-
-ActionCreatureImplementation::ActionCreatureImplementation(uint64 oid, uint32 objCrc, string& creName, string& stf, 
-, MissionManager* mMgr
+
-        
-        // General NPC:
@@ -75 +75 @@
-        // Mission:
-        misoKey = missionKey;
-        misoMgr = mMgr;
-        
-        stringstream loggingname;
@@ -184 +183 @@
-}
-
-MissionManager* ActionCreatureImplementation::getMisoMgr() {
-        if(misoMgr == NULL) {
-                misoMgr = server->getMissionManager();
-        }
-        return misoMgr;
-}
-

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionCreatureImplementation.h

@@ -46 +46 @@
-#define ACTIONCREATUREIMPLEMENTATION_H_
-
+class MissionManagerImplementation;
+
-class Player;
-class SceneObject;
+
+#include "engine/engine.h"
-
-#include "ActionCreature.h"
@@ -57 +61 @@
-        
-        string misoKey; //Mission Key
-
+Implementation
-        
-        //Trigger Action Keys:
@@ -66 +70 @@
-        
-public:
-
-
+
-        ~ActionCreatureImplementation();
-        
@@ -92 +95 @@
-        }
-        
-
+
+
+
+
+
+
+
+
-        
-        //Conversation Specific:
@@ -108 +118 @@
-                actionList.removeAll();
-        }
+        
+        friend class MissionManagerImplementation;
-
-};

core3/trunk/MMOCoreORB/src/server/zone/objects/creature/action/ActionImplementation.cpp

@@ -46 +46 @@
-#include "ActionImplementation.h"
-
-
+Implementation
-
-#include "../../../packets.h"
@@ -66 +66 @@
-        if(!prereqCheck(player))
-                return;
-
+
-        if((actionMask & TYPE_MOVE)) {
-        }
@@ -97 +97 @@
-                        
-                        pItem = player->getMissionItem(misoKey);
+                        
-                        if(pItem == NULL) {
-                                //Elaborate with NPC dialogue later.
-
-
-
-
+
-                                return;
-                        }
@@ -115 +113 @@
-        if((actionMask & TYPE_COMPMISSION)) {
-                string misoKey;
-
-
-
+
-                
-                if(parentObject->isNonPlayerCreature()) {
@@ -127 +123 @@
-                                return;
-                        
-                        printf("comp mission 2\n");
-                        
-                        misoKey = parentCreature->getMissionKey();
-                        mMgr = parentCreature->getMisoMgr();
-                        
-                        if(mMgr == NULL) {
-//
+
-                                return;
-                        }
-                        
-
-
-
-
+
+
+
+
+
-                } /*else if(parentObject->isAttackableObject()) {
-                        //For lairs
@@ -149 +144 @@
-        if((actionMask & TYPE_FAILMISSION)) {
-                string misoKey;
-
+Implementation
-                
-                if(parentObject->isNonPlayerCreature()) {
@@ -162 +157 @@
-                        mMgr = parentCreature->getMisoMgr();
-                        
-
+
+
+
+
+
+
-                        
-                } /*else if(parentObject->isAttackableObject()) {
@@ -227 +227 @@
-                        return;
-                }
-
-
-
+
-                string newScreenID;
-                string actKey;
@@ -312 +310 @@
-                }
-        }
-        //
-        
-        return false;

core3/trunk/MMOCoreORB/src/server/zone/objects/mission/MissionObjectImplementation.cpp

@@ -125 +125 @@
-
-        MissionObjectDeltaMessage3* dmiso3 = new MissionObjectDeltaMessage3((MissionObject*) _this);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        dmiso3->updateDifficultyLv(); //5
-        dmiso3->updateDestination(); //6
@@ -135 +144 @@
-        dmiso3->updateTarget(); //9
-        dmiso3->updateDepictedObject(); //10 (0A)
-
-
+
+
+
+
+
+
-        dmiso3->updateRefreshCount(player->nextMisoRFC()); //13 (0D)
-

core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerImplementation.cpp

@@ -3628 +3628 @@
-// Mission Functions
-
-&
+
-        tmk += ",";
-

core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerImplementation.h

@@ -775 +775 @@
-                curMisoKeys += (tck + ",");
-        }
-&
+
-        void removeFromCurMisoKeys(string tck);
-

core3/trunk/MMOCoreORB/src/server/zone/objects/tangible/InventoryImplementation.h

@@ -81 +81 @@
-                                tano = (TangibleObject*)obj;
-                                
-tano->getMisoAsocKey() == misKey
+!strcmp(tano->getMisoAsocKey().c_str(), misKey.c_str())
-                                        break;
+                                } else {
+                                        tano = NULL;
-                                }
-                                
-                                tano = NULL;
-                        }
-                }

core3/trunk/MMOCoreORB/src/server/zone/packets/mission/MissionObjectDeltaMessage3.h

@@ -118 +118 @@
-        }
-        
-
+bool isStf
-                startUpdate(0x0B);
-
-
+
+
+
+
+
+
+
+
+
-        }
-        
-
+bool isStf
-                startUpdate(0x0C);
-
-
+
+
+
+
+
+
+
+
+
-        }
-        

core3/trunk/MMOCoreORB/src/server/zone/packets/mission/MissionObjectMessage3.h

@@ -66 +66 @@
-                
-                insertFloat(1.0f);
-
+
-                if(mi->getTitleKey() != 0) {
-                        insertAscii("mission/mission_object");
-
-
-
-
-
-
+
-                        insertAscii(mi->getTypeStr());
-                } else {
-                        insertAscii("");
+                        insertInt(0);
+                        insertAscii(mi->getTitleStf());
-                }
-