Merge pull request #417 from SWG-Source/master

Merging master into WOD integration

Author: HeronAlexandria

.github/workflows/ant-compile-tab.yml

@@ -23,7 +23,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup System Requisites
-        run: sudo chmod 777 ${GITHUB_WORKSPACE}/include/DataTableTool
+        run: |
+          sudo apt-get install -y zlib1g
+          sudo chmod 777 ${GITHUB_WORKSPACE}/include/DataTableTool
 
       # NOTE: DataTableTool was built and placed in dsrc/include which is called by ant when compile_tab is ran
       # The DataTableTool in dsrc is a special version modified specifically to work with the GitHub Runner so DO NOT replace it with a regular build

sku.0/sys.server/compiled/game/datatables/crafting/weapon_appearance.tab

@@ -230,7 +230,7 @@ slot																																		resource	0	grip	petrochem_inert	7
 slot																																		template	0	vibration_generator	object/tangible/component/weapon/vibro_unit_base.iff	1																												
 slot																																		template	0	power_circuits	object/tangible/component/item/electronic_control_unit.iff	1																												
 slot																																		template	0	weapon_core	object/tangible/component/weapon/core/weapon_core_melee_base.iff	1																												
-weapon	melee	weapon_appearance_maul		systems.crafting.weapon.core.crafting_new_weapon_final	25	weapon	5	weapon_crafting		object/weapon/melee/2h_sword/2h_sword_maul.iff	object/weapon/melee/2h_sword/2h_sword_maul.iff	40	120	800	1100	0	0	0	0	0	0	kinetic	none	-1	-1	melee	melee	1	1	100	100		5							sys.server/compiled/game/object/draft_schematic/weapon/appearance/																							0	42	0	20
+weapon	melee	weapon_appearance_maul		systems.crafting.weapon.core.crafting_new_weapon_final	25	weapon	5	weapon_crafting		object/weapon/melee/2h_sword/2h_sword_maul.iff	object/weapon/melee/2h_sword/2h_sword_maul.iff	40	120	800	1100	0	0	0	0	0	0	kinetic	none	-1	-1	melee	melee	1	1	100	100		5							sys.server/compiled/game/object/draft_schematic/weapon/appearance/																							0	42	0	30
 slot																																		resource	0	grip_unit	metal	40																												
 slot																																		resource	0	reactive_striking_surface	iron_kammris	75																												
 slot																																		resource	0	power_cell_brackets	copper	24																												

sku.0/sys.server/compiled/game/datatables/space_loot/space_rls/rewards_tier_5.tab

@@ -2398,14 +2398,24 @@ waitForComplete:triggerId:xport_destroyed_3:xport_3		spawn_imperial_objective
 waitForComplete:triggerId:xport_destroyed_4:xport_4		spawn_imperial_objective
 waitForComplete:triggerId:xport_destroyed_5:xport_5		spawn_imperial_objective
 messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_1
+taskId:xport_update		xport_destroyed_1
+taskId:xport_destroy		xport_destroyed_1
 deleteSpawn:rebel_evac_pilot_1:none		xport_destroyed_1												
-messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_2												
+messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_2
+taskId:xport_update		xport_destroyed_2
+taskId:xport_destroy		xport_destroyed_2
 deleteSpawn:rebel_evac_pilot_2:none		xport_destroyed_2												
-messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_3												
+messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_3
+taskId:xport_update		xport_destroyed_3
+taskId:xport_destroy		xport_destroyed_3
 deleteSpawn:rebel_evac_pilot_3:none		xport_destroyed_3												
-messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_4												
+messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_4
+taskId:xport_update		xport_destroyed_4
+taskId:xport_destroy		xport_destroyed_4
 deleteSpawn:rebel_evac_pilot_4:none		xport_destroyed_4												
-messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_5												
+messageTo;quest_tracker;questUpdate;string:update=p3_transport_destroyed		xport_destroyed_5
+taskId:xport_update		xport_destroyed_5
+taskId:xport_destroy		xport_destroyed_5
 deleteSpawn:rebel_evac_pilot_5:none		xport_destroyed_5												
 delayAction:spawn_evac_st:1		start_spawn_evac_st											"st_xport1:patrolOnce:evac_st_setup_1,evac_st_exit_1,evac_st_1_1,evac_st_1_2,evac_st_1_3,evac_st_1_4,evac_st_1_5,evac_st_1_6,evac_st_1_7,evac_st_1_8,evac_st_1_9,evac_st_1_10,evac_st_1_11,evac_st_1_12,evac_st_1_13,evac_st_1_14,evac_st_1_15,evac_st_1_16,evac_st_1_17,evac_st_1_18,evac_st_1_19,evac_st_1_20,evac_st_1_21,evac_st_1_22,evac_st_1_23,evac_st_1_24,evac_st_1_25"	
 delayAction:spawn_evac_st:30		start_spawn_evac_st											"st_xport2:patrolOnce:evac_st_setup_2,evac_st_exit_2,evac_st_2_1,evac_st_2_2,evac_st_2_3,evac_st_2_4,evac_st_2_5,evac_st_2_6,evac_st_2_7,evac_st_2_8,evac_st_2_9,evac_st_2_10,evac_st_2_11,evac_st_2_12,evac_st_2_13,evac_st_2_14,evac_st_2_15,evac_st_2_16,evac_st_2_17,evac_st_2_18,evac_st_2_19,evac_st_2_20,evac_st_2_21,evac_st_2_22,evac_st_2_23,evac_st_2_24,evac_st_2_25,evac_st_2_26,evac_st_2_27,evac_st_2_28,evac_st_2_29,evac_st_2_30,evac_st_2_31,evac_st_2_32,evac_st_2_33,evac_st_2_34,evac_st_2_35,evac_st_2_36"	

sku.0/sys.server/compiled/game/datatables/spawning/heroic/echo_base.tab

@@ -2491,6 +2491,14 @@ public static boolean addRareLoot(obj_id target) throws InterruptedException
         // get the attacker who did the most damage.
         obj_id player = getObjIdObjVar(target, xp.VAR_TOP_GROUP);
 
