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

Some more skillMod improvements

Browse Source
This commit is contained in:
Treeku
2014-04-26 00:25:25 +01:00
parent ab797e7862
commit 61748a3545
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+10 -19
View File
@@ -452,34 +452,25 @@ public class ObjectService implements INetworkDispatch {
// Any such settings can be completely reset with setOptionsBitmask
// in scripts and modified with setOptions(Options.X, true/false)
if (Template.startsWith("object/creature/") || Template.startsWith("object/mobile/")) {
if (Template.startsWith("object/mobile/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE);
}
if (Template.startsWith("object/mobile/beast_master/")) {
((CreatureObject) object).setOptionsBitmask(Options.NONE);
}
if (Template.startsWith("object/mobile/vendor/")) {
} else if (Template.startsWith("object/mobile/vendor/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE | Options.USABLE);
}
if (Template.startsWith("object/mobile/vehicle/")) {
} else if (Template.startsWith("object/mobile/vehicle/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE | Options.MOUNT);
}
if (Template.startsWith("object/mobile/hologram/")) {
} else if (Template.startsWith("object/mobile/hologram/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE);
}
if (Template.startsWith("object/creature/npc/theme_park/")) {
} else if (Template.startsWith("object/mobile/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE);
} else if (Template.startsWith("object/creature/npc/theme_park/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE);
}
if (Template.startsWith("object/creature/npc/general/")) {
} else if (Template.startsWith("object/creature/npc/general/")) {
((CreatureObject) object).setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE);
}
if (Template.startsWith("object/creature/droid/crafted/")) {
} else if (Template.startsWith("object/creature/droid/crafted/")) {
((CreatureObject) object).setOptionsBitmask(Options.NONE);
}
if (Template.startsWith("object/creature/droid/")) {
} else if (Template.startsWith("object/creature/droid/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE | Options.INVULNERABLE);
}
if (Template.startsWith("object/creature/player/")) {
} else if (Template.startsWith("object/creature/player/")) {
((CreatureObject) object).setOptionsBitmask(Options.ATTACKABLE);
}
} else if (object instanceof TangibleObject) {