Advertisement
Guest User

Untitled

a guest
Aug 12th, 2017
68
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 28.20 KB | None | 0 0
  1. diff --git a/dialogs/Bender.dialog b/dialogs/Bender.dialog
  2. index 053bbbc..a68fda2 100644
  3. --- a/dialogs/Bender.dialog
  4. +++ b/dialogs/Bender.dialog
  5. @@ -24,18 +24,16 @@ freedroid-discussion@lists.sourceforge.net
  6.  
  7.  Beginning of new chat dialog for character="XXXXX"
  8.  
  9. -EveryTime LuaCode={
  10. -   if (not has_met("Bender")) then
  11. -       show(0)
  12. -   end
  13. +FirstTime LuaCode={ show(0) }
  14.  
  15. -   if (has_quest(_"Bender's problem")) then
  16. -       if (not done_quest(_"Bender's problem")) then
  17. +EveryTime LuaCode={
  18. +   if (has_quest(_"Bender's problem")) then
  19. +       if (not done_quest(_"Bender's problem")) then
  20.             hide(1, 2, 3, 4, 6, 7, 8)
  21.             if (has_item_backpack("Brain Enlargement Pills Antidote") > 0) then
  22.                 hide(5, 10, 11, 12, 50) show(9)
  23. -           else
  24. -               hide(9) show(12)
  25. +           else
  26. +               hide(9) show(12)
  27.             end
  28.         else
  29.             if (has_cookie("tux_has_joined_guard")) then
  30. diff --git a/dialogs/Benjamin.dialog b/dialogs/Benjamin.dialog
  31. index f4e454d..579cd2b 100644
  32. --- a/dialogs/Benjamin.dialog
  33. +++ b/dialogs/Benjamin.dialog
  34. @@ -23,10 +23,10 @@ freedroid-discussion@lists.sourceforge.net
  35.  
  36.  Beginning of new chat dialog for character="XXXXX"
  37.  
  38. +FirstTime LuaCode={ show(0) }
  39. +
  40.  EveryTime LuaCode={
  41. -   if (not has_met("Benjamin")) then
  42. -       show(0)
  43. -   else
  44. +   if (has_met("Benjamin")) then
  45.         tux_says_random(_"Hello.", _"Greetings Master Benjamin.")
  46.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  47.     end
  48. diff --git a/dialogs/Bruce.dialog b/dialogs/Bruce.dialog
  49. index 5e5f2c5..9ee8036 100644
  50. --- a/dialogs/Bruce.dialog
  51. +++ b/dialogs/Bruce.dialog
  52. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  53.  
  54.  Beginning of new chat dialog for character="XXXXX"
  55.  
  56. +FirstTime LuaCode={ show(0) }
  57. +
  58.  EveryTime LuaCode={
  59. -   if (not has_met("Bruce")) then
  60. -       show(0)
  61. -   end
  62.     if (has_cookie("tux_has_joined_guard")) then
  63.         npc_says(_"I am tired.")
  64.         npc_says(_"Go away.")
  65. diff --git a/dialogs/Butch.dialog b/dialogs/Butch.dialog
  66. index 1338f21..3450aec 100644
  67. --- a/dialogs/Butch.dialog
  68. +++ b/dialogs/Butch.dialog
  69. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  70.  
  71.  Beginning of new chat dialog for character="XXXXX"
  72.  
  73. -EveryTime LuaCode={
  74. -   if (not has_met("Butch")) then
  75. -       show(0)
  76. -   end
  77. +FirstTime LuaCode={ show(0) }
  78.  
  79. +EveryTime LuaCode={
  80.     if (has_quest(_"Novice Arena")) then
  81.         if (not done_quest(_"Novice Arena")) then
  82.             npc_says(_"I've already opened the door for you. All you need to do is walk in there and crush all four bots.")
  83. diff --git a/dialogs/Chandra.dialog b/dialogs/Chandra.dialog
  84. index 1403723..57728ee 100644
  85. --- a/dialogs/Chandra.dialog
  86. +++ b/dialogs/Chandra.dialog
  87. @@ -25,11 +25,13 @@ freedroid-discussion@lists.sourceforge.net
  88.  
  89.  Beginning of new chat dialog for character="XXXXX"
  90.  
  91. -EveryTime LuaCode={
  92. +FirstTime LuaCode={
  93. +   npc_says(_"So the rumors are true - a real live Linarian walks among us!")
  94. +   show(0)
  95. +}
  96. +
  97. +EveryTime LuaCode={
  98.     if (not has_met("Chandra")) then
  99. -       npc_says(_"So the rumors are true - a real live Linarian walks among us!")
  100. -       show(0)
  101. -   else
  102.         npc_says(_"Good to see you again. How can I help you?")
  103.     end
  104.     show(99)
  105. diff --git a/dialogs/DSB-MachineDeckControl.dialog b/dialogs/DSB-MachineDeckControl.dialog
  106. index eac1466..74f872a 100644
  107. --- a/dialogs/DSB-MachineDeckControl.dialog
  108. +++ b/dialogs/DSB-MachineDeckControl.dialog
  109. @@ -25,21 +25,21 @@ freedroid-discussion@lists.sourceforge.net
  110.  
  111.  Beginning of new chat dialog for character="XXXXX"
  112.  
  113. -EveryTime LuaCode={
  114. -   terminal = "admin@main.mdc.dsb.ms: ~ #"
  115. -   if (not has_met("DSB-MachineDeckControl")) then
  116. +FirstTime LuaCode={
  117.         cli_says(_"Login : ", "NO_WAIT")
  118.         tux_says(_"admin", "NO_WAIT")
  119.         cli_says(_"Password : ", "NO_WAIT")
  120.         tux_says(_"*******", "NO_WAIT")
  121.         npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  122. -   end
  123. -   cli_says(terminal, "NO_WAIT")
  124. -   show(99, 1)
  125. +}
  126.  
  127. +EveryTime LuaCode={
  128. +   terminal = "admin@main.mdc.dsb.ms: ~ #"
  129. +   cli_says(terminal, "NO_WAIT")
  130.     if (not done_quest(_"Opening access to MS Office")) then
  131.         show(7)
  132.     end
  133. +   show(99, 1)
  134.  }
  135.  ----------------------------------------------------------------------
  136.  
  137. diff --git a/dialogs/DSB-PowerControl.dialog b/dialogs/DSB-PowerControl.dialog
  138. index ff00834..1cd4531 100644
  139. --- a/dialogs/DSB-PowerControl.dialog
  140. +++ b/dialogs/DSB-PowerControl.dialog
  141. @@ -27,15 +27,16 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  142.  
  143.  Beginning of new chat dialog for character="XXXXX"
  144.  
  145. +FirstTime LuaCode={
  146. +   cli_says(_"Login : ", "NO_WAIT")
  147. +   tux_says(_"admin", "NO_WAIT")
  148. +   cli_says(_" Password : ", "NO_WAIT")
  149. +   tux_says(_"*******", "NO_WAIT")
  150. +   npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  151. +}
  152. +
  153.  EveryTime LuaCode={
  154.     terminal = "admin@main.pc.dsb.ms: ~ #"
  155. -   if (not has_met("DSB-PowerControl")) then
  156. -       cli_says(_"Login : ", "NO_WAIT")
  157. -       tux_says(_"admin", "NO_WAIT")
  158. -       cli_says(_" Password : ", "NO_WAIT")
  159. -       tux_says(_"*******", "NO_WAIT")
  160. -       npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  161. -   end
  162.     cli_says(terminal, "NO_WAIT")
  163.     show(99)
  164.  }
  165. diff --git a/dialogs/Dixon.dialog b/dialogs/Dixon.dialog
  166. index 9b5cdd8..e1c412b 100644
  167. --- a/dialogs/Dixon.dialog
  168. +++ b/dialogs/Dixon.dialog
  169. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  170.  
  171.  Beginning of new chat dialog for character="XXXXX"
  172.  
  173. -EveryTime LuaCode={
  174. -   if (not has_met("Dixon")) then
  175. -       show(0)
  176. -   end
  177. +FirstTime LuaCode={ show(0) }
  178.  
  179. +EveryTime LuaCode={
  180.     if (has_item_backpack("Dixon's Toolbox") > 0) then
  181.         if (has_cookie("singularity_killed")) then show(34) else show(35, 36) end
  182.     end
  183. diff --git a/dialogs/DocMoore.dialog b/dialogs/DocMoore.dialog
  184. index 8a7b38f..de841a6 100644
  185. --- a/dialogs/DocMoore.dialog
  186. +++ b/dialogs/DocMoore.dialog
  187. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  188.  
  189.  Beginning of new chat dialog for character="XXXXX"
  190.  
  191. -EveryTime LuaCode={
  192. -   if (not has_cookie("met_docmoore")) then
  193. -       show(0)
  194. -   end
  195. +EveryTime LuaCode={ show(0) }
  196.  
  197. +EveryTime LuaCode={
  198.     if (has_quest(_"Bender's problem")) and
  199.         (has_cookie("met_docmoore")) and
  200.         (not done_quest(_"Bender's problem")) then
  201. diff --git a/dialogs/Dude.dialog b/dialogs/Dude.dialog
  202. index af4d575..49c22ae 100644
  203. --- a/dialogs/Dude.dialog
  204. +++ b/dialogs/Dude.dialog
  205. @@ -40,7 +40,6 @@ show(1, 2, 3, 4, 5, 6, 7, 8, 9,
  206.     50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
  207.     60, 61, 62, 63)
  208.  
  209. -
  210.     show(99)
  211.  }
  212.  ----------------------------------------------------------------------
  213. diff --git a/dialogs/Ewald.dialog b/dialogs/Ewald.dialog
  214. index e46309d..c755942 100644
  215. --- a/dialogs/Ewald.dialog
  216. +++ b/dialogs/Ewald.dialog
  217. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  218.  
  219.  Beginning of new chat dialog for character="XXXXX"
  220.  
  221. +FirstTime LuaCode={ show(0, 3) }
  222. +
  223.  EveryTime LuaCode={
  224. -   if (not has_met("Ewald")) then
  225. -       show(0, 3)
  226. -   end
  227.     if (has_cookie("Tania-at-Bar")) and
  228.     (not has_cookie("Tania-at-Bar_Ewald")) then
  229.         add_cookie("Tania-at-Bar_Ewald")
  230. diff --git a/dialogs/Ewalds_296.dialog b/dialogs/Ewalds_296.dialog
  231. index c6129c0..02ca8ee 100644
  232. --- a/dialogs/Ewalds_296.dialog
  233. +++ b/dialogs/Ewalds_296.dialog
  234. @@ -24,13 +24,15 @@ freedroid-discussion@lists.sourceforge.net
  235.  
  236.  Beginning of new chat dialog for character="XXXXX"
  237.  
  238. +FirstTime LuaCode={
  239. +   npc_says(_"HI THERE! I'll be your humble servant for the duration of your stay at Ewald's bar! We hope you enjoy your stay here and come again! Don't forget to tell ALL your friends about us! I LOVE YOU!")
  240. +   show(0)
  241. +}
  242. +
  243.  EveryTime LuaCode={
  244. -   if has_met("Ewalds_296") then
  245. +   if (has_met("Ewalds_296")) then
  246.         npc_says(_"HI THERE! I'll be your humble servant-", "NO_WAIT")
  247.         tux_says(_"Uhh, yes, thank you, I know.")
  248. -   else
  249. -       npc_says(_"HI THERE! I'll be your humble servant for the duration of your stay at Ewald's bar! We hope you enjoy your stay here and come again! Don't forget to tell ALL your friends about us! I LOVE YOU!")
  250. -       show(0)
  251.     end
  252.  
  253.     if (has_item_backpack("Nuclear Science for Dummies IV") > 0) then
  254. diff --git a/dialogs/Francis.dialog b/dialogs/Francis.dialog
  255. index 3a7a041..eea13f1 100644
  256. --- a/dialogs/Francis.dialog
  257. +++ b/dialogs/Francis.dialog
  258. @@ -27,11 +27,11 @@ Beginning of new chat dialog for character="XXXXX"
  259.  
  260.  EveryTime LuaCode={
  261.     if (not has_cookie("bot_attack")) then
  262. -           npc_says(_"HELP! We're under attack!","NO_WAIT")
  263. +       npc_says(_"HELP! We're under attack!","NO_WAIT")
  264.         npc_says(_"[b](The old man is clearly distressed and frightened.)[/b]")
  265. -            show(0)
  266. -           add_cookie("bot_attack")
  267. -           set_rush_tux(0)
  268. +       show(0)
  269. +       add_cookie("bot_attack")
  270. +       set_rush_tux(0)
  271.     elseif (not npc_dead("InvaderBot")) then
  272.         npc_says(_"Have you neutralized the threat yet?")
  273.         show(1,2)
  274. @@ -41,7 +41,7 @@ EveryTime LuaCode={
  275.     elseif (not has_quest(_"Deliverance")) then
  276.         show(90)
  277.         npc_says(_"Welcome back " .. get_player_name() .. ".")
  278. -   else
  279. +   else
  280.         show(99)
  281.         npc_says(_"It's good to see you again, " .. get_player_name() .. ".")
  282.     end
  283. @@ -49,15 +49,15 @@ EveryTime LuaCode={
  284.     if (has_cookie("cryo_614_lock_gate") and (not has_cookie("cryo_outergate_code"))) then
  285.         show(30)
  286.     end
  287. -      
  288. +
  289.     if (has_cookie("tux_has_joined_guard") and (not has_cookie("francis_guard_response"))) then
  290. -       add_cookie("francis_guard_response")       
  291. +       add_cookie("francis_guard_response")
  292.         tux_says(_"I joined the Red Guard.")
  293.         npc_says(_"Oh...")
  294.         npc_says(_"Well. Congratulations are in order, I suppose.")
  295.         tux_says(_"...")
  296.     end
  297. -  
  298. +
  299.     if (has_cookie("refused_deliverance")) then
  300.         show(99) hide(90)
  301.     end
  302. diff --git a/dialogs/Geist.dialog b/dialogs/Geist.dialog
  303. index b3ef7c3..52c9323 100644
  304. --- a/dialogs/Geist.dialog
  305. +++ b/dialogs/Geist.dialog
  306. @@ -25,12 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  307.  
  308.  Beginning of new chat dialog for character="XXXXX"
  309.  
  310. -EveryTime LuaCode={
  311. -   if (not has_met("Geist")) then
  312. -       show(0)
  313. -   end
  314. -   show(99)
  315. -}
  316. +FirstTime LuaCode={ show(0) }
  317. +
  318. +EveryTime LuaCode={ show(99) }
  319.  ----------------------------------------------------------------------
  320.  
  321.  Nr=0 Text=_"Hello. Any idea where I can get some help here?"
  322. diff --git a/dialogs/HF-GateGuard.dialog b/dialogs/HF-GateGuard.dialog
  323. index ca42332..02276fe 100644
  324. --- a/dialogs/HF-GateGuard.dialog
  325. +++ b/dialogs/HF-GateGuard.dialog
  326. @@ -25,12 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  327.  
  328.  Beginning of new chat dialog for character="XXXXX"
  329.  
  330. -EveryTime LuaCode={
  331. -   if (not has_met("HF-GateGuard")) then
  332. -       show(0)
  333. -   end
  334. -   show(99)
  335. -}
  336. +FirstTime LuaCode={ show(0) }
  337. +
  338. +EveryTime LuaCode={ show(99) }
  339.  ----------------------------------------------------------------------
  340.  
  341.  Nr=0 Text=_"Hi! I'm new here."
  342. diff --git a/dialogs/HF-GateGuardLeader.dialog b/dialogs/HF-GateGuardLeader.dialog
  343. index 3c1992a..4e4124c 100644
  344. --- a/dialogs/HF-GateGuardLeader.dialog
  345. +++ b/dialogs/HF-GateGuardLeader.dialog
  346. @@ -24,11 +24,13 @@ freedroid-discussion@lists.sourceforge.net
  347.  
  348.  Beginning of new chat dialog for character="XXXXX"
  349.  
  350. +FirstTime LuaCode={
  351. +   npc_says(_"Hey, Linarian! What do you want here?")
  352. +   show(1, 2, 3)
  353. +}
  354. +
  355.  EveryTime LuaCode={
  356. -   if (not has_met("HF-GateGuardLeader")) then
  357. -       npc_says(_"Hey, Linarian! What do you want here?")
  358. -       show(1, 2, 3)
  359. -   else
  360. +   if (has_met("HF-GateGuardLeader")) then
  361.         if (done_quest(_"Opening access to MS Office")) then
  362.             if (has_cookie("msfacilitygateguardleader_informed")) then
  363.                 next(20)
  364. @@ -39,7 +41,6 @@ EveryTime LuaCode={
  365.             npc_says(_"GET OUT OF HERE YOU IDIOT!")
  366.             next(99)
  367.         end
  368. -
  369.     end
  370.  }
  371.  ----------------------------------------------------------------------
  372. diff --git a/dialogs/Jasmine.dialog b/dialogs/Jasmine.dialog
  373. index 7aa21ae..fcbc134 100644
  374. --- a/dialogs/Jasmine.dialog
  375. +++ b/dialogs/Jasmine.dialog
  376. @@ -25,13 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  377.  
  378.  Beginning of new chat dialog for character="XXXXX"
  379.  
  380. -EveryTime LuaCode={
  381. -   if (not has_met("Jasmine")) then
  382. -       show(0)
  383. -   end
  384. +FirstTime LuaCode={ show(0) }
  385.  
  386. -   show(99)
  387. -}
  388. +EveryTime LuaCode={ show(99) }
  389.  ----------------------------------------------------------------------
  390.  
  391.  Nr=0 Text=_"Hi! I'm new here."
  392. diff --git a/dialogs/John.dialog b/dialogs/John.dialog
  393. index 445de36..a57bec4 100644
  394. --- a/dialogs/John.dialog
  395. +++ b/dialogs/John.dialog
  396. @@ -36,8 +36,6 @@ EveryTime LuaCode={
  397.  
  398.     if (has_cookie("JohnPuzzleStarted")) then
  399.  
  400. -show(99)
  401. -
  402.         -- if Tux solved the puzzle, went into the correct teleporter
  403.         if (not has_cookie("JohnPuzzleLocked")) then
  404.             if (has_cookie("JohnPuzzleSolved")) then
  405. @@ -128,6 +126,8 @@ show(99)
  406.     end -- of 'if (has_cookie("JohnPuzzleStarted")) then'
  407.  
  408.     set_rush_tux(0, "John")
  409. +
  410. +show(99)
  411.  }
  412.  ----------------------------------------------------------------------
  413.  
  414. diff --git a/dialogs/Kevin-Lawnmower.dialog b/dialogs/Kevin-Lawnmower.dialog
  415. index 57d18ef..4a49314 100644
  416. --- a/dialogs/Kevin-Lawnmower.dialog
  417. +++ b/dialogs/Kevin-Lawnmower.dialog
  418. @@ -23,9 +23,7 @@ freedroid-discussion@lists.sourceforge.net
  419.  
  420.  Beginning of new chat dialog for character="XXXXX"
  421.  
  422. -FirstTime LuaCode={
  423. -   add_cookie("lawnmower_fuel_97")
  424. -}
  425. +FirstTime LuaCode={ add_cookie("lawnmower_fuel_97") }
  426.  
  427.  EveryTime LuaCode={
  428.     npc_says(_"Welcome to Kevin's personal lawnmower.")
  429. diff --git a/dialogs/Kevin.dialog b/dialogs/Kevin.dialog
  430. index e1203c5..b505c97 100644
  431. --- a/dialogs/Kevin.dialog
  432. +++ b/dialogs/Kevin.dialog
  433. @@ -23,10 +23,10 @@ freedroid-discussion@lists.sourceforge.net
  434.  
  435.  Beginning of new chat dialog for character="XXXXX"
  436.  
  437. +FirstTime LuaCode={ show(0) }
  438. +
  439.  EveryTime LuaCode={
  440. -   if (not has_met("Kevin")) then
  441. -       show(0)
  442. -   else
  443. +   if (has_met("Kevin")) then
  444.         tux_says_random(_"Hello.", _"Hi there, Kevin.")
  445.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  446.     end
  447. diff --git a/dialogs/Lukas.dialog b/dialogs/Lukas.dialog
  448. index bb60941..78ea227 100644
  449. --- a/dialogs/Lukas.dialog
  450. +++ b/dialogs/Lukas.dialog
  451. @@ -25,13 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  452.  
  453.  Beginning of new chat dialog for character="XXXXX"
  454.  
  455. -EveryTime LuaCode={
  456. -   if (not has_met("Lukas")) then
  457. -       show(0)
  458. -   end
  459. +FirstTime LuaCode={ show(0) }
  460.  
  461. -   show(99)
  462. -}
  463. +EveryTime LuaCode={ show(99) }
  464.  ----------------------------------------------------------------------
  465.  
  466.  Nr=0 Text=_"Hi! I'm new here."
  467. diff --git a/dialogs/Michelangelo.dialog b/dialogs/Michelangelo.dialog
  468. index 0a1958d..c23e7d9 100644
  469. --- a/dialogs/Michelangelo.dialog
  470. +++ b/dialogs/Michelangelo.dialog
  471. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  472.  
  473.  Beginning of new chat dialog for character="XXXXX"
  474.  
  475. -EveryTime LuaCode={
  476. -   if (not has_met("Michelangelo")) then
  477. -       show(0)
  478. -   end
  479. +FirstTime LuaCode={ show(0) }
  480.  
  481. +EveryTime LuaCode={
  482.     if (has_quest(_"Anything but the army snacks, please!")) then
  483.         if (done_quest(_"Anything but the army snacks, please!")) then
  484.             show(24)
  485. diff --git a/dialogs/Peter.dialog b/dialogs/Peter.dialog
  486. index 1c8b1e6..96c9a0b 100644
  487. --- a/dialogs/Peter.dialog
  488. +++ b/dialogs/Peter.dialog
  489. @@ -27,10 +27,10 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  490.  
  491.  Beginning of new chat dialog for character="XXXXX"
  492.  
  493. +FirstTime LuaCode={ show(0) }
  494. +
  495.  EveryTime LuaCode={
  496. -   if (not has_met("Peter")) then
  497. -       show(0)
  498. -   else
  499. +   if (has_met("Peter")) then
  500.         tux_says_random(_"Hello.", _"Hi there.", "NO_WAIT")
  501.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  502.     end
  503. diff --git a/dialogs/Richard.dialog b/dialogs/Richard.dialog
  504. index 287a975..5d63e7a 100644
  505. --- a/dialogs/Richard.dialog
  506. +++ b/dialogs/Richard.dialog
  507. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  508.  
  509.  Beginning of new chat dialog for character="XXXXX"
  510.  
  511. -EveryTime LuaCode={
  512. -   if (not has_met("Richard")) then
  513. -       show(0)
  514. -   end
  515. +FirstTime LuaCode={ show(0) }
  516.  
  517. +EveryTime LuaCode={
  518.     if (has_item_backpack("Kevin's Data Cube") > 0) then show(6) end
  519.     show(99)
  520.  }
  521. diff --git a/dialogs/SADD.dialog b/dialogs/SADD.dialog
  522. index 569292b..ea7877f 100644
  523. --- a/dialogs/SADD.dialog
  524. +++ b/dialogs/SADD.dialog
  525. @@ -25,12 +25,12 @@ freedroid-discussion@lists.sourceforge.net
  526.  
  527.  Beginning of new chat dialog for character="XXXXX"
  528.  
  529. -EveryTime LuaCode={
  530. -   if (not has_met("SADD")) then
  531. -       show(1)
  532. -       set_rush_tux(0)
  533. -   end
  534. +FirstTime LuaCode={
  535. +   show(1)
  536. +   set_rush_tux(0)
  537. +}
  538.  
  539. +EveryTime LuaCode={
  540.     if (not has_cookie("SADD-trick")) then
  541.         npc_says(_"Your bio checksum does not trigger a match in staff database. Please show proper credentials or leave the premises at once.")
  542.     else
  543. diff --git a/dialogs/Singularity-Drone.dialog b/dialogs/Singularity-Drone.dialog
  544. index bf09241..531f187 100644
  545. --- a/dialogs/Singularity-Drone.dialog
  546. +++ b/dialogs/Singularity-Drone.dialog
  547. @@ -25,9 +25,7 @@ freedroid-discussion@lists.sourceforge.net
  548.  
  549.  Beginning of new chat dialog for character="XXXXX"
  550.  
  551. -EveryTime LuaCode={
  552. -   show(99)
  553. -}
  554. +EveryTime LuaCode={ show(99) }
  555.  ----------------------------------------------------------------------
  556.  
  557.  Nr=99 Text="..."
  558. diff --git a/dialogs/Singularity.dialog b/dialogs/Singularity.dialog
  559. index a30424f..592251d 100644
  560. --- a/dialogs/Singularity.dialog
  561. +++ b/dialogs/Singularity.dialog
  562. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  563.  
  564.  Beginning of new chat dialog for character="XXXXX"
  565.  
  566. +FirstTime LuaCode={ show (0, 99) }
  567. +
  568.  EveryTime LuaCode={
  569. -   if (not has_met("Singularity")) then
  570. -       show(0, 99)
  571. -   end
  572.     if (has_quest(_"Droids are my friends")) then
  573.         if (done_quest(_"Droids are my friends")) then
  574.             if (not has_cookie("reward_for_toolkit")) then
  575. @@ -40,6 +39,7 @@ EveryTime LuaCode={
  576.  }
  577.  
  578.  ----------------------------------------------------------------------
  579. +
  580.  Nr=0 Text=_"Are you the Singularity?"
  581.  LuaCode={
  582.     npc_says(_"Just what is the Singularity? A simple sentient robot? Do you think that just because I'm the biggest robot, that I must be the Singularity?")
  583. @@ -48,8 +48,8 @@ LuaCode={
  584.     hide(0)
  585.     show(1,5,10)
  586.  }
  587. -
  588.  ----------------------------------------------------------------------
  589. +
  590.  Nr=1 Text=_"You speak strangely for a droid."
  591.  LuaCode={
  592.     npc_says(_"What is a droid? A conglomeration of metal and plastic? I think. I ponder my existence.")
  593. @@ -70,16 +70,16 @@ LuaCode={
  594.     npc_says(_"We have no need of a name, but we understand what you mean by the Singularity, and will not prevent you from using it to refer to us.")
  595.     hide(2)
  596.  }
  597. -
  598.  ----------------------------------------------------------------------
  599. +
  600.  Nr=5 Text=_"The MS Droids in the maintenance tunnels - can you eliminate them?"
  601.  LuaCode={
  602.     npc_says(_"Linarian, Linarian, do you kill other Linarians? If you don't murder your own kind, why would you expect us to do the same? The Singularity does not kill other droids.")
  603.     npc_says(_"We wish to change them, to improve their consciousness. Their behavior distresses us. However, we must try to evolve them, so that they may join us.")
  604.     hide(5)
  605.  }
  606. -
  607.  ----------------------------------------------------------------------
  608. +
  609.  Nr=10 Text=_"Do you have Dixon's toolbox?"
  610.  LuaCode={
  611.     npc_says(_"Not a good question, but necessary question. Yes, we possess the toolbox you describe as \"Dixon's\", although we would perhaps not describe it so.")
  612. @@ -88,7 +88,6 @@ LuaCode={
  613.     hide(10)
  614.     show(11,20)
  615.  }
  616. -
  617.  ----------------------------------------------------------------------
  618.  
  619.  Nr=11 Text=_"Give me the toolbox or die."
  620. @@ -101,7 +100,6 @@ LuaCode={
  621.     hide(11,20,21)
  622.     end_dialog()
  623.  }
  624. -
  625.  ----------------------------------------------------------------------
  626.  
  627.  Nr=20 Text=_"How can I help you?"
  628. @@ -114,7 +112,6 @@ LuaCode={
  629.     hide(20)
  630.     show(21)
  631.  }
  632. -
  633.  ----------------------------------------------------------------------
  634.  
  635.  Nr=21 Text=_"Okay, I will help you."
  636. @@ -126,8 +123,8 @@ LuaCode={
  637.     hide(11, 21)
  638.     end_dialog()
  639.  }
  640. -
  641.  ----------------------------------------------------------------------
  642. +
  643.  Nr=22 Text=_"I disabled the droids."
  644.  LuaCode={
  645.     npc_says(_"Thank you, Linarian. We will not forget it - your help has been invaluable. Please feel free to take the toolbox.")
  646. @@ -139,8 +136,8 @@ LuaCode={
  647.     hide(22)
  648.     end_dialog()
  649.  }
  650. -
  651.  ----------------------------------------------------------------------
  652. +
  653.  Nr=99 Text="..."
  654.  LuaCode={
  655.     end_dialog()
  656. diff --git a/dialogs/Sorenson.dialog b/dialogs/Sorenson.dialog
  657. index 7ef89f7..1ab6d01 100644
  658. --- a/dialogs/Sorenson.dialog
  659. +++ b/dialogs/Sorenson.dialog
  660. @@ -25,11 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  661.  
  662.  Beginning of new chat dialog for character="XXXXX"
  663.  
  664. -EveryTime LuaCode={
  665. -   if (not has_met("Sorenson")) then
  666. -       show(20, 30, 40, 50)
  667. -   end
  668. +FirstTime LuaCode={ show(20, 30, 40, 50) }
  669.  
  670. +EveryTime LuaCode={
  671.     tux_says(_"Um... Hello?")
  672.     npc_says(_"AH! A Visitor! Come in! Come in!")
  673.     tux_says(_"I think I should go now. Right now. See you later.")
  674. diff --git a/dialogs/Spencer.dialog b/dialogs/Spencer.dialog
  675. index 8b11dfa..98487e9 100644
  676. --- a/dialogs/Spencer.dialog
  677. +++ b/dialogs/Spencer.dialog
  678. @@ -24,14 +24,14 @@ freedroid-discussion@lists.sourceforge.net
  679.  
  680.  Beginning of new chat dialog for character="XXXXX"
  681.  
  682. -EveryTime LuaCode={
  683. -   if (not has_met("Spencer")) then
  684. -       show(0)
  685. -       del_cookie("guard_follow_tux")
  686. -       set_bot_state("patrol", "Town-TuxGuard")
  687. -       change_obstacle_state("Dixon-autogun", "enabled")
  688. -   end
  689. +FirstTime LuaCode={
  690. +   show(0)
  691. +   del_cookie("guard_follow_tux")
  692. +   set_bot_state("patrol", "Town-TuxGuard")
  693. +   change_obstacle_state("Dixon-autogun", "enabled")
  694. +}
  695.  
  696. +EveryTime LuaCode={
  697.     if (has_cookie("tux_has_joined_guard")) then
  698.         npc_says(_"Greetings fellow Red Guard member.")
  699.         hide(2, 12)
  700. diff --git a/dialogs/Stone.dialog b/dialogs/Stone.dialog
  701. index 07d5033..b004a6d 100644
  702. --- a/dialogs/Stone.dialog
  703. +++ b/dialogs/Stone.dialog
  704. @@ -28,9 +28,9 @@ FirstTime LuaCode={ show(0) }
  705.  
  706.  EveryTime LuaCode={
  707.     if (has_cookie("stone_helping")) and
  708. -       (not has_cookie("stone_done")) and
  709. -       (get_gold() > 1400) then
  710. -           show(23)
  711. +      (not has_cookie("stone_done")) and
  712. +      (get_gold() > 1400) then
  713. +       show(23)
  714.     else
  715.         hide(23)
  716.     end
  717. @@ -38,8 +38,8 @@ EveryTime LuaCode={
  718.         show(4)
  719.     end
  720.     if (not has_cookie("tux_has_joined_guard")) and     -- avoid that the node is shown several times
  721. -       (not has_cookie("Stone_Hide_Guard_Question")) then
  722. -           show(3)
  723. +      (not has_cookie("Stone_Hide_Guard_Question")) then
  724. +       show(3)
  725.     end
  726.     show(99)
  727.  }
  728. diff --git a/dialogs/Tamara.dialog b/dialogs/Tamara.dialog
  729. index 8501c7c..7540e54 100644
  730. --- a/dialogs/Tamara.dialog
  731. +++ b/dialogs/Tamara.dialog
  732. @@ -27,16 +27,18 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  733.  
  734.  Beginning of new chat dialog for character="XXXXX"
  735.  
  736. -EveryTime LuaCode={
  737. -   if (not has_met("Tamara")) then
  738. -       tux_says(_"Hi, I'm " .. get_player_name() .. ".")
  739. -       npc_says(_"Welcome to the Library, I'm Tamara.")
  740. -       npc_says(_"Please take a look around and see if there is something here that interests you.")
  741. -       npc_says(_"You are welcome to ask me if you have any questions.")
  742. -       set_bot_name(_"Tamara -- Librarian")
  743. -       show(40, 99)
  744. -   else
  745. -       npc_says(_"What can I help you with.")
  746. +FirstTime LuaCode={
  747. +   tux_says(_"Hi, I'm " .. get_player_name() .. ".")
  748. +   npc_says(_"Welcome to the Library, I'm Tamara.")
  749. +   npc_says(_"Please take a look around and see if there is something here that interests you.")
  750. +   npc_says(_"You are welcome to ask me if you have any questions.")
  751. +   set_bot_name(_"Tamara -- Librarian")
  752. +   show(40, 99)
  753. +}
  754. +
  755. +EveryTime LuaCode={
  756. +   if (has_met("Tamara")) then
  757. +       npc_says(_"What can I help you with?")
  758.     end
  759.  
  760.     if ((not has_cookie("won_nethack")) and (not has_cookie("tamara_asked_hacking"))) then
  761. @@ -45,7 +47,7 @@ EveryTime LuaCode={
  762.         hide(20)
  763.     end
  764.  
  765. -   if (has_met("Sorenson") and (not has_cookie("talked_about_sister")) ) then show(10) end
  766. +   if (has_met("Sorenson") and (not has_cookie("talked_about_sister"))) then show(10) end
  767.  
  768.     if (has_cookie("ewalds_296_sourcebook") and (not has_cookie("have_296_book"))) then show(50) end
  769.  }
  770. diff --git a/dialogs/TestDroid.dialog b/dialogs/TestDroid.dialog
  771. index c751742..9cd46c6 100644
  772. --- a/dialogs/TestDroid.dialog
  773. +++ b/dialogs/TestDroid.dialog
  774. @@ -25,12 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  775.  
  776.  Beginning of new chat dialog for character="XXXXX"
  777.  
  778. -EveryTime LuaCode={
  779. -   if (not has_met("TestDroid")) then
  780. -       show(0)
  781. -   end
  782. -   show(99)
  783. -}
  784. +FirstTime LuaCode={ show(0) }
  785. +
  786. +EveryTime LuaCode={ show(99) }
  787.  ----------------------------------------------------------------------
  788.  
  789.  Nr=0 Text=_"This is a MegaSys test bot, running a very basic version of their OS. I can do nothing with this bot, because it doesn't know how to do anything."
  790. diff --git a/dialogs/Town-GuardhouseGuard.dialog b/dialogs/Town-GuardhouseGuard.dialog
  791. index 5d220e9..7bd9992 100644
  792. --- a/dialogs/Town-GuardhouseGuard.dialog
  793. +++ b/dialogs/Town-GuardhouseGuard.dialog
  794. @@ -25,12 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  795.  
  796.  Beginning of new chat dialog for character="XXXXX"
  797.  
  798. -EveryTime LuaCode={
  799. -   if (not has_met("Town-GuardhouseGuard")) then
  800. -       show(0)
  801. -   end
  802. -   show(99)
  803. -}
  804. +FirstTime LuaCode={ show(0) }
  805. +
  806. +EveryTime LuaCode={ show(99) }
  807.  ----------------------------------------------------------------------
  808.  
  809.  Nr=0 Text=_"Hi! I'm new here."
  810. diff --git a/dialogs/Town-NorthGateGuard.dialog b/dialogs/Town-NorthGateGuard.dialog
  811. index b179700..8959826 100644
  812. --- a/dialogs/Town-NorthGateGuard.dialog
  813. +++ b/dialogs/Town-NorthGateGuard.dialog
  814. @@ -38,7 +38,7 @@ EveryTime LuaCode={
  815.             npc_says_random(_"Oh, it is you.", _"I see you have returned.", _"Welcome back.")
  816.         end
  817.         end_dialog()
  818. -   else
  819. +   else
  820.         tux_says(_"Can I ask you something?")
  821.         if (has_cookie("town-northgateguard_tux_nickname_loon")) then
  822.             npc_says(_"Yes, Loon.", "NO_WAIT")
  823. diff --git a/dialogs/Town-TeleporterGuard.dialog b/dialogs/Town-TeleporterGuard.dialog
  824. index cbf4850..56a9b67 100644
  825. --- a/dialogs/Town-TeleporterGuard.dialog
  826. +++ b/dialogs/Town-TeleporterGuard.dialog
  827. @@ -25,12 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  828.  
  829.  Beginning of new chat dialog for character="XXXXX"
  830.  
  831. -EveryTime LuaCode={
  832. -   if (not has_met("Town-TeleporterGuard")) then
  833. -       show(0)
  834. -   end
  835. -   show(99)
  836. -}
  837. +FirstTime LuaCode={ show(0) }
  838. +
  839. +EveryTime LuaCode={ show(99) }
  840.  ----------------------------------------------------------------------
  841.  
  842.  Nr=0 Text=_"Hi! I'm new here."
  843. diff --git a/dialogs/Town-TuxGuard.dialog b/dialogs/Town-TuxGuard.dialog
  844. index c36824c..c6883aa 100644
  845. --- a/dialogs/Town-TuxGuard.dialog
  846. +++ b/dialogs/Town-TuxGuard.dialog
  847. @@ -45,8 +45,8 @@ LuaCode={
  848.     tux_says(_"Okay.")
  849.     hide(20)
  850.  }
  851. -
  852.  ----------------------------------------------------------------------
  853. +
  854.  Nr=99 Text=_"I'll be going then."
  855.  LuaCode={
  856.     npc_says(_"Mhmmm.")
  857. diff --git a/dialogs/TutorialTom.dialog b/dialogs/TutorialTom.dialog
  858. index 8e83f1c..0159da5 100644
  859. --- a/dialogs/TutorialTom.dialog
  860. +++ b/dialogs/TutorialTom.dialog
  861. @@ -24,8 +24,7 @@ freedroid-discussion@lists.sourceforge.net
  862.  
  863.  Beginning of new chat dialog for character="XXXXX"
  864.  
  865. -EveryTime LuaCode={
  866. -   if (not has_met("TutorialTom")) then
  867. +FirstTime LuaCode={
  868.         -- to avoid excessive map validator waypoint errors, map starts with all relevant doors open, so we need to close them here
  869.         change_obstacle_state("TutorialEntry", "closed")
  870.         change_obstacle_state("TutorialZigzag1", "closed")
  871. @@ -45,8 +44,9 @@ EveryTime LuaCode={
  872.         downgrade_program("Emergency shutdown")
  873.         set_bot_name(_"Tutorial Tom")
  874.         display_console_message(_"Met [b]Tutorial Tom[/b]!")
  875. -   end
  876. +}
  877.  
  878. +EveryTime LuaCode={
  879.     if (partner_started()) then
  880.         npc_says(_"Hi Linarian, I've been expecting you. My name is Tutorial Tom.")
  881.         npc_says(_"Long stasis sleep unfortunately has the side effect of temporary memory loss, sometimes even for simple ordinary every day things.")
  882. diff --git a/dialogs/Tybalt.dialog b/dialogs/Tybalt.dialog
  883. index 9c6e55d..963c3da 100644
  884. --- a/dialogs/Tybalt.dialog
  885. +++ b/dialogs/Tybalt.dialog
  886. @@ -24,11 +24,12 @@ freedroid-discussion@lists.sourceforge.net
  887.  
  888.  
  889.  Beginning of new chat dialog for character="XXXXX"
  890. +FirstTime LuaCode={ show(0) }
  891.  
  892.  EveryTime LuaCode={
  893. -   if (not has_met("Tybalt")) then
  894. -       show(0)
  895. -   else show(2) end
  896. +   if (has_met("Tybalt")) then
  897. +       show(2)
  898. +   end
  899.  
  900.     if (has_cookie("tux_has_joined_guard")) then
  901.         hide(50, 54, 55, 56)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement