MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

updated range chack and hitbox calculations

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-27 19:50:52 -05:00
parent f06e2c2e5c
commit 86102c8933
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+5 -5
View File
@@ -140,7 +140,7 @@ public enum CombatManager {
if (bonus != null) if (bonus != null)
rangeMod += bonus.getFloatPercentAll(mbEnums.ModType.WeaponRange, mbEnums.SourceType.None); rangeMod += bonus.getFloatPercentAll(mbEnums.ModType.WeaponRange, mbEnums.SourceType.None);
attackRange = weapon.template.item_weapon_max_range * rangeMod; attackRange += weapon.template.item_weapon_max_range * rangeMod;
} }
if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob)) if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob))
@@ -150,11 +150,11 @@ public enum CombatManager {
float distanceSquared = attacker.loc.distanceSquared(target.loc); float distanceSquared = attacker.loc.distanceSquared(target.loc);
boolean inRange = false; boolean inRange = false;
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) { //if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
attackRange += ((PlayerCharacter) attacker).getCharacterHeight() * 0.5f; // attackRange += ((PlayerCharacter) attacker).getCharacterHeight() * 0.5f;
} else { //} else {
attackRange += attacker.calcHitBox(); attackRange += attacker.calcHitBox();
} //}
if(attackRange > 15 && attacker.isMoving()){ if(attackRange > 15 && attacker.isMoving()){
//cannot shoot bow while moving; //cannot shoot bow while moving;
src/engine/server/MBServerStatics.java
+1 -1
View File
@@ -273,7 +273,7 @@ public class MBServerStatics {
public static final float COMBATRUNSPEED = 14.67f; public static final float COMBATRUNSPEED = 14.67f;
public static final float RUNSPEED_MOB = 15.4f; public static final float RUNSPEED_MOB = 15.4f;
public static final float MOVEMENT_DESYNC_TOLERANCE = 2f; // Distance out of public static final float MOVEMENT_DESYNC_TOLERANCE = 2f; // Distance out of
public static final float NO_WEAPON_RANGE = 8f; // Range for attack with no public static final float NO_WEAPON_RANGE = 4f; // Range for attack with no
public static final float REGEN_IDLE = .06f; public static final float REGEN_IDLE = .06f;
/* /*
* Base regen rates. Do NOT modify these. They must match the client %per * Base regen rates. Do NOT modify these. They must match the client %per