From 2815962839084a089c86c249cbe3945b9d441d76 Mon Sep 17 00:00:00 2001 From: alpine Date: Fri, 19 Dec 2014 17:29:02 +0000 Subject: [PATCH] Update for Heliothryx game: - added localization tool Updates for Marble Match-3 game: - added localization support - some cosmetic changes git-svn-id: svn://kolibrios.org@5243 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/games/heliothryx/Tupfile.lua | 17 +- .../games/heliothryx/game/rs/rsmicrolibc.c | 19 + .../games/heliothryx/game/rs/rsmicrolibc.h | 3 + .../games/heliothryx/game/rs/rsplatform.h | 25 +- .../games/heliothryx/game/rs/rsplatform_kos.c | 402 +++++++++--------- programs/games/heliothryx/game/rsgame.c | 42 +- programs/games/heliothryx/game/rsgame.h | 11 + programs/games/heliothryx/game/rsgamedraw.c | 12 +- programs/games/heliothryx/game/rsgamemenu.c | 33 +- programs/games/heliothryx/game/rsgametext.c | 12 +- programs/games/heliothryx/game/rskos.c | 2 +- programs/games/heliothryx/game/rskos.h | 2 +- programs/games/heliothryx/game/rsmain.c | 14 - programs/games/heliothryx/game/rsmain.h | 3 - programs/games/heliothryx/game/rssoundgen.c | 14 +- programs/games/heliothryx/game/rssoundgen.h | 6 +- .../heliothryx/localization-tool/font.png | Bin 0 -> 9757 bytes .../heliothryx/localization-tool/index.html | 201 +++++++++ programs/games/heliothryx/readme.utf8.txt | 6 + .../games/marblematch3/game/rs/rsmicrolibc.c | 19 + .../games/marblematch3/game/rs/rsmicrolibc.h | 3 + programs/games/marblematch3/game/rsgame.c | 31 +- programs/games/marblematch3/game/rsgame.h | 4 +- programs/games/marblematch3/game/rsgamedraw.c | 50 ++- programs/games/marblematch3/game/rsgamemenu.c | 22 +- programs/games/marblematch3/game/strings.h | 4 +- programs/games/marblematch3/game/strings_en.h | 24 +- programs/games/marblematch3/game/strings_ru.h | 25 +- programs/games/marblematch3/readme.utf8.txt | 3 + 29 files changed, 661 insertions(+), 348 deletions(-) delete mode 100755 programs/games/heliothryx/game/rsmain.c delete mode 100755 programs/games/heliothryx/game/rsmain.h create mode 100644 programs/games/heliothryx/localization-tool/font.png create mode 100644 programs/games/heliothryx/localization-tool/index.html diff --git a/programs/games/heliothryx/Tupfile.lua b/programs/games/heliothryx/Tupfile.lua index a83d4ed9e7..707584a06a 100644 --- a/programs/games/heliothryx/Tupfile.lua +++ b/programs/games/heliothryx/Tupfile.lua @@ -1,8 +1,21 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_GCC") ~= "" then return end +-- tup.rule("echo \"#define LANG_" .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. "\" > lang.h", {"lang.h"}) HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_sound.lua") LDFLAGS = LDFLAGS .. " -T kolibri.ld" tup.append_table(OBJS, tup.rule("start.asm", "fasm %f %o", "start.o")) -compile_gcc{"system/kolibri.c", "game/rs/rsmicrolibc.c", "game/rs/rsplatform_kos.c", "game/rs/rsmx.c", "game/rsnoise.c", "game/rsgentex.c", "game/rsmain.c", "game/rsgame.c", "game/rsgamedraw.c", "game/rskos.c", "game/rsgametext.c", "game/rsgamemenu.c"} -link_gcc("heliothryx") + +if tup.getconfig("LANG") == "ru" +then C_LANG = "LANG_RU" + +elseif tup.getconfig("LANG") == "sp" +then C_LANG = "LANG_SP" -- just for example, other languages are not implemented + +else C_LANG = "LANG_EN" -- default language is English +end + +CFLAGS = CFLAGS .. " -DRS_KOS -D" .. C_LANG .. " " + +compile_gcc{ "system/kolibri.c", "game/rs/rsmicrolibc.c", "game/rs/rsplatform_kos.c", "game/rs/rsmx.c", "game/rsnoise.c", "game/rsgentex.c", "game/rsgame.c", "game/rsgamedraw.c", "game/rskos.c", "game/rsgametext.c", "game/rsgamemenu.c"} +link_gcc ("heliothryx") diff --git a/programs/games/heliothryx/game/rs/rsmicrolibc.c b/programs/games/heliothryx/game/rs/rsmicrolibc.c index e5049201ce..e51613d0d7 100644 --- a/programs/games/heliothryx/game/rs/rsmicrolibc.c +++ b/programs/games/heliothryx/game/rs/rsmicrolibc.c @@ -170,5 +170,24 @@ void* memcpy(void *dst, const void *src, unsigned size) } +char* strchr(char* s, int c) { + while (*s) { + if (*s == (char) c) { + return s; + }; + s++; + }; + return NULL; + +}; + +unsigned int strlen ( char * str ) { + unsigned int len = 0; + while ( *str ) { + len++; + str++; + }; + return len; +}; diff --git a/programs/games/heliothryx/game/rs/rsmicrolibc.h b/programs/games/heliothryx/game/rs/rsmicrolibc.h index 110159ef37..9bb391ae84 100644 --- a/programs/games/heliothryx/game/rs/rsmicrolibc.h +++ b/programs/games/heliothryx/game/rs/rsmicrolibc.h @@ -50,4 +50,7 @@ void free(void* pointer); void* memset(void *mem, int c, unsigned size); void* memcpy(void *dst, const void *src, unsigned size); +char* strchr(char* s, int c); +unsigned int strlen ( char * str ); + #endif diff --git a/programs/games/heliothryx/game/rs/rsplatform.h b/programs/games/heliothryx/game/rs/rsplatform.h index 00918b6b0d..c3f0f4295b 100644 --- a/programs/games/heliothryx/game/rs/rsplatform.h +++ b/programs/games/heliothryx/game/rs/rsplatform.h @@ -40,43 +40,52 @@ #define RS_KEY_X 45 +unsigned int get_time(); + + typedef void RSFUNC0(); -typedef void RSFUNC1i(int); +/*typedef void RSFUNC1i(int); typedef void RSFUNC2i(int,int); -typedef void RSFUNC1i1f(int,float); +typedef void RSFUNC1i1f(int,float); */ typedef RSFUNC0 *PRSFUNC0; -typedef RSFUNC1i *PRSFUNC1i; +/*typedef RSFUNC1i *PRSFUNC1i; typedef RSFUNC2i *PRSFUNC2i; -typedef RSFUNC1i1f *PRSFUNC1i1f; - +typedef RSFUNC1i1f *PRSFUNC1i1f;*/ +/* void NullFunc0(); void NullFunc1i(int i); void NullFunc2i(int i, int j); void NullFunc1i1f(int i, float f); +*/ typedef struct rs_app_t { unsigned short app_time; unsigned short delta_time; - - PRSFUNC2i OnSize; + + /* PRSFUNC2i OnKeyDown; PRSFUNC1i OnKeyUp; + + PRSFUNC2i OnMouseDown; + PRSFUNC2i OnMouseUp; PRSFUNC0 OnAppProcess; PRSFUNC0 rsAppOnInitDisplay; PRSFUNC0 rsAppOnTermDisplay; + + */ } rs_app_t; extern rs_app_t rs_app; -void rsAppZero(); +//void rsAppZero(); diff --git a/programs/games/heliothryx/game/rs/rsplatform_kos.c b/programs/games/heliothryx/game/rs/rsplatform_kos.c index 665103aa26..c0c9ffc663 100644 --- a/programs/games/heliothryx/game/rs/rsplatform_kos.c +++ b/programs/games/heliothryx/game/rs/rsplatform_kos.c @@ -1,101 +1,101 @@ #include "rsplatform.h" - + rs_app_t rs_app; - - - - + + + + // set this macro to zero (0) if bug is fixed #define FIX_MENUETOS_LEGACY_ONE_PIXEL_BORDER_GAP_BUG (-1) - + // Fixed frame rate, set to 25 -#define GAME_REQUIRED_FPS 25 - - - -//extern char PATH[256]; -//extern char PARAM[256]; - +#define GAME_REQUIRED_FPS 25 + + + +//extern char PATH[256]; +//extern char PARAM[256]; + int window_width, window_height; - + int fps = 0; int dt = 1; int draw_dt = 1; int area_width = 160; int area_height = 160; - + int w_plus = 0; - - - - - + + + + + #define BIT_SET(var,mask) { var |= (mask); } #define BIT_CLEAR(var,mask) { var &= ~(mask); } #define BIT_TOGGLE(var,mask) { var ^= (mask); } - + #define IS_BIT_SET(var,mask) ( (var) & (mask) ) #define IS_BIT_CLEARED(var,mask) (!( (var) & (mask) )) - - + + void BoardPuts(const char *s) { - unsigned int i = 0; - while(*(s + i)) - { - asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s + i))); - i++; - } + unsigned int i = 0; + while(*(s + i)) + { + asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s + i))); + i++; + } } - + void board_write_integer(const char *s, int i) { - - char tmp[16]; - - - + + char tmp[16]; + + + }; - - + + void kol_wnd_resize(unsigned w, unsigned h) { - asm volatile ("int $0x40"::"a"(67), "b"(-1), "c"(-1), "d"(w), "S"(h)); + asm volatile ("int $0x40"::"a"(67), "b"(-1), "c"(-1), "d"(w), "S"(h)); } - - - - + + + + void wnd_draw() { - - char tmp[] = "Fps:000 | Heliothryx Beta by Roman Shuvalov"; - - kol_paint_start(); - - tmp[4] = '0' + ( (fps/100) % 10 ); - tmp[5] = '0' + ( (fps/10) % 10 ); - tmp[6] = '0' + ( (fps) % 10 ); - - kol_wnd_define(100, 100, window_width, window_height, 0x74ddddff, 0x34ddddff, "HELLO WINDOW"); - kol_wnd_caption(tmp); - - GameProcess(); - - kol_paint_end(); - + + char tmp[] = "Fps:000 | Heliothryx Beta by Roman Shuvalov"; + + kol_paint_start(); + + tmp[4] = '0' + ( (fps/100) % 10 ); + tmp[5] = '0' + ( (fps/10) % 10 ); + tmp[6] = '0' + ( (fps) % 10 ); + + kol_wnd_define(100, 100, window_width, window_height, 0x74ddddff, 0x34ddddff, "HELLO WINDOW"); + kol_wnd_caption(tmp); + + GameProcess(); + + kol_paint_end(); + } - - - - + + + + /// =========================================================== - + void kol_main() { - - BoardPuts("Hello, Heliothryx!\n"); - - int err; + + BoardPuts("Hello, Heliothryx!\n"); + + int err; int version =-1; if((err = InitSound(&version)) !=0 ){ @@ -106,139 +106,137 @@ void kol_main() (SOUND_VERSION<(version >> 16))){ BoardPuts("Sound Error 2\n"); } - - - unsigned event; - unsigned key; - unsigned key_up; - - unsigned btn; - unsigned pos, x, y; - int gx, gy; - - //srand(kol_system_time_get()); - - // kol_event_mask( 0xC0000027 ); // enable using of mouse - kol_event_mask(7); // keyboard only - - kol_key_mode_set(1); - - area_width = 640; - area_height = 360; - - // Initializing variables - window_width = FIX_MENUETOS_LEGACY_ONE_PIXEL_BORDER_GAP_BUG + area_width + 10; // 2 x 5px border - window_height = FIX_MENUETOS_LEGACY_ONE_PIXEL_BORDER_GAP_BUG + kol_skin_height() + area_height + 5; // bottom 5px border - - - GameInit(); - - wnd_draw(); - - fps = 0; - - unsigned int tick_start = kol_time_tick(); - unsigned int tick_current = tick_start; - unsigned int tick_last = tick_start; - - unsigned int fps_counter = 0; - int wait_time; - int already_drawn = 0; - - float xf; - float xfs; - int xfs_i; - - while (1) { - tick_last = tick_current; - tick_current = kol_time_tick(); - dt = tick_current - tick_last; - tick_last = tick_current; - - already_drawn = 0; - - while (( event = kol_event_wait_time(1) )) { - - switch (event) { - - case 1: - wnd_draw(); // <--- need to clear event! - already_drawn = 1; - break; - - case 2: - key = kol_key_get(); - key = (key & 0xff00)>>8; - key_up = key & 0x80; - key = key & 0x7F; - - if (key_up) { - GameKeyUp(key, 1); - } - else { - GameKeyDown(key); - }; - - break; - - case 3: - switch ((kol_btn_get() & 0xff00)>>8) - { - case 1: // close button - kol_exit(); - case 2: // 'new' button - //init_board(); - //wnd_draw(); - break; - } - break; - - case 6: - btn = kol_mouse_btn(); // read mouse button - pos = kol_mouse_posw(); // read mouse position - x = pos / 65536; - y = pos % 65536; - if (x > window_width) - x=0; - if (y > window_height) - y=0; - - - break; - } - - }; - - - if (!already_drawn) { - wnd_draw(); - }; - - - fps_counter++; - - tick_current = kol_time_tick(); - - if (tick_current > tick_start+100) { - fps = fps_counter; - fps_counter = 0; - tick_start += 100; - }; - - draw_dt = tick_current - tick_last; - - wait_time = (100/GAME_REQUIRED_FPS) - draw_dt; - if (wait_time <= 0) { - wait_time = 1; - }; - kol_sleep(wait_time); - - - } - - GameTerm(); - - kol_exit(); + + + unsigned event; + unsigned key; + unsigned key_up; + + unsigned btn; + unsigned pos, x, y; + int gx, gy; + + //srand(kol_system_time_get()); + + // kol_event_mask( 0xC0000027 ); // enable using of mouse + kol_event_mask(7); // keyboard only + + kol_key_mode_set(1); + + area_width = 640; + area_height = 360; + + // Initializing variables + window_width = FIX_MENUETOS_LEGACY_ONE_PIXEL_BORDER_GAP_BUG + area_width + 10; // 2 x 5px border + window_height = FIX_MENUETOS_LEGACY_ONE_PIXEL_BORDER_GAP_BUG + kol_skin_height() + area_height + 5; // bottom 5px border + + + GameInit(); + + wnd_draw(); + + fps = 0; + + unsigned int tick_start = kol_time_tick(); + unsigned int tick_current = tick_start; + unsigned int tick_last = tick_start; + + unsigned int fps_counter = 0; + int wait_time; + int already_drawn = 0; + + float xf; + float xfs; + int xfs_i; + + while (1) { + tick_last = tick_current; + tick_current = kol_time_tick(); + dt = tick_current - tick_last; + tick_last = tick_current; + + already_drawn = 0; + + while (( event = kol_event_wait_time(1) )) { + + switch (event) { + + case 1: + wnd_draw(); // <--- need to clear event! + already_drawn = 1; + break; + + case 2: + key = kol_key_get(); + key = (key & 0xff00)>>8; + key_up = key & 0x80; + key = key & 0x7F; + + if (key_up) { + GameKeyUp(key, 1); + } + else { + GameKeyDown(key); + }; + + break; + + case 3: + switch ((kol_btn_get() & 0xff00)>>8) + { + case 1: // close button + kol_exit(); + case 2: // 'new' button + //init_board(); + //wnd_draw(); + break; + } + break; + + case 6: + btn = kol_mouse_btn(); // read mouse button + pos = kol_mouse_posw(); // read mouse position + x = pos / 65536; + y = pos % 65536; + if (x > window_width) + x=0; + if (y > window_height) + y=0; + + + break; + } + + }; + + + if (!already_drawn) { + wnd_draw(); + }; + + + fps_counter++; + + tick_current = kol_time_tick(); + + if (tick_current > tick_start+100) { + fps = fps_counter; + fps_counter = 0; + tick_start += 100; + }; + + draw_dt = tick_current - tick_last; + + wait_time = (100/GAME_REQUIRED_FPS) - draw_dt; + if (wait_time <= 0) { + wait_time = 1; + }; + kol_sleep(wait_time); + + + } + + GameTerm(); + + kol_exit(); } - - diff --git a/programs/games/heliothryx/game/rsgame.c b/programs/games/heliothryx/game/rsgame.c index 5d94f371bd..584c64a515 100755 --- a/programs/games/heliothryx/game/rsgame.c +++ b/programs/games/heliothryx/game/rsgame.c @@ -24,6 +24,7 @@ #endif + rs_game_t game; @@ -162,6 +163,24 @@ void soundbuf_sin_fade(rs_soundbuf_t *snd, float freq) { for (i = 0; i < snd->length_samples; i++) { snd->data[i] = ( 1.0 - 1.0*i/snd->length_samples ) * sin( ( (1.0 - 0.48*i/snd->length_samples) * freq ) *i) * amp; }; + + + /* + + // ok + + rs_sgen_init(2, snd->length_samples); + rs_sgen_func_pm(1, 880.0, 21.0, 0.3, 110.0, 0.3); + rs_sgen_func_normalize(1, 1.0); + rs_sgen_func_lowpass(0, 1, 1.0, 0.0, 1.0); + rs_sgen_wave_out(0); + + memcpy(snd->data, rs_sgen_reg.wave_out, snd->length_samples*2 ); + + rs_sgen_term(); + + */ + rskos_snd_update_buffer(&snd->hbuf, snd->data, snd->length_samples); }; @@ -196,9 +215,9 @@ void game_reg_init() { game.status = STATUS_MENU; game.window_scale = 2; - #ifdef RS_LINUX + #ifndef RS_KOS game.window_scale = 3; - window_scale_str[3] = '3'; + window_scale_str[3] = '3'; #endif game.keyboard_state = 0; @@ -421,7 +440,7 @@ void GameInit() { rs_gen_term(); - #ifdef RS_LINUX + #ifndef RS_KOS rs_audio_init(RS_AUDIO_FMT_MONO16, RS_AUDIO_FREQ_16000, 0); #endif @@ -446,7 +465,7 @@ void GameTerm() { DEBUG10("--- Game Term ---"); - #ifdef RS_LINUX + #ifndef RS_KOS rs_audio_term(); #endif @@ -511,6 +530,7 @@ void GameKeyDown(int key, int first) { if ( (game.menu_index == MENU_SETTINGS) && (game.menu_item_index == MENU_ITEM_WINDOW_SCALE) ) { game_change_window_scale(-1); + game_ding(1); }; //PlayBuffer(hBuff, 0); @@ -520,6 +540,7 @@ void GameKeyDown(int key, int first) { if ( (game.menu_index == MENU_SETTINGS) && (game.menu_item_index == MENU_ITEM_WINDOW_SCALE) ) { game_change_window_scale(1); + game_ding(1); }; //StopBuffer(hBuff); @@ -591,6 +612,16 @@ void GameKeyUp(int key) { }; +void GameMouseDown(int x, int y) { + game.tx = x; + game.ty = y; + DEBUG10f("Mouse Down %d, %d \n", x, y); +}; + +void GameMouseUp(int x, int y) { + // +}; + void game_change_window_scale(int d) { int scale = window_scale_str[3] - '0'; @@ -621,6 +652,9 @@ void game_change_window_scale(int d) { rskos_resize_window( GAME_WIDTH * scale, GAME_HEIGHT * scale ); window_scale_str[3] = scale + '0'; + + + }; void game_ding(int i) { diff --git a/programs/games/heliothryx/game/rsgame.h b/programs/games/heliothryx/game/rsgame.h index 7f8a6f6716..b8778db5ee 100755 --- a/programs/games/heliothryx/game/rsgame.h +++ b/programs/games/heliothryx/game/rsgame.h @@ -8,6 +8,14 @@ */ +#ifndef RS_LINUX + #ifndef RS_WIN32 + #ifndef RS_KOS + #error Please specify platform + #endif + #endif +#endif + #include "rskos.h" #include "rs/rsplatform.h" @@ -182,6 +190,9 @@ void GameTerm(); void GameKeyDown(int key, int first); void GameKeyUp(int key); +void GameMouseDown(int x, int y); +void GameMouseUp(int x, int y); + void game_change_window_scale(int d); #endif // RSGAME_H_INCLUDED diff --git a/programs/games/heliothryx/game/rsgamedraw.c b/programs/games/heliothryx/game/rsgamedraw.c index a94852a212..f4459743ff 100755 --- a/programs/games/heliothryx/game/rsgamedraw.c +++ b/programs/games/heliothryx/game/rsgamedraw.c @@ -6,7 +6,7 @@ #include "rsnoise.h" - +#include "strings.h" void game_draw() { @@ -76,9 +76,9 @@ void game_draw() { texture_draw(&game.framebuffer, &game.tex_rocks[i], 250+80*rs_noise(i,150), 60+60*rs_noise(i,1110), DRAW_MODE_ADDITIVE ); }; - game_textout( GAME_WIDTH/2 - 100, 40, 1, "HELIOTHRYX"); - game_textout( GAME_WIDTH/2 - 8, 58, 3, "TECHDEMO"); - game_textout( 2, GAME_HEIGHT-10, 2, "DEVELOPER: ROMAN SHUVALOV` TOGLIATTI_ 2014"); + game_textout( GAME_WIDTH/2 - 100, 40, 1, "HELI0THRYX"); + game_textout( GAME_WIDTH/2 - 8, 58, 3, "TECHDEM0"); + game_textout( 2, GAME_HEIGHT-10, 2, L_BOTTOM_LINE_DEVELOPER_INFO); }; } @@ -100,8 +100,8 @@ void game_draw() { }; }; - game_textout( 2, 2, 2, "THIS IS TECHDEMO` "); - game_textout( 2, 12, 2, "USE ARROWS TO MOVE_ TO SHOOT_ TO EXIT` "); + game_textout( 2, 2, 2, L_TECHDEMO_LINE1 ); + game_textout( 2, 12, 2, L_TECHDEMO_LINE2 ); }; diff --git a/programs/games/heliothryx/game/rsgamemenu.c b/programs/games/heliothryx/game/rsgamemenu.c index ccbd0a8907..c7ec099e7d 100644 --- a/programs/games/heliothryx/game/rsgamemenu.c +++ b/programs/games/heliothryx/game/rsgamemenu.c @@ -4,6 +4,8 @@ #include "rskos.h" +#include "strings.h" + PRSFUNC0 menu_actions[] = { /* a */ &menu_action_start, /* b */ &menu_action_exit, @@ -12,27 +14,38 @@ PRSFUNC0 menu_actions[] = { char window_scale_str[] = "c< 2X >"; +/* + First char: + - letter a...z means action (a = 0th, b = 1st, c = 2nd, see menu_actions[] above) + - number 0...9 means goto menu #0, #1, #2... see menu_titles[] below + - space ' ' means no action, menu item is unselectable + - empty string "" is now allowed and can cause segfault + String from second char is label of menu item + +*/ + + char* menu_main_titles[] = { - "a5TART", - "15ETTING5", - "2ABOUT", - "bQUIT", + "a"L_START, + "1"L_SETTINGS, + "2"L_ABOUT, + "b"L_QUIT, 0 }; char* menu_settings_titles[] = { - " WINDOW SCALE:", + " "L_WINDOW_SCALE, window_scale_str, " ", - "0DONE", + "0"L_DONE, 0 }; char* menu_about_titles[] = { - " DEVELOPED BY", - " ROMAN SHUVALOV", + " "L_DEVELOPED_BY, + " "L_ROMAN_SHUVALOV, " ", - "0DONE", + "0"L_DONE, 0 }; @@ -113,7 +126,7 @@ void menu_action_start() { }; void menu_action_exit() { - #ifndef RS_LINUX + #ifdef RS_KOS GameTerm(); #endif rskos_exit(); diff --git a/programs/games/heliothryx/game/rsgametext.c b/programs/games/heliothryx/game/rsgametext.c index d26ca3a650..36cc50b1c0 100755 --- a/programs/games/heliothryx/game/rsgametext.c +++ b/programs/games/heliothryx/game/rsgametext.c @@ -217,7 +217,7 @@ signed short pp_seg[32*8] = { 11, 25, 6, 0, - // 31 not implemented + // 31 not implemented - need to create up-left DOT for percent(%) sign 16, 26-16, 16, 26+16, 16, 26, @@ -226,8 +226,8 @@ signed short pp_seg[32*8] = { }; -uint32_t ch_seg[64] = { - 0b00111111, // // for cross-line in O | 1<<12 | 1<<19, // 0 +unsigned int ch_seg[64] = { + 0b00111111 /* | 1<<12 | 1<<19 */, // 0 or O 1<<26 | 1<<8 | 1<<9 | 1<<3, // 1 0b01011011, // 2 1<<0 | 1<<12 | 1<<15 | 1<<2 | 1<<3, // 3 @@ -261,12 +261,12 @@ uint32_t ch_seg[64] = { 1<<5 | 1<<4 | 1<<3, // L 1<<5 | 1<<4 | 1<<1 | 1<<2 | 1<<16 | 1<<12, // M 1<<5 | 1<<4 | 1<<16 | 1<<11 | 1<<1 | 1<<2, // N - 0b00111111, // O + 1<<16 | 1<<11 | 1<<19 | 1<<12 | 1<<6 | 1<<8 | 1<<9, // O - FREE SYMBOL 1<<4 | 1<<5 | 1<<0 | 1<<1 | 1<<6, // P 1<<0 | 1<<1 | 1<<13 | 1<<27 | 1<<4 | 1<<5 | 1<<11, // Q // old: 0b00111111 | 1<<11, // Q 1<<0 | 1<<1 | 1<<6 | 1<<5 | 1<<4 | 1<<11, // R - 0b01101101, // S + (1 << 18 | 1 << 13) | (1 << 29 | 1 << 26) | (1 << 5 | 1 << 2) | (1 << 19 | 1 << 12), // percent(%) sign, s == 5 -> // 0b01101101, // S 1<<0 | 1<<8 | 1<<9, // T 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5, // U 1<<1 | 1<<13 | 1<<17 | 1<<5, // V @@ -296,7 +296,7 @@ uint32_t ch_seg[64] = { 1<<4 | 1<<18 | 1<<28 | 1<<1 | 1<<2, // l // old symmetric: 1<<4 | 1<<18 | 1<<10 | 1<<2, // l // old: 1<<19 | 1<<12 | 1<<1 | 1<<2, // lЛ 1<<5 | 1<<4 | 1<<3 | 1<<1 | 1<<2 | 1<<9 | 1<<21, // mЩ, 1<<4 | 1<<5 | 1<<0 | 1<<1 | 1<<2, // n - 1<<0 | 1<<12 | 1<<15 | 1<<2 | 1<<3, // oЗ + (1<<8 | 1<<9) | 1<<10 | 1<<18, // 'o' for arrow up ^ }; diff --git a/programs/games/heliothryx/game/rskos.c b/programs/games/heliothryx/game/rskos.c index 94231f51c1..e3c2152cf1 100644 --- a/programs/games/heliothryx/game/rskos.c +++ b/programs/games/heliothryx/game/rskos.c @@ -1,6 +1,6 @@ #include "rskos.h" -#ifdef RS_LINUX +#ifndef RS_KOS #include "rs/rstexture.h" #include "rs/rsgl.h" diff --git a/programs/games/heliothryx/game/rskos.h b/programs/games/heliothryx/game/rskos.h index 65f099cd7c..b95250ab56 100644 --- a/programs/games/heliothryx/game/rskos.h +++ b/programs/games/heliothryx/game/rskos.h @@ -16,7 +16,7 @@ void rskos_exit(); // sound #ifndef SNDBUF - #ifdef RS_LINUX + #ifndef RS_KOS #include "rs/rsaudio.h" typedef rs_sound_t* SNDBUF; #else diff --git a/programs/games/heliothryx/game/rsmain.c b/programs/games/heliothryx/game/rsmain.c deleted file mode 100755 index 2568626dc9..0000000000 --- a/programs/games/heliothryx/game/rsmain.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "rsmain.h" - -#include "rsgame.h" - -void rs_main_init() { - - rs_app.rsAppOnInitDisplay = GameInit; - rs_app.rsAppOnTermDisplay = GameTerm; - - rs_app.OnKeyDown = GameKeyDown; - rs_app.OnKeyUp = GameKeyUp; - - rs_app.OnAppProcess = GameProcess; -}; diff --git a/programs/games/heliothryx/game/rsmain.h b/programs/games/heliothryx/game/rsmain.h deleted file mode 100755 index 094475813d..0000000000 --- a/programs/games/heliothryx/game/rsmain.h +++ /dev/null @@ -1,3 +0,0 @@ -#include "rs/rsplatform.h" - -void rs_main_init(); diff --git a/programs/games/heliothryx/game/rssoundgen.c b/programs/games/heliothryx/game/rssoundgen.c index 49c97386e5..18fd23a4bf 100755 --- a/programs/games/heliothryx/game/rssoundgen.c +++ b/programs/games/heliothryx/game/rssoundgen.c @@ -1,13 +1,17 @@ #include "rssoundgen.h" -/* - #include "rsnoise.h" #include "rs/rsmx.h" -#include -#include + +#ifdef RS_KOS + #include "rs/rsplatform.h" +#else + #include + #include + #include +#endif rs_sgen_reg_t rs_sgen_reg; @@ -454,4 +458,4 @@ void rs_sgen_func_shift(int dest, int src) { }; }; -*/ + diff --git a/programs/games/heliothryx/game/rssoundgen.h b/programs/games/heliothryx/game/rssoundgen.h index 58b5387dda..038330a126 100755 --- a/programs/games/heliothryx/game/rssoundgen.h +++ b/programs/games/heliothryx/game/rssoundgen.h @@ -3,9 +3,7 @@ #include "rsgame.h" -/* - -#include "rs/rsaudio.h" +//#include "rs/rsaudio.h" typedef struct rs_sgen_reg_t { int wave_length; @@ -40,6 +38,6 @@ void rs_sgen_func_shift(int dest, int src); //void rs_gen_func_mult_add_value(int dest, int src, float val_mult, float val_add); -*/ + #endif diff --git a/programs/games/heliothryx/localization-tool/font.png b/programs/games/heliothryx/localization-tool/font.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0231f5cffe4f5fbad1884bcbfc250a7c4f0248 GIT binary patch literal 9757 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

