Skip to content

Commit adabbb8

Browse files
HeronAlexandriaHeronAlexandria
authored
Merge pull request #406 from SWG-Source/qa/jedi-qa-gear
Jedi QA God Gear For Testing
2 parents ea12677 + 6a373ce commit adabbb8

3 files changed

Lines changed: 80 additions & 4 deletions

File tree

‎sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ item_krayt_pearl_04_17 int:jedi.crystal.stats.min_dmg=18,int:jedi.crystal.stat
10911091
item_krayt_pearl_04_18 int:jedi.crystal.stats.min_dmg=19,int:jedi.crystal.stats.max_dmg=20,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1
10921092
item_krayt_pearl_04_19 int:jedi.crystal.stats.min_dmg=20,int:jedi.crystal.stats.max_dmg=22,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1
10931093
item_krayt_pearl_04_20 int:jedi.crystal.stats.min_dmg=21,int:jedi.crystal.stats.max_dmg=23,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1
1094+
item_krayt_pearl_QA int:jedi.crystal.stats.min_dmg=50000,int:jedi.crystal.stats.max_dmg=50000,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1
10941095
item_color_crystal_02_00 int:jedi.crystal.stats.color=0,int:jedi.crystal.stats.level=-1 index_color_1=0
10951096
item_color_crystal_02_01 int:jedi.crystal.stats.color=1,int:jedi.crystal.stats.level=-1 index_color_1=1
10961097
item_color_crystal_02_02 int:jedi.crystal.stats.color=2,int:jedi.crystal.stats.level=-1 index_color_1=2

‎sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,7 @@ item_krayt_pearl_04_17 object/tangible/component/weapon/lightsaber/lightsaber_mo
14861486
item_krayt_pearl_04_18 object/tangible/component/weapon/lightsaber/lightsaber_module_krayt_dragon_pearl.iff 4 systems.jedi.jedi_saber_component 1 Krayt Dragon Pearl A gizzard stone used by the Krayt Dragon to help it digest its food. The stone is a lustrous, milky color and can be tuned by a Jedi for use as a focusing crystal in a lightsaber.||This pearl must be tuned by a Jedi before use. Once tuned this pearl becomes a part of the lightsaber's focusing device and can only be used in a lightsaber by the Jedi who tuned it.
14871487
item_krayt_pearl_04_19 object/tangible/component/weapon/lightsaber/lightsaber_module_krayt_dragon_pearl.iff 4 systems.jedi.jedi_saber_component 1 Ancient Krayt Dragon Pearl A gizzard stone used by the Krayt Dragon to help it digest its food. The stone is a lustrous, milky color and can be tuned by a Jedi for use as a focusing crystal in a lightsaber.||This pearl must be tuned by a Jedi before use. Once tuned this pearl becomes a part of the lightsaber's focusing device and can only be used in a lightsaber by the Jedi who tuned it. Tuned by a Jedi long ago, this pearl seems as if it has seen different eras in time.
14881488
item_krayt_pearl_04_20 object/tangible/component/weapon/lightsaber/lightsaber_module_krayt_dragon_pearl.iff 4 systems.jedi.jedi_saber_component 1 Ancient Krayt Dragon Pearl A gizzard stone used by the Krayt Dragon to help it digest its food. The stone is a lustrous, milky color and can be tuned by a Jedi for use as a focusing crystal in a lightsaber.||This pearl must be tuned by a Jedi before use. Once tuned this pearl becomes a part of the lightsaber's focusing device and can only be used in a lightsaber by the Jedi who tuned it. Tuned by a Jedi long ago, this pearl seems as if it has seen different eras in time.
1489+
item_krayt_pearl_QA object/tangible/component/weapon/lightsaber/lightsaber_module_krayt_dragon_pearl.iff 4 systems.jedi.jedi_saber_component 1 Ancient Krayt Dragon Pearl A gizzard stone used by the Krayt Dragon to help it digest its food. The stone is a lustrous, milky color and can be tuned by a Jedi for use as a focusing crystal in a lightsaber.||This pearl must be tuned by a Jedi before use. Once tuned this pearl becomes a part of the lightsaber's focusing device and can only be used in a lightsaber by the Jedi who tuned it. Tuned by a Jedi long ago, this pearl seems as if it has seen different eras in time.
14891490
item_color_crystal_02_00 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Color Crystal A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it.
14901491
item_color_crystal_02_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Color Crystal A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it.
14911492
item_color_crystal_02_02 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Color Crystal A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it.

