Skip to content

Commit

Permalink
Corrected line endings and BOM issues with several files
Browse files Browse the repository at this point in the history
- Ensured final end-of-line character in every file.
- Corrected cases of mixed line endings (mostly CR and CRLF within the
  same file.)
- Removed extra BOM  from some scripts, since it causes a parsing error.

Signed-off-by: Haru <[email protected]>
  • Loading branch information
MishimaHaruna committed Sep 16, 2013
1 parent f1a594d commit fe2f840
Show file tree
Hide file tree
Showing 186 changed files with 2,106 additions and 2,106 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ set( LIBCONFIG_SOURCES
CACHE INTERNAL "libconfig sources" )
set( LIBCONFIG_DEFINITIONS
"-DLIBCONFIG_STATIC"
CACHE INTERNAL "libconfig definitions" )
CACHE INTERNAL "libconfig definitions" )
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ Hercules has a large collection of help files and sample NPC scripts located in

There are more files in the /doc/ directory that will help you to create scripts or update the
mapcache, or even explain how the job system and item bonuses work. Before posting a topic asking
for help on the forums, we recommend that all users take the time to look over this directory.
for help on the forums, we recommend that all users take the time to look over this directory.
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ Hercules has a large collection of help files and sample NPC scripts located in

There are more files in the /doc/ directory that will help you to create scripts or update the
mapcache, or even explain how the job system and item bonuses work. Before posting a topic asking
for help on the forums, we recommend that all users take the time to look over this directory.
for help on the forums, we recommend that all users take the time to look over this directory.
2 changes: 1 addition & 1 deletion cache/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
//============================================================

No touching these folders or the files in them!
they are read and written by the server during runtime when it feels it is wise.
they are read and written by the server during runtime when it feels it is wise.
2 changes: 1 addition & 1 deletion cache/db/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
//============================================================

No touching these folders or the files in them!
they are read and written by the server during runtime when it feels it is wise.
they are read and written by the server during runtime when it feels it is wise.
2 changes: 1 addition & 1 deletion cache/db/pre-re/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
//============================================================

No touching these folders or the files in them!
they are read and written by the server during runtime when it feels it is wise.
they are read and written by the server during runtime when it feels it is wise.
2 changes: 1 addition & 1 deletion cache/db/re/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
//============================================================

No touching these folders or the files in them!
they are read and written by the server during runtime when it feels it is wise.
they are read and written by the server during runtime when it feels it is wise.
2 changes: 1 addition & 1 deletion conf/atcommand.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ nolog: {
/* Commands help file */
help: {
@include "conf/help.txt"
}
}
2 changes: 1 addition & 1 deletion conf/battle/feature.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ feature.search_stores: on

// Atcommand suggestions (Note 1)
// If one type incomplete atcommand, it will suggest the complete ones.
feature.atcommand_suggestions: off
feature.atcommand_suggestions: off
2 changes: 1 addition & 1 deletion conf/battle/items.conf
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ item_restricted_consumption_type:1
// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
// 1 : yes(official)
// 0 : no
item_enabled_npc:1
item_enabled_npc:1
2 changes: 1 addition & 1 deletion conf/battle/player.conf
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ min_npc_vendchat_distance: 3
// Super Novice's fury is enabled to increments of 10%, such as at 10.0%, 20.0% - 80.0%, 90.0%
// Changing snovice_call_type config to 1 enables its use at 0%, for maxed super novices.
// default: 0
snovice_call_type: 0
snovice_call_type: 0
2 changes: 1 addition & 1 deletion conf/battle/skill.conf
Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,4 @@ skill_trap_type: 0

// Max Possible Level of Monster skills
// Note: If your MVPs are too tough, reduce it to 10.
mob_max_skilllvl: 100
mob_max_skilllvl: 100
2 changes: 1 addition & 1 deletion conf/battlegrounds.conf
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ battlegrounds: (
pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */
}
)
})
})
2 changes: 1 addition & 1 deletion conf/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ and you'll eliminate any problems updating in the future.

Neat, isn't it?

