Instructions Jenkins Doxygen

[Added] custom names can be set via objects' lua template 52/1752/1
authorIvojedi <ivojedi@swgemu.com>
Sat, 7 Jun 2014 18:26:16 +0000 (11:26 -0700)
committerIvojedi <ivojedi@swgemu.com>
Sat, 7 Jun 2014 19:27:29 +0000 (12:27 -0700)
[Fixed] name on a few lair objects

Change-Id: If325f4777efc925adf1e92dbfe6fad6b41f19b49

MMOCoreORB/bin/scripts/object/tangible/lair/bark_mite/lair_bark_mite.lua
MMOCoreORB/bin/scripts/object/tangible/lair/bark_mite/lair_bark_mite_grassland.lua
MMOCoreORB/bin/scripts/object/tangible/lair/bark_mite/lair_bark_mite_hills.lua
MMOCoreORB/bin/scripts/object/tangible/lair/crystal_snake/lair_crystal_snake_swamp.lua
MMOCoreORB/bin/scripts/object/tangible/lair/cu_pa/lair_cu_pa_wasteland.lua
MMOCoreORB/bin/scripts/object/tangible/lair/gualama/lair_gualama_grassland.lua
MMOCoreORB/bin/scripts/object/tangible/lair/kliknik/lair_kliknik_forest.lua
MMOCoreORB/src/server/zone/objects/scene/SceneObjectImplementation.cpp
MMOCoreORB/src/server/zone/templates/SharedObjectTemplate.cpp
MMOCoreORB/src/server/zone/templates/SharedObjectTemplate.h

index 07144bd..2d1bfa1 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_bark_mite_lair_bark_mite = object_tangible_lair_bark_mite_shared_lair_bark_mite:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       objectName = "@lair_n:barkmite"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_bark_mite_lair_bark_mite, "object/tangible/lair/bark_mite/lair_bark_mite.iff")
index 4f133bb..76039cd 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_bark_mite_lair_bark_mite_grassland = object_tangible_lair_bark_mite_shared_lair_bark_mite_grassland:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       objectName = "@lair_n:barkmite_grassland"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_bark_mite_lair_bark_mite_grassland, "object/tangible/lair/bark_mite/lair_bark_mite_grassland.iff")
index 3074a0f..184bbc4 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_bark_mite_lair_bark_mite_hills = object_tangible_lair_bark_mite_shared_lair_bark_mite_hills:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       objectName = "@lair_n:barkmite_hills"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_bark_mite_lair_bark_mite_hills, "object/tangible/lair/bark_mite/lair_bark_mite_hills.iff")
index 52047a9..b2a0c78 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_crystal_snake_lair_crystal_snake_swamp = object_tangible_lair_crystal_snake_shared_lair_crystal_snake_swamp:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       customName = "a swamp crystal snake lair"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_crystal_snake_lair_crystal_snake_swamp, "object/tangible/lair/crystal_snake/lair_crystal_snake_swamp.iff")
index 3cedf85..832eee9 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_cu_pa_lair_cu_pa_wasteland = object_tangible_lair_cu_pa_shared_lair_cu_pa_wasteland:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       customName = "a wasteland cu pa lair"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_cu_pa_lair_cu_pa_wasteland, "object/tangible/lair/cu_pa/lair_cu_pa_wasteland.iff")
index 9e21ac6..ee4bc6d 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_gualama_lair_gualama_grassland = object_tangible_lair_gualama_shared_lair_gualama_grassland:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       customName = "a grassland gualama lair"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_gualama_lair_gualama_grassland, "object/tangible/lair/gualama/lair_gualama_grassland.iff")
index a7d5d92..dcbe4b5 100644 (file)
@@ -43,6 +43,7 @@
 
 object_tangible_lair_kliknik_lair_kliknik_forest = object_tangible_lair_kliknik_shared_lair_kliknik_forest:new {
        objectMenuComponent = {"cpp", "LairMenuComponent"},
+       customName = "a forest kliknik lair"
 }
 
 ObjectTemplates:addTemplate(object_tangible_lair_kliknik_lair_kliknik_forest, "object/tangible/lair/kliknik/lair_kliknik_forest.iff")
index 5c7068b..3303344 100644 (file)
@@ -175,6 +175,7 @@ void SceneObjectImplementation::initializePrivateData() {
 
 void SceneObjectImplementation::loadTemplateData(SharedObjectTemplate* templateData) {
        objectName.setStringId(templateData->getObjectName());
+       customName = templateData->getCustomName();
        //detailedDescription.setStringId(templateData->getDetailedDescription());
 
        gameObjectType = templateData->getGameObjectType();
index 45c93f1..91d4e9f 100644 (file)
@@ -63,6 +63,8 @@ void SharedObjectTemplate::parseVariableData(const String& varName, LuaObject* t
                detailedDescription = Lua::getStringParameter(state);
        } else if (varName == "lookAtText") {
                lookAtText = Lua::getStringParameter(state);
+       } else if (varName == "customName") {
+               customName = Lua::getStringParameter(state);
        } else if (varName == "snapToTerrain") {
                snapToTerrain = Lua::getByteParameter(state);
        } else if (varName == "containerType") {
index 115f2f7..5993aa4 100644 (file)
@@ -38,6 +38,7 @@ protected:
        StringIdParam objectName;
        StringIdParam detailedDescription;
        StringIdParam lookAtText;
+       String customName;
 
        BoolParam snapToTerrain;
        IntegerParam containerType;
@@ -276,6 +277,10 @@ public:
                return objectName.getFullString();
        }
 
+       inline String getCustomName() const {
+               return customName;
+       }
+
        inline bool getOnlyVisibleInTools() const {
                return onlyVisibleInTools;
        }