Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AmoriaPQ + ItemSort fix + revamped GMShop

Browse Source 
Implemented AmoriaPQ. Fixed an issue with ItemIdSortHandler where empty
vectors given to the sorting module would cause an exception thrown,
wiping players inventory items. Thanks to Vcoc, revamped shop data for
GMShop (shop id 1337). Mount quest for explorers now uses event script.
This commit is contained in:
ronancpl
2017-09-15 21:32:15 -03:00
parent 6abbc2947e
commit 1ffcf47f79
133 changed files with 63565 additions and 60865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wz/Item.wz/Etc/0403.img.xml
View File

@@ -6911,6 +6911,7 @@
<int name="price" value="1"/>
<int name="slotMax" value="1"/>
<int name="notSale" value="1"/>
<int name="pquest" value="1"/>
</imgdir>
</imgdir>
<imgdir name="04031595">
@@ -6924,6 +6925,7 @@
<int name="price" value="1"/>
<int name="slotMax" value="10"/>
<int name="notSale" value="1"/>
<int name="pquest" value="1"/>
</imgdir>
</imgdir>
<imgdir name="04031596">
@@ -6936,6 +6938,7 @@
</canvas>
<int name="price" value="1"/>
<int name="notSale" value="1"/>
<int name="pquest" value="1"/>
</imgdir>
</imgdir>
<imgdir name="04031597">
@@ -6949,6 +6952,7 @@
<int name="price" value="1"/>
<int name="slotMax" value="150"/>
<int name="notSale" value="1"/>
<int name="pquest" value="1"/>
</imgdir>
</imgdir>
<imgdir name="04031606">
@@ -11579,8 +11583,7 @@
<canvas name="iconRaw" width="32" height="29">
<vector name="origin" x="0" y="32"/>
</canvas>
<int name="price" value="1"/>
<int name="tradeBlock" value="1"/>
<int name="price" value="10000"/>
<int name="notSale" value="1"/>
<int name="slotMax" value="1"/>
</imgdir>

4326
wz/Map.wz/Map/Map6/670010100.img.xml
View File

File diff suppressed because it is too large Load Diff

31604
wz/Map.wz/Map/Map6/670010200.img.xml
View File

File diff suppressed because it is too large Load Diff

1
wz/Map.wz/Map/Map6/670010300.img.xml
View File

@@ -2128,6 +2128,7 @@
<int name="y" value="-843"/>
<int name="tm" value="670010400"/>
<string name="tn" value="st00"/>
<string name="script" value="apqClosed"/>
</imgdir>
<imgdir name="9">
<string name="pn" value="door00"/>

1
wz/Map.wz/Map/Map6/670010301.img.xml
View File

@@ -2023,6 +2023,7 @@
<int name="y" value="-841"/>
<int name="tm" value="670010400"/>
<string name="tn" value="st00"/>
<string name="script" value="apqClosed"/>
</imgdir>
</imgdir>
</imgdir>

1
wz/Map.wz/Map/Map6/670010302.img.xml
View File

@@ -2111,6 +2111,7 @@
<int name="y" value="-843"/>
<int name="tm" value="670010400"/>
<string name="tn" value="st00"/>
<string name="script" value="apqClosed"/>
</imgdir>
<imgdir name="9">
<string name="pn" value="door00"/>

5941
wz/Map.wz/Map/Map6/670010400.img.xml
View File

File diff suppressed because it is too large Load Diff

1
wz/Map.wz/Map/Map6/670010500.img.xml
View File

@@ -4154,6 +4154,7 @@
<int name="y" value="-178"/>
<int name="tm" value="670010600"/>
<string name="tn" value="st00"/>
<string name="script" value="apqClosed"/>
</imgdir>
</imgdir>
</imgdir>

51676
wz/Map.wz/Map/Map6/670010600.img.xml
View File

File diff suppressed because it is too large Load Diff

28355
wz/Map.wz/Map/Map6/670010750.img.xml
View File

File diff suppressed because it is too large Load Diff

2
wz/Quest.wz/Act.img.xml
View File

