diff --git a/odb/cities/je.info.0.8 b/odb/cities/je.info.0.8 new file mode 100644 index 00000000..c6a20587 --- /dev/null +++ b/odb/cities/je.info.0.8 @@ -0,0 +1 @@ +140613 19:57:33:302 INFO [.\odb\cities]Chose lowest utilized file for cleaning. totalUtilization: 14 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false diff --git a/scripts/gcw/gcwrank_imperial.py b/scripts/collections/gcwrank_imperial.py similarity index 100% rename from scripts/gcw/gcwrank_imperial.py rename to scripts/collections/gcwrank_imperial.py diff --git a/scripts/gcw/gcwrank_rebel.py b/scripts/collections/gcwrank_rebel.py similarity index 100% rename from scripts/gcw/gcwrank_rebel.py rename to scripts/collections/gcwrank_rebel.py diff --git a/scripts/loot/lootItems/junk/damaged_droid_motivator.py b/scripts/loot/lootItems/junk/damaged_droid_motivator.py index b4c690db..73b366c6 100644 --- a/scripts/loot/lootItems/junk/damaged_droid_motivator.py +++ b/scripts/loot/lootItems/junk/damaged_droid_motivator.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_small_motor_generic.it/shared_ff'] + return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] def customItemName(): diff --git a/scripts/loot/lootItems/junk/droid_battery_black_green.py b/scripts/loot/lootItems/junk/droid_battery_black_green.py index b2e42ad2..4d896c3c 100644 --- a/scripts/loot/lootItems/junk/droid_battery_black_green.py +++ b/scripts/loot/lootItems/junk/droid_battery_black_green.py @@ -4,11 +4,15 @@ def itemTemplate(): def customItemName(): - return 'Droid Battery (Black/Green)' + return 'Droid Battery' def stackable(): return 1 + +def reverse_engineering_name(): + + return 'Black/Green' def junkDealerPrice(): diff --git a/scripts/loot/lootItems/junk/droid_battery_purple_green.py b/scripts/loot/lootItems/junk/droid_battery_purple_green.py index 5dc1d187..50d9b3d0 100644 --- a/scripts/loot/lootItems/junk/droid_battery_purple_green.py +++ b/scripts/loot/lootItems/junk/droid_battery_purple_green.py @@ -4,7 +4,7 @@ def itemTemplate(): def customItemName(): - return 'Droid Battery (Purple/Green)' + return 'Droid Battery' def lootDescriptor(): @@ -21,6 +21,10 @@ def customizationValues(): def stackable(): return 1 + +def reverse_engineering_name(): + + return 'Purple/Green' def junkDealerPrice(): diff --git a/scripts/loot/lootItems/junk/droid_battery_teal.py b/scripts/loot/lootItems/junk/droid_battery_teal.py index aed43435..3d379020 100644 --- a/scripts/loot/lootItems/junk/droid_battery_teal.py +++ b/scripts/loot/lootItems/junk/droid_battery_teal.py @@ -4,7 +4,7 @@ def itemTemplate(): def customItemName(): - return 'Droid Battery (Teal)' + return 'Droid Battery' def lootDescriptor(): @@ -21,6 +21,10 @@ def customizationValues(): def stackable(): return 1 + +def reverse_engineering_name(): + + return 'Teal' def junkDealerPrice(): diff --git a/scripts/loot/lootItems/junk/droid_motor_red.py b/scripts/loot/lootItems/junk/droid_motor_red.py index 34d094c9..f68735fe 100644 --- a/scripts/loot/lootItems/junk/droid_motor_red.py +++ b/scripts/loot/lootItems/junk/droid_motor_red.py @@ -4,7 +4,7 @@ def itemTemplate(): def customItemName(): - return 'Droid Motor (Red)' + return 'Droid Motor' def lootDescriptor(): @@ -22,6 +22,10 @@ def stackable(): return 1 +def reverse_engineering_name(): + + return 'Red' + def junkDealerPrice(): return 28 diff --git a/scripts/loot/lootItems/junk/droid_motor_yellow.py b/scripts/loot/lootItems/junk/droid_motor_yellow.py index aa6a3391..d23d505d 100644 --- a/scripts/loot/lootItems/junk/droid_motor_yellow.py +++ b/scripts/loot/lootItems/junk/droid_motor_yellow.py @@ -4,7 +4,7 @@ def itemTemplate(): def customItemName(): - return 'Droid Motor (yellow)' + return 'Droid Motor' def lootDescriptor(): @@ -22,6 +22,10 @@ def stackable(): return 1 +def reverse_engineering_name(): + + return 'Yellow' + def junkDealerPrice(): return 28 diff --git a/scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py b/scripts/loot/lootItems/junk/electronics_module.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py rename to scripts/loot/lootItems/junk/electronics_module.py index 44256af6..5ed9edcb 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py +++ b/scripts/loot/lootItems/junk/electronics_module.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_simple_generic.iff'] +def customItemName(): + + return 'Electronics Module' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_module_wires.py b/scripts/loot/lootItems/junk/emergency_reactivator.py similarity index 72% rename from scripts/loot/lootItems/npc_loot/elect_module_wires.py rename to scripts/loot/lootItems/junk/emergency_reactivator.py index 3aada50d..8f95eb49 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_wires.py +++ b/scripts/loot/lootItems/junk/emergency_reactivator.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff'] +def customItemName(): + + return 'Emergency Reactivator' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/explosive_dud.py b/scripts/loot/lootItems/junk/explosive_dud.py index 1fdcf7c3..e871fd97 100644 --- a/scripts/loot/lootItems/junk/explosive_dud.py +++ b/scripts/loot/lootItems/junk/explosive_dud.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_firework_generic.iff'] + return ['object/tangible/loot/npc_loot/shared_rocket_ammo_generic.iff'] def customItemName(): diff --git a/scripts/loot/lootItems/junk/frequency_jamming_wired.py b/scripts/loot/lootItems/junk/frequency_jamming_wired.py new file mode 100644 index 00000000..af2594c0 --- /dev/null +++ b/scripts/loot/lootItems/junk/frequency_jamming_wired.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_frequency_jammed_wire_generic.iff'] + +def customItemName(): + + return 'Frequency Jamming Wired' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 10 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/recording_rod_generic.py b/scripts/loot/lootItems/junk/holorecorder.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/recording_rod_generic.py rename to scripts/loot/lootItems/junk/holorecorder.py index f6d25839..e6c121e1 100644 --- a/scripts/loot/lootItems/npc_loot/recording_rod_generic.py +++ b/scripts/loot/lootItems/junk/holorecorder.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_recording_rod_generic.iff'] + +def customItemName(): + return 'Holorecorder' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 10 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/hyperdrive_unit.py b/scripts/loot/lootItems/junk/hyperdrive_unit.py index 8ce2372d..919bba54 100644 --- a/scripts/loot/lootItems/junk/hyperdrive_unit.py +++ b/scripts/loot/lootItems/junk/hyperdrive_unit.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/misc/shared_hyperdrive_part_s01.iff'] + return ['object/tangible/loot/npc_loot/shared_hyperdrive_part_generic.iff'] def customItemName(): diff --git a/scripts/loot/lootItems/junk/locomotor.py b/scripts/loot/lootItems/junk/locomotor.py new file mode 100644 index 00000000..9f886792 --- /dev/null +++ b/scripts/loot/lootItems/junk/locomotor.py @@ -0,0 +1,32 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] + +def customItemName(): + + return 'Locomotor' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [26] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 34 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/circuit_board_generic.py b/scripts/loot/lootItems/junk/mark_i_circuit_board.py similarity index 68% rename from scripts/loot/lootItems/npc_loot/circuit_board_generic.py rename to scripts/loot/lootItems/junk/mark_i_circuit_board.py index 86d8c842..96662feb 100644 --- a/scripts/loot/lootItems/npc_loot/circuit_board_generic.py +++ b/scripts/loot/lootItems/junk/mark_i_circuit_board.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff'] + +def customItemName(): + return 'Mark I Circuit Board' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 15 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/mark_v_circuit_board.py b/scripts/loot/lootItems/junk/mark_v_circuit_board.py new file mode 100644 index 00000000..c113eff2 --- /dev/null +++ b/scripts/loot/lootItems/junk/mark_v_circuit_board.py @@ -0,0 +1,32 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff'] + +def customItemName(): + + return 'Mark I Circuit Board' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [6] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 15 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/mark_v_vocab_module.py b/scripts/loot/lootItems/junk/mark_v_vocab_module.py new file mode 100644 index 00000000..f04794d6 --- /dev/null +++ b/scripts/loot/lootItems/junk/mark_v_vocab_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_orange_generic.iff'] + +def customItemName(): + + return 'Mark V Vocab Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/mark_vii_vocabulation_module.py b/scripts/loot/lootItems/junk/mark_vii_vocabulation_module.py new file mode 100644 index 00000000..97d157a4 --- /dev/null +++ b/scripts/loot/lootItems/junk/mark_vii_vocabulation_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] + +def customItemName(): + + return 'Mark VII Vocabulation Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/mark_x_vocab_module.py b/scripts/loot/lootItems/junk/mark_x_vocab_module.py new file mode 100644 index 00000000..6d83c144 --- /dev/null +++ b/scripts/loot/lootItems/junk/mark_x_vocab_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_red_generic.iff'] + +def customItemName(): + + return 'Mark X Vocab Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py b/scripts/loot/lootItems/junk/newsfilter_module.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py rename to scripts/loot/lootItems/junk/newsfilter_module.py index 00bc89b2..33b142cb 100644 --- a/scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py +++ b/scripts/loot/lootItems/junk/newsfilter_module.py @@ -1,14 +1,19 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff'] +def customItemName(): + + return 'Newsfilter Module' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): diff --git a/scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py b/scripts/loot/lootItems/junk/outdated_aeromagnifier.py similarity index 76% rename from scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py rename to scripts/loot/lootItems/junk/outdated_aeromagnifier.py index 80c9c816..425f9eff 100644 --- a/scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py +++ b/scripts/loot/lootItems/junk/outdated_aeromagnifier.py @@ -1,7 +1,11 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_aero_magnifier_generic.iff'] - + +def customItemName(): + + return 'Outdated Aeromagnifier' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/npc_loot/atat_life_support_generic.py b/scripts/loot/lootItems/junk/palm_diary.py similarity index 52% rename from scripts/loot/lootItems/npc_loot/atat_life_support_generic.py rename to scripts/loot/lootItems/junk/palm_diary.py index 02682d0f..6860f705 100644 --- a/scripts/loot/lootItems/npc_loot/atat_life_support_generic.py +++ b/scripts/loot/lootItems/junk/palm_diary.py @@ -1,6 +1,10 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_atat_life_support_generic.iff'] + return ['object/tangible/loot/misc/shared_ledger_s01.iff'] + +def customItemName(): + + return 'Palm Diary' def stackable(): diff --git a/scripts/loot/lootItems/npc_loot/tubed_device_generic.py b/scripts/loot/lootItems/junk/plugged_hydraulics_system.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/tubed_device_generic.py rename to scripts/loot/lootItems/junk/plugged_hydraulics_system.py index 86a8ba00..655528f4 100644 --- a/scripts/loot/lootItems/npc_loot/tubed_device_generic.py +++ b/scripts/loot/lootItems/junk/plugged_hydraulics_system.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_tubed_device_generic.iff'] +def customItemName(): + + return 'Plugged Hydraulics System' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py b/scripts/loot/lootItems/junk/power_output_device.py similarity index 69% rename from scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py rename to scripts/loot/lootItems/junk/power_output_device.py index 0371ec7c..fdca8bea 100644 --- a/scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py +++ b/scripts/loot/lootItems/junk/power_output_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_power_output_analyzer_generic.iff'] + +def customItemName(): + return 'Power Output Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/generator_device_generic.py b/scripts/loot/lootItems/junk/power_supply.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/generator_device_generic.py rename to scripts/loot/lootItems/junk/power_supply.py index de8b4255..18d89a7d 100644 --- a/scripts/loot/lootItems/npc_loot/generator_device_generic.py +++ b/scripts/loot/lootItems/junk/power_supply.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_generator_device_generic.iff'] + +def customItemName(): + return 'Power Supply' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/rapid_program_module.py b/scripts/loot/lootItems/junk/rapid_program_module.py new file mode 100644 index 00000000..8821da77 --- /dev/null +++ b/scripts/loot/lootItems/junk/rapid_program_module.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff'] + +def customItemName(): + + return 'Rapid Program Module' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 21 + +def junkType(): + + return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py b/scripts/loot/lootItems/junk/rations_kit.py similarity index 80% rename from scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py rename to scripts/loot/lootItems/junk/rations_kit.py index 8f253eee..31cb551a 100644 --- a/scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py +++ b/scripts/loot/lootItems/junk/rations_kit.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_ration_kit_device_generic.iff'] +def customItemName(): + + return 'Rations Kit' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/npc_loot/electronic_key_generic.py b/scripts/loot/lootItems/junk/remote_transmitter.py similarity index 68% rename from scripts/loot/lootItems/npc_loot/electronic_key_generic.py rename to scripts/loot/lootItems/junk/remote_transmitter.py index 4cb3cbe3..e010fa14 100644 --- a/scripts/loot/lootItems/npc_loot/electronic_key_generic.py +++ b/scripts/loot/lootItems/junk/remote_transmitter.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_electronic_key_generic.iff'] + +def customItemName(): + return 'Remote Transmitter' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py b/scripts/loot/lootItems/junk/restraining_device.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py rename to scripts/loot/lootItems/junk/restraining_device.py index 271749a8..31866d68 100644 --- a/scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py +++ b/scripts/loot/lootItems/junk/restraining_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_engineer_analysis_board_generic.iff'] + +def customItemName(): + return 'Restraining Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/self_analysis_circuit.py b/scripts/loot/lootItems/junk/self_analysis_circuit.py new file mode 100644 index 00000000..81645d5b --- /dev/null +++ b/scripts/loot/lootItems/junk/self_analysis_circuit.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff'] + +def customItemName(): + + return 'Self Analysis Circuit' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_console_generic.py b/scripts/loot/lootItems/junk/servo_joint.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/medical_console_generic.py rename to scripts/loot/lootItems/junk/servo_joint.py index 69ee6034..2b399503 100644 --- a/scripts/loot/lootItems/npc_loot/medical_console_generic.py +++ b/scripts/loot/lootItems/junk/servo_joint.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_medical_console_generic.iff'] + +def customItemName(): + return 'Servo Joint' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 24 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py b/scripts/loot/lootItems/junk/speederdrive.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py rename to scripts/loot/lootItems/junk/speederdrive.py index 46b965c8..91b7909a 100644 --- a/scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py +++ b/scripts/loot/lootItems/junk/speederdrive.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_hyperdrive_part_generic.iff'] + +def customItemName(): + return 'Speederdrive' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py b/scripts/loot/lootItems/junk/tranceiver.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py rename to scripts/loot/lootItems/junk/tranceiver.py index 54ce9d22..fabc708c 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py +++ b/scripts/loot/lootItems/junk/tranceiver.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_complex_generic.iff'] + +def customItemName(): + return 'Tranceiver' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/tubing.py b/scripts/loot/lootItems/junk/tubing.py new file mode 100644 index 00000000..0f27b301 --- /dev/null +++ b/scripts/loot/lootItems/junk/tubing.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_tubing_device_generic.iff'] + +def customItemName(): + + return 'Tubing' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 34 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py b/scripts/loot/lootItems/junk/unpowered_installation_repair_device.py similarity index 65% rename from scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py rename to scripts/loot/lootItems/junk/unpowered_installation_repair_device.py index 1d701f23..75cee131 100644 --- a/scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py +++ b/scripts/loot/lootItems/junk/unpowered_installation_repair_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_installation_repair_device_generic.iff'] + +def customItemName(): + return 'Unpowered Installation Repair Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/decryptor_generic.py b/scripts/loot/lootItems/junk/unpowered_memory_encryptor.py similarity index 66% rename from scripts/loot/lootItems/npc_loot/decryptor_generic.py rename to scripts/loot/lootItems/junk/unpowered_memory_encryptor.py index 218fe01d..be33e61b 100644 --- a/scripts/loot/lootItems/npc_loot/decryptor_generic.py +++ b/scripts/loot/lootItems/junk/unpowered_memory_encryptor.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_decryptor_generic.iff'] + +def customItemName(): + return 'Unpowered Memory Encryptor' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py b/scripts/loot/lootItems/junk/unpowered_survey_pad.py similarity index 68% rename from scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py rename to scripts/loot/lootItems/junk/unpowered_survey_pad.py index f5e9e3cd..a75a8091 100644 --- a/scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py +++ b/scripts/loot/lootItems/junk/unpowered_survey_pad.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_survey_pad_adv_generic.iff'] + +def customItemName(): + return 'Unpowered Survey Pad' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/id_chip_generic.py b/scripts/loot/lootItems/junk/used_id_chip.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/id_chip_generic.py rename to scripts/loot/lootItems/junk/used_id_chip.py index a35ff878..34ac1e3c 100644 --- a/scripts/loot/lootItems/npc_loot/id_chip_generic.py +++ b/scripts/loot/lootItems/junk/used_id_chip.py @@ -1,6 +1,11 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_id_chip_generic.iff'] + +def customItemName(): + + return 'Used ID Chip' def stackable(): @@ -8,7 +13,7 @@ def stackable(): def junkDealerPrice(): - return 28 + return 14 def junkType(): diff --git a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py b/scripts/loot/lootItems/junk/used_vidscreen.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py rename to scripts/loot/lootItems/junk/used_vidscreen.py index 7734f2fa..df5b2a48 100644 --- a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py +++ b/scripts/loot/lootItems/junk/used_vidscreen.py @@ -1,6 +1,11 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_2_generic.iff'] + +def customItemName(): + + return 'Used Vidscreen' def stackable(): @@ -8,7 +13,7 @@ def stackable(): def junkDealerPrice(): - return 28 + return 14 def junkType(): diff --git a/scripts/loot/lootItems/junk/vocabulator.py b/scripts/loot/lootItems/junk/vocabulator.py new file mode 100644 index 00000000..d8b93a49 --- /dev/null +++ b/scripts/loot/lootItems/junk/vocabulator.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] + +def customItemName(): + + return 'Vocabulator' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/wire_element.py b/scripts/loot/lootItems/junk/wire_element.py new file mode 100644 index 00000000..4f0e8eeb --- /dev/null +++ b/scripts/loot/lootItems/junk/wire_element.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/simple_kit/shared_heating_element.iff'] + +def customItemName(): + + return 'Wire Element' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/wiring_black.py b/scripts/loot/lootItems/junk/wiring_black.py new file mode 100644 index 00000000..5c69cb3b --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_black.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [2] + +def reverse_engineering_name(): + + return 'Black' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/blue_wiring_generic.py b/scripts/loot/lootItems/junk/wiring_blue.py similarity index 59% rename from scripts/loot/lootItems/npc_loot/blue_wiring_generic.py rename to scripts/loot/lootItems/junk/wiring_blue.py index d7096aba..0190a3b8 100644 --- a/scripts/loot/lootItems/npc_loot/blue_wiring_generic.py +++ b/scripts/loot/lootItems/junk/wiring_blue.py @@ -1,15 +1,24 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_blue_wiring_generic.iff'] + +def customItemName(): + return 'Wiring' + def stackable(): return 1 +def reverse_engineering_name(): + + return 'Blue' + def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/wiring_green.py b/scripts/loot/lootItems/junk/wiring_green.py new file mode 100644 index 00000000..6646dd97 --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_green.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [14] + +def reverse_engineering_name(): + + return 'Green' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/wiring_orange.py b/scripts/loot/lootItems/junk/wiring_orange.py new file mode 100644 index 00000000..678b5e77 --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_orange.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [6] + +def reverse_engineering_name(): + + return 'Orange' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/wiring_purple.py b/scripts/loot/lootItems/junk/wiring_purple.py new file mode 100644 index 00000000..b53c4e6a --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_purple.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [29] + +def reverse_engineering_name(): + + return 'Purple' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/wiring_red_yellow.py b/scripts/loot/lootItems/junk/wiring_red_yellow.py new file mode 100644 index 00000000..88fd2f59 --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_red_yellow.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [13] #not correct + +def reverse_engineering_name(): + + return 'Red/Yellow' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/wiring_teal.py b/scripts/loot/lootItems/junk/wiring_teal.py new file mode 100644 index 00000000..10809917 --- /dev/null +++ b/scripts/loot/lootItems/junk/wiring_teal.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [25] + +def reverse_engineering_name(): + + return 'Teal' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/answering_machine_generic.py b/scripts/loot/lootItems/npc_loot/answering_machine_generic.py deleted file mode 100644 index 89740650..00000000 --- a/scripts/loot/lootItems/npc_loot/answering_machine_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_answering_machine_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py deleted file mode 100644 index 0ace743b..00000000 --- a/scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_armor_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/artifact_generic.py b/scripts/loot/lootItems/npc_loot/artifact_generic.py deleted file mode 100644 index db5670a1..00000000 --- a/scripts/loot/lootItems/npc_loot/artifact_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_artifact_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py b/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py deleted file mode 100644 index c1951d7c..00000000 --- a/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bacta_ampules_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/basket_generic.py b/scripts/loot/lootItems/npc_loot/basket_generic.py deleted file mode 100644 index df8acc43..00000000 --- a/scripts/loot/lootItems/npc_loot/basket_generic.py +++ /dev/null @@ -1,14 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_basket_generic.iff'] -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py deleted file mode 100644 index 9d3745d7..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py deleted file mode 100644 index 541e29fc..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py deleted file mode 100644 index be88312d..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s03_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py deleted file mode 100644 index 1c94fece..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s04_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bowl_generic.py b/scripts/loot/lootItems/npc_loot/bowl_generic.py deleted file mode 100644 index 6afc929d..00000000 --- a/scripts/loot/lootItems/npc_loot/bowl_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bowl_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/briefcase_generic.py b/scripts/loot/lootItems/npc_loot/briefcase_generic.py deleted file mode 100644 index eca5bbca..00000000 --- a/scripts/loot/lootItems/npc_loot/briefcase_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_briefcase_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py b/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py deleted file mode 100644 index 9f5ba3cd..00000000 --- a/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_broad_spectrum_med_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bug_jar_generic.py b/scripts/loot/lootItems/npc_loot/bug_jar_generic.py deleted file mode 100644 index 28cf4703..00000000 --- a/scripts/loot/lootItems/npc_loot/bug_jar_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bug_jar_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/building_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/building_repair_device_generic.py deleted file mode 100644 index 89af1925..00000000 --- a/scripts/loot/lootItems/npc_loot/building_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_building_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cage_generic.py b/scripts/loot/lootItems/npc_loot/cage_generic.py deleted file mode 100644 index f91bfbf6..00000000 --- a/scripts/loot/lootItems/npc_loot/cage_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cage_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/camera_generic.py b/scripts/loot/lootItems/npc_loot/camera_generic.py deleted file mode 100644 index 2e6f6432..00000000 --- a/scripts/loot/lootItems/npc_loot/camera_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_camera_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py b/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py deleted file mode 100644 index a008f436..00000000 --- a/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_canister_small_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py b/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py deleted file mode 100644 index 0abb6985..00000000 --- a/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_chance_cube_8_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py b/scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py deleted file mode 100644 index 71f933c7..00000000 --- a/scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_chem_dispersion_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clamp_generic.py b/scripts/loot/lootItems/npc_loot/clamp_generic.py deleted file mode 100644 index 0a673f2b..00000000 --- a/scripts/loot/lootItems/npc_loot/clamp_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_clamp_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py b/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py deleted file mode 100644 index bdc491df..00000000 --- a/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_clipon_id_badge_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cloth_box_generic.py b/scripts/loot/lootItems/npc_loot/cloth_box_generic.py deleted file mode 100644 index 817b40b9..00000000 --- a/scripts/loot/lootItems/npc_loot/cloth_box_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cloth_box_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py b/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py deleted file mode 100644 index fc557163..00000000 --- a/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cloth_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py deleted file mode 100644 index b15e233d..00000000 --- a/scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_clothing_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py b/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py deleted file mode 100644 index 4eca0138..00000000 --- a/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_comlink_civilian_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/copper_battery_generic.py b/scripts/loot/lootItems/npc_loot/copper_battery_generic.py deleted file mode 100644 index 61a9b0eb..00000000 --- a/scripts/loot/lootItems/npc_loot/copper_battery_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datadisk_generic.py b/scripts/loot/lootItems/npc_loot/datadisk_generic.py deleted file mode 100644 index ee3b9ddf..00000000 --- a/scripts/loot/lootItems/npc_loot/datadisk_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datadisk_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py b/scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py deleted file mode 100644 index 2879d622..00000000 --- a/scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datapad_flashy_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_generic.py b/scripts/loot/lootItems/npc_loot/datapad_generic.py deleted file mode 100644 index 699d4187..00000000 --- a/scripts/loot/lootItems/npc_loot/datapad_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datapad_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py b/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py deleted file mode 100644 index 57dedb7d..00000000 --- a/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datapad_trakball_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py b/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py deleted file mode 100644 index b4727ee5..00000000 --- a/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_deed_datapad_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py b/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py deleted file mode 100644 index f4be3df0..00000000 --- a/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_dermal_analyzer_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py b/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py deleted file mode 100644 index fb704084..00000000 --- a/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_disguise_makeup_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/disk_drive_generic.py b/scripts/loot/lootItems/npc_loot/disk_drive_generic.py deleted file mode 100644 index f93bdb82..00000000 --- a/scripts/loot/lootItems/npc_loot/disk_drive_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_disk_drive_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/dye_set_generic.py b/scripts/loot/lootItems/npc_loot/dye_set_generic.py deleted file mode 100644 index 45a0a16e..00000000 --- a/scripts/loot/lootItems/npc_loot/dye_set_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_dye_set_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_module_misc_01.py b/scripts/loot/lootItems/npc_loot/elect_module_misc_01.py deleted file mode 100644 index 2acda9e5..00000000 --- a/scripts/loot/lootItems/npc_loot/elect_module_misc_01.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_elect_module_misc_01.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py b/scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py deleted file mode 100644 index 0060d932..00000000 --- a/scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_elect_power_unit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py b/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py deleted file mode 100644 index b542f217..00000000 --- a/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_electro_polearm_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/firework_generic.py b/scripts/loot/lootItems/npc_loot/firework_generic.py deleted file mode 100644 index eb99aac1..00000000 --- a/scripts/loot/lootItems/npc_loot/firework_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_firework_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py b/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py deleted file mode 100644 index 1ca01637..00000000 --- a/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_flask_sample_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py b/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py deleted file mode 100644 index c0e1ddf6..00000000 --- a/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_fliptop_calibrator_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py b/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py deleted file mode 100644 index dd99ef94..00000000 --- a/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_frequency_jammer_wire_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py deleted file mode 100644 index bb171ed2..00000000 --- a/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_furniture_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/generic_crystal.py b/scripts/loot/lootItems/npc_loot/generic_crystal.py deleted file mode 100644 index e90d50de..00000000 --- a/scripts/loot/lootItems/npc_loot/generic_crystal.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_generic_crystal.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py b/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py deleted file mode 100644 index 3af36b03..00000000 --- a/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_generic_tool_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py b/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py deleted file mode 100644 index 6bebbcd0..00000000 --- a/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_green_stone_necklace_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py b/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py deleted file mode 100644 index a1132938..00000000 --- a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_1_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py b/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py deleted file mode 100644 index 78323bd5..00000000 --- a/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_healing_chemical_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py b/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py b/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py b/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py b/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py b/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py b/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py b/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py b/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py deleted file mode 100644 index dd9d24f0..00000000 --- a/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_holocube_splinters_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py b/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py deleted file mode 100644 index 1706a92b..00000000 --- a/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_hovercrate_transport_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py b/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py deleted file mode 100644 index aba6ec0d..00000000 --- a/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_imp_life_support_pack_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py b/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py deleted file mode 100644 index 67c498fe..00000000 --- a/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_impulse_detector_01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py b/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py deleted file mode 100644 index d26e4009..00000000 --- a/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_impulse_detector_02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jellyfish_generic.py b/scripts/loot/lootItems/npc_loot/jellyfish_generic.py deleted file mode 100644 index 34d2a67e..00000000 --- a/scripts/loot/lootItems/npc_loot/jellyfish_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_jellyfish_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py b/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py deleted file mode 100644 index 957b63ed..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_jewelry_setting_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py b/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py deleted file mode 100644 index fcd26a3f..00000000 --- a/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_large_dispersal_unit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/laser_trap_generic.py b/scripts/loot/lootItems/npc_loot/laser_trap_generic.py deleted file mode 100644 index 1abe062d..00000000 --- a/scripts/loot/lootItems/npc_loot/laser_trap_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_laser_trap_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py b/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py deleted file mode 100644 index 101ea1f7..00000000 --- a/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_launcher_tube_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/ledger_generic.py b/scripts/loot/lootItems/npc_loot/ledger_generic.py deleted file mode 100644 index 42d4a063..00000000 --- a/scripts/loot/lootItems/npc_loot/ledger_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_ledger_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py b/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py deleted file mode 100644 index 4a5dedde..00000000 --- a/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_magseal_detector_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_device_generic.py b/scripts/loot/lootItems/npc_loot/medical_device_generic.py deleted file mode 100644 index 2aa256ff..00000000 --- a/scripts/loot/lootItems/npc_loot/medical_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_medical_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py b/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py deleted file mode 100644 index 56e301ff..00000000 --- a/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_medical_enhance_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/metal_ball_generic.py b/scripts/loot/lootItems/npc_loot/metal_ball_generic.py deleted file mode 100644 index fac99e44..00000000 --- a/scripts/loot/lootItems/npc_loot/metal_ball_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_metal_ball_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py b/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py deleted file mode 100644 index a00254b6..00000000 --- a/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_metal_barrel_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/metal_case_generic.py b/scripts/loot/lootItems/npc_loot/metal_case_generic.py deleted file mode 100644 index 688d988d..00000000 --- a/scripts/loot/lootItems/npc_loot/metal_case_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_metal_case_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/motivator_device_generic.py b/scripts/loot/lootItems/npc_loot/motivator_device_generic.py deleted file mode 100644 index a4dc7ed1..00000000 --- a/scripts/loot/lootItems/npc_loot/motivator_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_motivator_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/notebook_generic.py b/scripts/loot/lootItems/npc_loot/notebook_generic.py deleted file mode 100644 index a0fab1c9..00000000 --- a/scripts/loot/lootItems/npc_loot/notebook_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_notebook_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py b/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py deleted file mode 100644 index 386bfc3a..00000000 --- a/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_organichem_stores_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/pearl_generic.py b/scripts/loot/lootItems/npc_loot/pearl_generic.py deleted file mode 100644 index 670e8960..00000000 --- a/scripts/loot/lootItems/npc_loot/pearl_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_pearl_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/place_setting_generic.py b/scripts/loot/lootItems/npc_loot/place_setting_generic.py deleted file mode 100644 index 81892f53..00000000 --- a/scripts/loot/lootItems/npc_loot/place_setting_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_place_setting_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py b/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py deleted file mode 100644 index 214c24a6..00000000 --- a/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_preserved_bugs_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py b/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py deleted file mode 100644 index 5eb4524f..00000000 --- a/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_prop_jacket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/radio_generic.py b/scripts/loot/lootItems/npc_loot/radio_generic.py deleted file mode 100644 index 88590013..00000000 --- a/scripts/loot/lootItems/npc_loot/radio_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_radio_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rebreather_generic.py b/scripts/loot/lootItems/npc_loot/rebreather_generic.py deleted file mode 100644 index b42c7d4c..00000000 --- a/scripts/loot/lootItems/npc_loot/rebreather_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rebreather_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/red_wiring_generic.py b/scripts/loot/lootItems/npc_loot/red_wiring_generic.py deleted file mode 100644 index 24cb70ad..00000000 --- a/scripts/loot/lootItems/npc_loot/red_wiring_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_red_wiring_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py deleted file mode 100644 index 01b9b15d..00000000 --- a/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rng_weapon_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rock_generic.py b/scripts/loot/lootItems/npc_loot/rock_generic.py deleted file mode 100644 index 718c633a..00000000 --- a/scripts/loot/lootItems/npc_loot/rock_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rock_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py b/scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py deleted file mode 100644 index ea5b521f..00000000 --- a/scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rocket_ammo_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rocket_generic.py b/scripts/loot/lootItems/npc_loot/rocket_generic.py deleted file mode 100644 index 7ae615cb..00000000 --- a/scripts/loot/lootItems/npc_loot/rocket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rocket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py b/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py deleted file mode 100644 index e724632a..00000000 --- a/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rusty_toolkit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py b/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py deleted file mode 100644 index 918a51d3..00000000 --- a/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_scope_weapon_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/scroll_generic.py b/scripts/loot/lootItems/npc_loot/scroll_generic.py deleted file mode 100644 index 983c80fb..00000000 --- a/scripts/loot/lootItems/npc_loot/scroll_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_scroll_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/serum_vial_generic.py b/scripts/loot/lootItems/npc_loot/serum_vial_generic.py deleted file mode 100644 index 88de796e..00000000 --- a/scripts/loot/lootItems/npc_loot/serum_vial_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_serum_vial_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shield_module_generic.py b/scripts/loot/lootItems/npc_loot/shield_module_generic.py deleted file mode 100644 index 31b0fb17..00000000 --- a/scripts/loot/lootItems/npc_loot/shield_module_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shield_module_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py deleted file mode 100644 index cac3b1ed..00000000 --- a/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shield_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shisa_generic.py b/scripts/loot/lootItems/npc_loot/shisa_generic.py deleted file mode 100644 index 6e009638..00000000 --- a/scripts/loot/lootItems/npc_loot/shisa_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shisa_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py b/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py deleted file mode 100644 index 549780d1..00000000 --- a/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shoe_soul_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/slave_collar_generic.py b/scripts/loot/lootItems/npc_loot/slave_collar_generic.py deleted file mode 100644 index d708ad10..00000000 --- a/scripts/loot/lootItems/npc_loot/slave_collar_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_slave_collar_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/small_motor_generic.py b/scripts/loot/lootItems/npc_loot/small_motor_generic.py deleted file mode 100644 index 89bf3902..00000000 --- a/scripts/loot/lootItems/npc_loot/small_motor_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/software_module_generic.py b/scripts/loot/lootItems/npc_loot/software_module_generic.py deleted file mode 100644 index 75d68601..00000000 --- a/scripts/loot/lootItems/npc_loot/software_module_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py b/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py deleted file mode 100644 index 3392dfe1..00000000 --- a/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_software_module_orange_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/software_module_red_generic.py b/scripts/loot/lootItems/npc_loot/software_module_red_generic.py deleted file mode 100644 index 55a69b0c..00000000 --- a/scripts/loot/lootItems/npc_loot/software_module_red_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_software_module_red_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/solar_panel.py b/scripts/loot/lootItems/npc_loot/solar_panel.py deleted file mode 100644 index 145b5f97..00000000 --- a/scripts/loot/lootItems/npc_loot/solar_panel.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_solar_panel_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/speaker_generic.py b/scripts/loot/lootItems/npc_loot/speaker_generic.py deleted file mode 100644 index 51a1be5b..00000000 --- a/scripts/loot/lootItems/npc_loot/speaker_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_speaker_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py b/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py deleted file mode 100644 index 27e14a53..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_booster_blue_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py b/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py deleted file mode 100644 index f29b059a..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_crash_n_burn_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py b/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py deleted file mode 100644 index c4fc473c..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_droid_lube_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py b/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py deleted file mode 100644 index e9bc4c5c..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_giggledust_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py b/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py deleted file mode 100644 index 8db66847..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_grey_gabaki_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py b/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py deleted file mode 100644 index 7ddee3a0..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_gunjack_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py b/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py deleted file mode 100644 index 0050a0e3..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_kliknik_boost_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py b/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py deleted file mode 100644 index 409905d7..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_kwi_boost_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py b/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py deleted file mode 100644 index 8166790d..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_muon_gold_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py b/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py deleted file mode 100644 index ec4b0502..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_neutron_pixie_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py b/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py deleted file mode 100644 index 6ee5a60e..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_pyrepenol_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py b/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py deleted file mode 100644 index a6fde893..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_scramjet_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py b/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py deleted file mode 100644 index 113d6074..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_sedative_h4b_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py b/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py deleted file mode 100644 index e84ed917..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_shadowpaw_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py b/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py deleted file mode 100644 index 1c1b485b..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_sweetblossom_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py b/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py deleted file mode 100644 index ff27c155..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_thrusterhead_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py b/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py deleted file mode 100644 index 08a3bc5b..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_yarrock_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py b/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py deleted file mode 100644 index 07938537..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_bottle_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py deleted file mode 100644 index 53bcebf3..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py deleted file mode 100644 index 38cc5f98..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py deleted file mode 100644 index 31a6703a..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_03_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py deleted file mode 100644 index 9d291638..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/stasis_field_generic.py b/scripts/loot/lootItems/npc_loot/stasis_field_generic.py deleted file mode 100644 index 170a5f89..00000000 --- a/scripts/loot/lootItems/npc_loot/stasis_field_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_stasis_field_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/stim_a_generic.py b/scripts/loot/lootItems/npc_loot/stim_a_generic.py deleted file mode 100644 index df58334a..00000000 --- a/scripts/loot/lootItems/npc_loot/stim_a_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_stim_a_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py b/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py deleted file mode 100644 index 242fa26e..00000000 --- a/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_substance_analyzer_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_liquid.py b/scripts/loot/lootItems/npc_loot/supplement_liquid.py deleted file mode 100644 index 75ba8b93..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_liquid.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_liquid_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_solid.py b/scripts/loot/lootItems/npc_loot/supplement_solid.py deleted file mode 100644 index 9c62747d..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_solid.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_solid.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py b/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py deleted file mode 100644 index d7b2d57a..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_solid_pills.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py b/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py deleted file mode 100644 index d34e96b1..00000000 --- a/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_survival_equipment_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/syringe_generic.py b/scripts/loot/lootItems/npc_loot/syringe_generic.py deleted file mode 100644 index da7d11db..00000000 --- a/scripts/loot/lootItems/npc_loot/syringe_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_syringe_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py b/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py deleted file mode 100644 index a8fc68d9..00000000 --- a/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tech_food_basket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py b/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py deleted file mode 100644 index d7a0286c..00000000 --- a/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tool_bundle_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tube_paste_generic.py b/scripts/loot/lootItems/npc_loot/tube_paste_generic.py deleted file mode 100644 index 5b1809a9..00000000 --- a/scripts/loot/lootItems/npc_loot/tube_paste_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tube_paste_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/wiring_generic.py b/scripts/loot/lootItems/npc_loot/wiring_generic.py deleted file mode 100644 index 535a4455..00000000 --- a/scripts/loot/lootItems/npc_loot/wiring_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/worklight_generic.py b/scripts/loot/lootItems/npc_loot/worklight_generic.py deleted file mode 100644 index cb1df243..00000000 --- a/scripts/loot/lootItems/npc_loot/worklight_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_worklight_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py b/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py deleted file mode 100644 index 05478bd9..00000000 --- a/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_writing_utensils_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_tatooine.py b/scripts/object/building/player/city/cityhall_tatooine.py index 6b2cbced..2390d6f0 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/scripts/object/building/player/city/cityhall_tatooine.py @@ -9,7 +9,7 @@ def setup(core, object): structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') - structureterminal.setAttachment('housing_parentstruct', object) + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) #cityterminal.setAttachment('housing_parentstruct', object) diff --git a/scripts/object/tangible/terminal/terminal_city_vote.py b/scripts/object/tangible/terminal/terminal_city_vote.py index ccad8904..4e988a1e 100644 --- a/scripts/object/tangible/terminal/terminal_city_vote.py +++ b/scripts/object/tangible/terminal/terminal_city_vote.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'terminal/city_voting_terminal') return \ No newline at end of file diff --git a/scripts/radial/terminal/city_maintenance_terminal.py b/scripts/radial/terminal/city_maintenance_terminal.py index 4aa8f402..70562682 100644 --- a/scripts/radial/terminal/city_maintenance_terminal.py +++ b/scripts/radial/terminal/city_maintenance_terminal.py @@ -5,6 +5,8 @@ from services.sui.SUIService import MessageBoxType from services.sui.SUIWindow import Trigger from java.util import Vector from java.lang import System +from java.util import Map +from java.util import TreeMap import main.NGECore import sys @@ -35,7 +37,6 @@ def createRadial(core, owner, target, radials): radials.add(RadialOptions(2, 232, 0, 'Deduct 10 citizens')) if city.getMayorID() != owner.getObjectID(): - print 'here' return radials.add(RadialOptions(0, 216, 0, '@city/city:city_management')) @@ -57,6 +58,7 @@ def createRadial(core, owner, target, radials): radials.add(RadialOptions(3, 228, 0, '@city/city:align')) return + def handleSelection(core, owner, target, option): playerCity = core.playerCityService.getCityObjectIsIn(owner) @@ -115,6 +117,147 @@ def handleSelection(core, owner, target, option): if owner is not None: handleToggleZoning(core, owner, target, option) return + if option == 214: + if owner is not None: + handleStructureReport(core, owner, target, option) + return + if option == 215: + if owner is not None: + handleTreasuryReport(core, owner, target, option) + return + if option == 218: + if owner is not None: + handleManageMilitia(core, owner, target, option) + return + if option == 230: + if owner is not None: + handleRevokeCitizenship(core, owner, target, option) + return + +def handleRevokeCitizenship(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity or not playerCity.isCitizen(owner.getObjectID()) or playerCity.getMayorID() == owner.getObjectID(): + return + window = core.suiService.createMessageBox(2, 'revoke_cit_t', 'revoke_cit_d', owner, None, 0) + returnList = Vector() + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, revokeCitizenship) + core.suiService.openSUIWindow(suiWindow) + return + +def revokeCitizenship(owner, window, eventType, returnList): + core = main.NGECore.getInstance() + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity or not playerCity.isCitizen(owner.getObjectID()) or playerCity.getMayorID() == owner.getObjectID(): + return + playerCity.removeCitizen(owner.getObjectID()) + owner.getPlayerObject().setHome('') + owner.getPlayerObject().setCitizenship(0) + owner.setAttachment('residentCity', None) + owner.sendSystemMessage('You have successfully revoked your citizenship.', 0) + owner.sendSystemMessage('@city/city:revoke_citizenship_warning', 0) + return + +def handleManageMilitia(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + menuItems.put(0, '@city/city:militia_new_t') + for militiaId in playerCity.getMilitiaList(): + militia = core.objectService.getObject(militiaId) + if not militia: + militia = core.objectService.getCreatureFromDB(militiaId) + if militia: + menuItems.put(militiaId, militia.getCustomName()) + + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window = core.suiService.createListBox(1, '@city/city:militia_t', '@city/city:militia_d', menuItems, owner, None, 0) + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleMilitiaListBox) + core.suiService.openSUIWindow(suiWindow) + + return + +def handleMilitiaListBox(owner, window, eventType, returnList): + core = main.NGECore.getInstance() + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + index = returnList.get(0) + id = window.getObjectIdByIndex(index) + if id == 0: + handleAddMiltiaPrompt(core, owner) + else: + core.playerCityService.handleRemoveMilitia(owner, id) + return + +def handleAddMiltiaPrompt(core, owner): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + window = core.suiService.createInputBox(2, '@city/city:militia_new_t', '@city/city:militia_new_d', owner, None, 0) + returnList = Vector() + returnList.add('txtInput:LocalText') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleAddMiltia) + core.suiService.openSUIWindow(suiWindow) + return + +def handleAddMiltia(owner, window, eventType, returnList): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + name = returnList.get(0) + militiaId = core.characterService.getPlayerOID(name) + if militiaId == 0: + owner.sendSystemMessage('@city/city:cannot_find_citizen', 0) + return + if not playerCity.isCitizen(militiaId): + owner.sendSystemMessage('@city/city:not_citizen', 0) + return + if playerCity.isMilitiaMember(militiaId): + owner.sendSystemMessage('That player is already a member of the city militia.', 0) + return + militia = core.objectService.getObject(militiaId) + persist = False + if not militia: + militia = core.objectService.getCreatureFromDB(militiaId) + persist = True + if not militia: + owner.sendSystemMessage('@city/city:cannot_find_citizen', 0) + return + playerCity.addMilitia(militiaId) + if militia.getClient(): + militia.sendSystemMessage('@city/city:added_militia_target', 0) + owner.sendSystemMessage('@city/city:added_militia', 0) + militia.getPlayerObject().setCitizenship(2) + if persist: + core.objectService.persistObject(militiaId, militia, core.getSWGObjectODB()) + return + +def handleTreasuryReport(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + menuItems.put(1, '@city/city:treasury ' + int(playerCity.getCityTreasury())) + window = core.suiService.createListBox(1, '@city/city:treasury_balance_t', '@city/city:treasury_balance_d', menuItems, owner, None, 0) + core.suiService.openSUIWindow(suiWindow) + return + +def handleStructureReport(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + i = 0 + for structureId in playerCity.getPlacedStructures(): + structure = core.objectService.getObject(structureId) + if structure and structure.getAttachment('isCivicStructure') is not None and structure.getAttachment('isCivicStructure') == True: + i += 1 + menuItems.put(i, structure.getLookAtText() + ' - Condition : ' + int((structure.getMaximumCondition() - structure.getConditionDamage()) / structure.getMaximumCondition() * 100) + '%') + window = core.suiService.createListBox(1, '@city/city:structure_list_t', '@city/city:structure_list_d', menuItems, owner, None, 0) + core.suiService.openSUIWindow(suiWindow) + return def handleDeposit(core, owner, target, option): @@ -157,6 +300,7 @@ def handleDepositSUI(owner, window, eventType, returnList): playerCity.addToTreasury(deposit) owner.deductCashCredits(deposit) owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:deposit_treasury', deposit), 0) + playerCity.sendTreasuryDepositMail(owner, deposit) return def handleToggleZoning(core, owner, target, option): @@ -506,7 +650,7 @@ def handleRegisterMap(core, owner, target, option): if playerCity.isRegistered(): return - + playerCity.setRegistered(True) core.mapService.addLocation(owner.getPlanet(), playerCity.getCityName(), playerCity.getCityCenterPosition().x, playerCity.getCityCenterPosition().z, 17, 0, 0) return @@ -523,19 +667,11 @@ def handleUnregisterMap(core, owner, target, option): if not playerCity.isRegistered(): return - + playerCity.setRegistered(False) core.mapService.removeLocation(owner.getPlanet(), playerCity.getCityCenterPosition().x, playerCity.getCityCenterPosition().z, 17) return -def setRegisterMapCallBack(owner, window, eventType, returnList): - if returnList.size()==0: - return - playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setCityName(returnList.get(0)) - owner.sendSystemMessage('@city/city:name_changed', 0) - return - def handleSpecialization(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) diff --git a/scripts/radial/terminal/city_voting_terminal.py b/scripts/radial/terminal/city_voting_terminal.py new file mode 100644 index 00000000..faa1fa61 --- /dev/null +++ b/scripts/radial/terminal/city_voting_terminal.py @@ -0,0 +1,51 @@ +from resources.common import RadialOptions +from services.sui.SUIService import MessageBoxType +from services.sui.SUIWindow import Trigger +from java.util import Vector +import sys + +def createRadial(core, owner, target, radials): + radials.clear() + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return + radials.add(RadialOptions(0, 7, 0, 'Examine')) + radials.add(RadialOptions(0, 224, 0, '@city/city:mayoral_race')) + radials.add(RadialOptions(2, 225, 0, '@city/city:mayoral_standings')) + radials.add(RadialOptions(2, 226, 0, '@city/city:mayoral_vote')) + if city.isCandidate(owner.getObjectID()): + radials.add(RadialOptions(2, 227, 0, '@city/city:mayoral_unregister')) + else: + radials.add(RadialOptions(2, 227, 0, '@city/city:mayoral_register')) + + + return + +def handleSelection(core, owner, target, option): + + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return + if option == 224 or option == 225: + handleViewStandings(core, owner) + if option == 226: + handlePromptVote(core, owner) + if option == 227 and city.isCandidate(owner.getObjectID()): + handleUnregister(core, owner) + if option == 227 and not city.isCandidate(owner.getObjectID()): + handleRegister(core, owner) + + return + +def handleViewStandings(core, owner): + return + +def handlePromptVote(core, owner): + return + +def handleUnregister(core, owner): + return + +def handleRegister(core, owner): + return + \ No newline at end of file diff --git a/src/resources/objectives/BountyMissionObjective.java b/src/resources/objectives/BountyMissionObjective.java index a2d81812..bd5d7a87 100644 --- a/src/resources/objectives/BountyMissionObjective.java +++ b/src/resources/objectives/BountyMissionObjective.java @@ -298,20 +298,20 @@ public class BountyMissionObjective extends MissionObjective { return; } - WaypointObject missionWp = mission.getAttachedWaypoint(); + WaypointObject missionWp = mission.getWaypoint(); - if (missionWp == null) { - WaypointObject waypoint = (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/shared_waypoint.iff", target.getPlanet(), - target.getWorldPosition().x, target.getWorldPosition().z, target.getWorldPosition().y); + if (missionWp.getPlanetCRC() != CRC.StringtoCRC(target.getPlanet().name)) { + WaypointObject waypoint = (WaypointObject) getMissionObject().getWaypoint(); waypoint.setActive(true); waypoint.setColor(WaypointObject.ORANGE); - waypoint.setName(getMissionObject().getMissionTargetName()); + waypoint.setName(getMissionObject().getTargetName()); waypoint.setPlanetCRC(CRC.StringtoCRC(target.getPlanet().getName())); waypoint.setStringAttribute("", ""); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } else { missionWp.setPosition(target.getWorldPosition()); - mission.setAttachedWaypoint(missionWp); + mission.setWaypoint(missionWp); + getMissionObject().setWaypoint(missionWp); } actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); actor.sendSystemMessage("@mission/mission_generic:target_continue_tracking", DisplayType.Broadcast); @@ -327,7 +327,7 @@ public class BountyMissionObjective extends MissionObjective { public void beginArakydUpdate(final CreatureObject actor) { arakydActive = true; Executors.newScheduledThreadPool(1).schedule(() -> { - + int number = new Random().nextInt(100); // Effectively a 16% chance of failing. The failure type is calculated by subtracting 10 from the number received. @@ -340,14 +340,15 @@ public class BountyMissionObjective extends MissionObjective { target.getWorldPosition().x, target.getWorldPosition().z, target.getWorldPosition().y); waypoint.setActive(true); waypoint.setColor(WaypointObject.ORANGE); - waypoint.setName(getMissionObject().getMissionTargetName()); + waypoint.setName(getMissionObject().getTargetName()); waypoint.setPlanetCRC(CRC.StringtoCRC(target.getPlanet().getName())); waypoint.setStringAttribute("", ""); - getMissionObject().setAttachedWaypoint(waypoint); + + actor.getClient().getSession().write(getMissionObject().getBaseline3().set("waypoint", waypoint)); actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); actor.sendSystemMessage("@mission/mission_generic:target_located_" + target.getPlanet().getName(), DisplayType.Broadcast); - + }, 180, TimeUnit.SECONDS); } diff --git a/src/resources/objectives/DeliveryMissionObjective.java b/src/resources/objectives/DeliveryMissionObjective.java index 96f9b583..b2ae62a6 100644 --- a/src/resources/objectives/DeliveryMissionObjective.java +++ b/src/resources/objectives/DeliveryMissionObjective.java @@ -21,6 +21,7 @@ ******************************************************************************/ package resources.objectives; +import engine.resources.common.CRC; import engine.resources.scene.Point3D; import main.NGECore; import resources.common.OutOfBand; @@ -51,8 +52,8 @@ public class DeliveryMissionObjective extends MissionObjective { String template = "object/mobile/shared_dressed_commoner_tatooine_sullustan_male_06.iff"; - Point3D startLoc = parent.getStartLocation(); - Point3D destination = parent.getDestination(); + Point3D startLoc = parent.getStartLocation().getLocation(); + Point3D destination = parent.getDestinationLocation().getLocation(); // TODO: Randomize this process. CreatureObject missionGiver = (CreatureObject) core.staticService.spawnObject(template, parent.getPlanet().name, 0, startLoc.x, startLoc.y, startLoc.z, 0, 1); @@ -78,19 +79,22 @@ public class DeliveryMissionObjective extends MissionObjective { setDropOffNpc(dropOffNpc); if (getObjectivePhase() == 0) { - WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); + WaypointObject waypoint = getMissionObject().getWaypoint(); + //waypoint.setPlanet(missionGiver.getPlanet()); + waypoint.setPlanetCRC(CRC.StringtoCRC(missionGiver.getPlanet().name)); waypoint.setPosition(startLoc); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } else if (getObjectivePhase() == 1) { - WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - waypoint.setPosition(parent.getDestination()); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + WaypointObject waypoint = getMissionObject().getWaypoint(); + waypoint.setPlanetCRC(CRC.StringtoCRC(dropOffNpc.getPlanet().name)); + waypoint.setPosition(destination); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } setActive(true); @@ -130,22 +134,21 @@ public class DeliveryMissionObjective extends MissionObjective { switch(getObjectivePhase()) { case 1: WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - waypoint.setPosition(parent.getDestination()); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + waypoint.setPosition(parent.getDestinationLocation().getLocation()); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setMissionTargetName("Dropoff Location"); - getMissionObject().setAttachedWaypoint(waypoint); - System.out.println("Waypoint set to " + parent.getDestination().x + " and " + parent.getDestination().z); + getMissionObject().setTargetName("Dropoff Location"); + getMissionObject().setWaypoint(waypoint); break; case 2: WaypointObject returnWp = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - returnWp.setPosition(parent.getStartLocation()); - returnWp.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + returnWp.setPosition(parent.getStartLocation().getLocation()); + returnWp.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); returnWp.setColor(WaypointObject.ORANGE); returnWp.setActive(true); - getMissionObject().setMissionTargetName("Return"); - getMissionObject().setAttachedWaypoint(returnWp); + getMissionObject().setTargetName("Return"); + getMissionObject().setWaypoint(returnWp); break; } } @@ -160,7 +163,7 @@ public class DeliveryMissionObjective extends MissionObjective { if (inventory == null) return false; - TangibleObject deliveryObject = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_datadisk.iff", getMissionObject().getGrandparent().getPlanet()); + TangibleObject deliveryObject = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_datadisk.iff", player.getPlanet()); if (deliveryObject != null && inventory.add(deliveryObject)) { setDeliveryObject(deliveryObject); diff --git a/src/resources/objectives/SurveyMissionObjective.java b/src/resources/objectives/SurveyMissionObjective.java index 025b15bf..67c0c3fe 100644 --- a/src/resources/objectives/SurveyMissionObjective.java +++ b/src/resources/objectives/SurveyMissionObjective.java @@ -47,7 +47,7 @@ public class SurveyMissionObjective extends MissionObjective{ public void activate(NGECore core, CreatureObject player) { pickupPlanet = player.getPlanet().getName(); pickupLocation = player.getPosition(); - resourceFamily = getMissionObject().getMissionTargetName(); + resourceFamily = getMissionObject().getTargetName(); // This way will allow 2 survey missions at a time. AtomicInteger number = new AtomicInteger(); diff --git a/src/resources/objects/mission/MissionMessageBuilder.java b/src/resources/objects/mission/MissionMessageBuilder.java index 22431c85..4166aeca 100644 --- a/src/resources/objects/mission/MissionMessageBuilder.java +++ b/src/resources/objects/mission/MissionMessageBuilder.java @@ -21,16 +21,9 @@ ******************************************************************************/ package resources.objects.mission; -import java.nio.ByteOrder; import java.util.Map; - -import org.apache.mina.core.buffer.IoBuffer; - -import engine.resources.common.CRC; import engine.resources.objects.Builder; -import engine.resources.scene.Point3D; import resources.objects.intangible.IntangibleMessageBuilder; -import resources.objects.waypoint.WaypointObject; public class MissionMessageBuilder extends IntangibleMessageBuilder { @@ -42,363 +35,6 @@ public class MissionMessageBuilder extends IntangibleMessageBuilder { super(); } - public IoBuffer buildBaseline3() { - MissionObject mission = (MissionObject) object; - IoBuffer buffer = IoBuffer.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN); - buffer.setAutoExpand(true); - - buffer.putShort((short) 16); - - buffer.putFloat(object.getComplexity()); // mission complexity ?? - - buffer.put(getAsciiString(object.getStfFilename())); - buffer.putInt(0); - buffer.put(getAsciiString(object.getStfName())); - - if (mission.getCustomName() == null) { buffer.putInt(0); } - else { buffer.put(getUnicodeString(mission.getCustomName())); } - - buffer.putInt(object.getVolume()); // volume - - buffer.putInt(0); // unused - - buffer.putInt(mission.getMissionLevel()); - - if (mission.getStartLocation() != null) { - buffer.putFloat(mission.getStartLocation().x); - buffer.putFloat(0); - buffer.putFloat(mission.getStartLocation().z); - } else { - buffer.putFloat(0); - buffer.putFloat(0); - buffer.putFloat(0); - } - buffer.putLong(0); // Start Object ID - if (mission.getMissionStartPlanet() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionStartPlanet())); - - if (mission.getCreator() != null) - buffer.put(getUnicodeString(mission.getCreator())); - else - buffer.putInt(0); - - buffer.putInt(mission.getCreditReward()); - - if (mission.getDestination() != null) { - buffer.putFloat(mission.getDestination().x); - buffer.putFloat(0); - buffer.putFloat(mission.getDestination().z); - } else { - buffer.putFloat(0); - buffer.putFloat(0); - buffer.putFloat(0); - } - buffer.putLong(0); // Destination Object ID - if (mission.getMissionDestinationPlanet() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionDestinationPlanet())); - - buffer.putInt(mission.getMissionTemplateObject()); - - buffer.put(getAsciiString(mission.getMissionStf())); - buffer.putInt(0); - buffer.put(getAsciiString(mission.getMissionDescription())); - - buffer.put(getAsciiString(mission.getMissionStf())); - buffer.putInt(0); - buffer.put(getAsciiString(mission.getMissionTitle())); - - buffer.putInt(0); // refresh counter - - if(mission.getMissionType() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionType())); - - buffer.put(getAsciiString(mission.getMissionTargetName())); - - WaypointObject wp = mission.getAttachedWaypoint(); - - if (wp == null) { - buffer.putInt(0); // cell - buffer.putFloat(0); // x - buffer.putFloat(0); // z - buffer.putFloat(0); // y - buffer.putLong(0); // target id - buffer.putInt(0); // planet crc - buffer.putInt(0); // name - buffer.putLong(0); // waypoint id - buffer.put((byte) 0); // color - buffer.put((byte) 0x01); //active - } else { - buffer.putInt(wp.getCellId()); - buffer.putFloat(wp.getPosition().x); - buffer.putFloat(wp.getPosition().y); - buffer.putFloat(wp.getPosition().z); - buffer.putLong(0); - buffer.putInt(CRC.StringtoCRC(wp.getPlanet().name)); - buffer.put(getUnicodeString(wp.getName())); - buffer.putLong(wp.getObjectId()); - buffer.put(wp.getColor()); - buffer.put((byte) (wp.isActive() ? 1 : 0)); - } - - int size = buffer.position(); - buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size); - - buffer.flip(); - buffer = createBaseline("MISO", (byte) 3, buffer, size); - - //Console.println("MISO3 Bytes: " + StringUtilities.bytesToHex(buffer.array())); - return buffer; - } - - public IoBuffer buildBaseline6() { - - IoBuffer buffer = IoBuffer.allocate(18, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 3); - buffer.putInt(76); // server id - buffer.putLong(0); // detail stf - buffer.putInt(0xFFFFFFFF); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 6, buffer, size); - - return buffer; - } - - public IoBuffer buildBaseline8() { - IoBuffer buffer = IoBuffer.allocate(2, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 0); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 8, buffer, size); - - return buffer; - } - - public IoBuffer buildBaseline9() { - IoBuffer buffer = IoBuffer.allocate(2, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 0); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 9, buffer, size); - - return buffer; - } - - public IoBuffer buildStfDelta(String stfFile, String stfName) { - - IoBuffer buffer = IoBuffer.allocate(4 + stfFile.length() + stfName.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(stfName)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x01, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildDifficultyLevelDelta(int difficulty) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(difficulty); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x05, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildStartLocationDelta(Point3D startLocation, String planet) { - - IoBuffer buffer = IoBuffer.allocate(24, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putFloat(startLocation.x); - buffer.putFloat(0); - buffer.putFloat(startLocation.z); - - buffer.putLong(0); - - if (planet == null) { - buffer.putInt(CRC.StringtoCRC(object.getPlanet().name)); - } else { - buffer.putInt(CRC.StringtoCRC(planet)); - } - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x06, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildCreatorNameDelta(String creator) { - - IoBuffer buffer = IoBuffer.allocate(4 + (creator.length() * 2), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getUnicodeString(creator)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x07, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildCreditsRewardDelta(int creds) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(creds); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x08, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildDestinationDelta(Point3D destination, String planet) { - - IoBuffer buffer = IoBuffer.allocate(24, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putFloat(destination.x); - buffer.putFloat(0); - buffer.putFloat(destination.z); - - buffer.putLong(0); // Destination Object ID - - if (planet == null) { - buffer.putInt(CRC.StringtoCRC(object.getPlanet().name)); - } else { - buffer.putInt(CRC.StringtoCRC(planet)); - } - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x09, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildTargetObjectIffDelta(int template) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(template); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0A, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionDescriptionDelta(String stfFile, String descId) { - - IoBuffer buffer = IoBuffer.allocate(13 + stfFile.length() + descId.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(descId)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0B, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionTitleDelta(String stfFile, String titleId) { - - IoBuffer buffer = IoBuffer.allocate(12 + stfFile.length() + titleId.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(titleId)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0C, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildRepeatCounterDelta(int counter) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(counter); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0D, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionTypeDelta(String type) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(CRC.StringtoCRC(type)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0E, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildTargetNameDelta(String targetName) { - - IoBuffer buffer = IoBuffer.allocate(4 + targetName.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(targetName)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0F, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildWaypointDelta(WaypointObject wp) { - - IoBuffer buffer = IoBuffer.allocate(44 + (2 * wp.getName().length()), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(wp.getCellId()); - buffer.putFloat(wp.getPosition().x); - buffer.putFloat(wp.getPosition().y); - buffer.putFloat(wp.getPosition().z); - buffer.putLong(0); - buffer.putInt(CRC.StringtoCRC(wp.getPlanet().name)); - buffer.put(getUnicodeString(wp.getName())); - buffer.putLong(wp.getObjectId()); - buffer.put(wp.getColor()); - buffer.put((byte) (wp.isActive() ? 1 : 0)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x10, buffer, size + 4); - - return buffer; - } - @Override public void buildBaseline3(Map baselineBuilders, Map deltaBuilders) { super.buildBaseline3(baselineBuilders, deltaBuilders); diff --git a/src/resources/objects/mission/MissionObject.java b/src/resources/objects/mission/MissionObject.java index e6640a05..f4990bbc 100644 --- a/src/resources/objects/mission/MissionObject.java +++ b/src/resources/objects/mission/MissionObject.java @@ -22,45 +22,38 @@ package resources.objects.mission; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import com.sleepycat.persist.model.NotPersistent; -import com.sleepycat.persist.model.Persistent; +import org.apache.mina.core.buffer.IoBuffer; -import resources.objects.ObjectMessageBuilder; +import main.NGECore; import resources.objects.intangible.IntangibleObject; import resources.objects.waypoint.WaypointObject; +import services.mission.MissionLocation; import services.mission.MissionObjective; import engine.clients.Client; +import engine.resources.common.CRC; +import engine.resources.common.Stf; +import engine.resources.common.StringUtilities; +import engine.resources.common.UString; +import engine.resources.objects.Baseline; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; -@Persistent(version=1) public class MissionObject extends IntangibleObject implements Serializable { private static final long serialVersionUID = 1L; - private Point3D destination; - private Point3D startLocation; - private String startPlanet = ""; - private int difficultyLevel = 0; // Difficulty level displayed in details - private String destinationPlanet = ""; - private int repeatCount = 0; // increases for each player using the mission; used for redisplaying on mission term too - private int reward = 0; - private String creator = ""; - private String description = ""; - private String title = ""; - private String missionTargetName = ""; // Target object I guess? - private int missionId = 0; - private String missionStf = ""; - private String type = ""; - private int missionTemplateObject = 0; - private WaypointObject attachedWaypoint; - + // Server variables private MissionObjective objective; private long bountyObjId; + private String missionType = ""; + private int missionId; + private int repeatCount; - @NotPersistent private transient MissionMessageBuilder messageBuilder = new MissionMessageBuilder(this); public MissionObject() { @@ -71,221 +64,191 @@ public class MissionObject extends IntangibleObject implements Serializable { super(objectID, planet, new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), template); } - public String getMissionDestinationPlanet() { - synchronized(objectMutex) { - return destinationPlanet; - } + public Baseline getBaseline3() { + Baseline baseline = super.getBaseline3(); + baseline.put("difficultyLevel", 0); + baseline.put("startLocation", new MissionLocation(new Point3D(0,0,0), 0, "tatooine")); + baseline.put("creator", new UString("")); + baseline.put("creditReward", 0); + baseline.put("destinationLocation", new MissionLocation(new Point3D(0,0,0), 0, "tatooine")); + baseline.put("templateObject", 0); + baseline.put("description", new Stf("", 0, "")); + baseline.put("title", new Stf("", 0, "")); + baseline.put("repeatCounter", 0); + baseline.put("missionType", 0); + baseline.put("targetName", ""); + + WaypointObject wp = (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/base/shared_base_waypoint.iff", getPlanet()); + wp.setActive(true); + baseline.put("waypoint", wp); + return baseline; + } + + public Baseline getBaseline6() { + Baseline baseline = super.getBaseline6(); + baseline.put("unk", -1); + return baseline; + } + + public Baseline getBaseline8() { + Baseline baseline = super.getBaseline8(); + return baseline; + } + + public Baseline getBaseline9() { + Baseline baseline = super.getBaseline9(); + return baseline; } @Override public void initAfterDBLoad() { super.init(); messageBuilder = new MissionMessageBuilder(this); - if(attachedWaypoint != null) - attachedWaypoint.initAfterDBLoad(); } - - public int getMissionLevel() { - synchronized(objectMutex) { - return difficultyLevel; + + public int getDifficultyLevel() { + return (int) getBaseline3().get("difficultyLevel"); + } + + public void setDifficultyLevel(int level) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline(3).set("difficultyLevel", level)); } } - - public void setMissionLevel(int missionLevel) { - synchronized(objectMutex) { - this.difficultyLevel = missionLevel; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildDifficultyLevelDelta(missionLevel)); + + public MissionLocation getStartLocation() { + return (MissionLocation) getBaseline3().get("startLocation"); + } + + public void setStartLocation(Point3D location, long objId, String planet) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + MissionLocation startLocation = new MissionLocation(location.clone(), objId, planet); + getGrandparent().getClient().getSession().write(getBaseline(3).set("startLocation", startLocation)); } } - - public String getMissionStartPlanet() { - synchronized(objectMutex) { - return startPlanet; - } - } - - public int getMissionRepeatCounter() { - synchronized(objectMutex) { - return repeatCount; - } - } - - public void setRepeatCount(int missionRepeatCounter) { - synchronized(objectMutex) { - this.repeatCount = missionRepeatCounter; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildRepeatCounterDelta(missionRepeatCounter)); - } - } - - public int getCreditReward() { - synchronized(objectMutex) { - return reward; - } - } - - public void setCreditReward(int missionCredits) { - synchronized(objectMutex) { - this.reward = missionCredits; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildCreditsRewardDelta(missionCredits)); - } - } - + public String getCreator() { - synchronized(objectMutex) { - return creator; + return ((UString)getBaseline3().get("creator")).get(); + } + + public void setCreator(String creator) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("creator", new UString(creator))); } } - - public void setCreator(String missionCreator) { - synchronized(objectMutex) { - this.creator = missionCreator; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildCreatorNameDelta(missionCreator)); + + public int getCreditReward() { + return (int) getBaseline3().get("creditReward"); + } + + public void setCreditReward(int credits) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("creditReward", credits)); } } - - public String getMissionDescription() { - synchronized(objectMutex) { - return description; + + public MissionLocation getDestinationLocation() { + return (MissionLocation) getBaseline3().get("destinationLocation"); + } + + public void setDestinationLocation(Point3D location, long objId, String planet) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + MissionLocation destinationLocation = new MissionLocation(location.clone(), objId, planet); + getGrandparent().getClient().getSession().write(getBaseline3().set("destinationLocation", destinationLocation)); } } - - public void setMissionDescription(String missionDescription) { - synchronized(objectMutex) { - this.description = missionDescription; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionStf, missionDescription)); + + public int getTemplateObject() { + return (int) getBaseline3().get("templateObject"); + } + + public void setTemplateObject(int objCRC) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("templateObject", objCRC)); } } - - public String getMissionTitle() { - synchronized(objectMutex) { - return title; + + public Stf getDescription() { + return (Stf) getBaseline3().get("description"); + } + + public void setDescription(String description) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("description", new Stf(description))); } } - - public void setMissionTitle(String missionTitle) { - synchronized(objectMutex) { - this.title = missionTitle; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionStf, missionTitle)); + + public Stf getTitle() { + return (Stf) getBaseline3().get("title"); + } + + public void setTitle(String title) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("title", new Stf(title))); } } - - public String getMissionTargetName() { - synchronized(objectMutex) { - return missionTargetName; + + public int getRepeatCounter() { + return (int) getBaseline3().get("repeatCounter"); + } + + public void setRepeatCounter(int count) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + this.repeatCount = count; + getGrandparent().getClient().getSession().write(getBaseline3().set("repeatCounter", count)); } } - - public void setMissionTargetName(String missionTargetName) { - synchronized(objectMutex) { - this.missionTargetName = missionTargetName; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildTargetNameDelta(missionTargetName)); + + public void incrementRepeatCounter() { + setRepeatCounter(this.repeatCount + 1); // temporary fix for getBaseline(3).get("repeatCounter") always being 0. + } + + public void decrementRepeatCounter() { + int repeatCounter = getRepeatCounter() + 1; + setRepeatCounter((repeatCounter < 0) ? 0 : repeatCounter); + } + + public int getMissionTypeCRC() { + return (int) getBaseline3().get("missionType"); + } + + public void setMissionType(String type) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("missionType", CRC.StringtoCRC(type))); + this.missionType = type; } } - - public WaypointObject getAttachedWaypoint() { - synchronized(objectMutex) { - return attachedWaypoint; - } - } - - public void setAttachedWaypoint(WaypointObject waypoint) { - synchronized(objectMutex) { - this.attachedWaypoint = waypoint; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildWaypointDelta(waypoint)); - } - } - - public int getMissionTemplateObject() { - synchronized(objectMutex) { - return missionTemplateObject; - } - } - - public void setMissionTemplateObject(int missionTemplateObject) { - synchronized(objectMutex) { - this.missionTemplateObject = missionTemplateObject; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildTargetObjectIffDelta(missionTemplateObject)); - } - } - + public String getMissionType() { - synchronized(objectMutex) { - return type; - } + return missionType; } - - public void setMissionType(String missionType) { - synchronized(objectMutex) { - this.type = missionType; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTypeDelta(missionType)); - } + + public String getTargetName() { + return (String) getBaseline3().get("targetName"); } - - public MissionObjective getObjective() { - synchronized(objectMutex) { - return objective; - } - } - - public void setObjective(MissionObjective objective) { - synchronized(objectMutex) { - this.objective = objective; - } - } - - public Point3D getStartLocation() { - synchronized(objectMutex) { - return startLocation; + + public void setTargetName(String targetName) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("targetName", targetName)); } } - public Point3D getDestination() { - synchronized(objectMutex) { - return destination; - } + public WaypointObject getWaypoint() { + return (WaypointObject) getBaseline3().get("waypoint"); } - - public void setStartLocation(Point3D startLocation, String planet) { - synchronized(objectMutex) { - this.startLocation = startLocation; - this.startPlanet = planet; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildStartLocationDelta(startLocation, planet)); + + public void setWaypoint(WaypointObject waypoint) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("waypoint", waypoint)); } } - public void setDestination(Point3D destination, String planet) { - synchronized(objectMutex) { - this.destination = destination; - this.destinationPlanet = planet; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildDestinationDelta(destination, planet)); - } + public long getBountyMarkId() { + return bountyObjId; + } + + public void setBountyMarkId(long bountyObjId) { + this.bountyObjId = bountyObjId; } public int getMissionId() { @@ -296,38 +259,49 @@ public class MissionObject extends IntangibleObject implements Serializable { this.missionId = missionId; } - public long getBountyMarkId() { - return bountyObjId; + public MissionObjective getObjective() { + return objective; } - public void setBountyMarkId(long bountyObjId) { - this.bountyObjId = bountyObjId; - } - - public String getMissionStf() { - return missionStf; - } - - public void setMissionStf(String missionStf) { - this.missionStf = missionStf; + public void setObjective(MissionObjective objective) { + this.objective = objective; } @Override public void sendBaselines(Client destination) { - - if(destination == null || destination.getSession() == null) { - System.out.println("NULL session"); - return; + if (destination != null && destination.getSession() != null) { + destination.getSession().write(getBaseline(3).getBaseline()); + destination.getSession().write(getBaseline(6).getBaseline()); + destination.getSession().write(getBaseline(8).getBaseline()); + destination.getSession().write(getBaseline(9).getBaseline()); } - - destination.getSession().write(messageBuilder.buildBaseline3()); - destination.getSession().write(messageBuilder.buildBaseline6()); - destination.getSession().write(messageBuilder.buildBaseline8()); - destination.getSession().write(messageBuilder.buildBaseline9()); } - public ObjectMessageBuilder getMessageBuilder() { - return messageBuilder; + @Override + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { + switch (viewType) { + case 1: + case 4: + case 3: + case 6: + case 7: + case 8: + case 9: + if (getGrandparent().getClient() != null) { + buffer = getBaseline(viewType).createDelta(updateType, buffer.array()); + getGrandparent().getClient().getSession().write(buffer); + } + default: + return; + } + } + + public MissionMessageBuilder getMessageBuilder() { + synchronized(objectMutex) { + if (messageBuilder == null) + messageBuilder = new MissionMessageBuilder(this); + + return messageBuilder; + } } - } diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java index 563ae32f..189a310e 100644 --- a/src/resources/objects/waypoint/WaypointObject.java +++ b/src/resources/objects/waypoint/WaypointObject.java @@ -43,7 +43,7 @@ public class WaypointObject extends IntangibleObject implements Serializable, ID private int cellId; // ??? private long locationNetworkId; private int planetCRC; - private String name; + private String name = ""; private byte color; private boolean isActive; private transient static SimpleBufferAllocator bufferPool = new SimpleBufferAllocator(); diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java index 0ac88608..f1c775f6 100644 --- a/src/services/gcw/GCWService.java +++ b/src/services/gcw/GCWService.java @@ -562,9 +562,9 @@ public class GCWService implements INetworkDispatch { player.setRankProgress((float) Math.floor(newprogress)); if (newrank > oldrank) { - core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankUp", core, actor, newrank); + core.scriptService.callScript("scripts/collections/", "gcwrank_" + actor.getFaction(), "handleRankUp", core, actor, newrank); } else { - core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankDown", actor, newrank); + core.scriptService.callScript("scripts/collections/", "gcwrank_" + actor.getFaction(), "handleRankDown", actor, newrank); } } diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index cb7305ad..4dd3e58b 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -396,6 +396,7 @@ public class HousingService implements INetworkDispatch { if(building.getResidency()) owner.setAttachment("residentBuilding", null); + if(city != null) { city.removeStructure(building.getObjectID()); if(building.getResidency()) { diff --git a/src/services/mission/MissionLocation.java b/src/services/mission/MissionLocation.java new file mode 100644 index 00000000..85141267 --- /dev/null +++ b/src/services/mission/MissionLocation.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * 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 services.mission; + +import org.apache.mina.core.buffer.IoBuffer; + +import engine.resources.common.CRC; +import engine.resources.objects.Delta; +import engine.resources.scene.Point3D; + +public class MissionLocation extends Delta { + + private static final long serialVersionUID = 1L; + + private Point3D location; + private long objId; + private String planet; + + public MissionLocation() { } + + public MissionLocation(Point3D location, long objId, String planet) { + this.location = location; + this.objId = objId; + this.planet = planet; + } + + public Point3D getLocation() { + return location; + } + + public void setLocation(Point3D location) { + this.location = location; + } + + public long getObjectId() { + return objId; + } + + public void setObjectId(long objId) { + this.objId = objId; + } + + public String getPlanet() { + return planet; + } + + public void setPlanet(String planet) { + this.planet = planet; + } + + public int getPlanetCRC() { + if (planet != null) + return CRC.StringtoCRC(planet); + else + return 0; + } + + @Override + public byte[] getBytes() { + IoBuffer buffer = createBuffer(24); + + buffer.putFloat(location.x); + buffer.putFloat(location.y); + buffer.putFloat(location.z); + buffer.putLong(objId); + buffer.putInt(getPlanetCRC()); + return buffer.flip().array(); + } +} diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index 809bcca8..2d97a7ae 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -312,7 +312,7 @@ public class MissionService implements INetworkDispatch { else return; - mission.setRepeatCount(requestCounter); + mission.incrementRepeatCounter(); typeOneCount.incrementAndGet(); } else if (typeTwoCount.get() < 5) { @@ -329,7 +329,7 @@ public class MissionService implements INetworkDispatch { else return; - mission.setRepeatCount(requestCounter); + mission.incrementRepeatCounter(); typeTwoCount.incrementAndGet(); } } @@ -480,21 +480,21 @@ public class MissionService implements INetworkDispatch { mission.setMissionType("survey"); String missionStf = "mission/mission_npc_survey_neutral_easy"; - mission.setMissionStf(missionStf); + mission.setMissionId(getRandomStringEntry(missionStf)); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); - mission.setMissionTitle("m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setCreator(nameGenerator.compose(2) + " " + nameGenerator.compose(3)); - mission.setMissionLevel(randLevel); + mission.setDifficultyLevel(randLevel); - mission.setStartLocation(player.getPosition(), player.getPlanet().name); + mission.setStartLocation(player.getPosition(), 0, player.getPlanet().name); mission.setCreditReward(400 + (randLevel - minLevel) * 20 + ran.nextInt(100)); - mission.setMissionTemplateObject(CRC.StringtoCRC(ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[family.getContainerType()])); // This should be the resource container obj - mission.setMissionTargetName(family.getResourceType() + family.getResourceClass()); + mission.setTemplateObject(CRC.StringtoCRC(ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[family.getContainerType()])); // This should be the resource container obj + mission.setTargetName(family.getResourceType() + family.getResourceClass()); } @@ -504,26 +504,27 @@ public class MissionService implements INetworkDispatch { String[] difficulties = { "easy", "medium", "hard" }; String missionStf = "mission/mission_deliver_neutral_" + difficulties[ran.nextInt(difficulties.length)]; - mission.setMissionStf(missionStf); + mission.setMissionId(getRandomStringEntry(missionStf)); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); - mission.setMissionTitle("m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setCreator(nameGenerator.compose(2) + " " + nameGenerator.compose(3)); - mission.setMissionLevel(5); + mission.setDifficultyLevel(5); // TODO: Use pre-defined commoner locations Point3D startLocation = SpawnPoint.getRandomPosition(player.getPosition(), (float) 50, (float) 300, player.getPlanetId()); Point3D destination = SpawnPoint.getRandomPosition(startLocation, (float) 50, (float) 500, player.getPlanetId()); - mission.setStartLocation(startLocation, player.getPlanet().name); - mission.setDestination(destination, player.getPlanet().name); + mission.setStartLocation(startLocation, 0, player.getPlanet().name); + mission.setDestinationLocation(destination, 0, player.getPlanet().name); mission.setCreditReward((int) (200 + ((startLocation.getDistance2D(destination) / 10)))); - mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); - mission.setMissionTargetName("Datadisk"); + mission.setTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); + mission.setTargetName("Datadisk"); + } private void randomBountyMission(SWGObject player, MissionObject mission) { @@ -552,19 +553,18 @@ public class MissionService implements INetworkDispatch { String missionStf = "mission/mission_bounty_jedi"; - mission.setMissionStf(missionStf); if (!bountyTarget.getProfession().equals("")) { // TODO: Smuggler mission checks. if (bountyTarget.getFaction().equals("rebel")) { - mission.setMissionTargetName("Rebel Bounty"); + mission.setTargetName("Rebel Bounty"); mission.setMissionId(2); mission.setCreator("The Galactic Empire"); } else if (bountyTarget.getFaction().equals("imperial")) { - mission.setMissionTargetName("Imperial Bounty"); + mission.setTargetName("Imperial Bounty"); mission.setMissionId(1); mission.setCreator("The Alliance"); } - mission.setMissionTitle("m" + mission.getMissionId() + "t"); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); } else { // TODO: Dead code, but place-holder for implementation of smuggler missions. if (bountyTarget.getFaction().equals("neutral")) { @@ -576,17 +576,18 @@ public class MissionService implements INetworkDispatch { else if (bountyTarget.getFaction().equals("imperial")) { mission.setMissionId(1); } - mission.setMissionTitle("m" + mission.getMissionId() + "ts"); - mission.setMissionDescription("m" + mission.getMissionId() + "ds"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "ts"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "ds"); } - mission.setMissionLevel(95 + bountyTarget.getFailedAttempts()); + mission.setDifficultyLevel(95 + bountyTarget.getFailedAttempts()); mission.setCreditReward(bountyTarget.getCreditReward()); - mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_bounty_jedi_target.iff")); + mission.setTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_bounty_jedi_target.iff")); mission.setBountyMarkId(bountyTarget.getObjectID()); + } public enum TerminalType {; diff --git a/src/services/playercities/PlayerCity.java b/src/services/playercities/PlayerCity.java index 357514e1..a8a990c2 100644 --- a/src/services/playercities/PlayerCity.java +++ b/src/services/playercities/PlayerCity.java @@ -628,6 +628,7 @@ public class PlayerCity implements Serializable { public void removeCitizen(long citizen, boolean sendMail) { citizens.remove(citizen); + removeMilitia(citizen); NGECore core = NGECore.getInstance(); CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); if(citizenObject == null) @@ -636,6 +637,14 @@ public class PlayerCity implements Serializable { sendCitizenLeftMailAll(citizenObject); } } + + public void addMilitia(long militiaId) { + militiaList.add(militiaId); + } + + public void removeMilitia(long militiaId) { + militiaList.remove(militiaId); + } public long getNextElectionDate() { return nextElectionDate; @@ -807,13 +816,6 @@ public class PlayerCity implements Serializable { return false; } - public boolean hasCitizen(long actor){ - if (getCitizens().contains(actor)) - return true; - - return false; - } - public static String[] getSpecialisationSTFNames() { return specialisationSTFNames; } @@ -903,9 +905,7 @@ public class PlayerCity implements Serializable { actorMail.setSubject("@city/city:new_city_citizen_other_subject"); actorMail.setSenderName("City " + this.cityName); actorMail.addProseAttachment(new ProsePackage("@city/city:new_city_citizen_other_body", "TT", mayor.getCustomName(), "TU", cityName)); - - - + core.chatService.storePersistentMessage(actorMail); if (citizen.getClient()!=null) core.chatService.sendPersistentMessageHeader(citizen.getClient(), actorMail); @@ -1235,6 +1235,33 @@ public class PlayerCity implements Serializable { } } + + public void sendTreasuryDepositMail(CreatureObject actor, int amount) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:treasury_deposit_subject"); + mail.setSenderName("@city/city:treasury_deposit_from"); + mail.addProseAttachment(new ProsePackage("@city/city:treasury_deposit_body", "TO", actor.getCustomName(), amount)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + } + + public boolean isCitizen(long citizenId) { + return getCitizens().contains(citizenId); + } + + public boolean isCandidate(long candidateId) { + return electionList.containsKey(candidateId); + } } diff --git a/src/services/playercities/PlayerCityService.java b/src/services/playercities/PlayerCityService.java index cc99e1da..a9a981cc 100644 --- a/src/services/playercities/PlayerCityService.java +++ b/src/services/playercities/PlayerCityService.java @@ -39,6 +39,7 @@ import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; import services.chat.Mail; import services.sui.SUIService.InputBoxType; +import services.sui.SUIService.MessageBoxType; import services.sui.SUIWindow; import services.sui.SUIWindow.SUICallback; import services.sui.SUIWindow.Trigger; @@ -459,7 +460,7 @@ public class PlayerCityService implements INetworkDispatch { window.setProperty("btnOk:Text", "@ok"); window.setProperty("btnCancel:Text", "@cancel"); - VectorreturnList = new Vector(); + Vector returnList = new Vector(); returnList.add("transaction.txtInputFrom:Text"); returnList.add("transaction.txtInputTo:Text"); window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, (actor, eventType, inputList) -> { @@ -499,4 +500,23 @@ public class PlayerCityService implements INetworkDispatch { core.suiService.openSUIWindow(window); } + + public void handleRemoveMilitia(CreatureObject mayor, long militiaId) { + PlayerCity playerCity = core.playerCityService.getPlayerCity(mayor); + CreatureObject militia = core.objectService.getObject(militiaId) == null ? core.objectService.getCreatureFromDB(militiaId) : (CreatureObject) core.objectService.getObject(militiaId); + if(militia == null) + return; + + SUIWindow window = core.suiService.createMessageBox(MessageBoxType.MESSAGE_BOX_OK_CANCEL, "@city/city:remove_militia_confirm", "@city/city:remove_militia_prefix " + militia.getCustomName() + " @city/city:remove_militia_suffix", mayor, null, 0); + window.addHandler(0, "", Trigger.TRIGGER_OK, new Vector(), (actor, eventType, returnList) -> { + playerCity.removeMilitia(militiaId); + if(militia.getClient() != null) + militia.sendSystemMessage("@city/city:removed_militia_target", (byte) 0); + mayor.sendSystemMessage("@city/city:removed_militia", (byte) 0); + militia.getPlayerObject().setCitizenship(Citizenship.Citizen); + if(core.objectService.getObject(militiaId) == null) + core.objectService.persistObject(militiaId, militia, core.getSWGObjectODB()); + }); + core.suiService.openSUIWindow(window); + } } diff --git a/src/services/reverseengineering/ReverseEngineeringService.java b/src/services/reverseengineering/ReverseEngineeringService.java index 5094a5fc..a3a400e6 100644 --- a/src/services/reverseengineering/ReverseEngineeringService.java +++ b/src/services/reverseengineering/ReverseEngineeringService.java @@ -3198,12 +3198,13 @@ public class ReverseEngineeringService implements INetworkDispatch { // Assuming munition String powerUpLabel = "item_reverse_engineering_powerup_armor_02_01"; String powerUpDescription = "item_reverse_engineering_powerup_armor_02_01"; - String powerUpTemplate = "object/tangible/powerup/base/shared_armor_base.iff"; + String powerUpTemplate = "object/tangible/loot/generic_usable/shared_copper_battery_usuable.iff"; if (profession.equals("trader_0a")){ // Domestic powerUpLabel = "item_reverse_engineering_powerup_clothing_02_01"; powerUpDescription = "item_reverse_engineering_powerup_clothing_02_01"; - powerUpTemplate = "object/tangible/powerup/base/shared_base.iff"; + powerUpTemplate = "object/tangible/loot/generic_usable/shared_chassis_blueprint_usuable.iff"; + } if (profession.equals("trader_0d")){ // Engineer powerUpLabel = "item_reverse_engineering_powerup_weapon_02_01"; @@ -3284,7 +3285,7 @@ public class ReverseEngineeringService implements INetworkDispatch { // Assuming munition String SEALabel = "socket_gem_armor"; String SEADescription = "socket_gem"; - String SEATemplate = "object/tangible/gem/shared_clothing.iff"; + String SEATemplate = "object/tangible/gem/shared_armor.iff"; if (profession.equals("trader_0a")){ SEALabel = "socket_gem_clothing"; @@ -3294,7 +3295,7 @@ public class ReverseEngineeringService implements INetworkDispatch { if (profession.equals("trader_0d")){ SEALabel = "socket_gem_weapon"; SEADescription = "socket_gem"; - SEATemplate = "object/tangible/gem/shared_clothing.iff"; + SEATemplate = "object/tangible/gem/shared_weapon.iff"; } core.objectService.destroyObject(bit1.getObjectID()); @@ -3405,7 +3406,7 @@ public class ReverseEngineeringService implements INetworkDispatch { // Assuming munition String SEALabel = "socket_gem_armor"; String SEADescription = "socket_gem"; - String SEATemplate = "object/tangible/gem/shared_clothing.iff"; + String SEATemplate = "object/tangible/gem/shared_armor.iff"; if (profession.equals("trader_0c")){ // QA if (! SEASTFName.equals("socket_gem_armor")) @@ -3424,7 +3425,7 @@ public class ReverseEngineeringService implements INetworkDispatch { return; // Wrong SEA type inserted SEALabel = "socket_gem_weapon"; SEADescription = "socket_gem"; - SEATemplate = "object/tangible/gem/shared_clothing.iff"; + SEATemplate = "object/tangible/gem/shared_weapon.iff"; } // SEA --- this item can have max 3 modifiers; it is not possible to stack the same kind of modifier in one SEA.