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

Using Java ThreadPool + Mob Skills & Event Instance patch + Eqp Merge

Browse Source 
Server source now uses Java ThreadPool, recycling used thread resources for next uses.
Added Grenade visual effect for other players.
Implemented an attempt towards unsynced mob behavior, where reportedly players were able to pin same mob in different sections of the map.
Solved several deadlock issues, mostly regarding character synchronized methods, event instance scripts and player/item vision-unvision.
Solved an issue where mobs would not cast some skills of it's skillset. Frequent behavior on low-leveled mobs.
Fixed a bug on 2nd Maker quest where players could complete it by merely disassembling an equipment.
New custom mechanic: equipment merge. Similarly to the Bazaar NPC, every equipment after the selected one is used up, and a fraction of their stat amounts are used as stat gains on the currently equipped items. If restrictions are enabled, players must be high-leveled and Maker lv3 to use it.
Skill Storm Break no longer uses up arrows.
Added a server flag to allow access for all Aran job skills from the beginning.
Implemented Battleship and Super Transformation questline scripts.
Fixed a desynchronization within pet position and cash inventory position, that could potentially lead to some inventory issues until relogin.
Improved timestamp handling in some handler classes. Spam detection is entirely a server-side matter, hence removed usage of client-sided timestamp content.
Refactored some pet response packets, improving some of their behaviors.
Fixed some quest issues: Maker lv1 and Omega Sector meteorite one.
This commit is contained in:
ronancpl
2018-11-10 17:48:35 -02:00
parent 00675ab95d
commit 5ee0cd1c98
120 changed files with 7424 additions and 6387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wz/Item.wz/Etc/0400.img.xml
View File

@@ -8438,6 +8438,7 @@
</canvas>
<int name="price" value="1"/>
<int name="slotMax" value="1"/>
<int name="quest" value="1"/>
</imgdir>
</imgdir>
<imgdir name="04001213">

14
wz/Map.wz/Map/Map2/200010000.img.xml
View File

@@ -775,20 +775,6 @@
<int name="rx0" value="35"/>
<int name="rx1" value="135"/>
</imgdir>
<imgdir name="37">
<string name="type" value="n"/>
<string name="id" value="9010012"/>
<int name="x" value="224"/>
<int name="y" value="-113"/>
<int name="mobTime" value="0"/>
<string name="limitedname" value="lie_2"/>
<int name="f" value="0"/>
<int name="hide" value="0"/>
<int name="fh" value="130"/>
<int name="cy" value="-106"/>
<int name="rx0" value="174"/>
<int name="rx1" value="274"/>
</imgdir>
</imgdir>
<imgdir name="0">
<imgdir name="info">

14
wz/Map.wz/Map/Map2/240010200.img.xml
View File

@@ -623,20 +623,6 @@
<int name="rx0" value="1960"/>
<int name="rx1" value="2810"/>
</imgdir>
<imgdir name="20">
<string name="type" value="n"/>
<string name="id" value="9010013"/>
<int name="x" value="1510"/>
<int name="y" value="292"/>
<int name="mobTime" value="0"/>
<string name="limitedname" value="lie_3"/>
<int name="f" value="1"/>
<int name="hide" value="0"/>
<int name="fh" value="78"/>
<int name="cy" value="302"/>
<int name="rx0" value="1460"/>
<int name="rx1" value="1560"/>
</imgdir>
</imgdir>
<imgdir name="reactor">
<imgdir name="0">

2770
wz/Map.wz/Map/Map2/261000000.img.xml
View File

File diff suppressed because it is too large Load Diff

36
wz/Map.wz/Map/Map6/600000000.img.xml
View File

