Instructions Jenkins Doxygen

[fixed] Sarlacc disease duration 97/1797/2
authorMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 15:45:22 +0000 (15:45 +0000)
committerMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 15:47:55 +0000 (15:47 +0000)
[added] Dathomir sarlacc will now also disease unlucky travelers

Change-Id: Iffb20805af81254cb3a03ffcc781a370def727bb

MMOCoreORB/src/server/zone/managers/planet/PlanetManagerImplementation.cpp
MMOCoreORB/src/server/zone/objects/area/SarlaccAreaImplementation.cpp

index 5f59fc4..6a210a5 100644 (file)
@@ -72,6 +72,11 @@ void PlanetManagerImplementation::initialize() {
                area->setRadius(512.f);
                area->initializePosition(5306, 0, -4145);
                zone->transferObject(area, -1, true);
+
+               Reference<ActiveArea*> sarlaccArea = zone->getZoneServer()->createObject(String("object/sarlacc_area.iff").hashCode(), 0).castTo<ActiveArea*>();
+               sarlaccArea->setRadius(50.f);
+               sarlaccArea->initializePosition(-2085, 0, 3147);
+               zone->transferObject(sarlaccArea, -1, true);
        }
 
        if (zone->getZoneName() == "tatooine") {
index d89a5b7..c7da2ff 100644 (file)
@@ -34,6 +34,6 @@ void SarlaccAreaImplementation::notifyEnter(SceneObject* player) {
                        }
                }
        }
-       playerCreature->addDotState(CreatureState::DISEASED, 0, 30 + System::random(20), CreatureAttribute::HEALTH, 1000 * 60 * 60, 2000, 0);
+       playerCreature->addDotState(CreatureState::DISEASED, 0, 30 + System::random(20), CreatureAttribute::HEALTH, 30 * 60, 2000, 0);
        playerCreature->sendSystemMessage("@mob/sarlacc:sarlacc_dot"); // You suddenly feel weak and sick.
 }