‎sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ public void setScene(String scene) {
12871287
"Nightsister Clothes",
12881288
"Mandalorian Armor",
12891289
"Cybernetic Headband",
1290-
"Set Player Size",
1290+
"Nigthsister Backpack",
12911291
"Increase Factory Speed",
12921292
"Torrent of the Force Drink",
12931293
"Bespin Port (x10)"
@@ -1355,7 +1355,8 @@ public void setScene(String scene) {
13551355
"Special Color Crystals",
13561356
"Perfect Power Crystals",
13571357
"Ancient Krayt Pearls",
1358-
"QA Power Crystals"
1358+
"QA Power Crystals",
1359+
"QA God Krayt Pearls"
13591360
};
13601361
public static final String[] SABER_OPTIONS =
13611362
{
@@ -1388,7 +1389,8 @@ public void setScene(String scene) {
13881389
"(80)Black Jedi Master Cloak",
13891390
"(90)Cloak of Hate",
13901391
"(90)Shatterpoint Cloak",
1391-
"Reset Jedi Statue Slots for Master Jedi Cloaks Collection"
1392+
"Reset Jedi Statue Slots for Master Jedi Cloaks Collection",
1393+
"Nightsister God QA Jedi Clothing"
13921394
};
13931395
public static final String ARMOR_SET_PREFIX = "object/tangible/wearables/armor/";
13941396
public static final String[] ARMOR_SET_ASSAULT_1 =
@@ -8233,7 +8235,8 @@ public int handleMiscSelect(obj_id self, dictionary params) throws InterruptedEx
82338235
sendSystemMessageTestingOnly(player, "Quest Obtained - Accept and Choose Reward");
82348236
break;
82358237
case 15:
8236-
sendSystemMessageTestingOnly(player, "This option is disabled.");
8238+
static_item.createNewItemFunction("item_tcg_loot_reward_series5_nightsister_backpack", pInv);
8239+
sendSystemMessageTestingOnly(player, "Nighstsister Backpack Issued.");
82378240
break;
82388241
case 16:
82398242
obj_id attachment = createObject("object/tangible/gem/clothing.iff", pInv, "");
@@ -10591,6 +10594,18 @@ public int handleCrystalSelect(obj_id self, dictionary params) throws Interrupte
1059110594
sendSystemMessageTestingOnly(player, "QA Power Crystals Issued!");
1059210595
}
1059310596
break;
10597+
case 5:
10598+
10599+
if (isGod(player))
10600+
{
10601+
for (int i = 0; i < 5; i++)
10602+
{
10603+
static_item.createNewItemFunction("item_krayt_pearl_QA", pInv);
10604+
}
10605+
sendSystemMessageTestingOnly(player, "QA Pearls Issued!");
10606+
}
10607+
10608+
break;
1059410609
default:
1059510610
cleanScriptVars(player);
1059610611
return SCRIPT_CONTINUE;
@@ -10930,13 +10945,72 @@ public int handleRobeSelect(obj_id self, dictionary params) throws InterruptedEx
1093010945
if (hasCompletedCollectionSlot(player, "jedi_robe_01_08"))
1093110946
modifyCollectionSlotValue(player, "jedi_robe_01_08", -1);
1093210947
sendSystemMessageTestingOnly(player, "Statue slots in Master Jedi Cloak collection reset!");
10948+
break;
10949+
case 16:
10950+
obj_id clothing;
10951+
clothing = createObject("object/tangible/wearables/pants/nightsister_pants_s01.iff", pInv, "");
10952+
SetupNightSisterJediClothes(clothing);
10953+
clothing = createObject("object/tangible/wearables/pants/nightsister_pants_s02.iff", pInv, "");
10954+
SetupNightSisterJediClothes(clothing);
10955+
clothing = createObject("object/tangible/wearables/shirt/nightsister_shirt_s01.iff", pInv, "");
10956+
SetupNightSisterJediClothes(clothing);
10957+
clothing = createObject("object/tangible/wearables/shirt/nightsister_shirt_s02.iff", pInv, "");
10958+
SetupNightSisterJediClothes(clothing);
10959+
clothing = createObject("object/tangible/wearables/shirt/nightsister_shirt_s03.iff", pInv, "");
10960+
SetupNightSisterJediClothes(clothing);
10961+
clothing = createObject("object/tangible/wearables/dress/nightsister_dress.iff", pInv, "");
10962+
SetupNightSisterJediClothes(clothing);
10963+
clothing = createObject("object/tangible/wearables/hat/nightsister_hat_s01.iff", pInv, "");
10964+
SetupNightSisterJediClothes(clothing);
10965+
clothing = createObject("object/tangible/wearables/hat/nightsister_hat_s02.iff", pInv, "");
10966+
SetupNightSisterJediClothes(clothing);
10967+
clothing = createObject("object/tangible/wearables/hat/nightsister_hat_s03.iff", pInv, "");
10968+
SetupNightSisterJediClothes(clothing);
10969+
clothing = createObject("object/tangible/wearables/boots/nightsister_boots.iff", pInv, "");
10970+
SetupNightSisterJediClothes(clothing);
10971+
clothing = createObject("object/tangible/wearables/armor/nightsister/armor_nightsister_bicep_r_s01.iff", pInv, "");
10972+
SetupNightSisterJediClothes(clothing);
10973+
cleanScriptVars(player);
10974+
10975+
break;
1093310976
default:
1093410977
cleanScriptVars(player);
1093510978
return SCRIPT_CONTINUE;
1093610979
}
1093710980
refreshMenu(player, "Select the desired armor option", "Test Center Terminal", ROBE_OPTIONS, "handleRobeSelect", false);
1093810981
return SCRIPT_CONTINUE;
1093910982
}
10983+
10984+
private void SetupNightSisterJediClothes(obj_id clothing)
10985+
{
10986+
setObjVar(clothing, "armor.general_protection_clothing", 65000);
10987+
setObjVar(clothing, "skillmod.bonus.agility_modified", 500);
10988+
setObjVar(clothing, "skillmod.bonus.constitution_modified", 500);
10989+
setObjVar(clothing, "skillmod.bonus.luck_modified", 500);
10990+
setObjVar(clothing, "skillmod.bonus.precision_modified", 500);
10991+
setObjVar(clothing, "skillmod.bonus.strength_modified", 500);
10992+
setObjVar(clothing, "skillmod.bonus.stamina_modified", 500);
10993+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_ae_dm_cc", 500);
10994+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_dm_cc", 500);
10995+
setObjVar(clothing, "skillmod.bonus.expertise_damage_weapon_9", 500);
10996+
setObjVar(clothing, "skillmod.bonus.expertise_action_weapon_9", 500);
10997+
setObjVar(clothing, "skillmod.bonus.expertise_damage_weapon_10", 500);
10998+
setObjVar(clothing, "skillmod.bonus.expertise_action_weapon_10", 500);
10999+
setObjVar(clothing, "skillmod.bonus.expertise_damage_weapon_11", 500);
11000+
setObjVar(clothing, "skillmod.bonus.expertise_action_weapon_11", 500);
11001+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_cc_crit", 500);
11002+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_force_throw", 500);
11003+
setObjVar(clothing, "skillmod.bonus.expertise_dm_armor_bypass", 500);
11004+
setObjVar(clothing, "skillmod.bonus.expertise_fs_imp_choke", 500);
11005+
setObjVar(clothing, "skillmod.bonus.expertise_dot_damage_fs_dm_cc", 500);
11006+
setObjVar(clothing, "skillmod.bonus.expertise_action_line_fs_path_corruption", 500);
11007+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_path_corruption", 500);
11008+
setObjVar(clothing, "skillmod.bonus.expertise_dot_duration_line_fs_path_bleed", 500);
11009+
setObjVar(clothing, "skillmod.bonus.expertise_damage_line_fs_path_bleed", 500);
11010+
attachScript(clothing, "item.buff_worn_item");
11011+
}
11012+
11013+
1094011014
public void generateGenerationSabers(int generation, obj_id player, obj_id pInv, float[] weaponMinDamage, float[] weaponMaxDamage, float[] weaponAttackSpeed, float weaponWoundChance, float weaponForceCost, float weaponAttackCost) throws InterruptedException
1094111015
{
1094211016
String[] saber;

0 commit comments

Comments
 (0)