Skip to content
Permalink
Browse files

== Memory leak & Skills ==

=General:
*Merged missing changes from 3ceam rev. 524

*Fixed an memory leak in some cases if an script-based atcommand fails.

*Added missing Elven Bow Drops.

*Added some more Champion Monsters & Items.

*Some random cleanup.

=Skills:
*RK_WINDCUTTER damage formula reviewed.

*RA_WUGSTRIKE damage formula corrected.

*SA_SPELLFIST implementation completed.

*Skill's delay that casted by AutoShadowSpell is applied.

*Holy light and magnus can't be casted by AutoShadowSpell.

*SO_STRIKING check the skills which are grant bonuses on the caster size.

*Shadow Form can't be dispelled.

*Some improvements to masquarade's rates.

*GN_MANDRAGORA only drains SP on success.

*GN_SPECIALPHARMACY consume item amounts fixed.
  • Loading branch information...
15peaces committed Dec 6, 2016
1 parent 00535f6 commit 4db722fbb3d23af5f840f6b0750585b32447d6a2
Showing with 477 additions and 212 deletions.
  1. +18 −0 Changelog-15-3athena.txt
  2. +31 −1 db/item_db2.txt
  3. +1 −1 db/mob_db.txt
  4. +21 −0 db/mob_db2.txt
  5. +153 −0 db/mob_skill_db2.txt
  6. +10 −10 npc/mobs/championmobs.txt
  7. +87 −48 src/map/battle.c
  8. +5 −1 src/map/npc.c
  9. +128 −122 src/map/skill.c
  10. +23 −29 src/map/status.c
@@ -4,6 +4,24 @@
// * Modifications.
// - Details.
//========================================
12/06/2016
r147 [15peaces]
*Merged missing changes from 3ceam rev. 524
*Fixed an memory leak in some cases if an script-based atcommand fails.
*Added missing Elven Bow Drops.
*Added some more Champion Monsters & Items.
*Some random cleanup.
*RK_WINDCUTTER damage formula reviewed.
*RA_WUGSTRIKE damage formula corrected.
*SA_SPELLFIST implementation completed.
*Skill's delay that casted by AutoShadowSpell is applied.
*Holy light and magnus can't be casted by AutoShadowSpell.
*SO_STRIKING check the skills which are grant bonuses on the caster size.
*Shadow Form can't be dispelled.
*Some improvements to masquarade's rates.
*GN_MANDRAGORA only drains SP on success.
*GN_SPECIALPHARMACY consume item amounts fixed.

12/01/2016
r146 [15peaces]
*Merged missing changes from 3ceam rev. 523
@@ -2230,7 +2230,7 @@
4695,V_Trentini_Card,True Trentini Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) set .@b,.@b+20; if(getequipweaponlv(-1) == 4) set .@b,.@b+20; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",20+.@b; },{},{}
4696,V_Alphoccio_Card,True Alphoccio Card,6,20,,10,,,,,,,,2,,,,,{ if(getrefine() > 9) set .@b,.@b+20; if(getequipweaponlv(-1) == 4) set .@b,.@b+20; bonus2 bSkillAtk,"WM_REVERBERATION",20+.@b; },{},{}

// New Items (Renewal)
// New Items (Renewal) (recheck itemtypes!)
12609,Old_Ore_Box,Old Ore Box,2,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ /*getgroupitem(IG_Old_Ore_Box);*/ },{},{}
12831,Potion_Box,Potion Box,2,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 545,100; getitem 546,100; getitem 547,100; getitem 505,100; },{},{}
17496,Lucky_Silvervine_Fruit_Box_III110,Lucky Silvervine Fruit Box III(110),18,10,,10,,,,,,,,,,,,,{ /*getgroupitem(IG_Lucky_Silvervine_Fruit_Box_III110);*/ },{},{}
@@ -2355,3 +2355,33 @@
18618,Airplane_Hat,Airplane Hat,4,20,,200,,8,,1,0xFFFFFFFE,63,2,256,,20,1,775,{},{},{}
18619,Thief_Bandana,Thief Bandana,4,20,,200,,1,,0,0xFFFFFFFE,63,2,256,,20,1,776,{ bonus3 bAutoSpell,"TF_STEAL",1,20; },{},{}
18620,Heart_Eye_Patch,Heart Eyepatch,4,5,,50,,2,,0,0xFFFFFFFF,63,2,512,,20,1,779,{},{},{}

