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

Fix #164

Browse Source
This commit is contained in:
AconiteGodOfSWG
2020-11-19 22:45:24 -05:00
parent 8c8ede8859
commit b554319650
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab
View File

@@ -1120,7 +1120,7 @@ item_color_crystal_02_24 int:jedi.crystal.stats.color=24,int:jedi.crystal.stat
item_color_crystal_02_25 int:jedi.crystal.stats.color=25,int:jedi.crystal.stats.level=-1 index_color_1=25
item_color_crystal_02_26 int:jedi.crystal.stats.color=26,int:jedi.crystal.stats.level=-1 index_color_1=26
item_color_crystal_02_27 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27
item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27
item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27
item_color_crystal_02_28 int:jedi.crystal.stats.color=28,int:jedi.crystal.stats.level=-1 index_color_1=28
item_color_crystal_02_29 int:jedi.crystal.stats.color=29,int:jedi.crystal.stats.level=-1 index_color_1=29
item_color_crystal_02_30 int:jedi.crystal.stats.color=30,int:jedi.crystal.stats.level=-1 index_color_1=30
@@ -1136,7 +1136,7 @@ item_power_crystal_04_06 int:jedi.crystal.stats.min_dmg=6,int:jedi.crystal.sta
item_power_crystal_04_07 int:jedi.crystal.stats.min_dmg=7,int:jedi.crystal.stats.max_dmg=8,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_08 int:jedi.crystal.stats.min_dmg=8,int:jedi.crystal.stats.max_dmg=9,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_09 int:jedi.crystal.stats.min_dmg=9,int:jedi.crystal.stats.max_dmg=10,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_11 int:jedi.crystal.stats.min_dmg=11,int:jedi.crystal.stats.max_dmg=12,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_12 int:jedi.crystal.stats.min_dmg=12,int:jedi.crystal.stats.max_dmg=13,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_13 int:jedi.crystal.stats.min_dmg=13,int:jedi.crystal.stats.max_dmg=14,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31
@@ -1147,7 +1147,7 @@ item_power_crystal_04_17 int:jedi.crystal.stats.min_dmg=17,int:jedi.crystal.st
item_power_crystal_04_18 int:jedi.crystal.stats.min_dmg=18,int:jedi.crystal.stats.max_dmg=19,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_19 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 index_color_1=31
item_power_crystal_04_20 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 index_color_1=31
item_power_crystal_04_21 int:jedi.crystal.stats.min_dmg=23,int:jedi.crystal.stats.max_dmg=25,int:jedi.crystal.stats.quality=7,int:jedi.crystal.stats.level=-1 index_color_1=31
item_power_crystal_04_21 int:jedi.crystal.stats.min_dmg=23,int:jedi.crystal.stats.max_dmg=25,int:jedi.crystal.stats.quality=7,int:jedi.crystal.stats.level=-1 index_color_1=31
item_npe_dance_prop_l_entertainer_02_01 int:nocert=1
item_npe_dance_prop_r_entertainer_02_01 int:nocert=1
item_npe_necklace_protection_02_01 agility_modified=3
@@ -4596,6 +4596,7 @@ item_col_weed_nyms_themepark_01_08 string:collection.slotName=nyms_stronghold_
item_col_weed_nyms_themepark_01_09 string:collection.slotName=nyms_stronghold_duty_col:icon_nyms_duty_09
item_col_weed_nyms_themepark_01_10 string:collection.slotName=nyms_stronghold_duty_col:icon_nyms_duty_10
col_mail_opt_in_4_01 string:collection.slotName=mail_opt_in_4:mail_opt_in_4_01
col_mail_opt_in_4_02 string:collection.slotName=mail_opt_in_4:mail_opt_in_4_02
item_space_shield_high_capacity_projector string:loot_schematic.schematic=object/draft_schematic/space/shields/shield_high_capacity_projector_mk5.iff,int:loot_schematic.uses=5,string:loot_schematic.skill_req=class_structures_phase4_05
community_tcg_gcw_photo_contest_painting_2010_01
community_tcg_gcw_photo_contest_painting_2010_02
@@ -4782,14 +4783,14 @@ item_zozpheratu_costume costume_zozpheratu
item_ponda_halloween_hand scary_halloween_hand itemBuffClick 39600
item_deed_atst_walker string:vehicle_attribs.object_ref=atst_walker,float:hit_points=15000
item_deed_atxt_walker string:vehicle_attribs.object_ref=atxt_walker,float:hit_points=15000
item_bracelet_l_set_ent_01_01 "strength_modified=30,agility_modified=30" int:item.set.set_id=130001
item_bracelet_l_set_trader_01_01 "luck_modified=30,precision_modified=30,strength_modified=30" int:item.set.set_id=140001
item_bracelet_r_set_ent_01_01 "strength_modified=30,agility_modified=30" int:item.set.set_id=130001
item_bracelet_r_set_trader_01_01 "luck_modified=30,precision_modified=30,strength_modified=30" int:item.set.set_id=140001
item_necklace_set_ent_01_01 "strength_modified=30,agility_modified=30" int:item.set.set_id=130001
item_necklace_set_trader_01_01 "luck_modified=30,precision_modified=30,strength_modified=30" int:item.set.set_id=140001
item_band_set_ent_01_01 "strength_modified=30,agility_modified=30" int:item.set.set_id=130001
item_band_set_trader_01_01 "luck_modified=30,precision_modified=30,strength_modified=30" int:item.set.set_id=140001
item_ring_set_ent_01_01 "strength_modified=30,agility_modified=30" int:item.set.set_id=130001
item_ring_set_trader_01_01 "luck_modified=30,precision_modified=30,strength_modified=30" int:item.set.set_id=140001
item_bracelet_l_set_ent_01_01 strength_modified=30,agility_modified=30 int:item.set.set_id=130001
item_bracelet_l_set_trader_01_01 luck_modified=30,precision_modified=30,strength_modified=30 int:item.set.set_id=140001
item_bracelet_r_set_ent_01_01 strength_modified=30,agility_modified=30 int:item.set.set_id=130001
item_bracelet_r_set_trader_01_01 luck_modified=30,precision_modified=30,strength_modified=30 int:item.set.set_id=140001
item_necklace_set_ent_01_01 strength_modified=30,agility_modified=30 int:item.set.set_id=130001
item_necklace_set_trader_01_01 luck_modified=30,precision_modified=30,strength_modified=30 int:item.set.set_id=140001
item_band_set_ent_01_01 strength_modified=30,agility_modified=30 int:item.set.set_id=130001
item_band_set_trader_01_01 luck_modified=30,precision_modified=30,strength_modified=30 int:item.set.set_id=140001
item_ring_set_ent_01_01 strength_modified=30,agility_modified=30 int:item.set.set_id=130001
item_ring_set_trader_01_01 luck_modified=30,precision_modified=30,strength_modified=30 int:item.set.set_id=140001
rebel_trooper_hat_schematic string:loot_schematic.schematic=object/draft_schematic/clothing/clothing_hat_rebel_trooper.iff,int:loot_schematic.uses=1,string:loot_schematic.skill_req=class_domestics_phase4_master

