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

Change ITV check to a datatable query for ease of adding future ITV vehicles

Browse Source
This commit is contained in:
Reedux
2020-01-11 15:04:12 +00:00
parent 541ea74ce5
commit 0e8f027a40
2 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab
+9
View File
@@ -0,0 +1,9 @@
objVarName itvCommand
s s
privateerShip callforprivateerpickup
royalShip callforroyalpickup
junk callforrattletrappickup
tcg_itv_home callforsolarsailerpickup
tcg_itv_location callforg9riggerpickup
itv_snowspeeder callforsnowspeeder
itv_slave_1 callforslave1pickup
sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java
+11 -39
View File
@@ -10,6 +10,7 @@ public class instant_travel_terminal_deed extends script.base_script
public instant_travel_terminal_deed()
{
}
private static final String ITV_COMMAND_TABLE = "datatables/item/itv_command_list.iff";
public static final string_id LEARN_ABILITY = new string_id("item_n", "instant_travel_terminal_learn");
public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException
{
@@ -27,47 +28,18 @@ public class instant_travel_terminal_deed extends script.base_script
{
if(getLevel(player) < minimumLevel){
sendSystemMessage(player, "Instant Travel vehicles may not be used until you have reached level " + minLevelSetting + ". Please use this deed again when you reach level " + minLevelSetting + " or higher.", null);
return SCRIPT_CONTINUE;
}
else if (hasObjVar(self, "privateerShip"))
{
grantCommand(player, "callforprivateerpickup");
destroyObject(self);
}
else if (hasObjVar(self, "royalShip"))
{
grantCommand(player, "callforroyalpickup");
destroyObject(self);
}
else if (hasObjVar(self, "junk"))
{
grantCommand(player, "callforrattletrappickup");
destroyObject(self);
}
else if (hasObjVar(self, "tcg_itv_home"))
{
grantCommand(player, "callforsolarsailerpickup");
destroyObject(self);
}
else if (hasObjVar(self, "tcg_itv_location"))
{
grantCommand(player, "callforg9riggerpickup");
destroyObject(self);
}
else if (hasObjVar(self, "itv_snowspeeder"))
{
grantCommand(player, "callforsnowspeeder");
destroyObject(self);
}
else if (hasObjVar(self, "itv_slave_1"))
{
grantCommand(player, "callforslave1pickup");
destroyObject(self);
}
else
{
grantCommand(player, "callforpickup");
destroyObject(self);
int rows = dataTableGetNumRows(ITV_COMMAND_TABLE);
for (int i=0;i<rows;i++) {
if (hasObjVar(self, dataTableGetString(ITV_COMMAND_TABLE, i, 0))) {
grantCommand(player, dataTableGetString(ITV_COMMAND_TABLE, i, 1));
destroyObject(self);
return SCRIPT_CONTINUE;
}
}
grantCommand(player, "callforpickup");
destroyObject(self);
}
return SCRIPT_CONTINUE;
}