projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1456 from Undercova/master

Browse Source 
Content update
This commit is contained in:
Undercova
2023-12-05 03:16:26 +01:00
committed by GitHub
parent d6cfccb291 5ae64d3ac7
commit 3c4b6e8aec
7 changed files with 2765 additions and 3244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serverdata/items/items_armor.sdb
-9
View File
@@ -178,15 +178,6 @@ armor_assault_agi_lvl80_chest_02_01 object/tangible/wearables/armor/composite/ar
armor_assault_agi_lvl80_gloves_02_01 object/tangible/wearables/armor/composite/armor_composite_gloves.iff armor Agile Composite Gloves 1 40000 advanced assault 6000 80 0 0 0 0 ranged_defense=20 -1 -1 75 -1 800 0 -
armor_assault_agi_lvl80_helmet_02_01 object/tangible/wearables/armor/composite/armor_composite_helmet.iff armor Agile Composite Helmet 1 40000 advanced assault 6000 80 0 0 0 0 ranged_defense=20 -1 -1 75 -1 800 0 -
armor_assault_agi_lvl80_leggings_02_01 object/tangible/wearables/armor/composite/armor_composite_leggings.iff armor Agile Composite Leggings 1 40000 advanced assault 6000 80 0 0 0 0 ranged_defense=20 -1 -1 75 -1 800 0 -
armor_assault_borvo_acklay_bicep_l_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_bicep_l.iff armor Acklay Carapace Left Bicep 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_bicep_r_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_bicep_r.iff armor Acklay Carapace Right Bicep 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_boots_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_boots.iff armor Acklay Carapace Boots 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_bracer_l_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_bracer_l.iff armor Acklay Carapace Left Bracer 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_bracer_r_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_bracer_r.iff armor Acklay Carapace Right Bracer 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_chest_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_chest_plate.iff armor Acklay Carapace Chestplate 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_gloves_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_gloves.iff armor Acklay Carapace Gloves 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_helmet_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_helmet.iff armor Acklay Carapace Helmet 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 4 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_borvo_acklay_leggings_02_01 object/tangible/wearables/armor/chitin/armor_chitin_acklay_leggings.iff armor Acklay Carapace Leggings 1 40000 basic assault 1500 22 1 0 0 0 melee_defense=10 1 4 -1 -1 0 0 Armor granted as a reward for quest starting with loot item from Borvos Acklay
armor_assault_con_lvl20_bicep_l_02_01 object/tangible/wearables/armor/composite/armor_composite_bicep_l.iff armor Fit Composite Left Bicep 1 40000 basic assault 1500 22 0 0 0 0 healing_efficiency=5 -1 -1 88 -1 220 0 -
armor_assault_con_lvl20_bicep_r_02_01 object/tangible/wearables/armor/composite/armor_composite_bicep_r.iff armor Fit Composite Right Bicep 1 40000 basic assault 1500 22 0 0 0 0 healing_efficiency=5 -1 -1 88 -1 220 0 -
armor_assault_con_lvl20_boots_02_01 object/tangible/wearables/armor/composite/armor_composite_boots.iff armor Fit Composite Boots 1 40000 basic assault 1500 22 0 0 0 0 healing_efficiency=5 -1 -1 88 -1 220 0 -
serverdata/items/items_item.sdb
+1826 -2160
View File
File diff suppressed because it is too large Load Diff
serverdata/items/items_wearable.sdb
-9
View File
@@ -816,9 +816,6 @@ item_ithorian_gloves_02_01 object/tangible/wearables/ithorian/ith_gloves_s02.iff
item_ithorian_pants_02_01 object/tangible/wearables/ithorian/ith_pants_s19.iff wearable Issued Ithorian Pants 1 1000 0 0 1 0 0 0 0 0 ranged_defense=3 -1 6 63 -1 0 0 npe clothing
item_ithorian_shirt_02_01 object/tangible/wearables/ithorian/ith_shirt_s09.iff wearable Issued Ithorian Shirt 1 1000 0 0 1 0 0 0 0 0 ranged_defense=3 -1 31 63 -1 0 0 npe clothing
item_ithorian_vest_02_01 object/tangible/wearables/ithorian/ith_vest_s02.iff wearable Issued Ithorian Vest 1 1000 0 0 1 0 0 0 0 0 ranged_defense=3 -1 0 63 -1 0 0 npe clothing
item_lifeday_09_jacket_01 object/tangible/wearables/jacket/jacket_lifeday_09_01.iff wearable Life Day Jacket 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_lifeday_09_jacket_02 object/tangible/wearables/jacket/jacket_lifeday_09_02.iff wearable Holiday Jacket 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_lifeday_gift_04_13 object/tangible/wearables/necklace/necklace_lifeday.iff wearable Wookiee Life Day Necklace 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_pub28_corsec_ring_02_01 object/tangible/wearables/ring/ring_s01.iff wearable CorSec Guard Ring 1 1000 0 0 36 0 0 0 0 0 healing_efficiency=9,melee_accuracy=9 -1 -1 -1 -1 2700 0 -
item_pub28_corsec_ring_02_02 object/tangible/wearables/ring/ring_s02.iff wearable CorSec Marksmen Ring 1 1000 0 0 36 0 0 0 0 0 ranged_defense=9,ranged_accuracy=9 -1 -1 -1 -1 2700 0 -
item_pub28_corsec_ring_02_03 object/tangible/wearables/ring/ring_s03.iff wearable CorSec Administrator Ring 1 1000 0 0 36 0 0 0 0 0 melee_defense=9,healing_efficiency=9 -1 -1 -1 -1 2700 0 -
@@ -867,7 +864,6 @@ item_clothing_bikini_leggings_01_01 object/tangible/wearables/bikini/bikini_legg
item_clothing_bodysuit_at_at_01_01 object/tangible/wearables/bodysuit/bodysuit_atat.iff wearable AT-AT Pilot Bodysuit 1 1000 0 0 imperial 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_bodysuit_bwing_01_01 object/tangible/wearables/bodysuit/bodysuit_bwing.iff wearable B-Wing Pilot Bodysuit 1 1000 0 0 rebel 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_bodysuit_tie_fighter_01_01 object/tangible/wearables/bodysuit/bodysuit_tie_fighter.iff wearable Tie Pilot Bodysuit 1 1000 0 0 imperial 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_bodysuit_trando_slaver_01_01 object/tangible/wearables/bodysuit/bodysuit_trando_slaver.iff wearable Trandoshan Slaver Bodysuit 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_boots_01_03 object/tangible/wearables/boots/boots_s03.iff wearable Wrapped Boots 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_boots_01_04 object/tangible/wearables/boots/boots_s04.iff wearable Hide Boots 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_boots_01_05 object/tangible/wearables/boots/boots_s05.iff wearable Sturdy Boots 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
@@ -917,7 +913,6 @@ item_clothing_gloves_01_12 object/tangible/wearables/gloves/gloves_s12.iff weara
item_clothing_gloves_01_13 object/tangible/wearables/gloves/gloves_s13.iff wearable Long Uniform Gloves 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_gloves_01_14 object/tangible/wearables/gloves/gloves_s14.iff wearable Link-Steel Reinforced Gloves 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_gloves_tusken_raider_01_01 object/tangible/wearables/gloves/gloves_tusken_raider.iff wearable Tusken Raider Gloves 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_goggles_anniversary_01_01 object/tangible/wearables/goggles/goggles_anniversary.iff wearable Anniversary Goggles 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_goggles_goggles_01_01 object/tangible/wearables/goggles/goggles_s01.iff wearable Special Edition Goggles 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_goggles_goggles_01_02 object/tangible/wearables/goggles/goggles_s02.iff wearable Special Edition Goggles 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_goggles_goggles_01_03 object/tangible/wearables/goggles/goggles_s03.iff wearable Special Edition Goggles 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
@@ -927,8 +922,6 @@ item_clothing_goggles_goggles_01_06 object/tangible/wearables/goggles/goggles_s0
item_clothing_hat_chef_01_01 object/tangible/wearables/hat/hat_chef_s01.iff wearable Kitchen Master's Hat 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_chef_01_02 object/tangible/wearables/hat/hat_chef_s02.iff wearable Bake Master's Cap 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_imp_01_01 object/tangible/wearables/hat/hat_imp_s01.iff wearable Imperial Command Hat 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_imp_01_02 object/tangible/wearables/hat/hat_imp_s02.iff wearable 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_rebel_trooper_01_01 object/tangible/wearables/hat/hat_rebel_trooper_01.iff wearable Rebel Trooper Helmet 1 1000 0 0 rebel 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_hat_01_02 object/tangible/wearables/hat/hat_s02.iff wearable Warm Hat 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_01_04 object/tangible/wearables/hat/hat_s04.iff wearable Swoop Helm 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_hat_01_10 object/tangible/wearables/hat/hat_s10.iff wearable Sunguard 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
@@ -1073,8 +1066,6 @@ item_clothing_robe_01_05 object/tangible/wearables/robe/robe_s05.iff wearable Cl
item_clothing_robe_01_12 object/tangible/wearables/robe/robe_s12.iff wearable Grand Mayoral Robe 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_robe_01_18 object/tangible/wearables/robe/robe_s18.iff wearable Wookiee Smock 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_robe_01_27 object/tangible/wearables/robe/robe_s27.iff wearable Gunman's Duster 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_robe_01_32 object/tangible/wearables/robe/robe_s32.iff wearable Robe 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_robe_01_33 object/tangible/wearables/robe/robe_s33.iff wearable Robe 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 100 0 -
item_clothing_shirt_nightsister_01_01 object/tangible/wearables/shirt/nightsister_shirt_s01.iff wearable Nightsister Gruesome Wrap 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_shirt_nightsister_01_02 object/tangible/wearables/shirt/nightsister_shirt_s02.iff wearable Nightsister Battle Mantle 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
item_clothing_shirt_nightsister_01_03 object/tangible/wearables/shirt/nightsister_shirt_s03.iff wearable Nightsister Havoc Habit 1 1000 0 0 1 0 0 0 0 0 -1 -1 -1 -1 0 0 -
serverdata/items/master_item.msdb
-1
View File
@@ -1,7 +1,6 @@
file enabled
TEXT BOOLEAN
items_armor.sdb TRUE
items_collection.sdb FALSE
items_crystal.sdb TRUE
items_item.sdb TRUE
items_weapon.sdb FALSE
serverdata/loot/loot_table.sdb
+935 -1061
View File
File diff suppressed because one or more lines are too long
serverdata/npc/npc_2.sdb
+1 -1
View File
@@ -465,7 +465,7 @@ droid_som_volcano_five_midguard_gk18 GK-18 Sentinel som_volcano_five_midguard dr
droid_som_volcano_five_septipod_gk14 GK-14 Defender som_volcano_five_septipod droid - som/union_sentry_droid.iff Mustafar droid_army droid_army FALSE 1 1 0 - 2 1.6 ranged_droid_cww8 droid 24 24 TRUE - 30 junk_droid_mustafar 5 cube_loot 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_four_cym_proto CY-M Prototype som_volcano_four_cym_prototype droid - som/volcano_cyborg_lt.iff Mustafar droid_army droid_army FALSE 1.2 1.2 0 - 2 2 melee_unarmed_default droid 24 24 TRUE - 30 junk_droid_mustafar 15 weapon_cym_rifle 10 weapon_cym_sword FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_observer_orpu1s ORPU-1s som_volcano_observer droid - death_watch_battle_droid.iff;death_watch_battle_droid_02.iff;death_watch_battle_droid_03.iff Mustafar droid_army droid_army FALSE 1 1 0 - 2 1.6 ranged_carbine_e5 droid 24 24 TRUE - 30 junk_droid_mustafar 5 cube_loot 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_one_hk_taskmaster HK-Taskmaster som_volcano_one_taskmaster droid - som/hk77.iff Mustafar droid_army droid_army FALSE 1.5 1.5 0 - 2 1.6 ranged_droid_hk77_assault_droid droid 24 24 FALSE - 30 junk_droid_mustafar 15 weapon_taskmaste_sword 10 weapon_taskmaste_gauss_rifle FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_one_hk_taskmaster HK-Taskmaster som_volcano_one_taskmaster droid - som/hk77.iff Mustafar droid_army droid_army FALSE 1.5 1.5 0 - 2 1.6 ranged_droid_hk77_assault_droid droid 24 24 FALSE - 30 junk_droid_mustafar 15 weapon_taskmaster_sword 10 weapon_taskmaster_gauss_rifle FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_one_sustainer_sk21 a SK-21 support droid som_volcano_one_sustainer droid - som/hk77.iff Mustafar droid_army droid_army FALSE 1.3 1.3 0 - 2 1.6 ranged_droid_hk77_assault_droid droid 24 24 TRUE - 30 junk_droid_mustafar 5 cube_loot 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_three_forward_comm_mkii Forward Commander Mk II som_volcano_three_forward_commander droid - som/hk77.iff Mustafar droid_army droid_army FALSE 1.5 1.5 0 - 2 1.6 ranged_droid_hk77_assault_droid droid 24 24 TRUE - 30 junk_droid_mustafar 15 unique_fwd_commander 10 weapon_ak_prime_rocket_launcher FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
droid_som_volcano_three_hk77_assault a HK-77 assault droid som_volcano_three_hk77 droid - som/hk77.iff Mustafar droid_army droid_army FALSE 1.3 1.3 0 - 2 1.6 ranged_droid_hk77_assault_droid droid 24 24 TRUE - 30 junk_droid_mustafar 5 cube_loot 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatNpcService.java
+3 -3
View File
@@ -47,7 +47,7 @@ public class CombatNpcService extends Service {
if (i.getKiller().isPlayer())
deleteCorpseTasks.put(corpse.getObjectId(), executor.execute(TimeUnit.SECONDS.toMillis(120), () -> deleteCorpse(corpse)));
else
executor.execute(15000, () -> deleteCorpse(corpse));
executor.execute(60000, () -> deleteCorpse(corpse));
}
@IntentHandler
@@ -71,14 +71,14 @@ public class CombatNpcService extends Service {
if (task == null) {
Log.w("There should already be a deleteCorpse task for corpse %s!", corpse.toString());
executor.execute(15000, () -> deleteCorpse(corpse));
executor.execute(30000, () -> deleteCorpse(corpse));
return;
}
// if existing deleteCorpse task has more than 5 seconds remaining, cancel it
// if the cancel operation succeeds, schedule another deleteCorpse task for 5 seconds
if (task.getDelay(TimeUnit.SECONDS) > 15 && task.cancel(false))
executor.execute(15000, () -> deleteCorpse(corpse));
executor.execute(30000, () -> deleteCorpse(corpse));
}
private void deleteCorpse(CreatureObject creatureCorpse) {