L2J Force Team - �� Java ��

�� - 22 - �� allset

mybb@mybb.ru (NBAL1) — Wed, 30 Dec 2009 16:10:09 +0300

# �� .
AltFreeTeleporting = False

# ��
AltFreeTeleporting = False

# �� (�� ), �� # �� .
AltRecommend = False

# �� , �� .
AltRecommend = False

�� - 21 - 2 �� - Blood Fiend , Dangerous Allure

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:48:09 +0300

data/scripts/quests/BloodFiend.java (+142) new

data/scripts/quests/DangerousAllure.java (+145) new

haha....gratz

�� - 20 - ��

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:46:52 +0300

data/stats/armor/14500-14599.xml (+30 -0) diffs

data/stats/armor/7800-7899.xml (+20 -20) diffs

data/stats/armor/9800-9899.xml (+30 -0) diffs

�� - 19 - �� Rogue

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:45:47 +0300

93 - case 0:
93 + case ATTACK_NOONE:

104 - case 1:
104 + case ATTACK_SINGLE:

139 - if ("1".equals(event))
139 + if (QUEST_START_EVT.equals(event))

170 - if (qs == null || qs.getState() != State.STARTED || qs.getInt(CONDITION) == 0
170 + if (qs == null || !qs.isStarted() || qs.getInt(CONDITION) == 0

202 - if (qs.dropQuestItems(SPATOIS_BONES, 1, SPATOI_BONE_COUNT, chance, true))
202 + if (qs.dropQuestItems(SPATOIS_BONES, 1, SPATOI_BONE_COUNT, chance, true, false))

�� - 18 - �� Destroy Plague bringers

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:44:09 +0300

quests/DestroyPlaguebringers.java (+154) new

�� - 17 - scripting-engines 1.3.0A

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:42:23 +0300

scripting-engines 1.3.0A

- <version>1.3.0</version>
+ <version>1.3.0A</version>

�� - 16 - ��

mybb@mybb.ru (Droppo) — Wed, 30 Dec 2009 07:41:15 +0300

data/stats/augmentation/augmentation_skillmap.xml (+10 -10) diffs

- <skillId val="0"/> 
+ <skillId val="3179"/>

for all augm skills....
during...

�� - 14 - no comments...

mybb@mybb.ru (NBAL1) — Wed, 30 Dec 2009 07:38:51 +0300

gameserver/model/quest/Quest.java (+2 -0) diffs

64 + public static final String QUEST = "Quest";
69 + public static final String QUEST_START_EVT = "1";

�� - 13 - ��

mybb@mybb.ru (NBAL1) — Wed, 30 Dec 2009 07:37:35 +0300

gameserver/model/actor/L2Character.java (+39 -52) diffs

931 -
931 +
932 + // Verify if the attack can be started
933 + if (getEvtReadyToAct().isScheduled())
934 + {
935 + // Cancel the attack because it can't be done at this moment
936 + sendPacket(ActionFailed.STATIC_PACKET);
937 + return;
938 + }
939 +
933 - if (weaponItem != null && !transformed)
941 + if (weaponItem != null && !transformed && this instanceof L2PcInstance)
943 + // Check for arrows and MP
937 - // Verify if the bow can be use
938 - if (getEvtReadyToAct().isScheduled())
946 + // Equip arrows needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True
947 + if (!checkAndEquipArrows())
949 + // Cancel the action because the L2PcInstance have no arrow
950 + getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
952 + sendPacket(SystemMessageId.NOT_ENOUGH_ARROWS);
944 - // Check for arrows and MP
945 - if (this instanceof L2PcInstance)
956 + // Verify if L2PcInstance owns enough MP
957 + int saMpConsume = (int)getStat().calcStat(Stats.MP_CONSUME, 0, null, null);
958 + int mpConsume = saMpConsume == 0 ? weaponItem.getMpConsume() : saMpConsume;
959 + mpConsume = (int)calcStat(Stats.BOW_MP_CONSUME_RATE, mpConsume, null, null);
960 +
961 + if (getStatus().getCurrentMp() < mpConsume)
947 - // Equip arrows needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True
948 - if (!checkAndEquipArrows())
949 - {
950 - // Cancel the action because the L2PcInstance have no arrow
951 - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
952 - sendPacket(ActionFailed.STATIC_PACKET);
953 - sendPacket(SystemMessageId.NOT_ENOUGH_ARROWS);
954 - return;
955 - }
956 -
957 - // Verify if L2PcInstance owns enough MP
958 - int saMpConsume = (int)getStat().calcStat(Stats.MP_CONSUME, 0, null, null);
959 - int mpConsume = saMpConsume == 0 ? weaponItem.getMpConsume() : saMpConsume;
960 - mpConsume = (int)calcStat(Stats.BOW_MP_CONSUME_RATE, mpConsume, null, null);
961 -
962 - if (getStatus().getCurrentMp() < mpConsume)
963 - {
964 - // If L2PcInstance doesn't have enough MP, stop the attack
965 - getEvtReadyToAct().schedule(1000);
966 - sendPacket(ActionFailed.STATIC_PACKET);
967 - sendPacket(SystemMessageId.NOT_ENOUGH_MP);
968 - return;
969 - }
970 -
971 - // If L2PcInstance have enough MP, the bow consumes it
972 - if (mpConsume > 0)
973 - getStatus().reduceMp(mpConsume);
963 + // If L2PcInstance doesn't have enough MP, stop the attack
964 + getEvtReadyToAct().schedule(1000);
965 + sendPacket(ActionFailed.STATIC_PACKET);
966 + sendPacket(SystemMessageId.NOT_ENOUGH_MP);
967 + return;
969 +
970 + // If L2PcInstance have enough MP, the bow consumes it
971 + if (mpConsume > 0)
972 + getStatus().reduceMp(mpConsume);
974 + // Check for bolts
978 - // Verify if the crossbow can be use
979 - if (getEvtReadyToAct().isScheduled())
977 + // Equip bolts needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True
978 + if (!checkAndEquipBolts())
981 - // Cancel the action because the crossbow can't be re-use at this moment
980 + // Cancel the action because the L2PcInstance have no arrow
981 + getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
983 + sendPacket(SystemMessageId.NOT_ENOUGH_BOLTS);
985 -
986 - // Check for bolts
987 - if (this instanceof L2PcInstance)
988 - {
989 - // Equip bolts needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True
990 - if (!checkAndEquipBolts())
991 - {
992 - // Cancel the action because the L2PcInstance have no arrow
993 - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
994 - sendPacket(ActionFailed.STATIC_PACKET);
995 - sendPacket(SystemMessageId.NOT_ENOUGH_BOLTS);
996 - return;
997 - }
998 - }
- private EvtReadyToAct getEvtReadyToAct()
1105 + protected EvtReadyToAct getEvtReadyToAct()
1126 - private final class EvtReadyToAct extends ExclusiveTask
1113 + protected final class EvtReadyToAct extends ExclusiveTask

�� - 12 - �� ,��,��

mybb@mybb.ru (NBAL1) — Wed, 30 Dec 2009 07:33:10 +0300

gameserver/ai/L2CharacterAI.java (+19 -8) diffs

80 -
80 +
81 + protected void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
82 + {
83 + }
84 +
221 - if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAfraid())
225 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow() || _actor.isAfraid())
229 + saveNextIntention(AI_INTENTION_ATTACK, target, null);
331 - if (_actor.isAllSkillsDisabled() || _actor.isCastingNow())
336 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow())
340 + saveNextIntention(AI_INTENTION_MOVE_TO, pos, null);
398 - if (_actor.isAllSkillsDisabled() || _actor.isCastingNow())
405 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow())
409 + saveNextIntention(AI_INTENTION_MOVE_TO_IN_AIR_SHIP, destination, origin);
- if (_actor.isAllSkillsDisabled() || _actor.isCastingNow())
446 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow())
450 + saveNextIntention(AI_INTENTION_FOLLOW, target, null);
- if (_actor.isAllSkillsDisabled() || _actor.isCastingNow())
504 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow())
508 + saveNextIntention(AI_INTENTION_PICK_UP, object, null);
- if (_actor.isAllSkillsDisabled() || _actor.isCastingNow())
554 + if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow())
558 + saveNextIntention(AI_INTENTION_INTERACT, object, null);

