summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf-tmpl/battle/exp.conf2
-rw-r--r--conf-tmpl/msg_athena.conf2
-rw-r--r--doc/packet_table_en.txt6
-rw-r--r--doc/pccommand_list.txt2
-rw-r--r--doc/script_commands.txt4
-rw-r--r--npc/cities/rachel.txt2
-rw-r--r--npc/custom/blackjack.txt2
-rw-r--r--npc/events/custom/uneasy_cemetery.txt2
-rw-r--r--npc/jobs/1-1/archer.txt2
-rw-r--r--npc/jobs/2-1/assassin.txt4
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/jobs/2-1/knight.txt2
-rw-r--r--npc/jobs/2-2/rogue.txt2
-rw-r--r--npc/other/pvp.txt2
-rw-r--r--npc/quests/The_Sign_Quest.txt2
-rw-r--r--npc/quests/ninja_quests.txt2
-rw-r--r--npc/quests/quests_comodo.txt2
-rw-r--r--npc/sample/PCLoginEvent.txt2
-rw-r--r--src/char/char.c2
-rw-r--r--src/map/chrif.c2
-rw-r--r--src/map/irc.c2
-rw-r--r--src/map/mail.c2
22 files changed, 26 insertions, 26 deletions
diff --git a/conf-tmpl/battle/exp.conf b/conf-tmpl/battle/exp.conf
index 01d68ab4c..3e11599a2 100644
--- a/conf-tmpl/battle/exp.conf
+++ b/conf-tmpl/battle/exp.conf
@@ -73,7 +73,7 @@ resurrection_exp: 0
// The rate of job exp. when using discount and overcharge on an NPC
// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)
-// The way it is calculated is (money recieved * skill lv) * shop_exp / 10000.
+// The way it is calculated is (money received * skill lv) * shop_exp / 10000.
shop_exp: 0
// PVP exp. Do players get exp in PvP maps
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 08e180c10..ad5085b65 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -443,7 +443,7 @@
517: Message not found.
518: Reading message from %s.
519: Cannot delete unread priority mail.
-520: You have recieved new mail, use @listmail before deleting.
+520: You have received new mail, use @listmail before deleting.
521: Message deleted.
522: You must wait 10 minutes before sending another message.
523: Access Denied.
diff --git a/doc/packet_table_en.txt b/doc/packet_table_en.txt
index fc16bd8ce..07d615635 100644
--- a/doc/packet_table_en.txt
+++ b/doc/packet_table_en.txt
@@ -487,7 +487,7 @@ S 00e4 <ID>.l
request trade.
R 00e5 <nick>.24B
取り引き要請受け
- recieve a request to trade.
+ receive a request to trade.
S 00e6 <type>.B
type=03 取り引き要請ok
trade ok.
@@ -518,9 +518,9 @@ S 00eb
completed adding item.(cliecked OK)
R 00ec <fail>.B
fail=00 自分からのok受領
- recieved "OK" from myself
+ received "OK" from myself
fail=01 相手からのok受領
- recieved "OK" from the other.
+ received "OK" from the other.
S 00ed
取り引きキャンセル
trade canceled.
diff --git a/doc/pccommand_list.txt b/doc/pccommand_list.txt
index b15fff5af..5690941a3 100644
--- a/doc/pccommand_list.txt
+++ b/doc/pccommand_list.txt
@@ -20,7 +20,7 @@ prontera,0,0,0 script OnPCLoginEvent -1,{
}
+ Explaination:
-every player who logs in will recieve a message 'lmao' in their face as soon
+every player who logs in will receive a message 'lmao' in their face as soon
as they can see the map.
+ Note:
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 3d0c8472c..40a198b79 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1312,7 +1312,7 @@ allow the player to enter text. Otherwise, only numbers will be allowed.
Notice that in current SVN, you may not input a negative number with this
command. This was done to prevent exploits in badly written scripts, which would
let people, for example, put negative amounts of zeny into a bank script and
-recieve free zeny as a result. Unfortunately it limits the uses of the 'input'
+receive free zeny as a result. Unfortunately it limits the uses of the 'input'
command quite a bit.
---------------------------------------
@@ -5843,7 +5843,7 @@ mes "4."+@name$[3]+"("+@fame[3]+")";
mes "5."+@name$[4]+"("+@fame[4]+")";
Note: In the TXT version it doesn't fill the array and always return -1.
-Note: Use $ as suffix in the array to recieve all data as text.
+Note: Use $ as suffix in the array to receive all data as text.
---------------------------------------
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 1772bcca2..e06e844cc 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -92,7 +92,7 @@ rachel,157,183,3 script Follower Ustiala 916,{
mes "["+strcharinfo(0)+"]";
mes "Oh... Hello.";
next;
- menu "I'm here to recieve the teachings of Freya",-,"I'm just here to tour",L_menu2;
+ menu "I'm here to receive the teachings of Freya",-,"I'm just here to tour",L_menu2;
mes "[Ustialla]";
mes "The day that our all knowing Freya ressurects,";
diff --git a/npc/custom/blackjack.txt b/npc/custom/blackjack.txt
index ddba8fe7a..99f5a3367 100644
--- a/npc/custom/blackjack.txt
+++ b/npc/custom/blackjack.txt
@@ -113,7 +113,7 @@ cmd_in02,188,89,1 script Black Jack Dealer 57,{
mes "11 points to give you 15 points total.";
next;
mes "[Dealer]";
- mes "If you had decided to pull and recieved a 9, the ace would";
+ mes "If you had decided to pull and received a 9, the ace would";
mes "automatically be counted as 1 point to give you a total of 14";
mes "points. If the Ace was counted as 11 points, you would have a";
mes "point total over 21 and would have lost.";
diff --git a/npc/events/custom/uneasy_cemetery.txt b/npc/events/custom/uneasy_cemetery.txt
index 8cd31480e..4e4df070b 100644
--- a/npc/events/custom/uneasy_cemetery.txt
+++ b/npc/events/custom/uneasy_cemetery.txt
@@ -8,7 +8,7 @@
//= eAthena Version 1.0
//===== Description: =========================================
//= A periodical quest of the Uneasy Cemetery (Kill undead / Prevent their appearance)
-//= Every day, at the midnight Prontera recieve a wave of Undeads.
+//= Every day, at the midnight Prontera receive a wave of Undeads.
//= They come from Uneasy Cemetery of Prontera. To protect the players
//= from the undeads terror you may either kill the enemy. Or supply Mother Mathana
//= with needed amount of Holy Water. Every citizen can take his part in the
diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index cffa30600..2fa0b4890 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -63,7 +63,7 @@ payon_in02,64,71,4 script Archer Guildsman 59,{
next;
mes "[Archer Guildsman]";
mes "The higher the quality of the wood you gather the higher your score.";
- mes "You must recieve a score of ^ff0000at least 25^000000 in order to ^ff0000pass the test^000000.";
+ mes "You must receive a score of ^ff0000at least 25^000000 in order to ^ff0000pass the test^000000.";
next;
mes "[Archer Guildsman]";
mes "You can find wood by battling ^0000ff'Willows'^000000, a type of tree monster found outside of town in Payon forest.";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 842085f89..91008da96 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -122,7 +122,7 @@ in_moc_16,19,33,4 script Guildsman 55,{
M_0:
mes "[Angry looking man]";
- mes "It's been a long time since we've recieved any Assassin candidates..... anyhow let me send you ^5533FFAssassin 'Kai'^000000.";
+ mes "It's been a long time since we've received any Assassin candidates..... anyhow let me send you ^5533FFAssassin 'Kai'^000000.";
mes "He'll take care of the registration process.";
enablenpc "Assassin Kai#1";
disablenpc "Assassin Kai#2";
@@ -931,7 +931,7 @@ L_Test:
sM_6c:
mes "[Nameless One]";
- mes "7. When an Assassin reaches a ^5533FFJob level of 50^000000, what is the added bonus he/she recieves to agility?";
+ mes "7. When an Assassin reaches a ^5533FFJob level of 50^000000, what is the added bonus he/she receives to agility?";
next;
menu "7",sM_7c, "8",sM_7c, "9",sM_7c, "10",-;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 581a28b32..27a6335de 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -942,7 +942,7 @@ geffen,46,164,4 script Baisulitst 69,{
mes "I ordered something from the Geffen Blacksmith Guild but the order got transfered to a blacksmith in Alberta.....";
next;
mes "[Baisulitst]";
- mes "Hmmm....., I wonder when I will recieve my special order ^5555FFArc Wand^000000.....";
+ mes "Hmmm....., I wonder when I will receive my special order ^5555FFArc Wand^000000.....";
emotion e_hmm;
close;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 77d61039b..271525873 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -129,7 +129,7 @@ L_Check:
mes "Let me just say that I applaud all of your hard work and your determination.";
next;
mes "[Chivalry Captain Herman]";
- mes "The final step to become a Knight is to recieve a recomondation from all six of the Knights who tested you.";
+ mes "The final step to become a Knight is to receive a recommendation from all six of the Knights who tested you.";
next;
mes "[Chivalry Captain Herman]";
mes "Let's start with Sir Andrew Syloc. Sir Syloc, what is your opinion of Knight candidate, ^ff0000"+strcharinfo(0)+"^000000.";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 01833151a..42c435872 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -103,7 +103,7 @@ L_Test1:
if(rand(2)) goto L_QSet2;
mes "[Markie]";
- mes "1) What is the added flee rate that a Thief recieves when the ^5533FFImprove Dodge^000000 skill is ^5533FFmastered^000000?";
+ mes "1) What is the added flee rate that a Thief receives when the ^5533FFImprove Dodge^000000 skill is ^5533FFmastered^000000?";
next;
menu "20",sM1_1, "30",-, "40",sM1_1, "160",sM1_1;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index f5084602d..2f263057b 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -103,7 +103,7 @@ function script F_PvPNarr {
mes "There is a hidden EXP value in PvP mode. This EXP will only apply inside of the PvP zone and not outside.";
next;
mes "[PvP Narrator]";
- mes "Every one will recieve a base EXP of 5 points when they first start. If you win a match your EXP with increase by 1 point.";
+ mes "Every one will receive a base EXP of 5 points when they first start. If you win a match your EXP with increase by 1 point.";
mes "If you loose your EXP will drop by 5 points, so be carefull!";
next;
mes "[PvP Narrator]";
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 591dd0b11..7c15d83fc 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -2811,7 +2811,7 @@ L_quiztime:
set @signquestions19$,"Choose the monster that is a different type than the others.";
set @signquestions20$,"Choose the Job class that cannot equip Silk Robe.";
set @signquestions21$,"Four thousand five hundred sixty divided by four, divided by two, plus three is equal too...";
- set @signquestions22$,"Which monster would recieve the most damage from a Fire Property Dagger?";
+ set @signquestions22$,"Which monster would receive the most damage from a Fire Property Dagger?";
set @signquestions23$,"Choose the skill related to the Priest's B.S. Sacramenti from the ones displayed in the list.";
set @playerpoints,0;
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index 436e342d7..42510f728 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -158,7 +158,7 @@ que_ng,28,50,3 script Boshuu 709,{
mes "[Boshuu]";
mes "Oh, I see you're back with all the required materials.";
mes "But before I start, I must ask you one more time.";
- mes "Do you want to give me the materials you've brought and recieve a Slotted Arm Guard instead?";
+ mes "Do you want to give me the materials you've brought and receive a Slotted Arm Guard instead?";
next;
if(select("No:Yes") == 1){
mes "[Boshuu]";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 88dcfe3d7..8116d4c4e 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -637,7 +637,7 @@ L_1:
mes "[Tausupa]";
mes "Can you take this special seasoning to my friends?";
next;
- mes "^5555FF~ recieved Koserahserah ~^000000";
+ mes "^5555FF~ received Koserahserah ~^000000";
set dmdswrd_Q, 2;
next;
diff --git a/npc/sample/PCLoginEvent.txt b/npc/sample/PCLoginEvent.txt
index 22218a2bf..b7020b719 100644
--- a/npc/sample/PCLoginEvent.txt
+++ b/npc/sample/PCLoginEvent.txt
@@ -13,7 +13,7 @@
// }
// [/code]
//
-// every player who logs in will recieve a message 'lmao' in their face as soon
+// every player who logs in will receive a message 'lmao' in their face as soon
// as they can see the map.
//-----------------------------------------------------------------------------
// Note:
diff --git a/src/char/char.c b/src/char/char.c
index 65e1dc3e6..d4ff879aa 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3208,7 +3208,7 @@ int parse_frommap(int fd)
}
break;
- case 0x2b16: // Recieve rates [Wizputer]
+ case 0x2b16: // Receive rates [Wizputer]
if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,8))
return 0;
// Txt doesn't need this packet, so just skip it
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 8596ad2f2..3fef01c5c 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -65,7 +65,7 @@ static const int packet_len_table[0x3d] = { // U - used, F - free
//2b12: Incomming, chrif_divorce -> 'divorce a wedding of charid X and partner id X'
//2b13: Incomming, chrif_accountdeletion -> 'Delete acc XX, if the player is on, kick ....'
//2b14: Incomming, chrif_accountban -> 'not sure: kick the player with message XY'
-//2b15: Incomming, chrif_recvgmaccounts -> 'recieve gm accs from charserver (seems to be incomplete !)'
+//2b15: Incomming, chrif_recvgmaccounts -> 'receive gm accs from charserver (seems to be incomplete !)'
//2b16: Outgoing, chrif_ragsrvinfo -> 'sends motd / rates ....'
//2b17: Outgoing, chrif_char_offline -> 'tell the charserver that the char is now offline'
//2b18: Outgoing, chrif_char_reset_offline -> 'set all players OFF!'
diff --git a/src/map/irc.c b/src/map/irc.c
index c5e707dd9..863631394 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -317,7 +317,7 @@ void irc_parse_sub(int fd, char *incoming_string)
// Names Reply [Zido]
else if((strcmpi(command,"353")==0)) {
- ShowInfo("IRC: NAMES recieved\n");
+ ShowInfo("IRC: NAMES received\n");
parse_names_packet(incoming_string);
}
}
diff --git a/src/map/mail.c b/src/map/mail.c
index cd1f63b1e..71c9b8c89 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -210,7 +210,7 @@ int mail_delete(struct map_session_data *sd, int message_id)
}
if(!atoi(mail_row[4])) {
mysql_free_result(mail_res);
- //clif_displaymessage(sd->fd,"You have recieved new mail, use @listmail before deleting.");
+ //clif_displaymessage(sd->fd,"You have received new mail, use @listmail before deleting.");
clif_displaymessage(sd->fd,msg_txt(520));
return 0;
}