projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #268 from madsboddum/211

Browse Source 
creatureMeleeAttack is now only used for the creature weapon instead of being used by every NPC #211
This commit is contained in:
Josh Larson
2020-11-23 15:12:36 -05:00
committed by GitHub
parent b6c7dd2c9c 282c7bf95c
commit 1e6a039dab
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt
View File

@@ -142,21 +142,19 @@ class NpcCombatMode(obj: AIObject) : NpcMode(obj) {
}
private fun getWeaponCommand(weapon: WeaponObject): String {
val ai = weapon.parent as AIObject?
return if (ai != null && GameObjectType.GOT_CREATURE == ai.gameObjectType) {
// Creatures use different default attack abilities than humanoids do
"creatureMeleeAttack" // TODO this is a bit simple as there are ranged attacks available for some creatures as well.
} else {
when (weapon.type) {
WeaponType.PISTOL -> "rangedShotPistol"
WeaponType.RIFLE -> "rangedShotRifle"
WeaponType.LIGHT_RIFLE -> "rangedShotLightRifle"
WeaponType.CARBINE, WeaponType.HEAVY, WeaponType.HEAVY_WEAPON, WeaponType.DIRECTIONAL_TARGET_WEAPON -> "rangedShot"
WeaponType.ONE_HANDED_MELEE, WeaponType.TWO_HANDED_MELEE, WeaponType.UNARMED, WeaponType.POLEARM_MELEE, WeaponType.THROWN -> "meleeHit"
WeaponType.ONE_HANDED_SABER, WeaponType.TWO_HANDED_SABER, WeaponType.POLEARM_SABER -> "saberHit"
else -> "meleeHit"
}
if (weapon.template == "object/weapon/creature/shared_creature_default_weapon.iff") {
// Creature weapon, use the melee attack designed for creatures
return "creatureMeleeAttack"
}
return when (weapon.type) {
WeaponType.PISTOL -> "rangedShotPistol"
WeaponType.RIFLE -> "rangedShotRifle"
WeaponType.LIGHT_RIFLE -> "rangedShotLightRifle"
WeaponType.CARBINE, WeaponType.HEAVY, WeaponType.HEAVY_WEAPON, WeaponType.DIRECTIONAL_TARGET_WEAPON -> "rangedShot"
WeaponType.ONE_HANDED_MELEE, WeaponType.TWO_HANDED_MELEE, WeaponType.UNARMED, WeaponType.POLEARM_MELEE, WeaponType.THROWN -> "meleeHit"
WeaponType.ONE_HANDED_SABER, WeaponType.TWO_HANDED_SABER, WeaponType.POLEARM_SABER -> "saberHit"
else -> "meleeHit"
}
}