// New Items (Renewal)
18685,Stardust_Hairband,Stardust Hairband,5,20,,1000,,0,,0,0xFFFFFFFF,63,2,256,,10,0,831,{},{},{}
18686,2011_RMSC_1,2011 RMSC 1,5,20,,2500,,20,,1,0xFFFFFFFF,63,2,256,,1,0,832,{ bonus bUnbreakableHelm,1; bonus bAllStats,5; },{},{}
18687,2011_RMSC_2,2011 RMSC 2,5,20,,2500,,20,,1,0xFFFFFFFF,63,2,256,,1,0,832,{ bonus bUnbreakableHelm,1; bonus bAllStats,3; },{},{}
18688,2011_RMSC_3,2011 RMSC 3,5,20,,2500,,20,,1,0xFFFFFFFF,63,2,256,,1,0,832,{ bonus bUnbreakableHelm,1; bonus bAllStats,1; },{},{}
18689,2011_RMSC_4,2011 RMSC 4,5,20,,10,,0,,0,0xFFFFFFFF,63,2,256,,1,0,832,{ bonus bUnbreakableHelm,1; },{},{}
18690,Sirt_Evil_Eye,Sirt Evil Eye,5,20,,400,,0,,0,0xFFFFFFFF,63,2,512,,50,0,345,{ bonus bUnbreakableHelm,1; bonus bStr,1; },{},{}
18691,Rising_Black_Dragon,Rising Black Dragon,5,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,1,1,863,{},{},{}
18692,Mike_Hat,Mike Hat,5,20,,200,,3,,1,0xFFFFFFFE,63,2,256,,1,1,837,{ bonus bDex,2; bonus bLuk,1; },{},{}
18693,Sleeping_Kitty_Cat,Sleeping Kitty Cat,5,20,,200,,4,,1,0xFFFFFFFE,63,2,256,,20,1,838,{ bonus2 bAddRace,RC_Brute,2; },{},{}
18694,Red_Hood,Red Hood,5,20,,200,,3,,1,0xFFFFFFFE,63,2,256,,20,1,839,{ bonus bCritical,10; },{},{}
19148,Santa_Poring_Balloon,Santa Poring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1428,{ bonus2 bAddItemGroupHealRate,IG_Candy,200; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19149,Poporing_Balloon,Poporing Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1429,{ bonus2 bAddEff,Eff_Poison,500; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19150,Metalring_Balloon,Metalring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1431,{ bonus3 bAutoSpell,"RG_STRIPWEAPON",1,50; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19151,Devilring_Balloon,Devilring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1434,{ bonus2 bAddEff,Eff_Curse,500; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19152,Angelring_Balloon,Angelring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1435,{ bonus2 bAddItemHealRate,504,100; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19153,Ghostring_Balloon,Ghostring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1436,{ bonus3 bAutoSpell,"MG_SOULSTRIKE",5,10; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19154,Arch_Angelring_Balloon,Arch Angelring Balloon,5,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1437,{ skill "ALL_RESURRECTION",1; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
19155,Demons_Eyes,Demon's Eyes,5,20,,10,,0,,0,0xFFFFFFFF,63,2,512,,60,0,1490,{ bonus2 bSubRace,RC_Player,3; bonus bFlee2,2; },{},{}
31060,C_Starfish_Headband,Costume Starfish Headband,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,793,{},{},{}
31061,C_Nipper_Hairpin,Costume Nipper Hairpin,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,470,{},{},{}
31062,C_Eleanor_Wig,Costume Eleanor Wig,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1502,{},{},{}
31063,C_Hair_Bun_Blue,Costume Hair Bun Blue,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1503,{},{},{}
31064,C_Hair_Bun_Red,Costume Hair Bun Red,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1504,{},{},{}
31065,C_Hair_Bun_Yellow,Costume Hair Bun Yellow,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1505,{},{},{}
31066,C_Hair_Bun_Green,Costume Hair Bun Green,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1506,{},{},{}
31067,C_Hair_Bun_Black,Costume Hair Bun Black,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1507,{},{},{}
31068,C_Hair_Bun_White,Costume Hair Bun White,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1508,{},{},{}
31069,C_Hair_Bun_Crimson,Costume Hair Bun Crimson,5,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1509,{},{},{}
@@ -254,7 +254,7 @@
1250,CHEPET,Chepet,Chepet,42,4950,0,1518,946,1,380,440,0,25,1,72,35,71,65,85,10,12,1,7,23,0x3695,400,672,672,288,0,0,0,0,0,0,0,0,7035,2500,912,750,512,5500,619,40,10019,5,508,1300,2508,5,0,0,0,0,4284,1
1251,KNIGHT_OF_WINDSTORM,Knight of Windstorm,Stormy Knight,77,240000,0,64350,21450,2,1425,1585,35,60,75,185,83,55,130,79,10,12,2,0,84,0x37B5,200,468,468,288,32175,10000,720,4500,2406,500,995,3000,1468,150,603,3000,617,4000,2621,200,2506,500,985,4559,5007,1,0,0,0,0,4318,1
1252,GARM,Garm,Garm,73,197000,0,50050,20020,3,1700,1900,40,45,85,126,82,65,95,60,10,12,2,2,81,0x37B5,400,608,408,336,25025,10000,7036,1000,603,3000,995,3000,7036,5500,1131,150,1256,500,1815,500,0,0,985,3977,984,2900,0,0,0,0,4324,1
1253,GARGOYLE,Gargoyle,Gargoyle,48,3950,0,1650,1650,9,290,360,10,10,15,61,20,20,126,40,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,912,3880,1039,500,0,0,0,0,2619,1,1769,2000,757,238,0,0,0,0,4149,1
1253,GARGOYLE,Gargoyle,Gargoyle,48,3950,0,1650,1650,9,290,360,10,10,15,61,20,20,126,40,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,912,3880,1039,500,0,0,0,0,2619,1,1769,2000,757,238,1746,5,0,0,4149,1
1254,RAGGLER,Raggler,Raggler,21,1020,0,218,140,1,102,113,0,5,18,10,32,20,39,35,10,12,0,2,24,0x3695,200,1000,900,384,0,0,0,0,0,0,0,0,7053,3000,916,5000,645,200,514,200,992,90,2225,7,756,32,0,0,0,0,4186,1
1255,NERAID,Neraid,Nereid,40,4120,0,1126,684,1,325,360,0,10,1,45,50,5,64,5,10,12,0,2,22,0x3695,200,776,576,288,0,0,0,0,0,0,0,0,1055,5100,7053,1000,510,230,1966,10,514,250,757,180,985,37,0,0,0,0,4167,1
1256,PEST,Pest,Pest,40,3240,0,1238,752,1,375,450,0,5,1,60,22,5,80,5,10,12,0,2,47,0x3695,165,700,648,480,0,0,0,0,0,0,0,0,1055,5500,7054,200,702,10,605,100,716,250,0,0,756,115,0,0,0,0,4315,1
@@ -163,3 +163,24 @@
2158,S_HORNET,Hornet,Hornet,8,169,0,19,15,1,22,27,5,5,6,20,8,10,17,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1
2159,S_GIANT_HORNET,Giant Hornet,Giant Hornet,56,13105,0,5785,2006,1,650,852,38,43,35,38,32,10,71,64,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,526,550,518,1200,522,12,610,15,1608,3,722,20,1736,15,0,0,0,0,4271,1
2160,S_LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,25103,0,13040,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x7795,100,672,500,192,0,0,0,0,0,0,0,0,939,9000,955,9000,943,3000,518,300,526,200,992,160,2744,2,0,0,0,0,0,0

// More Champion Monsters (renewal)
2826,C3_GARGOYLE,Gargoyle Ringleader,Gargoyle Ringleader,100,43860,1,5700,12810,9,677,916,98,43,100,61,60,57,120,70,10,12,1,6,64,0x2002085,200,1020,720,384,0,0,0,0,0,0,0,912,3880,1039,500,2506,2,1746,5,2619,1,1769,2000,757,238,0,0,0,0,4149,1
2827,C4_GARGOYLE,Furious Gargoyle,Furious Gargoyle,100,43860,1,5700,12810,9,676,915,98,43,100,79,60,57,120,70,10,12,1,6,64,0x2002085,200,1020,720,384,0,0,0,0,0,0,0,912,3880,1039,500,2506,2,1746,5,2619,1,1769,2000,757,238,0,0,0,0,4149,1
2828,C5_GALION,Elusive Galion,Elusive Galion,100,44105,1,5305,9945,1,711,964,100,62,106,79,62,45,108,36,10,12,1,2,44,0x620108B,150,864,624,360,0,0,0,0,0,0,0,0,7564,3000,919,3000,996,10,2531,5,0,0,0,0,0,0,0,0,0,0,4423,1
2829,C1_FUR_SEAL,Swift Seal,Swift Seal,47,6855,1,900,3030,1,167,208,42,16,37,40,30,39,35,19,10,12,1,2,21,0x3885,200,1612,622,583,0,0,0,0,0,0,0,0,912,4365,601,250,2310,5,7053,1200,1452,1,525,200,746,120,0,0,0,0,4312,1
2830,C2_FREEZER,Solid Freezer,Solid Freezer,94,99900,1,4665,13110,2,741,1030,127,38,68,47,50,45,69,25,10,12,1,2,41,0x3695,170,1260,960,672,0,0,0,0,0,0,0,0,967,4413,7070,850,7066,1250,912,1800,526,160,6256,200,689,100,0,0,0,0,4319,1
2831,C3_FREEZER,Freezer Ringleader,Freezer Ringleader,94,49950,1,4665,13110,2,741,1030,127,38,68,47,50,45,69,25,10,12,1,2,41,0x3695,170,1260,960,672,0,0,0,0,0,0,0,0,967,4413,7070,850,7066,1250,912,1800,526,160,6256,200,689,100,0,0,0,0,4319,1
2832,C4_FERUS_,Furious Ferus,Furious Ferus,126,195270,1,13600,26880,2,1085,1520,111,33,91,74,57,61,87,51,10,12,2,9,42,0x3095,120,108,576,432,0,0,0,0,0,0,0,0,579,5100,1035,1000,1036,3589,7445,800,997,20,7445,100,0,0,0,0,0,0,4381,1
2833,C5_FARMILIAR,Elusive Familiar,Elusive Familiar,24,2135,1,360,1215,1,103,136,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1
2834,C1_FAKE_ANGEL,Swift False Angel,Swift False Angel,105,54940,1,6300,14130,2,847,1162,106,84,112,67,43,81,82,80,10,12,0,8,66,0x3885,160,920,720,336,0,0,0,0,0,0,0,0,717,1000,715,1000,716,1000,12020,1000,1974,20,0,0,0,0,0,0,0,0,4316,1
2835,C2_FABRE,Solid Fabre,Solid Fabre,6,720,1,135,300,1,29,34,24,0,12,5,5,5,12,5,10,12,0,4,22,0x2000081,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,601,5,511,700,705,1000,1501,200,0,0,0,0,4002,1

// Dewata (renewal)
2151,ALNOLDI,Alnoldi,Rafflesia Alnoldi,80,5149,0,1399,1280,1,378,447,80,20,1,32,24,61,85,30,10,12,1,3,22,0x3895,300,768,768,576,0,0,0,0,0,0,0,0,705,250,520,425,905,4500,711,300,521,250,2269,100,0,0,0,0,0,0,4515,1
2152,COMODO,Comodo,Comodo,81,4002,0,1072,1581,1,427,469,92,11,50,52,35,20,94,48,10,12,1,2,65,0x3895,165,432,432,360,0,0,0,0,0,0,0,0,6403,5000,517,9000,911,9000,908,5000,0,0,0,0,0,0,0,0,0,0,4516,1
2153,CENDRAWASIH,Cendrawasih,Cendrawasih,84,5556,0,2612,2687,1,297,467,72,33,50,77,51,58,92,45,10,12,1,8,23,0x3895,220,768,768,576,0,0,0,0,0,0,0,0,6405,9000,7063,8000,916,9000,0,0,0,0,0,0,0,0,0,0,0,0,4517,1
2154,BANASPATY,Banaspaty,Banaspaty,85,4680,0,1164,1688,1,200,382,63,89,1,78,35,77,79,20,10,12,0,0,63,0x3895,220,1872,672,480,0,0,0,0,0,0,0,0,1003,1000,912,2000,985,1500,756,1500,1752,500,0,0,0,0,0,0,0,0,4518,1
2155,BUTOIJO,Butoijo,Butoijo,88,7524,0,1355,1752,1,358,460,77,12,50,65,30,30,106,44,10,12,2,6,43,0x2004895,200,1100,483,528,0,0,0,0,0,0,0,0,938,2750,537,500,520,450,0,0,0,0,0,0,0,0,0,0,0,0,4519,1
2156,LEAK,Leak,Leak,94,1266000,0,472800,300120,1,3723,5007,280,128,100,125,30,85,186,55,10,12,2,6,47,0x6283695,150,151,288,360,236400,10000,607,5500,617,2250,616,450,1422,10,617,2500,607,2500,15032,500,12738,3500,518,2500,969,2000,0,0,0,0,4520,1
2157,G_BANASPATY,Banaspaty,Banaspaty,85,4680,0,0,0,1,200,382,63,89,1,78,35,77,79,20,10,12,0,0,63,0x6203695,220,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
Oops, something went wrong.

0 comments on commit 4db722f

Please sign in to comment.
You can’t perform that action at this time.