games/Awakening Changeset - 9715b7dd6763

Changeset - 9715b7dd6763

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Silverwing - 8 years ago 2017-01-28 07:51:14

Characters won't follow you into cutscene

2 files changed with 17 insertions and 50 deletions:

party.lua

utils.lua

0 comments (0 inline, 0 general)

party.lua

➞

Show inline comments

@@ @@ -8,12 +8,23 @@ party_accompany = function(s, value) @@
 	else
 		move(s, s.home, where(s));
 		lifeoff(s);
 	end;
 end;
 party_follow = function(s)
     if (where(pl).cutscene) then
     elseif (where(pl).leviathan) then
         if (stead.nameof(where(s)) ~= s.home) then
             move(s, s.home, where(s));
         end;
     else
         move(s, where(pl), where(s));
     end;
 end;
 -- TODO больше отвлеченных диалогов, дабы было о чем поговорить с сопартийцами. Не стоит делать их деревянными безжизненными манекенами
 char_learr = obj {
 	var {
 		follow = false;
 	};
 	nam = "learr";
@@ @@ -28,22 +39,13 @@ char_learr = obj { @@
 				{Леарр} ждет ваших указаний. ^
 			]];
 		end;
 	end;
 	home = "leviathan_wardroom";
 	accompany = party_accompany;
 	life = function(s)
 		print("learr");
 		if (where(pl).leviathan) then
 			if (stead.nameof(where(s)) ~= s.home) then
 				move(s, s.home, where(s));
 			end;
 		else
 			move(s, where(pl), where(s));
 		end;
 	end;
 	life = party_follow;
 	act = function(s)
 		if (stead.nameof(where(s)) == s.home) then
 			walkin(learr_home_dlg);
 		else
 			walkin(learr_dlg);
 		end;
@@ @@ -66,21 +68,13 @@ char_phaetlarr = obj { @@
 				{Фаэтларр} ждет ваших указаний. ^
 			]];
 		end;
 	end;
 	home = "leviathan_engines";
 	accompany = party_accompany;
 	life = function(s)
 		if (where(pl).leviathan) then
 			if (stead.nameof(where(s)) ~= s.home) then
 				move(s, s.home, where(s));
 			end;
 		else
 			move(s, where(pl), where(s));
 		end;
 	end;
 	life = party_follow;
 	act = function(s)
 		if (stead.nameof(where(s)) == s.home) then
 			walkin(phaetlarr_home_dlg);
 		else
 			walkin(phaetlarr_dlg);
 		end;
@@ @@ -103,21 +97,13 @@ char_radcliffe = obj { @@
 				{Уолтер Рэдклифф} ждет ваших указаний. ^
 			]];
 		end;
 	end;
 	home = "leviathan_engines";
 	accompany = party_accompany;
 	life = function(s)
 		if (where(pl).leviathan) then
 			if (stead.nameof(where(s)) ~= s.home) then
 				move(s, s.home, where(s));
 			end;
 		else
 			move(s, where(pl), where(s));
 		end;
 	end;
 	life = party_follow;
 	act = function(s)
 		if (stead.nameof(where(s)) == s.home) then
 			walkin(radcliffe_home_dlg);
 		else
 			walkin(radcliffe_dlg);
 		end;
@@ @@ -140,25 +126,13 @@ char_wright = obj { @@
 				{Джек Райт} ждет ваших указаний. ^
 			]];
 		end;
 	end;
 	home = "leviathan_wardroom";
 	accompany = party_accompany;
 	life = function(s)
 		--print("wright");
 		if (where(pl).leviathan) then
 			--print("wright:leviathan");
 			if (stead.nameof(where(s)) ~= s.home) then
 				--print("wright:goinghome");
 				move(s, s.home, where(s));
 			end;
 		else
 			--print("wright:following");
 			move(s, where(pl), where(s));
 		end;
 	end;
 	life = party_follow;
 	act = function(s)
 		if (stead.nameof(where(s)) == s.home) then
 			walkin(wright_home_dlg);
 		else
 			walkin(wright_dlg);
 		end;
@@ @@ -181,21 +155,13 @@ char_anna = obj { @@
 				{Анна Рэдклифф} ждет ваших указаний. ^
 			]];
 		end;
 	end;
 	home = "leviathan_wardroom";
 	accompany = party_accompany;
 	life = function(s)
 		if (where(pl).leviathan) then
 			if (stead.nameof(where(s)) ~= s.home) then
 				move(s, s.home, where(s));
 			end;
 		else
 			move(s, where(pl), where(s));
 		end;
 	end;
 	life = party_follow;
 	act = function(s)
 		if (stead.nameof(where(s)) == s.home) then
 			walkin(anna_home_dlg);
 		else
 			walkin(anna_dlg);
 		end;

utils.lua

➞

Show inline comments

@@ @@ -280,12 +280,13 @@ end; @@
 function cutscene(nam, disp, dsc, nxt, entered)
     return room {
         nam = nam;
         disp = disp;
         entered = entered;
         hideinv = true;
         cutscene = true;
         dsc = dsc;
         obj = {
             vway("continue", "{Продолжить}", nxt);
         };
     };
 end;

0 comments (0 inline, 0 general)