diff --git a/programs/games/rstearth/i_data.inc b/programs/games/rstearth/i_data.inc index ab00f740f3..cfd1291605 100644 --- a/programs/games/rstearth/i_data.inc +++ b/programs/games/rstearth/i_data.inc @@ -279,6 +279,15 @@ menu_credits_text_pointers: dd menu_credits_text.4 dd menu_credits_text.5 dd menu_credits_text.6 + dd menu_credits_text.7 + dd menu_credits_text.8 + dd menu_credits_text.9 + dd menu_credits_text.10 + dd menu_credits_text.11 + dd menu_credits_text.12 + dd menu_credits_text.13 + dd menu_credits_text.14 + dd menu_credits_text.15 dd 0 ;--------------------------------------------------------------------- align 4 @@ -300,5 +309,14 @@ align 4 map_level_pointer: dd map_level_0 dd map_level_1 + dd map_level_2 + dd map_level_3 + dd map_level_4 + dd map_level_5 + dd map_level_6 + dd map_level_7 + dd map_level_8 + dd map_level_9 + dd map_level_10 dd 0 ;--------------------------------------------------------------------- diff --git a/programs/games/rstearth/levels.inc b/programs/games/rstearth/levels.inc index 8ffc13b3d9..38e82941bf 100644 --- a/programs/games/rstearth/levels.inc +++ b/programs/games/rstearth/levels.inc @@ -33,7 +33,7 @@ map_level_game_stage: dd 000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h ;--------------------------------------------------------------------- align 4 -map_level_1: +map_level_10: dd 030100h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h dd 000000h,001001h,001001h,000001h,000001h,000001h,001001h,001001h,001001h,000000h dd 010200h,001001h,000002h,000002h,000000h,000000h,000000h,000000h,001001h,000000h @@ -46,7 +46,7 @@ map_level_1: dd 030300h,000000h,000000h,000000h,000000h,020400h,000000h,000000h,000003h,000003h ;--------------------------------------------------------------------- align 4 -map_level_0: +map_level_1: dd 000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h dd 000001h,001001h,001001h,000001h,000001h,000001h,000001h,001101h,001101h,000001h dd 000001h,001001h,000001h,000001h,000001h,000001h,000001h,000001h,001101h,000001h @@ -57,4 +57,112 @@ map_level_0: dd 000001h,001101h,000001h,000001h,000001h,000001h,000001h,000001h,001001h,000001h dd 000001h,001101h,001101h,000001h,000001h,000001h,000001h,001001h,001001h,000001h dd 000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h -;--------------------------------------------------------------------- \ No newline at end of file +;--------------------------------------------------------------------- +map_level_0: + dd 000000h,000001h,000001h,000001h,001101h,001101h,000001h,000001h,000001h,000000h + dd 000000h,000001h,000001h,001101h,000001h,000001h,001101h,000001h,000001h,000000h + dd 000000h,000001h,001101h,000001h,000001h,000001h,000001h,001101h,000001h,000000h + dd 000000h,001101h,001001h,000001h,000001h,000001h,000001h,001001h,001101h,000000h + dd 000000h,010201h,001001h,000001h,000f01h,000001h,000001h,001001h,000001h,000000h + dd 000000h,000001h,001001h,000001h,000001h,000001h,000001h,001001h,000001h,000000h + dd 000000h,000001h,001001h,000001h,000001h,000001h,000001h,001001h,000001h,000000h + dd 000000h,000001h,001001h,001101h,001101h,001101h,001101h,001001h,000001h,000000h + dd 000000h,000001h,001001h,000001h,000001h,000001h,000001h,001001h,000001h,000000h + dd 000000h,000000h,001000h,000000h,000000h,000000h,000000h,001000h,000000h,020100h +;--------------------------------------------------------------------- +map_level_2: + dd 000004h,000004h,001104h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,001104h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,001104h,000004h,000004h,000004h,000004h,001104h,001104h,001104h + dd 000004h,000004h,001104h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000f04h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,000004h,000004h,001104h,000004h,000004h + dd 001104h,001104h,001104h,000004h,001004h,000004h,000004h,001104h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,001004h,000004h,001104h,000004h,000004h + dd 030304h,000004h,000004h,000004h,000004h,000004h,000004h,001104h,020304h,000004h +;--------------------------------------------------------------------- +map_level_3: + dd 000004h,040304h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,001104h,000004h,000004h,000004h,001104h,000004h,000004h,000004h,000004h + dd 000004h,001004h,000004h,000004h,000004h,001004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,001104h,000004h,000f04h,000004h,001104h,000004h,001104h,000004h + dd 000004h,000004h,001004h,000004h,001004h,000004h,001004h,000004h,001004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,000004h,000004h,001104h,000004h,000004h,000004h,001104h,000004h,000004h + dd 000004h,000004h,000004h,001004h,000004h,000004h,000004h,001004h,000004h,000004h + dd 000004h,000004h,000004h,000004h,000004h,010104h,000004h,000004h,000004h,000004h +;--------------------------------------------------------------------- +map_level_4: + dd 000005h,000005h,000005h,000005h,000005h,000005h,000005h,030105h,000005h,000005h + dd 000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h + dd 000005h,001105h,000005h,001005h,000005h,001105h,000005h,001005h,000005h,000005h + dd 000005h,001005h,000005h,001105h,000005h,001005h,000005h,001105h,000005h,000005h + dd 000005h,001005h,000005h,001005h,000f05h,001005h,000005h,001005h,000005h,000005h + dd 000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h + dd 000005h,000005h,001005h,000005h,001105h,000005h,001105h,000005h,001005h,000005h + dd 000005h,000005h,001005h,000005h,001005h,000005h,001005h,000005h,001005h,000005h + dd 000005h,000005h,001105h,000005h,001005h,000005h,001105h,000005h,001005h,000005h + dd 000005h,000005h,000005h,010205h,000005h,000005h,000005h,000005h,000005h,000005h +;--------------------------------------------------------------------- +map_level_5: + dd 000000h,000000h,000000h,020300h,000000h,000000h,000000h,000000h,000000h,000000h + dd 000000h,000002h,001100h,000000h,000000h,000002h,001100h,000000h,001100h,000000h + dd 000000h,000002h,000000h,000000h,000000h,000002h,000003h,000000h,000000h,000000h + dd 000000h,000000h,000000h,000000h,000000h,000000h,000003h,000000h,000000h,000000h + dd 000000h,000000h,001100h,000000h,000f00h,000000h,000003h,000000h,000000h,000000h + dd 040100h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,001100h,000000h + dd 000000h,001100h,000000h,000000h,000000h,000000h,000000h,000000h,000003h,000000h + dd 000000h,000003h,000000h,000002h,001100h,000000h,001100h,000000h,000003h,000000h + dd 000000h,000003h,000000h,000002h,000000h,000000h,000000h,000000h,000003h,000000h + dd 000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,030400h +;--------------------------------------------------------------------- +map_level_6: + dd 000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,030401h + dd 000001h,000003h,000003h,000003h,000001h,000001h,000003h,000003h,000001h,000001h + dd 000001h,000001h,001101h,000001h,000001h,001101h,000001h,001101h,000001h,000001h + dd 040401h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h + dd 000001h,000001h,000003h,000003h,000f01h,000001h,000003h,000003h,000001h,001101h + dd 000001h,000001h,000001h,000001h,001101h,000001h,000001h,000001h,000001h,000001h + dd 000001h,001101h,001101h,000001h,000001h,001101h,000001h,000001h,001001h,000001h + dd 000001h,001001h,001001h,000001h,000003h,000003h,000003h,000001h,001101h,000001h + dd 000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h,000001h + dd 000001h,000001h,000001h,000001h,000001h,040401h,000001h,000001h,000001h,000001h +;--------------------------------------------------------------------- +map_level_7: + dd 000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h + dd 000004h,001104h,000004h,001104h,000004h,000004h,001104h,000004h,000004h,000004h + dd 000004h,000002h,040104h,000004h,000004h,000002h,000002h,001104h,000004h,000004h + dd 000004h,000002h,000004h,001104h,000004h,000004h,000002h,000004h,000004h,000004h + dd 000004h,000002h,000004h,000004h,000f04h,000004h,000002h,000004h,001104h,000004h + dd 000004h,000004h,000002h,000004h,000004h,000004h,000004h,000004h,001104h,000004h + dd 000004h,001104h,000002h,000002h,000004h,000004h,000004h,000004h,030204h,000004h + dd 000004h,000004h,000004h,001104h,000004h,000004h,001104h,000004h,000002h,000004h + dd 000004h,000004h,000004h,000004h,000004h,000002h,000002h,000002h,000004h,000004h + dd 040304h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h,000004h +;--------------------------------------------------------------------- +map_level_8: + dd 040400h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h,000000h + dd 000000h,000003h,000003h,000000h,000000h,001100h,001100h,000000h,001100h,000000h + dd 000000h,000003h,000003h,000000h,000000h,000000h,000000h,000000h,000003h,000000h + dd 000000h,001100h,000000h,000000h,000000h,000000h,000000h,000003h,000003h,000000h + dd 000000h,001000h,000000h,000003h,000f00h,000000h,001100h,000003h,000000h,000000h + dd 000000h,001100h,000000h,000003h,000003h,000000h,000000h,000000h,000000h,030200h + dd 000000h,000000h,000000h,001100h,000000h,000000h,000000h,000000h,000000h,000000h + dd 000000h,000000h,001000h,001100h,000000h,000000h,000003h,000000h,001100h,000000h + dd 000000h,000000h,001100h,000000h,000000h,000000h,000003h,000003h,001000h,000000h + dd 000000h,000000h,000000h,000000h,000000h,010100h,000000h,000000h,000000h,000000h +;--------------------------------------------------------------------- +map_level_9: + dd 040205h,000005h,000005h,000005h,001105h,000005h,000005h,000005h,001105h,000005h + dd 000005h,001105h,000005h,000005h,000005h,000005h,000005h,000005h,000005h,000005h + dd 000005h,000002h,000005h,000002h,000005h,000002h,000005h,000002h,000005h,000005h + dd 000005h,000005h,000005h,000005h,001105h,000005h,000005h,000005h,001105h,000005h + dd 000005h,000005h,000002h,000005h,000f05h,000005h,000002h,000005h,000002h,000005h + dd 000005h,001105h,000005h,000005h,000005h,000005h,000005h,030305h,000005h,000005h + dd 000005h,000002h,000005h,000002h,000005h,000002h,000005h,000002h,000005h,000005h + dd 000005h,000005h,000005h,001105h,000005h,000005h,000005h,001105h,001105h,000005h + dd 000005h,000005h,000005h,000005h,001105h,000005h,000005h,000005h,000005h,000005h + dd 000005h,000005h,010105h,000005h,000005h,000005h,000005h,000005h,000005h,000005h +;--------------------------------------------------------------------- diff --git a/programs/games/rstearth/localization_eng.inc b/programs/games/rstearth/localization_eng.inc index c3b2a7404c..e6974df508 100644 --- a/programs/games/rstearth/localization_eng.inc +++ b/programs/games/rstearth/localization_eng.inc @@ -1,6 +1,6 @@ ;--------------------------------------------------------------------- title: - db 'Rusty Earth (Prototype 1.9) 30.12.2014',0 + db 'Rusty Earth 31.12.2014',0 ;--------------------------------------------------------------------- menu_game_label: db 'GAME',0 @@ -44,11 +44,20 @@ protagonist_death_text: ;--------------------------------------------------------------------- menu_credits_text: .1: db 'Hello KolibriOS Team!',0 -.2: db 'The game used graphics and sound material',0 -.3: db 'under a free license, borrowed from:',0 -.4: db 'http://untamed.wild-refuge.net/',0 -.5: db 'http://opengameart.org',0 -.6: db 'https://wiki.themanaworld.org',0 +.2: db ' Hello Habrahabr!',0 +.3: db 0 +.4: db 'The game used graphics and sound material',0 +.5: db 'under a free license, borrowed from:',0 +.6: db ' http://opengameart.org',0 +.7: db 0 +.8: db 'NPC sprites by',0 +.9: db ' http://untamed.wild-refuge.net',0 +.10: db 0 +.11: db 'Hatsune Miku Sprites by',0 +.12: db ' http://nekorandomnessqueen.deviantart.com',0 +.13: db 0 +.14: db 'Glyphs of Russo free font by',0 +.15: db ' http://www.jovanny.ru',0 ;--------------------------------------------------------------------- menu_help_text: .1: db 'Game control',0 diff --git a/programs/games/rstearth/localization_rus.inc b/programs/games/rstearth/localization_rus.inc index e8baf5289d..ecd43d696a 100644 --- a/programs/games/rstearth/localization_rus.inc +++ b/programs/games/rstearth/localization_rus.inc @@ -2,7 +2,7 @@ ; Code page - Cyrillic OEM866 ;--------------------------------------------------------------------- title: - db 'Ржавая Земля (Прототип 1.9) 30.12.2014',0 + db 'Ржавая Земля 31.12.2014',0 ;--------------------------------------------------------------------- menu_game_label: db 'ИГРА',0 @@ -45,12 +45,21 @@ protagonist_death_text: db 'ЭТО БЫЛ КОНЕЦ',0 ;--------------------------------------------------------------------- menu_credits_text: -.1: db 'Привет участникам команды KolibriOS Team!',0 -.2: db 'Графические и звуковые материалы под',0 -.3: db 'свободными лицензиями, взяты с сайтов:',0 -.4: db 'http://untamed.wild-refuge.net/',0 -.5: db 'http://opengameart.org',0 -.6: db 'https://wiki.themanaworld.org',0 +.1: db 'Привет KolibriOS Team!',0 +.2: db ' Привет Хабрахабр!',0 +.3: db 0 +.4: db 'Графические и звуковые материалы под',0 +.5: db 'свободными лицензиями, взяты с сайта',0 +.6: db ' http://opengameart.org',0 +.7: db 0 +.8: db 'Спрайты NPC взяты с сайта',0 +.9: db ' http://untamed.wild-refuge.net',0 +.10: db 0 +.11: db 'Cпрайты Мику Хацунэ от',0 +.12: db ' http://nekorandomnessqueen.deviantart.com',0 +.13: db 0 +.14: db 'Глифы свободного шрифта Russo от',0 +.15: db ' http://www.jovanny.ru',0 ;--------------------------------------------------------------------- menu_help_text: .1: db 'Управление игрой',0 diff --git a/programs/games/rstearth/resources/base_8bpp.png b/programs/games/rstearth/resources/base_8bpp.png index d6306dcd9e..703184ce79 100644 Binary files a/programs/games/rstearth/resources/base_8bpp.png and b/programs/games/rstearth/resources/base_8bpp.png differ diff --git a/programs/games/rstearth/rstearth.asm b/programs/games/rstearth/rstearth.asm index 2876b86b54..3931f3679b 100644 --- a/programs/games/rstearth/rstearth.asm +++ b/programs/games/rstearth/rstearth.asm @@ -76,6 +76,8 @@ BASE_SMALL_ROCK = 0 BASE_GRASS = 1 BASE_LAVA = 2 BASE_WATER = 3 +BASE_SAND = 4 +BASE_SNOW = 5 ;----------------------------------------------------------------------------- TARGET_RANGE = 3 ;-----------------------------------------------------------------------------