# HG changeset patch # User Silverwing # Date 2017-09-17 09:09:31 # Node ID 92951c9baca4f2138bf1699b71074ba5a8582724 # Parent 6f114094d2c129a785a6a5def84cd777c48b2de2 warehouse32: tablet diff --git a/images/wh32_plan.png b/images/wh32_plan.png new file mode 100644 index 0000000000000000000000000000000000000000..3b36348271fbb32e890dc8df7ba4cc109ab07b41 GIT binary patch literal 2367 zc$}412{7B+9{x*%h+0}jEp75HdeMqnuDwFFTD8^|MO3S3>`H=5ELGgzT5ex&Yp1$U zRHCg!tVz@Ms+Oy@G_D{*ODhP12*FD`^XAT*H}g90oH@&Uzxig)`Of@)-?{GQa!LlO z3IzZ_#^Lk{cK{Hx5$#_?Bt&yD*sNZ(NL+M0bpqJ=+V6JM+!7&DF{jVP0f4l^*C7U! zl2gw z%8*qC07#9)30u#^k@>OrvG>gYiNML&J(fB&ek%55o#{aV*g-};lC!3QQN_DFl_%g85*Vot0Y+Xp6$F|^#9NmN9{-9dJ3WMv%C*FVKU_hEg4uF@+vy{T0let}1SXwsm9D|c!QEr{;UXWLa z9YY3Gv^}mDj$-HPiA2k?umc_e9BzNg$c$%^Zu|UsYDWhigLCg>Fc_Ci^%W)9JM%VY zm@>JA{PM%ng)@j7nU+`r;qYizMRPcex3Mvj%BZ%?Z%EAOqn&_j6gHh7?lIZKdx0z4|M9E-GnM%g;@__j|tHeRS6cB^wwQR zWlO6N(ZZstE0cG-b&UL3gs0heuw&7W%KUKrmMH6B@jzDFgK|LI01~&1@dWadPKi@a zazmV~gV8efw_p@WkL7Ohvl+d6)6)U4d^(`^gun0ILynO*Av;$IUeAyi!uUMaplbJ?`X`miRy7lm({b>s!Bb zFNowSAVZwTo={3*3H;5gmoF#zZx4IyUE)&OJF$bHOREi?EeivT)mDa*z3$v5IoOGB z6zX16W{8j?lCU>Pz&TBM^4cE;D^IFgW_whOm(2e}+M{KqtFu|h4#Wr9{V=3AXIX&5 zyj#6JkU+roB#jOxQ3=8Pu$5Kd!opD1BgN3fEXB_{=YzY zro&ArdF7*-<6!fkNdv~Or~qRiEsIoGOq?%vMKfAyG@O*pH)?v`QK)}oi@l1+kHbVX zV=wk`q@R5HZuP{t>{-&R-@SZNZaDi5UM(2j#o$dR^yVa!CY zN*$vv`ntsjvL4+_dH?q{_;H z7o^vq&{wB0b)G8L?kO|MBt0uG zcd2nr^T=-rDVr*2B{<*s0>sd&qp9m}iS^nw2mN7`r?sr{&*I+UA^6kczPxY_EQ1Mm=ky-|{2B+?tRziJF zS|>i4m@0f!QBm=9V>DJ_-(7If@|SoEue2>;ahmy&D#_o+wGMLlGr;+Plp5t>rvw49 z5?Nmdm9z~As51e@wY~uON-17m_-m{gK!^m_*VQ$NXON^aiL0!54`#>Q&%=U diff --git a/main.lua b/main.lua --- a/main.lua +++ b/main.lua @@ -195,7 +195,8 @@ function init() end; ---game init pl.where = intro; - ---debug + ---debug + pl.where = w32_backdoor; --language_known = true; --pl.where = "leviathan_airlock"; --move(submarine_leviathan, "iyh_rear_entrance_foot"); diff --git a/utils.lua b/utils.lua --- a/utils.lua +++ b/utils.lua @@ -282,7 +282,7 @@ function game_over(nam, dsc) }; end; -function cutscene(nam, disp, dsc, nxt, entered) +function cutscene(nam, disp, dsc, nxt, entered, pic) return room { nam = nam; not_follow = true; @@ -291,6 +291,7 @@ function cutscene(nam, disp, dsc, nxt, e hideinv = true; cutscene = true; dsc = dsc; + pic = pic; obj = { vway("continue", "{Продолжить}", nxt); }; diff --git a/warehouse32.lua b/warehouse32.lua --- a/warehouse32.lua +++ b/warehouse32.lua @@ -128,6 +128,16 @@ wright_travel_dlg = dlg { }; }; +w32_tablet = cutscene("w32_tablet", "Склад 32, задняя дверь", "Табличка со схемой склада висит рядом с дверью. ", "w32_backdoor", null, "images/wh32_plan.png"); + +w32_tablet_obj = obj { + nam = "w32_tablet_obj"; + dsc = "Рядом с дверью висит {табличка}. "; + act = function(s) + walk(w32_tablet); + end; +}; + w32_backdoor = room { nam = "w32_backdoor"; disp = "Склад 32, задняя дверь"; @@ -146,6 +156,9 @@ w32_backdoor = room { end); kh_vroom("Через забор", "warehouse_32_behind_night"); }; + obj = { + "w32_tablet_obj"; + }; }; w32_mgr = darkroom { @@ -182,7 +195,7 @@ w32_mgr = darkroom { obj = { 'w32_mgr_table', 'w32_mgr_bookcase', - 'money_w32' + 'money_wh32' }; };