Instructions Jenkins Doxygen

[Changed] Sith Shadows to be aggressive in sith shadow encounter. 97/1297/1
authorLoshult <loshult@swgemu.com>
Fri, 27 Dec 2013 20:38:09 +0000 (20:38 +0000)
committerLoshult <loshult@swgemu.com>
Fri, 27 Dec 2013 20:38:09 +0000 (20:38 +0000)
[Added] a waypoint datapad as loot to one of the sith shadows.

Change-Id: I123c5ce31fde86141b859907784e104475550cec

MMOCoreORB/bin/scripts/loot/groups.lua
MMOCoreORB/bin/scripts/loot/groups/sith_shadow_encounter_datapad.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/loot/items.lua
MMOCoreORB/bin/scripts/loot/items/quest/waypoint_datapad.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/managers/jedi/village/sith_shadow_encounter.lua
MMOCoreORB/bin/scripts/mobile/quest/serverobjects.lua
MMOCoreORB/bin/scripts/mobile/quest/sith_shadow.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/mobile/quest/sith_shadow_datapad.lua [new file with mode: 0644]
MMOCoreORB/bin/scripts/object/tangible/loot/quest/force_sensitive/sharred_waypoint_datapad.lua

index 859fcce..bc8a0fc 100644 (file)
@@ -131,6 +131,7 @@ includeFile("groups/rebel_officer_common.lua")
 includeFile("groups/rifles.lua")
 includeFile("groups/sharnaff.lua")
 includeFile("groups/sharnaff_common.lua")
+includeFile("groups/sith_shadow_encounter_datapad.lua")
 includeFile("groups/skaak_tipper_common.lua")
 includeFile("groups/skill_buffs.lua")
 includeFile("groups/stormtrooper_common.lua")
diff --git a/MMOCoreORB/bin/scripts/loot/groups/sith_shadow_encounter_datapad.lua b/MMOCoreORB/bin/scripts/loot/groups/sith_shadow_encounter_datapad.lua
new file mode 100644 (file)
index 0000000..463abf7
--- /dev/null
@@ -0,0 +1,12 @@
+--Automatically generated by SWGEmu Spawn Tool v0.12 loot editor.
+
+sith_shadow_encounter_datapad = {
+       description = "",
+       minimumLevel = 0,
+       maximumLevel = 0,
+       lootItems = {
+               {itemTemplate = "waypoint_datapad", weight = 10000000}
+       }
+}
+
+addLootGroupTemplate("sith_shadow_encounter_datapad", sith_shadow_encounter_datapad)
index 852cd77..26dc924 100644 (file)
@@ -414,6 +414,9 @@ includeFile("items/loot_kit/sculpture_structure_5.lua")
 includeFile("items/loot_kit/sculpture_structure_6.lua")
 includeFile("items/loot_kit/sculpture_structure_7.lua")
 
+--quest sub-folder
+includeFile("items/quest/waypoint_datapad.lua")
+
 --recycler sub-folder
 includeFile("items/recycler/agitator_motor_schematic.lua")
 includeFile("items/recycler/blue_wiring.lua")
