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

Merge branch 'testing' of stellabellum.net:staff/dsrc into testing

Browse Source
This commit is contained in:
Cekis
2016-06-27 06:45:29 +01:00
parent 6b0d0355b9 00a601ca59
commit 3921fda4cc
6 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/ship/components/character_builder/frog_weapon.tab
+1 -1
View File
@@ -7,6 +7,6 @@ object/tangible/ship/components/weapon/wpn_mission_reward_imperial_cygnus_starbl
object/tangible/ship/components/weapon/wpn_hk_scorcher_2.iff 5 Test Weapon Level 5 1247 1850 0.686 0.686 19.58 0.31 354 354 1739 5400
object/tangible/ship/components/weapon/wpn_seinar_ls1.iff 6 Test Weapon Level 6 1878 2843 0.681 0.681 24.48 0.38 446 446 1689 9394
object/tangible/ship/components/weapon/wpn_mandal_advanced_annihilator.iff 7 Test Weapon Level 7 1977 3080 0.651 0.64 20.9 0.3 548 548 1753 13442
object/tangible/ship/components/weapon/wpn_sds_heavy_imperial_spc_forces_cannon.iff 8 Test Weapon Level 8 2531 3913 0.7 0.7 13.3 0.38 724 724 1650 22078
object/tangible/ship/components/weapon/wpn_mission_reward_neutral_borstel_disruptor.iff 8 Test Weapon Level 8 2531 3913 0.7 0.7 13.3 0.38 724 724 1650 22078
object/tangible/ship/components/weapon/wpn_sds_elite.iff 9 Test Weapon Level 9 2404 3860 0.657 0.636 23.31 0.3 647 647 1796 34682
object/tangible/ship/components/weapon/wpn_sds_modified_elite.iff 10 Test Weapon Level 10 3001 4927 0.826 0.805 28.85 0.37 822 822 1802 43049
sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java
+1 -8
View File
@@ -6418,14 +6418,7 @@ public class terminal_character_builder extends script.base_script
sendSystemMessageTestingOnly(player, "Spec-Ops Pack Issued.");
break;
case 1:
obj_id bufferId = player;
float currentBuffTime = performance.inspireGetMaxDuration(player);
buff.applyBuff(player, "buildabuff_inspiration", 14400);
utils.setScriptVar(player, "performance.buildabuff.buffComponentKeys", buffComponentKeys);
utils.setScriptVar(player, "performance.buildabuff.buffComponentValues", buffComponentValues);
utils.setScriptVar(player, "performance.buildabuff.bufferId", bufferId);
buff.applyBuff((player), "me_buff_health_2", 14400);
buff.applyBuff((player), "me_buff_action_3", 14400);
buff.applyBuff((player), "me_buff_strength_3", 14400);
sku.0/sys.shared/compiled/game/object/static/structure/dantooine/shared_dant_fire_pit.tpf
+2 -2
View File
@@ -13,6 +13,6 @@ lookAtText = "string_table" "pristine wall"
snapToTerrain = false
appearanceFilename = "appearance/thm_dant_fire_pit.apt"
appearanceFilename = ""
portalLayoutFilename = ""
portalLayoutFilename = ""
sku.0/sys.shared/compiled/game/object/static/structure/dathomir/shared_mtn_clan_pillar_s01.tpf
+2 -2
View File
@@ -10,6 +10,6 @@ surfaceType = ST_stone
detailedDescription = "string_table" "Deathstar Debris"
appearanceFilename = "appearance/thm_dath_mtn_clan_pillar_s01.apt"
appearanceFilename = ""
portalLayoutFilename = ""
portalLayoutFilename = ""
sku.0/sys.shared/compiled/game/object/tangible/collection/shared_rare_rifle_coynite_disruptor.tpf
+1 -1
View File
@@ -7,4 +7,4 @@
objectName = "static_item_n" "weapon_tow_rifle_03_02"
detailedDescription = "static_item_d" "weapon_tow_rifle_03_02"
appearanceFilename = "appearance/wp_rifle_mustafar_disruptor.apt"
appearanceFilename = ""
sku.0/sys.shared/compiled/game/object/tangible/quest/shared_som_burning_marker_04.tpf
+1 -1
View File
@@ -11,4 +11,4 @@ objectName = "som/som_item" "som_burning_marker_n"
detailedDescription = "som/som_item" "som_burning_marker_d"
appearanceFilename = "appearance/poi_talus_ley_line_tower.apt"
appearanceFilename = ""