@@ -55827,7 +55827,7 @@
</imgdir>
<imgdir name="4">
<int name="count" value="-30"/>
<int name="id" value="4000440"/>
<int name="id" value="4031871"/>
</imgdir>
<imgdir name="5">
<int name="count" value="-10"/>

5
wz/Quest.wz/Check.img.xml
View File

@@ -15288,6 +15288,7 @@
</imgdir>
<imgdir name="1">
<int name="npc" value="2060005"/>
<int name="endmeso" value="10000000"/>
</imgdir>
</imgdir>
<imgdir name="20525">
@@ -15352,6 +15353,7 @@
<int name="count" value="200"/>
</imgdir>
</imgdir>
<int name="endmeso" value="5000000"/>
</imgdir>
</imgdir>
<imgdir name="20526">
@@ -15410,6 +15412,7 @@
<imgdir name="1">
<int name="npc" value="1102002"/>
<string name="endscript" value="q20526e"/>
<int name="endmeso" value="10000000"/>
</imgdir>
</imgdir>
<imgdir name="20527">
@@ -76694,7 +76697,7 @@
</imgdir>
<imgdir name="4">
<int name="count" value="30"/>
<int name="id" value="4000440"/>
<int name="id" value="4031871"/>
</imgdir>
<imgdir name="5">
<int name="id" value="4032475"/>

2
wz/Quest.wz/QuestInfo.img.xml
View File

@@ -10317,7 +10317,7 @@ Able to proceed to &apos;For the peace of Victoria Island...&apos; as next quest
<string name="name" value="Hunter&apos;s Profission"/>
<int name="area" value="50"/>
<string name="0" value="Scadur seems up to something big this time. I should move to El Nath and see what he is looking for..."/>
<string name="1" value="So Scadur is going to set-up a &quot;Leather Festival&quot; on El Nath... I&apos;m out to find and collect all these items for him. Hope the reward of this mission is really worth it...\n\n#i4000021# #t4000021# #c4000021# / #r50#k\n#i4000264# #t4000264# #c4000264# / #r10#k\n#i4000281# #t4000281# #c4000281# / #r10#k\n#i4000295# #t4000295# #c4000295# / #r10#k\n#i4000440# #t4000440# #c4000440# / #r10#k\n#i4031871# #t4031871# #c4031871# / #r10#k\n#i4032475# #t4032475# #c4032475# / #r5#k"/>
<string name="1" value="So Scadur is going to set-up a &quot;Leather Festival&quot; on El Nath... I&apos;m out to find and collect all these items for him. Hope the reward of this mission is really worth it...\n\n#i4000021# #t4000021# #c4000021# / #r50#k\n#i4000264# #t4000264# #c4000264# / #r10#k\n#i4000281# #t4000281# #c4000281# / #r10#k\n#i4000295# #t4000295# #c4000295# / #r10#k\n#i4031871# #t4031871# #c4031871# / #r10#k\n#i4032475# #t4032475# #c4032475# / #r5#k"/>
<string name="2" value="I helped Scadur in his &quot;Leather Festival&quot;, held on El Nath."/>
</imgdir>
<imgdir name="29000">

2
wz/Quest.wz/Say.img.xml
View File

@@ -64786,7 +64786,7 @@
<string name="0" value="The new hunting season has begun! I am planning to set-up a stand here at the El-Nath Market, selling #rleathers#k of the most fine quality. And for this, I am counting on you to bring all these leathers here, obviously for a #bvery nice reward#k. If you miss that season, you&apos;re not a serious hunter. It&apos;s that important. You know, I can give you a special tip on how to hunt effectively. Are you interested?"/>
<imgdir name="yes">
<string name="0" value="Oh hoho... Surely you do. As a hunter in training, you should get accostumed with the uncertainties that surround us. So, take this list of leathers I want you to bring, and bring them here, ok? If you pass this test, you will not regret it!"/>
<string name="1" value="You will need firstly regular #b#t4000021##k in a bunch of 60. In #rLeafre#k, hunt for some #b#t4000264##k. In #rMu Lung#k, hunt for some #b#t4000281##k and #b#t4000295##k, these are famous from around here, and quite rare to find. This one will be tricky: #b#t4000440##k... Well, these are found from Primitive Boars, you will need to go to Ludibrium somewhere and find a portal to jump back in the time. Hey, don&apos;t look to me like that, word has it that they in Ludibrium can do something about this sort of thing!"/>
<string name="1" value="You will need firstly regular #b#t4000021##k in a bunch of 60. In #rLeafre#k, hunt for some #b#t4000264##k. In #rMu Lung#k, hunt for some #b#t4000281##k and #b#t4000295##k, these are widely appreciated around here, and quite rare to find."/>
<string name="2" value="Finally, #b#t4032475##k. Normally their leather are not very consistent. However, once we are in open hunt season, they have some utility for adorning things. Said all that, good luck on your hunt and be safe."/>
</imgdir>
<imgdir name="no">