�� - 11 - ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 12:54:41 +0300

no_comments

�� - 15 - �� 636_TruthBeyond

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:25:05 +0300

quests/636_TruthBeyond/__init__.py (+2 -1) diffs

+ # Update NBAL1 / L2jft
- st.set("cond","2")
+ st.setState(State.COMPLETED)

�� - 14 - skills/23100-23199.xml ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:23:32 +0300

(+1) skills/23100-23199.xml

�� - 13 - scripts/ai/group_template/FleeingClanMembers.java ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:22:52 +0300

(+1) scripts/ai/group_template/FleeingClanMembers.java

�� - 12 - ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:21:42 +0300

sql/spawnlist.sql (+4 -1) diffs

- (45577,'Monastery Silence',1,22135,114482,-80787,-50,0,0,33991,60,0,0),
+ (45577,'Monastery Silence',1,22135,114482,-80787,-50,0,0,33991,0,0,0),

+
+ -- Monastery of Silence spawn fix
+ UPDATE `spawnlist` SET `respawn_delay` = 60 WHERE `npc_templateid` = '45577';

�� - 11 - ��... 5500-5599.xml 5600-5699.xml 5700-5799.xml

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:20:02 +0300

skills/5500-5599.xml (+297 -67) diffs

skills/5600-5699.xml (+325 -108) diffs

