Skip to content

Commit

Permalink
Fixed some charset issues
Browse files Browse the repository at this point in the history
- Fixed files with mixed character set or invalid CP949 characters.
- Uncommented '#music' script in the_sign_quest.txt (now the
  soundeffect filename should be fixed).
- Added a note to the header of CP949 files not to read or save them as
  UTF8, since it'd break their encoding. It should be safe enough to
  read them as EUC-KR if your text editor doesn't offer CP949 as an
  option.
- Added FIXME notes about untranslated strings in assassin_skills.txt
  and WolfchevLaboratory.txt.

Signed-off-by: Haru <haru@dotalux.com>
  • Loading branch information
MishimaHaruna committed May 13, 2014
1 parent 00d9001 commit 3bd57cf
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 16 deletions.
2 changes: 1 addition & 1 deletion conf/battle/battle.conf
Expand Up @@ -99,7 +99,7 @@ vit_penalty_num: 5
// eg: 10 + 50 def becomes 0 + (10*type + 50)
weapon_defense_type: 0

//MDEFsame 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)
Expand Down
2 changes: 2 additions & 0 deletions npc/events/christmas_2008.txt
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions npc/jobs/2-1/priest.txt
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions npc/other/fortune.txt
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions npc/quests/quests_moscovia.txt
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions npc/quests/skills/assassin_skills.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions npc/quests/the_sign_quest.txt
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions npc/re/cities/dicastes.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions npc/re/instances/WolfchevLaboratory.txt
Expand Up @@ -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: ===================================================
Expand Down Expand Up @@ -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.";

This comment has been minimized.

Copy link
@EPuncker

EPuncker May 13, 2014

Contributor

burnt status according to bRO files, btw this bonus is not present at item_db.conf:

"Acrescenta o status Queimado ao atacar fisicamente, mas o usuáio também corre o risco de ser queimado.",

queimado = burnt

This comment has been minimized.

Copy link
@MishimaHaruna

MishimaHaruna May 13, 2014

Author Member

Thank you very much, I'll update the text

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;
Expand Down
2 changes: 2 additions & 0 deletions npc/re/quests/eden/86-90.txt
Expand Up @@ -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: =================================
Expand Down
2 changes: 2 additions & 0 deletions npc/re/quests/eden/91-99.txt
Expand Up @@ -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: =================================
Expand Down
2 changes: 2 additions & 0 deletions npc/re/quests/quests_dicastes.txt
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions npc/re/quests/quests_malangdo.txt
Expand Up @@ -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:
Expand Down
16 changes: 9 additions & 7 deletions npc/re/quests/quests_mora.txt
Expand Up @@ -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:
Expand Down Expand Up @@ -3382,36 +3384,36 @@ 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";
mes "distributed evenly across the puddles.";
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�";

This comment has been minimized.

Copy link
@EPuncker

EPuncker May 13, 2014

Contributor

was it intentional? since we use º for temperature :P

This comment has been minimized.

Copy link
@MishimaHaruna

MishimaHaruna May 13, 2014

Author Member

Yes, it is intentional. GitHub doesn't use the correct charset here, but if you load it as CP-949 or EUC-KR, this ¡Æ string is in fact °

This comment has been minimized.

Copy link
@vthibault

vthibault May 14, 2014

Contributor

Wouldn't it better to write all the special characters to hex representation to avoid any problem related to charset ?
The script engine support "\xb0" notation (should not be documented).

This comment has been minimized.

Copy link
@MishimaHaruna

MishimaHaruna May 14, 2014

Author Member

Not sure about that. In my opinion, having the actual characters rather than some unintelligible hex string, makes it much more readable.

Edit: Expressing it in hex notation, would still keep it bound to a certain charset (even if it makes the file pure ASCII). Editing it would become even harder, because you'd still have to set your editor to the right charset, decode the string, edit it, and re-encode it in hex notation.

mes "*** PH ************ 9.8";
mes "*** Solid residues *** 176";
mes "*** K+ ************ 0,23";
Expand Down
2 changes: 2 additions & 0 deletions npc/re/warps/cities/dicastes.txt
Expand Up @@ -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: =================================
Expand Down
2 changes: 1 addition & 1 deletion sql-files/upgrades/rAthena-main-upgrade.sql
Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion src/common/timer.c
Expand Up @@ -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;
Expand Down

0 comments on commit 3bd57cf

Please sign in to comment.