Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Geffen Magic Tournament instance - Semi-official implementation

Browse Source 
Big thanks to @RagnarokNova for creating this script with the help of
@tokeiburu, Diablo and others. I simply converted it to be compliant
with rAthena master standard. Hope you guys enjoy it and report any bugs
:)

To clarify on the semi-official part: This script was made from scratch
by playing on iRO and may have inconsistencies with the official
version. If you want to use this on your server you must enable it
yourself by uncommenting the entry in scripts_athena.conf.
This commit is contained in:
Locien 2016-12-30 18:45:49 +01:00
parent a9faab82cb
commit be1c0ee1e6
9 changed files with 5078 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/re/instance_db.txt
View File

@ -19,3 +19,4 @@
12,Old Glast Heim,3600,300,1@gl_k,150,20,2@gl_k 12,Old Glast Heim,3600,300,1@gl_k,150,20,2@gl_k
13,Eclage Interior,1200,300,1@ecl,60,50 13,Eclage Interior,1200,300,1@ecl,60,50
14,Sara's Memories,3600,300,1@sara,250,155 14,Sara's Memories,3600,300,1@sara,250,155
15,Geffen Magic Tournament,7200,300,1@gef,119,209,1@gef_in,1@ge_st

42
db/re/mob_db.txt
View File