skills/5700-5799.xml (+612 -85) diffs

�� - 10 - �� 128_PailakaSongOfIceAndFire

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:18:09 +0300

quests/128_PailakaSongOfIceAndFire/__init__.py (+24 -19) diffs

+ if player.getInstanceId() != 0:
158 + instance = InstanceManager.getInstance().getInstance(player.getInstanceId())
159 + if instance != None:
160 + instance.setDuration(300000)
- cond = st.getInt("cond")
169 - if npcId == ADLER:
170 - if cond > 0:
171 - tele = PyObject()
172 - tele.x = -52855
173 - tele.y = 188199
174 - tele.z = -4700
175 - instanceId = enterInstance(self, player, "SongOfIceAndFire.xml", tele)
176 - self.startQuestTimer("TimeOver", 3600000, None, player)
177 - player.setPailaka(True)
178 - htmltext = ""
179 - else:
180 - htmltext = "32497.htm"
181 - elif npcId == SINAI:
182 - if cond == 1:
183 - htmltext = "32500.htm"
184 - elif npcId == ADLER2:
185 - if cond == 9:
186 - htmltext = "32510.htm"
+ else :
173 + cond = st.getInt("cond")
174 + if npcId == ADLER:
175 + if cond > 0:
176 + tele = PyObject()
177 + tele.x = -52855
178 + tele.y = 188199
179 + tele.z = -4700
180 + instanceId = enterInstance(self, player, "SongOfIceAndFire.xml", tele)
181 + self.startQuestTimer("TimeOver", 3600000, None, player)
182 + player.setPailaka(True)
183 + htmltext = ""
184 + else:
185 + htmltext = "32497.htm"
186 + elif npcId == SINAI:
187 + if cond == 1:
188 + htmltext = "32500.htm"
189 + elif npcId == ADLER2:
190 + if cond == 9:
191 + htmltext = "32510.htm"

�� - 9 - Kamaloka

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:16:04 +0300