1
sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab
View File

@@ -8240,6 +8240,7 @@ item_col_weed_nyms_themepark_01_08 object/tangible/collection/col_nym_weed_08.if
item_col_weed_nyms_themepark_01_09 object/tangible/collection/col_nym_weed_09.iff 1 1000 systems.collections.consume_loot,object.autostack 1 Weed, Type IX A Collectible Weed
item_col_weed_nyms_themepark_01_10 object/tangible/collection/col_nym_weed_10.iff 1 1000 systems.collections.consume_loot,object.autostack 1 Weed, Type X A Collectible Weed
col_mail_opt_in_4_01 object/tangible/loot/creature_loot/collections/opt_in_mail_10.iff 4 item.special.nomove,systems.collections.no_consume_loot Model of Nym's Ship A model of Nym's ship, a Scurrg H-6 prototype bomber that he named Havoc. This item will not be consumed when it updates your collection. marketing email collection
col_mail_opt_in_4_02 object/tangible/loot/creature_loot/collections/opt_in_mail_11.iff 4 item.special.nomove,systems.collections.no_consume_loot Huj Mat Rug marketing email collection
item_space_shield_high_capacity_projector object/tangible/loot/loot_schematic/generic_limited_use.iff 1 item.loot_schematic.loot_schematic 1 Schematic: High Capacity Projector Shield - MK5 Schematic for a High Capacity Projector Shield MK5 component.
community_tcg_gcw_photo_contest_painting_2010_01 object/tangible/furniture/decorative/community_tcg_gcw_photo_contest_painting_2010_01.iff Padawan Training In search of a lost friend, Asotost Lemme stumbled upon the lair of a dangerous beast. Will he put his Padawan training to good use, or will he suffer the fate of those who failed before him?
community_tcg_gcw_photo_contest_painting_2010_02 object/tangible/furniture/decorative/community_tcg_gcw_photo_contest_painting_2010_02.iff Imperial Agent Imperial Counter Intelligence Agents weed out threats to the Empire's personnel and resources using stealth and deception. Agents are recruited from all walks of life for the various skill sets they possess. Agents typically steer clear of issued Imperial armor and weapons, to better blend in with the dregs of the galaxy, unless the mission requires the use of such equipment. They have seemingly bottomless resources to acquire their gear, and typically purchase their tools of the trade on black markets throughout the galaxy, to ensure they obtain exactly what they need to get the job done. Imperial 'Ghosts' are a Rebel urban legend the Empire capitalizes on as a propaganda tool, striking fear and doubt into friend and foe alike; one never knows when, where, or how the 'Ghosts' will appear, or for what purpose...Mak'o Rad is the epitome of an Imperial Agent.