@ -1703,26 +1703,26 @@
2546,GUARDDOG2,2nd Guard Dog,2nd Guard Dog,101,21099,1,1014,2673,1,573,229,66,36,20,46,25,35,64,30,10,12,1,2,23,0x3095,120,73,348,288,0,0,0,0,0,0,0,12045,466,7478,1,12050,466,12055,466,12060,466,12065,466,12070,466,12126,200,0,0,0,0 2546,GUARDDOG2,2nd Guard Dog,2nd Guard Dog,101,21099,1,1014,2673,1,573,229,66,36,20,46,25,35,64,30,10,12,1,2,23,0x3095,120,73,348,288,0,0,0,0,0,0,0,12045,466,7478,1,12050,466,12055,466,12060,466,12065,466,12070,466,12126,200,0,0,0,0
//2547,MER_GARM_BABY //2547,MER_GARM_BABY
//2548,MER_HILLSRION //2548,MER_HILLSRION
//2549,GEFFEN_MAGE_1 2549,GEFFEN_MAGE_1,Arhi,Arhi,90,100000,1,8900,4550,1,329,424,64,38,50,50,50,50,130,50,10,12,1,7,20,0x85,200,1000,864,480,0,0,0,0,0,0,0,0,,0,,0,,0,,0,,0,,0,,0,0,0,0,0,
//2550,GEFFEN_MAGE_2 2550,GEFFEN_MAGE_2,Dio Anemos,Dio Anemos,95,200000,1,9440,4430,1,478,649,129,18,40,40,50,80,130,60,10,12,1,7,20,0x85,200,900,672,480,0,0,0,0,0,0,0,1095,10000,0,,0,,0,,0,,0,,0,,0,0,0,0,0,
//2551,GEFFEN_MAGE_3_1 2551,GEFFEN_MAGE_3_1,Geffen Shoplifter,Geffen Shoplifter,100,300000,1,9780,3665,1,478,632,93,36,70,70,40,40,140,60,10,12,1,7,20,0x85,200,800,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
//2552,GEFFEN_MAGE_3_2 2552,GEFFEN_MAGE_3_2,Geffen Bully,Geffen Bully,100,300000,1,9780,3665,1,478,632,93,36,70,50,70,40,140,40,10,12,1,7,20,0x85,200,900,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
//2553,GEFFEN_MAGE_3_3 2553,GEFFEN_MAGE_3_3,Geffen Gang Member,Geffen Gang Member,100,300000,1,9780,3665,1,468,622,93,36,60,80,30,30,140,70,10,12,1,7,20,0x85,200,950,864,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
//2554,GEFFEN_MAGE_4 2554,GEFFEN_MAGE_4,Faymont,Faymont,105,400000,1,11660,4370,1,477,633,114,21,60,60,60,60,140,60,10,12,1,7,20,0x85,200,672,648,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
//2555,GEFFEN_MAGE_5 2555,GEFFEN_MAGE_5,Ordre,Ordre,110,600000,1,15610,4861,1,654,906,107,21,40,70,40,100,150,60,10,12,1,7,20,0x85,200,768,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
//2556,GEFFEN_MAGE_6 2556,GEFFEN_MAGE_6,Blut Hase,Blut Hase,120,1000000,1,20560,10010,1,480,601,66,47,120,120,120,50,150,60,10,12,1,7,48,0x85,200,800,768,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
//2557,GEFFEN_MAGE_7 2557,GEFFEN_MAGE_7,Kuro Akuma,Kuro Akuma,130,1200000,1,26100,12030,1,761,1026,135,10,100,100,100,100,145,100,10,12,1,7,20,0x85,200,1000,864,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
//2558,GEFFEN_MAGE_8 2558,GEFFEN_MAGE_8,Ifodes,Ifodes,140,1400000,1,46150,18900,1,676,869,120,60,150,100,100,50,170,100,10,12,1,7,20,0x85,200,800,768,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
//2559,GEFFEN_MAGE_9 2559,GEFFEN_MAGE_9,Licheniyes,Licheniyes,145,1600000,1,52060,24105,1,763,1048,140,57,50,100,50,200,220,75,10,12,1,7,20,0x85,200,864,768,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
//2560,GEFFEN_MAGE_10 2560,GEFFEN_MAGE_10,Odoric,Odoric,150,2000000,1,60027,40237,1,950,1250,165,62,200,150,50,50,170,100,10,12,1,7,20,0x85,200,800,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
//2561,GEFFEN_MAGE_11 2561,GEFFEN_MAGE_11,Ju,Ju,155,5000000,1,75335,52130,1,1045,1465,170,65,50,100,100,200,220,100,10,12,1,7,20,0x85,200,800,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
//2562,GEFFEN_MAGE_12 2562,GEFFEN_MAGE_12,Dwigh,Dwigh,160,7000000,1,151317,123000,1,1410,2010,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,800,768,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
//2563,FEI_KANABIAN 2563,FEI_KANABIAN,Fei Kanabian,Fay Kanavian,160,8000000,1,157975,110571,1,1710,2460,175,65,50,100,100,250,220,100,10,12,1,7,48,0x6200085,200,720,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
//2564,GEFFEN_FENRIR 2564,GEFFEN_FENRIR,Geffen Fenrir,Fenrir,160,20000000,1,323300,300000,1,2160,3060,200,70,200,100,200,200,220,100,10,12,1,7,48,0x6200085,200,900,864,480,0,0,0,0,0,0,0,22511,100,22511,100,22511,100,22511,100,22511,100,22511,100,0,0,0,0,0,0,4556,1
//2565,ALPHONSE 2565,ALPHONSE,Alphonse,Alphonse,150,1000000,1,0,0,1,650,850,100,20,100,100,50,50,170,100,10,12,1,7,42,0x85,200,1400,816,396,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
//2566,ALPHONSE_JR 2566,ALPHONSE_JR,Alphonse Jr,Alphonse Jr,150,100000,1,0,0,1,450,550,80,20,100,100,50,50,170,100,10,12,1,7,62,0x85,200,936,792,432,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
//2567,E_GEFFEN_MAGE_3_2 2567,E_GEFFEN_MAGE_3_2,Geffen Bully,Geffen Bully,50,10000,1,212,227,1,89,111,70,7,41,14,15,0,100,5,10,12,1,7,20,0x85,200,900,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
//2568,E_GEFFEN_MAGE_3_3 2568,E_GEFFEN_MAGE_3_3,Geffen Gang Member,Geffen Gang Member,50,10000,1,212,227,1,89,111,70,7,41,14,15,0,100,5,10,12,1,7,20,0x85,200,950,864,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
//2569,G_ANOPHELES //2569,G_ANOPHELES
//2570,G_BREEZE //2570,G_BREEZE
//2571,G_BUTOIJO //2571,G_BUTOIJO
@ -2068,7 +2068,7 @@
2911,C1_AGAV,Swift Agav,Swift Agav,128,200000,200000,12780,26520,1,1069,1497,77,82,85,66,55,113,120,61,10,12,1,7,80,0x3295,300,768,360,360,0,0,0,0,0,0,0,7567,2500,2422,2,7563,4000,2109,1,12183,50,7563,100,1061,2500,0,0,0,0,4409,1 2911,C1_AGAV,Swift Agav,Swift Agav,128,200000,200000,12780,26520,1,1069,1497,77,82,85,66,55,113,120,61,10,12,1,7,80,0x3295,300,768,360,360,0,0,0,0,0,0,0,7567,2500,2422,2,7563,4000,2109,1,12183,50,7563,100,1061,2500,0,0,0,0,4409,1
2912,C2_ACIDUS_,Solid Acidus,Solid Acidus,130,407180,407180,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1 2912,C2_ACIDUS_,Solid Acidus,Solid Acidus,130,407180,407180,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1
2913,C3_ACIDUS_,Acidus Ringleader,Acidus Ringleader,130,203590,203590,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1 2913,C3_ACIDUS_,Acidus Ringleader,Acidus Ringleader,130,203590,203590,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1
//2914,E_GEFFEN_MAGE_3_1 2914,E_GEFFEN_MAGE_3_1,Geffen Shoplifter,Geffen Shoplifter,50,10000,1,212,227,1,89,111,70,7,41,14,15,0,100,5,10,12,1,7,20,0x85,200,800,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
//2915,HIDDEN_MOB6 //2915,HIDDEN_MOB6
2916,BIG_BEN,Big Ben,Big Ben,150,220240,1,7447,7005,1,3101,3313,125,43,102,58,69,75,131,49,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,1095,3000,1019,500,509,950,568,160,757,100,22515,15,22515,15,0,0,0,0,4626,1 2916,BIG_BEN,Big Ben,Big Ben,150,220240,1,7447,7005,1,3101,3313,125,43,102,58,69,75,131,49,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,1095,3000,1019,500,509,950,568,160,757,100,22515,15,22515,15,0,0,0,0,4626,1
2917,BIG_BELL,Big Bell,Big Bell,163,166860,1,7513,8457,1,4785,4977,138,53,102,104,72,57,98,57,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,1095,3000,2607,1,7005,750,984,100,912,750,22515,10,0,0,0,0,0,0,4627,1 2917,BIG_BELL,Big Bell,Big Bell,163,166860,1,7513,8457,1,4785,4977,138,53,102,104,72,57,98,57,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,1095,3000,2607,1,7005,750,984,100,912,750,22515,10,0,0,0,0,0,0,4627,1

