lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored NPC display state functions.

Browse Source
This commit is contained in:
MobiusDev
2015-10-13 12:46:58 +00:00
parent aa2a04b466
commit c39ac887e3
13 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java vendored
View File

@@ -105,7 +105,7 @@ public class HillsOfGold extends AbstractNpcAI
}
else
{
npc.setState(1);
npc.setDisplayEffect(1);
}
return super.onSpawn(npc);
}

18
trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java vendored
View File

@@ -125,16 +125,16 @@ public final class SelMahumSquad extends AbstractNpcAI
case "fire":
{
startQuestTimer("fire", 30000 + getRandom(5000), npc, null);
npc.setState(FIRE_EFFECT_NONE);
npc.setDisplayEffect(FIRE_EFFECT_NONE);
if (getRandom(GameTimeController.getInstance().isNight() ? 2 : 4) < 1)
{
npc.setState(FIRE_EFFECT_BURN); // fire burns
npc.setDisplayEffect(FIRE_EFFECT_BURN); // fire burns
npc.broadcastEvent("SCE_CAMPFIRE_START", 600, null);
}
else
{
npc.setState(FIRE_EFFECT_NONE); // fire goes out
npc.setDisplayEffect(FIRE_EFFECT_NONE); // fire goes out
npc.broadcastEvent("SCE_CAMPFIRE_END", 600, null);
}
break;
@@ -148,12 +148,12 @@ public final class SelMahumSquad extends AbstractNpcAI
if (npc.isNoRndWalk())
{
npc.doCast(SkillData.getInstance().getSkill(6331, 1));
npc.setState(MAHUM_EFFECT_SLEEP);
npc.setDisplayEffect(MAHUM_EFFECT_SLEEP);
}
if (npc.getVariables().getInt("BUSY_STATE") == 1) // Eating
{
npc.doCast(SkillData.getInstance().getSkill(6332, 1));
npc.setState(MAHUM_EFFECT_EAT);
npc.setDisplayEffect(MAHUM_EFFECT_EAT);
}
startQuestTimer("remove_effects", 300000, npc, null);
@@ -168,7 +168,7 @@ public final class SelMahumSquad extends AbstractNpcAI
{
// myself.i_quest0 = 0;
npc.setIsRunning(true);
npc.setState(MAHUM_EFFECT_NONE);
npc.setDisplayEffect(MAHUM_EFFECT_NONE);
break;
}
case "reset_full_bottle_prize":
@@ -226,7 +226,7 @@ public final class SelMahumSquad extends AbstractNpcAI
{
if (receiver.getId() == FIRE)
{
receiver.setState(FIRE_EFFECT_BURN);
receiver.setDisplayEffect(FIRE_EFFECT_BURN);
final L2Npc stove = addSpawn(STOVE, receiver.getX(), receiver.getY(), receiver.getZ() + 100, 0, false, 0);
stove.setSummoner(receiver);
startQuestTimer("notify_dinner", 2000, receiver, null); // @SCE_DINNER_EAT
@@ -353,7 +353,7 @@ public final class SelMahumSquad extends AbstractNpcAI
}
else if (Util.contains(SQUAD_LEADERS, npc.getId()))
{
npc.setState(3);
npc.setDisplayEffect(3);
npc.setIsNoRndWalk(false);
}
return super.onSpawn(npc);
@@ -390,7 +390,7 @@ public final class SelMahumSquad extends AbstractNpcAI
cancelQuestTimer("remove_effects", attacked, null);
attacked.getVariables().remove("BUSY_STATE");
attacked.setIsNoRndWalk(false);
attacked.setState(MAHUM_EFFECT_NONE);
attacked.setDisplayEffect(MAHUM_EFFECT_NONE);
if (attacked.getRightHandItem() == OHS_Weapon)
{
attacked.setRHandId(THS_Weapon);

8
trunk/dist/game/data/scripts/ai/individual/Anais.java vendored
View File

@@ -60,7 +60,7 @@ public final class Anais extends AbstractNpcAI
private void burnerOnAttack(int pot, L2Npc anais)
{
L2Npc npc = _divineBurners.get(pot);
npc.setState(1);
npc.setDisplayEffect(1);
npc.setIsRunning(false);
if (pot < 4)
{
@@ -99,7 +99,7 @@ public final class Anais extends AbstractNpcAI
}
final L2Npc b = _divineBurners.get(_pot);
_pot = _pot + 1;
b.setState(1);
b.setDisplayEffect(1);
b.setIsRunning(false);
L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0);
((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999);
@@ -134,7 +134,7 @@ public final class Anais extends AbstractNpcAI
cancelQuestTimer("GUARD_ATTACK", npc, _nextTarget);
if (_current != null)
{
_current.setState(2);
_current.setDisplayEffect(2);
_current.setIsRunning(false);
_current = null;
}
@@ -186,7 +186,7 @@ public final class Anais extends AbstractNpcAI
cancelQuestTimer("CHECK", npc, null);
if (_current != null)
{
_current.setState(2);
_current.setDisplayEffect(2);
_current.setIsRunning(false);
_current = null;
}

10
trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java vendored
View File

@@ -112,14 +112,14 @@ public final class Minigame extends AbstractNpcAI
{
if (npc.getId() == BURNER)
{
npc.setState(2);
npc.setDisplayEffect(2);
npc.setIsRunning(false);
}
else
{
for (L2Npc burner : room.getBurners())
{
burner.setState(2);
burner.setDisplayEffect(2);
burner.setIsRunning(false);
}
}
@@ -147,7 +147,7 @@ public final class Minigame extends AbstractNpcAI
if (room.getCurrentPot() < 9)
{
L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]];
b.setState(1);
b.setDisplayEffect(1);
b.setIsRunning(false);
startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after
startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null);
@@ -279,7 +279,7 @@ public final class Minigame extends AbstractNpcAI
{
if (room.getCurrentPot() < 8)
{
npc.setState(1);
npc.setDisplayEffect(1);
npc.setIsRunning(false);
startQuestTimer("off", 2000, npc, null);
room.setCurrentPot(room.getCurrentPot() + 1);
@@ -427,7 +427,7 @@ public final class Minigame extends AbstractNpcAI
{
for (L2Npc burner : _burners)
{
burner.setState(1);
burner.setDisplayEffect(1);
burner.setIsRunning(false);
}
}