Reverted previous commit.

This commit is contained in:
MobiusDev
2016-10-14 18:30:10 +00:00
parent 5fee0cf38b
commit c19c44449a
2 changed files with 156 additions and 157 deletions

View File

@@ -47,7 +47,6 @@ import com.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import com.l2jmobius.gameserver.model.events.annotations.RegisterType;
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMenuSelect;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
@@ -207,8 +206,8 @@ public final class Raina extends AbstractNpcAI
if (subClass != null)
{
final int classId = subClass.ordinal();
final String sClassName = NpcStringId.getNpcStringId(11170000 + classId).getName();
sb.append("<button icon=\"normal\" align=\"left\" action=\"bypass -h menu_select?ask=0&reply=" + classId + "\">" + sClassName + "</button>");
final int npcStringId = 11170000 + classId;
sb.append("<fstring p1=\"0\" p2=\"" + classId + "\">" + npcStringId + "</fstring>");
}
}
html.replace("%subclassList%", sb.toString());
@@ -248,8 +247,8 @@ public final class Raina extends AbstractNpcAI
if (subClass != null)
{
final int classId = subClass.getClassId();
final String sClassName = NpcStringId.getNpcStringId(11170000 + classId).getName();
sb.append("<button icon=\"normal\" align=\"left\" action=\"bypass -h menu_select?ask=2&reply=" + subClass.getClassIndex() + "\">" + sClassName + "</button>");
final int npcStringId = 11170000 + classId;
sb.append("<fstring p1=\"2\" p2=\"" + subClass.getClassIndex() + "\">" + npcStringId + "</fstring>");
}
}
html.replace("%removeList%", sb.toString());
@@ -435,8 +434,8 @@ public final class Raina extends AbstractNpcAI
return;
}
final String sClassName = NpcStringId.getNpcStringId(11170000 + classId).getName();
sb.append("<button icon=\"normal\" align=\"left\" action=\"bypass -h menu_select?ask=1&reply=" + classId + "\">" + sClassName + "</button>");
final int npcStringId = 11170000 + classId;
sb.append("<fstring p1=\"1\" p2=\"" + classId + "\">" + npcStringId + "</fstring>");
html.replace("%confirmButton%", sb.toString());
player.sendPacket(html);
break;
@@ -477,8 +476,8 @@ public final class Raina extends AbstractNpcAI
if (subClass != null)
{
final int classId = subClass.ordinal();
final String sClassName = NpcStringId.getNpcStringId(11170000 + classId).getName();
sb.append("<button icon=\"normal\" align=\"left\" action=\"bypass -h menu_select?ask=3&reply=" + classId + "\">" + sClassName + "</button>");
final int npcStringId = 11170000 + classId;
sb.append("<fstring p1=\"3\" p2=\"" + classId + "\">" + npcStringId + "</fstring>");
}
}
npc.getVariables().set("SUBCLASS_INDEX_" + player.getObjectId(), subclassIndex);
@@ -497,8 +496,8 @@ public final class Raina extends AbstractNpcAI
final StringBuilder sb = new StringBuilder();
final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "addConfirm2.html");
final String sClassName = NpcStringId.getNpcStringId(11170000 + classId).getName();
sb.append("<button icon=\"normal\" align=\"left\" action=\"bypass -h menu_select?ask=4&reply=" + classId + "\">" + sClassName + "</button>");
final int npcStringId = 11170000 + classId;
sb.append("<fstring p1=\"4\" p2=\"" + classId + "\">" + npcStringId + "</fstring>");
html.replace("%confirmButton%", sb.toString());
player.sendPacket(html);
break;