diff --git a/scripts/commands/addignore.py b/scripts/commands/addignore.py new file mode 100644 index 00000000..d8da29a8 --- /dev/null +++ b/scripts/commands/addignore.py @@ -0,0 +1,10 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + actorGhost = actor.getSlottedObject("ghost") + chatSrvc = core.chatService + chatSrvc.addToIgnoreList(actor, commandString) + return \ No newline at end of file diff --git a/scripts/commands/removeignore.py b/scripts/commands/removeignore.py new file mode 100644 index 00000000..4561dd79 --- /dev/null +++ b/scripts/commands/removeignore.py @@ -0,0 +1,10 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + actorGhost = actor.getSlottedObject("ghost") + chatSrvc = core.chatService + chatSrvc.removeFromIgnoreList(actor, commandString) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_l.py b/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_l.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_l.py +++ b/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_l.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_r.py b/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_r.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_r.py +++ b/scripts/object/tangible/wearables/armor/appearance_invisible_bicep_r.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_l.py b/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_l.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_l.py +++ b/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_l.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_r.py b/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_r.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_r.py +++ b/scripts/object/tangible/wearables/armor/appearance_invisible_bracer_r.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/nightsister/armor_nightsister_bicep_r_s01.py b/scripts/object/tangible/wearables/armor/nightsister/armor_nightsister_bicep_r_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/armor/nightsister/armor_nightsister_bicep_r_s01.py +++ b/scripts/object/tangible/wearables/armor/nightsister/armor_nightsister_bicep_r_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_gmf_wings.py b/scripts/object/tangible/wearables/backpack/back_gmf_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_gmf_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_gmf_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_love_day_10_blue_wings.py b/scripts/object/tangible/wearables/backpack/back_love_day_10_blue_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_love_day_10_blue_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_love_day_10_blue_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_love_day_10_golden_wings.py b/scripts/object/tangible/wearables/backpack/back_love_day_10_golden_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_love_day_10_golden_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_love_day_10_golden_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_love_day_10_pink_wings.py b/scripts/object/tangible/wearables/backpack/back_love_day_10_pink_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_love_day_10_pink_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_love_day_10_pink_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_love_day_11_hue_wings.py b/scripts/object/tangible/wearables/backpack/back_love_day_11_hue_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_love_day_11_hue_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_love_day_11_hue_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/back_love_day_wings.py b/scripts/object/tangible/wearables/backpack/back_love_day_wings.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/back_love_day_wings.py +++ b/scripts/object/tangible/wearables/backpack/back_love_day_wings.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/backpack_gmf_01.py b/scripts/object/tangible/wearables/backpack/backpack_gmf_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/backpack/backpack_gmf_01.py +++ b/scripts/object/tangible/wearables/backpack/backpack_gmf_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/empireday_rebel_endor_backpack.py b/scripts/object/tangible/wearables/backpack/empireday_rebel_endor_backpack.py index ccad8904..fa0152e7 100644 --- a/scripts/object/tangible/wearables/backpack/empireday_rebel_endor_backpack.py +++ b/scripts/object/tangible/wearables/backpack/empireday_rebel_endor_backpack.py @@ -1,4 +1,9 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + object.setStringAttribute('cost', '[15] Remembrance Day Token') + object.setStringAttribute('faction_restriction', 'Rebel Alliance') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/backpack/empireday_sandtrooper_backpack.py b/scripts/object/tangible/wearables/backpack/empireday_sandtrooper_backpack.py index ccad8904..c86c4ed5 100644 --- a/scripts/object/tangible/wearables/backpack/empireday_sandtrooper_backpack.py +++ b/scripts/object/tangible/wearables/backpack/empireday_sandtrooper_backpack.py @@ -1,4 +1,9 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + object.setStringAttribute('cost', '[15] Empire Day Token') + object.setStringAttribute('faction_restriction', 'Imperial') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s01.py b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s01.py +++ b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s02.py b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s02.py +++ b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s03.py b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s03.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s03.py +++ b/scripts/object/tangible/wearables/bandolier/bandolier_tusken_raider_s03.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/belt/appearance_invisible_s01.py b/scripts/object/tangible/wearables/belt/appearance_invisible_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/belt/appearance_invisible_s01.py +++ b/scripts/object/tangible/wearables/belt/appearance_invisible_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/belt/belt_whip_s01.py b/scripts/object/tangible/wearables/belt/belt_whip_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/belt/belt_whip_s01.py +++ b/scripts/object/tangible/wearables/belt/belt_whip_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_atat.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_atat.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_atat.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_atat.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_atat_quest.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_atat_quest.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_atat_quest.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_atat_quest.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing_quest.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing_quest.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing_quest.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_bwing_quest.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_outbreak_prisoner.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_outbreak_prisoner.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_outbreak_prisoner.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_outbreak_prisoner.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter_quest.py b/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter_quest.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter_quest.py +++ b/scripts/object/tangible/wearables/bodysuit/bodysuit_tie_fighter_quest.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/boots/boots_tusken_raider.py b/scripts/object/tangible/wearables/boots/boots_tusken_raider.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/boots/boots_tusken_raider.py +++ b/scripts/object/tangible/wearables/boots/boots_tusken_raider.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/appearance_invisible_l_s01.py b/scripts/object/tangible/wearables/bracelet/appearance_invisible_l_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bracelet/appearance_invisible_l_s01.py +++ b/scripts/object/tangible/wearables/bracelet/appearance_invisible_l_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/appearance_invisible_r_s01.py b/scripts/object/tangible/wearables/bracelet/appearance_invisible_r_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/bracelet/appearance_invisible_r_s01.py +++ b/scripts/object/tangible/wearables/bracelet/appearance_invisible_r_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/cape/cape_imperial_01.py b/scripts/object/tangible/wearables/cape/cape_imperial_01.py index ccad8904..66ff82f4 100644 --- a/scripts/object/tangible/wearables/cape/cape_imperial_01.py +++ b/scripts/object/tangible/wearables/cape/cape_imperial_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + object.setCustomName('Imperial Cape') + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + object.setStringAttribute('cost', '[2500] Imperial Galactic Civil War token') + object.setStringAttribute('faction_restriction', 'Imperial') + + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/cape/cape_rebel_01.py b/scripts/object/tangible/wearables/cape/cape_rebel_01.py index ccad8904..ac9674d5 100644 --- a/scripts/object/tangible/wearables/cape/cape_rebel_01.py +++ b/scripts/object/tangible/wearables/cape/cape_rebel_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + object.setCustomName('Rebel Alliance Cape') + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + object.setStringAttribute('cost', '[2500] Rebel Alliance Galactic Civil War token') + object.setStringAttribute('faction_restriction', 'Rebel Alliance') + + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/gloves/appearance_invisible_s01.py b/scripts/object/tangible/wearables/gloves/appearance_invisible_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/gloves/appearance_invisible_s01.py +++ b/scripts/object/tangible/wearables/gloves/appearance_invisible_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/gloves/gloves_tusken_raider.py b/scripts/object/tangible/wearables/gloves/gloves_tusken_raider.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/gloves/gloves_tusken_raider.py +++ b/scripts/object/tangible/wearables/gloves/gloves_tusken_raider.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_anniversary.py b/scripts/object/tangible/wearables/goggles/goggles_anniversary.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_anniversary.py +++ b/scripts/object/tangible/wearables/goggles/goggles_anniversary.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s01.py b/scripts/object/tangible/wearables/goggles/goggles_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s01.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s02.py b/scripts/object/tangible/wearables/goggles/goggles_s02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s02.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s03.py b/scripts/object/tangible/wearables/goggles/goggles_s03.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s03.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s03.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s04.py b/scripts/object/tangible/wearables/goggles/goggles_s04.py index ccad8904..4f631a53 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s04.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s04.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s05.py b/scripts/object/tangible/wearables/goggles/goggles_s05.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s05.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s05.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/goggles_s06.py b/scripts/object/tangible/wearables/goggles/goggles_s06.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/goggles_s06.py +++ b/scripts/object/tangible/wearables/goggles/goggles_s06.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/goggles/rebreather.py b/scripts/object/tangible/wearables/goggles/rebreather.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/goggles/rebreather.py +++ b/scripts/object/tangible/wearables/goggles/rebreather.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_fedora__s01.py b/scripts/object/tangible/wearables/hat/hat_fedora__s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_fedora__s01.py +++ b/scripts/object/tangible/wearables/hat/hat_fedora__s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_imp_s01.py b/scripts/object/tangible/wearables/hat/hat_imp_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_imp_s01.py +++ b/scripts/object/tangible/wearables/hat/hat_imp_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_imp_s02.py b/scripts/object/tangible/wearables/hat/hat_imp_s02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_imp_s02.py +++ b/scripts/object/tangible/wearables/hat/hat_imp_s02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_imperial_gunner_01.py b/scripts/object/tangible/wearables/hat/hat_imperial_gunner_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_imperial_gunner_01.py +++ b/scripts/object/tangible/wearables/hat/hat_imperial_gunner_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_loveday_halo_01.py b/scripts/object/tangible/wearables/hat/hat_loveday_halo_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_loveday_halo_01.py +++ b/scripts/object/tangible/wearables/hat/hat_loveday_halo_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_loveday_halo_02.py b/scripts/object/tangible/wearables/hat/hat_loveday_halo_02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_loveday_halo_02.py +++ b/scripts/object/tangible/wearables/hat/hat_loveday_halo_02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/hat/hat_rebel_trooper_01.py b/scripts/object/tangible/wearables/hat/hat_rebel_trooper_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/hat/hat_rebel_trooper_01.py +++ b/scripts/object/tangible/wearables/hat/hat_rebel_trooper_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_atat.py b/scripts/object/tangible/wearables/helmet/helmet_atat.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_atat.py +++ b/scripts/object/tangible/wearables/helmet/helmet_atat.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_fighter_blacksun_ace.py b/scripts/object/tangible/wearables/helmet/helmet_fighter_blacksun_ace.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_fighter_blacksun_ace.py +++ b/scripts/object/tangible/wearables/helmet/helmet_fighter_blacksun_ace.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_fighter_imperial_ace.py b/scripts/object/tangible/wearables/helmet/helmet_fighter_imperial_ace.py index ccad8904..4f631a53 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_fighter_imperial_ace.py +++ b/scripts/object/tangible/wearables/helmet/helmet_fighter_imperial_ace.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_fighter_privateer_ace.py b/scripts/object/tangible/wearables/helmet/helmet_fighter_privateer_ace.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_fighter_privateer_ace.py +++ b/scripts/object/tangible/wearables/helmet/helmet_fighter_privateer_ace.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_fighter_rebel_ace.py b/scripts/object/tangible/wearables/helmet/helmet_fighter_rebel_ace.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_fighter_rebel_ace.py +++ b/scripts/object/tangible/wearables/helmet/helmet_fighter_rebel_ace.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_tie_fighter.py b/scripts/object/tangible/wearables/helmet/helmet_tie_fighter.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_tie_fighter.py +++ b/scripts/object/tangible/wearables/helmet/helmet_tie_fighter.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s01.py b/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s01.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s01.py +++ b/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s02.py b/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s02.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s02.py +++ b/scripts/object/tangible/wearables/helmet/helmet_tusken_raider_s02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/appearance_invisible_s01.py b/scripts/object/tangible/wearables/jacket/appearance_invisible_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/appearance_invisible_s01.py +++ b/scripts/object/tangible/wearables/jacket/appearance_invisible_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_ace_imperial.py b/scripts/object/tangible/wearables/jacket/jacket_ace_imperial.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_ace_imperial.py +++ b/scripts/object/tangible/wearables/jacket/jacket_ace_imperial.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_ace_privateer.py b/scripts/object/tangible/wearables/jacket/jacket_ace_privateer.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_ace_privateer.py +++ b/scripts/object/tangible/wearables/jacket/jacket_ace_privateer.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_ace_rebel.py b/scripts/object/tangible/wearables/jacket/jacket_ace_rebel.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_ace_rebel.py +++ b/scripts/object/tangible/wearables/jacket/jacket_ace_rebel.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_gcw_imperial_01.py b/scripts/object/tangible/wearables/jacket/jacket_gcw_imperial_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_gcw_imperial_01.py +++ b/scripts/object/tangible/wearables/jacket/jacket_gcw_imperial_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_gcw_rebel_01.py b/scripts/object/tangible/wearables/jacket/jacket_gcw_rebel_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_gcw_rebel_01.py +++ b/scripts/object/tangible/wearables/jacket/jacket_gcw_rebel_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_gmf_01.py b/scripts/object/tangible/wearables/jacket/jacket_gmf_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_gmf_01.py +++ b/scripts/object/tangible/wearables/jacket/jacket_gmf_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_01.py b/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_01.py +++ b/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_02.py b/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_02.py +++ b/scripts/object/tangible/wearables/jacket/jacket_lifeday_09_02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/jacket/jacket_outbreak_prison_guard.py b/scripts/object/tangible/wearables/jacket/jacket_outbreak_prison_guard.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/jacket/jacket_outbreak_prison_guard.py +++ b/scripts/object/tangible/wearables/jacket/jacket_outbreak_prison_guard.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/appearance_invisible_s01.py b/scripts/object/tangible/wearables/necklace/appearance_invisible_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/appearance_invisible_s01.py +++ b/scripts/object/tangible/wearables/necklace/appearance_invisible_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_f.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_f.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_m.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_m.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_empire_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_f.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_f.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_m.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_m.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_neutral_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_f.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_f.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_m.py b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_m.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_ace_pilot_rebel_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_f.py b/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_f.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_m.py b/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_m.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_rodian_safari_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_f.py b/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_f.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_m.py b/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_m.py +++ b/scripts/object/tangible/wearables/necklace/ith_necklace_trando_scale_of_honor_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_empire_wke_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_neutral_wke_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_f.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_m.py b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_ace_pilot_rebel_wke_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_lifeday.py b/scripts/object/tangible/wearables/necklace/necklace_lifeday.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_lifeday.py +++ b/scripts/object/tangible/wearables/necklace/necklace_lifeday.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_medallion_black_sun.py b/scripts/object/tangible/wearables/necklace/necklace_medallion_black_sun.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_medallion_black_sun.py +++ b/scripts/object/tangible/wearables/necklace/necklace_medallion_black_sun.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_primitive_01.py b/scripts/object/tangible/wearables/necklace/necklace_primitive_01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_primitive_01.py +++ b/scripts/object/tangible/wearables/necklace/necklace_primitive_01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_primitive_03.py b/scripts/object/tangible/wearables/necklace/necklace_primitive_03.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_primitive_03.py +++ b/scripts/object/tangible/wearables/necklace/necklace_primitive_03.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_primitive_04.py b/scripts/object/tangible/wearables/necklace/necklace_primitive_04.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_primitive_04.py +++ b/scripts/object/tangible/wearables/necklace/necklace_primitive_04.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari.py b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari.py +++ b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_f.py b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_m.py b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_f.py b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_m.py b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_rodian_safari_wke_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_f.py b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_m.py b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_f.py b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_f.py +++ b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_m.py b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_m.py +++ b/scripts/object/tangible/wearables/necklace/necklace_trando_scale_of_honor_wke_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/pants/pants_outbreak_prison_guard.py b/scripts/object/tangible/wearables/pants/pants_outbreak_prison_guard.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/pants/pants_outbreak_prison_guard.py +++ b/scripts/object/tangible/wearables/pants/pants_outbreak_prison_guard.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_tusken_raider_s01.py b/scripts/object/tangible/wearables/robe/robe_tusken_raider_s01.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/robe/robe_tusken_raider_s01.py +++ b/scripts/object/tangible/wearables/robe/robe_tusken_raider_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_tusken_raider_s02.py b/scripts/object/tangible/wearables/robe/robe_tusken_raider_s02.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/robe/robe_tusken_raider_s02.py +++ b/scripts/object/tangible/wearables/robe/robe_tusken_raider_s02.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/utility/utility_belt_tusken_raider.py b/scripts/object/tangible/wearables/utility/utility_belt_tusken_raider.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/utility/utility_belt_tusken_raider.py +++ b/scripts/object/tangible/wearables/utility/utility_belt_tusken_raider.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/vest/appearance_invisible_s01.py b/scripts/object/tangible/wearables/vest/appearance_invisible_s01.py index ccad8904..a398dc48 100644 --- a/scripts/object/tangible/wearables/vest/appearance_invisible_s01.py +++ b/scripts/object/tangible/wearables/vest/appearance_invisible_s01.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe.py b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe.py +++ b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_f.py b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_f.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_f.py +++ b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_f.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_m.py b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_m.py index ccad8904..b89922ca 100644 --- a/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_m.py +++ b/scripts/object/tangible/wearables/wookiee/wke_lifeday_robe_m.py @@ -1,4 +1,7 @@ import sys def setup(core, object): + object.setStringAttribute('condition', '100/100') + object.setIntAttribute('volume', 1) + return \ No newline at end of file diff --git a/src/protocol/swg/AddIgnoreMessage.java b/src/protocol/swg/AddIgnoreMessage.java new file mode 100644 index 00000000..44455a1c --- /dev/null +++ b/src/protocol/swg/AddIgnoreMessage.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package protocol.swg; + +import java.nio.ByteOrder; + +import main.NGECore; + +import org.apache.mina.core.buffer.IoBuffer; + +import engine.resources.config.Config; +import engine.resources.config.DefaultConfig; +import engine.resources.objects.SWGObject; + +public class AddIgnoreMessage extends SWGMessage { + + private SWGObject player; + private boolean type; + private String ignoreName; + + public AddIgnoreMessage(SWGObject obj, String name, boolean type) { + this.player = obj; + this.ignoreName = name; + this.type = type; + } + + @Override + public void deserialize(IoBuffer data) { + + } + + @Override + public IoBuffer serialize() { + Config config = NGECore.getInstance().getConfig(); + String server = config.getProperty("GALAXY_NAME"); + + IoBuffer result = IoBuffer.allocate(34 + server.length() + ignoreName.length()).order(ByteOrder.LITTLE_ENDIAN); + + result.putShort((short) 6); + result.putInt(0x70E9DA0F); + result.putLong(player.getObjectId()); + + result.put(getAsciiString("SWG")); + result.put(getAsciiString(server)); + result.put(getAsciiString(ignoreName)); + + result.putInt(0); + result.put((byte) ((type) ? 1 : 0)); // add = T, remove = F + result.putInt(0); + + return result.flip(); + } + +} diff --git a/src/protocol/swg/ChatOnAddFriend.java b/src/protocol/swg/ChatOnAddFriend.java index be805945..0b84e6ff 100644 --- a/src/protocol/swg/ChatOnAddFriend.java +++ b/src/protocol/swg/ChatOnAddFriend.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ package protocol.swg; import java.nio.ByteOrder; diff --git a/src/protocol/swg/ChatOnChangeFriendStatus.java b/src/protocol/swg/ChatOnChangeFriendStatus.java index 5eeb3f33..c93e5265 100644 --- a/src/protocol/swg/ChatOnChangeFriendStatus.java +++ b/src/protocol/swg/ChatOnChangeFriendStatus.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ package protocol.swg; import java.nio.ByteOrder; @@ -28,12 +49,9 @@ public class ChatOnChangeFriendStatus extends SWGMessage { @Override public IoBuffer serialize() { - Config config = new Config(); - config.setFilePath("nge.cfg"); - if (!(config.loadConfigFile())) { - config = DefaultConfig.getConfig(); - } + Config config = NGECore.getInstance().getConfig(); String server = config.getString("GALAXY_NAME"); + IoBuffer result = IoBuffer.allocate(100 + this.name.length() + server.length()).order(ByteOrder.LITTLE_ENDIAN); result.putShort((short)0x06); result.putInt(0x54336726); diff --git a/src/resources/objects/player/PlayerMessageBuilder.java b/src/resources/objects/player/PlayerMessageBuilder.java index cb480a88..fc89c30b 100644 --- a/src/resources/objects/player/PlayerMessageBuilder.java +++ b/src/resources/objects/player/PlayerMessageBuilder.java @@ -576,6 +576,44 @@ public class PlayerMessageBuilder extends ObjectMessageBuilder { } + public IoBuffer buildIgnoreAddDelta(String ignoreName) { + IoBuffer buffer = bufferPool.allocate(30, false).order(ByteOrder.LITTLE_ENDIAN); + PlayerObject player = (PlayerObject) object; + + buffer.putInt(1); + buffer.putInt(player.getIgnoreListUpdateCounter()); + + buffer.put((byte) 1); // updateType (SubType) + + buffer.putShort((short) player.getIgnoreList().indexOf(ignoreName)); + buffer.put(getAsciiString(ignoreName)); + + int size = buffer.position(); + buffer.flip(); + + buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 8, buffer, size + 4); + + return buffer; + } + + public IoBuffer buildIgnoreRemoveDelta(String removeName) { + IoBuffer buffer = bufferPool.allocate(30, false).order(ByteOrder.LITTLE_ENDIAN); + PlayerObject player = (PlayerObject) object; + + buffer.putInt(1); + buffer.putInt(player.getIgnoreListUpdateCounter()); + + buffer.put((byte) 0); + buffer.putShort((short) player.getIgnoreList().indexOf(removeName)); + + int size = buffer.position(); + buffer.flip(); + + buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 8, buffer, size + 4); + + return buffer; + } + public int getProfData(String profession) { switch (profession) { diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java index fa60f7c6..8e9dcfd0 100644 --- a/src/resources/objects/player/PlayerObject.java +++ b/src/resources/objects/player/PlayerObject.java @@ -433,6 +433,22 @@ public class PlayerObject extends SWGObject { } } + public void ignoreAdd(String ignoreName) { + synchronized(objectMutex) { + setIgnoreListUpdateCounter(getIgnoreListUpdateCounter() + 1); + getContainer().getClient().getSession().write(messageBuilder.buildIgnoreAddDelta(ignoreName)); + ignoreList.add(ignoreName); + } + } + + public void ignoreRemove(String removeName) { + synchronized(objectMutex) { + setIgnoreListUpdateCounter(getIgnoreListUpdateCounter() + 1); + getContainer().getClient().getSession().write(messageBuilder.buildIgnoreRemoveDelta(removeName)); + ignoreList.remove(removeName); + } + } + public void setIgnoreListUpdateCounter(int ignoreListUpdateCounter) { synchronized(objectMutex) { this.ignoreListUpdateCounter = ignoreListUpdateCounter; diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 0b32913a..2d0c26c4 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -46,6 +46,7 @@ import engine.resources.service.INetworkRemoteEvent; import resources.common.*; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; +import protocol.swg.AddIgnoreMessage; import protocol.swg.ChatOnChangeFriendStatus; import protocol.swg.ChatDeletePersistentMessage; import protocol.swg.ChatFriendsListUpdate; @@ -71,6 +72,8 @@ public class ChatService implements INetworkDispatch { this.core = core; core.commandService.registerCommand("spatialchatinternal"); core.commandService.registerCommand("socialinternal"); + core.commandService.registerCommand("addignore"); + core.commandService.registerCommand("removeignore"); mailODB = core.getMailODB(); } @@ -177,10 +180,13 @@ public class ChatService implements INetworkDispatch { if(sender == null) return; - - SWGObject recipient = getObjectByFirstName(firstName); + PlayerObject recipientGhost = (PlayerObject) recipient.getSlottedObject("ghost"); + + if (recipientGhost.getIgnoreList().contains(sender.getCustomName().toLowerCase())) + return; + if(recipient == null || recipient.getClient() == null || recipient.getClient().getSession() == null) { ChatOnSendInstantMessage response = new ChatOnSendInstantMessage(4, chatInstantMsg.getSequence()); //System.out.println(response.serialize().getHexDump()); @@ -219,7 +225,12 @@ public class ChatService implements INetworkDispatch { return; SWGObject recipient = getObjectByFirstName(packet.getRecipient()); - + + PlayerObject recipientGhost = (PlayerObject) recipient.getSlottedObject("ghost"); + + if (recipientGhost.getIgnoreList().contains(sender.getCustomName().toLowerCase())) + return; + if(recipient == null || recipient.getSlottedObject("ghost" ) == null) { ChatOnSendPersistentMessage response = new ChatOnSendPersistentMessage(4, packet.getCounter()); session.write(response.serialize()); @@ -421,6 +432,50 @@ public class ChatService implements INetworkDispatch { //actor.friendAdd(friendShortName); } + public void addToIgnoreList(SWGObject actor, String ignoreName) { + PlayerObject ghost = (PlayerObject) actor.getSlottedObject("ghost"); + CreatureObject creature = (CreatureObject) actor; + List ignoreList = ghost.getIgnoreList(); + + if (ignoreList.contains(ignoreName.toLowerCase())) { + creature.sendSystemMessage(ignoreName + " is already in your ignore list.", (byte) 0); + return; + } else { + // TODO: Do check for valid names to ignore + + AddIgnoreMessage addIgnore = new AddIgnoreMessage(actor, ignoreName.toLowerCase(), true); + actor.getClient().getSession().write(addIgnore.serialize()); + Console.println("Sent the add ignore message!"); + ghost.ignoreAdd(ignoreName.toLowerCase()); + Console.println("Sent the add ignore delta!"); + creature.sendSystemMessage(ignoreName + " is now ignored.", (byte) 0); + } + + } + + public void removeFromIgnoreList(SWGObject actor, String ignoreName) { + PlayerObject ghost = (PlayerObject) actor.getSlottedObject("ghost"); + CreatureObject creature = (CreatureObject) actor; + List ignoreList = ghost.getIgnoreList(); + + if (ignoreList.contains(ignoreName.toLowerCase())) { + for (String name : ignoreList) { + if(name.equalsIgnoreCase(ignoreName)) { + //Console.println("Name found!"); + AddIgnoreMessage removeIgnore = new AddIgnoreMessage(actor, ignoreName.toLowerCase(), false); + actor.getClient().getSession().write(removeIgnore.serialize()); + //Console.println("Sent AddIgnoreMessage to remove friend!"); + ghost.ignoreRemove(ignoreName.toLowerCase()); + //Console.println("Sent ignoreRemove delta!"); + creature.sendSystemMessage(ignoreName + " is no longer ignored.", (byte) 0); + + // TODO: Find out why player must click on name twice in list for name to be removed. + break; + } + } + } else { return; } + } + public void sendPersistentMessageHeader(Client client, Mail mail) { if(client.getSession() == null) diff --git a/src/services/travel/ShuttleCountdown.java b/src/services/travel/ShuttleCountdown.java deleted file mode 100644 index ce4c7042..00000000 --- a/src/services/travel/ShuttleCountdown.java +++ /dev/null @@ -1,39 +0,0 @@ -package services.travel; - -import java.util.Vector; -import java.util.Map.Entry; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import main.NGECore; -import resources.common.Console; -import engine.resources.scene.Planet; - -public class ShuttleCountdown implements Runnable { - - private NGECore core; - private final AtomicInteger runCount = new AtomicInteger(); - private final Runnable delegate; - private volatile ScheduledFuture self; - - public ShuttleCountdown(Runnable delegate, NGECore core) { - this.core = core; - this.delegate = delegate; - } - - @Override - public void run() { - delegate.run(); - Console.println("Atomic int: " + runCount.get()); - if (runCount.incrementAndGet() == 60) { - Console.println("Shutting down countdown!"); - self.cancel(false); - } - } - - public void startCountdown(ScheduledExecutorService scheduler) { - self = scheduler.scheduleAtFixedRate(delegate, 0, 1, TimeUnit.SECONDS); - } -} diff --git a/src/services/travel/TravelService.java b/src/services/travel/TravelService.java index df05a4c6..956c34ca 100644 --- a/src/services/travel/TravelService.java +++ b/src/services/travel/TravelService.java @@ -136,105 +136,6 @@ public class TravelService implements INetworkDispatch { } }); - } - public void startShuttleSchedule() { - final Runnable shuttleRun = new Runnable() { - - @Override - public void run() { - - for (Entry> entry : travelMap.entrySet()) { - for(TravelPoint tp : entry.getValue()) { - if (tp.getShuttle() == null) - continue; - else { - - if (tp.isShuttleAvailable() == false) { - tp.getShuttle().setPosture((byte) 0); - tp.setShuttleLanding(true); - handleShuttleLanding(); - //Console.println("Started handle shuttle landing"); - } - else { - tp.getShuttle().setPosture((byte) 2); - tp.setShuttleAvailable(false); - tp.setShuttleLanding(false); - tp.setShuttleDeparting(true); - handleShuttleDeparture(); - //Console.println("Shuttle is not available."); - } - } - } - } - - } - - }; - - scheduler.scheduleAtFixedRate(shuttleRun, 83, 83, TimeUnit.SECONDS); - - //shuttleCountdown(); - } - - private void handleShuttleLanding() { - scheduler.schedule(new Runnable() { - - @Override - public void run() { - for (Entry> entry : travelMap.entrySet()) { - for(TravelPoint tp : entry.getValue()) { - if (tp.isShuttleLanding()) { - tp.setShuttleLanding(false); - tp.setShuttleAvailable(true); - //Console.println("Shuttle has landed!"); - } - } - } - } - - }, 27, TimeUnit.SECONDS); - - } - - private void handleShuttleDeparture() { - scheduler.schedule(new Runnable() { - - @Override - public void run() { - for (Entry> entry : travelMap.entrySet()) { - for(TravelPoint tp : entry.getValue()) { - tp.setShuttleDeparting(false); - tp.setSecondsRemaining(60); - } - } - shuttleCountdown(); - //Console.println("Countdown initiated"); - } - - }, 20, TimeUnit.SECONDS); - } - - private void shuttleCountdown() { - Runnable countDown = new Runnable() { - @Override - public void run() { - for (Entry> entry : travelMap.entrySet()) { - for(TravelPoint tp : entry.getValue()) { - if (tp.getShuttle() == null || tp.isShuttleDeparting() == true || tp.isShuttleAvailable() == true || tp.getSecondsRemaining() == 0) - continue; - - else { - tp.setSecondsRemaining(tp.getSecondsRemaining() - 1); - //Console.println("Time Remaining: " + tp.getSecondsRemaining()); - } - } - } - } - - }; - - runCountdown(countDown, scheduler); - } public TravelPoint getNearestTravelPoint(SWGObject obj) { @@ -369,7 +270,7 @@ public class TravelService implements INetworkDispatch { SWGObject travelTicket = createTravelTicket(departurePlanet, departureLoc, arrivalPlanet, arrivalLoc); creatureObj.getSlottedObject("inventory").add(travelTicket); - Console.println("Total cost: " + fare); + //Console.println("Total cost: " + fare); SUIWindow window = core.suiService.createMessageBox(MessageBoxType.MESSAGE_BOX_OK, "STAR WARS GALAXIES", "Ticket purchase complete.", player, null, 0); core.suiService.openSUIWindow(window); @@ -505,10 +406,6 @@ public class TravelService implements INetworkDispatch { return this.travelMap; } - public void runCountdown(Runnable task, ScheduledExecutorService executor) { - new ShuttleCountdown(task, this.core).startCountdown(executor); - } - @Override public void shutdown() {