* Merged eAthena r15184 by ai4rei, updated effect IDs and NPC IDs (db\const.txt)

* More updates to effect list documentation (doc\effect_list.txt)
* Uncommented a status change in Ranger job quest, bugreport:6551 (npc\re\jobs\3-1\ranger.txt)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16731 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 732 insertions, 25 deletions

diff --git a/db/const.txt b/db/const.txt
index 6d9202c57..3171504cd 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1386,6 +1386,7 @@ ARCH_MERC_GUILD	0
 SPEAR_MERC_GUILD	1
 SWORD_MERC_GUILD	2
 
+EF_NONE	-1
 EF_HIT1	0
 EF_HIT2	1
 EF_HIT3	2
@@ -1609,7 +1610,7 @@ EF_POTION_	219
 EF_POTION_BERSERK	220
 EF_POTIONPILLAR	221
 EF_DEFENDER	222
-EF_SAINTCASTING	223
+EF_GANBANTEIN	223
 EF_WIND	224
 EF_VOLCANO	225
 EF_GRANDCROSS	226
@@ -1764,6 +1765,650 @@ EF_BOTTOM_BASILICA	374
 EF_ASSUMPTIO	375
 EF_HITLINE2	376
 EF_BASH3D2	377
+EF_ENERGYDRAIN2	378
+EF_TRANSBLUEBODY	379
+EF_MAGICCRASHER	380
+EF_LIGHTSPHERE2	381
+EF_LIGHTBLADE	382
+EF_ENERGYDRAIN3	383
+EF_LINELINK2	384
+EF_LINKLIGHT	385
+EF_TRUESIGHT	386
+EF_FALCONASSAULT	387
+EF_TRIPLEATTACK2	388
+EF_PORTAL4	389
+EF_MELTDOWN	390
+EF_CARTBOOST	391
+EF_REJECTSWORD	392
+EF_TRIPLEATTACK3	393
+EF_SPHEREWIND2	394
+EF_LINELINK3	395
+EF_PINKBODY	396
+EF_LEVEL99_5	397
+EF_LEVEL99_6	398
+EF_BASH3D3	399
+EF_BASH3D4	400
+EF_NAPALMVALCAN	401
+EF_PORTAL5	402
+EF_MAGICCRASHER2	403
+EF_BOTTOM_SPIDER	404
+EF_BOTTOM_FOGWALL	405
+EF_SOULBURN	406
+EF_SOULCHANGE	407
+EF_BABY	408
+EF_SOULBREAKER2	409
+EF_RAINBOW	410
+EF_PEONG	411
+EF_TANJI2	412
+EF_PRESSEDBODY	413
+EF_SPINEDBODY	414
+EF_KICKEDBODY	415
+EF_AIRTEXTURE	416
+EF_HITBODY	417
+EF_DOUBLEGUMGANG	418
+EF_REFLECTBODY	419
+EF_BABYBODY	420
+EF_BABYBODY2	421
+EF_GIANTBODY	422
+EF_GIANTBODY2	423
+EF_ASURABODY	424
+EF_4WAYBODY	425
+EF_QUAKEBODY	426
+EF_ASURABODY_MONSTER	427
+EF_HITLINE3	428
+EF_HITLINE4	429
+EF_HITLINE5	430
+EF_HITLINE6	431
+EF_ELECTRIC	432
+EF_ELECTRIC2	433
+EF_HITLINE7	434
+EF_STORMKICK	435
+EF_HALFSPHERE	436
+EF_ATTACKENERGY	437
+EF_ATTACKENERGY2	438
+EF_CHEMICAL3	439
+EF_ASSUMPTIO2	440
+EF_BLUECASTING	441
+EF_RUN	442
+EF_STOPRUN	443
+EF_STOPEFFECT	444
+EF_JUMPBODY	445
+EF_LANDBODY	446
+EF_FOOT3	447
+EF_FOOT4	448
+EF_TAE_READY	449
+EF_GRANDCROSS2	450
+EF_SOULSTRIKE2	451
+EF_YUFITEL2	452
+EF_NPC_STOP	453
+EF_DARKCASTING	454
+EF_GUMGANGNPC	455
+EF_AGIUP	456
+EF_JUMPKICK	457
+EF_QUAKEBODY2	458
+EF_STORMKICK1	459
+EF_STORMKICK2	460
+EF_STORMKICK3	461
+EF_STORMKICK4	462
+EF_STORMKICK5	463
+EF_STORMKICK6	464
+EF_STORMKICK7	465
+EF_SPINEDBODY2	466
+EF_BEGINASURA1	467
+EF_BEGINASURA2	468
+EF_BEGINASURA3	469
+EF_BEGINASURA4	470
+EF_BEGINASURA5	471
+EF_BEGINASURA6	472
+EF_BEGINASURA7	473
+EF_AURABLADE2	474
+EF_DEVIL1	475
+EF_DEVIL2	476
+EF_DEVIL3	477
+EF_DEVIL4	478
+EF_DEVIL5	479
+EF_DEVIL6	480
+EF_DEVIL7	481
+EF_DEVIL8	482
+EF_DEVIL9	483
+EF_DEVIL10	484
+EF_DOUBLEGUMGANG2	485
+EF_DOUBLEGUMGANG3	486
+EF_BLACKDEVIL	487
+EF_FLOWERCAST	488
+EF_FLOWERCAST2	489
+EF_FLOWERCAST3	490
+EF_MOCHI	491
+EF_LAMADAN	492
+EF_EDP	493
+EF_SHIELDBOOMERANG2	494
+EF_RG_COIN2	495
+EF_GUARD2	496
+EF_SLIM	497
+EF_SLIM2	498
+EF_SLIM3	499
+EF_CHEMICALBODY	500
+EF_CASTSPIN	501
+EF_PIERCEBODY	502
+EF_SOULLINK	503
+EF_CHOOKGI2	504
+EF_MEMORIZE	505
+EF_SOULLIGHT	506
+EF_MAPAE	507
+EF_ITEMPOKJUK	508
+EF_05VAL	509
+EF_BEGINASURA11	510
+EF_NIGHT	511
+EF_CHEMICAL2DASH	512
+EF_GROUNDSAMPLE	513
+EF_GI_EXPLOSION	514
+EF_CLOUD4	515
+EF_CLOUD5	516
+EF_BOTTOM_HERMODE	517
+EF_CARTTER	518
+EF_ITEMFAST	519
+EF_SHIELDBOOMERANG3	520
+EF_DOUBLECASTBODY	521
+EF_GRAVITATION	522
+EF_TAROTCARD1	523
+EF_TAROTCARD2	524
+EF_TAROTCARD3	525
+EF_TAROTCARD4	526
+EF_TAROTCARD5	527
+EF_TAROTCARD6	528
+EF_TAROTCARD7	529
+EF_TAROTCARD8	530
+EF_TAROTCARD9	531
+EF_TAROTCARD10	532
+EF_TAROTCARD11	533
+EF_TAROTCARD12	534
+EF_TAROTCARD13	535
+EF_TAROTCARD14	536
+EF_ACIDDEMON	537
+EF_GREENBODY	538
+EF_THROWITEM4	539
+EF_BABYBODY_BACK	540
+EF_THROWITEM5	541
+EF_BLUEBODY	542
+EF_HATED	543
+EF_REDLIGHTBODY	544
+EF_RO2YEAR	545
+EF_SMA_READY	546
+EF_STIN	547
+EF_RED_HIT	548
+EF_BLUE_HIT	549
+EF_QUAKEBODY3	550
+EF_SMA	551
+EF_SMA2	552
+EF_STIN2	553
+EF_HITTEXTURE	554
+EF_STIN3	555
+EF_SMA3	556
+EF_BLUEFALL	557
+EF_BLUEFALL_90	558
+EF_FASTBLUEFALL	559
+EF_FASTBLUEFALL_90	560
+EF_BIG_PORTAL	561
+EF_BIG_PORTAL2	562
+EF_SCREEN_QUAKE	563
+EF_HOMUNCASTING	564
+EF_HFLIMOON1	565
+EF_HFLIMOON2	566
+EF_HFLIMOON3	567
+EF_HO_UP	568
+EF_HAMIDEFENCE	569
+EF_HAMICASTLE	570
+EF_HAMIBLOOD	571
+EF_HATED2	572
+EF_TWILIGHT1	573
+EF_TWILIGHT2	574
+EF_TWILIGHT3	575
+EF_ITEM_THUNDER	576
+EF_ITEM_CLOUD	577
+EF_ITEM_CURSE	578
+EF_ITEM_ZZZ	579
+EF_ITEM_RAIN	580
+EF_ITEM_LIGHT	581
+EF_ANGEL3	582
+EF_M01	583
+EF_M02	584
+EF_M03	585
+EF_M04	586
+EF_M05	587
+EF_M06	588
+EF_M07	589
+EF_KAIZEL	590
+EF_KAAHI	591
+EF_CLOUD6	592
+EF_FOOD01	593
+EF_FOOD02	594
+EF_FOOD03	595
+EF_FOOD04	596
+EF_FOOD05	597
+EF_FOOD06	598
+EF_SHRINK	599
+EF_THROWITEM6	600
+EF_SIGHT2	601
+EF_QUAKEBODY4	602
+EF_FIREHIT2	603
+EF_NPC_STOP2	604
+EF_NPC_STOP2_DEL	605
+EF_FVOICE	606
+EF_WINK	607
+EF_COOKING_OK	608
+EF_COOKING_FAIL	609
+EF_TEMP_OK	610
+EF_TEMP_FAIL	611
+EF_HAPGYEOK	612
+EF_THROWITEM7	613
+EF_THROWITEM8	614
+EF_THROWITEM9	615
+EF_THROWITEM10	616
+EF_BUNSINJYUTSU	617
+EF_KOUENKA	618
+EF_HYOUSENSOU	619
+EF_BOTTOM_SUITON	620
+EF_STIN4	621
+EF_THUNDERSTORM2	622
+EF_CHEMICAL4	623
+EF_STIN5	624
+EF_MADNESS_BLUE	625
+EF_MADNESS_RED	626
+EF_RG_COIN3	627
+EF_BASH3D5	628
+EF_CHOOKGI3	629
+EF_KIRIKAGE	630
+EF_TATAMI	631
+EF_KASUMIKIRI	632
+EF_ISSEN	633
+EF_KAEN	634
+EF_BAKU	635
+EF_HYOUSYOURAKU	636
+EF_DESPERADO	637
+EF_LIGHTNING_S	638
+EF_BLIND_S	639
+EF_POISON_S	640
+EF_FREEZING_S	641
+EF_FLARE_S	642
+EF_RAPIDSHOWER	643
+EF_MAGICALBULLET	644
+EF_SPREADATTACK	645
+EF_TRACKCASTING	646
+EF_TRACKING	647
+EF_TRIPLEACTION	648
+EF_BULLSEYE	649
+EF_MAP_MAGICZONE	650
+EF_MAP_MAGICZONE2	651
+EF_DAMAGE1	652
+EF_DAMAGE1_2	653
+EF_DAMAGE1_3	654
+EF_UNDEADBODY	655
+EF_UNDEADBODY_DEL	656
+EF_GREEN_NUMBER	657
+EF_BLUE_NUMBER	658
+EF_RED_NUMBER	659
+EF_PURPLE_NUMBER	660
+EF_BLACK_NUMBER	661
+EF_WHITE_NUMBER	662
+EF_YELLOW_NUMBER	663
+EF_PINK_NUMBER	664
+EF_BUBBLE_DROP	665
+EF_NPC_EARTHQUAKE	666
+EF_DA_SPACE	667
+EF_DRAGONFEAR	668
+EF_BLEEDING	669
+EF_WIDECONFUSE	670
+EF_BOTTOM_RUNNER	671
+EF_BOTTOM_TRANSFER	672
+EF_CRYSTAL_BLUE	673
+EF_BOTTOM_EVILLAND	674
+EF_GUARD3	675
+EF_NPC_SLOWCAST	676
+EF_CRITICALWOUND	677
+EF_GREEN99_3	678
+EF_GREEN99_5	679
+EF_GREEN99_6	680
+EF_MAPSPHERE	681
+EF_POK_LOVE	682
+EF_POK_WHITE	683
+EF_POK_VALEN	684
+EF_POK_BIRTH	685
+EF_POK_CHRISTMAS	686
+EF_MAP_MAGICZONE3	687
+EF_MAP_MAGICZONE4	688
+EF_DUST	689
+EF_TORCH_RED	690
+EF_TORCH_GREEN	691
+EF_MAP_GHOST	692
+EF_GLOW1	693
+EF_GLOW2	694
+EF_GLOW4	695
+EF_TORCH_PURPLE	696
+EF_CLOUD7	697
+EF_CLOUD8	698
+EF_FLOWERLEAF	699
+EF_MAPSPHERE2	700
+EF_GLOW11	701
+EF_GLOW12	702
+EF_CIRCLELIGHT	703
+EF_ITEM315	704
+EF_ITEM316	705
+EF_ITEM317	706
+EF_ITEM318	707
+EF_STORM_MIN	708
+EF_POK_JAP	709
+EF_MAP_GREENLIGHT	710
+EF_MAP_MAGICWALL	711
+EF_MAP_GREENLIGHT2	712
+EF_YELLOWFLY1	713
+EF_YELLOWFLY2	714
+EF_BOTTOM_BLUE	715
+EF_BOTTOM_BLUE2	716
+EF_WEWISH	717
+EF_FIREPILLARON2	718
+EF_FORESTLIGHT5	719
+EF_SOULBREAKER3	720
+EF_ADO_STR	721
+EF_IGN_STR	722
+EF_CHIMTO2	723
+EF_WINDCUTTER	724
+EF_DETECT2	725
+EF_FROSTMYSTY	726
+EF_CRIMSON_STR	727
+EF_HELL_STR	728
+EF_SPR_MASH	729
+EF_SPR_SOULE	730
+EF_DHOWL_STR	731
+EF_EARTHWALL	732
+EF_SOULBREAKER4	733
+EF_CHAINL_STR	734
+EF_CHOOKGI_FIRE	735
+EF_CHOOKGI_WIND	736
+EF_CHOOKGI_WATER	737
+EF_CHOOKGI_GROUND	738
+EF_MAGENTA_TRAP	739
+EF_COBALT_TRAP	740
+EF_MAIZE_TRAP	741
+EF_VERDURE_TRAP	742
+EF_NORMAL_TRAP	743
+EF_CLOAKING2	744
+EF_AIMED_STR	745
+EF_ARROWSTORM_STR	746
+EF_LAULAMUS_STR	747
+EF_LAUAGNUS_STR	748
+EF_MILSHIELD_STR	749
+EF_CONCENTRATION2	750
+EF_FIREBALL2	751
+EF_BUNSINJYUTSU2	752
+EF_CLEARTIME	753
+EF_GLASSWALL3	754
+EF_ORATIO	755
+EF_POTION_BERSERK2	756
+EF_CIRCLEPOWER	757
+EF_ROLLING1	758
+EF_ROLLING2	759
+EF_ROLLING3	760
+EF_ROLLING4	761
+EF_ROLLING5	762
+EF_ROLLING6	763
+EF_ROLLING7	764
+EF_ROLLING8	765
+EF_ROLLING9	766
+EF_ROLLING10	767
+EF_PURPLEBODY	768
+EF_STIN6	769
+EF_RG_COIN4	770
+EF_POISONWAV	771
+EF_POISONSMOKE	772
+EF_GUMGANG4	773
+EF_SHIELDBOOMERANG4	774
+EF_CASTSPIN2	775
+EF_VULCANWAV	776
+EF_AGIUP2	777
+EF_DETECT3	778
+EF_AGIUP3	779
+EF_DETECT4	780
+EF_ELECTRIC3	781
+EF_GUARD4	782
+EF_BOTTOM_BARRIER	783
+EF_BOTTOM_STEALTH	784
+EF_REPAIRTIME	785
+EF_NC_ANAL	786
+EF_FIRETHROW	787
+EF_VENOMIMPRESS	788
+EF_FROSTMISTY	789
+EF_BURNING	790
+EF_COLDTHROW	791
+EF_MAKEHALLU	792
+EF_HALLUTIME	793
+EF_INFRAREDSCAN	794
+EF_CRASHAXE	795
+EF_GTHUNDER	796
+EF_STONERING	797
+EF_INTIMIDATE2	798
+EF_STASIS	799
+EF_REDLINE	800
+EF_FROSTDIVER3	801
+EF_BOTTOM_BASILICA2	802
+EF_RECOGNIZED	803
+EF_TETRA	804
+EF_TETRACASTING	805
+EF_FIREBALL3	806
+EF_INTIMIDATE3	807
+EF_RECOGNIZED2	808
+EF_CLOAKING3	809
+EF_INTIMIDATE4	810
+EF_STRETCH	811
+EF_BLACKBODY	812
+EF_ENERVATION	813
+EF_ENERVATION2	814
+EF_ENERVATION3	815
+EF_ENERVATION4	816
+EF_ENERVATION5	817
+EF_ENERVATION6	818
+EF_LINELINK4	819
+EF_RG_COIN5	820
+EF_WATERFALL_ANI	821
+EF_BOTTOM_MANHOLE	822
+EF_MANHOLE	823
+EF_MAKEFEINT	824
+EF_FORESTLIGHT6	825
+EF_DARKCASTING2	826
+EF_BOTTOM_ANI	827
+EF_BOTTOM_MAELSTROM	828
+EF_BOTTOM_BLOODYLUST	829
+EF_BEGINSPELL_N1	830
+EF_BEGINSPELL_N2	831
+EF_HEAL_N	832
+EF_CHOOKGI_N	833
+EF_JOBLVUP50_2	834
+EF_CHEMICAL2DASH2	835
+EF_CHEMICAL2DASH3	836
+EF_ROLLINGCAST	837
+EF_WATER_BELOW	838
+EF_WATER_FADE	839
+EF_BEGINSPELL_N3	840
+EF_BEGINSPELL_N4	841
+EF_BEGINSPELL_N5	842
+EF_BEGINSPELL_N6	843
+EF_BEGINSPELL_N7	844
+EF_BEGINSPELL_N8	845
+EF_WATER_SMOKE	846
+EF_DANCE1	847
+EF_DANCE2	848
+EF_LINKPARTICLE	849
+EF_SOULLIGHT2	850
+EF_SPR_PARTICLE	851
+EF_SPR_PARTICLE2	852
+EF_SPR_PLANT	853
+EF_CHEMICAL_V	854
+EF_SHOOTPARTICLE	855
+EF_BOT_REVERB	856
+EF_RAIN_PARTICLE	857
+EF_CHEMICAL_V2	858
+EF_SECRA	859
+EF_BOT_REVERB2	860
+EF_CIRCLEPOWER2	861
+EF_SECRA2	862
+EF_CHEMICAL_V3	863
+EF_ENERVATION7	864
+EF_CIRCLEPOWER3	865
+EF_SPR_PLANT2	866
+EF_CIRCLEPOWER4	867
+EF_SPR_PLANT3	868
+EF_RG_COIN6	869
+EF_SPR_PLANT4	870
+EF_CIRCLEPOWER5	871
+EF_SPR_PLANT5	872
+EF_CIRCLEPOWER6	873
+EF_SPR_PLANT6	874
+EF_CIRCLEPOWER7	875
+EF_SPR_PLANT7	876
+EF_CIRCLEPOWER8	877
+EF_SPR_PLANT8	878
+EF_HEARTASURA	879
+EF_BEGINSPELL_150	880
+EF_LEVEL99_150	881
+EF_PRIMECHARGE	882
+EF_GLASSWALL4	883
+EF_GRADIUS_LASER	884
+EF_BASH3D6	885
+EF_GUMGANG5	886
+EF_HITLINE8	887
+EF_ELECTRIC4	888
+EF_TEIHIT1T	889
+EF_SPINMOVE	890
+EF_FIREBALL4	891
+EF_TRIPLEATTACK4	892
+EF_CHEMICAL3S	893
+EF_GROUNDSHAKE	894
+EF_DQ9_CHARGE	895
+EF_DQ9_CHARGE2	896
+EF_DQ9_CHARGE3	897
+EF_DQ9_CHARGE4	898
+EF_BLUELINE	899
+EF_SELFSCROLL	900
+EF_SPR_LIGHTPRINT	901
+EF_PNG_TEST	902
+EF_BEGINSPELL_YB	903
+EF_CHEMICAL2DASH4	904
+EF_GROUNDSHAKE2	905
+EF_PRESSURE2	906
+EF_RG_COIN7	907
+EF_PRIMECHARGE2	908
+EF_PRIMECHARGE3	909
+EF_PRIMECHARGE4	910
+EF_GREENCASTING	911
+EF_WALLOFTHORN	912
+EF_FIREBALL5	913
+EF_THROWITEM11	914
+EF_SPR_PLANT9	915
+EF_DEMONICFIRE	916
+EF_DEMONICFIRE2	917
+EF_DEMONICFIRE3	918
+EF_HELLSPLANT	919
+EF_FIREWALL2	920
+EF_VACUUM	921
+EF_SPR_PLANT10	922
+EF_SPR_LIGHTPRINT2	923
+EF_POISONSMOKE2	924
+EF_MAKEHALLU2	925
+EF_SHOCKWAVE2	926
+EF_SPR_PLANT11	927
+EF_COLDTHROW2	928
+EF_DEMONICFIRE4	929
+EF_PRESSURE3	930
+EF_LINKPARTICLE2	931
+EF_SOULLIGHT3	932
+EF_CHAREFFECT	933
+EF_GUMGANG6	934
+EF_FIREBALL6	935
+EF_GUMGANG7	936
+EF_GUMGANG8	937
+EF_GUMGANG9	938
+EF_BOTTOM_DE2	939
+EF_COLDSTATUS	940
+EF_SPR_LIGHTPRINT3	941
+EF_WATERBALL3	942
+EF_HEAL_N2	943
+EF_RAIN_PARTICLE2	944
+EF_CLOUD9	945
+EF_YELLOWFLY3	946
+EF_EL_GUST	947
+EF_EL_BLAST	948
+EF_EL_AQUAPLAY	949
+EF_EL_UPHEAVAL	950
+EF_EL_WILD_STORM	951
+EF_EL_CHILLY_AIR	952
+EF_EL_CURSED_SOIL	953
+EF_EL_COOLER	954
+EF_EL_TROPIC	955
+EF_EL_PYROTECHNIC	956
+EF_EL_PETROLOGY	957
+EF_EL_HEATER	958
+EF_POISON_MIST	959
+EF_ERASER_CUTTER	960
+EF_SILENT_BREEZE	961
+EF_MAGMA_FLOW	962
+EF_GRAYBODY	963
+EF_LAVA_SLIDE	964
+EF_SONIC_CLAW	965
+EF_TINDER_BREAKER	966
+EF_MIDNIGHT_FRENZY	967
+EF_MACRO	968
+EF_CHEMICAL_ALLRANGE	969
+EF_TETRA_FIRE	970
+EF_TETRA_WATER	971
+EF_TETRA_WIND	972
+EF_TETRA_GROUND	973
+EF_EMITTER	974
+EF_VOLCANIC_ASH	975
+EF_LEVEL99_ORB1	976
+EF_LEVEL99_ORB2	977
+EF_LEVEL150	978
+EF_LEVEL150_SUB	979
+EF_THROWITEM4_1	980
+EF_THROW_HAPPOKUNAI	981
+EF_THROW_MULTIPLE_COIN	982
+EF_THROW_BAKURETSU	983
+EF_ROTATE_HUUMARANKA	984
+EF_ROTATE_BG	985
+EF_ROTATE_LINE_GRAY	986
+EF_2011RWC	987
+EF_2011RWC2	988
+EF_KAIHOU	989
+EF_GROUND_EXPLOSION	990
+EF_KG_KAGEHUMI	991
+EF_KO_ZENKAI_WATER	992
+EF_KO_ZENKAI_LAND	993
+EF_KO_ZENKAI_FIRE	994
+EF_KO_ZENKAI_WIND	995
+EF_KO_JYUMONJIKIRI	996
+EF_KO_SETSUDAN	997
+EF_RED_CROSS	998
+EF_KO_IZAYOI	999
+EF_ROTATE_LINE_BLUE	1000
+EF_KG_KYOMU	1001
+EF_KO_HUUMARANKA	1002
+EF_BLUELIGHTBODY	1003
+EF_KAGEMUSYA	1004
+EF_OB_GENSOU	1005
+EF_NO100_FIRECRACKER	1006
+EF_KO_MAKIBISHI	1007
+EF_KAIHOU1	1008
+EF_AKAITSUKI	1009
+EF_ZANGETSU	1010
+EF_GENSOU	1011
+EF_HAT_EFFECT	1012
+EF_CHERRYBLOSSOM	1013
+EF_EVENT_CLOUD	1014
+EF_RUN_MAKE_OK	1015
+EF_RUN_MAKE_FAILURE	1016
+EF_MIRESULT_MAKE_OK	1017
+EF_MIRESULT_MAKE_FAIL	1018
+EF_ALL_RAY_OF_PROTECTION	1019
+EF_VENOMFOG	1020
+EF_DUSTSTORM	1021
 
 WARPNPC	45
 1_ETC_01	46