@@ -11642,8 +11642,8 @@
<int name="y" value="183"/>
<int name="cy" value="201"/>
<int name="mobTime" value="0"/>
<int name="rx0" value="2640"/>
<int name="rx1" value="2654"/>
<int name="rx0" value="2636"/>
<int name="rx1" value="2650"/>
<int name="f" value="1"/>
<string name="type" value="n"/>
<int name="fh" value="473"/>
@@ -11678,8 +11678,8 @@
<int name="y" value="482"/>
<int name="cy" value="501"/>
<int name="mobTime" value="0"/>
<int name="rx0" value="3472"/>
<int name="rx1" value="3572"/>
<int name="rx0" value="3489"/>
<int name="rx1" value="3589"/>
<int name="f" value="1"/>
<string name="type" value="n"/>
<int name="fh" value="540"/>
@@ -11750,8 +11750,8 @@
<int name="y" value="358"/>
<int name="cy" value="381"/>
<int name="mobTime" value="0"/>
<int name="rx0" value="3199"/>
<int name="rx1" value="3299"/>
<int name="rx0" value="3197"/>
<int name="rx1" value="3297"/>
<int name="f" value="1"/>
<string name="type" value="n"/>
<int name="fh" value="510"/>
@@ -11929,5 +11929,29 @@
<string name="type" value="n"/>
<int name="fh" value="449"/>
</imgdir>
<imgdir name="27">
<string name="id" value="9000040"/>
<int name="x" value="807"/>
<int name="y" value="434"/>
<int name="cy" value="438"/>
<int name="mobTime" value="0"/>
<int name="rx0" value="757"/>
<int name="rx1" value="857"/>
<int name="f" value="0"/>
<string name="type" value="n"/>
<int name="fh" value="96"/>
</imgdir>
<imgdir name="28">
<string name="id" value="9000041"/>
<int name="x" value="710"/>
<int name="y" value="437"/>
<int name="cy" value="439"/>
<int name="mobTime" value="0"/>
<int name="rx0" value="660"/>
<int name="rx1" value="760"/>
<int name="f" value="0"/>
<string name="type" value="n"/>
<int name="fh" value="78"/>
</imgdir>
</imgdir>
</imgdir>

8171
wz/Map.wz/Map/Map8/801000000.img.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -34701,14 +34701,12 @@
<imgdir name="1">
</imgdir>
<imgdir name="0">
<int name="money" value="-10000"/>
</imgdir>
</imgdir>
<imgdir name="6031">
<imgdir name="1">
</imgdir>
<imgdir name="0">
<int name="money" value="-10000"/>
</imgdir>
</imgdir>
<imgdir name="6032">

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

@@ -12712,7 +12712,7 @@ Can proceed to the &quot;The Secrets Behind the Ring?&quot; quest.
<imgdir name="3329">
<string name="name" value="Keeny&apos;s Research on Roid"/>
<string name="0" value="#b#m261000000##k&apos;s favorite little Fairy #b#p2111005##k. Her dream is to one day become an alchemist herself, and apparently, she has already started a new research..."/>
<string name="1" value="#p2111005# was studying #o5110301#, the ones that the alchemists from Alcadno came up with. She said to thoroughly investigate #o5110301#, she&apos;ll need #t4000364#... I better get her #b80 #t4000364#k from #o5110301# for her, so she can continue her research. \n\n#i4000364##t4000364# #b#c4000364##k/80 "/>
<string name="1" value="#p2111005# was studying #o5110301#, the ones that the alchemists from Alcadno came up with. She said to thoroughly investigate #o5110301#, she&apos;ll need #t4000364#... I better get her #b80 #t4000364##k from #o5110301# for her, so she can continue her research. \n\n#i4000364##t4000364# #b#c4000364##k/80 "/>
<string name="2" value="I gave #p2111005# all the #t4000364#s she asked for. She broke out a wide grin while observing the complex-looking #t4000364#. She may be young, but she sure looks like an alchemist."/>
<int name="area" value="44"/>
</imgdir>

20
wz/Skill.wz/1310.img.xml
View File

@@ -1028,6 +1028,7 @@
<int name="x" value="205"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="2">
<string name="hs" value="h2"/>
@@ -1039,6 +1040,7 @@
<int name="x" value="210"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="3">
<string name="hs" value="h3"/>
@@ -1050,6 +1052,7 @@
<int name="x" value="215"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="4">
<string name="hs" value="h4"/>
@@ -1061,6 +1064,7 @@
<int name="x" value="220"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="5">
<string name="hs" value="h5"/>
@@ -1072,6 +1076,7 @@
<int name="x" value="225"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="6">
<string name="hs" value="h6"/>
@@ -1083,6 +1088,7 @@
<int name="x" value="230"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="7">
<string name="hs" value="h7"/>
@@ -1094,6 +1100,7 @@
<int name="x" value="235"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="8">
<string name="hs" value="h8"/>
@@ -1105,6 +1112,7 @@
<int name="x" value="240"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="9">
<string name="hs" value="h9"/>
@@ -1116,6 +1124,7 @@
<int name="x" value="245"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="10">
<string name="hs" value="h10"/>
@@ -1127,6 +1136,7 @@
<int name="x" value="250"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="11">
<string name="hs" value="h11"/>
@@ -1138,6 +1148,7 @@
<int name="x" value="255"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="12">
<string name="hs" value="h12"/>
@@ -1149,6 +1160,7 @@
<int name="x" value="260"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="13">
<string name="hs" value="h13"/>
@@ -1160,6 +1172,7 @@
<int name="x" value="265"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="14">
<string name="hs" value="h14"/>
@@ -1171,6 +1184,7 @@
<int name="x" value="270"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="15">
<string name="hs" value="h15"/>
@@ -1182,6 +1196,7 @@
<int name="x" value="275"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="16">
<string name="hs" value="h16"/>
@@ -1193,6 +1208,7 @@
<int name="x" value="280"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="17">
<string name="hs" value="h17"/>
@@ -1204,6 +1220,7 @@
<int name="x" value="285"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="18">
<string name="hs" value="h18"/>
@@ -1215,6 +1232,7 @@
<int name="x" value="290"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="19">
<string name="hs" value="h19"/>
@@ -1226,6 +1244,7 @@
<int name="x" value="295"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
<imgdir name="20">
<string name="hs" value="h20"/>
@@ -1237,6 +1256,7 @@
<int name="x" value="300"/>
<vector name="lt" x="-230" y="-90"/>
<vector name="rb" x="0" y="0"/>
<int name="bulletCount" value="0"/>
</imgdir>
</imgdir>
<imgdir name="hit">