6
wz/String.wz/Consume.img.xml
View File

@@ -894,7 +894,7 @@
</imgdir>
<imgdir name="2022145">
<string name="name" value="Canned Peach"/>
<string name="desc" value="Homemade canned peach made by the weird pharmacist in Mu Lung, Dr. Do.\nRecovers around 1000 nHP."/>
<string name="desc" value="Homemade canned peach made by the weird pharmacist in Mu Lung, Dr. Do.\nRecovers around 1000 HP."/>
</imgdir>
<imgdir name="2022146">
<string name="name" value="Peach Juice"/>
@@ -6686,11 +6686,11 @@
</imgdir>
<imgdir name="2000020">
<string name="name" value="Red Potion for Noblesse"/>
<string name="desc" value="A special potion made out of herbs that exclusively grow in Ereve. Made specifically for Noblesss. nHP +50."/>
<string name="desc" value="A special potion made out of herbs that exclusively grow in Ereve. Made specifically for Noblesss. HP +50."/>
</imgdir>
<imgdir name="2000021">
<string name="name" value="Blue Potion for Noblesse"/>
<string name="desc" value="A special potion made out of herbs that exclusively grow in Ereve. Made specifically for Noblesss. nMP +100."/>
<string name="desc" value="A special potion made out of herbs that exclusively grow in Ereve. Made specifically for Noblesss. MP +100."/>
</imgdir>
<imgdir name="2022323">
<string name="name" value="Fish Net with a Catch"/>

4
wz/String.wz/Skill.img.xml
View File

@@ -12063,7 +12063,7 @@
<string name="h20" value="MP -30; Available for 120 sec, applies only 10% of Monster Knock-Back damage."/>
</imgdir>
<imgdir name="21110004">
<string name="name" value="Combo Penril"/>
<string name="name" value="Combo Fenrir"/>
<string name="desc" value="[Master Level : 30]\nShoots a wave of concentrated energy, mixing with the spirit of wolves. Can only be used when the #cCombo Count reaches at least 100.#\nRequired Skill : #cCombo Smash Level 10#\n[Command : #cArrow Key : Down + Right + attack key#]"/>
<string name="h1" value="Damage 510%, attacks up to 4 monsters at once"/>
<string name="h2" value="Damage 520%, attacks up to 4 monsters at once"/>
@@ -12269,7 +12269,7 @@
</imgdir>
<imgdir name="21120006">
<string name="name" value="Combo Tempest"/>
<string name="desc" value="Creates an ice that is so deadly that even a slight collision would kill the monster, while incurring significant damage to boss monsters as well. #cOnly avilable when the combo count reaches 200 or more#.\nRequired Skill : #cCombo Penril Level 10#\n[command : #cArrow Key : Down + Right + attck\#]"/>
<string name="desc" value="Creates an ice that is so deadly that even a slight collision would kill the monster, while incurring significant damage to boss monsters as well. #cOnly avilable when the combo count reaches 200 or more#.\nRequired Skill : #cCombo Fenrir Level 10#\n[command : #cArrow Key : Down + Right + attck\#]"/>
<string name="h1" value="1210% in damage against boss monsters, with ice available for 10 sec"/>
<string name="h2" value="1220% in damage against boss monsters, with ice available for 11 sec"/>
<string name="h3" value="1230% in damage against boss monsters, with ice available for 12 sec"/>