diff options
127 files changed, 187 insertions, 203 deletions
diff --git a/conf-tmpl/battle/client.conf b/conf-tmpl/battle/client.conf index a9546e845..3b596bd44 100644 --- a/conf-tmpl/battle/client.conf +++ b/conf-tmpl/battle/client.conf @@ -113,4 +113,3 @@ display_version: yes // When affected with the "Hallucination" status effect, send the effect to client? (Note 1) // Note: Set to 'no' if the client lags due to the "Wavy" screen effect. display_hallucination: yes - diff --git a/conf-tmpl/charhelp.txt b/conf-tmpl/charhelp.txt index 6ce1871f4..c64a0c330 100644 --- a/conf-tmpl/charhelp.txt +++ b/conf-tmpl/charhelp.txt @@ -23,4 +23,4 @@ 60:#disguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player 60:#undisguise <char name> - Cancels disguise of a player 60:#changesex <name> - Changes sex of a player (all characters of the account) - 60:#warp/#rura+ <mapname> <x> <y> <char name> - Warps character to location of choice
\ No newline at end of file + 60:#warp/#rura+ <mapname> <x> <y> <char name> - Warps character to location of choice diff --git a/conf-tmpl/help.txt b/conf-tmpl/help.txt index a013e8d9d..2fe7726ef 100644 --- a/conf-tmpl/help.txt +++ b/conf-tmpl/help.txt @@ -173,4 +173,4 @@ 1:@readmail - Read a message. 1:@sendmail - Send mail. 1:deletemail - Deletes a message. - 80:@sendprioritymail - Sends priority mail (cannot be deleted until read)
\ No newline at end of file + 80:@sendprioritymail - Sends priority mail (cannot be deleted until read) diff --git a/conf-tmpl/help2.txt b/conf-tmpl/help2.txt index ff5bebd9f..e9210add0 100644 --- a/conf-tmpl/help2.txt +++ b/conf-tmpl/help2.txt @@ -92,4 +92,4 @@ 99:@gat - For debugging (you inspect around gat) 99:@packet - For debugging (packet variety) 100:@nuke <char name> - -100:@GM <password> - it becomes GM! (password is set in login_athena.conf)
\ No newline at end of file +100:@GM <password> - it becomes GM! (password is set in login_athena.conf) diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt index c29d4dbb4..eebf90f1f 100644 --- a/conf-tmpl/mapflag/nobranch.txt +++ b/conf-tmpl/mapflag/nobranch.txt @@ -291,4 +291,4 @@ umbala mapflag nobranch xmas mapflag nobranch yuno mapflag nobranch rachel mapflag nobranch -veins mapflag nobranch
\ No newline at end of file +veins mapflag nobranch diff --git a/conf-tmpl/mapflag/noloot.txt b/conf-tmpl/mapflag/noloot.txt index 12f72ab7f..a260ed5b3 100644 --- a/conf-tmpl/mapflag/noloot.txt +++ b/conf-tmpl/mapflag/noloot.txt @@ -21,5 +21,5 @@ job_soul mapflag noloot job_star mapflag noloot que_ng mapflag noloot -//Thievs have to gather some mushrooms. So they need loot +//Thieves have to gather some mushrooms. So they need loot //job_thief1 mapflag noloot diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt index 13eca9980..8d6f257f2 100644 --- a/conf-tmpl/mapflag/nopenalty.txt +++ b/conf-tmpl/mapflag/nopenalty.txt @@ -229,4 +229,4 @@ pvp_n_8-2 mapflag nopenalty pvp_n_8-3 mapflag nopenalty pvp_n_8-4 mapflag nopenalty pvp_n_8-5 mapflag nopenalty -pvp_2vs2 mapflag nopenalty
\ No newline at end of file +pvp_2vs2 mapflag nopenalty diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt index 842e1379c..0a0e74071 100644 --- a/conf-tmpl/mapflag/nopvp.txt +++ b/conf-tmpl/mapflag/nopvp.txt @@ -75,4 +75,4 @@ airport mapflag pvp off einbech mapflag pvp off einbroch mapflag pvp off ein_in01 mapflag pvp off -ayothaya mapflag pvp off
\ No newline at end of file +ayothaya mapflag pvp off diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt index 637a50317..303b208de 100644 --- a/conf-tmpl/mapflag/nowarpto.txt +++ b/conf-tmpl/mapflag/nowarpto.txt @@ -39,4 +39,4 @@ nguild_prt mapflag nowarpto lhz_dun03 mapflag nowarpto // Special Quests Places ======= ama_test mapflag nowarpto -gon_test mapflag nowarpto
\ No newline at end of file +gon_test mapflag nowarpto diff --git a/conf-tmpl/motd.txt b/conf-tmpl/motd.txt index b4d040554..7e8c50575 100644 --- a/conf-tmpl/motd.txt +++ b/conf-tmpl/motd.txt @@ -1,2 +1,2 @@ // Internal default is limited to 128 lines. If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c -Welcome to eAthena SVN Version! Enjoy! Please report any bugs you find in eAthena :).
\ No newline at end of file +Welcome to eAthena SVN Version! Enjoy! Please report any bugs you find in eAthena :). diff --git a/db/create_arrow_db.txt b/db/create_arrow_db.txt index 7332975db..2a23ca5f6 100644 --- a/db/create_arrow_db.txt +++ b/db/create_arrow_db.txt @@ -192,4 +192,4 @@ // Matchstick --> 3000 Fire Arrows 7035,1752,3000 // Fang of Garm --> 300 Crystal Arrows -7036,1754,300
\ No newline at end of file +7036,1754,300 diff --git a/db/exp.txt b/db/exp.txt index 5c2dba027..58310fe24 100644 --- a/db/exp.txt +++ b/db/exp.txt @@ -21,4 +21,4 @@ //Job - Star Gladiator 50,4047:4048,1,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,54868,70216,77154,84412,105416,133942,165376,179088,193338,235642,289842,348402,373354,399168,477234,572732,674294,716870,760752,895370,1053978,1220492,1289472,1587070,1843620,2213516,2521910,2974608,3115314,3981264,4166772 //Job - Ninja/Gunslinger -70,24:25,1,72,92,142,174,301,443,548,799,1270,1838,2145,2473,3339,4746,6385,7172,8002,10321,13717,17554,19288,21103,26354,33485,41344,44772,48334,58910,72460,87100,93338,99792,119308,143183,231068,257377,274363,314246,371105,431038,476309,588548,665256,801731,916689,1130023,1188623,1477408,1551289,1746582,1845236,1954741,2124555,2345698,2548763,2759555,3021488,3254111,3489547,3695474,4012251,4181112,4302211,4496584,4578951,4869523,5022114,5123654,5395117
\ No newline at end of file +70,24:25,1,72,92,142,174,301,443,548,799,1270,1838,2145,2473,3339,4746,6385,7172,8002,10321,13717,17554,19288,21103,26354,33485,41344,44772,48334,58910,72460,87100,93338,99792,119308,143183,231068,257377,274363,314246,371105,431038,476309,588548,665256,801731,916689,1130023,1188623,1477408,1551289,1746582,1845236,1954741,2124555,2345698,2548763,2759555,3021488,3254111,3489547,3695474,4012251,4181112,4302211,4496584,4578951,4869523,5022114,5123654,5395117 diff --git a/db/item_noequip.txt b/db/item_noequip.txt index 79b0f3f7c..1e43130ca 100644 --- a/db/item_noequip.txt +++ b/db/item_noequip.txt @@ -32,4 +32,4 @@ //Zone 2 - Jail 601,8 //Fly Wing - not really needed here but ... -602,8 //Butterfly Wing - also not needed
\ No newline at end of file +602,8 //Butterfly Wing - also not needed diff --git a/db/mob_race2_db.txt b/db/mob_race2_db.txt index 56c8d8126..e556fd5a2 100644 --- a/db/mob_race2_db.txt +++ b/db/mob_race2_db.txt @@ -12,4 +12,4 @@ // Golems 4,1040,1278,1366,1497,1540,1549 // Guardians -5,1285,1286,1287
\ No newline at end of file +5,1285,1286,1287 diff --git a/db/mob_skill_db2.txt b/db/mob_skill_db2.txt index 51532c4cb..8e44bfd33 100644 --- a/db/mob_skill_db2.txt +++ b/db/mob_skill_db2.txt @@ -239,4 +239,4 @@ //1239,Fire Poring@RG_STRIPSHIELD,attack,216,5,2000,0,3000,yes,target,always,0,,,,,, //1239,Fire Poring@RG_STRIPWEAPON,attack,215,5,2000,0,3000,yes,target,always,0,,,,,, -// Here you can place your custom mob skills
\ No newline at end of file +// Here you can place your custom mob skills diff --git a/db/packet_db.txt b/db/packet_db.txt index ff634078f..6a276c825 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -891,4 +891,4 @@ packet_ver: 21 0x02ac,6 // Add new packets here -//packet_ver: 22
\ No newline at end of file +//packet_ver: 22 diff --git a/db/refine_db.txt b/db/refine_db.txt index 62fc5a174..9a1292fdd 100644 --- a/db/refine_db.txt +++ b/db/refine_db.txt @@ -8,5 +8,3 @@ 3, 5,6, 100,100,100,100,100,100, 60, 40, 20, 20, // Lv.2 Weapons 5, 8,5, 100,100,100,100,100, 60, 50, 20, 20, 20, // Lv.3 Weapons 7,13,4, 100,100,100,100, 60, 40, 40, 20, 20, 10, // Lv.4 Weapons - - diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 4f59a4563..22c34cf8a 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -216,7 +216,7 @@ //-- HT_SKIDTRAP 115,0,0,0,300000:240000:180000:120000:60000,0 //-- HT_LANDMINE -116,0,0,0,200000:160000:120000:80000:40000,3000 +116,0,0,0,200000:160000:120000:80000:40000,5000 //-- HT_ANKLESNARE 117,0,0,0,250000:200000:150000:100000:50000,4000:8000:12000:16000:20000 //-- HT_SHOCKWAVE diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt index 019d88059..f80cca8e6 100644 --- a/doc/woe_time_explanation.txt +++ b/doc/woe_time_explanation.txt @@ -108,4 +108,4 @@ //| Any questions Pm me (erKURITA) or go to irc channel on irc.deltaanime.net in #athena //| channel. Do not PM on IRC w/o asking please. //| -//| ~ erKURITA
\ No newline at end of file +//| ~ erKURITA diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 086c69fd8..c21b78348 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -658,13 +658,13 @@ OnTimer130000: donpcevent "#AirshipWarp-4::OnHide"; disablenpc "#AirshipWarp-3"; disablenpc "#AirshipWarp-4"; - mapannounce "airplane_01.gat","The Airship is leaving the ground. Our next destination is Rachel.",1,0xFF8600; + mapannounce "airplane_01","The Airship is leaving the ground. Our next destination is Rachel.",1,0xFF8600; end; OnTimer145000: - mapannounce "airplane_01.gat","We are heading to Rachel.",1,0xFF8600; + mapannounce "airplane_01","We are heading to Rachel.",1,0xFF8600; end; OnTimer160000: - mapannounce "airplane_01.gat","We will arrive in Rachel shortly.",1,0xFF8600; + mapannounce "airplane_01","We will arrive in Rachel shortly.",1,0xFF8600; end; OnTimer175000: set $@airplanelocation2,3; @@ -672,10 +672,10 @@ OnTimer175000: enablenpc "#AirshipWarp-4"; donpcevent "#AirshipWarp-3::OnUnhide"; donpcevent "#AirshipWarp-4::OnUnhide"; - mapannounce "airplane_01.gat","Welcome to Rachel. Have a safe trip.",1,0xFF8600; + mapannounce "airplane_01","Welcome to Rachel. Have a safe trip.",1,0xFF8600; end; OnTimer185000: - mapannounce "airplane_01.gat","Currently, we are in Rachel. The Airship will leave shortly.",1,0xFF8600; + mapannounce "airplane_01","Currently, we are in Rachel. The Airship will leave shortly.",1,0xFF8600; end; OnTimer195000: stoptimer; @@ -825,7 +825,7 @@ hugel,182,150,3 script Airship Staff#hu 91,{ //= The Rachel Airship Staff //============================================================ -ra_fild12.gat,294,206,3 script Airship Staff#ra 91,{ +ra_fild12,294,206,3 script Airship Staff#ra 91,{ mes "[Airship Staff]"; mes "Welcome to the International Airship."; @@ -845,12 +845,12 @@ ra_fild12.gat,294,206,3 script Airship Staff#ra 91,{ if(countitem(7311) > 0) goto L_GotTicket; if(Zeny < 1200) goto L_NoZeny; set Zeny, Zeny - 1200; - warp "airplane_01.gat",224,64; + warp "airplane_01",224,64; close; L_GotTicket: delitem 7311,1; - warp "airplane_01.gat",224,64; + warp "airplane_01",224,64; close; L_NoZeny: diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index 71d567b6e..cd77fca4c 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -108,4 +108,4 @@ einbroch,94,267,4 script Airship Staff 91,{ mes "you to the main terminal. Thank"; mes "you, and enjoy your travels."; close; -}
\ No newline at end of file +} diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index 6e3b1b5cb..64bfe03a9 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -88,4 +88,4 @@ lhz_airport,126,51,4 script Airport Staff#4::AirportL2 90,{ } lhz_airport,143,51,4 duplicate(AirportL2) Airport Staff#5 90 -lhz_airport,156,51,4 duplicate(AirportL2) Airport Staff#6 90
\ No newline at end of file +lhz_airport,156,51,4 duplicate(AirportL2) Airport Staff#6 90 diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index 1ed925fe6..3203f4d2a 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -88,4 +88,4 @@ y_airport,126,51,4 script Airport Staff#004::AirportY2 90,{ } y_airport,143,51,4 duplicate(AirportY2) Airport Staff#005 90 -y_airport,156,51,4 duplicate(AirportY2) Airport Staff#006 90
\ No newline at end of file +y_airport,156,51,4 duplicate(AirportY2) Airport Staff#006 90 diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 25cdf6d52..0f3707813 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -353,4 +353,4 @@ alb2trea,39,50,5 script Sailor 100,{ warp "alberta",192,169; MEnd: close; -}
\ No newline at end of file +} diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index c1dc943a0..a202e4ae2 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -936,4 +936,4 @@ s_NEnough: //que_ng,28,45,3 script Man 86,{end;} //que_ng,28,50,3 script Seaman2 709,{end;} //que_ng,22,62,3 script Seaman2 709,{end;} -//que_ng,30,65,3 script Ninja Sensei 730,{end;}
\ No newline at end of file +//que_ng,30,65,3 script Ninja Sensei 730,{end;} diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 02677485e..06f5d818b 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -284,4 +284,4 @@ ayo_dun01,28,28,4 duplicate(#ayokillscript) #ayodupe10 139,1,1 ayo_dun01,271,274,4 duplicate(#ayokillscript) #ayodupe11 139,1,1 ayo_dun01,271,271,4 duplicate(#ayokillscript) #ayodupe12 139,1,1 ayo_dun01,274,271,4 duplicate(#ayokillscript) #ayodupe13 139,1,1 -ayo_dun01,274,274,4 duplicate(#ayokillscript) #ayodupe14 139,1,1
\ No newline at end of file +ayo_dun01,274,274,4 duplicate(#ayokillscript) #ayodupe14 139,1,1 diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index a3944fcad..69e426519 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -423,4 +423,4 @@ moc_fild12,35,303,4 script Saint Darmain Gatekeeper 59,{ mes "^3355FF`Comodo'^000000 City."; mes "The tropical weather over there is a brand new experience for most people."; close; -}
\ No newline at end of file +} diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index e9468f35e..f1d44599f 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -976,4 +976,3 @@ OnTouch: warp "einbroch",112,245; end; } - diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index af59eff16..fffdb4403 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -569,4 +569,4 @@ gonryun,169,71,3 script Guide#gn 770,{ mes "You'll find a lots of beautiful"; mes "sights all over the town."; close; -}
\ No newline at end of file +} diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 64bd7d512..d2d2bb649 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -30,7 +30,7 @@ //Torpy's Mom //--------------------------------------------------------------------------- -hu_fild06.gat,190,367,3 script Torpy's Mom 701,{ +hu_fild06,190,367,3 script Torpy's Mom 701,{ mes "[Torpy's Mom]"; mes "Where did he go this time?!"; @@ -43,7 +43,7 @@ hu_fild06.gat,190,367,3 script Torpy's Mom 701,{ //Postell Schuwell //--------------------------------------------------------------------------- -hu_fild06.gat,34,123,3 script Postell Schuwell 97,{ +hu_fild06,34,123,3 script Postell Schuwell 97,{ mes "[Postell]"; mes "I really like living"; @@ -61,7 +61,7 @@ hu_fild06.gat,34,123,3 script Postell Schuwell 97,{ // Manainne //-------------------------------------------------------------------------- -hugel.gat,191,172,5 script Manainne 893,{ +hugel,191,172,5 script Manainne 893,{ mes "[Manainne]"; mes "You know, even though"; @@ -75,7 +75,7 @@ hugel.gat,191,172,5 script Manainne 893,{ //El Schatt //--------------------------------------------------------------------------- -hugel.gat,196,164,5 script El Schatt 50,{ +hugel,196,164,5 script El Schatt 50,{ mes "[El Schatt]"; mes "Father was right..."; @@ -89,7 +89,7 @@ hugel.gat,196,164,5 script El Schatt 50,{ //Young Man //--------------------------------------------------------------------------- -hugel.gat,189,143,5 script Young Man 898,{ +hugel,189,143,5 script Young Man 898,{ mes "[Young Man]"; mes "Huh. So that giant"; @@ -103,7 +103,7 @@ hugel.gat,189,143,5 script Young Man 898,{ //Emily //--------------------------------------------------------------------------- -hugel.gat,126,151,3 script Emily 90,{ +hugel,126,151,3 script Emily 90,{ mes "[Emily]"; mes "I feel so blessed to"; @@ -123,7 +123,7 @@ hugel.gat,126,151,3 script Emily 90,{ //Mudie //--------------------------------------------------------------------------- -hugel.gat,85,93,3 script Mudie 866,{ +hugel,85,93,3 script Mudie 866,{ mes "[Mudie]"; mes "The Monster Races"; @@ -152,7 +152,7 @@ hugel.gat,85,93,3 script Mudie 866,{ //Perfitz //--------------------------------------------------------------------------- -hugel.gat,100,103,3 script Perfitz 866,{ +hugel,100,103,3 script Perfitz 866,{ mes "[Perfitz]"; mes "Money is very dependable..."; @@ -182,7 +182,7 @@ hugel.gat,100,103,3 script Perfitz 866,{ //Torpy //--------------------------------------------------------------------------- -hugel.gat,107,67,3 script Torpy 706,{ +hugel,107,67,3 script Torpy 706,{ mes "[Torpy]"; mes "Waaah~!"; @@ -194,7 +194,7 @@ hugel.gat,107,67,3 script Torpy 706,{ //Kayplas //--------------------------------------------------------------------------- -hugel.gat,86,165,5 script Kayplas 896,{ +hugel,86,165,5 script Kayplas 896,{ mes "[Kayplas]"; mes "Ooh, I really want to"; @@ -207,7 +207,7 @@ hugel.gat,86,165,5 script Kayplas 896,{ //Erjan //--------------------------------------------------------------------------- -hugel.gat,102,161,3 script Erjan 100,{ +hugel,102,161,3 script Erjan 100,{ mes "[Erjan]"; mes "I am Erjan, first son of"; @@ -221,7 +221,7 @@ hugel.gat,102,161,3 script Erjan 100,{ //Barrel //--------------------------------------------------------------------------- -hugel.gat,100,175,0 script Suspicious Barrel 111,{ +hugel,100,175,0 script Suspicious Barrel 111,{ mes "^CD00CDYou hear something bustling from"; mes "the hole in the barrel."; @@ -234,7 +234,7 @@ hugel.gat,100,175,0 script Suspicious Barrel 111,{ //Lisa //--------------------------------------------------------------------------- -hugel.gat,71,197,3 script Lisa 90,{ +hugel,71,197,3 script Lisa 90,{ mes "[Lisa]"; mes "Hugel is a pretty"; @@ -254,7 +254,7 @@ hugel.gat,71,197,3 script Lisa 90,{ //Old Nikki //--------------------------------------------------------------------------- -hugel.gat,169,112,5 script Old Nikki 892,{ +hugel,169,112,5 script Old Nikki 892,{ mes "[Old Nikki]"; mes "You must not be from"; @@ -274,7 +274,7 @@ hugel.gat,169,112,5 script Old Nikki 892,{ //Bismarc //--------------------------------------------------------------------------- -hugel.gat,168,183,5 script Bismarc 118,{ +hugel,168,183,5 script Bismarc 118,{ mes "[Bismarc]"; mes "^808080*Ghyklk*"; @@ -296,7 +296,7 @@ hugel.gat,168,183,5 script Bismarc 118,{ //Tree ~Completely missed this on iRO; full credit to Tsuyuki ~Munin //--------------------------------------------------------------------------- -hugel.gat,198,171,0 script #oldtree 139,1,1,{ +hugel,198,171,0 script #oldtree 139,1,1,{ end; @@ -316,7 +316,7 @@ OnTouch: //Allen Schuwell //------------------------------------------------------------------------- -hu_in01.gat,386,245,1 script Allen Schuwell 849,{ +hu_in01,386,245,1 script Allen Schuwell 849,{ mes "[Allen]"; mes "*Groooooan~*"; @@ -330,7 +330,7 @@ hu_in01.gat,386,245,1 script Allen Schuwell 849,{ //Siria //--------------------------------------------------------------------------- -hu_in01.gat,326,307,3 script Siria 90,{ +hu_in01,326,307,3 script Siria 90,{ mes "[Siria]"; mes "Oh, hello there."; @@ -341,7 +341,7 @@ hu_in01.gat,326,307,3 script Siria 90,{ //Furniture Drawer //--------------------------------------------------------------------------- -hu_in01.gat,370,254,0 script Upper Drawer 111,1,1,{ +hu_in01,370,254,0 script Upper Drawer 111,1,1,{ end; @@ -355,7 +355,7 @@ OnTouch: //Girl //--------------------------------------------------------------------------- -hu_in01.gat,310,380,5 script Girl 891,{ +hu_in01,310,380,5 script Girl 891,{ mes "[Girl]"; mes "Oh... I'm so bored!"; @@ -369,7 +369,7 @@ hu_in01.gat,310,380,5 script Girl 891,{ //Chris //--------------------------------------------------------------------------- -hu_in01.gat,111,386,4 script Chris 86,{ +hu_in01,111,386,4 script Chris 86,{ mes "[Chris]"; mes "You know, the people don't"; @@ -388,7 +388,7 @@ hu_in01.gat,111,386,4 script Chris 86,{ //Herico - Has Cut-In! //--------------------------------------------------------------------------- -hu_in01.gat,256,40,3 script Herico 897,{ +hu_in01,256,40,3 script Herico 897,{ cutin "heri1",2; mes "[Herico]"; @@ -403,7 +403,7 @@ hu_in01.gat,256,40,3 script Herico 897,{ //Rachel //--------------------------------------------------------------------------- -hu_in01.gat,365,170,5 script Rachel 793,{ +hu_in01,365,170,5 script Rachel 793,{ mes "[Rachel]"; mes "You know what I love?"; @@ -416,7 +416,7 @@ hu_in01.gat,365,170,5 script Rachel 793,{ //Shaomei //--------------------------------------------------------------------------- -hu_in01.gat,377,106,5 script Shaomei 892,{ +hu_in01,377,106,5 script Shaomei 892,{ mes "[Shaomei]"; mes "We didn't use to get"; @@ -432,7 +432,7 @@ hu_in01.gat,377,106,5 script Shaomei 892,{ // Party Supplies/Firecracker Seller //-------------------------------------------------------------- -hu_in01.gat,23,311,4 script Party Supplies Shop 898,{ +hu_in01,23,311,4 script Party Supplies Shop 898,{ mes "[Shopkeeper]"; mes "Welcome to the party supplies"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 988e632d3..9a905e348 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -3039,4 +3039,4 @@ mes "equated to zeny, you know?"; close; } -// ---------------------------------------------------------------------------
\ No newline at end of file +// --------------------------------------------------------------------------- diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index bfd57cc92..299e28731 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -571,4 +571,4 @@ lou_in02,272,55,1 script Familiar-Looking Patient 86,{ mes "Aww...wwww.."; emotion e_dots; close; -}
\ No newline at end of file +} diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 7acc9dd3a..a44d22cbb 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -208,4 +208,4 @@ L_back: close; OnNFMob: end; -}
\ No newline at end of file +} diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 4cd444ebc..bcf372273 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -1021,4 +1021,4 @@ payon_in03,131,7,4 script Hunter 59,{ mes "...Can I help you?"; mes "I'm here for official business and am busy at the moment. If you'll excuse me..."; close; -}
\ No newline at end of file +} diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index d07ca4b5c..a91e89b0f 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -623,4 +623,4 @@ s_Dont2: close; } goto Loopback; -}
\ No newline at end of file +} diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 6b65c8caf..77a8cce43 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -550,4 +550,4 @@ L_ALREADY3RD: mes "You don't belong to our guild. Begone!"; emotion e_omg; close; -}
\ No newline at end of file +} diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index ff7f5c8c9..3ae850496 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -362,4 +362,4 @@ yuno,165,111,4 script Juno Sage 123,{ mes "is nothing but a mindless monster"; mes "now."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 446f4a32a..a83950878 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -16,7 +16,7 @@ //===== Comments ========================================== //= Converted from Aegis Script. //========================================================= -que_ng.gat,187,156,3 script Bullet Merchant Tony 86,{ +que_ng,187,156,3 script Bullet Merchant Tony 86,{ if (BaseJob == JOB_GUNSLINGER) { mes "[Tony]"; mes "I'm Bullet-tooth Tony!"; diff --git a/npc/mobs/fields/veins.txt b/npc/mobs/fields/veins.txt index 03affb07e..0fe7fbff8 100644 --- a/npc/mobs/fields/veins.txt +++ b/npc/mobs/fields/veins.txt @@ -14,49 +14,49 @@ //================================================================ //======== [Veins Field-01] ====================================== -ve_fild01.gat,0,0,0 monster Side Winder 1037,1,0,0,0 -ve_fild01.gat,0,0,0 monster Muka 1055,40,0,0,0 -ve_fild01.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1 -ve_fild01.gat,0,0,0 monster Blue Plant 1079,3,1800000,900000,1 -ve_fild01.gat,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 -ve_fild01.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 -ve_fild01.gat,0,0,0 monster Drops 1113,20,0,0,0 -ve_fild01.gat,0,0,0 monster Stapo 1784,20,0,0,0 +ve_fild01,0,0,0 monster Side Winder 1037,1,0,0,0 +ve_fild01,0,0,0 monster Muka 1055,40,0,0,0 +ve_fild01,0,0,0 monster Red Plant 1078,10,180000,90000,1 +ve_fild01,0,0,0 monster Blue Plant 1079,3,1800000,900000,1 +ve_fild01,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 +ve_fild01,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 +ve_fild01,0,0,0 monster Drops 1113,20,0,0,0 +ve_fild01,0,0,0 monster Stapo 1784,20,0,0,0 //======== [Veins Field-02] ======================================= -ve_fild02.gat,0,0,0 monster Side Winder 1037,10,0,0,0 -ve_fild02.gat,0,0,0 monster Savage 1166,60,0,0,0 -ve_fild02.gat,0,0,0 monster Roween 1782,30,0,0,0 -ve_fild02.gat,0,0,0 monster Atros 1785,1,86400000,86000000,1 +ve_fild02,0,0,0 monster Side Winder 1037,10,0,0,0 +ve_fild02,0,0,0 monster Savage 1166,60,0,0,0 +ve_fild02,0,0,0 monster Roween 1782,30,0,0,0 +ve_fild02,0,0,0 monster Atros 1785,1,86400000,86000000,1 //======== [Veins Field-03] ======================================= -ve_fild03.gat,0,0,0 monster Sleeper 1386,40,0,0,0 -ve_fild03.gat,0,0,0 monster Magmaring 1836,30,0,0,0 +ve_fild03,0,0,0 monster Sleeper 1386,40,0,0,0 +ve_fild03,0,0,0 monster Magmaring 1836,30,0,0,0 //======== [Veins Field-04] ======================================= -ve_fild04.gat,0,0,0 monster Desert Wolf 1106,30,0,0,0 -ve_fild04.gat,0,0,0 monster Muscipular 1780,10,0,0,0 -ve_fild04.gat,0,0,0 monster Roween 1782,15,0,0,0 -ve_fild04.gat,0,0,0 monster Stapo 1784,30,0,0,0 +ve_fild04,0,0,0 monster Desert Wolf 1106,30,0,0,0 +ve_fild04,0,0,0 monster Muscipular 1780,10,0,0,0 +ve_fild04,0,0,0 monster Roween 1782,15,0,0,0 +ve_fild04,0,0,0 monster Stapo 1784,30,0,0,0 //======== [Veins Field-05] ======================================= -ve_fild05.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1 -ve_fild05.gat,0,0,0 monster Desert Wolf 1106,10,0,0,0 -ve_fild05.gat,0,0,0 monster Sleeper 1386,10,0,0,0 -ve_fild05.gat,0,0,0 monster Muscipular 1780,10,0,0,0 -ve_fild05.gat,0,0,0 monster Drosera 1781,10,0,0,0 -ve_fild05.gat,0,0,0 monster Roween 1782,20,0,0,0 -ve_fild05.gat,0,0,0 monster Galion 1783,5,0,0,0 +ve_fild05,0,0,0 monster Red Plant 1078,10,180000,90000,1 +ve_fild05,0,0,0 monster Desert Wolf 1106,10,0,0,0 +ve_fild05,0,0,0 monster Sleeper 1386,10,0,0,0 +ve_fild05,0,0,0 monster Muscipular 1780,10,0,0,0 +ve_fild05,0,0,0 monster Drosera 1781,10,0,0,0 +ve_fild05,0,0,0 monster Roween 1782,20,0,0,0 +ve_fild05,0,0,0 monster Galion 1783,5,0,0,0 //======== [Veins Field-06] ======================================= -ve_fild06.gat,0,0,0 monster Red Plant 1078,3,180000,90000,1 -ve_fild06.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 -ve_fild06.gat,0,0,0 monster Stapo 1784,5,120000,60000,1 +ve_fild06,0,0,0 monster Red Plant 1078,3,180000,90000,1 +ve_fild06,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 +ve_fild06,0,0,0 monster Stapo 1784,5,120000,60000,1 //======== [Veins Field-07] ======================================= -ve_fild07.gat,0,0,0 monster Side Winder 1037,1,0,0,0 -ve_fild07.gat,0,0,0 monster Shellfish 1074,40,0,0,0 -ve_fild07.gat,0,0,0 monster White Plant 1082,5,180000,90000,1 -ve_fild07.gat,0,0,0 monster Raggler 1254,20,0,0,0 -ve_fild07.gat,0,0,0 monster Aster 1266,30,0,0,0 -ve_fild07.gat,0,0,0 monster Stapo 1784,20,0,0,0 +ve_fild07,0,0,0 monster Side Winder 1037,1,0,0,0 +ve_fild07,0,0,0 monster Shellfish 1074,40,0,0,0 +ve_fild07,0,0,0 monster White Plant 1082,5,180000,90000,1 +ve_fild07,0,0,0 monster Raggler 1254,20,0,0,0 +ve_fild07,0,0,0 monster Aster 1266,30,0,0,0 +ve_fild07,0,0,0 monster Stapo 1784,20,0,0,0 diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf index d0b065eda..a5a1d531b 100644 --- a/npc/scripts_guild.conf +++ b/npc/scripts_guild.conf @@ -64,4 +64,4 @@ npc: npc/guild/nguild/nguild_kafras.txt npc: npc/guild/nguild/nguild_treas.txt npc: npc/guild/nguild/nguild_guardians.txt npc: npc/guild/nguild/nguild_warper.txt -// --------------------------------------------------------------
\ No newline at end of file +// -------------------------------------------------------------- diff --git a/npc/scripts_jmonsters.conf b/npc/scripts_jmonsters.conf index 024eeb291..6c57f04a7 100644 --- a/npc/scripts_jmonsters.conf +++ b/npc/scripts_jmonsters.conf @@ -29,4 +29,4 @@ npc: npc/eamobs/jro/jro.txt //npc: npc/mobs/dungeons/kiel.txt //npc: npc/mobs/dungeons/icedun.txt //npc: npc/mobs/dungeons/racheldun.txt -// --------------------------------------------------------------
\ No newline at end of file +// -------------------------------------------------------------- diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 7c5f6ecc6..40ca3261c 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -98,4 +98,4 @@ npc: npc/warps/other/kiel.txt npc: npc/warps/other/sign.txt npc: npc/warps/other/god.txt npc: npc/warps/pvp/pvp.txt -// --------------------------------------------------------------
\ No newline at end of file +// -------------------------------------------------------------- diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt index 4cfa5eb19..271288235 100644 --- a/npc/warps/cities/alberta.txt +++ b/npc/warps/cities/alberta.txt @@ -55,4 +55,4 @@ alberta_in,66,113,0 warp alb18 3,1,alberta_in,66,132 alberta_in,66,130,0 warp alb18-1 3,1,alberta_in,66,111 alberta_in,66,153,0 warp alb19 3,2,alberta_in,66,173 alberta_in,66,170,0 warp alb19-1 3,2,alberta_in,66,149 -alb2trea,88,111,0 warp alb002 1,1,treasure01,69,24
\ No newline at end of file +alb2trea,88,111,0 warp alb002 1,1,treasure01,69,24 diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index f2911af12..370fab0fb 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -48,4 +48,4 @@ aldeba_in,97,102,0 warp ald10-1 2,2,aldeba_in,103,58 //Turbo Track Room alde_gld,183,204,0 warp turbo01 1,1,turbo_room,100,64 -turbo_room,100,61,0 warp turbo02 1,1,alde_gld,183,198
\ No newline at end of file +turbo_room,100,61,0 warp turbo02 1,1,alde_gld,183,198 diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 0e1bbbd68..a855c3409 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -54,4 +54,4 @@ que_ng,20,138,0 warp ninja02 1,1,amatsu,147,136 que_ng,10,183,0 warp ninja03 1,1,que_ng,33,64 que_ng,37,64,0 warp ninja04 1,1,que_ng,15,182 que_ng,30,37,0 warp ninja05 1,1,que_ng,67,28 -que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37
\ No newline at end of file +que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37 diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt index 210cf2895..279281023 100644 --- a/npc/warps/cities/ayothaya.txt +++ b/npc/warps/cities/ayothaya.txt @@ -91,4 +91,4 @@ ayo_in01,13,83,0 warp ayothayawarp047 2,2,ayo_in01,19,15 ayo_in01,22,15,0 warp ayothayawarp048 2,2,ayo_in01,16,83 //Inn Room -- Bottom Left ayo_in01,13,107,0 warp ayothayawarp049 2,2,ayo_in01,133,27 -ayo_in01,136,27,0 warp ayothayawarp050 2,2,ayo_in01,16,107
\ No newline at end of file +ayo_in01,136,27,0 warp ayothayawarp050 2,2,ayo_in01,16,107 diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt index 815306f66..6ea63eff0 100644 --- a/npc/warps/cities/comodo.txt +++ b/npc/warps/cities/comodo.txt @@ -47,4 +47,4 @@ cmd_in02,58,74,0 warp cmd15 1,1,cmd_in02,166,116 cmd_in02,69,129,0 warp cmd09-1 4,4,comodo,115,288 cmd_in02,74,21,0 warp cmd01-1 1,1,comodo,140,86 cmd_in02,90,37,0 warp cmd14 1,1,cmd_in02,191,77 -cmd_in02,98,216,0 warp cmd16-1 1,1,cmd_in02,207,210
\ No newline at end of file +cmd_in02,98,216,0 warp cmd16-1 1,1,cmd_in02,207,210 diff --git a/npc/warps/cities/einbech.txt b/npc/warps/cities/einbech.txt index f89734851..03e87dd86 100644 --- a/npc/warps/cities/einbech.txt +++ b/npc/warps/cities/einbech.txt @@ -43,4 +43,3 @@ ein_in01,265,104,0 warp eib_b02a 1,1,einbech,141,112 //========================================================================= einbech,256,109,0 warp eib_js01 1,1,ein_in01,148,153 ein_in01,144,153,0 warp eib_js01a 1,1,einbech,253,109 - diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt index 6a5f5b5bb..600143b01 100644 --- a/npc/warps/cities/einbroch.txt +++ b/npc/warps/cities/einbroch.txt @@ -113,4 +113,4 @@ que_ng,166,85,0 warp gswarp4 1,1,que_ng,182,161 que_ng,165,137,0 warp gswarp5 1,1,que_ng,177,41 que_ng,172,42,0 warp gswarp6 1,1,que_ng,160,139 //This one seems to be wrong -//einbroch,137,149,0 warp gswarp7 1,1,que_ng,138,167
\ No newline at end of file +//einbroch,137,149,0 warp gswarp7 1,1,que_ng,138,167 diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt index 1083e4188..697b041d5 100644 --- a/npc/warps/cities/geffen.txt +++ b/npc/warps/cities/geffen.txt @@ -47,4 +47,4 @@ geffen_in,163,94,0 warp gef05-1 4,2,geffen,65,176 geffen_in,70,132,0 warp gef04-1 3,1,geffen,46,88 geffen_in,106,181,0 warp gef03-1 2,2,geffen,180,61 geffen_in,28,106,0 warp gef01-1 1,3,geffen,136,136 -geffen_in,70,48,0 warp gef02-1 3,2,geffen,168,170
\ No newline at end of file +geffen_in,70,48,0 warp gef02-1 3,2,geffen,168,170 diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt index 5d8e4ab4a..8eb6ca9f6 100644 --- a/npc/warps/cities/gonryun.txt +++ b/npc/warps/cities/gonryun.txt @@ -31,4 +31,4 @@ gon_in,72,67,0 warp gon14 1,1,gonryun,107,181 gon_in,47,24,0 warp gon16 1,1,gonryun,112,131 gon_in,42,35,0 warp gon17 1,1,gon_in,34,97 gon_in,31,97,0 warp gon18 1,1,gon_in,39,35 -gon_fild01,192,266,0 warp gon01 1,1,gonryun,161,11
\ No newline at end of file +gon_fild01,192,266,0 warp gon01 1,1,gonryun,161,11 diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt index 68ee6905a..276a47dc7 100644 --- a/npc/warps/cities/hugel.txt +++ b/npc/warps/cities/hugel.txt @@ -115,4 +115,4 @@ que_bingo,49,7,0 warp hugelwarp1052 1,1,hugel,57,207 que_bingo,39,34,0 warp hugelwarp1053 1,1,que_bingo,34,109 que_bingo,34,105,0 warp hugelwarp1054 1,1,que_bingo,38,28 que_bingo,53,34,0 warp hugelwarp1055 1,1,que_bingo,49,71 -que_bingo,48,66,0 warp hugelwarp1056 1,1,que_bingo,53,29
\ No newline at end of file +que_bingo,48,66,0 warp hugelwarp1056 1,1,que_bingo,53,29 diff --git a/npc/warps/cities/izlude.txt b/npc/warps/cities/izlude.txt index e19efeee8..8ab2841f4 100644 --- a/npc/warps/cities/izlude.txt +++ b/npc/warps/cities/izlude.txt @@ -31,4 +31,4 @@ izlude_in,65,84,0 warp iz01-1 5,2,izlude,113,147 izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,136 izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169 izlude,149,39,0 warp izair1 1,1,izlude,180,56 -izlude,176,56,0 warp lizair2 1,1,izlude,145,39
\ No newline at end of file +izlude,176,56,0 warp lizair2 1,1,izlude,145,39 diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt index d74d24d3e..425c0646b 100644 --- a/npc/warps/cities/lighthalzen.txt +++ b/npc/warps/cities/lighthalzen.txt @@ -142,4 +142,4 @@ lighthalzen,324,301,0 warp lhz050 1,1,lhz_in03,239,101 lhz_in03,237,101,0 warp lhz050a 1,1,lighthalzen,324,299 lighthalzen,323,322,0 warp lhz051 1,1,lhz_in03,15,162 -lhz_in03,13,162,0 warp lhz051a 1,1,lighthalzen,321,322
\ No newline at end of file +lhz_in03,13,162,0 warp lhz051a 1,1,lighthalzen,321,322 diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt index 74b250ed8..1d39a9e28 100644 --- a/npc/warps/cities/lutie.txt +++ b/npc/warps/cities/lutie.txt @@ -35,4 +35,4 @@ xmas,104,290,0 warp xmas12 3,3,xmas_in,30,166 xmas_in,30,161,0 warp xmas12-1 3,3,xmas,104,285 xmas,189,279,0 warp xmas13 3,3,xmas_in,168,166 xmas_in,168,161,0 warp xmas13-1 3,3,xmas,189,274 -xmas,143,313,0 warp xmas14 3,3,xmas_dun01,205,17
\ No newline at end of file +xmas,143,313,0 warp xmas14 3,3,xmas_dun01,205,17 diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt index d5a6d97dc..8aa210c1d 100644 --- a/npc/warps/cities/morroc.txt +++ b/npc/warps/cities/morroc.txt @@ -104,4 +104,4 @@ moc_castle,96,90,0 warp mocc13-2 1,1,moc_castle,94,119 moc_castle,92,67,0 warp mocc14 3,2,moc_castle,92,85 moc_castle,92,82,0 warp mocc14-1 3,2,moc_castle,92,63 moc_castle,94,143,0 warp mocc15 3,2,moc_castle,94,160 -moc_castle,94,156,0 warp mocc15-1 3,2,moc_castle,94,140
\ No newline at end of file +moc_castle,94,156,0 warp mocc15-1 3,2,moc_castle,94,140 diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt index bd7d3c091..91437bc22 100644 --- a/npc/warps/cities/niflheim.txt +++ b/npc/warps/cities/niflheim.txt @@ -49,4 +49,4 @@ nif_in,140,171,0 warp nwarp18 1,1,nif_in,65,165 niflheim,165,162,0 warp nwarp19 1,1,nif_in,156,80 nif_in,169,82,0 warp nwarp20 1,1,nif_in,189,105 nif_in,186,105,0 warp nwarp21 1,1,nif_in,167,82 -nif_in,154,78,0 warp nwarp22 1,1,niflheim,167,161
\ No newline at end of file +nif_in,154,78,0 warp nwarp22 1,1,niflheim,167,161 diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt index ca2db2c48..ef5bd19f9 100644 --- a/npc/warps/cities/payon.txt +++ b/npc/warps/cities/payon.txt @@ -135,4 +135,4 @@ payon_in03,27,172,0 warp payonwarp086 2,2,payon_in03,27,157 payon_in01,86,9,0 warp payonwarp087 2,2,payon,266,152 payon,270,152,0 warp payonwarp088 2,2,payon_in01,90,9 payon_in01,107,71,0 warp payonwarp089 2,2,payon_in01,96,37 -payon_in01,93,37,0 warp payonwarp090 2,2,payon_in01,104,71
\ No newline at end of file +payon_in01,93,37,0 warp payonwarp090 2,2,payon_in01,104,71 diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt index 3b53b721e..ef3564f19 100644 --- a/npc/warps/cities/prontera.txt +++ b/npc/warps/cities/prontera.txt @@ -102,4 +102,4 @@ prt_castle,59,29,0 warp prtca11 2,2,prt_castle,85,29 prt_castle,68,153,0 warp prtca10-1 1,1,prt_castle,42,145 prt_castle,75,107,0 warp prtca12 2,3,prt_castle,95,107 prt_castle,82,29,0 warp prtca11-1 1,1,prt_castle,56,29 -prt_castle,92,107,0 warp prtca12-1 2,3,prt_castle,72,107
\ No newline at end of file +prt_castle,92,107,0 warp prtca12-1 2,3,prt_castle,72,107 diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt index f863eb577..47aca7de9 100644 --- a/npc/warps/cities/umbala.txt +++ b/npc/warps/cities/umbala.txt @@ -42,4 +42,4 @@ um_in,99,63,0 warp umba0038 1,1,umbala,160,247 //Large Shack umbala,108,164,0 warp umba0039 1,1,um_in,38,112 -um_in,38,110,0 warp umba0040 1,1,umbala,104,163
\ No newline at end of file +um_in,38,110,0 warp umba0040 1,1,umbala,104,163 diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt index ee9e7d3e4..456f83ad9 100644 --- a/npc/warps/cities/yggdrasil.txt +++ b/npc/warps/cities/yggdrasil.txt @@ -20,4 +20,4 @@ yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66 //Yggdrasil Tree yggdrasil01,271,51,0 warp nwarp3 1,1,yggdrasil01,26,196 -yggdrasil01,26,193,0 warp nwarp4 1,1,yggdrasil01,269,53
\ No newline at end of file +yggdrasil01,26,193,0 warp nwarp4 1,1,yggdrasil01,269,53 diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 972fce47e..96d19c082 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -216,4 +216,4 @@ yuno_pre,112,48,0 warp yungvn10 1,1,yuno_pre,112,31 yuno_pre,94,69,0 warp yungvn11 1,1,yuno_pre,77,69 yuno_pre,60,69,0 warp yungvn12 1,1,yuno_pre,33,69 yuno_pre,81,69,0 warp yungvn13 1,1,yuno_pre,98,69 -yuno_pre,18,92,0 warp yungvn14 1,1,yuno_pre,18,73
\ No newline at end of file +yuno_pre,18,92,0 warp yungvn14 1,1,yuno_pre,18,73 diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt index 32b8ef36e..1b2d129fb 100644 --- a/npc/warps/disabled_warps.txt +++ b/npc/warps/disabled_warps.txt @@ -42,4 +42,4 @@ // Airplane (no direct access there) //airplane,255,55,0 warp ein044 1,1,airplane,90,68 -//airplane,88,68,0 warp ein044a 1,1,airplane,253,55
\ No newline at end of file +//airplane,88,68,0 warp ein044a 1,1,airplane,253,55 diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 44f6990e5..6bf41f0b3 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -17,4 +17,4 @@ abyss_01,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05,192,207 abyss_01,26,23,0 warp abysslakedunwarp003 1,1,abyss_02,275,270 abyss_02,278,270,0 warp abysslakedunwarp004 1,1,abyss_01,26,26 abyss_02,145,281,0 warp abysslakedunwarp005 1,1,abyss_03,116,27 -abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278
\ No newline at end of file +abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278 diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt index 596ef9f34..ed772a59b 100644 --- a/npc/warps/dungeons/alberta_duns.txt +++ b/npc/warps/dungeons/alberta_duns.txt @@ -55,4 +55,4 @@ tur_dun03,132,193,0 warp ttl02-1 1,1,tur_dun02,167,23 tur_dun03,217,71,0 warp ttl03 1,1,tur_dun04,100,192 tur_dun04,100,196,0 warp ttl03-1 1,1,tur_dun03,215,75 tur_dun05,89,69,0 warp ttl05 1,1,tur_dun02,148,264 -tur_dun05,9,45,0 warp ttl06 1,1,tur_dun01,154,237
\ No newline at end of file +tur_dun05,9,45,0 warp ttl06 1,1,tur_dun01,154,237 diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt index 304d36fd9..25ba86713 100644 --- a/npc/warps/dungeons/alde_ct.txt +++ b/npc/warps/dungeons/alde_ct.txt @@ -213,4 +213,4 @@ alde_dun04,80,34,4 script ald022r 45,1,1,{ w3: warp "c_tower3",235,7; end; w4: warp "alde_dun04",84,36; end; } -//============================================================
\ No newline at end of file +//============================================================ diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt index bcc9bae0c..3e7baa20f 100644 --- a/npc/warps/dungeons/amatsu_dun.txt +++ b/npc/warps/dungeons/amatsu_dun.txt @@ -18,4 +18,4 @@ ama_dun01,234,143,0 warp warp8008 1,1,ama_dun02,31,41 ama_dun02,196,124,0 warp warp8010 1,1,ama_dun03,119,14 ama_dun02,29,41,0 warp warp8009 1,1,ama_dun01,231,143 -ama_dun03,119,9,0 warp warp8011 1,1,ama_dun02,196,121
\ No newline at end of file +ama_dun03,119,9,0 warp warp8011 1,1,ama_dun02,196,121 diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt index 0fb11e34b..e0150200f 100644 --- a/npc/warps/dungeons/ant_hell.txt +++ b/npc/warps/dungeons/ant_hell.txt @@ -31,4 +31,4 @@ anthell02,171,169,0 script ant002 45,1,2,{ end; } anthell01,253,32,0 warp ant01 2,1,anthell02,34,263 -anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35
\ No newline at end of file +anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt index db7870436..89d26ccd7 100644 --- a/npc/warps/dungeons/ayo_dun.txt +++ b/npc/warps/dungeons/ayo_dun.txt @@ -18,4 +18,4 @@ ayo_fild02,285,150,0 warp ayodunwrp001 2,2,ayo_dun01,275,17 ayo_dun01,275,14,0 warp ayodunwrp002 2,2,ayo_fild02,282,150 ayo_dun02,24,21,0 warp ayodunwrp003 2,2,ayo_dun01,24,281 -ayo_dun02,275,21,0 warp ayodunwrp004 2,2,ayo_dun01,24,281
\ No newline at end of file +ayo_dun02,275,21,0 warp ayodunwrp004 2,2,ayo_dun01,24,281 diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt index 1b8686bd1..8050477d9 100644 --- a/npc/warps/dungeons/coal_mine.txt +++ b/npc/warps/dungeons/coal_mine.txt @@ -19,4 +19,4 @@ mjo_dun02,31,21,0 warp mjod02 1,1,mjo_dun03,302,262 mjo_dun02,384,343,0 warp mjod01-1 2,4,mjo_dun01,17,283 mjo_dun02,39,21,0 warp mjod03 1,1,mjo_dun03,308,262 mjo_dun03,302,264,0 warp mjod02-1 1,1,mjo_dun02,31,23 -mjo_dun03,308,264,0 warp mjod03-1 1,1,mjo_dun02,39,23
\ No newline at end of file +mjo_dun03,308,264,0 warp mjod03-1 1,1,mjo_dun02,39,23 diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt index 825d89f52..65ab8585b 100644 --- a/npc/warps/dungeons/com_dun.txt +++ b/npc/warps/dungeons/com_dun.txt @@ -16,4 +16,4 @@ beach_dun,276,67,0 warp cmd004 1,1,comodo,31,215 beach_dun2,154,13,0 warp cmd005 2,1,comodo,176,353 beach_dun3,17,265,0 warp cmd007 1,1,comodo,328,175 -beach_dun3,286,57,0 warp cmd006 1,1,cmd_fild01,30,317
\ No newline at end of file +beach_dun3,286,57,0 warp cmd006 1,1,cmd_fild01,30,317 diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt index a1a17683e..40898f7fe 100644 --- a/npc/warps/dungeons/ein_dun.txt +++ b/npc/warps/dungeons/ein_dun.txt @@ -16,4 +16,4 @@ einbech,138,252,0 warp eib_d01 1,1,ein_dun01,22,14 ein_dun01,22,11,0 warp eib_d01a 1,1,einbech,138,249 ein_dun01,262,256,0 warp ein012 1,1,ein_dun02,292,290 -ein_dun02,292,292,0 warp ein012a 1,1,ein_dun01,262,258
\ No newline at end of file +ein_dun02,292,292,0 warp ein012a 1,1,ein_dun01,262,258 diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt index 3ed23b01b..1b1b03036 100644 --- a/npc/warps/dungeons/geffen_dun.txt +++ b/npc/warps/dungeons/geffen_dun.txt @@ -43,4 +43,4 @@ gef_dun01,115,240,0 warp gefd01-1 2,2,gef_dun00,107,165 gef_dun01,197,38,0 warp gefd02 2,1,gef_dun02,106,132 gef_dun02,106,134,0 warp gefd02-1 2,1,gef_dun01,197,40 //gef_dun02,215,67,0 warp gefd03 2,1,gef_dun03,203,200 -gef_dun03,203,204,0 warp gefd03-1 2,1,gef_dun02,215,63
\ No newline at end of file +gef_dun03,203,204,0 warp gefd03-1 2,1,gef_dun02,215,63 diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt index 3fc2a2582..6f60ba611 100644 --- a/npc/warps/dungeons/gon_dun.txt +++ b/npc/warps/dungeons/gon_dun.txt @@ -37,4 +37,4 @@ gon_dun02,199,94,0 warp gon40 1,1,gon_dun02,60,70/*����A*/ gon_dun02,276,76,0 warp gon41 1,1,gon_dun02,163,87/*����B*/ gon_dun02,196,20,0 warp gon42 1,1,gon_dun02,95,190/*����E*/ gon_dun02,251,268,0 warp gon43 1,1,gon_dun03,68,9 -gon_dun03,68,6,0 warp gon44 1,1,gon_dun02,251,265
\ No newline at end of file +gon_dun03,68,6,0 warp gon44 1,1,gon_dun02,251,265 diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt index b499707cb..f010492ea 100644 --- a/npc/warps/dungeons/izlude_dun.txt +++ b/npc/warps/dungeons/izlude_dun.txt @@ -27,4 +27,4 @@ iz_dun02,236,198,0 warp izd04-1 5,3,iz_dun01,118,165 iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63 iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27 iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328 -iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245
\ No newline at end of file +iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt index b0d49adca..e2481512a 100644 --- a/npc/warps/dungeons/juperos.txt +++ b/npc/warps/dungeons/juperos.txt @@ -126,4 +126,4 @@ jupe_core,150,17,0 script Juperos Guard#2 111,{ end; } close; -}
\ No newline at end of file +} diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt index 561bb308e..c5aafeb6c 100644 --- a/npc/warps/dungeons/lhalzen_dun.txt +++ b/npc/warps/dungeons/lhalzen_dun.txt @@ -210,4 +210,4 @@ function script randomw { warp "lhz_cube",67,193; end; rdm1: warp "lhz_cube",66,136; end; rdm2: warp "lhz_cube",66,74; end; -}
\ No newline at end of file +} diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/louyang_dun.txt index 9131dd1cd..2d2f9aa95 100644 --- a/npc/warps/dungeons/louyang_dun.txt +++ b/npc/warps/dungeons/louyang_dun.txt @@ -17,4 +17,4 @@ lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270 lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20 lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209 lou_dun02,165,270,0 warp louwarp004 3,3,lou_dun03,165,38 -lou_dun03,165,34,0 warp louwarp004a 3,3,lou_dun02,165,266
\ No newline at end of file +lou_dun03,165,34,0 warp louwarp004a 3,3,lou_dun02,165,266 diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt index a7dda1437..d1c19ee76 100644 --- a/npc/warps/dungeons/lutie_dun.txt +++ b/npc/warps/dungeons/lutie_dun.txt @@ -15,4 +15,4 @@ //= Toy Factory ============================================== xmas_dun01,128,133,0 warp xmas15 3,3,xmas_dun02,129,133 xmas_dun01,205,13,0 warp xmas14-1 3,3,xmas,143,308 -xmas_dun02,129,129,0 warp xmas15-1 3,3,xmas_dun01,128,128
\ No newline at end of file +xmas_dun02,129,129,0 warp xmas15-1 3,3,xmas_dun01,128,128 diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt index 6f0894840..261144cf6 100644 --- a/npc/warps/dungeons/morroc_duns.txt +++ b/npc/warps/dungeons/morroc_duns.txt @@ -60,4 +60,4 @@ moc_prydb1,100,77,0 warp mocp10-1 5,2,moc_prydb1,100,107 moc_prydb1,111,115,0 warp mocp11 2,6,moc_prydb1,145,115 moc_prydb1,142,115,0 warp mocp11-1 2,6,moc_prydb1,108,115 moc_prydb1,59,115,0 warp mocp12 2,6,moc_prydb1,90,115 -moc_prydb1,87,115,0 warp mocp12-1 2,6,moc_prydb1,56,115
\ No newline at end of file +moc_prydb1,87,115,0 warp mocp12-1 2,6,moc_prydb1,56,115 diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt index 6328dbd14..0ffee0a92 100644 --- a/npc/warps/dungeons/odin.txt +++ b/npc/warps/dungeons/odin.txt @@ -67,4 +67,4 @@ L_No: mes "[Sailor Hako]"; mes "Suit yourself."; close; -}
\ No newline at end of file +} diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt index a484c97c3..78255ef87 100644 --- a/npc/warps/dungeons/orc_dun.txt +++ b/npc/warps/dungeons/orc_dun.txt @@ -23,4 +23,4 @@ orcsdun01,32,172,0 warp orc01-1 3,1,in_orcs01,30,180 in_orcs01,108,114,0 warp orc02 2,1,orcsdun02,180,17 orcsdun02,180,15,0 warp orc02-1 2,1,in_orcs01,108,112 orcsdun01,183,8,0 warp orc03 4,2,orcsdun02,21,185 -orcsdun02,21,188,0 warp orc03-1 8,2,orcsdun01,183,11
\ No newline at end of file +orcsdun02,21,188,0 warp orc03-1 8,2,orcsdun01,183,11 diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt index 5549a34d1..fd9e196d4 100644 --- a/npc/warps/dungeons/payon_dun.txt +++ b/npc/warps/dungeons/payon_dun.txt @@ -13,13 +13,13 @@ //============================================================ //= Payon Cave =============================================== -pay_dun00,184,33,0 warp payd01 2,7,pay_dun01,19,33 -pay_dun00,21,186,0 warp pay005 2,2,pay_arche,39,131 -pay_dun01,15,33,0 warp payd01-1 2,6,pay_dun00,181,33 -pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63 -pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159 -pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28 -pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126 +pay_dun00,184,33,0 warp payd01 2,7,pay_dun01,19,33 +pay_dun00,21,186,0 warp pay005 2,2,pay_arche,39,131 +pay_dun01,15,33,0 warp payd01-1 2,6,pay_dun00,181,33 +pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63 +pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159 +pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28 +pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126 pay_dun03,127,62,4 script payd04r 45,2,2,{ set @r,rand(4); if(@r==1) goto w2; @@ -29,8 +29,8 @@ pay_dun03,127,62,4 script payd04r 45,2,2,{ w2: warp "pay_dun04",189,43; end; w3: warp "pay_dun04",43,40; end; w4: warp "pay_dun04",34,202; end; -} -pay_dun04,191,41,0 warp payd04-2 1,1,pay_dun03,124,62 -pay_dun04,202,206,0 warp payd04-3 1,1,pay_dun03,124,62 -pay_dun04,32,204,0 warp payd04-4 2,1,pay_dun03,124,62 -pay_dun04,40,37,0 warp payd04-1 2,2,pay_dun03,124,62
\ No newline at end of file +} +pay_dun04,191,41,0 warp payd04-2 1,1,pay_dun03,124,62 +pay_dun04,202,206,0 warp payd04-3 1,1,pay_dun03,124,62 +pay_dun04,32,204,0 warp payd04-4 2,1,pay_dun03,124,62 +pay_dun04,40,37,0 warp payd04-1 2,2,pay_dun03,124,62 diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt index 8a47fa2d7..5f7eee910 100644 --- a/npc/warps/dungeons/prt_dun.txt +++ b/npc/warps/dungeons/prt_dun.txt @@ -239,4 +239,4 @@ prt_sewb2,19,175,0 warp prts04 4,2,prt_sewb2,60,28 prt_sewb2,60,24,0 warp prts04-1 4,2,prt_sewb2,19,171 prt_sewb3,180,173,0 warp prts03-1 4,2,prt_sewb2,180,28 prt_sewb3,20,185,0 warp prts05 3,2,prt_sewb4,100,92 -prt_sewb4,100,96,0 warp prts05-1 3,2,prt_sewb3,19,180
\ No newline at end of file +prt_sewb4,100,96,0 warp prts05-1 3,2,prt_sewb3,19,180 diff --git a/npc/warps/dungeons/thana_custom.txt b/npc/warps/dungeons/thana_custom.txt index 2443d7032..2b53a9e01 100644 --- a/npc/warps/dungeons/thana_custom.txt +++ b/npc/warps/dungeons/thana_custom.txt @@ -156,4 +156,4 @@ tha_t03,207,70,0 script #TanKey8 111,{ delitem 7424,1; getitem 7429,1; end; -}
\ No newline at end of file +} diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt index e02bbfa9e..346f1e3a1 100644 --- a/npc/warps/dungeons/thana_dun.txt +++ b/npc/warps/dungeons/thana_dun.txt @@ -127,4 +127,4 @@ thana_step,180,73,0 warp WarpThana11c 1,1,tha_t11,89,36 // Thanatos Tower Level 12 (tha_t12) thana_step,182,15,0 warp WarpThana12a 1,1,tha_t12,129,51 thana_step,70,288,0 warp WarpThana12b 1,1,tha_t12,129,51 -thana_step,173,288,0 warp WarpThana12c 1,1,thana_boss,135,128
\ No newline at end of file +thana_step,173,288,0 warp WarpThana12c 1,1,thana_boss,135,128 diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_dun.txt index 4d3543c35..d9798bc2a 100644 --- a/npc/warps/dungeons/thor_dun.txt +++ b/npc/warps/dungeons/thor_dun.txt @@ -21,4 +21,4 @@ thor_v02,72,206,0 warp veinswarp4002 1,1,thor_v01,199,34 thor_v02,191,55,0 warp veinswarp4003 1,1,thor_v03,31,272 thor_v03,28,272,0 warp veinswarp4004 1,1,thor_v02,190,57 thor_v02,143,78,0 warp veinswarp4005 1,1,thor_camp,284,289 -thor_camp,288,289,0 warp veinswarp4006 1,1,thor_v02,146,86
\ No newline at end of file +thor_camp,288,289,0 warp veinswarp4006 1,1,thor_v02,146,86 diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt index 4eddca2a1..5c986b3b6 100644 --- a/npc/warps/dungeons/umbala_dun.txt +++ b/npc/warps/dungeons/umbala_dun.txt @@ -30,4 +30,4 @@ um_dun02,25,244,0 warp umba0022 1,1,um_dun02,35,251 um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242 um_dun02,51,26,0 warp umba0022 1,1,um_dun01,153,201 um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77 -um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92
\ No newline at end of file +um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92 diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt index 3b904afab..9dcb7d009 100644 --- a/npc/warps/dungeons/yuno_dun.txt +++ b/npc/warps/dungeons/yuno_dun.txt @@ -15,4 +15,4 @@ //= Magma Dungeon ============================================ mag_dun01,126,66,0 warp mag01-yunfild 1,1,yuno_fild03,34,139 mag_dun01,242,241,0 warp mag01-02 1,1,mag_dun02,47,30 -mag_dun02,47,28,0 warp mag02-01 1,1,mag_dun01,242,239
\ No newline at end of file +mag_dun02,47,28,0 warp mag02-01 1,1,mag_dun01,242,239 diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index 9ee62e942..9c11e0e9b 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -74,4 +74,4 @@ L_close: close; } -hu_fild05,197,210,0 warp warpabyss 2,3,abyss_01,264,271
\ No newline at end of file +hu_fild05,197,210,0 warp warpabyss 2,3,abyss_01,264,271 diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt index a593dd34d..ddfc57f69 100644 --- a/npc/warps/fields/amatsu_fild.txt +++ b/npc/warps/fields/amatsu_fild.txt @@ -19,4 +19,4 @@ //ama_fild,193,302,0 warp warp1997 1,1,prontera,163,186 //ama_fild,330,141,0 warp warp1999 1,1,prontera,163,186 ama_fild01,174,332,0 warp warp8003 1,1,ama_in01,175,174 -ama_fild01,75,29,0 warp warp1961 1,1,amatsu,247,287
\ No newline at end of file +ama_fild01,75,29,0 warp warp1961 1,1,amatsu,247,287 diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt index 3e6f34046..7ab7ebe35 100644 --- a/npc/warps/fields/com_fild.txt +++ b/npc/warps/fields/com_fild.txt @@ -50,4 +50,4 @@ cmd_fild09,75,382,0 warp cmdf15-1 2,1,cmd_fild08,75,42 //Others ======================= cmd_fild08,354,324,0 warp cmd008 1,1,moc_fild12,26,305 cmd_fild09,369,164,0 warp cmd009 2,2,moc_fild18,55,170 -moc_fild18,51,170,0 warp cmd010 1,3,cmd_fild09,363,164
\ No newline at end of file +moc_fild18,51,170,0 warp cmd010 1,3,cmd_fild09,363,164 diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt index ef6523884..2d9d9cb92 100644 --- a/npc/warps/fields/ein_fild.txt +++ b/npc/warps/fields/ein_fild.txt @@ -50,4 +50,4 @@ lhz_fild02,166,367,0 warp ein049a 1,1,ein_fild03,142,34 lhz_fild02,164,37,0 warp ein050 1,1,lhz_fild03,158,347 lhz_fild03,158,349,0 warp ein050a 1,1,lhz_fild02,164,39 lhz_fild03,363,283,0 warp ein051 1,1,ein_fild08,25,275 -ein_fild08,23,275,0 warp ein051a 1,1,lhz_fild03,361,283
\ No newline at end of file +ein_fild08,23,275,0 warp ein051a 1,1,lhz_fild03,361,283 diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt index f28e6baba..932861f61 100644 --- a/npc/warps/fields/geffen_fild.txt +++ b/npc/warps/fields/geffen_fild.txt @@ -69,4 +69,4 @@ gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56 gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23 gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 -gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219
\ No newline at end of file +gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index ad4310dd8..cec683191 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -81,4 +81,4 @@ glast_01,220,360,0 warp gl5 1,1,gl_in01,110,125 glast_01,237,330,0 warp gl6 1,1,gl_in01,122,59 glast_01,377,304,0 warp glst001 3,3,gef_fild06,27,304 glast_01,51,108,0 warp gl1 1,1,gl_step,12,7 -glast_01,77,193,0 warp gl2 1,1,gl_knt01,150,15
\ No newline at end of file +glast_01,77,193,0 warp gl2 1,1,gl_knt01,150,15 diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt index 04e9aeb07..fe50d24d3 100644 --- a/npc/warps/fields/jawaii.txt +++ b/npc/warps/fields/jawaii.txt @@ -23,4 +23,4 @@ jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186 jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94 jawaii_in,27,91,4 script jawaiiwarp006 45,1,1,{ if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; -}
\ No newline at end of file +} diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt index 7653af316..aa7b22240 100644 --- a/npc/warps/fields/lhalzen_fild.txt +++ b/npc/warps/fields/lhalzen_fild.txt @@ -17,4 +17,4 @@ lhz_fild01,210,18,0 warp lhz043 1,1,lighthalzen,214,324 lighthalzen,214,329,0 warp lhz043a 1,1,lhz_fild01,210,23 lhz_fild01,367,222,0 warp lhz044 1,1,lhz_fild02,36,221 -lhz_fild02,29,219,0 warp lhz044a 1,1,lhz_fild01,361,222
\ No newline at end of file +lhz_fild02,29,219,0 warp lhz044a 1,1,lhz_fild01,361,222 diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt index 40c24bd49..f84196a14 100644 --- a/npc/warps/fields/lutie_fild.txt +++ b/npc/warps/fields/lutie_fild.txt @@ -14,4 +14,4 @@ //= Lutie Field ============================================== xmas_fild01,80,251,0 warp xmas2 2,2,xmas,150,45 -xmas_fild01,85,49,0 warp xmas001 10,3,aldebaran,140,240
\ No newline at end of file +xmas_fild01,85,49,0 warp xmas001 10,3,aldebaran,140,240 diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt index 30e277183..d94f3d20f 100644 --- a/npc/warps/fields/morroc_fild.txt +++ b/npc/warps/fields/morroc_fild.txt @@ -100,4 +100,4 @@ moc_fild18,158,382,0 warp mocf24-1 4,2,moc_fild12,118,33 moc_fild18,382,305,0 warp moc29-1 2,4,moc_fild17,33,300 moc_fild19,169,107,0 warp mocf004 1,4,morocc,27,164 moc_fild19,71,170,0 warp mocf018 8,2,moc_ruins,71,19 -moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9
\ No newline at end of file +moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9 diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt index 580ead478..e01034c25 100644 --- a/npc/warps/fields/mtmjolnir.txt +++ b/npc/warps/fields/mtmjolnir.txt @@ -58,4 +58,4 @@ mjolnir_11,174,20,0 warp mjol010 4,2,prt_fild02,173,379 mjolnir_11,20,220,0 warp mjol16-1 2,4,mjolnir_10,381,220 mjolnir_12,199,378,0 warp mjol012 2,2,aldebaran,138,37 mjolnir_12,220,26,0 warp mjol08-1 3,2,mjolnir_05,220,379 -mjolnir_12,44,17,0 warp mjol17 1,1,prt_maze01,17,111
\ No newline at end of file +mjolnir_12,44,17,0 warp mjol17 1,1,prt_maze01,17,111 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index cdfc31485..9d4d67b64 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -45,4 +45,4 @@ pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19 pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290 pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252 pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 -pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19
\ No newline at end of file +pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt index 97de8e6a2..9571a87fa 100644 --- a/npc/warps/fields/prontera_fild.txt +++ b/npc/warps/fields/prontera_fild.txt @@ -98,4 +98,4 @@ monk_in,99,102,0 warp monk07 5,1,monk_in,99,143 monk_in,99,141,0 warp monk07-1 3,1,monk_in,99,100 prt_monk,22,248,0 warp monk001 2,2,prt_fild03,368,256 prt_monk,245,106,0 warp monk01 1,1,monk_in,98,30 -prt_monk,245,137,0 warp monk02 1,1,monk_in,98,183
\ No newline at end of file +prt_monk,245,137,0 warp monk02 1,1,monk_in,98,183 diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt index 2778c69fd..683974fdd 100644 --- a/npc/warps/fields/umbala_fild.txt +++ b/npc/warps/fields/umbala_fild.txt @@ -32,4 +32,4 @@ um_fild02,374,149,0 warp umba0008 1,1,um_fild03,35,146 um_fild02,374,326,0 warp umba0005 1,1,um_fild03,21,334 um_fild03,18,334,0 warp umba0006 1,1,um_fild02,371,326 um_fild03,30,146,0 warp umba0007 1,1,um_fild02,371,149 -um_fild04,179,10,0 warp umba0054 1,1,um_fild02,191,372
\ No newline at end of file +um_fild04,179,10,0 warp umba0054 1,1,um_fild02,191,372 diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt index d83681b3e..3b93a8aa2 100644 --- a/npc/warps/fields/yuno_fild.txt +++ b/npc/warps/fields/yuno_fild.txt @@ -86,4 +86,4 @@ yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351 hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375 yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38 hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372 -yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38
\ No newline at end of file +yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38 diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt index 5e95baea1..ed4f1b256 100644 --- a/npc/warps/other/airplane.txt +++ b/npc/warps/other/airplane.txt @@ -76,4 +76,4 @@ airplane_01,245,160,0 warp air_2wp02a 1,1,airplane_01,214,54 airplane_01,104,199,0 warp air_2wp03 1,1,airplane_01,105,72 airplane_01,103,72,0 warp air_2wp03a 1,1,airplane_01,102,199 airplane_01,104,176,0 warp air_2wp04 1,1,airplane_01,105,52 -airplane_01,103,52,0 warp air_2wp04a 1,1,airplane_01,102,176
\ No newline at end of file +airplane_01,103,52,0 warp air_2wp04a 1,1,airplane_01,102,176 diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index b9acb4e56..9c271294d 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -25,4 +25,4 @@ arena_room,115,71,0 warp arn_room_5_1 1,1,arena_room,139,50 arena_room,136,53,0 warp arn_room_5_2 1,1,arena_room,113,74 arena_room,123,88,0 warp arn_room_3_1 1,1,arena_room,153,87 arena_room,150,87,0 warp arn_room_3_2 1,1,arena_room,120,87 -prt_are_in,54,13,0 warp toarn_room 1,1,arena_room,100,77
\ No newline at end of file +prt_are_in,54,13,0 warp toarn_room 1,1,arena_room,100,77 diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index d20016710..a6086f46d 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -119,4 +119,4 @@ in_rogue,160,103,0 warp rogue06-fild04 1,1,cmd_fild04,301,177 //Dancer //============================================================================== //job_duncer,69,43,0 warp duncer1 1,1,comodo,185,156 -job_duncer,70,45,0 warp duncer1 2,2,comodo,193,149
\ No newline at end of file +job_duncer,70,45,0 warp duncer1 2,2,comodo,193,149 diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt index 2359c9059..1e3a1290a 100644 --- a/npc/warps/other/other.txt +++ b/npc/warps/other/other.txt @@ -32,4 +32,4 @@ //guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 //guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 //guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0
\ No newline at end of file +//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt index 1cefe989f..74a636d70 100644 --- a/npc/warps/other/sign.txt +++ b/npc/warps/other/sign.txt @@ -35,4 +35,4 @@ que_sign01,113,133,0 warp sign07 1,1,nif_in,117,173 que_sign01,45,15,0 warp sign08 1,1,niflheim,146,245 que_sign02,22,314,0 warp sign09 1,1,niflheim,30,156 -que_sign02,379,235,0 warp sign09a 1,1,que_sign01,180,172
\ No newline at end of file +que_sign02,379,235,0 warp sign09a 1,1,que_sign01,180,172 diff --git a/npc/warps/pvp/pvp.txt b/npc/warps/pvp/pvp.txt index 29f63341d..5cee4f3b2 100644 --- a/npc/warps/pvp/pvp.txt +++ b/npc/warps/pvp/pvp.txt @@ -166,4 +166,4 @@ ordeal_3-4,180,154,0 warp ord348 1,1,ordeal_3-4,284,164 //ordeal_a04,153,180,0 warp orda5 0,0,ordeal_a04,144,284 //ordeal_a04,172,135,0 warp orda6 0,0,ordeal_a04,284,24 //ordeal_a04,172,172,0 warp orda7 0,0,ordeal_a04,284,284 -//ordeal_a04,180,154,0 warp orda8 0,0,ordeal_a04,284,164
\ No newline at end of file +//ordeal_a04,180,154,0 warp orda8 0,0,ordeal_a04,284,164 diff --git a/src/char/int_homun.c b/src/char/int_homun.c index 943f5b8c8..492d8a76e 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -369,4 +369,3 @@ int inter_homun_parse_frommap(int fd) } return 1; } - diff --git a/src/char/int_status.c b/src/char/int_status.c index a0473f01a..719820f3e 100644 --- a/src/char/int_status.c +++ b/src/char/int_status.c @@ -184,4 +184,4 @@ void status_final(void) { scdata_db->destroy(scdata_db, scdata_db_final); } -#endif +#endif //ENABLE_SC_SAVING diff --git a/src/char_sql/int_guild.h b/src/char_sql/int_guild.h index 4b153574b..f8b3e98c5 100644 --- a/src/char_sql/int_guild.h +++ b/src/char_sql/int_guild.h @@ -32,4 +32,5 @@ int inter_guild_CharOffline(int char_id, int guild_id); //For the TXT->SQL converter. int inter_guild_tosql(struct guild *g,int flag); int inter_guildcastle_tosql(struct guild_castle *gc); -#endif + +#endif /* _INT_GUILD_SQL_H_ */ diff --git a/src/common/db.c b/src/common/db.c index 7d1eb3903..80918d7f6 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -2377,4 +2377,3 @@ void linkdb_final( struct linkdb_node** head ) { } *head = NULL; } - diff --git a/src/common/ers.c b/src/common/ers.c index 109378d5f..53c1edc3a 100644 --- a/src/common/ers.c +++ b/src/common/ers.c @@ -502,4 +502,3 @@ void ers_force_destroy_all(void) ers_num = 0; } #endif /* not DISABLE_ERS */ - diff --git a/src/common/grfio.h b/src/common/grfio.h index 68371576d..ce2b75150 100644 --- a/src/common/grfio.h +++ b/src/common/grfio.h @@ -8,4 +8,3 @@ int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen); #endif /* _GRFIO_H_ */ - diff --git a/src/common/lock.c b/src/common/lock.c index 18091820d..a08b46756 100644 --- a/src/common/lock.c +++ b/src/common/lock.c @@ -68,4 +68,3 @@ int lock_fclose (FILE *fp, const char* filename, int *info) { return ret; } - diff --git a/src/common/md5calc.c b/src/common/md5calc.c index fd8ffd5d3..b70236d6b 100644 --- a/src/common/md5calc.c +++ b/src/common/md5calc.c @@ -233,4 +233,3 @@ void MD5_String(const char * string, char * output) digest[ 8], digest[ 9], digest[10], digest[11], digest[12], digest[13], digest[14], digest[15]); } - diff --git a/src/common/utils.c b/src/common/utils.c index 3dc7fea16..b738d31c8 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -321,4 +321,3 @@ unsigned long MakeDWord(unsigned short word0, unsigned short word1) return ((unsigned long)word0) | ((unsigned long)word1<<0x10); } - diff --git a/src/map/clif.c b/src/map/clif.c index 5dd222ebd..15642ee62 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12426,4 +12426,3 @@ int do_init_clif(void) add_timer_func_list(clif_delayquit, "clif_delayquit"); return 0; } - diff --git a/src/map/date.c b/src/map/date.c index 4643d6780..9f2bc4bee 100644 --- a/src/map/date.c +++ b/src/map/date.c @@ -69,4 +69,3 @@ int is_day_of_star(void) { return date_get_day()%5 == 0; } - diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index f5a7762d6..fa184b624 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -514,4 +514,4 @@ int buildin_deletepset(struct script_state *st) { return 0; } -#endif +#endif //PCRE_SUPPORT diff --git a/src/map/vending.c b/src/map/vending.c index 23a7d9ce8..2f2e132bc 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -274,4 +274,3 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f sd->vender_id = 0; } } - diff --git a/src/plugins/gui.txt b/src/plugins/gui.txt index 03554aa8d..c71b684b6 100644 --- a/src/plugins/gui.txt +++ b/src/plugins/gui.txt @@ -12,4 +12,4 @@ imalive_time: 30 flush_on: 0 // How often to flush the buffer on-screen (in seconds) -flush_time: 60
\ No newline at end of file +flush_time: 60 diff --git a/src/plugins/sig.c b/src/plugins/sig.c index edd0e55a2..6f1f8404c 100644 --- a/src/plugins/sig.c +++ b/src/plugins/sig.c @@ -208,4 +208,3 @@ int sig_init () return 1; } #endif - diff --git a/src/plugins/upnp.txt b/src/plugins/upnp.txt index d5d0d43ff..eb3f955cb 100644 --- a/src/plugins/upnp.txt +++ b/src/plugins/upnp.txt @@ -28,4 +28,4 @@ close_ports: 1 // Note: This plugin only works on Windows XP or higher // For more info on UPnP try here: -// http://www.google.com/search?q=what+is+upnp
\ No newline at end of file +// http://www.google.com/search?q=what+is+upnp diff --git a/src/tool/grfio.h b/src/tool/grfio.h index 5f4701900..57439b16d 100644 --- a/src/tool/grfio.h +++ b/src/tool/grfio.h @@ -18,4 +18,3 @@ int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen); #endif /* _GRFIO_H_ */ - |