$Qb|UVMZ053`%<#A7pw6)--g&c?@( z|8K@IoW^0?vhmu2J@vEi{4DB)W;tm?1-zVCkdiO1Q0gxFx%L&yC}ndIp_~rJ=37a zP~BXcZhwc+NxsD*0`V-_-T)c>?Cx69RD-Q13nHL^u+qMZx|JhcjBqWJ6i#2`jgre% zaO;YDx`-P&ry>T%Mmh1VCv*l~bbbB>T|b{9v8bqtog8LM`r}CK3U7H7AMkk{xiZ2g zhHvSVT5#L&D>-27oHX`XPtN#t+1+Dmd=V)^CxuTte?RF-c2f;{V>CUp+ld>DE4p}K zFVyyO6dNGGJ45cJd5qJCUXN=aqoEKNtO@E9tvTte7J@mxl3?ZiQ0=DQN4dsK7nQ<{ z2bwHI0NVoHYc852e()QK%bUtJVefigA?%IQq+HQt}mr zn0gZTwaa@6|DcceEbxvj+WmTKd&TpVaoD&=V!(#&f7seDvb@ac*+P*W-t5AUPY=ET zmm?OFdL!|FV%t~35}iXx+8>^;tDe&Zb7Qi>amx6~|VFSi= zOy7_ZP{aS@p4~*s^w$`sJE8K_9sHAHm{@pzI<=Vv&)|7w4f1otcMz;r?a%S~CuuB;86k`#NG?Rq(2KIm_{G29R_yh1k`i#;+SgkT|w~8N24ZWGyk4S`MuQJc(Yz=ciD^2;#^;d zMHN+;v2eXU6GUVhL)JlW>yX!k6;{V!uTNx`Q1)fjN0dxi1%s3LmOr;8ghzrhosK}| i4D_B;5vz;IG1 + + + + Heliothryx Localization Tool: Text Converter + + + + + + + +