23
sku.0/sys.server/compiled/game/script/player/live_conversions.java
View File

@@ -965,4 +965,27 @@ public class live_conversions extends script.base_script
showLootBox(player, new obj_id[] {col1, col2, col3, col4, cos1, cos2, cos3, cos4});
setObjVar(player, "publish_gifts.has_esb_rewards", 1);
}
public void handleMailOptInRewards(obj_id player) throws InterruptedException {
if(!utils.checkConfigFlag("Custom", "grantMailOptInRewards")) {
return;
}
if(hasObjVar(player, "publish_gifts.has_mail_opt_in_rewards")) {
return;
}
obj_id inv = utils.getInventoryContainer(player);
obj_id r1 = static_item.createNewItemFunction("col_mail_opt_in_1_01", inv);
obj_id r2 = static_item.createNewItemFunction("col_mail_opt_in_1_02", inv);
obj_id r3 = static_item.createNewItemFunction("col_mail_opt_in_1_03", inv);
obj_id r4 = static_item.createNewItemFunction("col_mail_opt_in_2_01", inv);
obj_id r5 = static_item.createNewItemFunction("col_mail_opt_in_2_02", inv);
obj_id r6 = static_item.createNewItemFunction("col_mail_opt_in_2_03", inv);
obj_id r7 = static_item.createNewItemFunction("col_mail_opt_in_3_01", inv);
obj_id r8 = static_item.createNewItemFunction("col_mail_opt_in_3_02", inv);
obj_id r9 = static_item.createNewItemFunction("col_mail_opt_in_3_03", inv);
obj_id r10 = static_item.createNewItemFunction("col_mail_opt_in_4_01", inv);
obj_id r11 = static_item.createNewItemFunction("col_mail_opt_in_4_02", inv);
showLootBox(player, new obj_id[] {r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11});
setObjVar(player, "publish_gifts.has_mail_opt_in_rewards", 1);
}
}