diff --git a/MMOCoreORB/bin/scripts/loot/items/quest/waypoint_datapad.lua b/MMOCoreORB/bin/scripts/loot/items/quest/waypoint_datapad.lua
new file mode 100644 (file)
index 0000000..e1a39f4
--- /dev/null
@@ -0,0 +1,14 @@
+--Automatically generated by SWGEmu Spawn Tool v0.12 loot editor.
+
+waypoint_datapad = {
+       minimumLevel = 0,
+       maximumLevel = -1,
+       customObjectName = "",
+       directObjectTemplate = "object/tangible/loot/quest/force_sensitive/waypoint_datapad.iff",
+       craftingValues = {
+       },
+       customizationStringNames = {},
+       customizationValues = {}
+}
+
+addLootItemTemplate("waypoint_datapad", waypoint_datapad)
index 9d208b2..aa60a1e 100644 (file)
@@ -14,8 +14,8 @@ SithShadowEncounter = Encounter:new {
        --encounterDespawnTime = 5 * 60 * 1000, -- 5 minutes
        encounterDespawnTime = 60 * 1000, -- 5 minutes
        spawnObjectList = {
-               { template = "sith_shadow_pirate", minimumDistance = 32, maximumDistance = 64, referencePoint = 0, followPlayer = true },
-               { template = "sith_shadow_pirate", minimumDistance = 4, maximumDistance = 8, referencePoint = 1, followPlayer = true }
+               { template = "sith_shadow_datapad", minimumDistance = 32, maximumDistance = 64, referencePoint = 0, followPlayer = true },
+               { template = "sith_shadow", minimumDistance = 4, maximumDistance = 8, referencePoint = 1, followPlayer = true }
        },
        onEncounterSpawned = nil,
        isEncounterFinished = nil,
index 9d53ea9..f5f692f 100644 (file)
@@ -3,4 +3,6 @@ includeFile("quest/chadra_fan_assassin.lua")
 includeFile("quest/chadra_fan_female.lua")
 includeFile("quest/chadra_fan_male.lua")
 includeFile("quest/chadra_fan_thief.lua")
-includeFile("quest/gadget_specialist.lua")
\ No newline at end of file
+includeFile("quest/gadget_specialist.lua")
+includeFile("quest/sith_shadow.lua")
+includeFile("quest/sith_shadow_datapad.lua")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/sith_shadow.lua b/MMOCoreORB/bin/scripts/mobile/quest/sith_shadow.lua
new file mode 100644 (file)
index 0000000..e84c689
--- /dev/null
@@ -0,0 +1,72 @@
+sith_shadow = Creature:new {
+       objectName = "@mob/creature_names:shadow_punk",
+       socialGroup = "sith_shadow",
+       pvpFaction = "sith_shadow",
+       faction = "sith_shadow",
+       level = 10,
+       chanceHit = 0.28,
+       damageMin = 90,
+       damageMax = 110,
+       baseXp = 356,
+       baseHAM = 810,
+       baseHAMmax = 990,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = PACK + KILLER,
+       optionsBitmask = 128,
+       diet = HERBIVORE,
+
+       templates = {
+               "object/mobile/dressed_sith_shadow_hum_f_01.iff",
+               "object/mobile/dressed_sith_shadow_hum_f_02.iff",
+               "object/mobile/dressed_sith_shadow_hum_f_03.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_01.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_02.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_03.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_f_01.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_f_02.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_m_01.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_m_02.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_01.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_02.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_03.iff",
+               "object/mobile/dressed_sith_shadow_rodian_f_01.iff",
+               "object/mobile/dressed_sith_shadow_rodian_f_02.iff",
+               "object/mobile/dressed_sith_shadow_rodian_m_01.iff",
+               "object/mobile/dressed_sith_shadow_rodian_m_02.iff",
+               "object/mobile/dressed_sith_shadow_trn_f_01.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_01.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_02.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_03.iff",
+               "object/mobile/dressed_sith_shadow_zab_f_01.iff",
+               "object/mobile/dressed_sith_shadow_zab_f_02.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_01.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_02.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_03.iff"},
+       lootGroups = {
+           {
+                       groups = {
+                               {group = "junk", chance = 6000000},
+                               {group = "tailor_components", chance = 1500000},
+                               {group = "loot_kit_parts", chance = 1500000},
+                               {group = "printer_parts", chance = 1000000},
+                       },
+                       lootChance = 2200000
+               }
+       },
+       weapons = {"pirate_weapons_light"},
+       conversationTemplate = "",
+       attacks = merge(brawlernovice,marksmannovice)
+}
+
+CreatureTemplates:addCreatureTemplate(sith_shadow, "sith_shadow")
diff --git a/MMOCoreORB/bin/scripts/mobile/quest/sith_shadow_datapad.lua b/MMOCoreORB/bin/scripts/mobile/quest/sith_shadow_datapad.lua
new file mode 100644 (file)
index 0000000..d8a3b84
--- /dev/null
@@ -0,0 +1,69 @@
+sith_shadow_datapad = Creature:new {
+       objectName = "@mob/creature_names:shadow_punk",
+       socialGroup = "sith_shadow",
+       pvpFaction = "sith_shadow",
+       faction = "sith_shadow",
+       level = 10,
+       chanceHit = 0.28,
+       damageMin = 90,
+       damageMax = 110,
+       baseXp = 356,
+       baseHAM = 810,
+       baseHAMmax = 990,
+       armor = 0,
+       resists = {0,0,0,0,0,0,0,-1,-1},
+       meatType = "",
+       meatAmount = 0,
+       hideType = "",
+       hideAmount = 0,
+       boneType = "",
+       boneAmount = 0,
+       milk = 0,
+       tamingChance = 0,
+       ferocity = 0,
+       pvpBitmask = AGGRESSIVE + ATTACKABLE + ENEMY,
+       creatureBitmask = PACK + KILLER,
+       optionsBitmask = 128,
+       diet = HERBIVORE,
+
+       templates = {
+               "object/mobile/dressed_sith_shadow_hum_f_01.iff",
+               "object/mobile/dressed_sith_shadow_hum_f_02.iff",
+               "object/mobile/dressed_sith_shadow_hum_f_03.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_01.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_02.iff",
+               "object/mobile/dressed_sith_shadow_hum_m_03.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_f_01.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_f_02.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_m_01.iff",
+               "object/mobile/dressed_sith_shadow_aqualish_m_02.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_01.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_02.iff",
+               "object/mobile/dressed_sith_shadow_nikto_m_03.iff",
+               "object/mobile/dressed_sith_shadow_rodian_f_01.iff",
+               "object/mobile/dressed_sith_shadow_rodian_f_02.iff",
+               "object/mobile/dressed_sith_shadow_rodian_m_01.iff",
+               "object/mobile/dressed_sith_shadow_rodian_m_02.iff",
+               "object/mobile/dressed_sith_shadow_trn_f_01.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_01.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_02.iff",
+               "object/mobile/dressed_sith_shadow_trn_m_03.iff",
+               "object/mobile/dressed_sith_shadow_zab_f_01.iff",
+               "object/mobile/dressed_sith_shadow_zab_f_02.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_01.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_02.iff",
+               "object/mobile/dressed_sith_shadow_zab_m_03.iff"},
+       lootGroups = {
+           {
+                       groups = {
+                               {group = "sith_shadow_encounter_datapad", chance = 10000000}
+                       },
+                       lootChance = 10000000
+               }
+       },
+       weapons = {"pirate_weapons_light"},
+       conversationTemplate = "",
+       attacks = merge(brawlernovice,marksmannovice)
+}
+
+CreatureTemplates:addCreatureTemplate(sith_shadow_datapad, "sith_shadow_datapad")
index 6b8c068..bfb540c 100644 (file)
@@ -3,46 +3,47 @@
 
 --This File is part of Core3.
 
---This program is free software; you can redistribute 
---it and/or modify it under the terms of the GNU Lesser 
+--This program is free software; you can redistribute
+--it and/or modify it under the terms of the GNU Lesser
 --General Public License as published by the Free Software
---Foundation; either version 2 of the License, 
+--Foundation; either version 2 of the License,
 --or (at your option) any later version.
 
---This program is distributed in the hope that it will be useful, 
---but WITHOUT ANY WARRANTY; without even the implied warranty of 
---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 --See the GNU Lesser General Public License for
 --more details.
 
---You should have received a copy of the GNU Lesser General 
+--You should have received a copy of the GNU Lesser General
 --Public License along with this program; if not, write to
 --the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
---Linking Engine3 statically or dynamically with other modules 
---is making a combined work based on Engine3. 
---Thus, the terms and conditions of the GNU Lesser General Public License 
+--Linking Engine3 statically or dynamically with other modules
+--is making a combined work based on Engine3.
+--Thus, the terms and conditions of the GNU Lesser General Public License
 --cover the whole combination.
 
---In addition, as a special exception, the copyright holders of Engine3 
---give you permission to combine Engine3 program with free software 
---programs or libraries that are released under the GNU LGPL and with 
---code included in the standard release of Core3 under the GNU LGPL 
---license (or modified versions of such code, with unchanged license). 
---You may copy and distribute such a system following the terms of the 
---GNU LGPL for Engine3 and the licenses of the other code concerned, 
---provided that you include the source code of that other code when 
+--In addition, as a special exception, the copyright holders of Engine3
+--give you permission to combine Engine3 program with free software
+--programs or libraries that are released under the GNU LGPL and with
+--code included in the standard release of Core3 under the GNU LGPL
+--license (or modified versions of such code, with unchanged license).
+--You may copy and distribute such a system following the terms of the
+--GNU LGPL for Engine3 and the licenses of the other code concerned,
+--provided that you include the source code of that other code when
 --and as the GNU LGPL requires distribution of source code.
 
---Note that people who make modified versions of Engine3 are not obligated 
---to grant this special exception for their modified versions; 
---it is their choice whether to do so. The GNU Lesser General Public License 
---gives permission to release a modified version without this exception; 
---this exception also makes it possible to release a modified version 
+--Note that people who make modified versions of Engine3 are not obligated
+--to grant this special exception for their modified versions;
+--it is their choice whether to do so. The GNU Lesser General Public License
+--gives permission to release a modified version without this exception;
+--this exception also makes it possible to release a modified version
 
 
 object_tangible_loot_quest_force_sensitive_waypoint_datapad = object_tangible_loot_quest_force_sensitive_sharred_waypoint_datapad:new {
 
+       -- TODO: objectMenuComponent = {"cpp", "LootSchematicMenuComponent"},
 }
 
 ObjectTemplates:addTemplate(object_tangible_loot_quest_force_sensitive_waypoint_datapad, "object/tangible/loot/quest/force_sensitive/waypoint_datapad.iff")