@@ -2094,7 +2739,60 @@ XMAS_SMOKEY_Y	609
 4_F_GENETIC	643
 4_F_TAEKWON	644
 4_F_SWORDMAN	645
-//Free	Ids 646 - 699
+4_F_IU	646
+4_M_RAGI	647
+4_M_MELODY	648
+4_TRACE	649
+4_F_HIMEL	650
+4_LEVITATEMAN	651
+4_M_HEINRICH	652
+4_M_ROYALGUARD	653
+4_M_BARMUND	654
+4_F_KHALITZBURG	655
+4_F_HIMEL2	656
+4_WHITEKNIGHT	657
+4_COCO	658
+4_M_ALADDIN	659
+4_M_GENIE	660
+4_F_GENIE	661
+4_JP_MID_SWIM	662
+4_JP_RUNE_SWIM	663
+4_F_FENRIR	664
+4_F_GEFFEN_FAY	665
+4_F_IRIS	666
+4_F_LUCILE	667
+4_F_SARAH_BABY	668
+4_GEFFEN_01	669
+4_GEFFEN_02	670
+4_GEFFEN_03	671
+4_GEFFEN_04	672
+4_GEFFEN_05	673
+4_GEFFEN_06	674
+4_GEFFEN_07	675
+4_GEFFEN_08	676
+4_GEFFEN_09	677
+4_GEFFEN_10	678
+4_GEFFEN_11	679
+4_GEFFEN_12	680
+4_GEFFEN_13	681
+4_GEFFEN_14	682
+4_M_CHAOS	683
+4_M_CHIEF_IRIN	684
+4_M_SAKRAY	685
+4_M_SAKRAYROYAL	686
+4_TOWER_01	687
+4_TOWER_02	688
+4_TOWER_03	689
+4_TOWER_04	690
+4_TOWER_05	691
+4_TOWER_06	692
+4_TOWER_07	693
+4_TOWER_08	694
+4_TOWER_09	695
+4_TOWER_10	696
+4_TOWER_11	697
+4_TOWER_12	698
+4_TOWER_13	699
 8_F_GIRL	700
 4_F_GODEMOM	701
 4_F_GON	702