57
db/re/mob_skill_db.txt
View File

@ -8852,6 +8852,63 @@
//2542,Irene Elder@NPC_MILLENNIUMSHIELD,attack,707,1,5000,1000,30000,no,self,always,0,,,,,,, //2542,Irene Elder@NPC_MILLENNIUMSHIELD,attack,707,1,5000,1000,30000,no,self,always,0,,,,,,,
//2542,Irene Elder@NPC_MILLENNIUMSHIELD,chase,707,1,5000,1000,30000,no,self,always,0,,,,,,, //2542,Irene Elder@NPC_MILLENNIUMSHIELD,chase,707,1,5000,1000,30000,no,self,always,0,,,,,,,
//Geffen Magic Tournament
2549,[PH] 게펜마법사1@MG_FIREBOLT,attack,19,5,3000,1000,3000,yes,target,always,0,,,,,,,
2549,[PH] 게펜마법사1@MG_FIREWALL,attack,18,1,3000,2000,3000,yes,target,always,0,,,,,,,
2550,[PH] 게펜마법사2@MG_FROSTDIVER,attack,15,5,3000,1000,3000,yes,target,always,0,,,,,,,
2550,[PH] 게펜마법사2@MG_THUNDERSTORM,attack,21,3,3000,2000,3000,yes,target,always,0,,,,,,,
2551,[PH] 게펜마법사3 1@NPC_COMBOATTACK,attack,171,2,5000,0,3000,yes,target,always,0,,,,,,,
2551,[PH] 게펜마법사3 1@MG_STONECURSE,attack,16,5,5000,1000,5000,yes,target,always,0,,,,,,,
2551,[PH] 게펜마법사3 1@TF_POISON,attack,52,3,3000,0,5000,yes,target,always,0,,,,,,,
2552,[PH] 게펜마법사3 2@BS_HAMMERFALL,attack,110,5,5000,1000,10000,yes,target,always,0,,,,,,,
2552,[PH] 게펜마법사3 2@NPC_POWERUP,attack,349,5,5000,1000,25000,yes,self,always,0,,,,,,,
2553,[PH] 게펜마법사3 3@ASC_BREAKER,attack,379,1,3000,1000,5000,yes,target,always,0,,,,,,,
2553,[PH] 게펜마법사3 3@AS_VENOMDUST,attack,140,10,3000,1000,5000,yes,target,always,0,,,,,,,
2554,[PH] 게펜마법사4@AL_INCAGI,idle,29,10,10000,1000,10000,yes,self,always,0,,,,,,,
2554,[PH] 게펜마법사4@AL_INCAGI,attack,29,10,3000,1000,10000,yes,self,always,0,,,,,,,
2554,[PH] 게펜마법사4@AL_DECAGI,attack,30,48,3000,1000,10000,yes,target,always,0,,,,,,,
2554,[PH] 게펜마법사4@NPC_COMBOATTACK,attack,171,3,5000,0,3000,yes,target,always,0,,,,,,,
2555,[PH] 게펜마법사5@MG_COLDBOLT,attack,14,5,3000,1000,5000,yes,target,always,0,,,,,,,
2555,[PH] 게펜마법사5@WZ_STORMGUST,attack,89,1,3000,3000,10000,yes,target,always,0,,,,,,,
2555,[PH] 게펜마법사5@WZ_FROSTNOVA,attack,88,5,3000,1000,5000,yes,self,always,0,,,,,,,
2556,[PH] 게펜마법사6@CR_AUTOGUARD,attack,249,5,3000,500,5000,yes,self,always,0,,,,,,,
2556,[PH] 게펜마법사6@CR_GRANDCROSS,attack,254,5,3000,1000,10000,yes,self,always,0,,,,,,,
2557,[PH] 게펜마법사7@NPC_BLEEDING,attack,660,5,5000,0,10000,yes,target,always,0,,,,,,,
2557,[PH] 게펜마법사7@NPC_WIDESOULDRAIN,attack,680,3,3000,500,10000,no,self,always,0,,,,,,,
2557,[PH] 게펜마법사7@NPC_COMBOATTACK,attack,171,10,3000,1000,10000,yes,target,always,0,,,,,,,
2557,[PH] 게펜마법사7@NPC_INVISIBLE,attack,353,1,2000,1000,60000,yes,self,always,0,,,,,,,
2558,[PH] 게펜마법사8@LK_SPIRALPIERCE,attack,397,5,3000,1000,10000,yes,target,always,0,,,,,,,
2558,[PH] 게펜마법사8@SM_ENDURE,attack,8,10,3000,0,10000,yes,self,always,0,,,,,,,
2558,[PH] 게펜마법사8@SM_MAGNUM,attack,7,25,3000,500,5000,yes,self,always,0,,,,,,,
2558,[PH] 게펜마법사8@NPC_MILLENNIUMSHIELD,attack,707,1,3000,1000,10000,yes,self,always,0,,,,,,,
2559,[PH] 게펜마법사9@NPC_HOLYATTACK,attack,189,10,3000,500,5000,yes,target,always,0,,,,,,,
2559,[PH] 게펜마법사9@AL_HEAL,attack,28,8,3000,0,5000,yes,self,always,0,,,,,,,
2559,[PH] 게펜마법사9@AL_PNEUMA,attack,25,1,3000,1000,10000,yes,self,always,0,,,,,,,
2560,[PH] 게펜마법사10@NPC_MENTALBREAKER,attack,159,4,2000,1500,10000,no,target,always,0,,,,,,,
2560,[PH] 게펜마법사10@AC_DOUBLE,attack,46,5,3000,500,5000,yes,target,always,0,,,,,,,
2560,[PH] 게펜마법사10@HT_ANKLESNARE,attack,117,1,2000,1000,10000,yes,around2,always,0,,,,,,,
2560,[PH] 게펜마법사10@HT_FLASHER,attack,120,1,2000,1000,10000,yes,around2,always,0,,,,,,,
2561,[PH] 게펜마법사11@MG_FIREBOLT,attack,19,5,1000,500,15000,yes,target,always,0,,,,,,,
2561,[PH] 게펜마법사11@MG_COLDBOLT,attack,14,5,1000,500,15000,yes,target,always,0,,,,,,,
2561,[PH] 게펜마법사11@MG_LIGHTNINGBOLT,attack,20,5,1000,500,10000,yes,target,always,0,,,,,,,
2561,[PH] 게펜마법사11@WZ_EARTHSPIKE,attack,90,5,1000,500,15000,yes,target,always,0,,,,,,,
2561,[PH] 게펜마법사11@PF_SPIDERWEB,attack,405,1,1000,1000,15000,yes,target,always,0,,,,,,,
2561,[PH] 게펜마법사11@RG_STRIPSHIELD,attack,216,5,3000,1000,30000,yes,target,always,0,,,,,,,
2562,[PH] 게펜마법사12@NPC_SLOWCAST,attack,672,5,1000,1000,15000,yes,self,always,0,,,,,,,
2562,[PH] 게펜마법사12@MG_SOULSTRIKE,attack,13,10,1000,500,10000,yes,target,always,0,,,,,,,
2562,[PH] 게펜마법사12@WZ_FIREPILLAR,attack,80,5,3000,500,5000,yes,around2,always,0,,,,,,,
2562,[PH] 게펜마법사12@WZ_VERMILION,attack,85,5,1000,2000,15000,yes,target,always,0,,,,,,,
2563,Fei Kanabian@AM_DEMONSTRATION,attack,229,5,2000,500,15000,yes,target,always,0,,,,,,,
2563,Fei Kanabian@AM_ACIDTERROR,attack,230,5,2000,1000,15000,yes,target,always,0,,,,,,,
2563,Fei Kanabian@AM_POTIONPITCHER,attack,231,4,3000,1000,10000,yes,self,always,0,,,,,,,
2564,Geffen Fenrir@NPC_SHIELDBRAKE,attack,346,10,3000,1000,10000,yes,target,always,0,,,,,,,
2564,Geffen Fenrir@WL_EARTHSTRAIN,attack,2216,5,3000,3000,30000,yes,target,always,0,,,,,,,
2564,Geffen Fenrir@NPC_COMET,attack,708,5,2000,5000,30000,yes,self,always,0,,,,,,,
2564,Geffen Fenrir@WL_TETRAVORTEX,attack,2217,5,1000,5000,30000,yes,target,always,0,,,,,,,
2565,Alphonse@SM_BASH,attack,5,5,1000,500,10000,yes,target,always,0,,,,,,,
2566,Alphonse Jr@PR_LEXDIVINA,attack,76,1,1000,2000,60000,yes,target,always,0,,,,,,,
2566,Alphonse Jr@PR_LEXAETERNA,attack,78,1,1000,500,10000,yes,target,always,0,,,,,,,
// Champion Monsters // Champion Monsters
2603,Swift Zombie Slaughter@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,, 2603,Swift Zombie Slaughter@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
2603,Swift Zombie Slaughter@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,, 2603,Swift Zombie Slaughter@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,,

