projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

fixed AI dmg bug, fixed crash bug related to stf names

Browse Source
This commit is contained in:
Light2
2014-03-28 02:23:07 +01:00
parent 06c0df11c3
commit eece94c7cb
5 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureMessageBuilder.java
+1
View File
@@ -93,6 +93,7 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
buffer.putFloat(1);
buffer.put(getAsciiString(creature.getStfFilename()));
buffer.putInt(0);
if(creature.getStfName() == null) creature.setStfName("");
buffer.put(getAsciiString(creature.getStfName()));
if (creature.getCustomName() == null) { creature.setCustomName(""); }//Not all CreatureObjects have CustomName (Shuttles)
buffer.put(getUnicodeString(creature.getCustomName()));
src/services/SimulationService.java
+1
View File
@@ -163,6 +163,7 @@ public class SimulationService implements INetworkDispatch {
core.commandService.registerCommand("setbiography");
core.commandService.registerCommand("requestbiography");
core.commandService.registerCommand("eject");
core.commandService.registerGmCommand("broadcast");
}
src/services/combat/CombatService.java
+1 -35
View File
@@ -560,7 +560,7 @@ public class CombatService implements INetworkDispatch {
float rawDamage = command.getAddedDamage();
if(command.getPercentFromWeapon() > 0 && weapon != attacker.getSlottedObject("default_weapon")) {
if(command.getPercentFromWeapon() > 0) {
float weaponMinDmg = weapon.getMinDamage();
float weaponMaxDmg = weapon.getMaxDamage();
@@ -589,23 +589,6 @@ public class CombatService implements INetworkDispatch {
}
} else if(command.getPercentFromWeapon() > 0) {
float weaponMinDmg = 50;
float weaponMaxDmg = 100;
float weaponDmg = new Random().nextInt((int) (weaponMaxDmg - weaponMinDmg + 1)) + weaponMinDmg;
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee()) {
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
}
rawDamage *= getWeaponDamageIncrease(attacker, weapon);
@@ -656,23 +639,6 @@ public class CombatService implements INetworkDispatch {
}
} else if(command.getPercentFromWeapon() > 0) {
float weaponMinDmg = 50;
float weaponMaxDmg = 100;
float weaponDmg = new Random().nextInt((int) (weaponMaxDmg - weaponMinDmg + 1)) + weaponMinDmg;
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee()) {
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
}
return rawDamage;
src/services/spawn/MobileTemplate.java
+2 -2
View File
@@ -35,8 +35,8 @@ public class MobileTemplate {
private short level;
private Vector<String> attacks;
private String defaultAttack;
private int minDamage;
private int maxDamage;
private int minDamage = 0;
private int maxDamage = 0;
private int difficulty = 0;
private int health, action;
private String creatureName;
src/services/spawn/SpawnService.java
+1
View File
@@ -125,6 +125,7 @@ public class SpawnService {
}
creature.addObjectToEquipList(defaultWeapon);
creature.add(defaultWeapon);
creature.setWeaponId(defaultWeapon.getObjectID());
creature.addObjectToEquipList(inventory);
creature.add(inventory);