@@ -2395,6 +3093,15 @@ CLEAR_NPC	844
 4_M_MOCASS1	997
 4_M_MOCASS2	998
 4_M_MUT1	999
+4_TOWER_14	10001
+4_TOWER_15	10002
+4_TOWER_16	10003
+4_TOWER_17	10004
+4_TREASURE_BOX	10005
+ACADEMY_MASTER	10006
+PORTAL	10007
+THANATOS_BATTLE	10008
+THANATOS_KEEP	10009
 
 HAVEQUEST	0
 PLAYTIME	1
diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index e7c3b973b..b93d4bf8a 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -731,20 +731,20 @@ Number	Description
 712.	A Little Flame Sphere
 713.	A lot of Very Small and Yellow Sphere
 714.	(Nothing)
-715.	Something Like a Little Blue Basilica (Probably something related Arch Bishop)
-716.	The same of 715 (Probably something related Arch Bishop)
-717.	Something like Angelus (Probably something related Arch Bishop)
+715.	Little blue Basilica
+716.	Same as 715
+717.	Christmas Carol (copy of Angelus)
 718.	Judex (Visual Effect)
 719.	Renovatio (light beam)
-720.	Some sound and effect of Soul Destroyer but Yellow (Probably something related Warlock)
-721.	Big Lightning from the Sky (Probably something related Warlock)
+720.	Yellow version of Soul Breaker
+721.	Adoramus (lightning bolt)
 722.	Ignition Break (big explosion)