+        // VAR_TOP_GROUP stores a group object when the top damage dealer is grouped.
+        // Pick a random member of that group to receive the RLS chest.
+        if (group.isGroupObject(player)) {
+            obj_id[] members = utils.getLocalGroupMemberIds(player);
+            if (members == null || members.length == 0) return false;
+            player = members[rand(0, members.length - 1)];
+        }
+
         // make sure the attacker is a player.
         if(!isValidId(player) || !isPlayer(player)){
             return false;

sku.0/sys.server/compiled/game/script/library/loot.java

@@ -1003,6 +1003,9 @@ shared_ith_skirt_s02	:block	:block	:block	:block	:block	:block	:block	:block	:bl
 shared_ith_skirt_s03	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_skirt_s03_m.sat	appearance/ith_skirt_s03_f.sat	:block	:block
 shared_ith_vest_s01	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_vest_s01_m.sat	appearance/ith_vest_s01_f.sat	:block	:block
 shared_ith_vest_s02	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_vest_s02_m.sat	appearance/ith_vest_s02_f.sat	:block	:block
+shared_ith_backpack_s01	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_backpack_s01_m.sat	appearance/ith_backpack_s01_f.sat	:block	:block
+shared_ith_backpack_s03	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_backpack_s03_m.sat	appearance/ith_backpack_s03_f.sat	:block	:block
+shared_ith_backpack_s05	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_backpack_s05_m.sat	appearance/ith_backpack_s05_f.sat	:block	:block
 shared_ith_backpack_s06	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_backpack_s06_m.sat	appearance/ith_backpack_s06_f.sat	:block	:block
 shared_ith_belt_s18	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_belt_s18_m.sat	appearance/ith_belt_s18_f.sat	:block	:block
 shared_ith_belt_s19	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	:block	appearance/ith_belt_s19_m.sat	appearance/ith_belt_s19_f.sat	:block	:block

sku.0/sys.shared/compiled/game/datatables/appearance/appearance_table.tab

@@ -1208,11 +1208,11 @@ fs_dm_cc_5_root	commandClicky	normal	fs_dm_cc_5	failSpecialAttack			1	fs_dm_cc_5
 fs_dm_cc_6_root	commandClicky	normal	fs_dm_cc_6	failSpecialAttack			1	fs_dm_cc_6	1	0	1	1	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	1	1		1	0	0	1	1	1	1	0	1	0	1	1	1	1	0	0									0		0	0	0	0	0								enemy	required		2		combat_ranged	0	32		combat	1	ALL	HEAVY	fs_dm_cc	0	0.25	7			1	
 milkCreature	commandClicky	normal	milkCreature	failSpecialAttack			1		1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
 searchLair	commandClicky	normal	searchLair	failSpecialAttack			1		1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
-adminLair	commandClicky	normal	adminLair	failAdmin			1	admin	1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
-zoneUtil	commandClicky	normal	cmdZoneUtility	failAdmin			1	admin	1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
-objInfo	commandClicky	normal	cmdObjectInfo	failAdmin			1	admin	1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
-cmdCreateSpaceRareLootCrate	commandClicky	normal	cmdCreateSpaceRareLootCrate	failAdmin			1	admin	1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
-cmdCreateSpaceRareLootItem	commandClicky	normal	cmdCreateSpaceRareLootItem	failAdmin			1	admin	1	0	1	1	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	0	0		1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0								0		0	0	0	0	0								other	none	1	3			0			other	0	ALL		gathering	0	0.25	1			0	
+adminLair		immediate	adminLair					admin																				1	1		0													1																														optional							40	csr											
+zoneUtil		immediate	cmdZoneUtility					admin																				1	1		0													1																														optional							40	csr											
+objInfo		immediate	cmdObjectInfo					admin																				1	1		0													1																														optional							40	csr											
+cmdCreateSpaceRareLootCrate		immediate	cmdCreateSpaceRareLootCrate					admin																				1	1		0													1																														optional							40	csr											
+cmdCreateSpaceRareLootItem		immediate	cmdCreateSpaceRareLootItem					admin																				1	1		0													1																														optional							40	csr											
 of_buff_def_4	commandClicky	normal	of_buff_def_4	failSpecialAttack			1	of_buff_def_4	1	0	1	1	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	1	1		1	0	0	1	1	1	1	0	1	0	1	1	1	1	0	0									0		0	0	0	0	0								other	none		2		combat_ranged				combat	1	ALL		of_buff_def		0.25	7			1	
 of_buff_def_5	commandClicky	normal	of_buff_def_5	failSpecialAttack			1	of_buff_def_5	1	0	1	1	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	1	1		1	0	0	1	1	1	1	0	1	0	1	1	1	1	0	0									0		0	0	0	0	0								other	none		2		combat_ranged				combat	1	ALL		of_buff_def		0.25	7			1	
 of_buff_def_6	commandClicky	normal	of_buff_def_6	failSpecialAttack			1	of_buff_def_6	1	0	1	1	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0			0	0	1	1		1	0	0	1	1	1	1	0	1	0	1	1	1	1	0	0									0		0	0	0	0	0								other	none		2		combat_ranged				combat	1	ALL		of_buff_def		0.25	7			1	

sku.0/sys.shared/compiled/game/datatables/command/command_table.tab

@@ -16,6 +16,8 @@ clearFloraRadius = 38
 objectName = "building_name" "player_house_generic_medium_windowed_s03"
 detailedDescription = "building_detail" "player_house_generic_medium_windowed_s03"
 
+appearanceFilename = "appearance/ply_house_med_s03_hue_r0_exterior.apt"
+
 portalLayoutFilename = "appearance/ply_house_med_s03_hue.pob"
 
 clientDataFile = "clientdata/building/shared_player_house_tatooine_medium_style_01.cdf"

sku.0/sys.shared/compiled/game/object/building/player/shared_player_house_generic_medium_windowed_s03.tpf

@@ -8,6 +8,6 @@ objectName = "static_item_n" "space_rare_loot_chest_1"
 
 detailedDescription = "static_item_d" "space_rare_loot_chest_1"
 
-appearanceFilename = "appearance/item_rare_loot_chest.apt"
+appearanceFilename = "appearance/item_space_rare_loot_chest.apt"
 
 gameObjectType = GOT_misc_item_usable

sku.0/sys.shared/compiled/game/object/tangible/item/shared_space_rare_loot_chest_1.tpf

@@ -8,6 +8,6 @@ objectName = "static_item_n" "space_rare_loot_chest_2"
 
 detailedDescription = "static_item_d" "space_rare_loot_chest_2"
 
-appearanceFilename = "appearance/item_rare_loot_chest_exquisite.apt"
+appearanceFilename = "appearance/item_space_rare_loot_chest_exquisite.apt"
 
 gameObjectType = GOT_misc_item_usable