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

Merge pull request #240 from Reedux/master

Browse Source 
Forsake Fear & BM Revive changes
This commit is contained in:
Aconite
2021-01-11 14:12:07 -06:00
committed by GitHub
parent 43217f344e 9f43bd642f
commit 05a659cd8e
3 changed files with 4473 additions and 6550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sku.0/sys.server/compiled/game/script/player/player_beastmaster.java
View File

@@ -610,6 +610,9 @@ public class player_beastmaster extends script.base_script
int duration = 20;
int reviveTimeMod = getEnhancedSkillStatisticModifierUncapped(self, "expertise_bm_pet_revive_time");
duration -= reviveTimeMod;
if (params.containsKey("extendedRange")) {
duration *= params.getFloat("extendedRange");
}
int flags = sui.CD_EVENT_INCAPACITATE;
int pid = sui.smartCountdownTimerSUI(self, self, "bm_revive_pet", null, 0, duration, "", 0, flags);
duration += getGameTime();

11016
sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -1418,8 +1418,8 @@ bm_soothing_comfort_1 commandClicky normal bm_soothing_comfort_1 failSpecialAtta
bm_mend_pet_1 commandClicky normal bm_mend_pet_1 failSpecialAttack 1 bm_mend_pet_1 1 0 1 1 1 0 1 1 1 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 friend none 2 combat_ranged combat 1 ALL bm_mend_pet_1 0 0.25 15 1
bm_mend_pet_2 commandClicky normal bm_mend_pet_2 failSpecialAttack 1 bm_mend_pet_2 1 0 1 1 1 0 1 1 1 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 friend none 2 combat_ranged combat 1 ALL bm_mend_pet_1 0 0.25 15 1
bm_mend_pet_3 commandClicky normal bm_mend_pet_3 failSpecialAttack 1 bm_mend_pet_3 1 0 1 1 1 0 1 1 1 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 friend none 2 combat_ranged combat 1 ALL bm_mend_pet_1 0 0.25 15 1
bm_revive_pet_1 commandClicky normal bm_revive_pet_1 failSpecialAttack 1 bm_revive_pet_1 1 0 1 1 1 0 1 1 1 0 0 0 0 0 0 1 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 friend none 2 combat_ranged 0 7 combat 1 ALL bm_revive_pet_1 0 0.25 21 1
bm_revive_pet_2 commandClicky normal bm_revive_pet_2 failSpecialAttack 1 bm_revive_pet_2 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 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 optional 2 combat_ranged 0 combat 1 ALL bm_revive_pet_1 0 0.25 21 1
bm_revive_pet_1 commandClicky normal bm_revive_pet_1 failSpecialAttack 1 bm_revive_pet_1 1 0 1 1 1 0 1 1 1 0 0 0 0 0 0 1 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 friend none 2 combat_ranged 0 85 combat 1 ALL bm_revive_pet_1 0 0.25 21 1
bm_revive_pet_2 commandClicky normal bm_revive_pet_2 failSpecialAttack 1 bm_revive_pet_2 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 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 optional 2 combat_ranged 0 85 combat 1 ALL bm_revive_pet_1 0 0.25 21 1
bm_bite_1 commandClicky normal bm_bite_1 failSpecialAttack 1 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 optional 2 combat_ranged 0 combat 1 bm_bite 0 0 6 1
bm_bite_2 commandClicky normal bm_bite_2 failSpecialAttack 1 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 optional 2 combat_ranged 0 combat 1 bm_bite 0 0 6 1
bm_bite_3 commandClicky normal bm_bite_3 failSpecialAttack 1 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 optional 2 combat_ranged 0 combat 1 bm_bite 0 0 6 1