API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 12th, 2017
456
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 30.22 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/dialogs/Bender.dialog b/dialogs/Bender.dialog
  2. index a85488e..053bbbc 100644
  3. --- a/dialogs/Bender.dialog
  4. +++ b/dialogs/Bender.dialog
  5. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  6.  Beginning of new chat dialog for character="XXXXX"
  7.  
  8.  EveryTime LuaCode={
  9. -   if (not has_cookie("met_bender")) then
  10. +   if (not has_met("Bender")) then
  11.         show(0)
  12. -       add_cookie("met_bender")
  13. -   else end
  14. +   end
  15.  
  16.     if (has_quest(_"Bender's problem")) then
  17.         if (not done_quest(_"Bender's problem")) then
  18. @@ -44,11 +43,10 @@ EveryTime LuaCode={
  19.                     npc_says(_"Congratulations on getting into the Red Guard! I voted for you and that was what got you in! I said we'd be buddies, didn't I? Want to stand guard at the gate with me? It gets boring with just that 614 to talk to. I could tell you all the secrets of the Red Guard.")
  20.                     add_cookie("bender_congrats")
  21.                     show(14)
  22. -               else end
  23. +               end
  24.             else
  25.                 next(13)
  26.             end
  27. -
  28.         end
  29.     end
  30.  
  31. diff --git a/dialogs/Benjamin.dialog b/dialogs/Benjamin.dialog
  32. index 2536996..f4e454d 100644
  33. --- a/dialogs/Benjamin.dialog
  34. +++ b/dialogs/Benjamin.dialog
  35. @@ -24,9 +24,8 @@ freedroid-discussion@lists.sourceforge.net
  36.  Beginning of new chat dialog for character="XXXXX"
  37.  
  38.  EveryTime LuaCode={
  39. -   if (not has_cookie("met_benjamin")) then
  40. +   if (not has_met("Benjamin")) then
  41.         show(0)
  42. -       add_cookie("met_benjamin")
  43.     else
  44.         tux_says_random(_"Hello.", _"Greetings Master Benjamin.")
  45.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  46. diff --git a/dialogs/Bruce.dialog b/dialogs/Bruce.dialog
  47. index 0b28128..5e5f2c5 100644
  48. --- a/dialogs/Bruce.dialog
  49. +++ b/dialogs/Bruce.dialog
  50. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  51.  Beginning of new chat dialog for character="XXXXX"
  52.  
  53.  EveryTime LuaCode={
  54. -   if (not has_cookie("met_bruce")) then
  55. +   if (not has_met("Bruce")) then
  56.         show(0)
  57. -       add_cookie("met_bruce")
  58.     end
  59.     if (has_cookie("tux_has_joined_guard")) then
  60.         npc_says(_"I am tired.")
  61. diff --git a/dialogs/Butch.dialog b/dialogs/Butch.dialog
  62. index 01767a6..1338f21 100644
  63. --- a/dialogs/Butch.dialog
  64. +++ b/dialogs/Butch.dialog
  65. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  66.  Beginning of new chat dialog for character="XXXXX"
  67.  
  68.  EveryTime LuaCode={
  69. -   if (not has_cookie("met_butch")) then
  70. +   if (not has_met("Butch")) then
  71.         show(0)
  72. -       add_cookie("met_butch")
  73. -   else end
  74. +   end
  75.  
  76.     if (has_quest(_"Novice Arena")) then
  77.         if (not done_quest(_"Novice Arena")) then
  78. @@ -38,10 +37,10 @@ EveryTime LuaCode={
  79.             if (not has_cookie("butch_enable_first_set")) then
  80.                 add_cookie("butch_enable_first_set")
  81.                 show(7, 8)
  82. -           else end
  83. +           end
  84.             show(20)
  85.         end
  86. -   else end
  87. +   end
  88.  
  89.     if (has_quest(_"Time to say goodnight")) then
  90.         if (not done_quest(_"Time to say goodnight")) then
  91. @@ -51,10 +50,10 @@ EveryTime LuaCode={
  92.             if (not has_cookie("butch_enable_second_set")) then
  93.                 add_cookie("butch_enable_second_set")
  94.                 show(10)
  95. -           else end
  96. +           end
  97.             show(21)
  98.         end
  99. -   else end
  100. +   end
  101.     show(99)
  102.  }
  103.  ----------------------------------------------------------------------
  104. diff --git a/dialogs/Chandra.dialog b/dialogs/Chandra.dialog
  105. index bbefb4d..1403723 100644
  106. --- a/dialogs/Chandra.dialog
  107. +++ b/dialogs/Chandra.dialog
  108. @@ -26,11 +26,10 @@ freedroid-discussion@lists.sourceforge.net
  109.  Beginning of new chat dialog for character="XXXXX"
  110.  
  111.  EveryTime LuaCode={
  112. -   if (not has_cookie("met_chandra")) then
  113. +   if (not has_met("Chandra")) then
  114.         npc_says(_"So the rumors are true - a real live Linarian walks among us!")
  115.         show(0)
  116. -       add_cookie("met_chandra")
  117. -   else
  118. +   else
  119.         npc_says(_"Good to see you again. How can I help you?")
  120.     end
  121.     show(99)
  122. @@ -44,7 +43,7 @@ LuaCode={
  123.        (not has_cookie("chandra_first_contact")) then
  124.         show(15)
  125.     end
  126. -           hide(0) show(1, 2, 9)
  127. +   hide(0) show(1, 2, 9)
  128.  }
  129.  ----------------------------------------------------------------------
  130.  
  131. diff --git a/dialogs/DSB-MachineDeckControl.dialog b/dialogs/DSB-MachineDeckControl.dialog
  132. index 30d528f..eac1466 100644
  133. --- a/dialogs/DSB-MachineDeckControl.dialog
  134. +++ b/dialogs/DSB-MachineDeckControl.dialog
  135. @@ -27,20 +27,19 @@ Beginning of new chat dialog for character="XXXXX"
  136.  
  137.  EveryTime LuaCode={
  138.     terminal = "admin@main.mdc.dsb.ms: ~ #"
  139. -   if (not has_cookie("met_dsb-mdc")) then
  140. +   if (not has_met("DSB-MachineDeckControl")) then
  141.         cli_says(_"Login : ", "NO_WAIT")
  142.         tux_says(_"admin", "NO_WAIT")
  143.         cli_says(_"Password : ", "NO_WAIT")
  144.         tux_says(_"*******", "NO_WAIT")
  145.         npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  146. -       add_cookie("met_dsb-mdc")  
  147. -   else end
  148. +   end
  149.     cli_says(terminal, "NO_WAIT")
  150.     show(99, 1)
  151.  
  152.     if (not done_quest(_"Opening access to MS Office")) then
  153.         show(7)
  154. -   else end
  155. +   end
  156.  }
  157.  ----------------------------------------------------------------------
  158.  
  159. diff --git a/dialogs/DSB-PowerControl.dialog b/dialogs/DSB-PowerControl.dialog
  160. index 456d97b..ff00834 100644
  161. --- a/dialogs/DSB-PowerControl.dialog
  162. +++ b/dialogs/DSB-PowerControl.dialog
  163. @@ -29,27 +29,17 @@ Beginning of new chat dialog for character="XXXXX"
  164.  
  165.  EveryTime LuaCode={
  166.     terminal = "admin@main.pc.dsb.ms: ~ #"
  167. -   if (not has_cookie("met_dsb-pc")) then
  168. +   if (not has_met("DSB-PowerControl")) then
  169.         cli_says(_"Login : ", "NO_WAIT")
  170.         tux_says(_"admin", "NO_WAIT")
  171.         cli_says(_" Password : ", "NO_WAIT")
  172.         tux_says(_"*******", "NO_WAIT")
  173.         npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  174. -       add_cookie("met_dsb-pc")   
  175. -   else end
  176. +   end
  177.     cli_says(terminal, "NO_WAIT")
  178.     show(99)
  179.  }
  180.  ----------------------------------------------------------------------
  181. -
  182. -Nr=0 Text=_"<?>"
  183. -LuaCode={
  184. -   npc_says(_"<?>")
  185. -   cli_says(terminal, "NO_WAIT")
  186. -   hide(0)
  187. -}
  188. -----------------------------------------------------------------------
  189. -
  190.  Nr=99 Text=_"logout"
  191.  LuaCode={
  192.     npc_says(_"Exiting")
  193. diff --git a/dialogs/DSB-PowerControlGate1.dialog b/dialogs/DSB-PowerControlGate1.dialog
  194. index 079466c..683818f 100644
  195. --- a/dialogs/DSB-PowerControlGate1.dialog
  196. +++ b/dialogs/DSB-PowerControlGate1.dialog
  197. @@ -39,10 +39,6 @@ EveryTime LuaCode={
  198.     npc_says(_"Last login from /dev/ttyS0 on Sun, 23 mar 2057.", "NO_WAIT")
  199.     cli_says(terminal, "NO_WAIT")
  200.  
  201. -   if (not has_cookie("met_dsb-pcg1e")) then
  202. -       add_cookie("met_dsb-pcg1e")
  203. -   else end
  204. -
  205.     if (cmp_obstacle_state("DSB-PCGate1", "closed")) then show(0)
  206.     else
  207.         if (cmp_obstacle_state("DSB-PCGate1", "opened")) then show(10)
  208. diff --git a/dialogs/Dixon.dialog b/dialogs/Dixon.dialog
  209. index 1af1541..9b5cdd8 100644
  210. --- a/dialogs/Dixon.dialog
  211. +++ b/dialogs/Dixon.dialog
  212. @@ -26,14 +26,13 @@ freedroid-discussion@lists.sourceforge.net
  213.  Beginning of new chat dialog for character="XXXXX"
  214.  
  215.  EveryTime LuaCode={
  216. -   if (not has_cookie("met_dixon")) then
  217. +   if (not has_met("Dixon")) then
  218.         show(0)
  219. -       add_cookie("met_dixon")
  220. -   else end
  221. +   end
  222.  
  223.     if (has_item_backpack("Dixon's Toolbox") > 0) then
  224.         if (has_cookie("singularity_killed")) then show(34) else show(35, 36) end
  225. -   else end
  226. +   end
  227.  
  228.     if (done_quest(_"The yellow toolkit")) then
  229.         if (has_cookie("singularity_dead")) then
  230. @@ -41,25 +40,25 @@ EveryTime LuaCode={
  231.         else
  232.             if (has_cookie("dixon_one")) then show(46) else show(45) end
  233.         end
  234. -   else end
  235. +   end
  236.  
  237.     if (has_cookie("dixon_angry_250")) then
  238.         if (has_cookie("dixon_very_angry")) then next(83)
  239.         else npc_says(_"Linarian, please leave. You are no longer welcome here. You have done me wrong and I have no desire to talk to you.")
  240.         end
  241. -   else end
  242. +   end
  243.  
  244.     if (has_cookie("dixon_angry_350")) then
  245.         if (has_cookie("dixon_very_angry")) then next(83)
  246.         else npc_says(_"Linarian, please leave. You are no longer welcome here. You have done me wrong and I have no desire to talk to you.")
  247.         end
  248. -   else end
  249. +   end
  250.  
  251.     if (has_cookie("singularity_saved")) then
  252.         if (has_cookie("dixon_one")) then show(46) else show(45) end
  253. -   else end
  254. +   end
  255.  
  256. -   if (has_cookie("dixon_saved_and_talked")) then hide(46) else end
  257. +   if (has_cookie("dixon_saved_and_talked")) then hide(46) end
  258.     show(99)
  259.    
  260.     if (has_cookie("ewalds_296_sourcebook") and (not has_cookie("have_296_book"))) then show(60) end
  261. diff --git a/dialogs/Duncan.dialog b/dialogs/Duncan.dialog
  262. index 93b2695..8db013a 100644
  263. --- a/dialogs/Duncan.dialog
  264. +++ b/dialogs/Duncan.dialog
  265. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  266.  Beginning of new chat dialog for character="XXXXX"
  267.  
  268.  EveryTime LuaCode={
  269. -   if (not has_cookie("met_duncan")) then
  270. +   if (not has_met("Duncan")) then
  271.         show(0, 90, 99)
  272. -       add_cookie("met_duncan")
  273.     elseif (not has_cookie("guard_follow_tux")) and
  274.             (not has_cookie("koan_quest")) then
  275.         next(50)
  276. @@ -146,7 +145,7 @@ LuaCode={
  277.     npc_says(_"I will be waiting here for your return.")
  278.     tux_says(_"That is all I need to know. I will find Koan.")
  279.     npc_says(_"Only time will tell.")
  280. -   if (cmp_obstacle_state("DesertGate", "closed") and (not has_cookie("met_tania"))) then
  281. +   if (cmp_obstacle_state("DesertGate", "closed") and (not has_met("Tania"))) then
  282.         npc_says(_"Here is a couple of circuits to grease open the western gate, if you know what I mean.")
  283.         add_gold(25)
  284.     end
  285. diff --git a/dialogs/Engel.dialog b/dialogs/Engel.dialog
  286. index 8c8ac19..b5878c4 100644
  287. --- a/dialogs/Engel.dialog
  288. +++ b/dialogs/Engel.dialog
  289. @@ -25,7 +25,7 @@ freedroid-discussion@lists.sourceforge.net
  290.  
  291.  Beginning of new chat dialog for character="XXXXX"
  292.  
  293. -FirstTime LuaCode={ add_cookie("met_engel") show (0, 6) }
  294. +FirstTime LuaCode={ show (0, 6) }
  295.  
  296.  EveryTime LuaCode={ show(99) }
  297.  ----------------------------------------------------------------------
  298. @@ -146,7 +146,7 @@ LuaCode={
  299.     tux_says(_"So they are kind of add-ons?")
  300.     npc_says(_"Yes.")
  301.     npc_says(_"Ask the Stadtmenschen if you want to know more.") --Stadtmenschen = townspeople
  302. -   if (not has_cookie("met_dixon")) then
  303. +   if (not has_met("Dixon")) then
  304.         npc_says(_"I think the Rot Guard makes them.") --Rot = red
  305.         npc_says(_"If you have Gluck, they won't kill you directly.") --Gluck (should actually be 'Glück' but there is no ü in the font) = luck
  306.     end
  307. diff --git a/dialogs/Ewald.dialog b/dialogs/Ewald.dialog
  308. index c08f696..e46309d 100644
  309. --- a/dialogs/Ewald.dialog
  310. +++ b/dialogs/Ewald.dialog
  311. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  312.  Beginning of new chat dialog for character="XXXXX"
  313.  
  314.  EveryTime LuaCode={
  315. -   if (not has_cookie("met_ewald")) then
  316. +   if (not has_met("Ewald")) then
  317.         show(0, 3)
  318. -       add_cookie("met_ewald")
  319.     end
  320.     if (has_cookie("Tania-at-Bar")) and
  321.     (not has_cookie("Tania-at-Bar_Ewald")) then
  322. diff --git a/dialogs/Ewalds_296.dialog b/dialogs/Ewalds_296.dialog
  323. index 2597ab6..c6129c0 100644
  324. --- a/dialogs/Ewalds_296.dialog
  325. +++ b/dialogs/Ewalds_296.dialog
  326. @@ -25,11 +25,11 @@ freedroid-discussion@lists.sourceforge.net
  327.  Beginning of new chat dialog for character="XXXXX"
  328.  
  329.  EveryTime LuaCode={
  330. -   if has_cookie("met_ewalds_296") then
  331. +   if has_met("Ewalds_296") then
  332.         npc_says(_"HI THERE! I'll be your humble servant-", "NO_WAIT")
  333.         tux_says(_"Uhh, yes, thank you, I know.")
  334. -   else 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!")
  335. -       add_cookie("met_ewalds_296")
  336. +   else
  337. +       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!")
  338.         show(0)
  339.     end
  340.  
  341. diff --git a/dialogs/Geist.dialog b/dialogs/Geist.dialog
  342. index 91b2834..b3ef7c3 100644
  343. --- a/dialogs/Geist.dialog
  344. +++ b/dialogs/Geist.dialog
  345. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  346.  Beginning of new chat dialog for character="XXXXX"
  347.  
  348.  EveryTime LuaCode={
  349. -   if (not has_cookie("met_geist")) then
  350. +   if (not has_met("Geist")) then
  351.         show(0)
  352. -       add_cookie("met_geist")
  353. -   else end
  354. +   end
  355.     show(99)
  356.  }
  357.  ----------------------------------------------------------------------
  358. diff --git a/dialogs/HF-GateGuard.dialog b/dialogs/HF-GateGuard.dialog
  359. index b693557..ca42332 100644
  360. --- a/dialogs/HF-GateGuard.dialog
  361. +++ b/dialogs/HF-GateGuard.dialog
  362. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  363.  Beginning of new chat dialog for character="XXXXX"
  364.  
  365.  EveryTime LuaCode={
  366. -   if (not has_cookie("met_hf-gateguard")) then
  367. +   if (not has_met("HF-GateGuard")) then
  368.         show(0)
  369. -       add_cookie("met_hf-gateguard")
  370. -   else end
  371. +   end
  372.     show(99)
  373.  }
  374.  ----------------------------------------------------------------------
  375. diff --git a/dialogs/HF-GateGuardLeader.dialog b/dialogs/HF-GateGuardLeader.dialog
  376. index 2a7bcae..3c1992a 100644
  377. --- a/dialogs/HF-GateGuardLeader.dialog
  378. +++ b/dialogs/HF-GateGuardLeader.dialog
  379. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  380.  Beginning of new chat dialog for character="XXXXX"
  381.  
  382.  EveryTime LuaCode={
  383. -   if (not has_cookie("met_hf-gateguardleader")) then
  384. +   if (not has_met("HF-GateGuardLeader")) then
  385.         npc_says(_"Hey, Linarian! What do you want here?")
  386.         show(1, 2, 3)
  387. -       add_cookie("met_hf-gateguardleader")
  388.     else
  389.         if (done_quest(_"Opening access to MS Office")) then
  390.             if (has_cookie("msfacilitygateguardleader_informed")) then
  391. diff --git a/dialogs/Iris.dialog b/dialogs/Iris.dialog
  392. index 7cc3487..de46b16 100644
  393. --- a/dialogs/Iris.dialog
  394. +++ b/dialogs/Iris.dialog
  395. @@ -27,7 +27,7 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  396.  
  397.  Beginning of new chat dialog for character="XXXXX"
  398.  
  399. -FirstTime LuaCode={ add_cookie("met_iris") show(0) }
  400. +FirstTime LuaCode={ show(0) }
  401.  
  402.  EveryTime LuaCode={
  403.     if has_cookie("Iris_wants_lamp") then
  404. diff --git a/dialogs/Jasmine.dialog b/dialogs/Jasmine.dialog
  405. index 9d1b102..7aa21ae 100644
  406. --- a/dialogs/Jasmine.dialog
  407. +++ b/dialogs/Jasmine.dialog
  408. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  409.  Beginning of new chat dialog for character="XXXXX"
  410.  
  411.  EveryTime LuaCode={
  412. -   if (not has_cookie("met_jasmine")) then
  413. +   if (not has_met("Jasmine")) then
  414.         show(0)
  415. -       add_cookie("met_jasmine")
  416.     end
  417.  
  418.     show(99)
  419. diff --git a/dialogs/John.dialog b/dialogs/John.dialog
  420. index 57c6f81..445de36 100644
  421. --- a/dialogs/John.dialog
  422. +++ b/dialogs/John.dialog
  423. @@ -25,7 +25,7 @@ freedroid-discussion@lists.sourceforge.net
  424.  
  425.  Beginning of new chat dialog for character="XXXXX"
  426.  
  427. -FirstTime LuaCode={ add_cookie("met_john") show(0) }
  428. +FirstTime LuaCode={ show(0) }
  429.  
  430.  EveryTime LuaCode={
  431.     if (has_cookie("john_dislike")) then
  432. diff --git a/dialogs/Kevin-Lawnmower.dialog b/dialogs/Kevin-Lawnmower.dialog
  433. index ee781b3..57d18ef 100644
  434. --- a/dialogs/Kevin-Lawnmower.dialog
  435. +++ b/dialogs/Kevin-Lawnmower.dialog
  436. @@ -25,7 +25,6 @@ Beginning of new chat dialog for character="XXXXX"
  437.  
  438.  FirstTime LuaCode={
  439.     add_cookie("lawnmower_fuel_97")
  440. -   add_cookie("met_kevins_lawnmower")
  441.  }
  442.  
  443.  EveryTime LuaCode={
  444. diff --git a/dialogs/Kevin.dialog b/dialogs/Kevin.dialog
  445. index ef5dfa2..e1203c5 100644
  446. --- a/dialogs/Kevin.dialog
  447. +++ b/dialogs/Kevin.dialog
  448. @@ -24,15 +24,14 @@ freedroid-discussion@lists.sourceforge.net
  449.  Beginning of new chat dialog for character="XXXXX"
  450.  
  451.  EveryTime LuaCode={
  452. -   if (not has_cookie("met_kevin")) then
  453. +   if (not has_met("Kevin")) then
  454.         show(0)
  455. -       add_cookie("met_kevin")
  456.     else
  457.         tux_says_random(_"Hello.", _"Hi there, Kevin.")
  458.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  459.     end
  460.  
  461. -   if ( (has_quest(_"A strange guy stealing from town")) and (not done_quest(_"A strange guy stealing from town")) ) then
  462. +   if ((has_quest(_"A strange guy stealing from town")) and (not done_quest(_"A strange guy stealing from town")) ) then
  463.         add_xp(100)
  464.         end_quest(_"A strange guy stealing from town", _"Oh, I seem to have found the guy the town guard was raving on about. Better not tell the Red Guards in town or they might force me to assist them in his capture. I'll likely have more use of Kevin and his knowledge here in his house with his computers than in a holding cell in town.")
  465.     end
  466. diff --git a/dialogs/Koan.dialog b/dialogs/Koan.dialog
  467. index abae652..d5fe5b1 100644
  468. --- a/dialogs/Koan.dialog
  469. +++ b/dialogs/Koan.dialog
  470. @@ -43,7 +43,7 @@ EveryTime LuaCode={
  471.         if has_quest("Doing Duncan a favor") then
  472.             show(2)
  473.         else
  474. -           if (not has_cookie("met_duncan")) then
  475. +           if (not has_met("Duncan")) then
  476.                 show(4)
  477.             else
  478.                 show(5)
  479. diff --git a/dialogs/Lukas.dialog b/dialogs/Lukas.dialog
  480. index 1b66b32..bb60941 100644
  481. --- a/dialogs/Lukas.dialog
  482. +++ b/dialogs/Lukas.dialog
  483. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  484.  Beginning of new chat dialog for character="XXXXX"
  485.  
  486.  EveryTime LuaCode={
  487. -   if (not has_cookie("met_lukas")) then
  488. +   if (not has_met("Lukas")) then
  489.         show(0)
  490. -       add_cookie("met_lukas")
  491. -   else end
  492. +   end
  493.  
  494.     show(99)
  495.  }
  496. diff --git a/dialogs/Michelangelo.dialog b/dialogs/Michelangelo.dialog
  497. index 8bd0066..0a1958d 100644
  498. --- a/dialogs/Michelangelo.dialog
  499. +++ b/dialogs/Michelangelo.dialog
  500. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  501.  Beginning of new chat dialog for character="XXXXX"
  502.  
  503.  EveryTime LuaCode={
  504. -   if (not has_cookie("met_michelangelo")) then
  505. +   if (not has_met("Michelangelo")) then
  506.         show(0)
  507. -       add_cookie("met_michelangelo")
  508. -   else end
  509. +   end
  510.  
  511.     if (has_quest(_"Anything but the army snacks, please!")) then
  512.         if (done_quest(_"Anything but the army snacks, please!")) then
  513. @@ -38,7 +37,7 @@ EveryTime LuaCode={
  514.                 if (done_quest(_"SADD's power supply")) then
  515.                     hide(75, 76, 77)
  516.                 else
  517. -                   if (has_item_backpack("Red Dilithium Crystal") < 1) then show(40, 75) else end
  518. +                   if (has_item_backpack("Red Dilithium Crystal") < 1) then show(40, 75) end
  519.                 end
  520.             end
  521.             if (has_quest(_"Gapes Gluttony")) then
  522. @@ -61,7 +60,7 @@ EveryTime LuaCode={
  523.                 if (has_cookie("asked_michelangelo_for_army_snacks")) then show(26) else show(12) end
  524.             end
  525.         end
  526. -   else end
  527. +   end
  528.     show(99)
  529.  }
  530.  ----------------------------------------------------------------------
  531. diff --git a/dialogs/Pendragon.dialog b/dialogs/Pendragon.dialog
  532. index 2ffbee9..d64b511 100644
  533. --- a/dialogs/Pendragon.dialog
  534. +++ b/dialogs/Pendragon.dialog
  535. @@ -27,7 +27,6 @@ Beginning of new chat dialog for character="XXXXX"
  536.  
  537.  FirstTime LuaCode={
  538.     show(0)
  539. -   add_cookie("met_pendragon")
  540.  }
  541.  
  542.  EveryTime LuaCode={
  543. @@ -88,7 +87,7 @@ EveryTime LuaCode={
  544.         hide(40)
  545.     end
  546.  
  547. -   if ((cmp_obstacle_state("DesertGate", "opened")) or has_cookie("met_tania")) then
  548. +   if ((cmp_obstacle_state("DesertGate", "opened")) or has_met("Tania")) then
  549.         hide(40, 45)
  550.     end
  551.  
  552. diff --git a/dialogs/Peter.dialog b/dialogs/Peter.dialog
  553. index 367208d..1c8b1e6 100644
  554. --- a/dialogs/Peter.dialog
  555. +++ b/dialogs/Peter.dialog
  556. @@ -28,9 +28,8 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  557.  Beginning of new chat dialog for character="XXXXX"
  558.  
  559.  EveryTime LuaCode={
  560. -   if (not has_cookie("met_peter")) then
  561. +   if (not has_met("Peter")) then
  562.         show(0)
  563. -       add_cookie("met_peter")
  564.     else
  565.         tux_says_random(_"Hello.", _"Hi there.", "NO_WAIT")
  566.         npc_says_random(_"Well, hello again.", _"Hello hello.", _"Welcome back.")
  567. diff --git a/dialogs/Richard.dialog b/dialogs/Richard.dialog
  568. index 53ae4ff..287a975 100644
  569. --- a/dialogs/Richard.dialog
  570. +++ b/dialogs/Richard.dialog
  571. @@ -26,12 +26,11 @@ freedroid-discussion@lists.sourceforge.net
  572.  Beginning of new chat dialog for character="XXXXX"
  573.  
  574.  EveryTime LuaCode={
  575. -   if (not has_cookie("met_richard")) then
  576. +   if (not has_met("Richard")) then
  577.         show(0)
  578. -       add_cookie("met_richard")
  579. -   else end
  580. +   end
  581.  
  582. -   if (has_item_backpack("Kevin's Data Cube") > 0) then show(6) else end
  583. +   if (has_item_backpack("Kevin's Data Cube") > 0) then show(6) end
  584.     show(99)
  585.  }
  586.  ----------------------------------------------------------------------
  587. diff --git a/dialogs/SADD.dialog b/dialogs/SADD.dialog
  588. index 523b156..569292b 100644
  589. --- a/dialogs/SADD.dialog
  590. +++ b/dialogs/SADD.dialog
  591. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  592.  Beginning of new chat dialog for character="XXXXX"
  593.  
  594.  EveryTime LuaCode={
  595. -   if (not has_cookie("met_sadd")) then
  596. +   if (not has_met("SADD")) then
  597.         show(1)
  598. -       add_cookie("met_sadd")
  599.         set_rush_tux(0)
  600.     end
  601.  
  602. diff --git a/dialogs/Singularity.dialog b/dialogs/Singularity.dialog
  603. index 6199585..a30424f 100644
  604. --- a/dialogs/Singularity.dialog
  605. +++ b/dialogs/Singularity.dialog
  606. @@ -26,8 +26,7 @@ freedroid-discussion@lists.sourceforge.net
  607.  Beginning of new chat dialog for character="XXXXX"
  608.  
  609.  EveryTime LuaCode={
  610. -   if (not has_cookie("met_singularity")) then
  611. -       add_cookie("met_singularity")
  612. +   if (not has_met("Singularity")) then
  613.         show(0, 99)
  614.     end
  615.     if (has_quest(_"Droids are my friends")) then
  616. @@ -37,7 +36,7 @@ EveryTime LuaCode={
  617.                 add_cookie("reward_for_toolkit")
  618.             end
  619.         end
  620. -   end            
  621. +   end
  622.  }
  623.  
  624.  ----------------------------------------------------------------------
  625. diff --git a/dialogs/Skippy.dialog b/dialogs/Skippy.dialog
  626. index 03a2318..3c21d3a 100644
  627. --- a/dialogs/Skippy.dialog
  628. +++ b/dialogs/Skippy.dialog
  629. @@ -26,7 +26,6 @@ freedroid-discussion@lists.sourceforge.net
  630.  Beginning of new chat dialog for character="XXXXX"
  631.  
  632.  FirstTime LuaCode={
  633. -   add_cookie("met_skippy")
  634.     show(0, 99)
  635.  }
  636.  
  637. diff --git a/dialogs/Sorenson.dialog b/dialogs/Sorenson.dialog
  638. index 86e1215..7ef89f7 100644
  639. --- a/dialogs/Sorenson.dialog
  640. +++ b/dialogs/Sorenson.dialog
  641. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  642.  Beginning of new chat dialog for character="XXXXX"
  643.  
  644.  EveryTime LuaCode={
  645. -   if (not has_cookie("met_sorenson")) then
  646. +   if (not has_met("Sorenson")) then
  647.         show(20, 30, 40, 50)
  648. -       add_cookie("met_sorenson")
  649. -   else end
  650. +   end
  651.  
  652.     tux_says(_"Um... Hello?")
  653.     npc_says(_"AH! A Visitor! Come in! Come in!")
  654. diff --git a/dialogs/Spencer.dialog b/dialogs/Spencer.dialog
  655. index bb5833d..8b11dfa 100644
  656. --- a/dialogs/Spencer.dialog
  657. +++ b/dialogs/Spencer.dialog
  658. @@ -25,9 +25,8 @@ freedroid-discussion@lists.sourceforge.net
  659.  Beginning of new chat dialog for character="XXXXX"
  660.  
  661.  EveryTime LuaCode={
  662. -   if (not has_cookie("met_spencer")) then
  663. +   if (not has_met("Spencer")) then
  664.         show(0)
  665. -       add_cookie("met_spencer")
  666.         del_cookie("guard_follow_tux")
  667.         set_bot_state("patrol", "Town-TuxGuard")
  668.         change_obstacle_state("Dixon-autogun", "enabled")
  669. diff --git a/dialogs/Stone.dialog b/dialogs/Stone.dialog
  670. index d7e1b53..07d5033 100644
  671. --- a/dialogs/Stone.dialog
  672. +++ b/dialogs/Stone.dialog
  673. @@ -24,7 +24,7 @@ freedroid-discussion@lists.sourceforge.net
  674.  
  675.  Beginning of new chat dialog for character="XXXXX"
  676.  
  677. -FirstTime LuaCode={ add_cookie("met_stone") show(0) }
  678. +FirstTime LuaCode={ show(0) }
  679.  
  680.  EveryTime LuaCode={
  681.     if (has_cookie("stone_helping")) and
  682. diff --git a/dialogs/Tamara.dialog b/dialogs/Tamara.dialog
  683. index c74d950..8501c7c 100644
  684. --- a/dialogs/Tamara.dialog
  685. +++ b/dialogs/Tamara.dialog
  686. @@ -28,14 +28,13 @@ Remember to change =_ to only = for OptionText and Subtitle that will not need t
  687.  Beginning of new chat dialog for character="XXXXX"
  688.  
  689.  EveryTime LuaCode={
  690. -   if (not has_cookie("met_tamara")) then
  691. +   if (not has_met("Tamara")) then
  692.         tux_says(_"Hi, I'm " .. get_player_name() .. ".")
  693.         npc_says(_"Welcome to the Library, I'm Tamara.")
  694.         npc_says(_"Please take a look around and see if there is something here that interests you.")
  695.         npc_says(_"You are welcome to ask me if you have any questions.")
  696.         set_bot_name(_"Tamara -- Librarian")
  697.         show(40, 99)
  698. -       add_cookie("met_tamara")
  699.     else
  700.         npc_says(_"What can I help you with.")
  701.     end
  702. @@ -46,7 +45,7 @@ EveryTime LuaCode={
  703.         hide(20)
  704.     end
  705.  
  706. -   if (has_cookie("met_sorenson") and (not has_cookie("talked_about_sister")) ) then show(10) end
  707. +   if (has_met("Sorenson") and (not has_cookie("talked_about_sister")) ) then show(10) end
  708.  
  709.     if (has_cookie("ewalds_296_sourcebook") and (not has_cookie("have_296_book"))) then show(50) end
  710.  }
  711. diff --git a/dialogs/Tania.dialog b/dialogs/Tania.dialog
  712. index c6db435..d66691c 100644
  713. --- a/dialogs/Tania.dialog
  714. +++ b/dialogs/Tania.dialog
  715. @@ -27,7 +27,6 @@ Beginning of new chat dialog for character="XXXXX"
  716.  
  717.  FirstTime LuaCode={
  718.     show(0)
  719. -   add_cookie("met_tania")
  720.  }
  721.  
  722.  EveryTime LuaCode={
  723. @@ -362,7 +361,7 @@ LuaCode={
  724.  Nr=50 Text=_"I have some industrial coolant you could have."
  725.  LuaCode={
  726.     npc_says(_"I can't drink this.")
  727. -   if has_cookie("met_ewald") then
  728. +   if has_met("Ewald") then
  729.         tux_says(_"I've seen the town bartender put it in drinks.")
  730.         npc_says(_"I guess I'll give it a try then.")
  731.         del_item_backpack("Industrial coolant")
  732. diff --git a/dialogs/TestDroid.dialog b/dialogs/TestDroid.dialog
  733. index a320b7d..c751742 100644
  734. --- a/dialogs/TestDroid.dialog
  735. +++ b/dialogs/TestDroid.dialog
  736. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  737.  Beginning of new chat dialog for character="XXXXX"
  738.  
  739.  EveryTime LuaCode={
  740. -   if (not has_cookie("met_testdroid")) then
  741. +   if (not has_met("TestDroid")) then
  742.         show(0)
  743. -       add_cookie("met_testdroid")
  744. -   else end
  745. +   end
  746.     show(99)
  747.  }
  748.  ----------------------------------------------------------------------
  749. diff --git a/dialogs/Town-GuardhouseGuard.dialog b/dialogs/Town-GuardhouseGuard.dialog
  750. index c0b0990..5d220e9 100644
  751. --- a/dialogs/Town-GuardhouseGuard.dialog
  752. +++ b/dialogs/Town-GuardhouseGuard.dialog
  753. @@ -26,10 +26,9 @@ freedroid-discussion@lists.sourceforge.net
  754.  Beginning of new chat dialog for character="XXXXX"
  755.  
  756.  EveryTime LuaCode={
  757. -   if (not has_cookie("met_town-guardhouseguard")) then
  758. +   if (not has_met("Town-GuardhouseGuard")) then
  759.         show(0)
  760. -       add_cookie("met_town-guardhouseguard")
  761. -   else end
  762. +   end
  763.     show(99)
  764.  }
  765.  ----------------------------------------------------------------------
  766. diff --git a/dialogs/Town-NorthGateGuard.dialog b/dialogs/Town-NorthGateGuard.dialog
  767. index 9e28272..b179700 100644
  768. --- a/dialogs/Town-NorthGateGuard.dialog
  769. +++ b/dialogs/Town-NorthGateGuard.dialog
  770. @@ -25,10 +25,9 @@ freedroid-discussion@lists.sourceforge.net
  771.  Beginning of new chat dialog for character="XXXXX"
  772.  
  773.  EveryTime LuaCode={
  774. -   if (not has_cookie("met_town-northgateguard")) then
  775. +   if (not has_met("Town-NorthGateGuard")) then
  776.         npc_says(_"Hey you! Linarian! What do you want here?")
  777.         show(1, 2, 3)
  778. -       add_cookie("met_town-northgateguard")
  779.         set_rush_tux(0)
  780.         add_cookie("guard_follow_tux")
  781.     elseif will_rush_tux() then
  782. @@ -91,7 +90,7 @@ LuaCode={
  783.     npc_says(_"Heh, you sure are a curious little bird, in more than one way I might say.")
  784.     npc_says(_"On the day he visited all our computers went insane, 20 bags of food rations vanished from our storage and one of our bots was stolen.")
  785.     npc_says(_"I think that freak lives somewhere to the east. I would love to get my hands on him and beat the life out of him. Slowly.")
  786. -   if (not has_cookie("met_kevin")) then
  787. +   if (not has_met("Kevin")) then
  788.         add_quest(_"A strange guy stealing from town", _"The guard in charge at the entrance of the town mentioned that somebody sneaked into town recently, and stole food and hardware. I might want to find out who this person is - apparently he lives somewhere to the east. But maybe I should get some experience and better equipment first before traveling far outside of town. With all those lethal bots roaming around I might not get far otherwise.")
  789.     else
  790.         add_quest(_"A strange guy stealing from town", _"Ooops, the guard must be talking about Kevin. I'll better not mention I know him and where he lives or I might find myself in a holding cell or being forced to show the guards straight to his home. But I guess that explains where Kevin got that 614 bot from.")
  791. diff --git a/dialogs/Town-TeleporterGuard.dialog b/dialogs/Town-TeleporterGuard.dialog
  792. index 35fe3c8..cbf4850 100644
  793. --- a/dialogs/Town-TeleporterGuard.dialog
  794. +++ b/dialogs/Town-TeleporterGuard.dialog
  795. @@ -26,9 +26,8 @@ freedroid-discussion@lists.sourceforge.net
  796.  Beginning of new chat dialog for character="XXXXX"
  797.  
  798.  EveryTime LuaCode={
  799. -   if (not has_cookie("met_town-teleporterguard")) then
  800. +   if (not has_met("Town-TeleporterGuard")) then
  801.         show(0)
  802. -       add_cookie("met_town-teleporterguard")
  803.     end
  804.     show(99)
  805.  }
  806. diff --git a/dialogs/Tybalt.dialog b/dialogs/Tybalt.dialog
  807. index 8355c2d..9c6e55d 100644
  808. --- a/dialogs/Tybalt.dialog
  809. +++ b/dialogs/Tybalt.dialog
  810. @@ -26,14 +26,13 @@ freedroid-discussion@lists.sourceforge.net
  811.  Beginning of new chat dialog for character="XXXXX"
  812.  
  813.  EveryTime LuaCode={
  814. -   if (not has_cookie("met_tybalt")) then
  815. +   if (not has_met("Tybalt")) then
  816.         show(0)
  817. -       add_cookie("met_tybalt")
  818.     else show(2) end
  819.  
  820.     if (has_cookie("tux_has_joined_guard")) then
  821.         hide(50, 54, 55, 56)
  822. -        else end
  823. +   end
  824.  
  825.     show(99)
  826.  }
  827. @@ -63,7 +62,7 @@ LuaCode={
  828.         npc_says(_"Sorry pal, but I don't think so. Only authorized personnel are permitted and that means members of the Red Guard.")
  829.         npc_says(_"Talk to Spencer if you have any business inside. I cannot let you pass.")
  830.         -- do we propose a bribe ?
  831. -       if(not has_cookie("tybalt_bribe")) then show(50) else end
  832. +       if (not has_cookie("tybalt_bribe")) then show(50) end
  833.     end
  834.     hide(2)
  835.  }
  836. diff --git a/dialogs/WillGapes.dialog b/dialogs/WillGapes.dialog
  837. index 52710d3..4d3031f 100644
  838. --- a/dialogs/WillGapes.dialog
  839. +++ b/dialogs/WillGapes.dialog
  840. @@ -24,16 +24,15 @@ freedroid-discussion@lists.sourceforge.net
  841.  Beginning of new chat dialog for character="XXXXX"
  842.  
  843.  EveryTime LuaCode={
  844. -   if (not has_cookie("met_willgapes")) then
  845. +   if (not has_met("WillGapes")) then
  846.         npc_says(_"Don't come any closer! Or I'll turn you into scrap metal!")
  847.         npc_says(_"Wait... You're not a robot. Who are you? What are you doing here?")
  848. -       add_cookie("met_willgapes")
  849.         show(1, 2, 3)
  850.     elseif (has_quest(_"Gapes Gluttony")) and (not done_quest(_"Gapes Gluttony")) then
  851.          if (has_item_backpack("Lunch in a Picnic Basket") > 0) then
  852.             del_item_backpack("Lunch in a Picnic Basket")
  853.             show (9)
  854. -       else
  855. +       else
  856.             npc_says(_"Have you brought me some food?")
  857.             tux_says(_"No, not yet.")
  858.             npc_says(_"Hurry... I'm starting to feel weak.")
  859. diff --git a/dialogs/c-net.dialog b/dialogs/c-net.dialog
  860. index bbadf95..2ad5f65 100644
  861. --- a/dialogs/c-net.dialog
  862. +++ b/dialogs/c-net.dialog
  863. @@ -301,7 +301,7 @@ LuaCode={
  864.         show(66)
  865.     elseif (username =="lily") then -- no special files yet
  866.     elseif (username =="cpain") then -- no special files yet
  867. -   else end
  868. +   end
  869.     cli_says(terminal, "NO_WAIT")
  870.     show(31) hide(10, 20, 30, 80, 99)
  871.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!