-723.	Noise Sound (Probably something related Warlock)
-724.	Client Crash :P
-725.	Status Recovery Sound and Wind movement on the ground (Probably something related Arch Bishop)
+723.	Noise Sound
+724.	Green version of Detecting
+725.	Detecting
 726.	Frost Misty (blue vapor and bubbles)
 727.	Comet
-728.	A Little Flare that Remain on the Player for some second (Probably something related Warlock)
+728.	Small fire (part of Hell Inferno)
 729.	Marsh of Abyss (like Close Confine)
 730.	Small, cartoony explosion
 731.	Dragon Howling (blinking, expanding circle)
@@ -770,7 +770,7 @@ Number	Description
 751.	Shots from a direction
 752.	Some blinking filter
 753.	Sparkles
-754.	Green Warp
+754.	Green warp portal (root of Epiclesis)
 755.	Oratio (spinning blue symbol)
 756.	Enchant Blade (like Berserk Potion)
 757.	Stargate-like wormhole animation
@@ -803,28 +803,28 @@ Number	Description
 784.	White shaft of light
 785.	Upward flying wrenches
 786.	Symbol with bleeping sound [S]
-787.	(Nothing)
-788.	Green haired voodoo skull
+787.	Flare Launcher (line of fire)
+788.	Venom Impress (green skull)
 789.	Two Ancillas
 790.	Flame symbol
 791.	Two ice shots
 792.	Upward streaming white particles
 793.	Same, but more brief
 794.	Infrared Scan (red lasers)
