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

Entertainers get Dancing XP by dancing

Browse Source 
Relates to GitHub issue #691
This commit is contained in:
Ziggy
2022-07-20 21:41:22 +02:00
parent aed84df4cd
commit fb92f3e1f3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java
+10 -3
View File
@@ -249,7 +249,7 @@ public class EntertainmentService extends Service {
* @return true if {@code performer} is a Novice Entertainer and false if not
*/
private boolean isEntertainer(CreatureObject performer) {
return performer.hasSkill("class_entertainer_phase1_novice"); // First entertainer skillbox
return performer.hasSkill("social_entertainer_novice"); // First entertainer skillbox
}
private void scheduleExperienceTask(CreatureObject performer, String performanceName) {
@@ -435,12 +435,19 @@ public class EntertainmentService extends Service {
int xpGained = performanceCounter * flourishXpMod;
if (xpGained > 0) {
if (isEntertainer(performer))
new ExperienceIntent(performer, performer, "entertainer", xpGained, true).broadcast();
if (isEntertainer(performer)) {
if (isDancing()) {
new ExperienceIntent(performer, performer, "dance", xpGained, true).broadcast();
}
}
performer.setPerformanceCounter(performanceCounter - 1);
}
}
private boolean isDancing() {
return performer.getPerformanceId() == 0;
}
}
}