API tools faq
paste
gabrielb

Fixes for some stuff on sylph

gabrielb
Mar 9th, 2021 (edited)
119
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 28.00 KB | None | 0 0
raw download clone embed print report
  1. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
  2. IDEA additional info:
  3. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  4. <+>UTF-8
  5. ===================================================================
  6. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  7. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml (date 1615317720456)
  8. @@ -101,7 +101,7 @@
  9. </enchant>
  10.  
  11. <!-- Talisman of Aden -->
  12. - <enchant id="91756" maxEnchant="10">
  13. + <enchant id="91756" maxEnchant="10" safeEnchant="1">
  14. <item id="91745" />
  15. </enchant>
  16.  
  17. @@ -152,6 +152,11 @@
  18. <enchant id="93046" maxEnchant="10" safeEnchant="3">
  19. <item id="93042" />
  20. </enchant>
  21. +
  22. + <!-- Adventurer's Talisman -->
  23. + <enchant id="95688" maxEnchant="10" safeEnchant="1">
  24. + <item id="91937" />
  25. + </enchant>
  26.  
  27. <!-- Cloak of Protection -->
  28. <enchant id="93302" maxEnchant="10">
  29. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51400-51499.xml
  30. IDEA additional info:
  31. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  32. <+>UTF-8
  33. ===================================================================
  34. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51400-51499.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  35. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51400-51499.xml (date 1615320194197)
  36. @@ -276,7 +276,29 @@
  37. </skill>
  38. <skill id="51441" toLevel="1" name="Scroll of Escape: Abandoned Camp">
  39. <!-- A magical scroll that teleports to the Abandoned Camp. Cannot be exchanged, dropped, or sold. Can be stored in the private warehouse. -->
  40. - <operateType>A1</operateType>
  41. + <hitTime>500</hitTime>
  42. + <isMagic>2</isMagic> <!-- Static Skill -->
  43. + <itemConsumeCount>1</itemConsumeCount>
  44. + <itemConsumeId>91725</itemConsumeId>
  45. + <magicLevel>1</magicLevel>
  46. + <operateType>A1</operateType>
  47. + <magicCriticalRate>5</magicCriticalRate>
  48. + <targetType>SELF</targetType>
  49. + <affectScope>SINGLE</affectScope>
  50. + <conditions>
  51. + <condition name="OpAlignment">
  52. + <affectType>CASTER</affectType>
  53. + <alignment>LAWFUL</alignment>
  54. + </condition>
  55. + <condition name="OpCanEscape" />
  56. + </conditions>
  57. + <effects>
  58. + <effect name="Teleport">
  59. + <x>-46868</x>
  60. + <y>148086</y>
  61. + <z>-2968</z>
  62. + </effect>
  63. + </effects>
  64. </skill>
  65. <skill id="51442" toLevel="1" name="Scroll of Escape: Windmill Hill">
  66. <!-- A magical scroll that teleports to the Windmill Hill. Cannot be exchanged, dropped, or sold. Can be stored in the private warehouse. -->
  67. @@ -284,7 +306,29 @@
  68. </skill>
  69. <skill id="51443" toLevel="1" name="Scroll of Escape: Ruins of Agony">
  70. <!-- A magical scroll that teleports to the Ruins of Agony. Cannot be exchanged, dropped, or sold. Can be stored in the warehouse. -->
  71. - <operateType>A1</operateType>
  72. + <hitTime>500</hitTime>
  73. + <isMagic>2</isMagic> <!-- Static Skill -->
  74. + <itemConsumeCount>1</itemConsumeCount>
  75. + <itemConsumeId>91727</itemConsumeId>
  76. + <magicLevel>1</magicLevel>
  77. + <operateType>A1</operateType>
  78. + <magicCriticalRate>5</magicCriticalRate>
  79. + <targetType>SELF</targetType>
  80. + <affectScope>SINGLE</affectScope>
  81. + <conditions>
  82. + <condition name="OpAlignment">
  83. + <affectType>CASTER</affectType>
  84. + <alignment>LAWFUL</alignment>
  85. + </condition>
  86. + <condition name="OpCanEscape" />
  87. + </conditions>
  88. + <effects>
  89. + <effect name="Teleport">
  90. + <x>-42307</x>
  91. + <y>120810</y>
  92. + <z>-3368</z>
  93. + </effect>
  94. + </effects>
  95. </skill>
  96. <skill id="51444" toLevel="1" name="Reinforced Spear Chest">
  97. <icon>icon.etc_treasure_box_i04</icon>
  98. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
  99. IDEA additional info:
  100. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  101. <+>UTF-8
  102. ===================================================================
  103. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  104. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java (date 1615319390107)
  105. @@ -137,11 +137,22 @@
  106. {
  107. showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000);
  108. addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(25) + 100) - player.getExp(), 42000);
  109. - giveItems(player, BSOE_EVENT);
  110. - giveItems(player, ADVENTURERS_BRACELET);
  111. - giveItems(player, ADVENTURERS_TALISMAN);
  112. - giveItems(player, SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN);
  113. - giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON);
  114. + //TODO find a better way to do this: Temp fix for not regive items when already have them in inventory (bugging abort and re-accepting)
  115. + if(player.getInventory().getItemsByItemId(BSOE_EVENT.getId()).size() <= 20) { //20 due other quests also giving? need to see for a possible variable here
  116. + giveItems(player, BSOE_EVENT);
  117. + }
  118. + if(player.getInventory().getItemsByItemId(ADVENTURERS_BRACELET.getId()).isEmpty()) {
  119. + giveItems(player, ADVENTURERS_BRACELET);
  120. + }
  121. + if(player.getInventory().getItemsByItemId(ADVENTURERS_TALISMAN.getId()).isEmpty()) {
  122. + giveItems(player, ADVENTURERS_TALISMAN);
  123. + }
  124. + if(player.getInventory().getItemsByItemId(SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN.getId()).isEmpty()) {
  125. + giveItems(player, SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN);
  126. + }
  127. + if(player.getInventory().getItemsByItemId(SCROLL_OF_ENCHANT_ADEN_WEAPON.getId()).isEmpty()) {
  128. + giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON);
  129. + }
  130. qs.exitQuest(false, true);
  131. htmltext = "30332-03.html";
  132. }
  133. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml
  134. IDEA additional info:
  135. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  136. <+>UTF-8
  137. ===================================================================
  138. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  139. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml (date 1615320125274)
  140. @@ -303,12 +303,23 @@
  141. </item>
  142. <item id="91725" name="Scroll of Escape: Abandoned Camp" type="EtcItem">
  143. <!-- Can be used to teleport to the Abandoned Camp. -->
  144. - <set name="icon" val="icon.etc_scroll_of_return_i04" />
  145. - <set name="default_action" val="SKILL_REDUCE" />
  146. - <set name="material" val="PAPER" />
  147. - <set name="is_tradable" val="false" />
  148. - <set name="is_dropable" val="false" />
  149. - <set name="is_stackable" val="true" />
  150. + <set name="icon" val="icon.etc_scroll_of_return_i04" />
  151. + <set name="default_action" val="SKILL_REDUCE" />
  152. + <set name="material" val="PAPER" />
  153. + <set name="weight" val="30" />
  154. + <set name="price" val="35000" />
  155. + <set name="is_stackable" val="true" />
  156. + <set name="is_oly_restricted" val="true" />
  157. + <set name="handler" val="ItemSkills" />
  158. + <set name="commissionItemType" val="SCROLL_OTHER" />
  159. + <set name="is_tradable" val="false" />
  160. + <set name="is_dropable" val="false" />
  161. + <cond addName="1" msgId="113">
  162. + <player flyMounted="false" />
  163. + </cond>
  164. + <skills>
  165. + <skill id="51441" level="1" /> <!-- Scroll of Escape: Master Kerkir -->
  166. + </skills>
  167. </item>
  168. <item id="91726" name="Scroll of Escape: Windmill Hill" type="EtcItem">
  169. <!-- Can be used to teleport to the Windmill Hill. -->
  170. @@ -321,12 +332,23 @@
  171. </item>
  172. <item id="91727" name="Scroll of Escape: Ruins of Agony" type="EtcItem">
  173. <!-- Can be used to teleport to the Ruins of Agony. -->
  174. - <set name="icon" val="icon.etc_scroll_of_return_i04" />
  175. - <set name="default_action" val="SKILL_REDUCE" />
  176. - <set name="material" val="PAPER" />
  177. - <set name="is_tradable" val="false" />
  178. - <set name="is_dropable" val="false" />
  179. - <set name="is_stackable" val="true" />
  180. + <set name="icon" val="icon.etc_scroll_of_return_i04" />
  181. + <set name="default_action" val="SKILL_REDUCE" />
  182. + <set name="material" val="PAPER" />
  183. + <set name="weight" val="30" />
  184. + <set name="price" val="35000" />
  185. + <set name="is_stackable" val="true" />
  186. + <set name="is_oly_restricted" val="true" />
  187. + <set name="handler" val="ItemSkills" />
  188. + <set name="commissionItemType" val="SCROLL_OTHER" />
  189. + <set name="is_tradable" val="false" />
  190. + <set name="is_dropable" val="false" />
  191. + <cond addName="1" msgId="113">
  192. + <player flyMounted="false" />
  193. + </cond>
  194. + <skills>
  195. + <skill id="51443" level="1" /> <!-- Scroll of Escape: Ruins of Agony -->
  196. + </skills>
  197. </item>
  198. <item id="91728" name="Reinforced Spear Chest" type="EtcItem">
  199. <!-- Double-click to obtain the following items. -->
  200. Index: L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
  201. IDEA additional info:
  202. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  203. <+>UTF-8
  204. ===================================================================
  205. --- L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  206. +++ L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (date 1615318841962)
  207. @@ -129,7 +129,8 @@
  208. }
  209.  
  210. // fast auto-enchant cheat check
  211. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000))
  212. + // Lowered value to 500 (from 2000) On Sylph, some enchantments are much faster than normal ones
  213. + if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500))
  214. {
  215. Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH);
  216. player.removeRequest(request.getClass());
  217. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml
  218. IDEA additional info:
  219. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  220. <+>UTF-8
  221. ===================================================================
  222. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  223. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml (date 1615315641407)
  224. @@ -578,9 +578,11 @@
  225. <set name="immediate_effect" val="true" />
  226. <set name="material" val="GOLD" />
  227. <set name="weight" val="120" />
  228. + <set name="enchant_limit" val="1" />
  229. <set name="is_tradable" val="false" />
  230. <set name="is_dropable" val="false" />
  231. <set name="is_sellable" val="false" />
  232. + <set name="enchant_enabled" val="true" />
  233. <set name="bodypart" val="deco1" />
  234. </item>
  235. <item id="91938" name="Primeval Isle's Prolongating Stone" type="EtcItem">
  236. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
  237. IDEA additional info:
  238. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  239. <+>UTF-8
  240. ===================================================================
  241. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  242. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml (date 1615312945903)
  243. @@ -791,33 +791,63 @@
  244. </item>
  245. <item id="95586" name="Scroll of Escape: Master Kerkir" type="EtcItem">
  246. <!-- Can be used to teleport to Master Kerkir in the Wind Village. -->
  247. - <set name="icon" val="icon.etc_scroll_of_return_i04" />
  248. - <set name="default_action" val="SKILL_REDUCE" />
  249. - <set name="material" val="PAPER" />
  250. - <set name="weight" val="5" />
  251. - <set name="is_tradable" val="false" />
  252. - <set name="is_dropable" val="false" />
  253. - <set name="is_sellable" val="false" />
  254. + <set name="icon" val="icon.etc_scroll_of_return_i04" />
  255. + <set name="default_action" val="SKILL_REDUCE" />
  256. + <set name="material" val="PAPER" />
  257. + <set name="weight" val="30" />
  258. + <set name="price" val="35000" />
  259. + <set name="is_stackable" val="true" />
  260. + <set name="is_oly_restricted" val="true" />
  261. + <set name="handler" val="ItemSkills" />
  262. + <set name="commissionItemType" val="SCROLL_OTHER" />
  263. + <set name="is_tradable" val="false" />
  264. + <set name="is_dropable" val="false" />
  265. + <cond addName="1" msgId="113">
  266. + <player flyMounted="false" />
  267. + </cond>
  268. + <skills>
  269. + <skill id="40296" level="1" /> <!-- Scroll of Escape: Master Kerkir -->
  270. + </skills>
  271. </item>
  272. <item id="95587" name="Scroll of Escape: Grocer Evia" type="EtcItem">
  273. <!-- Can be used to teleport to Grocer Evia in the Wind Village. -->
  274. - <set name="icon" val="icon.etc_scroll_of_return_i04" />
  275. - <set name="default_action" val="SKILL_REDUCE" />
  276. - <set name="material" val="PAPER" />
  277. - <set name="weight" val="5" />
  278. - <set name="is_tradable" val="false" />
  279. - <set name="is_dropable" val="false" />
  280. - <set name="is_sellable" val="false" />
  281. + <set name="icon" val="icon.etc_scroll_of_return_i04" />
  282. + <set name="default_action" val="SKILL_REDUCE" />
  283. + <set name="material" val="PAPER" />
  284. + <set name="weight" val="30" />
  285. + <set name="price" val="35000" />
  286. + <set name="is_stackable" val="true" />
  287. + <set name="is_oly_restricted" val="true" />
  288. + <set name="handler" val="ItemSkills" />
  289. + <set name="commissionItemType" val="SCROLL_OTHER" />
  290. + <set name="is_tradable" val="false" />
  291. + <set name="is_dropable" val="false" />
  292. + <cond addName="1" msgId="113">
  293. + <player flyMounted="false" />
  294. + </cond>
  295. + <skills>
  296. + <skill id="40297" level="1" /> <!-- Scroll of Escape: Grocer Evia -->
  297. + </skills>
  298. </item>
  299. <item id="95588" name="Scroll of Escape: Gorgon Flower Garden" type="EtcItem">
  300. <!-- Can be used to teleport to the Gorgon Flower Garden. -->
  301. - <set name="icon" val="icon.etc_scroll_of_return_i04" />
  302. - <set name="default_action" val="SKILL_REDUCE" />
  303. - <set name="material" val="PAPER" />
  304. - <set name="weight" val="5" />
  305. - <set name="is_tradable" val="false" />
  306. - <set name="is_dropable" val="false" />
  307. - <set name="is_sellable" val="false" />
  308. + <set name="icon" val="icon.etc_scroll_of_return_i04" />
  309. + <set name="default_action" val="SKILL_REDUCE" />
  310. + <set name="material" val="PAPER" />
  311. + <set name="weight" val="30" />
  312. + <set name="price" val="35000" />
  313. + <set name="is_stackable" val="true" />
  314. + <set name="is_oly_restricted" val="true" />
  315. + <set name="handler" val="ItemSkills" />
  316. + <set name="commissionItemType" val="SCROLL_OTHER" />
  317. + <set name="is_tradable" val="false" />
  318. + <set name="is_dropable" val="false" />
  319. + <cond addName="1" msgId="113">
  320. + <player flyMounted="false" />
  321. + </cond>
  322. + <skills>
  323. + <skill id="40299" level="1" /> <!-- Scroll of Escape: Gorgon Flower Garden -->
  324. + </skills>
  325. </item>
  326. <item id="95589" name="Scroll of Escape: Death Pass" type="EtcItem">
  327. <!-- Can be used to teleport to the Death Pass. -->
  328. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml
  329. IDEA additional info:
  330. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  331. <+>UTF-8
  332. ===================================================================
  333. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  334. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml (date 1615316152653)
  335. @@ -1036,11 +1036,17 @@
  336. <item id="95688" name="Scroll: Enchant Adventurer's Talisman" type="EtcItem">
  337. <!-- Required for enchanting Adventurer's Talisman. -->
  338. <set name="icon" val="icon.aden_talisman_scroll" />
  339. - <set name="default_action" val="SKILL_REDUCE" />
  340. - <set name="material" val="PAPER" />
  341. - <set name="is_tradable" val="false" />
  342. - <set name="is_dropable" val="false" />
  343. - <set name="is_sellable" val="false" />
  344. + <set name="default_action" val="SKILL_REDUCE" />
  345. + <set name="material" val="PAPER" />
  346. + <set name="is_tradable" val="false" />
  347. + <set name="is_dropable" val="false" />
  348. + <set name="is_sellable" val="false" />
  349. + <set name="is_stackable" val="true" />
  350. + <set name="etcitem_type" val="ENCHT_AM" /> <!-- ENCHT_AM -->
  351. + <set name="handler" val="EnchantScrolls" />
  352. + <skills>
  353. + <skill id="40338" level="1" /> <!-- Scroll: Enchant Adventurer's Talisman -->
  354. + </skills>
  355. </item>
  356. <item id="95689" name="Young Knight's Shield" type="Armor">
  357. <set name="icon" val="icon.shield_leather_shield_i00" />
  358. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
  359. IDEA additional info:
  360. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  361. <+>UTF-8
  362. ===================================================================
  363. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  364. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java (date 1615319277643)
  365. @@ -79,8 +79,13 @@
  366. case "30857-03.htm":
  367. {
  368. qs.startQuest();
  369. - giveItems(player, ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT);
  370. - giveItems(player, ADVENTURER_SHEEP_HAT);
  371. + //TODO find a better way to do this: Temp fix for not regive items when already have them in inventory (bugging abort and re-accepting)
  372. + if(player.getInventory().getItemsByItemId(ADVENTURER_SHEEP_HAT.getId()).isEmpty()) {
  373. + giveItems(player, ADVENTURER_SHEEP_HAT);
  374. + }
  375. + if(player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT.getId()).isEmpty()) {
  376. + giveItems(player, ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT);
  377. + }
  378. htmltext = event;
  379. break;
  380. }
  381. @@ -110,8 +115,14 @@
  382. case "30857-05.html":
  383. {
  384. qs.startQuest();
  385. - giveItems(player, ENCHANT_SCROLL_ADVENTURER_BELT);
  386. - giveItems(player, ADVENTURER_BELT);
  387. +
  388. + //TODO find a better way to do this: Temp fix for not regive items when already have them in inventory (bugging abort and re-accepting)
  389. + if(player.getInventory().getItemsByItemId(ADVENTURER_BELT.getId()).isEmpty()) {
  390. + giveItems(player, ADVENTURER_BELT);
  391. + }
  392. + if(player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_BELT.getId()).isEmpty()) {
  393. + giveItems(player, ENCHANT_SCROLL_ADVENTURER_BELT);
  394. + }
  395. htmltext = event;
  396. break;
  397. }
  398. @@ -141,8 +152,14 @@
  399. case "30857-07.html":
  400. {
  401. qs.startQuest();
  402. - giveItems(player, ENCHANT_SCROLL_ADVENTURER_CLOAK);
  403. - giveItems(player, ADVENTURER_CLOAK);
  404. +
  405. + //TODO find a better way to do this: Temp fix for not regive items when already have them in inventory (bugging abort and re-accepting)
  406. + if(player.getInventory().getItemsByItemId(ADVENTURER_CLOAK.getId()).isEmpty()) {
  407. + giveItems(player, ADVENTURER_CLOAK);
  408. + }
  409. + if(player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_CLOAK.getId()).isEmpty()) {
  410. + giveItems(player, ENCHANT_SCROLL_ADVENTURER_CLOAK);
  411. + }
  412. htmltext = event;
  413. break;
  414. }
  415. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
  416. IDEA additional info:
  417. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  418. <+>UTF-8
  419. ===================================================================
  420. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  421. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java (date 1615319390119)
  422. @@ -18,6 +18,7 @@
  423.  
  424. import org.l2jmobius.gameserver.model.actor.Npc;
  425. import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  426. +import org.l2jmobius.gameserver.model.holders.ItemHolder;
  427. import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
  428. import org.l2jmobius.gameserver.model.quest.Quest;
  429. import org.l2jmobius.gameserver.model.quest.QuestState;
  430. @@ -32,8 +33,10 @@
  431. // NPC
  432. private static final int CAPTAIN_BATHIS = 30332;
  433. // Item
  434. - private static final int TALISMAN_OF_ADEN = 91745;
  435. - // Misc
  436. + private static final ItemHolder TALISMAN_OF_ADEN = new ItemHolder(91745, 1);
  437. + private static final ItemHolder TALISMAN_OF_ADEN_ENCHANT = new ItemHolder(91756, 1);
  438. +
  439. + // Misc
  440. private static final int MIN_LEVEL = 25;
  441.  
  442. public Q10971_TalismanEnchant()
  443. @@ -69,6 +72,13 @@
  444. {
  445. qs.startQuest();
  446. player.sendPacket(new ExTutorialShowId(47));
  447. + //TODO find a better way to do this: Temp fix for not regive items when already have them in inventory (bugging abort and re-accepting)
  448. + if(player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN.getId()).isEmpty()) {
  449. + giveItems(player, TALISMAN_OF_ADEN);
  450. + }
  451. + if(player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN_ENCHANT.getId()).isEmpty()) {
  452. + giveItems(player, TALISMAN_OF_ADEN_ENCHANT);
  453. + }
  454. htmltext = event;
  455. break;
  456. }
  457. @@ -88,7 +98,7 @@
  458. else if (qs.isStarted())
  459. {
  460. boolean foundEnchant = false;
  461. - SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN))
  462. + SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN.getId()))
  463. {
  464. if (item.getEnchantLevel() > 0)
  465. {
  466. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml
  467. IDEA additional info:
  468. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  469. <+>UTF-8
  470. ===================================================================
  471. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  472. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml (date 1615313376285)
  473. @@ -522,22 +522,87 @@
  474. </skill>
  475. <skill id="40296" toLevel="1" name="Scroll of Escape: Master Kerkir">
  476. <!-- Can be used to teleport to Master Kerkir in the Wind Village. -->
  477. - <icon>icon.skill0000</icon>
  478. - <operateType>A1</operateType>
  479. + <hitTime>500</hitTime>
  480. + <isMagic>2</isMagic> <!-- Static Skill -->
  481. + <itemConsumeCount>1</itemConsumeCount>
  482. + <itemConsumeId>95586</itemConsumeId>
  483. + <magicLevel>1</magicLevel>
  484. + <operateType>A1</operateType>
  485. + <magicCriticalRate>5</magicCriticalRate>
  486. + <targetType>SELF</targetType>
  487. + <affectScope>SINGLE</affectScope>
  488. + <conditions>
  489. + <condition name="OpAlignment">
  490. + <affectType>CASTER</affectType>
  491. + <alignment>LAWFUL</alignment>
  492. + </condition>
  493. + <condition name="OpCanEscape" />
  494. + </conditions>
  495. + <effects>
  496. + <effect name="Teleport">
  497. + <x>102609</x>
  498. + <y>56031</y>
  499. + <z>-4032</z>
  500. + </effect>
  501. + </effects>
  502. </skill>
  503. <skill id="40297" toLevel="1" name="Scroll of Escape: Grocer Evia">
  504. <!-- Can be used to teleport to Grocer Evia in the Wind Village. -->
  505. - <icon>icon.skill0000</icon>
  506. - <operateType>A1</operateType>
  507. +
  508. + <hitTime>500</hitTime>
  509. + <isMagic>2</isMagic> <!-- Static Skill -->
  510. + <itemConsumeCount>1</itemConsumeCount>
  511. + <itemConsumeId>95587</itemConsumeId>
  512. + <magicLevel>1</magicLevel>
  513. + <operateType>A1</operateType>
  514. + <magicCriticalRate>5</magicCriticalRate>
  515. + <targetType>SELF</targetType>
  516. + <affectScope>SINGLE</affectScope>
  517. + <conditions>
  518. + <condition name="OpAlignment">
  519. + <affectType>CASTER</affectType>
  520. + <alignment>LAWFUL</alignment>
  521. + </condition>
  522. + <condition name="OpCanEscape" />
  523. + </conditions>
  524. + <effects>
  525. + <effect name="Teleport">
  526. + <x>105091</x>
  527. + <y>57525</y>
  528. + <z>-3928</z>
  529. + </effect>
  530. + </effects>
  531. </skill>
  532. <skill id="40298" toLevel="1" name="Scroll of Escape: High Priest Maximilian">
  533. <!-- Can be used to teleport to High Priest Maximilian in Giran. -->
  534. <icon>icon.skill0000</icon>
  535. <operateType>A1</operateType>
  536. </skill>
  537. - <skill id="40299" toLevel="1" name="Scroll of Escape: Gorgon Flower Garden">
  538. + <skill id="95588" toLevel="1" name="Scroll of Escape: Gorgon Flower Garden">
  539. <!-- Can be used to teleport to the Gorgon Flower Garden. -->
  540. - <icon>icon.skill0000</icon>
  541. - <operateType>A1</operateType>
  542. + <hitTime>500</hitTime>
  543. + <isMagic>2</isMagic> <!-- Static Skill -->
  544. + <itemConsumeCount>1</itemConsumeCount>
  545. + <itemConsumeId>95588</itemConsumeId>
  546. + <magicLevel>1</magicLevel>
  547. + <operateType>A1</operateType>
  548. + <magicCriticalRate>5</magicCriticalRate>
  549. + <targetType>SELF</targetType>
  550. + <affectScope>SINGLE</affectScope>
  551. + <conditions>
  552. + <condition name="OpAlignment">
  553. + <affectType>CASTER</affectType>
  554. + <alignment>LAWFUL</alignment>
  555. + </condition>
  556. + <condition name="OpCanEscape" />
  557. + </conditions>
  558. + <effects>
  559. + <effect name="Teleport">
  560. + <x>105068</x>
  561. + <y>57525</y>
  562. + <z>-3936</z>
  563. + </effect>
  564. + </effects>
  565. +
  566. </skill>
  567. </list>
  568. Index: L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml
  569. IDEA additional info:
  570. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  571. <+>UTF-8
  572. ===================================================================
  573. --- L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml (revision ff30706137b35f6212589bbc025cdb3cb60de881)
  574. +++ L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml (date 1615316232959)
  575. @@ -191,9 +191,14 @@
  576. <operateType>A1</operateType>
  577. </skill>
  578. <skill id="40338" toLevel="1" name="Scroll: Enchant Adventurer's Talisman">
  579. - <!-- AUTO GENERATED SKILL TODO: FIX IT -->
  580. - <icon>icon.skill0000</icon>
  581. - <operateType>A1</operateType>
  582. + <icon>icon.giant_item_equip</icon>
  583. + <operateType>A1</operateType>
  584. + <isMagic>2</isMagic> <!-- Static Skill -->
  585. + <magicLevel>1</magicLevel>
  586. + <magicCriticalRate>5</magicCriticalRate>
  587. + <hitCancelTime>0</hitCancelTime>
  588. + <targetType>ITEM</targetType>
  589. + <affectScope>SINGLE</affectScope>
  590. </skill>
  591. <skill id="40339" toLevel="1" name="17th Anniversary Blessing">
  592. <!-- <font color="00DCFF"><Great discounts for death penalty recovery cost.></font> Lost item recovery price is $s1 XP recovery price is $s2 -->
  593.  
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!