Heliothryx Localization Tool: Text Converter

+ + + + +

This is procedural font. To minimize program size, only necessary characters are implemented:

+ +

+

    +
  • Numbers;
    • +
  • Latin characters from A to Z;
    • +
  • Cyrilic (Russian) characters which can't be replaced by matching Latin characters or numeric symbols;
    • +
  • Some punctuation.
    • +
+

+ +

Actually this is part of ASCII table starting from '0' (0x30).

+ +

Note that not all latin characters are in fact implemented, for example, 'S' can be successfully replaced by number 5, so other symbol are placed in place of 'S'. Some punctuation symbols are also replaced, for example, dot (.) in ASCII table have 0x2E code which is outside our range, so it is implemented in place of useless grave accent symbol (`).

+ +

To make process of writing string constants easier, this tool has been made. Write any text to first field, hit Enter and take string that you can use in your code. If you try to use unsupported characters, they will be replaced by dot and you will get warning.

+ + +
 
+ +
+ +
+
+ +
+ +
+ +Developed by: Roman Shuvalov + + + + diff --git a/programs/games/heliothryx/readme.utf8.txt b/programs/games/heliothryx/readme.utf8.txt index 9f5df1088e..0d37323abe 100644 --- a/programs/games/heliothryx/readme.utf8.txt +++ b/programs/games/heliothryx/readme.utf8.txt @@ -8,3 +8,9 @@ Heliothryx -- игра, разрабатываемая на конкурс. Heliothryx -- game that is developed for contest. Developer: Roman Shuvalov (http://board.kolibrios.org/memberlist.php?mode=viewprofile&u=6469) + +For Localization: + +Text strings are encoded in special format. +Please check out special tool (localization-tool/index.html). +There are instructions and text converter. diff --git a/programs/games/marblematch3/game/rs/rsmicrolibc.c b/programs/games/marblematch3/game/rs/rsmicrolibc.c index e5049201ce..e51613d0d7 100644 --- a/programs/games/marblematch3/game/rs/rsmicrolibc.c +++ b/programs/games/marblematch3/game/rs/rsmicrolibc.c @@ -170,5 +170,24 @@ void* memcpy(void *dst, const void *src, unsigned size) } +char* strchr(char* s, int c) { + while (*s) { + if (*s == (char) c) { + return s; + }; + s++; + }; + return NULL; + +}; + +unsigned int strlen ( char * str ) { + unsigned int len = 0; + while ( *str ) { + len++; + str++; + }; + return len; +}; diff --git a/programs/games/marblematch3/game/rs/rsmicrolibc.h b/programs/games/marblematch3/game/rs/rsmicrolibc.h index 110159ef37..9bb391ae84 100644 --- a/programs/games/marblematch3/game/rs/rsmicrolibc.h +++ b/programs/games/marblematch3/game/rs/rsmicrolibc.h @@ -50,4 +50,7 @@ void free(void* pointer); void* memset(void *mem, int c, unsigned size); void* memcpy(void *dst, const void *src, unsigned size); +char* strchr(char* s, int c); +unsigned int strlen ( char * str ); + #endif diff --git a/programs/games/marblematch3/game/rsgame.c b/programs/games/marblematch3/game/rsgame.c index 86a8b5ebc8..f3df882e57 100644 --- a/programs/games/marblematch3/game/rsgame.c +++ b/programs/games/marblematch3/game/rsgame.c @@ -242,7 +242,7 @@ void game_reg_init() { game.status = STATUS_LOADING; - game.window_scale = 1; +// game.window_scale = 1; // game.window_scale = 2; // #ifndef RS_KOS @@ -451,9 +451,8 @@ void GameInit() { }; // memset( game.field, 0, FIELD_LENGTH ); - game.scaled_framebuffer = malloc(GAME_WIDTH*game.window_scale * GAME_HEIGHT*game.window_scale * 3); - DEBUG10f("scaled framebuffer: %d (window_scale = %d) \n", game.window_scale * GAME_WIDTH * GAME_HEIGHT * 3, game.window_scale); - + game.bgr_framebuffer = malloc(GAME_WIDTH * GAME_HEIGHT * 3); + game_font_init(); game_textures_init_stage1(); @@ -574,12 +573,17 @@ void GameKeyDown(int key, int first) { if (game.status == STATUS_PLAYING) { - - if (key == RS_KEY_SPACE) { - - game.score = 101; - - + #ifndef RS_KOS + if (key == RS_KEY_SPACE) { + game.score = 101; + }; + #endif + + if (key == RS_KEY_ESCAPE) { + game.time = 0; + game.score = 0; + game.status = STATUS_MENU; + game.need_redraw = 1; }; }; @@ -624,6 +628,13 @@ void GameMouseDown(int x, int y) { game.ty = y; if (game.status == STATUS_MENU) { + + int i; + for (i = 0; i < FIELD_LENGTH; i++) { + game.field[i] = (unsigned char) (0.99 * fabs(rs_noise(i, seed*7 + 10)) * CRYSTALS_COUNT) | CRYSTAL_VISIBLE_BIT; + }; + + game.selected = 0; game.time = 0; game.score = 0; game.status = STATUS_PLAYING; diff --git a/programs/games/marblematch3/game/rsgame.h b/programs/games/marblematch3/game/rsgame.h index 625f4a2109..1e1121e072 100644 --- a/programs/games/marblematch3/game/rsgame.h +++ b/programs/games/marblematch3/game/rsgame.h @@ -139,7 +139,7 @@ void soundbuf_stop(rs_soundbuf_t *snd); typedef struct rs_game_t { rs_texture_t framebuffer; - unsigned char *scaled_framebuffer; // 24-bit BGRBGRBGR... for direct drawing + unsigned char *bgr_framebuffer; // 24-bit BGRBGRBGR... for direct drawing int loader_counter; @@ -167,7 +167,7 @@ typedef struct rs_game_t { int menu_index; int menu_item_index; - int window_scale; +// int window_scale; int process_timer; diff --git a/programs/games/marblematch3/game/rsgamedraw.c b/programs/games/marblematch3/game/rsgamedraw.c index 7d4194ae3b..0a19128da3 100644 --- a/programs/games/marblematch3/game/rsgamedraw.c +++ b/programs/games/marblematch3/game/rsgamedraw.c @@ -31,7 +31,8 @@ void game_draw() { if (game.menu_index == MENU_MAIN) { if (game.status == STATUS_LOADING) { - game_textout_at_center( 0, 240, 0, "L0ADING```" ); + game_textout_at_center( 0, 240, 0, L_LOADING ); + game_textout_at_center( -3, 240-2, 3, L_LOADING ); } else { @@ -39,25 +40,26 @@ void game_draw() { if (game.time) { - game_textout_at_center( 0, 230, 0, "LEVEL PA55ED" ); - game_textout_at_center( -3, 230-2, 3, "LEVEL PA55ED" ); + game_textout_at_center( 0, 230, 0, L_LEVEL_PASSED ); + game_textout_at_center( -3, 230-2, 3, L_LEVEL_PASSED ); - char s[] = "TIME: 000"; + char s[] = L_TIME; int time_sec = game.time / 25; - s[6] = '0' + (( time_sec / 100 ) % 10); - s[7] = '0' + (( time_sec / 10 ) % 10); - s[8] = '0' + (( time_sec / 1 ) % 10); + char *str_num = strchr(s, 'x'); + str_num[0] = '0' + (( time_sec / 100 ) % 10); + str_num[1] = '0' + (( time_sec / 10 ) % 10); + str_num[2] = '0' + (( time_sec / 1 ) % 10); game_textout_at_center( 0, 260, 0, s ); game_textout_at_center( -3, 260-2, 3, s ); }; - game_textout_at_center( 0, 300, 0, "CLICK T0 5TART" ); - game_textout_at_center( -3, 300-2, 3, "CLICK T0 5TART" ); + game_textout_at_center( 0, 300, 0, L_START ); + game_textout_at_center( -3, 300-2, 3, L_START ); }; - game_textout( 2, GAME_HEIGHT-10, 2, "DEVEL0PED BY R0MAN 5HUVAL0V"); + game_textout( 2, GAME_HEIGHT-10, 2, L_BOTTOM_LINE_DEVELOPER_INFO); }; } @@ -92,21 +94,23 @@ void game_draw() { }; - char str[] = "TIME: 999 "; + char str[] = L_TIME; int time_sec = game.time / 25; - str[6] = '0' + ( (time_sec / 100) % 10); - str[7] = '0' + ( (time_sec / 10) % 10); - str[8] = '0' + ( (time_sec / 1) % 10); + char *str_num = strchr(str, 'x'); + str_num[0] = '0' + ( (time_sec / 100) % 10); + str_num[1] = '0' + ( (time_sec / 10) % 10); + str_num[2] = '0' + ( (time_sec / 1) % 10); game_textout( 56+3, 32+2, 0, str ); // game_textout( 56-1, 32-1, 0, str ); game_textout( 56, 32, 3, str ); - char sstr[] = "5C0RE: 000 0F 100 "; - sstr[7] = '0' + ( (game.score / 100) % 10); - sstr[8] = '0' + ( (game.score / 10) % 10); - sstr[9] = '0' + ( (game.score / 1) % 10); + char sstr[] = L_SCORE; + str_num = strchr(sstr, 'x'); + str_num[0] = '0' + ( (game.score / 100) % 10); + str_num[1] = '0' + ( (game.score / 10) % 10); + str_num[2] = '0' + ( (game.score / 1) % 10); game_textout( 56+3, 64+2, 0, sstr ); game_textout( 56, 64, 3, sstr ); @@ -115,7 +119,7 @@ void game_draw() { // rskos_draw_area(0, 0, w, h, game.window_scale, game.framebuffer.data, NULL, RSKOS_BGRA); - rskos_draw_area(0, 0, w, h, game.window_scale, game.framebuffer.data, game.scaled_framebuffer, 0); + rskos_draw_area(0, 0, w, h, 1, game.framebuffer.data, game.bgr_framebuffer, 0); }; if (!continue_need_redraw) { @@ -218,9 +222,9 @@ void game_textures_init_stage1() { // float cr_g[CRYSTALS_COUNT] = { 0.1, 0.8, 0.5, 0.0, 0.7, 0.0, 0.8 }; // float cr_b[CRYSTALS_COUNT] = { 0.0, 0.1, 0.9, 0.8, 0.0, 0.5, 0.9 }; - float cr_r[CRYSTALS_COUNT] = { 1.0, 0.4, 0.1, 0.9, 0.9, 0.2, 0.8 }; - float cr_g[CRYSTALS_COUNT] = { 0.1, 1.0, 0.6, 0.1, 0.8, 0.2, 0.8 }; - float cr_b[CRYSTALS_COUNT] = { 0.0, 0.1, 1.0, 1.0, 0.0, 0.9, 0.9 }; + float cr_r[CRYSTALS_COUNT] = { 1.0, 0.4, 0.10, 0.9, 1.0, 0.2, 0.8 }; + float cr_g[CRYSTALS_COUNT] = { 0.1, 1.0, 0.75, 0.1, 0.9, 0.2, 0.8 }; + float cr_b[CRYSTALS_COUNT] = { 0.0, 0.1, 1.00, 1.0, 0.1, 0.9, 0.9 }; // rs_gen_init(5, CRYSTAL_SIZE); @@ -357,7 +361,7 @@ void game_textures_init_stage2() { }; void game_textures_free() { - free(game.scaled_framebuffer); + free(game.bgr_framebuffer); // texture_free(&game.tex_gui_line); diff --git a/programs/games/marblematch3/game/rsgamemenu.c b/programs/games/marblematch3/game/rsgamemenu.c index b06abbacee..825433159f 100644 --- a/programs/games/marblematch3/game/rsgamemenu.c +++ b/programs/games/marblematch3/game/rsgamemenu.c @@ -27,25 +27,25 @@ char window_scale_str[] = "c< 2X >"; char* menu_main_titles[] = { "a"L_START, - "1"L_SETTINGS, - "2"L_ABOUT, - "b"L_QUIT, +// "1"L_SETTINGS, +// "2"L_ABOUT, +// "b"L_QUIT, 0 }; char* menu_settings_titles[] = { - " "L_WINDOW_SCALE, - window_scale_str, - " ", - "0"L_DONE, +// " "L_WINDOW_SCALE, +// window_scale_str, +// " ", +// "0"L_DONE, 0 }; char* menu_about_titles[] = { - " "L_DEVELOPED_BY, - " "L_ROMAN_SHUVALOV, - " ", - "0"L_DONE, +// " "L_DEVELOPED_BY, +// " "L_ROMAN_SHUVALOV, +// " ", +// "0"L_DONE, 0 }; diff --git a/programs/games/marblematch3/game/strings.h b/programs/games/marblematch3/game/strings.h index 46fadea45f..d2f7f8f6ef 100644 --- a/programs/games/marblematch3/game/strings.h +++ b/programs/games/marblematch3/game/strings.h @@ -2,10 +2,8 @@ #define RS_STRINGS_H #ifndef RS_KOS - #include "strings_ru.h" + #include "strings_en.h" #else - - //#include "../lang.h" #ifdef LANG_RU // Russian diff --git a/programs/games/marblematch3/game/strings_en.h b/programs/games/marblematch3/game/strings_en.h index 86d1720332..0779d33168 100644 --- a/programs/games/marblematch3/game/strings_en.h +++ b/programs/games/marblematch3/game/strings_en.h @@ -6,25 +6,17 @@ // Be careful, only specific chars are available to use // See readme for details -// Main Menu -#define L_START "5TART" -#define L_SETTINGS "5ETTING5" -#define L_ABOUT "CREDITS" -#define L_QUIT "QUIT" +// Lower 'xxx' is used to detect number position, it will be replaced by numbers -// Settings menu -#define L_WINDOW_SCALE "WINDOW SCALE:" -#define L_DONE "DONE" +#define L_LOADING "L0ADING```" -// About menu -#define L_DEVELOPED_BY "DEVELOPED BY" -#define L_ROMAN_SHUVALOV "ROMAN SHUVALOV" +#define L_START "CLICK T0 5TART" + +#define L_TIME "TIME: xxx" +#define L_SCORE "5C0RE: xxx 0F 100" + +#define L_LEVEL_PASSED "LEVEL PA55ED" -// Main screen #define L_BOTTOM_LINE_DEVELOPER_INFO "DEVELOPER: ROMAN SHUVALOV` TOGLIATTI_ 2014" -// Gameplay -#define L_TECHDEMO_LINE1 "THIS IS TECHDEMO` " -#define L_TECHDEMO_LINE2 "USE ARROWS TO MOVE_ TO SHOOT_ TO EXIT` " - #endif diff --git a/programs/games/marblematch3/game/strings_ru.h b/programs/games/marblematch3/game/strings_ru.h index 601c15842c..688e9d0346 100644 --- a/programs/games/marblematch3/game/strings_ru.h +++ b/programs/games/marblematch3/game/strings_ru.h @@ -6,26 +6,17 @@ // Be careful, only specific chars are available to use // See readme for details -// Main Menu -#define L_START "CTAPT" -#define L_SETTINGS "HACTP0^Ki" -#define L_ABOUT "0b igPE" -#define L_QUIT "B\\X0d" +// Lower 'xxx' is used to detect number position, it will be replaced by numbers -// Settings menu -#define L_WINDOW_SCALE "MAChTAb 0KHA:" -#define L_DONE "g0T0B0" +#define L_LOADING "3AgPY3KA```" -// About menu -#define L_DEVELOPED_BY "PA3PAb0T4iK:" -#define L_ROMAN_SHUVALOV "P0MAH hYBAl0B" +#define L_START "HA4AT] igPY" + +#define L_TIME "BPEMa: xxx" +#define L_SCORE "04Ki: xxx i3 100" + +#define L_LEVEL_PASSED "YP0BEH] nP0^dEH" -// Main screen #define L_BOTTOM_LINE_DEVELOPER_INFO "PA3PAb0T4iK: P0MAH hYBAl0B` T0l]aTTi_ 2014" -// Gameplay -#define L_TECHDEMO_LINE1 "eT0 TEXH0dEMKA` " -#define L_TECHDEMO_LINE2 "CTPElKi = dBijEHiE_ = B\\CTPEl_ = B\\X0d` " - - #endif diff --git a/programs/games/marblematch3/readme.utf8.txt b/programs/games/marblematch3/readme.utf8.txt index 3fb3a9e326..dce2940db4 100644 --- a/programs/games/marblematch3/readme.utf8.txt +++ b/programs/games/marblematch3/readme.utf8.txt @@ -8,3 +8,6 @@ Marble Match 3 -- игра, разрабатываемая на конкурс. Marble Match 3 -- game that is developed for contest. Developer: Roman Shuvalov (http://board.kolibrios.org/memberlist.php?mode=viewprofile&u=6469) +If you want to translate this game, please use localization tool, +it is same as in my other game, Heliothryx, so please check out +localization readme for Heliothryx and use Heliothryx localization tool.