35
db/re/quest_db.txt
View File

@ -1771,6 +1771,41 @@
9260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Survey investigation notes" 9260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Survey investigation notes"
9262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mystery Robbery Incident 16" 9262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Mystery Robbery Incident 16"
//Geffen Magic Tournament
9284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9293,0,1106,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9295,0,2549,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9296,0,2550,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9298,0,2553,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9299,0,2554,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9300,0,2555,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9301,0,2556,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9302,0,2557,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9303,0,2558,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9304,0,2559,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9305,0,2560,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9306,0,2561,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9307,0,2562,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9315,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
// Academy 14.2 // Academy 14.2
9264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage" 9264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"
9265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage" 9265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Job change to Mage"

4930
npc/custom/official/GeffenMagicTournament.txt Normal file
View File

File diff suppressed because it is too large Load Diff

1
npc/re/scripts_athena.conf
View File

@ -61,6 +61,7 @@ npc: npc/re/instances/OldGlastHeim.txt
npc: npc/re/instances/WolfchevLaboratory.txt npc: npc/re/instances/WolfchevLaboratory.txt
npc: npc/re/instances/EclageInterior.txt npc: npc/re/instances/EclageInterior.txt
npc: npc/re/instances/SaraMemory.txt npc: npc/re/instances/SaraMemory.txt
//npc: npc/custom/official/GeffenMagicTournament.txt
// ---------------- Kafras & Cool Event Corp. ------------------- // ---------------- Kafras & Cool Event Corp. -------------------
npc: npc/re/kafras/kafras.txt npc: npc/re/kafras/kafras.txt

