projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-07 22:13:40 -04:00
Code Issues Projects Releases Wiki Activity

Merged in Obique/holocore (pull request #617)

Browse Source 
NPC fixes/updates
This commit is contained in:
Obique PSWG
2018-12-27 02:33:18 +00:00
parent 9e7a3a9fa0 c6561c886b
commit dff6018a47
4 changed files with 1764 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client-holocore
+1 -1
Submodule client-holocore updated: 18e78ef9b4...a655e1a476
serverdata/spawn/common_tatooine.sdb
+1760 -1760
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/projectswg/holocore/intents/gameplay/player/experience/ExperienceIntent.java
+1 -1
View File
@@ -44,7 +44,7 @@ public final class ExperienceIntent extends Intent {
this.creatureObject = creatureObject;
this.xpType = xpType;
this.experienceGained = experienceGained;
this.multiply = false;
this.multiply = multiply;
}
public CreatureObject getCreatureObject() {
src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java
+2 -2
View File
@@ -187,8 +187,8 @@ public class NPCCreator {
private static WeaponObject createWeapon(DetailNpcStatInfo detailNpcStat, String template) {
try {
WeaponObject weapon = (WeaponObject) ObjectCreator.createObjectFromTemplate(template);
weapon.setMinDamage((int) (detailNpcStat.getDamagePerSecond() * 0.90));
weapon.setMaxDamage(detailNpcStat.getDamagePerSecond());
weapon.setMinDamage((int) (detailNpcStat.getDamagePerSecond() * 2 * 0.90));
weapon.setMaxDamage(detailNpcStat.getDamagePerSecond() * 2);
int range = DataLoader.npcWeaponRanges().getWeaponRange(template);
if (range == -1)
Log.w("Failed to load weapon range for: %s", template);