data/html/default/32496.htm (+3) �� html

data/instances/Kamaloka-23.xml (+1)
+ <emptyDestroyTime val="300"/>

data/instances/Kamaloka-26.xml (+1)
+ <emptyDestroyTime val="300"/>

data/instances/Kamaloka-29.xml (+1)
+ <emptyDestroyTime val="300"/>

data/instances/Kamaloka-33.xml (+1)

�� - 8 - scripts/ai/group_template/cats_eye_bandit.py - ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:13:24 +0300

(-1)

�� - 7 - scripts/custom/8020_GrandIsleOfPrayerRace - ��

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:12:32 +0300

(-1)

�� - 10 - L2Clan.java

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:11:37 +0300

gameserver/model/L2Clan.java (-5) diffs

- if ((activeChar.getClanPrivileges() & L2Clan.CP_CL_JOIN_CLAN) != L2Clan.CP_CL_JOIN_CLAN)
- {
- activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- return false;
- }

�� - 9 - RequestRestart.java

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:10:24 +0300

RequestRestart.java (+1 -1) diffs

- if (!activeChar.canLogout() || activeChar.isIllegalWaiting())
+ if (!activeChar.canLogout(true) || activeChar.isIllegalWaiting())

�� - 8 - L2Npc.java

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:09:02 +0300

gameserver/model/actor/L2Npc.java (+8)

+ html1.append("<font color=\"LEVEL\">Quest Info</font>");
+ html1.append("<table border=\"0\" width=\"100%\">");
+ html1.append("<tr><td>Quest attack status:</td><td>" + getQuestAttackStatus() + "</td></tr>");
+ html1.append("<tr><td>Quest attacker:</td><td>" + getQuestFirstAttacker() + "</td></tr>");
+ html1.append("</table>");
+
+ setQuestFirstAttacker(null);
+ setQuestAttackStatus(Quest.ATTACK_NOONE);

�� - 7 - ScriptEngineManager.java

mybb@mybb.ru (NBAL1) — Tue, 29 Dec 2009 06:06:51 +0300

gameserver/scripting/L2ScriptEngineManager.java (+45 -57) diffs

