games/Awakening Changeset - 49453d20bb94

Changeset - 49453d20bb94

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Silverwing - 4 years ago 2020-05-07 18:30:07

fix: Restore old way of navigation. Impossible to properly implement new one because of inconsistencies

6 files changed with 0 insertions and 288 deletions:

atlantis_dyp.lua

atlantis_iyhehevjiarr.lua

journey_temple.lua

journey_venaedanotrr_labyrinth.lua

stealth.lua

utils.lua

0 comments (0 inline, 0 general)

atlantis_dyp.lua

➞

Show inline comments

@@ @@ -2113,51 +2113,6 @@ dyp_temple_blue_room = labyrinth { @@
         local y = s.map[s.position].y * 32 + 96;
         return "images/dyp_blueroom_bg.png;images/player.png@" .. y .. ',' .. x;
     end;
     ways_print = function(s, o)
         local n, e, sth, w;
         if s.map[s.position]['e1'] or s.map[s.position]['ex1'] then
             n = stead.xref(txtnb('N'), s.way[1]);
         else
             n = txtnb('N');
         end;
         if s.map[s.position]['e2'] or s.map[s.position]['ex2'] then
             e = stead.xref(txtnb('E'), s.way[2]);
         else
             e = txtnb('E');
         end;
         if s.map[s.position]['e3'] or s.map[s.position]['ex3'] then
             sth = stead.xref('S', s.way[3]);
         else
             sth = txtnb('S');
         end;
         if s.map[s.position]['e4'] or s.map[s.position]['ex4'] then
             w = stead.xref('W', s.way[4]);
         else
             w = txtnb('W');
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         return txttab('50%', 'center') .. n .. il
             .. txttab(left, 'center') .. w .. txttab(right, 'center') .. e .. il
             .. txttab('50%', 'center') .. sth .. '^';
     end;
     dir = {
         "На север";
         "На восток";
@@ @@ -2435,20 +2390,6 @@ dyp_crab_cave = labyrinth { @@
         "На юго-восток";
         "Выйти";
     };
     ways_print = function(s, o)
         local nw = stead.xref(txtnb('NW'), s.way[1]);
         local ne = stead.xref(txtnb('NE'), s.way[2]);
         local sw = stead.xref(txtnb('SW'), s.way[3]);
         local se = stead.xref(txtnb('SE'), s.way[4]);
         local ex5 = '';
         if s.map[s.position]['ex5'] then
              ex5 = stead.xref(txtnb(stead.dispof(s.way[5])), s.way[5]);
         end;
         return txttab('40%', 'center') .. nw .. txttab('60%', 'center') .. ne .. '^'..
         txttab('50%', 'center') .. ex5 .. '^' ..
         txttab('40%', 'center') .. sw .. txttab('60%', 'center') .. se ;
     end;
     underwater = true;
     map = {
         ["00"] = {

atlantis_iyhehevjiarr.lua

➞

Show inline comments

@@ @@ -598,63 +598,6 @@ iyh_labyrinth = labyrinth { @@
     dsc = function(s)
         return [[Вы находитесь где-то в переплетении узких ущелий. Вверху скалы сужаются почти вплотную, не давая вам возможности подняться над ущельем и осмотреться. ]];
     end;
     ways_print = function(s, o)
         local nw, n, ne, w, e, sw, sth, se;
         if (s.map[s.position]['e1'] or s.map[s.position]['ex1']) then
             n = stead.xref('N', s.way[1]);
         else
             n = 'N';
         end;
         if (s.map[s.position]['e2'] or s.map[s.position]['ex2']) then
             ne = stead.xref('NE', s.way[2]);
         else
             ne = 'NE';
         end;
         if (s.map[s.position]['e3'] or s.map[s.position]['ex3']) then
             e = stead.xref('E', s.way[3]);
         else
             e = 'E';
         end;
         if (s.map[s.position]['e4'] or s.map[s.position]['ex4']) then
             se = stead.xref('SE', s.way[4]);
         else
             se = 'SE';
         end;
         if (s.map[s.position]['e5'] or s.map[s.position]['ex5']) then
             sth = stead.xref('S', s.way[5]);
         else
             sth = 'S';
         end;
         if (s.map[s.position]['e6'] or s.map[s.position]['ex6']) then
             sw = stead.xref('SW', s.way[6]);
         else
             sw = 'SW';
         end;
         if (s.map[s.position]['e7'] or s.map[s.position]['ex7']) then
             w = stead.xref('W', s.way[7]);
         else
             w = 'W';
         end;
         if (s.map[s.position]['e8'] or s.map[s.position]['ex8']) then
             nw = stead.xref('NW', s.way[8]);
         else
             nw = 'NW';
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         return txttab(left, 'center') .. nw .. txttab('50%', 'center') .. n .. txttab(right, 'center') .. ne .. il
             .. txttab(left, 'center') .. w .. txttab(right, 'center') .. e .. il
             .. txttab(left, 'center') .. sw .. txttab('50%', 'center') .. sth .. txttab(right, 'center') .. se;
     end;
     map = {
         ["1"] = {
             e8 = "2";

journey_temple.lua

➞

Show inline comments

@@ @@ -266,64 +266,6 @@ dt_labyrinth = room { @@
     entered = function(s)
         s:update();
     end;
     ways_print = function(self, o)
         local nw, n, ne, w, e, sw, s, se;
         if (dt_labyrinth_map[dt_labyrinth.location].n) then
             n = stead.xref('N', dt_north);
         else
             n = 'N';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].ne) then
             ne = stead.xref('NE', dt_north_east);
         else
             ne = 'NE';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].e) then
             e = stead.xref('E', dt_east);
         else
             e = 'E';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].se) then
             se = stead.xref('SE', dt_south_east);
         else
             se = 'SE';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].s) then
             s = stead.xref('S', dt_south);
         else
             s = 'S';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].sw) then
             sw = stead.xref('SW', dt_south_west);
         else
             sw = 'SW';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].w) then
             w = stead.xref('W', dt_west);
         else
             w = 'W';
         end;
         if (dt_labyrinth_map[dt_labyrinth.location].nw) then
             nw = stead.xref('NW', dt_north_west);
         else
             nw = 'NW';
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         return txttab(left, 'center') .. nw .. txttab('50%', 'center') .. n .. txttab(right, 'center') .. ne .. il
             .. txttab(left, 'center') .. w .. txttab(right, 'center') .. e .. il
             .. txttab(left, 'center') .. sw .. txttab('50%', 'center') .. s .. txttab(right, 'center') .. se .. '^'
             .. stead.xref(txtnb('В другое место'), dt_elsewhere) .. ' | '.. stead.xref(txtnb('Отойти от штурвала'), self.way[1]);
     end;
     update = function(s)
         move(submarine_leviathan, dt_labyrinth_map[dt_labyrinth.location].where);
     end;