-795.	Axe Crashdown
+795.	Power Swing (axe crash)
 796.	Spinning blue triangles
 797.	Stapo
-798.	(Nothing)
-799.	Expanding blue [S]
+798.	Red triangles (like Intimidate)
+799.	Stasis (expanding blue mist) [S]
 800.	Hell Inferno (red lights)
 801.	Jack Frost unit (ice spikes)
 802.	White Imprison
-803.	(Nothing)
-804.	Earth shaking [S]
+803.	Recognized Spell
+804.	Tetra Vortex [S]
 805.	Tetra Vortex cast animation (blinking colors)
 806.	Flying by as fast as a rocket
 807.	Kidnapping sound
-808.	(Nothing)
+808.	Like Recognized Spell, but one symbol
 809.	Shadowy filter [S]
 810.	Damp thud sound [S]
 811.	Body Painting
@@ -836,7 +836,7 @@ Number	Description
 817.	Masquerade - Unlucky
 818.	Masquerade - Weakness
 819.	(Nothing)
-820.	Strip sound
+820.	Strip Accessory
 821.	Waterfall
 822.	Dimension Door (spinning blue aura)
 823.	in-the-manhole effect
@@ -863,8 +863,8 @@ Number	Description
 844.	Purple cone
 845.	light-bluish turquoise cone
 846.	(Nothing)
-847.	Light rays upwards (white/red)
-848.	Light rays upwards (white/blue)
+847.	Gloomy Day (white/red light rays)
+848.	Gloomy Day (white/blue light rays)
 849.	(Nothing)
 850.	(Nothing)
 851.	Green mushy-foggy stuff (dull)
@@ -942,7 +942,7 @@ Number	Description
 923.	Poison Buster
 924.	Poisoning animation
 925.	Some filter
-926.	Lightning cloud
+926.	Electric Walk unit
 927.	Earth Grave (speary roots)
 928.	Ice cloud projectiles
 929.	Warmer (field of flames)
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index ca4208d84..95e5b6182 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1803,7 +1803,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	732,{
 				next;
 				mes "[Test Supervisor, Freeze]";
 				mes "Then, Good luck!";
-//				sc_start SC_STONE,120000,10; // Commented until the Mercenary M_DESERT_WOLF_B is working correctly.
+				sc_start SC_STONE,120000,10;
 				close2;
 				donpcevent "Test Supervisor#jr_13::OnDisable";
 				donpcevent "Third Test Timer#jr_12::OnEnable";