+ import java.io.PrintWriter;
+ import java.io.StringWriter;
+ _log.info("Script Engine: " + factory.getEngineName() + " " + factory.getEngineVersion()
+ + " - Language: " + factory.getLanguageName() + " " + factory.getLanguageVersion());
+
- boolean reg = false;
+
- ScriptEngine existentEngine = _nameEngines.get(name);
+ if (_nameEngines.containsKey(name))
+ throw new IllegalStateException("Multiple script engines for the same name!");
- if (existentEngine != null)
- {
- double engineVer = Double.parseDouble(factory.getEngineVersion());
- double existentEngVer = Double.parseDouble(existentEngine.getFactory().getEngineVersion());
-
- if (engineVer <= existentEngVer)
- {
- continue;
- }
- }
- reg = true;
-
- if (reg)
- {
- _log.info("Script Engine: "+factory.getEngineName()+" "+factory.getEngineVersion()+" - Language: "+
- factory.getLanguageName()+" - Language Version: "+factory.getLanguageVersion());
- }
-
+
- if (!ext.equals("java") || factory.getLanguageName().equals("java"))
- {
- _extEngines.put(ext, engine);
- }
+ if (_extEngines.containsKey(ext))
+ throw new IllegalStateException("Multiple script engines for the same extension!");
+
+
- _log.warn("Failed initializing factory. ", e);
+ _log.warn("Failed initializing factory.", e);
+ context.setAttribute("parentLoader", ClassLoader.getSystemClassLoader(), ScriptContext.ENGINE_SCOPE);
+ context.removeAttribute("parentLoader", ScriptContext.ENGINE_SCOPE);
+ context.setAttribute("parentLoader", ClassLoader.getSystemClassLoader(), ScriptContext.ENGINE_SCOPE);
+ engine.getContext().removeAttribute("parentLoader", ScriptContext.ENGINE_SCOPE);
- String dir = script.getParent();
- String name = script.getName() + ".error.log";
- if (dir != null)
+ _log.warn("Failed executing script: " + script.getPath() + ".");
+
+ final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
+ pw.println("Error on: " + script.getAbsolutePath());
+ pw.println("Line: " + e.getLineNumber() + " - Column: " + e.getColumnNumber());
+ pw.println();
+ e.printStackTrace(pw);
+ pw.close();
+
+ final String report = sw.toString();
+
+ FileOutputStream fos = null;
+ try
- File file = new File(dir + "/" + name);
-
- FileOutputStream fos = null;
- try
- {
- if (!file.exists())
- {
- file.createNewFile();
- }
-
- fos = new FileOutputStream(file);
- String errorHeader = "Error on: " + file.getCanonicalPath() + "\r\nLine: " + e.getLineNumber() + " - Column: " + e.getColumnNumber()
- + "\r\n\r\n";
- fos.write(errorHeader.getBytes());
- fos.write(e.getMessage().getBytes());
- _log.warn("Failed executing script: " + script.getAbsolutePath() + ". See " + file.getName() + " for details.");
- }
- catch (IOException ioe)
- {
- _log.warn("Failed executing script: " + script.getAbsolutePath() + "\r\n" + e.getMessage()
- + "Additionally failed when trying to write an error report on script directory. Reason: " + ioe.getMessage(), ioe);
- }
- finally
- {
- IOUtils.closeQuietly(fos);
- }
+ String fileName = script.getName() + ".error.log";
+
+ fos = new FileOutputStream(new File(script.getParent(), fileName));
+ fos.write(report.getBytes());
+
+ _log.warn("See " + fileName + " for details.");
- else
+ catch (IOException ioe)
- _log.warn("Failed executing script: " + script.getAbsolutePath() + "\r\n" + e.getMessage()
- + "Additionally failed when trying to write an error report on script directory.");
+ _log.warn("Additionally failed when trying to write an error report on script directory.", ioe);
+ _log.info(report);
+ finally
+ {
+ IOUtils.closeQuietly(fos);
+ }

�� - 6 - ��

mybb@mybb.ru (NBAL1) — Mon, 28 Dec 2009 16:32:18 +0300

config/enchant.properties (+3 ) (�� l2j)

+ #Elemental enchant chance
+ EnchantChanceElement = 50
+

L2J Force Team - ������� ������� ���������� Java ��������

������� - 22 - �������� � ������� allset

������� - 21 - 2 ����� ������ - Blood Fiend , Dangerous Allure

������� - 20 - ������ ������

������� - 19 - ���� ������ �� ����� Rogue

������� - 18 - ����� ����� Destroy Plague bringers

������� - 17 - scripting-engines 1.3.0A

������� - 16 - ������ �����������

������� - 14 - no comments...

������� - 13 - ����� ����� �� ����

������� - 12 - ����� �����,��������,������� ������

������� - 11 - ������������� ������� ���� � ����� �������

������� - 15 - ����� 636_TruthBeyond

������� - 14 - skills/23100-23199.xml �����

������� - 13 - scripts/ai/group_template/FleeingClanMembers.java �����

������� - 12 - ������ ����������

������� - 11 - ������... 5500-5599.xml 5600-5699.xml 5700-5799.xml

������� - 10 - ����� 128_PailakaSongOfIceAndFire

������� - 9 - Kamaloka

������� - 8 - scripts/ai/group_template/cats_eye_bandit.py - ������

������� - 7 - scripts/custom/8020_GrandIsleOfPrayerRace - ������

������� - 10 - L2Clan.java

������� - 9 - RequestRestart.java

������� - 8 - L2Npc.java

������� - 7 - ScriptEngineManager.java

������� - 6 - ������� �����������