API tools faq
paste
CostyKiller

BM and Merchant of Mammon Update

CostyKiller
Oct 9th, 2020
231
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 17.27 KB | None | 0 0
raw download clone embed print report
  1. Index: dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html
  2. ===================================================================
  3. --- dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html   (revision 7680)
  4. +++ dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html   (working copy)
  5. @@ -1,4 +1,4 @@
  6. -<html><head><body>Black Marketeer of Mammon:<br>
  7. +<html><body>Black Marketeer of Mammon:<br>
  8.  <font color="FF0000">[Exchange failure]</font><br>
  9.  You've entered an invalid value. Please input a correct amount.<br>
  10.  <Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest BlackMarketeerOfMammon 31092-01.html">Back</Button>
  11. Index: dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html
  12. ===================================================================
  13. --- dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html   (revision 7680)
  14. +++ dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html   (working copy)
  15. @@ -1,4 +1,4 @@
  16. -<html><head><body>Black Marketeer of Mammon:<br>
  17. +<html><body>Black Marketeer of Mammon:<br>
  18.  <font color="FF0000">[Exchange failure]</font><br>
  19.  You don't have enough of the item that you're trying to exchange.<br>
  20.  <Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest BlackMarketeerOfMammon 31092-01.html">Back</Button>
  21. Index: dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html
  22. ===================================================================
  23. --- dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html   (revision 7680)
  24. +++ dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html   (nonexistent)
  25. @@ -1,7 +0,0 @@
  26. -<html><body>Black Marketeer of Mammon:<br>
  27. -Do you have a <font color="LEVEL">Guard Agathion Fragment</font>? Then you've come to the right place. I use those fragments to create <font color="LEVEL">Agathion Charms containing the power of Masia's, Paulina's or Tersi's Guard</font>.<br>
  28. -Also, I make exchanges with <font color="LEVEL">Book of Growth: Guard Agathion</font> which helps with the growth of the Guard Agathion. You'll need <font color="LEVEL">Angel's Breath</font> to exchange and it's sold a Merchant of Mammon.<br>
  29. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 310922001">"Exchange for Guard Agathion Charm."</Button>
  30. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 310922002">"Exchange for Book of Growth: Guard Agathion"</Button>
  31. -<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest BlackMarketeerOfMammon 31092.html">To the beginning.</Button>
  32. -</body></html>
  33. \ No newline at end of file
  34. Index: dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html
  35. ===================================================================
  36. --- dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html  (revision 7680)
  37. +++ dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html  (working copy)
  38. @@ -1,5 +1,8 @@
  39.  <html><body>Black Marketeer of Mammon:<br>
  40.  The LordHush!<br>
  41. -TraditioThe government is out to get me, so I am forced to do business in the shadows.<br>
  42. +The government is out to get me, so I am forced to do business in the shadows.<br>
  43.  <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest BlackMarketeerOfMammon 31092-01.html">"I want to exchange Ancient Adena for Adena."</Button>
  44. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 31092001">"I want to upgrade Talisman of Protection."</Button>
  45. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 31092002">"I want to get a Citrine Pendant."</Button>
  46. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 31092003">"I want to get a Proof of Battle (ForHonor Quest)."</Button>
  47.  </body></html>
  48. \ No newline at end of file
  49. Index: dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
  50. ===================================================================
  51. --- dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java (revision 7680)
  52. +++ dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java (working copy)
  53. @@ -45,7 +45,7 @@
  54.     public String onAdvEvent(String event, Npc npc, PlayerInstance player)
  55.     {
  56.         String htmltext = event;
  57. -       if (event.equals("31092-01.html") || event.equals("31092-05.html"))
  58. +       if (event.equals("31092-01.html"))
  59.         {
  60.             return event;
  61.         }
  62. Index: dist/game/data/multisell/310920001.xml
  63. ===================================================================
  64. --- dist/game/data/multisell/310920001.xml  (nonexistent)
  65. +++ dist/game/data/multisell/310920001.xml  (working copy)
  66. @@ -0,0 +1,78 @@
  67. +<?xml version="1.0" encoding="UTF-8"?>
  68. +<list isChanceMultisell="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  69. +   <npcs>
  70. +       <npc>31092</npc> <!-- Black Marketeer of Mammon -->
  71. +   </npcs>
  72. +   <item>
  73. +       <ingredient id="80637" count="1" /> <!-- Talisman of Protection Stage 1 -->
  74. +       <ingredient id="80637" count="1" /> <!-- Talisman of Protection Stage 1 -->
  75. +       <ingredient id="57" count="50000000" /> <!-- Adena -->
  76. +       <production id="80638" count="1" chance="0" /> <!-- Talisman of Protection Stage 2 -->
  77. +       <production id="80638" count="1" chance="45" /> <!-- Talisman of Protection Stage 2 -->
  78. +       <production id="80637" count="1" chance="55" /> <!-- Talisman of Protection Stage 1 -->
  79. +   </item>
  80. +   <item>
  81. +       <ingredient id="80638" count="1" /> <!-- Talisman of Protection Stage 2 -->
  82. +       <ingredient id="80638" count="1" /> <!-- Talisman of Protection Stage 2 -->
  83. +       <ingredient id="57" count="60000000" /> <!-- Adena -->
  84. +       <production id="80639" count="1" chance="0" /> <!-- Talisman of Protection Stage 3 -->
  85. +       <production id="80639" count="1" chance="45" /> <!-- Talisman of Protection Stage 3 -->
  86. +       <production id="80637" count="1" chance="55" /> <!-- Talisman of Protection Stage 1 -->
  87. +   </item>
  88. +   <item>
  89. +       <ingredient id="80639" count="1" /> <!-- Talisman of Protection Stage 3 -->
  90. +       <ingredient id="80639" count="1" /> <!-- Talisman of Protection Stage 3 -->
  91. +       <ingredient id="57" count="70000000" /> <!-- Adena -->
  92. +       <production id="80640" count="1" chance="0" /> <!-- Talisman of Protection Stage 4 -->
  93. +       <production id="80640" count="1" chance="40" /> <!-- Talisman of Protection Stage 4 -->
  94. +       <production id="80637" count="1" chance="60" /> <!-- Talisman of Protection Stage 1 -->
  95. +   </item>
  96. +   <item>
  97. +       <ingredient id="80640" count="1" /> <!-- Talisman of Protection Stage 4 -->
  98. +       <ingredient id="80640" count="1" /> <!-- Talisman of Protection Stage 4 -->
  99. +       <ingredient id="57" count="80000000" /> <!-- Adena -->
  100. +       <production id="80641" count="1" chance="0" /> <!-- Talisman of Protection Stage 5 -->
  101. +       <production id="80641" count="1" chance="40" /> <!-- Talisman of Protection Stage 5 -->
  102. +       <production id="80637" count="1" chance="60" /> <!-- Talisman of Protection Stage 1 -->
  103. +   </item>
  104. +   <item>
  105. +       <ingredient id="80641" count="1" /> <!-- Talisman of Protection Stage 5 -->
  106. +       <ingredient id="80641" count="1" /> <!-- Talisman of Protection Stage 5 -->
  107. +       <ingredient id="57" count="80000000" /> <!-- Adena -->
  108. +       <production id="80642" count="1" chance="0" /> <!-- Talisman of Protection Stage 6 -->
  109. +       <production id="80642" count="1" chance="35" /> <!-- Talisman of Protection Stage 6 -->
  110. +       <production id="80637" count="1" chance="65" /> <!-- Talisman of Protection Stage 1 -->
  111. +   </item>
  112. +   <item>
  113. +       <ingredient id="80642" count="1" /> <!-- Talisman of Protection Stage 6 -->
  114. +       <ingredient id="80642" count="1" /> <!-- Talisman of Protection Stage 6 -->
  115. +       <ingredient id="57" count="90000000" /> <!-- Adena -->
  116. +       <production id="80643" count="1" chance="0" /> <!-- Talisman of Protection Stage 7 -->
  117. +       <production id="80643" count="1" chance="35" /> <!-- Talisman of Protection Stage 7 -->
  118. +       <production id="80637" count="1" chance="65" /> <!-- Talisman of Protection Stage 1 -->
  119. +   </item>
  120. +   <item>
  121. +       <ingredient id="80643" count="1" /> <!-- Talisman of Protection Stage 7 -->
  122. +       <ingredient id="80643" count="1" /> <!-- Talisman of Protection Stage 7 -->
  123. +       <ingredient id="57" count="100000000" /> <!-- Adena -->
  124. +       <production id="80644" count="1" chance="0" /> <!-- Talisman of Protection Stage 8 -->
  125. +       <production id="80644" count="1" chance="30" /> <!-- Talisman of Protection Stage 8 -->
  126. +       <production id="80637" count="1" chance="70" /> <!-- Talisman of Protection Stage 1 -->
  127. +   </item>
  128. +   <item>
  129. +       <ingredient id="80644" count="1" /> <!-- Talisman of Protection Stage 8 -->
  130. +       <ingredient id="80644" count="1" /> <!-- Talisman of Protection Stage 8 -->
  131. +       <ingredient id="57" count="110000000" /> <!-- Adena -->
  132. +       <production id="80645" count="1" chance="0" /> <!-- Talisman of Protection Stage 9 -->
  133. +       <production id="80645" count="1" chance="30" /> <!-- Talisman of Protection Stage 9 -->
  134. +       <production id="80637" count="1" chance="70" /> <!-- Talisman of Protection Stage 1 -->
  135. +   </item>
  136. +   <item>
  137. +       <ingredient id="80645" count="1" /> <!-- Talisman of Protection Stage 9 -->
  138. +       <ingredient id="80645" count="1" /> <!-- Talisman of Protection Stage 9 -->
  139. +       <ingredient id="57" count="110000000" /> <!-- Adena -->
  140. +       <production id="80646" count="1" chance="0" /> <!-- Talisman of Protection Stage 10 -->
  141. +       <production id="80646" count="1" chance="30" /> <!-- Talisman of Protection Stage 10 -->
  142. +       <production id="80637" count="1" chance="70" /> <!-- Talisman of Protection Stage 1 -->
  143. +   </item>
  144. +</list>
  145. \ No newline at end of file
  146. Index: dist/game/data/multisell/310920002.xml
  147. ===================================================================
  148. --- dist/game/data/multisell/310920002.xml  (nonexistent)
  149. +++ dist/game/data/multisell/310920002.xml  (working copy)
  150. @@ -0,0 +1,12 @@
  151. +<?xml version="1.0" encoding="UTF-8"?>
  152. +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  153. +   <npcs>
  154. +       <npc>31092</npc> <!-- Black Marketeer of Mammon -->
  155. +   </npcs>
  156. +   <item>
  157. +       <ingredient id="57" count="120000000" /> <!-- Adena -->
  158. +       <ingredient id="17371" count="200" /> <!-- Crystal (R-Grade) -->   
  159. +       <ingredient id="45639" count="1" /> <!-- Citrine Pendant Fragment -->
  160. +       <production id="45640" count="1" /> <!-- Citrine Pendant -->
  161. +   </item>
  162. +</list>
  163. \ No newline at end of file
  164. Index: dist/game/data/multisell/310920003.xml
  165. ===================================================================
  166. --- dist/game/data/multisell/310920003.xml  (nonexistent)
  167. +++ dist/game/data/multisell/310920003.xml  (working copy)
  168. @@ -0,0 +1,10 @@
  169. +<?xml version="1.0" encoding="UTF-8"?>
  170. +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  171. +   <npcs>
  172. +       <npc>31092</npc> <!-- Black Marketeer of Mammon -->
  173. +   </npcs>
  174. +   <item>
  175. +       <ingredient id="45584" count="50" /> <!-- Mark of Battle -->
  176. +       <production id="45873" count="1" /> <!-- Proof of Battle 2 (For Honor Quest) -->
  177. +   </item>
  178. +</list>
  179. \ No newline at end of file
  180. Index: dist/game/data/scripts/ai/others/Mammons/33739-02.html
  181. ===================================================================
  182. --- dist/game/data/scripts/ai/others/Mammons/33739-02.html  (revision 7680)
  183. +++ dist/game/data/scripts/ai/others/Mammons/33739-02.html  (working copy)
  184. @@ -1,7 +1,7 @@
  185. -<html><body>Black Marketeer of Mammon:<br>
  186. +<html><body>Merchant of Mammon:<br>
  187.  Do you have a <font color="LEVEL">Guard Agathion Fragment</font>? Then you've come to the right place. I use those fragments to create <font color="LEVEL">Agathion Charms containing the power of Masia's, Paulina's or Tersi's Guard</font>.<br>
  188.  Also, I make exchanges with <font color="LEVEL">Book of Growth: Guard Agathion</font> which helps with the growth of the Guard Agathion. You'll need <font color="LEVEL">Angel's Breath</font> to exchange and it's sold a Merchant of Mammon.<br>
  189. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 310922001">"Exchange for Guard Agathion Charm."</Button>
  190. -<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 310922002">"Exchange for Book of Growth: Guard Agathion"</Button>
  191. -<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest BlackMarketeerOfMammon 33739.html">To the beginning.</Button>
  192. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 337390001">"Exchange for Guard Agathion Charm."</Button>
  193. +<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 337390002">"Exchange for Book of Growth: Guard Agathion"</Button>
  194. +<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Mammons 33739.html">To the beginning.</Button>
  195.  </body></html>
  196. \ No newline at end of file
  197. Index: dist/game/data/multisell/310922001.xml
  198. ===================================================================
  199. --- dist/game/data/multisell/310922001.xml  (revision 7680)
  200. +++ dist/game/data/multisell/310922001.xml  (nonexistent)
  201. @@ -1,21 +0,0 @@
  202. -<?xml version="1.0" encoding="UTF-8"?>
  203. -<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  204. -   <npcs>
  205. -       <npc>33739</npc> <!-- Merchant of Mammon -->
  206. -   </npcs>
  207. -   <item>
  208. -       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  209. -       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  210. -       <production count="1" id="48572" /> <!-- Masia's Guard Agathion Charm -->
  211. -   </item>
  212. -   <item>
  213. -       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  214. -       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  215. -       <production count="1" id="48573" /> <!-- Paulina's Guard Agathion Charm -->
  216. -   </item>
  217. -   <item>
  218. -       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  219. -       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  220. -       <production count="1" id="48574" /> <!-- Tersi's Guard Agathion Charm -->
  221. -   </item>
  222. -</list>
  223. \ No newline at end of file
  224. Index: dist/game/data/multisell/310922002.xml
  225. ===================================================================
  226. --- dist/game/data/multisell/310922002.xml  (revision 7680)
  227. +++ dist/game/data/multisell/310922002.xml  (nonexistent)
  228. @@ -1,20 +0,0 @@
  229. -<?xml version="1.0" encoding="UTF-8"?>
  230. -<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  231. -   <npcs>
  232. -       <npc>33739</npc> <!-- Merchant of Mammon -->
  233. -   </npcs>
  234. -   <item>
  235. -       <ingredient id="57" count="4961000" /> <!-- Adena -->
  236. -       <production id="48569" count="1" /> <!-- Angel's Breath -->
  237. -   </item>
  238. -   <item>
  239. -       <ingredient id="48568" count="2" /> <!-- Guard Agathion Fragment -->
  240. -       <ingredient id="48569" count="4" /> <!-- Angel's Breath -->
  241. -       <production id="48570" count="1" /> <!-- Book of Growth: Guard Agathion -->
  242. -   </item>
  243. -   <item>
  244. -       <ingredient id="48570" count="5" /> <!-- Book of Growth: Guard Agathion -->
  245. -       <ingredient id="48569" count="1" /> <!-- Angel's Breath -->
  246. -       <production id="48571" count="1" /> <!-- Ancient Book of Growth: Guard Agathion -->
  247. -   </item>
  248. -</list>
  249. \ No newline at end of file
  250. Index: dist/game/data/multisell/337390001.xml
  251. ===================================================================
  252. --- dist/game/data/multisell/337390001.xml  (nonexistent)
  253. +++ dist/game/data/multisell/337390001.xml  (working copy)
  254. @@ -0,0 +1,21 @@
  255. +<?xml version="1.0" encoding="UTF-8"?>
  256. +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  257. +   <npcs>
  258. +       <npc>33739</npc> <!-- Merchant of Mammon -->
  259. +   </npcs>
  260. +   <item>
  261. +       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  262. +       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  263. +       <production count="1" id="48572" /> <!-- Masia's Guard Agathion Charm -->
  264. +   </item>
  265. +   <item>
  266. +       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  267. +       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  268. +       <production count="1" id="48573" /> <!-- Paulina's Guard Agathion Charm -->
  269. +   </item>
  270. +   <item>
  271. +       <ingredient count="10" id="48568" /> <!-- Guard Agathion Fragment -->
  272. +       <ingredient count="23" id="36513" /> <!-- Elcyum Powder -->
  273. +       <production count="1" id="48574" /> <!-- Tersi's Guard Agathion Charm -->
  274. +   </item>
  275. +</list>
  276. \ No newline at end of file
  277. Index: dist/game/data/multisell/337390002.xml
  278. ===================================================================
  279. --- dist/game/data/multisell/337390002.xml  (nonexistent)
  280. +++ dist/game/data/multisell/337390002.xml  (working copy)
  281. @@ -0,0 +1,20 @@
  282. +<?xml version="1.0" encoding="UTF-8"?>
  283. +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
  284. +   <npcs>
  285. +       <npc>33739</npc> <!-- Merchant of Mammon -->
  286. +   </npcs>
  287. +   <item>
  288. +       <ingredient id="57" count="4961000" /> <!-- Adena -->
  289. +       <production id="48569" count="1" /> <!-- Angel's Breath -->
  290. +   </item>
  291. +   <item>
  292. +       <ingredient id="48568" count="2" /> <!-- Guard Agathion Fragment -->
  293. +       <ingredient id="48569" count="4" /> <!-- Angel's Breath -->
  294. +       <production id="48570" count="1" /> <!-- Book of Growth: Guard Agathion -->
  295. +   </item>
  296. +   <item>
  297. +       <ingredient id="48570" count="5" /> <!-- Book of Growth: Guard Agathion -->
  298. +       <ingredient id="48569" count="1" /> <!-- Angel's Breath -->
  299. +       <production id="48571" count="1" /> <!-- Ancient Book of Growth: Guard Agathion -->
  300. +   </item>
  301. +</list>
  302. \ No newline at end of file
  303.  
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!