summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/battle/battle.conf2
-rw-r--r--npc/events/christmas_2008.txt2
-rw-r--r--npc/jobs/2-1/priest.txt2
-rw-r--r--npc/other/fortune.txt2
-rw-r--r--npc/quests/quests_moscovia.txt2
-rw-r--r--npc/quests/skills/assassin_skills.txt4
-rw-r--r--npc/quests/the_sign_quest.txt6
-rw-r--r--npc/re/cities/dicastes.txt8
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt3
-rw-r--r--npc/re/quests/eden/86-90.txt2
-rw-r--r--npc/re/quests/eden/91-99.txt2
-rw-r--r--npc/re/quests/quests_dicastes.txt2
-rw-r--r--npc/re/quests/quests_malangdo.txt2
-rw-r--r--npc/re/quests/quests_mora.txt16
-rw-r--r--npc/re/warps/cities/dicastes.txt2
-rw-r--r--sql-files/upgrades/rAthena-main-upgrade.sql2
-rw-r--r--src/common/timer.c2
17 files changed, 45 insertions, 16 deletions
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 5b72f5ff9..29aa803a0 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -99,7 +99,7 @@ vit_penalty_num: 5
// eg: 10 + 50 def becomes 0 + (10*type + 50)
weapon_defense_type: 0
-//MDEF‚same as above....(MDEF*value)
+// MDEF, same as above....(MDEF*value)
magic_defense_type: 0
// Change attacker's direction to face opponent on every attack? (Note 3)
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 11fd1dea1..192bf25ec 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -4,6 +4,8 @@
//= Kisuka
//===== Current Version: =====================================
//= 1.1
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= iRO Christmas Event. (2008)
//= Create Music Box and Cake.
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index a06af96a1..735bb0d54 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -6,6 +6,8 @@
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 2.6
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Job Change quest for Priest class.
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index b622c1fac..a596377d1 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -4,6 +4,8 @@
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.0
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Fortune teller NPC. Displays random Card image.
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 740f1b038..508a14580 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -4,6 +4,8 @@
//= Kisuka
//===== Current Version: =====================================
//= 2.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= Quests for Moscovia.
//= The Moving Island, Help Mikhail, Acorn Exchange,
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 8ff7da04c..674090afa 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -4,6 +4,8 @@
//= Lupus, Reddozen
//===== Current Version: =====================================
//= 1.5
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Quests for skills: Venom Knife, Sonic Acceleration
@@ -950,6 +952,8 @@ OnTouch:
}
}
+// FIXME[Haru]: Why do we have a Korean name here? Can anyone translate it?
+// Google translate says ¡¡ (jingjing) = Whining, but it doesn't make much sense to me.
moc_pryd04,85,96,0 script ¡¡#crypt -1,3,3,{
OnTouch:
if (ASSN_SK == 4) {
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 9ede5352e..83704c8e5 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -4,6 +4,8 @@
//= SinSloth, MasterOfMuppets, Kargha
//===== Current Version: =====================================
//= 3.9
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Quest for opening the doors to Geffenia.
@@ -3090,13 +3092,11 @@ OnTouch:
end;
}
-/* Currently broken.
prt_maze02,25,161,0 script #music -1,7,7,{
OnTouch:
- soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
+ soundeffect "effect\\ ؽ.wav",1;
end;
}
-*/
prt_maze02,132,132,0 script #skill -1,{
OnEnable:
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 1c80f9567..efd1c6efc 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -4,6 +4,8 @@
//= Gennosuke Kouga, Muad_Dib
//===== Current Version: =====================================
//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= El Dicastes Town Script
@@ -82,8 +84,8 @@ dicastes01,234,158,0 script Training Galten#a 4_MAN_GALTUN,{
mes "if I keep up with my training every day.";
close;
}
- mes " ";
- mes " ";
+ mes " ";
+ mes " ";
next;
mes "Don't know what it means.";
close;
@@ -128,7 +130,7 @@ dicastes01,248,129,0 script Training Galten#d 4_MAN_GALTUN,{
close;
}
mes " ";
- mes " ";
+ mes " ";
next;
mes "Don't know what it means.";
close;
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index 4498ebdd0..114555547 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -4,6 +4,8 @@
//= Kisuka (1.0)
//===== Current Version: =======================================================
//= 1.0.0
+//===== File Encoding ==========================================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: ===========================================================
//= Defeat Wolfchev's human experimentations.
//===== Additional Comments: ===================================================
@@ -566,6 +568,7 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
break;
case 4:
mes "<<Ygnus Stale[1]>>";
+ // FIXME[Haru]: Anyone knows what ¹ßÈ­ means?
mes "When doing short distance attack, cast ¹ßÈ­ to the player and to the enemy with a certain chance.";
mes "Two-Handed Axe / ATK 250 / Weight 190 / Fire Property / Weapon Lv 4 / Required Lv 95 / Socket 1 / for High Swordman/Merchant Classes";
callsub L_Reward, Ygnus_Stale, 50, 100, 35;
diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 7746d6be3..01c8fec29 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -4,6 +4,8 @@
//= Chilly
//===== Current Version: =====================================
//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= Repetable Quests for Players between Baselevel 86 - 90.
//===== Additional Comments: =================================
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 2985463bf..e6744e80f 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -4,6 +4,8 @@
//= Chilly
//===== Current Version: =====================================
//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= Repetable Quests for Players between Baselevel 91 - 99.
//===== Additional Comments: =================================
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 7afe04039..9478ba1c9 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -4,6 +4,8 @@
//= Gennosuke Kouga, Muad_Dib
//===== Current Version: =====================================
//= 2.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Dewata:
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 5593300ec..0511a1e55 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -4,6 +4,8 @@
//= Muad_Dib
//===== Current Version: =====================================
//= 1.6
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Malangdo:
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 1d7e9bbd0..1c1e64046 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -4,6 +4,8 @@
//= Euphy
//===== Current Version: =====================================
//= 1.1
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Mora:
@@ -3382,26 +3384,26 @@ L_ShowReport:
mes "[Experimental Results]";
mes "*** Researcher - Inffle";
mes "*** Research Assistant - "+strcharinfo(0);
- mes "";
+ mes " ";
mes "<Research topic>";
mes "*** Bath of Mora Village";
- mes "";
+ mes " ";
mes "<Aim>";
mes "To investigate the mysterious power of the bath water";
mes "and to find out ways to better utilize";
mes "the water.";
- mes "";
+ mes " ";
mes "<Methods>";
mes "1. Obtained an unidentified DNA sample.";
mes "Obtained a sample of an unidentified DNA,";
mes "and collected more samples to look further into it.";
- mes "";
+ mes " ";
mes "2. A comparison analysis on the unidentified DNA";
mes "Concluded that the DNA belongs to";
mes "an unidentified creature living in the bath water.";
mes "combine and result in";
mes "from the swordfish DNA.";
- mes "";
+ mes " ";
mes "3. Research on the puddles around the village";
mes "From the four puddles around the village,";
mes "confirmed that the testing substances were";
@@ -3409,9 +3411,9 @@ L_ShowReport:
mes "It is thought that the four puddles";
mes "combine and result in";
mes "the mysterious power.";
- mes "";
+ mes " ";
mes "<Material analysis>";
- mes "*** Temperature ***** 33.5 ";
+ mes "*** Temperature ***** 33.5";
mes "*** PH ************ 9.8";
mes "*** Solid residues *** 176";
mes "*** K+ ************ 0,23";
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index 15e64a31f..52c641bc4 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -4,6 +4,8 @@
//= Chilly, Muad_Dib
//===== Current Version: =====================================
//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
//===== Description: =========================================
//= Warp Points for El Dicastes
//===== Additional Comments: =================================
diff --git a/sql-files/upgrades/rAthena-main-upgrade.sql b/sql-files/upgrades/rAthena-main-upgrade.sql
index 818cdcfb6..706c07740 100644
--- a/sql-files/upgrades/rAthena-main-upgrade.sql
+++ b/sql-files/upgrades/rAthena-main-upgrade.sql
@@ -6,7 +6,7 @@
-- Apply in the same database you applied your main.sql
-- Last revised: April 26, 2014 12:29 GMT
--- Drop table contents from ´sc_data´ since we use a different status order than rAthena
+-- Drop table contents from `sc_data` since we use a different status order than rAthena
-- /!\ WARNING /!\ This will remove _ALL_ of the status effects active on the server
-- You can disable this, but this is a SECURITY MEASURE
-- This will remove even jailed status from users!
diff --git a/src/common/timer.c b/src/common/timer.c
index 10f14b0f2..5d67455dc 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -180,7 +180,7 @@ static int64 sys_tick(void) {
// Monotinic clock: Implementation-defined.
// Clock that cannot be set and represents monotonic time since some
// unspecified starting point. This clock is not affected by
- // discontin‐uous jumps in the system time (e.g., if the system
+ // discontinuous jumps in the system time (e.g., if the system
// administrator manually changes the clock), but is affected by
// the incremental adjustments performed by adjtime(3) and NTP.
struct timespec tval;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 09:45:24 +0000