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

Merge branch 'master' of https://github.com/SWG-Source/dsrc

Browse Source
This commit is contained in:
IrishDarkshadow
2019-04-05 01:27:08 -07:00
parent f9ee08f439 80b6fe8f3a
commit a8cd4325cd
5 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.java
View File

@@ -491,6 +491,8 @@ public class reverse_engineering_tool extends script.base_script
obj_id powerup = static_item.createNewItemFunction(getGemTemplateByClass(player, ratio, 1), inventory);
if (isIdValid(powerup))
{
if(power > 117)
power = 117;
setObjVar(powerup, "reverse_engineering.reverse_engineering_power", power);
setObjVar(powerup, "reverse_engineering.reverse_engineering_modifier", mod);
setObjVar(powerup, "reverse_engineering.reverse_engineering_ratio", ratio);

9
sku.0/sys.server/compiled/game/script/player/player_instance.java
View File

@@ -705,6 +705,15 @@ public class player_instance extends script.base_script
}
public int handleAwardtoken(obj_id self, dictionary params) throws InterruptedException
{
obj_id instanceController = instance.getAreaInstanceController(self);
if (!isIdValid(instanceController))
{
return SCRIPT_CONTINUE;
}
if (!instance.isPlayerInPlayerList(self, instance.getPlayerList(instanceController)))
{
return SCRIPT_CONTINUE;
}
int tokenIndex = params.getInt("tokenIndex");
int count = 1;
if (params.containsKey("tokenCount"))

9
sku.0/sys.server/compiled/game/script/player/player_saga_quest.java
View File

@@ -510,7 +510,14 @@ public class player_saga_quest extends script.base_script
{
name = new string_id("saga_system", "holocron_reward_unknown");
}
if (utils.isNestedWithin(rewardItem, self))
final obj_id itemContainer = getContainedBy(rewardItem);
if (!isValidId(itemContainer) || !isValidId(playerInventory))
{
pp = prose.getPackage(new string_id("saga_system", "holocron_reward_not_in_inventory"), name);
sendSystemMessageProse(self, pp);
pgc_quests.logReward(self, questHolocron, "Player attempted to donate a reward item but it was not in their inventory: " + name + "(" + rewardItem + ")");
}
else if (itemContainer == playerInventory)
{
if (pgc_quests.isEligiblePgcReward(rewardItem))
{

8
sku.0/sys.server/compiled/game/script/systems/storyteller/prop_controller.java
View File

@@ -23,6 +23,14 @@ public class prop_controller extends script.base_script
messageTo(self, "handleStorytellerPropInitialize", null, 5, false);
return SCRIPT_CONTINUE;
}
public int OnAboutToBeTransferred(obj_id self, obj_id destContainer, obj_id transferer) throws InterruptedException
{
if (isPlayer(getContainedBy(destContainer)))
{
return SCRIPT_OVERRIDE;
}
return SCRIPT_CONTINUE;
}
public int handleStorytellerPropInitialize(obj_id self, dictionary params) throws InterruptedException
{
if (!hasObjVar(self, "eventTeamCleaupOverride") && !utils.hasScriptVar(self, "storytellerOnAttachFired"))

35
sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
View File

@@ -77,6 +77,27 @@ public class terminal_character_builder extends script.base_script
public static final String[] BUFF_OPTIONS = {
"Apply GOD Buffs"
};
public static final String[] CHRONICLER_SKILLS = {
"class_chronicles",
"class_chronicles_novice",
"class_chronicles_1",
"class_chronicles_2",
"class_chronicles_3",
"class_chronicles_4",
"class_chronicles_5",
"class_chronicles_6",
"class_chronicles_7",
"class_chronicles_8",
"class_chronicles_9",
"class_chronicles_10",
"class_chronicles_11",
"class_chronicles_12",
"class_chronicles_13",
"class_chronicles_14",
"class_chronicles_15",
"class_chronicles_16",
"class_chronicles_master"
};
public static final String[] DEV_TESTING_OPTIONS = {
"Halloween tokens",
"Lifeday rebel tokens",
@@ -1363,7 +1384,8 @@ public class terminal_character_builder extends script.base_script
"Select Roadmap",
"Earn Current Skill",
"Set Level",
"Reset Respec"
"Reset Respec",
"Master Chronicles"
};
public static final String[] JEDI_OPTIONS =
{
@@ -9971,6 +9993,10 @@ public class terminal_character_builder extends script.base_script
sendSystemMessageTestingOnly(player, "Respecced to level 90 and respecs cleared.");
cleanScriptVars(player);
break;
case 4:
grantChronicleSkills(player, CHRONICLER_SKILLS);
sendSystemMessageTestingOnly(player, "Skills granted");
break;
default:
cleanScriptVars(player);
return SCRIPT_CONTINUE;
@@ -11456,4 +11482,11 @@ public class terminal_character_builder extends script.base_script
sendSystemMessageTestingOnly(player, "Weapon Issued!");
}
}
public void grantChronicleSkills(obj_id objPlayer, String[] strSkillList) throws InterruptedException
{
for (int intI = 0; intI < strSkillList.length; intI++)
{
grantSkill(objPlayer, strSkillList[intI]);
}
}
}