projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Wave_Collections

Browse Source
This commit is contained in:
Waverunner
2014-03-20 13:57:52 -04:00
parent fc35adbf78 36458239d3
commit b434b96f46
127 changed files with 2404 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+6 -2
View File
@@ -479,7 +479,7 @@ public class PlayerService implements INetworkDispatch {
if(!FileUtilities.doesFileExist("scripts/expertise/" + expertiseBox + ".py"))
return;
core.scriptService.callScript("scripts/expertise/", "addExpertisePoint", expertiseBox, core, creature);
core.scriptService.callScript("scripts/expertise/", expertiseBox, "addExpertisePoint", core, creature);
}
@@ -598,6 +598,10 @@ public class PlayerService implements INetworkDispatch {
// Cannot gain more than half of the XP needed for the next level in one go
// Do check
int experienceBonus = creature.getSkillModBase("flush_with_success");
experience += ((experience * experienceBonus) / 100);
// 1. Add the experience.
if (experience > 0) {
creature.showFlyText("base_player", "prose_flytext_xp", "", experience, (float) 2.5, new RGB(180, 60, 240), 1);
@@ -619,7 +623,7 @@ public class PlayerService implements INetworkDispatch {
creature.playEffectObject("clienteffect/level_granted.cef", "");
creature.getClient().getSession().write((new ClientMfdStatusUpdateMessage((float) ((creature.getLevel() == 90) ? 90 : (creature.getLevel() + 1)), "/GroundHUD.MFDStatus.vsp.role.targetLevel")).serialize());
creature.setLevel(((Integer) experienceTable.getObject(i, 0)).shortValue());
core.scriptService.callScript("scripts/collections/", "addMasterBadge", "master_" + player.getProfession(), core, creature);
core.scriptService.callScript("scripts/collections/", "master_" + player.getProfession(), "addMasterBadge", core, creature);
// 3. Add the relevant health/action and expertise points.
float luck = (((((float) (core.scriptService.getMethod("scripts/roadmap/", player.getProfession(), "getLuck").__call__().asInt()) + (core.scriptService.getMethod("scripts/roadmap/", creature.getStfName(), "getLuck").__call__().asInt())) / ((float) 90)) * ((float) creature.getLevel())) - ((float) creature.getSkillModBase("luck")));