40
wz/Skill.wz/1311.img.xml
View File

@@ -1633,121 +1633,121 @@
<string name="hs" value="h1"/>
<int name="mpCon" value="18"/>
<int name="damage" value="160"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="2">
<string name="hs" value="h2"/>
<int name="mpCon" value="18"/>
<int name="damage" value="170"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="3">
<string name="hs" value="h3"/>
<int name="mpCon" value="18"/>
<int name="damage" value="180"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="4">
<string name="hs" value="h4"/>
<int name="mpCon" value="18"/>
<int name="damage" value="190"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="5">
<string name="hs" value="h5"/>
<int name="mpCon" value="18"/>
<int name="damage" value="200"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="6">
<string name="hs" value="h6"/>
<int name="mpCon" value="23"/>
<int name="damage" value="210"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="7">
<string name="hs" value="h7"/>
<int name="mpCon" value="23"/>
<int name="damage" value="220"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="8">
<string name="hs" value="h8"/>
<int name="mpCon" value="23"/>
<int name="damage" value="230"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="9">
<string name="hs" value="h9"/>
<int name="mpCon" value="23"/>
<int name="damage" value="240"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="10">
<string name="hs" value="h10"/>
<int name="mpCon" value="23"/>
<int name="damage" value="250"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="11">
<string name="hs" value="h11"/>
<int name="mpCon" value="28"/>
<int name="damage" value="260"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="12">
<string name="hs" value="h12"/>
<int name="mpCon" value="28"/>
<int name="damage" value="270"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="13">
<string name="hs" value="h13"/>
<int name="mpCon" value="28"/>
<int name="damage" value="280"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="14">
<string name="hs" value="h14"/>
<int name="mpCon" value="28"/>
<int name="damage" value="290"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="15">
<string name="hs" value="h15"/>
<int name="mpCon" value="28"/>
<int name="damage" value="300"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="16">
<string name="hs" value="h16"/>
<int name="mpCon" value="33"/>
<int name="damage" value="310"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="17">
<string name="hs" value="h17"/>
<int name="mpCon" value="33"/>
<int name="damage" value="320"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="18">
<string name="hs" value="h18"/>
<int name="mpCon" value="33"/>
<int name="damage" value="330"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="19">
<string name="hs" value="h19"/>
<int name="mpCon" value="33"/>
<int name="damage" value="340"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
<imgdir name="20">
<string name="hs" value="h20"/>
<int name="mpCon" value="33"/>
<int name="damage" value="350"/>
<int name="attackCount" value="3"/>
<int name="bulletCount" value="3"/>
</imgdir>
</imgdir>
<imgdir name="ball">

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

@@ -8181,7 +8181,7 @@
<string name="desc" value="With a 70% success rate, raises the Mastery Level of #cHigh Mastery# to 20.\nJob: Aran\nCondition: Min Skill Lv. 5"/>
</imgdir>
<imgdir name="2290129">
<string name="name" value="[Mastery Book]High Mastery 30"/>
<string name="name" value="[Mastery Book] High Mastery 30"/>
<string name="desc" value="With a 50% success rate, raises the Mastery Level of #cHigh Mastery# to 30.\nJob: Aran\nCondition: Min Skill Lv. 15"/>
</imgdir>
<imgdir name="2290130">