- Semi-guide by Ajarn / Euphy
- Semi-guide by Ajarn / Euphy
2 changes: 1 addition & 1 deletion db/cashshop_db.conf
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ cash_shop: (
ID907:500
}
}
)
)
2 changes: 1 addition & 1 deletion db/homun_skill_tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@
6052,8030,5,0,0,0,0,0,0,0,0,0,0,0 //MH_MIDNIGHT_FRENZY
6052,8036,5,0,0,0,0,0,0,0,0,0,0,0 //MH_TINDER_BREAKER
6052,8037,5,0,0,0,0,0,0,0,0,0,0,0 //MH_CBC
6052,8038,5,0,0,0,0,0,0,0,0,0,0,0 //MH_EQC
6052,8038,5,0,0,0,0,0,0,0,0,0,0,0 //MH_EQC
2 changes: 1 addition & 1 deletion db/homunculus_db.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
6049,6049,Bayeri,6112,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
6050,6050,Sera,6108,60000,1,1,4,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
6051,6051,Dieter,6104,60000,1,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
6052,6052,Eleanor,6115,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
6052,6052,Eleanor,6115,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
2 changes: 1 addition & 1 deletion db/item_avail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
//Enable if you plan to use the quest.
//12715,7721
//7915,673
//7916,675
//7916,675
2 changes: 1 addition & 1 deletion db/pre-re/item_chain.conf
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ ITMCHAIN_FOOD: {
Sweet_Potato: 100
Banana: 100
Apple: 600
}
}
2 changes: 1 addition & 1 deletion db/pre-re/map_zone_db.conf
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,4 @@ zones: (
Greed_Scroll: true
}
}
)
)
2 changes: 1 addition & 1 deletion db/re/exp_guild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
220900000
230400000
240100000
250000000
250000000
2 changes: 1 addition & 1 deletion db/re/item_chain.conf
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ ITMCHAIN_FOOD: {
Sweet_Potato: 100
Banana: 100
Apple: 600
}
}
2 changes: 1 addition & 1 deletion db/re/item_db.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8295,4 +8295,4 @@
21004,Alca_Bringer_,Alca Bringer,4,20,,3400,280,,2,2,0x00004080,56,2,34,3,100,1,3,{},{},{}
21005,Metal_Two_Hand_Sword,Metal Two-Handed Sword,4,20,,0,95,,1,1,0x00004082,63,2,34,3,0,1,3,{},{},{}
22514,Candy_Holder,Candy Holder,11,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
2 changes: 1 addition & 1 deletion db/re/item_group.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4741,4 +4741,4 @@ Lucky_Bag: (
("Taiwan_Luk_Coin",3),
"Big_Luk_Bookmark"
)
*/
*/
2 changes: 1 addition & 1 deletion db/re/map_zone_db.conf
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,4 @@ zones: (
Greed_Scroll: true
}
}
)
)
2 changes: 1 addition & 1 deletion doc/atcommands.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1428,4 +1428,4 @@ Sets the intimacy level of your homunculus, with 1000 being "Loyal".

Sets the hunger level of your homunculus, with 100 being "Stuffed".

