swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-11 22:45:06 -04:00
Code Issues Projects Releases Wiki Activity

Fixed static object destroy quests from static NPCs (old quests).

Browse Source
This commit is contained in:
Cekis
2016-08-31 15:53:20 +01:00
parent 0ca92602c3
commit bd1f612d36
3 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/spawning/static_npc/arven_wendik.tab
Regular → Executable
+1 -1
View File
@@ -4,4 +4,4 @@ s s s[normal] s[normal] s s s[none] s[none] s s s s s[none] s i s[none] s i s[no
smuggle static_npc/naboo/arven_wendik static.arven_wendik arven_wendik object/tangible/mission/quest_item/arven_wendik_q1_needed.iff npc.static_quest.quest_player npc.static_quest.quest_npc smuggler Alowi Fintz 25 female_great_grass_plains_tusk_cat aggressive Rebel
escort static_npc/naboo/arven_wendik static.arven_wendik arven_wendik npc.static_quest.quest_player npc.static_quest.quest_npc rebel_scout Grel Rommo 50 stormtrooper aggressive stormtrooper aggressive stormtrooper aggressive
escort static_npc/naboo/arven_wendik static.arven_wendik arven_wendik npc.static_quest.quest_player npc.static_quest.quest_npc commoner Needia Solum 75 stormtrooper aggressive stormtrooper aggressive stormtrooper aggressive imperial_warrant_officer_i aggressive
destroy static_npc/naboo/arven_wendik static.arven_wendik arven_wendik npc.static_quest.quest_player npc.static_quest.quest_npc object/static/structure/tatooine/debris_tatt_radar_dish.iff Airship Monitoring Dish 1000 stormtrooper aggressive stormtrooper aggressive stormtrooper aggressive imperial_warrant_officer_i aggressive
destroy static_npc/naboo/arven_wendik static.arven_wendik arven_wendik npc.static_quest.quest_player npc.static_quest.quest_npc object/tangible/destructible/destructable_crate_04.iff Airship Monitoring Device 1000 stormtrooper aggressive stormtrooper aggressive stormtrooper aggressive imperial_warrant_officer_i aggressive
sku.0/sys.server/compiled/game/object/tangible/destructible/destructable_crate_04.tpf
Regular → Executable
+1 -2
View File
@@ -9,10 +9,9 @@
maxHitPoints = 10000
@class object_template 4
sharedTemplate = "object/tangible/destructible/shared_destructable_crate_04.iff"
objvars = +["isStaticObject" = 1]
invulnerable = false
sku.0/sys.server/compiled/game/script/npc/static_quest/quest_npc.java
Regular → Executable
+39 -21
View File
@@ -1,20 +1,10 @@
package script.npc.static_quest;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.quests;
import script.library.ai_lib;
import script.library.chat;
import script.library.utils;
import script.ai.ai_combat;
import script.library.money;
import script.library.create;
import script.dictionary;
import script.library.*;
import script.location;
import script.obj_id;
import script.string_id;
public class quest_npc extends script.base_script
{
@@ -36,7 +26,6 @@ public class quest_npc extends script.base_script
String questID = dataTableGetString(datatable, questNum, "temp_objvar");
String type = dataTableGetString(datatable, questNum, "quest_type");
String convoType = dataTableGetString(datatable, questNum, "quest_npc_convo");
convoType = "terse";
faceTo(self, speaker);
if (ai_lib.isInCombat(self) || ai_lib.isInCombat(speaker))
{
@@ -320,11 +309,9 @@ public class quest_npc extends script.base_script
int questNum = getIntObjVar(self, "questNum");
String type = dataTableGetString(datatable, questNum, "quest_type");
String CONVO = dataTableGetString(datatable, questNum, "convo");
String convoStyle = dataTableGetString(datatable, questNum, "quest_giver_convo");
String response1 = "player_more_1_" + questNum;
String response2 = "player_more_2_" + questNum;
String response3 = "player_more_3_" + questNum;
String playerScript = dataTableGetString(datatable, questNum, "player_script");
if ((response.getAsciiId()).equals(response1))
{
String npcAnswer1 = "npc_more_1_" + questNum;
@@ -356,6 +343,18 @@ public class quest_npc extends script.base_script
}
return SCRIPT_CONTINUE;
}
public int OnObjectDisabled(obj_id self, obj_id killer) throws InterruptedException
{
String type = dataTableGetString(getStringObjVar(self, "quest_table"), getIntObjVar(self, "questNum"), "quest_type");
if (getBooleanObjVar(self, "isStaticObject") && type.equals("destroy"))
{
obj_id player = getObjIdObjVar(self, "player");
messageTo(player, "finishStaticQuest", null, 0, true);
setObjVar(self, "SentFinishMsg", 1);
return SCRIPT_CONTINUE;
}
return SCRIPT_CONTINUE;
}
public int OnIncapacitated(obj_id self, obj_id killer) throws InterruptedException
{
String datatable = getStringObjVar(self, "quest_table");
@@ -419,18 +418,34 @@ public class quest_npc extends script.base_script
}
public int setupSelf(obj_id self, dictionary params) throws InterruptedException
{
setWantSawAttackTriggers(self, false);
String datatable = getStringObjVar(self, "quest_table");
if (datatable == null)
{
setObjVar(self, "NO SCRIPT", 1);
return SCRIPT_OVERRIDE;
}
boolean isStaticObject = getBooleanObjVar(self, "isStaticObject");
int questNum = getIntObjVar(self, "questNum");
String type = dataTableGetString(datatable, questNum, "quest_type");
ai_lib.setDefaultCalmBehavior(self, ai_lib.BEHAVIOR_SENTINEL);
if (type.equals("info") || type.equals("rescue") || type.equals("smuggle") || type.equals("deliver") || type.equals("arrest") || type.equals("escort") || type.equals("retrieve"))
if(isStaticObject && type.equals("destroy")){
setObjVar(self, "pvpCanAttack", 1);
setMaxHitpoints(self, 30000);
attachScript(self, "systems.npc_lair.lair_destruct");
detachScript(self, "systems.gcw.gcw_vehicle_patrol");
setInvulnerable(self, false);
}
else if (!isStaticObject && type.equals("info")
|| type.equals("rescue")
|| type.equals("smuggle")
|| type.equals("deliver")
|| type.equals("arrest")
|| type.equals("escort")
|| type.equals("retrieve"))
{
setWantSawAttackTriggers(self, false);
attachScript(self, "npc.converse.npc_converse_menu");
setCondition(self, CONDITION_INTERESTING);
setInvulnerable(self, true);
@@ -441,13 +456,16 @@ public class quest_npc extends script.base_script
public int saySomething(obj_id self, dictionary params) throws InterruptedException
{
String datatable = getStringObjVar(self, "quest_table");
obj_id player = getObjIdObjVar(self, "player");
int questNum = getIntObjVar(self, "questNum");
String type = dataTableGetString(datatable, questNum, "quest_type");
if(getBooleanObjVar(self, "isStaticObject")){
return SCRIPT_CONTINUE;
}
String CONVO = dataTableGetString(datatable, questNum, "convo");
String something = "npc_breech_" + questNum;
string_id message = new string_id(CONVO, something);
String check = getString(message);
obj_id player = getObjIdObjVar(self, "player");
if (check != null)
{
if (!check.equals(""))