journey_venaedanotrr_labyrinth.lua

➞

Show inline comments

@@ @@ -176,53 +176,6 @@ ven_temple_labyrinth_l1 = labyrinth { @@
         "На юг";
         "На запад";
     };
     ways_print = function(s, o)
         local n, e, sth, w;
         if s.map[s.position]['e1'] or s.map[s.position]['ex1'] then
             n = stead.xref(txtnb('N'), s.way[1]);
         else
             n = txtnb('N');
         end;
         if s.map[s.position]['e2'] or s.map[s.position]['ex2'] then
             e = stead.xref(txtnb('E'), s.way[2]);
         else
             e = txtnb('E');
         end;
         if s.map[s.position]['e3'] or s.map[s.position]['ex3'] then
             sth = stead.xref('S', s.way[3]);
         else
             sth = txtnb('S');
         end;
         if s.map[s.position]['e4'] or s.map[s.position]['ex4'] then
             w = stead.xref('W', s.way[4]);
         else
             w = txtnb('W');
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         local left = '35%';
         local right = '65%';
         local il = '^^';
         if theme.name() == '.mobile' then
             print('x');
             il = '^';
             left = '25%';
             right = '75%';
         end;
         return txttab('50%', 'center') .. n .. il
             .. txttab(left, 'center') .. w .. txttab(right, 'center') .. e .. il
             .. txttab('50%', 'center') .. sth .. '^' .. stead.xref(txtnb('Ждать'), s.way[5]);
     end;
     nam = "Венаэданотр, храм, лабиринт";
     dsc = function(s)
         if (s.map[s.position].name) then

stealth.lua

➞

Show inline comments

@@ @@ -219,63 +219,6 @@ stealthroom = function(tab) @@
         end);
     };
     tab.ways_print = function(s, o)
         local n, e, sth, w;
         if isDisabled(s.way[1]) then
             n = 'N';
         else
             n = stead.xref('N', s.way[1]);
         end;
         if isDisabled(s.way[2]) then
             sth = 'S';
         else
             sth = stead.xref('S', s.way[2]);
         end;
         if isDisabled(s.way[3]) then
             w = 'W';
         else
             w = stead.xref('W', s.way[3]);
         end;
         if isDisabled(s.way[3]) then
             e = 'E';
         else
             e = stead.xref('E', s.way[4]);
         end;
         local left = '45%';
         local right = '55%';
         local il = '^';
         if theme.name() == '.mobile' then
             print('x');
             left = '40%';
             right = '60%';
         end;
         local wait;
         if isDisabled(s.way[5]) then
             wait = txtnb(stead.dispof(s.way[5]));
         else
             wait = stead.xref(txtnb(stead.dispof(s.way[5])), s.way[5]);
         end;
         local hide;
         if isDisabled(s.way[6]) then
             hide = txtnb(stead.dispof(s.way[6]));
         else
             hide = stead.xref(txtnb(stead.dispof(s.way[6])), s.way[6]);
         end;
         local unhide;
         if isDisabled(s.way[7]) then
             unhide = txtnb(stead.dispof(s.way[7]));
         else
             unhide = stead.xref(txtnb(stead.dispof(s.way[7])), s.way[7]);
         end;
         return txttab('50%', 'center') .. n .. il
             .. txttab(left, 'center') .. w .. txttab(right, 'center') .. e .. il
             .. txttab('50%', 'center') .. sth .. '^' .. wait .. ' | '.. hide .. ' | '.. unhide;
     end;
     rm = room(tab);
     return rm;

utils.lua

➞

Show inline comments

@@ @@ -979,16 +979,6 @@ suit = function(tab) @@
 	return obj(tab);
 end;
 old_player_ways = stead.player_ways;
 stead.player_ways = function(s)
     if type(here().ways_print) == 'function' then
         return here().ways_print(here(), s);
     else
         return old_player_ways(s);
     end;
 end;
 labyrinth = function(tab)
     local enter = tab.enter;
     local exit = tab.exit;

0 comments (0 inline, 0 general)