---------------------------------------
---------------------------------------
2 changes: 1 addition & 1 deletion doc/item_bonus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,4 @@ bonus bVariableCast,x; Increases variable cast time of all skills by x millise
bonus2 bSkillFixedCast,s,x; Increases fixed cast time of skill s by x milliseconds. (supports skill names.)
bonus2 bSkillVariableCast,s,x; Increases variable cast time of skill s by x milliseconds. (supports skill names.)
bonus2 bVariableCastrate,s,x; Increases variable cast time of skill s by x%. (supports skill names.)
bonus2 bFixedCastrate,s,x; Increases fixed cast time of skill s by x%. (supports skill names.)
bonus2 bFixedCastrate,s,x; Increases fixed cast time of skill s by x%. (supports skill names.)
2 changes: 1 addition & 1 deletion doc/md5_hashcheck.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ To enable MD5 hash checks, set 'client_hash_check' to 'on'.
The 'client_hash' group_id can be any of the groups in conf\groups.conf,
and is particularly useful if you wanted to allow GMs a different client
than normal players; for example, a GM client could be hexed differently
with dual-clienting enabled and chat flood disabled.
with dual-clienting enabled and chat flood disabled.
2 changes: 1 addition & 1 deletion doc/permissions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ show_bossmobs : Ability to see boss mobs with @showmobs.
disable_pvm : Ability to disable Player vs. Monster.
disable_pvp : Ability to disable Player vs. Player.
disable_commands_when_dead : Ability to disable @command usage when dead.
hchsys_admin : Hercules Chat System Admin (Ability to modify channel settings regardless of ownership and join password-protected channels without requiring a password.)
hchsys_admin : Hercules Chat System Admin (Ability to modify channel settings regardless of ownership and join password-protected channels without requiring a password.)
2 changes: 1 addition & 1 deletion doc/sample/bank_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ B_EXIT2:
mes "Good bye!";
cutin "kafra_06",255;
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/basejob_baseclass_upper.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ prontera,155,177,1 script Tell Me 725,{
mes "BaseJob: " + BaseJob;
mes "Upper: " + Upper;
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/checkoption.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ prontera,156,89,6 script test_checkoption 117,{
if(checkoption(@value) == 1) mes "True!";
else if(checkoption(@value) == 0) mes "False!";
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/delitem2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ prontera,160,182,5 script Delitem2 51,{
delitem2 @nameid,@amount,@iden,@ref,@attr,@c1,@c2,@c3,@c4;
mes "And here is the moment when your item should disappear! :P";
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/getequipcardid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ prontera,155,177,4 script Check My Hat 810,{
mes "Nothing?";
emotion e_hmm;
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/getequipid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ prontera,161,181,6 script GetEquipID Sample 105,{
for(set .@i,1; .@i<11; set .@i,.@i+1)
mes "GetEquipID(" + .@i + ") : " + getequipid(1);
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/getiteminfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ prontera,156,179,6 script test_getiteminfo 117,{
for(set .@id,0; .@id<14; set .@id,.@id+1)
mes " getiteminfo("+.@value+","+.@id+") = "+getiteminfo(.@value,.@id);
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/getmonsterinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ prontera,156,179,6 script test_getmonsterinfo 117,{
for(set .@id,0; .@id<23; set .@id,.@id+1)
mes " getmonsterinfo("+.@value+","+@id+") = "+getmonsterinfo(.@value,@id);
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/gstorage_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ GS_EXIT3:
GS_EXIT4:
cutin "kafra_06",255;
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_dynamic_shop.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ OnInit:
set $@rpotsleft, 10;
set $@opotsleft, 10;
end;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_extend_shop.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ prontera,146,229,5 shop Armor Card Merchant 80,4003:100000,4008:100000,4011:1000
prontera,144,227,5 shop Shield Card Merchant 80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000
prontera,142,225,5 shop Robe Card Merchant 80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000
prontera,140,223,5 shop Shoes Card Merchant 80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000
prontera,138,221,5 shop Accessory Card Merchant 80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
prontera,138,221,5 shop Accessory Card Merchant 80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
2 changes: 1 addition & 1 deletion doc/sample/npc_live_dialogues.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ M_BYE:
// Add some random goodbye from Global_Functions.txt
mes callfunc("F_Bye");
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_shop_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ prontera,218,211,4 shop Pet Groomer 125,537:2500,643:3000,10013:1500,10014:2000
izlude,164,138,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000
morocc,269,167,4 shop Pet Groomer 125,537:2500,643:3000,10013:1500,10014:2000
geffen,193,152,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000
payon,142,104,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000
payon,142,104,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000
2 changes: 1 addition & 1 deletion doc/sample/npc_test_array.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ prontera,164,190,1 script Array Test 112,{
mes "hoge[2]=> " + @hoge[2];
mes "hoge[3]=> " + @hoge[3];
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_chat.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ OnChatEvent:
disablewaitingroomevent;
warpwaitingpc "prontera",160,180;
end;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_duplicate.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ OnTouch:

prontera,150,175,4 duplicate(Test Script) Test1 909
prontera,155,175,4 duplicate(Test Script) Test2 909,2,2
prontera,160,175,4 duplicate(Test Script) Test3 909,3,3
prontera,160,175,4 duplicate(Test Script) Test3 909,3,3
2 changes: 1 addition & 1 deletion doc/sample/npc_test_npctimer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ OnTimer5000:
OnTimer10000:
npctalk "After 10 seconds...";
end;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_npctimer2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ OnTimer5000:
mes "Ah, your level is " + readparam(11) + "!";
detachnpctimer;
close;
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_quest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ prontera,90,95,1 script Jelly 123,{
mes "Thanks again for doing that for me!";
close;
}
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_setmapflag.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ prontera,165,145,0 script EXPflagtest 123,{
removemapflag "prontera",MF_PVP;
close;
}
}
}
2 changes: 1 addition & 1 deletion doc/sample/npc_test_time.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ prontera,157,181,6 script Time Sample 105,{
mes " GetTime(7) : " + gettime(7) + " (Year)";
mes " GetTimeStr : " + gettimestr("%Y-%m/%d %H:%M:%S",19);
close;
}
}
2 changes: 1 addition & 1 deletion doc/script_commands.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===== Hercules Documentation ===============================
//===== Hercules Documentation ===============================
//= Hercules Script Commands
//===== By: ==================================================
//= Hercules Dev Team
Expand Down
2 changes: 1 addition & 1 deletion doc/whisper_sys.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ OnWhisperGlobal:
// Script for an MVP summoning event.
}
end;
}
}
2 changes: 1 addition & 1 deletion npc/MOTD.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
- script HerculesMOTD -1,{
message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find.";
end;
}
}
2 changes: 1 addition & 1 deletion npc/airports/rachel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ OnTouch:
}
mes "Thank you, please come again.";
close;
}
}
2 changes: 1 addition & 1 deletion npc/custom/etc/quest_warper.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1689,4 +1689,4 @@ treasure02,104,40,3 script Warpra Helper#24 112,{ callfunc "QWS_Dungeon_Warpra",
xmas_dun02,124,131,3 script Warpra Helper#25 112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
um_dun02,44,28,3 script Warpra Helper#26 112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
tur_dun02,162,23,3 script Warpra Helper#27 112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
prt_maze02,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
prt_maze02,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
2 changes: 1 addition & 1 deletion npc/custom/events/cluckers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ OnTimer40000:
if (!$cluck_item_amount) set $cluck_item_amount,1;
set .startcluck,1;
end;
}
}
2 changes: 1 addition & 1 deletion npc/custom/jobmaster.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@ OnInit:
set .SkillPointCheck,1; // Force player to use up all skill points? (1: yes / 0: no)
set .Platinum,1; // Get platinum skills automatically? (1: yes / 0: no)
end;
}
}
Loading

0 comments on commit fe2f840

Please sign in to comment.