3
src/map/script_constants.h
View File

@ -1435,6 +1435,9 @@
export_constant(SC_GOLDENMACECLAN); export_constant(SC_GOLDENMACECLAN);
export_constant(SC_CROSSBOWCLAN); export_constant(SC_CROSSBOWCLAN);
export_constant(SC_JUMPINGCLAN); export_constant(SC_JUMPINGCLAN);
export_constant(SC_GEFFEN_MAGIC1);
export_constant(SC_GEFFEN_MAGIC2);
export_constant(SC_GEFFEN_MAGIC3);
#ifdef RENEWAL #ifdef RENEWAL
export_constant(SC_EXTREMITYFIST2); export_constant(SC_EXTREMITYFIST2);
#endif #endif

25
src/map/status.c
View File

@ -1106,6 +1106,11 @@ void initChangeTables(void)
StatusIconChangeTable[SC_CROSSBOWCLAN] = SI_CROSSBOWCLAN; StatusIconChangeTable[SC_CROSSBOWCLAN] = SI_CROSSBOWCLAN;
StatusIconChangeTable[SC_JUMPINGCLAN] = SI_JUMPINGCLAN; StatusIconChangeTable[SC_JUMPINGCLAN] = SI_JUMPINGCLAN;
// Geffen Magic Tournament Buffs
StatusIconChangeTable[SC_GEFFEN_MAGIC1] = SI_GEFFEN_MAGIC1;
StatusIconChangeTable[SC_GEFFEN_MAGIC2] = SI_GEFFEN_MAGIC2;
StatusIconChangeTable[SC_GEFFEN_MAGIC3] = SI_GEFFEN_MAGIC3;
/* Other SC which are not necessarily associated to skills */ /* Other SC which are not necessarily associated to skills */
StatusChangeFlagTable[SC_ASPDPOTION0] |= SCB_ASPD; StatusChangeFlagTable[SC_ASPDPOTION0] |= SCB_ASPD;
StatusChangeFlagTable[SC_ASPDPOTION1] |= SCB_ASPD; StatusChangeFlagTable[SC_ASPDPOTION1] |= SCB_ASPD;
@ -4019,6 +4024,20 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
sd->subele[ELE_HOLY] += sc->data[SC_PROVIDENCE]->val2; sd->subele[ELE_HOLY] += sc->data[SC_PROVIDENCE]->val2;
sd->subrace[RC_DEMON] += sc->data[SC_PROVIDENCE]->val2; sd->subrace[RC_DEMON] += sc->data[SC_PROVIDENCE]->val2;
} }
if (sc->data[SC_GEFFEN_MAGIC1]) {
sd->right_weapon.addrace[RC_PLAYER] += sc->data[SC_GEFFEN_MAGIC1]->val1;
sd->right_weapon.addrace[RC_DEMIHUMAN] += sc->data[SC_GEFFEN_MAGIC1]->val1;
sd->left_weapon.addrace[RC_PLAYER] += sc->data[SC_GEFFEN_MAGIC1]->val1;
sd->left_weapon.addrace[RC_DEMIHUMAN] += sc->data[SC_GEFFEN_MAGIC1]->val1;
}
if (sc->data[SC_GEFFEN_MAGIC2]) {
sd->magic_addrace[RC_PLAYER] += sc->data[SC_GEFFEN_MAGIC2]->val1;
sd->magic_addrace[RC_DEMIHUMAN] += sc->data[SC_GEFFEN_MAGIC2]->val1;
}
if(sc->data[SC_GEFFEN_MAGIC3]) {
sd->subrace[RC_PLAYER] += sc->data[SC_GEFFEN_MAGIC3]->val1;
sd->subrace[RC_DEMIHUMAN] += sc->data[SC_GEFFEN_MAGIC3]->val1;
}
if(sc->data[SC_ARMOR_ELEMENT]) { // This status change should grant card-type elemental resist. if(sc->data[SC_ARMOR_ELEMENT]) { // This status change should grant card-type elemental resist.
sd->subele[ELE_WATER] += sc->data[SC_ARMOR_ELEMENT]->val1; sd->subele[ELE_WATER] += sc->data[SC_ARMOR_ELEMENT]->val1;
sd->subele[ELE_EARTH] += sc->data[SC_ARMOR_ELEMENT]->val2; sd->subele[ELE_EARTH] += sc->data[SC_ARMOR_ELEMENT]->val2;
@ -11427,6 +11446,9 @@ int status_change_clear(struct block_list* bl, int type)
case SC_REUSE_STORMBLAST: case SC_REUSE_STORMBLAST:
case SC_ALL_RIDING_REUSE_LIMIT: case SC_ALL_RIDING_REUSE_LIMIT:
case SC_SPRITEMABLE: case SC_SPRITEMABLE:
case SC_GEFFEN_MAGIC1:
case SC_GEFFEN_MAGIC2:
case SC_GEFFEN_MAGIC3:
// Costumes // Costumes
case SC_MOONSTAR: case SC_MOONSTAR:
case SC_SUPER_STAR: case SC_SUPER_STAR:
@ -13420,6 +13442,9 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type)
case SC_ALL_RIDING_REUSE_LIMIT: case SC_ALL_RIDING_REUSE_LIMIT:
case SC_SPRITEMABLE: case SC_SPRITEMABLE:
case SC_BITESCAR: case SC_BITESCAR:
case SC_GEFFEN_MAGIC1:
case SC_GEFFEN_MAGIC2:
case SC_GEFFEN_MAGIC3:
// Costumes // Costumes
case SC_MOONSTAR: case SC_MOONSTAR:
case SC_SUPER_STAR: case SC_SUPER_STAR:

5
src/map/status.h
View File

@ -788,6 +788,11 @@ typedef enum sc_type {
SC_TAROTCARD, SC_TAROTCARD,
// Geffen Magic Tournament Buffs
SC_GEFFEN_MAGIC1,
SC_GEFFEN_MAGIC2,
SC_GEFFEN_MAGIC3,
#ifdef RENEWAL #ifdef RENEWAL
SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled
#endif #endif