Guest User

Untitled

a guest
Jan 27th, 2021
438
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 63.27 KB | None | 0 0
  1. diff -r 1.6.0/AI_NPC_Indoor.evfl.txt 1.7.0/AI_NPC_Indoor.evfl.txt
  2. 52a53,57
  3. > flow Carnival():
  4. >     if (EventFlowSystemActor.GlobalEventNow('Carnival', 'cMainOnly', false)) and (MainNpc.CheckNpcSchedule('cCarnival')):
  5. >         MainNpc.NpcChangeAIState('cBlockWander', 'NNPC_Talk_Sequence', 'Root', '', true, true)
  6. >         EventFlowSystemActor.ExitFlowchart()
  7. >
  8. 76,77c81,83
  9. <     if (EventFlowSystemActor.GlobalEventNow('HarvestFestival', 'cMainOnly', false)) and (EventFlowSystemActor.EventCheck('HarvestFestival') == 1) and (MainNpc.CheckNpcSchedule('cHarvestFestival')):
  10. <         if (MainNpc.NpcCheckStateSelectTiming('cTalkEnd')) and (MainNpc.EventFlags['cNpcTemp:TalkEndWait']):
  11. ---
  12. >     if (EventFlowSystemActor.GlobalEventNow('HarvestFestival', 'cMainOnly', false)) and (MainNpc.CheckNpcSchedule('cHarvestFestival')):
  13. >         MainNpc.SetDefaultWaitAs('cDefault')
  14. >         if MainNpc.NpcCheckStateSelectTiming('cTalkEnd'):
  15. 79d84
  16. <             MainNpc.EventFlags['cNpcTemp:TalkEndWait'] = false
  17. 104,105c109
  18. <         run Halloween()
  19. <         run Harvest()
  20. ---
  21. >         run SeasonEvent()
  22. 181a186,190
  23. >
  24. > flow SeasonEvent():
  25. >     run Halloween()
  26. >     run Harvest()
  27. >     run Carnival()
  28. diff -r 1.6.0/AI_NPC_Outdoor.evfl.txt 1.7.0/AI_NPC_Outdoor.evfl.txt
  29. 112a113,137
  30. > flow Carnival():
  31. >     switch MainNpc.DevideCarnivalEventState():
  32. >         case 0:
  33. >             MainNpc.NpcChangeAIState('cCarnivalWanderWait', '', '', '', false, true)
  34. >             EventFlowSystemActor.ExitFlowchart()
  35. >         case 1:
  36. >             MainNpc.SetNpcFeel('cHappy', -1)
  37. >             MainNpc.NpcChangeGoToDestinationState('cGoToDestination', '', '', '', false, true, 4, -1, -1)
  38. >             EventFlowSystemActor.ExitFlowchart()
  39. >         case 2:
  40. >             if System.EventFlags['cLand:CarnivalEventPlazaNpcWander']:
  41. >                 MainNpc.NpcChangeAIState('cCarnivalWanderWait', '', '', '', false, true)
  42. >                 EventFlowSystemActor.ExitFlowchart()
  43. >             else:
  44. >                 MainNpc.SetNpcFeel('cNormal', -1)
  45. >                 MainNpc.NpcChangeAIState('cCarnivalPlazaWait', '', '', '', false, true)
  46. >                 EventFlowSystemActor.ExitFlowchart()
  47. >         case 3:
  48. >             MainNpc.SetNpcFeel('cHappy', -1)
  49. >             MainNpc.NpcChangeGoToDestinationState('cGoToDestination', '', '', '', false, true, 2, -1, -1)
  50. >             EventFlowSystemActor.ExitFlowchart()
  51. >         case 4:
  52. >             MainNpc.NpcChangeAIState('cCarnivalWanderWait', '', '', '', false, true)
  53. >             EventFlowSystemActor.ExitFlowchart()
  54. >
  55. 120,121c145,150
  56. <             if (MainNpc.NpcCheckStateSelectTiming('cChangeMainPlayer')) and (MainNpc.CheckCurrentNpcAIState('cHarvestDemoAction') == 0):
  57. <                 run Sub_Event321()
  58. ---
  59. >             MainNpc.EventFlags['cNpcSave:HarvestDemoStateNow'] = false
  60. >             if not MainNpc.NpcCheckStateSelectTiming('cOther'):
  61. >                 MainNpc.EventFlags['cNpcSave:HarvestDemoEndWait'] = false
  62. >             elif MainNpc.EventFlags['cNpcSave:HarvestDemoEndWait']:
  63. >                 MainNpc.NpcChangeAIState('cHarvestDemoEnd', 'NNPC_Talk_Sequence', '', '', false, false)
  64. >                 run Sub_Event280()
  65. 129c158,159
  66. <             run Sub_Event321()
  67. ---
  68. >             MainNpc.NpcChangeAIState('cHarvestDemoAction', 'NNPC_Talk_Sequence', '', '', false, true)
  69. >             run Sub_Event280()
  70. 379,381c409
  71. <             if (System.EventFlags['cLand:HarvestProgress'] >= 4) and (EventFlowSystemActor.EnvHourCompare(0, -1, true, true) == 0):
  72. <                 MainNpc.SetNpcFeel('cHappy', -1)
  73. <             else:
  74. ---
  75. >             if System.EventFlags['cLand:HarvestProgress'] < 4:
  76. 382a411,412
  77. >             else:
  78. >                 MainNpc.SetNpcFeel('cHappy', -1)
  79. 493a524
  80. >     run Carnival()
  81. 529,532d559
  82. <
  83. < local flow Sub_Event321():
  84. <     MainNpc.NpcChangeAIState('cHarvestDemoAction', 'NNPC_Talk_Sequence', '', '', false, true)
  85. <     run Sub_Event280()
  86. Only in 1.7.0: AI_NPC_Pck.evfl.txt
  87. Only in 1.6.0: AI_NPC_Quest_VisitN.evfl.txt
  88. Only in 1.6.0: AI_NPC_Quest_VisitP.evfl.txt
  89. diff -r 1.6.0/Demo_PublicAnnouncement_21_CmnEvChk.evfl.txt 1.7.0/Demo_PublicAnnouncement_21_CmnEvChk.evfl.txt
  90. 33,35c33,35
  91. <             elif (SubflowResults[0] == 0) and (not System.EventFlags['cPlayer:TownNewsHeardShopOpen1Flag']):
  92. <                 if System.EventFlags['cLand:MarketOpen1stDay1']:
  93. <                     SubflowResults[7] = 1
  94. ---
  95. >             elif SubflowResults[0] == 0:
  96. >                 if System.EventFlags['cPlayer:TownNewsHeardShopOpen1Flag']:
  97. >                     run CmnPhoneCallImmQ()
  98. 37,40c37,43
  99. <                     SubflowResults[7] = 2
  100. <                 System.EventFlags['cPlayer:TownNewsHeardShopOpen1Flag'] = true
  101. <                 run CmnPhoneCallImmQ()
  102. <                 SubflowResults[4] = 1
  103. ---
  104. >                     if System.EventFlags['cLand:MarketOpen1stDay1']:
  105. >                         SubflowResults[7] = 1
  106. >                     else:
  107. >                         SubflowResults[7] = 2
  108. >                     System.EventFlags['cPlayer:TownNewsHeardShopOpen1Flag'] = true
  109. >                     run CmnPhoneCallImmQ()
  110. >                     SubflowResults[4] = 1
  111. 155,162c158,166
  112. <     run CmnMoveInChk()
  113. <     run CmnFacilitiesChk()
  114. <     run CmnMoveOutChk()
  115. <     run CmnFoxVisitChk()
  116. <     if SubflowResults[0] == 0:
  117. <         run ChkOfficeNews()
  118. <     else:
  119. <         run SzaNoNewsNmlChk()
  120. ---
  121. >     if not System.EventFlags['cLandTemp:ReserveMemErrorReenter']:
  122. >         run CmnMoveInChk()
  123. >         run CmnFacilitiesChk()
  124. >         run CmnMoveOutChk()
  125. >         run CmnFoxVisitChk()
  126. >         if SubflowResults[0] == 0:
  127. >             run ChkOfficeNews()
  128. >         else:
  129. >             run SzaNoNewsNmlChk()
  130. diff -r 1.6.0/Demo_PublicAnnouncement_50_CmnGEventInfo.evfl.txt 1.7.0/Demo_PublicAnnouncement_50_CmnGEventInfo.evfl.txt
  131. 0a1,9
  132. > flow Carnival_Sza():
  133. >     if (EventFlowSystemActor.GlobalEventNow('Carnival', 'cMainOnly', false)) and (EventFlowSystemActor.EventCheck('Carnival') == 1):
  134. >         run Conjunction_Sza()
  135. >         # (Festivale will be happening all day today. ( (I want everyone to go out and show off your best dance moves!
  136. >         MainNpc.OpenMessageWindow('TalkSNpc/PublicAnnouncement/SP_PublicAnnouncement_01_Sza:008_11_01', false)
  137. >         System.EventFlags['cLand:TownNewsHeardEventStarted'] = true
  138. >         System.EventFlags['cPlayer:AnnounceCarnival'] = true
  139. >         SubflowResults[15] = 1
  140. >
  141. 348a358
  142. >         run Carnival_Sza()
  143. diff -r 1.6.0/Demo_PublicAnnouncement.evfl.txt 1.7.0/Demo_PublicAnnouncement.evfl.txt
  144. 36a37
  145. >         EventFlowSystemActor.MessageSuspend()
  146. 46,47c47,48
  147. <     EventFlowSystemActor.MessageSuspend()
  148. <     System.EventFlags['cLand:PAnnounceToday'] = true
  149. ---
  150. >         EventFlowSystemActor.MessageSuspend()
  151. >         System.EventFlags['cLand:PAnnounceToday'] = true
  152. 57d57
  153. <     System.EventFlags['cLand:PAnnounceCeremony1st'] = true
  154. 65c65,66
  155. <         run Sub_Event81()
  156. ---
  157. >         EventFlowSystemActor.MessageSuspend()
  158. >         run Skip_TkkFirstLive()
  159. 66a68
  160. >         System.EventFlags['cLand:PAnnounceCeremony1st'] = true
  161. 80,83c82,86
  162. <     System.EventFlags['cPlayer:AmountHeardPublicAnnouncement'] += 1
  163. <     System.EventFlags['cPlayer:TownNewsReserve'] = false
  164. <     System.EventFlags['cLandTemp:ReserveAfterHookPublicAnouncement'] = true
  165. <     run Demo_PublicAnnouncement_Process::Root()
  166. ---
  167. >     if not System.EventFlags['cLandTemp:ReserveMemErrorReenter']:
  168. >         System.EventFlags['cPlayer:AmountHeardPublicAnnouncement'] += 1
  169. >         System.EventFlags['cPlayer:TownNewsReserve'] = false
  170. >         System.EventFlags['cLandTemp:ReserveAfterHookPublicAnouncement'] = true
  171. >         run Demo_PublicAnnouncement_Process::Root()
  172. diff -r 1.6.0/NNPC_ApproachF_MoveinGift.evfl.txt 1.7.0/NNPC_ApproachF_MoveinGift.evfl.txt
  173. 68c68
  174. <         # < (222}!  I made it back on my last island.(5 It's the best one I've ever made. No sharp edges, no bad smells, and weighs what it's supposed to! 2}(2!...
  175. ---
  176. >         # < (222}!  I made it back on my last island.(5 It's the best one I've ever made. No sharp edges, no bad smells, and weighs what it's supposed to! ( 22}...
  177. diff -r 1.6.0/NNPC_FreeEF.evfl.txt 1.7.0/NNPC_FreeEF.evfl.txt
  178. 14c14
  179. <             if (not System.EventFlags['cLand:AnyGlobalEventFinished']) and (not EventFlowSystemActor.EnvCheckBetweenDate(10, 26, 10, 30, 'cLastGrowUpTime')) and (not EventFlowSystemActor.CheckNearEvent(5, 'HarvestFestival', 1, false)) and (not EventFlowSystemActor.CheckNearEvent(5, 'XmasEve', 1, false)):
  180. ---
  181. >             if (not System.EventFlags['cLand:AnyGlobalEventFinished']) and (not EventFlowSystemActor.EnvCheckBetweenDate(10, 26, 10, 30, 'cLastGrowUpTime')) and (not EventFlowSystemActor.CheckNearEvent(5, 'HarvestFestival', 1, false)) and (not EventFlowSystemActor.CheckNearEvent(5, 'XmasEve', 1, false)) and (not EventFlowSystemActor.CheckNearEvent(5, 'Carnival', 1, false)):
  182. diff -r 1.6.0/NNPC_GE_Conv_KO.evfl.txt 1.7.0/NNPC_GE_Conv_KO.evfl.txt
  183. 37c37
  184. <             # But aren't (( those good things?(  (&How's that bonkers?  ( WHAT IS BONKERS?!((
  185. ---
  186. >             # But isn't (( that a good thing?(  (&How's that bonkers?  ( WHAT IS BONKERS?!((
  187. diff -r 1.6.0/NNPC_GEvent_BirthdayN_G.evfl.txt 1.7.0/NNPC_GEvent_BirthdayN_G.evfl.txt
  188. 34c34
  189. <             run Sub_grp_Event9()
  190. ---
  191. >             run Sub_Event36()
  192. 39c39
  193. <             run Sub_grp_Event9()
  194. ---
  195. >             run Sub_Event36()
  196. 43,55c43,44
  197. < local flow Sub_grp_Event8():
  198. <     switch EventFlowSystemActor.RandomChoiceExcludePrevious3(true, 3):
  199. <         case 0:
  200. <             # Did you give s your present, n?Make sure you don't forget! ("Because I'd forget, a huh huh huh.
  201. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:010', true)
  202. <         case 1:
  203. <             # (8I get all nervous when I give a present, because I worry it might not be a hit.((But you got nothing to worry about! ( (Your present will for sure b...
  204. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:011', true)
  205. <         case 2:
  206. <             # ()You know how they say presents should be something you would want for yourself?(I dunno if s wants a 10-pound bag of - flavored snack chips,  but I ...
  207. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:012', true)
  208. <
  209. < local flow Sub_grp_Event9():
  210. ---
  211. > local flow Sub_Event36():
  212. >     run ValentineChk()
  213. 71a61,93
  214. >
  215. > local flow Sub_grp_Event8():
  216. >     switch EventFlowSystemActor.RandomChoiceExcludePrevious3(true, 3):
  217. >         case 0:
  218. >             # Did you give s your present, n?Make sure you don't forget! ("Because I'd forget, a huh huh huh.
  219. >             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:010', true)
  220. >         case 1:
  221. >             # (8I get all nervous when I give a present, because I worry it might not be a hit.((But you got nothing to worry about! ( (Your present will for sure b...
  222. >             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:011', true)
  223. >         case 2:
  224. >             # ()You know how they say presents should be something you would want for yourself?(I dunno if s wants a 10-pound bag of - flavored snack chips,  but I ...
  225. >             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:012', true)
  226. >
  227. > flow ValentineChk():
  228. >     if (EventFlowSystemActor.TermEventNow('Valentine', false)) and (EventFlowSystemActor.HaveValentineItem()) and (not MainNpc.EventFlags['cNpcMemory:ValentinePresentFlag']):
  229. >         run NNPC_Talk_General::PresentAvailable_Chk()
  230. >         if (MainNpc.EventFlags['cNpcMemory:ReceivedFirstPresent']) and (MainNpc.EventFlags['cNpcMemory:FriendshipBecomeAcqH']):
  231. >             switch EventFlowSystemActor.RandomChoiceExcludePrevious3(true, 3):
  232. >                 case 0:
  233. >                     # (1I wanna have a birthday party just like this!  With all my favorite foods, and my friends too!( Oh!  Maybe I could even move my birthday to Valentin...
  234. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:020', false)
  235. >                 case 1:
  236. >                     # (2s is having a real good Valentine's Day, huh?(And it's 2hisher birthday too! ( (That's even better, n!
  237. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:021', false)
  238. >                 case 2:
  239. >                     # (&What happens if s gets too old to fit all the candles on one birthday cake?(Would 2heshe just put candles on 2hisher Valentine's Day cake?  Or would...
  240. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_G:022', false)
  241. >             if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  242. >                 run NNPC_Select_Present::Valentine()
  243. >                 EventFlowSystemActor.ExitFlowchart()
  244. >             else:
  245. >                 EventFlowSystemActor.WaitFrame(1)
  246. >                 EventFlowSystemActor.ExitFlowchart()
  247. diff -r 1.6.0/NNPC_GEvent_BirthdayN_H.evfl.txt 1.7.0/NNPC_GEvent_BirthdayN_H.evfl.txt
  248. 9c9,17
  249. <     MainNpc.SetItemToNpcStockList(0, 1)
  250. ---
  251. >     if EventFlowSystemActor.TermEventNow('Valentine', false):
  252. >         if EventFlowSystemActor.MultiItemSelectInclude(14029, 65534, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  253. >             MainNpc.RegistValentinePresentInfo()
  254. >         else:
  255. >             if not EventFlowSystemActor.MultiItemSelectInclude(13488, 65534, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  256. >                 MainNpc.SetItemToNpcStockList(0, 1)
  257. >         MainNpc.EventFlags['cNpcMemory:ValentinePresentFlag'] = true
  258. >     else:
  259. >         MainNpc.SetItemToNpcStockList(0, 1)
  260. 188a197
  261. >         run ValentineChk()
  262. 314c323
  263. <             # (Ooooooooo is that ( 2}? ( (I thought I smelled yumminess!Thanks, n.
  264. ---
  265. >             # (Oooooo, did you bring me something yummy?  (1Could it benmy favorite?  22}?(Thanks, n.
  266. 316,347c325,363
  267. <     elif EventFlowSystemActor.ItemIsDecoratedAtTalkNpcHouse('cItemSelect'):
  268. <         # (Ooh, wow! You got me 2}!(I have one already, but this is justn  (2It's just real awesome that you know what I like. ((
  269. <         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:018', false)
  270. <     elif EventFlowSystemActor.UISelectedItemIsEquiped(0, 'cItemSelect', false):
  271. <         if EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', '', '', '', '', '', '', 'cItemSelect'):
  272. <             # (22}?! < I love wearing this stuff!(%Now, if I drop food on my shirt, I can use this as a backup. ( I bet ("I'm gonna wear this a bunch.
  273. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019', false)
  274. <         elif (EventFlowSystemActor.MultiKindItemSelectInclude('Cap', '', '', '', '', '', '', '', 'cItemSelect')) and (not EventFlowSystemActor.MultiMessageCategoryItemSelectInclude('HeadHairAcce', '', '', '', '', '', '', '', 'cItemSelect')):
  275. <             # (My very favorite head-clothes!  22}!(It's just too bad I don't have extra heads or I would wear all of 'em at once, n!
  276. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019_01', false)
  277. <         else:
  278. <             # (Oh! Oh! Oh!  You got me 2 }! Yay!()This is great!  I was gonna lose mine tomorrow,  but that's OK now 'cause I have extra, n!  ("Thanks!
  279. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019_02', false)
  280. <     elif EventFlowSystemActor.UISelectedItemIsEquiped(8, 'cItemSelect', false):
  281. <         if EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', '', '', '', '', '', '', 'cItemSelect'):
  282. <             # (It's the } that you're wearing!(2A huh huh huh, we're totally } twins. <(
  283. <             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020', false)
  284. <         elif EventFlowSystemActor.MultiKindItemSelectInclude('Cap', '', '', '', '', '', '', '', 'cItemSelect'):
  285. <             if EventFlowSystemActor.MultiMessageCategoryItemSelectInclude('HeadHairAcce', '', '', '', '', '', '', '', 'cItemSelect'):
  286. <                 # (Hey, wait!  (&Don't you have 2 } too?(You do!  Right there!  On yournyou!  (And now mine can be on mynme whenever I want, n!  Yay!
  287. <                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_02', false)
  288. <             else:
  289. <                 # ( Wow!  You got me your head's super cool }!()Now all you have to do is make a face like a n and we can be head-twins, n!
  290. <                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_01', false)
  291. <         else:
  292. <             if EventFlowSystemActor.MultiKindItemSelectInclude('Accessory', '', '', '', '', '', '', '', 'cItemSelect'):
  293. <                 # (Hey, wait!  (&Don't you have 2 } too?(You do!  Right there!  On yournyou!  (And now mine can be on mynme whenever I want, n!  Yay!
  294. <                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_02', false)
  295. <             else:
  296. <                 run Sub_grp_Event130()
  297. <     else:
  298. <         run Sub_grp_Event130()
  299. ---
  300. >     elif (EventFlowSystemActor.TermEventNow('Valentine', false)) and (EventFlowSystemActor.MultiItemSelectInclude(13488, 14029, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect')):
  301. >         MainNpc.EventFlags['cNpcMemory:IsReceiptWrappingItem'] = true
  302. >         if EventFlowSystemActor.MultiItemSelectInclude(14029, 65534, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  303. >             MainNpc.RegistValentinePresentInfo()
  304. >         # (Wait!  Hang on!  Whoa!  You got me 2}?!(Wow!  You remembered my birthday!  I usually get forgotten with all the Valentine's Day stuff going on.()Birt...
  305. >         MainNpc.OpenMessageWindow('TalkNNpc/G4_An/GEvent/AN_GEvent_BirthdayN_H:036', false)
  306. >     else:
  307. >         if EventFlowSystemActor.ItemIsDecoratedAtTalkNpcHouse('cItemSelect'):
  308. >             # (Ooh, wow! You got me 2}!(It's funny because I already have 2}!(2But it's also awesome that you know what I like, n.
  309. >             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:018', false)
  310. >         elif EventFlowSystemActor.UISelectedItemIsEquiped(0, 'cItemSelect', false):
  311. >             if EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', '', '', '', '', '', '', 'cItemSelect'):
  312. >                 # (22}?! < I love wearing this stuff!(%Now, if I drop food on my shirt, I can use this as a backup. ( I bet ("I'm gonna wear this a bunch.
  313. >                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019', false)
  314. >             elif (EventFlowSystemActor.MultiKindItemSelectInclude('Cap', '', '', '', '', '', '', '', 'cItemSelect')) and (not EventFlowSystemActor.MultiMessageCategoryItemSelectInclude('HeadHairAcce', '', '', '', '', '', '', '', 'cItemSelect')):
  315. >                 # (My very favorite head-clothes!  22}!(It's just too bad I don't have extra heads or I would wear all of 'em at once, n!
  316. >                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019_01', false)
  317. >             else:
  318. >                 # (Oh! Oh! Oh!  You got me 2 }! Yay!()This is great!  I was gonna lose mine tomorrow,  but that's OK now 'cause I have extra, n!  ("Thanks!
  319. >                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:019_02', false)
  320. >         elif EventFlowSystemActor.UISelectedItemIsEquiped(8, 'cItemSelect', false):
  321. >             if EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', '', '', '', '', '', '', 'cItemSelect'):
  322. >                 # (It's the } that you're wearing!(2A huh huh huh, we're totally } twins. <(
  323. >                 MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020', false)
  324. >             elif EventFlowSystemActor.MultiKindItemSelectInclude('Cap', '', '', '', '', '', '', '', 'cItemSelect'):
  325. >                 if EventFlowSystemActor.MultiMessageCategoryItemSelectInclude('HeadHairAcce', '', '', '', '', '', '', '', 'cItemSelect'):
  326. >                     # (Hey, wait!  (&Don't you have 2 } too?(You do!  Right there!  On yournyou!  (And now mine can be on mynme whenever I want, n!  Yay!
  327. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_02', false)
  328. >                 else:
  329. >                     # ( Wow!  You got me your head's super cool }!()Now all you have to do is make a face like a n and we can be head-twins, n!
  330. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_01', false)
  331. >             else:
  332. >                 if EventFlowSystemActor.MultiKindItemSelectInclude('Accessory', '', '', '', '', '', '', '', 'cItemSelect'):
  333. >                     # (Hey, wait!  (&Don't you have 2 } too?(You do!  Right there!  On yournyou!  (And now mine can be on mynme whenever I want, n!  Yay!
  334. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/GEvent/BO_GEvent_BirthdayN_H:020_02', false)
  335. >                 else:
  336. >                     run Sub_grp_Event130()
  337. >         else:
  338. >             run Sub_grp_Event130()
  339. 406a423,443
  340. >
  341. > flow ValentineChk():
  342. >     if (EventFlowSystemActor.TermEventNow('Valentine', false)) and (EventFlowSystemActor.HaveValentineItem()) and (not MainNpc.EventFlags['cNpcMemory:ValentinePresentFlag']):
  343. >         run NNPC_Talk_General::PresentAvailable_Chk()
  344. >         if (MainNpc.EventFlags['cNpcMemory:ReceivedFirstPresent']) and (MainNpc.EventFlags['cNpcMemory:FriendshipBecomeAcqH']):
  345. >             switch EventFlowSystemActor.RandomChoiceExcludePrevious3(true, 3):
  346. >                 case 0:
  347. >                     # (%It's so rad everyone came out for my birthday today. ( (Ornmaybe they're only here to exchange valentines?(Nah, it's gotta be for me. (I mean, just ...
  348. >                     MainNpc.OpenMessageWindow('TalkNNpc/G4_An/GEvent/AN_GEvent_BirthdayN_H:101', false)
  349. >                 case 1:
  350. >                     # (9I wanna see everyone rockin' out like it's both your best buddy's birthday AND Valentine's Dayn('cause it is!
  351. >                     MainNpc.OpenMessageWindow('TalkNNpc/G4_An/GEvent/AN_GEvent_BirthdayN_H:102', false)
  352. >                 case 2:
  353. >                     # (Having my birthday on Valentine's Day kinda rocks, honestly.  Double parties are a total blast!  (Bwa ha ha!
  354. >                     MainNpc.OpenMessageWindow('TalkNNpc/G4_An/GEvent/AN_GEvent_BirthdayN_H:103', false)
  355. >             if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  356. >                 run NNPC_Select_Present::Valentine()
  357. >                 EventFlowSystemActor.ExitFlowchart()
  358. >             else:
  359. >                 EventFlowSystemActor.WaitFrame(1)
  360. >                 EventFlowSystemActor.ExitFlowchart()
  361. Only in 1.7.0: NNPC_GEvent_Carnival.evfl.txt
  362. diff -r 1.6.0/NNPC_GEvent_Countdown.evfl.txt 1.7.0/NNPC_GEvent_Countdown.evfl.txt
  363. 68c68
  364. <                 # (It's time! ( Do you have (;your party popper ready, n?! x
  365. ---
  366. >                 # (It's time! ( Do you have (;your light stick ready, n?! x
  367. 71c71
  368. <                 # (%So it's threen twon onen zero  and then we pop the party poppers, yeah? ( (A huh huh, I can't wait. x
  369. ---
  370. >                 # (%So it's threen twon onen zero  and then we wave the light sticks, yeah? ( (A huh huh, I can't wait. x
  371. 228c228
  372. <     if EventFlowSystemActor.EventCheck('Countdown') == 1:
  373. ---
  374. >     if EventFlowSystemActor.EventCheck('Countdown') in (1, 2):
  375. 243a244
  376. >         MainNpc.EventFlags['cNpcSave:WoreNewYearHat'] = true
  377. 254a256
  378. >         MainNpc.EventFlags['cNpcSave:WoreNewYearHat'] = true
  379. 267a270
  380. >         MainNpc.EventFlags['cNpcSave:WoreNewYearHat'] = true
  381. 278a282
  382. >         MainNpc.EventFlags['cNpcSave:WoreNewYearHat'] = true
  383. diff -r 1.6.0/NNPC_GEvent_Harvest.evfl.txt 1.7.0/NNPC_GEvent_Harvest.evfl.txt
  384. 410d409
  385. <                 MainNpc.EventFlags['cNpcTemp:TalkEndWait'] = true
  386. diff -r 1.6.0/NNPC_Quest_CatchFishInsect_Begin.evfl.txt 1.7.0/NNPC_Quest_CatchFishInsect_Begin.evfl.txt
  387. 29c29
  388. <                     MainNpc.QuestStartOpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:104', false, false)
  389. ---
  390. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:104', false)
  391. 40c40
  392. <                     MainNpc.QuestStartOpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:106', false, false)
  393. ---
  394. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:106', false)
  395. 53c53
  396. <                     MainNpc.QuestStartOpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:204', false, false)
  397. ---
  398. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:204', false)
  399. 64c64
  400. <                     MainNpc.QuestStartOpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:206', false, false)
  401. ---
  402. >                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Quest/BO_Quest_CatchFishInsect_Begin:206', false)
  403. 105c105
  404. <             # (Didja know horned beetles wrestle each other? It'd be cool to see them training for a match.n(Can you catch ($one for me? ( (Any kind of horned beetl...
  405. ---
  406. >             # (Didja know horned beetles wrestle each other? It'd be cool to see them training for a matchn(Can you catch ($one for me? ( (Any kind of horned beetle...
  407. diff -r 1.6.0/NNPC_Quest_CatchFishInsect_End.evfl.txt 1.7.0/NNPC_Quest_CatchFishInsect_End.evfl.txt
  408. 40c40
  409. <             # I really ( want a dragonfly! ( (8They fly real fast,  so make sure you sneak up, like, reaaal slow.
  410. ---
  411. >             # I really( want a dragonfly! ( (8They fly real fast,  so make sure you sneak up, like, reaaal slow.
  412. 228c228
  413. <                 # A huh huh huh! ( Here ya go! (22}! (  From me to you!  Me to you.
  414. ---
  415. >                 # A huh huh huh! ( Hope you like it.  (It's 2}!
  416. diff -r 1.6.0/NNPC_Reaction_First_Acquaintance.evfl.txt 1.7.0/NNPC_Reaction_First_Acquaintance.evfl.txt
  417. 163c163
  418. <         # Heyn You'ren I know youn (umn2n, right? ( (+Sorry, my brain isn't plugged all the way in right now. I have a cold.(I moved here the other day,  but I ...
  419. ---
  420. >         # Heyn You'ren I know youn (umn 2n, right?(+Sorry, my brain isn't plugged all the way in right now. I have a cold.(Well, I live here now,  but I haven't...
  421. 171a172,182
  422. > flow A421():
  423. >     if MainNpc.NpcIsQuestClient('cSick', false, false):
  424. >         # Heyn You'ren I know youn (umn 2n, right?(+Sorry, my brain isn't plugged all the way in right now. I have a cold.(Well, I live here now,  but I haven't...
  425. >         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/React/BO_React_First_Acquaintance:424', false)
  426. >     elif (not MainNpc.NpcLivingDays(1)) and (MainNpc.NpcIsMovingRoom() == 0):
  427. >         # ( It's ( n! ( (Remember that time we met?  I kinda do!It's me! n ! Remember? n ? That's me!( I didn't know you lived on  n!I just moved here today bec...
  428. >         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/React/BO_React_First_Acquaintance:421', false)
  429. >     else:
  430. >         # Huh? 2 n?! ( (&What the heck are you doing here?( YOU live here on   n?(5Oh man,  no way!  (;Me!  Too! <(I'm so happy we live  on the same island now,...
  431. >         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/React/BO_React_First_Acquaintance:422', false)
  432. >
  433. 180a192,193
  434. >             else:
  435. >                 run A421()
  436. diff -r 1.6.0/NNPC_Select_Etc.evfl.txt 1.7.0/NNPC_Select_Etc.evfl.txt
  437. 1,3d0
  438. < flow Bouquet_Chk():
  439. <     MainNpc.Dummy('部屋に飾る的なアクション')
  440. <
  441. 68,81d64
  442. <
  443. < flow Opposite_Sex():
  444. <     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:516', false)
  445. <     MainNpc.NpcDelivery(3, '"Default"')
  446. <     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:517', false)
  447. <     MainNpc.NpcAddFriendship(2)
  448. <     run Bouquet_Chk()
  449. <
  450. < flow Same_Sex():
  451. <     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:514', false)
  452. <     MainNpc.NpcDelivery(3, '"Default"')
  453. <     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:515', false)
  454. <     MainNpc.NpcAddFriendship(2)
  455. <     run Bouquet_Chk()
  456. diff -r 1.6.0/NNPC_Select_Furniture.evfl.txt 1.7.0/NNPC_Select_Furniture.evfl.txt
  457. 6a7,10
  458. > flow Bouquet_Chk():
  459. >     if EventFlowSystemActor.MultiItemSelectInclude(14029, 65534, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  460. >         MainNpc.RegistValentinePresentInfo()
  461. >
  462. 65a70,80
  463. > flow Opposite_Sex():
  464. >     run ValentineItem_Chk()
  465. >     # (Huh?  But why would you get me 2}?(2Oh!  It's Valentine's Day!  Riiiiiiiightn(4Sorry, I was just surprised.  But it's a good surprised.  Like when yo...
  466. >     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:514', false)
  467. >     MainNpc.NpcDelivery(3, '"Default"')
  468. >     EventFlowSystemActor.SystemDeletePlayerItem('cItemWindowSub', 1)
  469. >     # (You're the best!  Happy Valentine's Day, n!
  470. >     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:515', false)
  471. >     MainNpc.NpcAddFriendship(2)
  472. >     run Bouquet_Chk()
  473. >
  474. 83a99,109
  475. > flow Same_Sex():
  476. >     run ValentineItem_Chk()
  477. >     # (Huh?  But why would you get me 2}?(2Oh!  It's Valentine's Day!  Riiiiiiiightn(4Sorry, I was just surprised.  But it's a good surprised.  Like when yo...
  478. >     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:516', false)
  479. >     MainNpc.NpcDelivery(3, '"Default"')
  480. >     EventFlowSystemActor.SystemDeletePlayerItem('cItemWindowSub', 1)
  481. >     # (You're the best!  Happy Valentine's Day, n!
  482. >     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_Present:517', false)
  483. >     MainNpc.NpcAddFriendship(2)
  484. >     run Bouquet_Chk()
  485. >
  486. 86a113,136
  487. >
  488. > flow ValentineItem_Chk():
  489. >     if EventFlowSystemActor.MultiItemSelectInclude(14029, 65534, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  490. >         MainNpc.SetDeliveryItemAtRandom(14029, false, 'cVillageRemakePattern', 0)
  491. >     else:
  492. >         MainNpc.SetDeliveryItemAtRandom(13488, false, 'cVillageRemakePattern', 0)
  493. >
  494. > flow ValentinePresent():
  495. >     if EventFlowSystemActor.PlayerGender() == 0:
  496. >         switch MainNpc.CheckNpcLook():
  497. >             case 0, 1, 2, 3:
  498. >                 run Opposite_Sex()
  499. >             case 4, 5, 6, 7:
  500. >                 run Same_Sex()
  501. >             default:
  502. >                 return
  503. >     else:
  504. >         switch MainNpc.CheckNpcLook():
  505. >             case 0, 1, 2, 3:
  506. >                 run Same_Sex()
  507. >             case 4, 5, 6, 7:
  508. >                 run Opposite_Sex()
  509. >             default:
  510. >                 return
  511. diff -r 1.6.0/NNPC_Select_Present.evfl.txt 1.7.0/NNPC_Select_Present.evfl.txt
  512. 2c2
  513. <     if (EventFlowSystemActor.MultiKindItemSelectIncludeChoice4('cItemSelect', 4, 'Flower', '', '') in (1, 2, 3)) or (EventFlowSystemActor.MultiKindItemSelectInclude('Ftr', 'DoorDeco', 'Music', '', '', '', '', '', 'cItemSelect')) or (EventFlowSystemActor.MultiKindItemSelectInclude('Net', 'Watering', 'FishingRod', 'FierworkHand', '', '', '', '', 'cItemSelect')) or (EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', 'Cap', 'Accessory', 'Umbrella', '', '', '', 'cItemSelect')):
  514. ---
  515. >     if EventFlowSystemActor.MultiKindItemSelectIncludeChoice4('cItemSelect', 4, 'Flower', '', '') in (1, 2, 3):
  516. 4,6c4,13
  517. <     elif EventFlowSystemActor.MultiKindItemSelectInclude('Helmet', '', '', '', '', '', '', '', 'cItemSelect'):
  518. <         if MainNpc.NpcIsAbleEquipSelectItem():
  519. <             pass
  520. ---
  521. >     else:
  522. >         if EventFlowSystemActor.MultiKindItemSelectInclude('Ftr', 'DoorDeco', 'Music', '', '', '', '', '', 'cItemSelect'):
  523. >             if not ((EventFlowSystemActor.MultiItemSelectInclude(13488, 14029, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect')) and (EventFlowSystemActor.TermEventNow('Valentine', false))):
  524. >                 MainNpc.SetItemToNpcStockList(0, 1)
  525. >         else:
  526. >             if (not EventFlowSystemActor.MultiKindItemSelectInclude('Net', 'Watering', 'FishingRod', 'FierworkHand', '', '', '', '', 'cItemSelect')) and (not EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', 'Cap', 'Accessory', 'Umbrella', '', '', '', 'cItemSelect')) and (not ((EventFlowSystemActor.MultiKindItemSelectInclude('Helmet', '', '', '', '', '', '', '', 'cItemSelect')) and (MainNpc.NpcIsAbleEquipSelectItem()))):
  527. >                 if EventFlowSystemActor.MultiKindItemSelectInclude('Shoes', 'Socks', 'Bottoms', 'Bag', 'Helmet', '', '', '', 'cItemSelect'):
  528. >                     MainNpc.SetItemToNpcStockList(0, 1)
  529. >             else:
  530. >                 MainNpc.SetItemToNpcStockList(0, 1)
  531. 11a19
  532. > entrypoint Event25:
  533. 17c25
  534. <         if EventFlowSystemActor.UISelectedItemIsWrapping('cItemSelect'):
  535. ---
  536. >         if (EventFlowSystemActor.UISelectedItemIsWrapping('cItemSelect')) and (not EventFlowSystemActor.MultiKindItemSelectInclude('DummyWrappingOtoshidama', '', '', '', '', '', '', '', 'cItemSelect')):
  537. 54,76c62,80
  538. <                                     if EventFlowSystemActor.MultiKindItemSelectInclude('Ftr', 'DoorDeco', '', '', '', '', '', '', 'cItemSelect'):
  539. <                                         run NNPC_Select_Furniture::Furniture()
  540. <                                         run Select_Finish()
  541. <                                     elif EventFlowSystemActor.MultiKindItemSelectInclude('Sculpture', 'SculptureFake', 'Picture', 'PictureFake', '', '', '', '', 'cItemSelect'):
  542. <                                         run NNPC_Select_Furniture::Art()
  543. <                                         MainNpc.SetItemToNpcStockList(0, 1)
  544. <                                         run Select_Finish()
  545. <                                     elif EventFlowSystemActor.MultiKindItemSelectInclude('Fossil', 'FossilUnknown', '', '', '', '', '', '', 'cItemSelect'):
  546. <                                         run NNPC_Select_Furniture::Fossil()
  547. <                                         run Select_Finish_Disappear()
  548. <                                     elif EventFlowSystemActor.MultiKindItemSelectInclude('Net', 'Watering', 'FishingRod', '', '', '', '', '', 'cItemSelect'):
  549. <                                         run NNPC_Select_Tool::Useful()
  550. <                                         run Select_Finish()
  551. <                                     elif EventFlowSystemActor.MultiKindItemSelectInclude('Axe', 'Slingshot', 'ChangeStick', 'Timer', 'Shovel', '', '', '', 'cItemSelect'):
  552. <                                         run NNPC_Select_Tool::Nouse()
  553. <                                         run Select_Finish_Disappear()
  554. <                                     elif EventFlowSystemActor.MultiKindItemSelectInclude('Umbrella', '', '', '', '', '', '', '', 'cItemSelect'):
  555. <                                         run NNPC_Select_Tool::Umbrella()
  556. <                                         run Select_Finish()
  557. <                                     elif (not EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', 'Cap', 'Accessory', '', '', '', '', 'cItemSelect')) and (not EventFlowSystemActor.MultiKindItemSelectInclude('Helmet', 'Bottoms', 'Socks', 'Shoes', 'Bag', '', '', '', 'cItemSelect')):
  558. <                                         switch EventFlowSystemActor.MultiKindItemSelectIncludeChoice5('cItemSelect', 5, 'Money', 'Trash', 'TurnipExpired', 'Music'):
  559. <                                             case 0:
  560. <                                                 run NNPC_Select_Etc::Etc()
  561. ---
  562. >                                     if EventFlowSystemActor.MultiItemSelectInclude(13488, 14029, 65534, 65534, 65534, 65534, 65534, 65534, 'cItemSelect'):
  563. >                                         if EventFlowSystemActor.TermEventNow('Valentine', false):
  564. >                                             MainNpc.EventFlags['cNpcMemory:ValentinePresentFlag'] = true
  565. >                                             run NNPC_Select_Furniture::ValentinePresent()
  566. >                                             run Select_Finish()
  567. >                                         else:
  568. >                                             run NNPC_Select_Furniture::Furniture()
  569. >                                             run Select_Finish()
  570. >                                     else:
  571. >                                         if EventFlowSystemActor.MultiKindItemSelectInclude('Ftr', 'DoorDeco', '', '', '', '', '', '', 'cItemSelect'):
  572. >                                             run NNPC_Select_Furniture::Furniture()
  573. >                                             run Select_Finish()
  574. >                                         else:
  575. >                                             if EventFlowSystemActor.MultiKindItemSelectInclude('Sculpture', 'SculptureFake', 'Picture', 'PictureFake', '', '', '', '', 'cItemSelect'):
  576. >                                                 run NNPC_Select_Furniture::Art()
  577. >                                                 MainNpc.SetItemToNpcStockList(0, 1)
  578. >                                                 run Select_Finish()
  579. >                                             elif EventFlowSystemActor.MultiKindItemSelectInclude('Fossil', 'FossilUnknown', '', '', '', '', '', '', 'cItemSelect'):
  580. >                                                 run NNPC_Select_Furniture::Fossil()
  581. 78,83c82,104
  582. <                                             case 1:
  583. <                                                 run NNPC_Select_Etc::Money()
  584. <                                             case 2, 3:
  585. <                                                 run NNPC_Select_Etc::Garbage()
  586. <                                             case 4:
  587. <                                                 run NNPC_Select_Etc::Music()
  588. ---
  589. >                                             elif EventFlowSystemActor.MultiKindItemSelectInclude('Net', 'Watering', 'FishingRod', '', '', '', '', '', 'cItemSelect'):
  590. >                                                 run NNPC_Select_Tool::Useful()
  591. >                                                 run Select_Finish()
  592. >                                             elif EventFlowSystemActor.MultiKindItemSelectInclude('Axe', 'Slingshot', 'ChangeStick', 'Timer', 'Shovel', '', '', '', 'cItemSelect'):
  593. >                                                 run NNPC_Select_Tool::Nouse()
  594. >                                                 run Select_Finish_Disappear()
  595. >                                             elif EventFlowSystemActor.MultiKindItemSelectInclude('Umbrella', '', '', '', '', '', '', '', 'cItemSelect'):
  596. >                                                 run NNPC_Select_Tool::Umbrella()
  597. >                                                 run Select_Finish()
  598. >                                             elif (not EventFlowSystemActor.MultiKindItemSelectInclude('Tops', 'OnePiece', 'Cap', 'Accessory', '', '', '', '', 'cItemSelect')) and (not EventFlowSystemActor.MultiKindItemSelectInclude('Helmet', 'Bottoms', 'Socks', 'Shoes', 'Bag', '', '', '', 'cItemSelect')):
  599. >                                                 switch EventFlowSystemActor.MultiKindItemSelectIncludeChoice5('cItemSelect', 5, 'Money', 'Trash', 'TurnipExpired', 'Music'):
  600. >                                                     case 0:
  601. >                                                         run NNPC_Select_Etc::Etc()
  602. >                                                         run Select_Finish_Disappear()
  603. >                                                     case 1:
  604. >                                                         run NNPC_Select_Etc::Money()
  605. >                                                     case 2, 3:
  606. >                                                         run NNPC_Select_Etc::Garbage()
  607. >                                                     case 4:
  608. >                                                         run NNPC_Select_Etc::Music()
  609. >                                                         run Select_Finish()
  610. >                                             else:
  611. >                                                 run NNPC_Select_Equipment::Root()
  612. 85,87d105
  613. <                                     else:
  614. <                                         run NNPC_Select_Equipment::Root()
  615. <                                         run Select_Finish()
  616. 151a170,175
  617. >
  618. > flow Valentine():
  619. >     # < Huh? ( What is it? Huh? ( ($Do I get something? (;Ooh! ( What are you giving me?
  620. >     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/Select/BO_Select_General:003', true)
  621. >     EventFlowSystemActor.UIItemSelectWindowHandling(65534, '', '', '', 'cValentine', false)
  622. >     run Event25()
  623. diff -r 1.6.0/NNPC_Talk_GEvent.evfl.txt 1.7.0/NNPC_Talk_GEvent.evfl.txt
  624. 46a47,48
  625. >             case Unknown9:
  626. >                 run NNPC_GEvent_Carnival::Root()
  627. diff -r 1.6.0/Obj_RcoMachine_AmiiboCall.evfl.txt 1.7.0/Obj_RcoMachine_AmiiboCall.evfl.txt
  628. 27c27
  629. <         # < I'm n ! ( What ya need? I'm real bored, so let's (get REAL interesting! (Hello!  This is n . ( Thanks for the call! ( Now I know my phone works! Wha...
  630. ---
  631. >         # < I'm n ! ( Whaddaya need? I'm real bored, so let's (get REAL interesting! (Hello!  This is n . ( Thanks for the call! ( Now I know my phone works! Wh...
  632. diff -r 1.6.0/Obj_RcoMachine_Amiibo.evfl.txt 1.7.0/Obj_RcoMachine_Amiibo.evfl.txt
  633. 170c170
  634. <     # Would you like to use a different amiibo to invite someone else to the campsite?
  635. ---
  636. >     # Do you want to use a different amiibo to invite someone else to the campsite?
  637. diff -r 1.6.0/Obj_RcoMachine_MileExchange.evfl.txt 1.7.0/Obj_RcoMachine_MileExchange.evfl.txt
  638. 133a134,144
  639. > flow MileExchange_MyDesignShowcase():
  640. >     Player.OpenMessageWindow('TalkObj/OBJ_RcoMachine:590', false)
  641. >     if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  642. >         EventFlowSystemActor.MessageSuspend()
  643. >         EventFlowSystemActor.SonkatsuBuyDone(false)
  644. >         run Cmn_AppUpdateDemo()
  645. >         run RecipeReceiveing2_End()
  646. >         EventFlowSystemActor.ReservePlayerMutterDemo('Get_MydesignShowcase', 'cNowDemoEnd', 'Player_GetDemo_MileExchange', true)
  647. >     else:
  648. >         run ReChangeItem()
  649. >
  650. diff -r 1.6.0/Player_GetDemo.evfl.txt 1.7.0/Player_GetDemo.evfl.txt
  651. 88c88
  652. <     if (Player.PlayerGetDemoCheckItem('cSnowCrystal')) or (Player.PlayerGetDemoCheckItem('cSakurapetal')) or (Player.PlayerGetDemoCheckItem('cAutumnLeaf')):
  653. ---
  654. >     if (Player.PlayerGetDemoCheckItem('cSnowCrystal')) or (Player.PlayerGetDemoCheckItem('cSakurapetal')) or (Player.PlayerGetDemoCheckItem('cAutumnLeaf')) or (Player.PlayerGetDemoCheckItem('cFeather')):
  655. diff -r 1.6.0/Player_GetDemo_MileExchange.evfl.txt 1.7.0/Player_GetDemo_MileExchange.evfl.txt
  656. 78a79,83
  657. > flow Get_Emoticon_ByBook():
  658. >     # Whoa, I learned some new Reactions!  I can press  to see all of them and choose how to express myself.
  659. >     Player.OpenMessageWindow('TalkSys/SYS_Player:210_14', false)
  660. >     run UploadEmoticon()
  661. >
  662. diff -r 1.6.0/Player_SmaphoNavigation.evfl.txt 1.7.0/Player_SmaphoNavigation.evfl.txt
  663. 213c213
  664. <             # < dWhat's all this nonsense 'bout free rescue service?  Dream on, pal! ( Ain't nothin' in this world free.  Hah!d
  665. ---
  666. >             # < dOh, and about this freebie? ( Dream on if you think THAT'S gonna be a regular deal.  Hah!d
  667. diff -r 1.6.0/SNPC_dod_AirPort.evfl.txt 1.7.0/SNPC_dod_AirPort.evfl.txt
  668. 0a1,2
  669. > @EventFlowSystemActor:Net
  670. >
  671. 5,6c7,12
  672. <     run EntryPoint_PreProcedure(ContinueAS=True)
  673. <     EventFlowSystemActor.WaitFrame(40)
  674. ---
  675. >     fork:
  676. >         branch:
  677. >             run EntryPoint_PreProcedure(ContinueAS=True)
  678. >             EventFlowSystemActor.WaitFrame(40)
  679. >         branch:
  680. >             EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false)
  681. 8d13
  682. <     EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false)
  683. 31c36,42
  684. <         EventFlowSystemActor.NetDestroySessionVillage('cDestroyVillage', false)
  685. ---
  686. >         fork:
  687. >             branch:
  688. >                 run EntryPoint_PreProcedure(ContinueAS=True)
  689. >                 EventFlowSystemActor.WaitFrame(40)
  690. >             branch:
  691. >                 EventFlowSystemActor.NetDestroySessionVillage('cDestroyVillage', false)
  692. >         run EntryPoint_PostProcedure()
  693. 50,51c61,66
  694. <     run EntryPoint_PreProcedure(ContinueAS=True)
  695. <     EventFlowSystemActor.WaitFrame(40)
  696. ---
  697. >     fork:
  698. >         branch:
  699. >             run EntryPoint_PreProcedure(ContinueAS=True)
  700. >             EventFlowSystemActor.WaitFrame(40)
  701. >         branch:
  702. >             EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false)
  703. 53d67
  704. <     EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false)
  705. Only in 1.7.0: SNPC_pck.evfl.txt
  706. diff -r 1.6.0/SNPC_pyn_01_EasterPreVisit.evfl.txt 1.7.0/SNPC_pyn_01_EasterPreVisit.evfl.txt
  707. 43c43
  708. <             # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are six types of eggs hidden around the island, you see.()So wonde...
  709. ---
  710. >             # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are 6 types of eggs hidden around the island, you see.()So wonderf...
  711. 62c62
  712. <         # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are six types of eggs hidden around the island, you see.()So wonde...
  713. ---
  714. >         # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are 6 types of eggs hidden around the island, you see.()So wonderf...
  715. diff -r 1.6.0/SNPC_pyn_02_EasterDay.evfl.txt 1.7.0/SNPC_pyn_02_EasterDay.evfl.txt
  716. 187c187
  717. <         # n(&Do you understand what I'm trying to say?(You can still hunt for eggs on this special day!()Use your time wisely,  and try to find the six types of...
  718. ---
  719. >         # n(&Do you understand what I'm trying to say?(You can still hunt for eggs on this special day!()Use your time wisely,  and try to find the 6 types of e...
  720. 215c215
  721. <         # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are six types of eggs hidden around the island, you see.()So wonde...
  722. ---
  723. >         # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are 6 types of eggs hidden around the island, you see.()So wonderf...
  724. 247c247
  725. <     # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are six types of eggs hidden around the island, you see.()So wonde...
  726. ---
  727. >     # (&Did I make myself clear? ( (Yes?  No?  Maybe so? ( (Hmm.  How about thisn ()There are 6 types of eggs hidden around the island, you see.()So wonderf...
  728. diff -r 1.6.0/SNPC_rcm_00_Common.evfl.txt 1.7.0/SNPC_rcm_00_Common.evfl.txt
  729. 16a17,41
  730. > flow End_Shopping():
  731. >     run CmnCloseShoppingUI()
  732. >     if not System.EventFlags['cPlayerTemp:RcmBoughtGrocery']:
  733. >         EventFlowSystemActor.WaitFrame(5)
  734. >         if EventFlowSystemActor.ShopLevel() == InResServiceTent:
  735. >             # (Ah,  changed your mind? (( Please let me know if( there's anything else I can help with!
  736. >             MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_01', true)
  737. >             run SNPC_rcm::Rcm_SeqClose()
  738. >         else:
  739. >             if System.EventFlags['cPlayerTemp:RcmShopshelfCheck']:
  740. >                 EventFlowSystemActor.CloseMarketShowcase()
  741. >             # ((I'll be here if you ((need anything else.
  742. >             MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_02', false)
  743. >             run SNPC_rcm::Rcm_SeqClose()
  744. >     elif EventFlowSystemActor.ShopLevel() == InResServiceTent:
  745. >         # (Thank you!  Please don't hesitate to ask me for assistance.
  746. >         MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_03', false)
  747. >         run SNPC_rcm::Rcm_SeqClose()
  748. >     else:
  749. >         if System.EventFlags['cPlayerTemp:RcmShopshelfCheck']:
  750. >             EventFlowSystemActor.CloseMarketShowcase()
  751. >         # Thank you!d  K...thank you!dd
  752. >         MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_04', false)
  753. >         run SNPC_rcm::Rcm_SeqClose()
  754. >
  755. 61a87,88
  756. >         elif EventFlowSystemActor.MultiKindItemSelectInclude('DummyHowtoBook', '', '', '', '', '', '', '', 'cItemSelect'):
  757. >             run SNPC_rcm_16_BuyHowToBook::Root()
  758. 72,94c99
  759. <         run CmnCloseShoppingUI()
  760. <         if not System.EventFlags['cPlayerTemp:RcmBoughtGrocery']:
  761. <             EventFlowSystemActor.WaitFrame(5)
  762. <             if EventFlowSystemActor.ShopLevel() == InResServiceTent:
  763. <                 # (Ah,  changed your mind? (( Please let me know if( there's anything else I can help with!
  764. <                 MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_01', true)
  765. <                 run SNPC_rcm::Rcm_SeqClose()
  766. <             else:
  767. <                 if System.EventFlags['cPlayerTemp:RcmShopshelfCheck']:
  768. <                     EventFlowSystemActor.CloseMarketShowcase()
  769. <                 # ((I'll be here if you ((need anything else.
  770. <                 MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_02', false)
  771. <                 run SNPC_rcm::Rcm_SeqClose()
  772. <         elif EventFlowSystemActor.ShopLevel() == InResServiceTent:
  773. <             # (Thank you!  Please don't hesitate to ask me for assistance.
  774. <             MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_03', false)
  775. <             run SNPC_rcm::Rcm_SeqClose()
  776. <         else:
  777. <             if System.EventFlags['cPlayerTemp:RcmShopshelfCheck']:
  778. <                 EventFlowSystemActor.CloseMarketShowcase()
  779. <             # Thank you!d  K...thank you!dd
  780. <             MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:903_04', false)
  781. <             run SNPC_rcm::Rcm_SeqClose()
  782. ---
  783. >         run End_Shopping()
  784. 240a246,255
  785. >         if (EventFlowSystemActor.MultiFromItemSelectInclude('Carnival', '', '', '', '', '', '', '', 'cItemSelect')) and (System.EventFlags['cPlayer:EnableEmoticonUI']) and (not System.EventFlags['cPlayer:BuyReactionBook17']) and (not System.EventFlags['cPlayer:RcmChkCarnivalFtr']):
  786. >             if EventFlowSystemActor.CheckNearEvent(0, 'Carnival', 0, false):
  787. >                 # ( Ah!  I should inform you that this particular item was inspired by today's Festivale event.((Andnif you're interested, we have a collection of React...
  788. >                 MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:3004', false)
  789. >             else:
  790. >                 EventFlowSystemActor.SetTagFromSystem(0, 'cCarnivalMonth', 'cDegit', '', 0)
  791. >                 EventFlowSystemActor.SetTagFromSystem(0, 'cCarnivalDay', 'cDegit', '', 0)
  792. >                 # ( Ah!  I should inform you that this item was inspired by the upcoming Festivale event on Z# Z$!((Andnif you're interested, we have a collection of Re...
  793. >                 MainNpc.OpenMessageWindow('TalkSNpc/rcm/SP_rcm_00_common:3002', false)
  794. >             System.EventFlags['cPlayer:RcmChkCarnivalFtr'] = true
  795. 271c286
  796. <         if EventFlowSystemActor.MultiKindItemSelectInclude('DummyRecipe', '', '', '', '', '', '', '', 'cItemSelect'):
  797. ---
  798. >         if (EventFlowSystemActor.MultiKindItemSelectInclude('DummyRecipe', '', '', '', '', '', '', '', 'cItemSelect')) or (EventFlowSystemActor.MultiKindItemSelectInclude('DummyHowtoBook', '', '', '', '', '', '', '', 'cItemSelect')):
  799. Only in 1.7.0: SNPC_rcm_16_BuyHowToBook.evfl.txt
  800. diff -r 1.6.0/SNPC_rco_10_Common_MoveNpcFacility.evfl.txt 1.7.0/SNPC_rco_10_Common_MoveNpcFacility.evfl.txt
  801. 213d212
  802. <     DynamicCast_LandReadjustNpc.ChangeClothForVisitQuest(false, true)
  803. diff -r 1.6.0/SNPC_rco_96_PlayerMoving.evfl.txt 1.7.0/SNPC_rco_96_PlayerMoving.evfl.txt
  804. 10a11,22
  805. > flow EndwithoutBackupOtherP():
  806. >     # (Thank you for being patient.  (It appears everything is ready for s's big move!(Please wish s  ("the best on their new adventure!
  807. >     MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006_01', false)
  808. >     run Event77()
  809. >
  810. > flow EndwithoutSavedatabackup():
  811. >     # (Thank you so much for being patient.  (Everything is ready!(I'm sure you'll have lots of fun at your new home.  ("Do take care, hm, n?
  812. >     MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006', false)
  813. > entrypoint Event77:
  814. >     EventFlowSystemActor.NetMoveSessionFinalize()
  815. >     run Seq_ExitHome()
  816. >
  817. 32c44,70
  818. <         run SkipNoticeWrongNA()
  819. ---
  820. > entrypoint Event60:
  821. >         if EventFlowSystemActor.PlayerMoveValidateDestinationIsland():
  822. >             # (It seems 's system is ready to accept someone.
  823. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005', false)
  824. >             EventFlowSystemActor.MessageSuspend()
  825. >             if SubflowResults[1] == 0:
  826. >                 EventFlowSystemActor.SetTagMainPlayerName(1, 0)
  827. >             else:
  828. >                 EventFlowSystemActor.SetTagFromUIResult(0, 'cVillagerPlayerNameD')
  829. >             # The target Nintendo Switch system does not have save data for the Animal Crossing: New Horizons game.If you continue the moving process, s will become...
  830. >             EventFlowSystemActor.OpenMessageWindow('Dialog/DIALOG_Msg:9111', false)
  831. >             if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  832. >                 EventFlowSystemActor.NetMoveSessionFinalize()
  833. >                 run Cancel_Moving()
  834. >             else:
  835. >                 # (%Yes, yes!  It appears we can continue the process of moving a player to 's system.
  836. >                 MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005_00', false)
  837. >                 run MovingProcessStart()
  838. >         else:
  839. >             EventFlowSystemActor.SetTagMoveOutLandName(0)
  840. >             # (It looks like someone can move over to s,  which is on 's system!(&Shall we continue with moving a player to s?
  841. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005_01', false)
  842. >             if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  843. >                 run MovingProcessStart()
  844. >             else:
  845. >                 EventFlowSystemActor.NetMoveSessionFinalize()
  846. >                 run Cancel_Moving()
  847. 121c159
  848. <     if not EventFlowSystemActor.CheckErrorType(2):
  849. ---
  850. >     if EventFlowSystemActor.CheckErrorType(2):
  851. 123,124c161,164
  852. <             # (Thank you so much for being patient.  (Everything is ready!(I'm sure you'll have lots of fun at your new home.  ("Do take care, hm, n?
  853. <             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006', false)
  854. ---
  855. >             # (Hm?  It seems we've run into some connection trouble.  I'm sorry, but for now let's go back to the title screen.
  856. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1024', false)
  857. >             EventFlowSystemActor.NetMoveSessionFinalize()
  858. >             run SNPC_rco_92_OtherSettings::Seq_Close()
  859. 126,134c166,176
  860. <             # (Thank you for being patient.  (It appears everything is ready for s's big move!(Please wish s  ("the best on their new adventure!
  861. <             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006_01', false)
  862. <         EventFlowSystemActor.NetMoveSessionFinalize()
  863. <         run Seq_ExitHome()
  864. <     elif SubflowResults[1] == 0:
  865. <         # (Hm?  It seems we've run into some connection trouble.  I'm sorry, but for now let's go back to the title screen.
  866. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1024', false)
  867. <         EventFlowSystemActor.NetMoveSessionFinalize()
  868. <         run SNPC_rco_92_OtherSettings::Seq_Close()
  869. ---
  870. >             # (Hm?  We've run into some connection trouble.  I'm sorry,  but I'll need you to close the game and start over.
  871. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1024_01', false)
  872. >             EventFlowSystemActor.NetMoveSessionFinalize()
  873. >             run Seq_ExitHome()
  874. >     elif SubflowResults[1] != 0:
  875. >         if SubflowResults[2] == 0:
  876. >             run EndwithoutBackupOtherP()
  877. >         else:
  878. >             run UploadBackupAsyncTo()
  879. >     elif SubflowResults[2] == 0:
  880. >         run EndwithoutSavedatabackup()
  881. 136,138c178,179
  882. <         # (Hm?  We've run into some connection trouble.  I'm sorry,  but I'll need you to close the game and start over.
  883. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1024_01', false)
  884. <         EventFlowSystemActor.NetMoveSessionFinalize()
  885. ---
  886. > entrypoint Event229:
  887. >         run UploadBackUpAsync()
  888. 207,217c248,252
  889. <     # The save data transfer process will take some time. If you're playing in handheld mode, please connect the system to the Nintendo Switch AC adapter be...
  890. <     MainNpc.OpenMessageWindow('Dialog/DIALOG_Msg:9112', false)
  891. <     # nYes, yes,  I believe that covers everything.  (&Are you ready to start the moving process now?
  892. <     MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1003_04', false)
  893. <     switch EventFlowSystemActor.GeneralTalkChoice3():
  894. <         case 0:
  895. <             run MoveSeq_Procedure()
  896. <         case 1:
  897. <             run Return_MovingNotice()
  898. <         case 2:
  899. <             run Cancel_Moving()
  900. ---
  901. >     if (EventFlowSystemActor.BackupAgentExist()) and (not EventFlowSystemActor.SaveIsEnabledBackupSetting()) and (EventFlowSystemActor.BackupAgentIsMainPlayer()) and (not EventFlowSystemActor.SaveCompareBackupAgentNSAID()):
  902. >         # As a final step in the transfer process, your backed-up save data will be updated. An internet connection is required to back up save data.
  903. >         MainNpc.OpenMessageWindow('Dialog/DIALOG_Msg:9113', false)
  904. >         SubflowResults[2] = 1
  905. >     run Sub_Event216()
  906. 341,366c376
  907. <     if EventFlowSystemActor.PlayerMoveValidateDestinationIsland():
  908. <         # (It seems 's system is ready to accept someone.
  909. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005', false)
  910. <         EventFlowSystemActor.MessageSuspend()
  911. <         if SubflowResults[1] == 0:
  912. <             EventFlowSystemActor.SetTagMainPlayerName(1, 0)
  913. <         else:
  914. <             EventFlowSystemActor.SetTagFromUIResult(0, 'cVillagerPlayerNameD')
  915. <         # The target Nintendo Switch system does not have save data for the Animal Crossing: New Horizons game.If you continue the moving process, s will become...
  916. <         EventFlowSystemActor.OpenMessageWindow('Dialog/DIALOG_Msg:9111', false)
  917. <         if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  918. <             EventFlowSystemActor.NetMoveSessionFinalize()
  919. <             run Cancel_Moving()
  920. <         else:
  921. <             # (%Yes, yes!  It appears we can continue the process of moving a player to 's system.
  922. <             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005_00', false)
  923. <             run MovingProcessStart()
  924. <     else:
  925. <         EventFlowSystemActor.SetTagMoveOutLandName(0)
  926. <         # (It looks like someone can move over to s,  which is on 's system!(&Shall we continue with moving a player to s?
  927. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1005_01', false)
  928. <         if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  929. <             run MovingProcessStart()
  930. <         else:
  931. <             EventFlowSystemActor.NetMoveSessionFinalize()
  932. <             run Cancel_Moving()
  933. ---
  934. >     run Event60()
  935. 403a414,426
  936. > local flow Sub_Event216():
  937. >     # The save data transfer process will take some time. If you're playing in handheld mode, please connect the system to the Nintendo Switch AC adapter be...
  938. >     MainNpc.OpenMessageWindow('Dialog/DIALOG_Msg:9112', false)
  939. >     # nYes, yes,  I believe that covers everything.  (&Are you ready to start the moving process now?
  940. >     MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1003_04', false)
  941. >     switch EventFlowSystemActor.GeneralTalkChoice3():
  942. >         case 0:
  943. >             run MoveSeq_Procedure()
  944. >         case 1:
  945. >             run Return_MovingNotice()
  946. >         case 2:
  947. >             run Cancel_Moving()
  948. >
  949. 442a466,486
  950. >
  951. > flow UploadBackUpAsync():
  952. >     EventFlowSystemActor.NetMoveSessionFinalize()
  953. >     EventFlowSystemActor.MessageLockNext(2)
  954. >     # Connecting to the internet to update your save data backupn Do not touch .
  955. >     MainNpc.OpenMessageWindow('TalkSys/SYS_Save:014', false)
  956. >     EventFlowSystemActor.SaveUploadBackup()
  957. >     if not EventFlowSystemActor.SaveIsUploadedBackup():
  958. >         EventFlowSystemActor.MessageSuspend()
  959. >         EventFlowSystemActor.MessageUnlockNext()
  960. >         # Your backup has been updated.
  961. >         MainNpc.OpenMessageWindow('TalkSys/SYS_Save:015', false)
  962. >     if SubflowResults[1] == 0:
  963. >         # (Thank you so much for being patient.  (Everything is ready!(I'm sure you'll have lots of fun at your new home.  ("Do take care, hm, n?
  964. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006', false)
  965. >     else:
  966. >         # (Thank you for being patient.  (It appears everything is ready for s's big move!(Please wish s  ("the best on their new adventure!
  967. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_95_PlayerMoving:1006_01', false)
  968. >
  969. > flow UploadBackupAsyncTo():
  970. >     run Event229()
  971. diff -r 1.6.0/SNPC_tap.evfl.txt 1.7.0/SNPC_tap.evfl.txt
  972. 871a872,873
  973. >         if EventFlowSystemActor.CheckErrorType(2):
  974. >             pass
  975. diff -r 1.6.0/System_BootSequence.evfl.txt 1.7.0/System_BootSequence.evfl.txt
  976. 74c74,76
  977. <     if not EventFlowSystemActor.HasMovedOneSaveData():
  978. ---
  979. >     if EventFlowSystemActor.HasMovedOneSaveData():
  980. >         run Sub_Event0()
  981. >     else:
  982. 75a78,83
  983. >         if EventFlowSystemActor.SaveProcIsSuccess():
  984. >             run Sub_grp_Event5()
  985. >         else:
  986. >             run Sub_Event0()
  987. >
  988. > local flow Sub_Event0():
  989. 78,87c86,93
  990. <         if not EventFlowSystemActor.SaveIsNotFound():
  991. <             if EventFlowSystemActor.SaveIsBroken():
  992. <                 run Broken(BGUIOn=BGUIOn)
  993. <             else:
  994. <                 run UnexpectedError(BGUIOn=BGUIOn)
  995. <         elif not EventFlowSystemActor.HasMovedOneSaveData():
  996. <             EventFlowSystemActor.SaveSimpleLoad('cMovedOne')
  997. <             EventFlowSystemActor.BeginAsMovedOne(false)
  998. <             # Player data for an in-progress move from another island was detected. The moving process will now resume.
  999. <             EventFlowSystemActor.OpenMessageWindow('Dialog/DIALOG_Msg:8021', false)
  1000. ---
  1001. >         if EventFlowSystemActor.SaveIsNotFound():
  1002. >             if not EventFlowSystemActor.HasMovedOneSaveData():
  1003. >                 EventFlowSystemActor.SaveSimpleLoad('cMovedOne')
  1004. >                 EventFlowSystemActor.BeginAsMovedOne(false)
  1005. >                 # Player data for an in-progress move from another island was detected. The moving process will now resume.
  1006. >                 EventFlowSystemActor.OpenMessageWindow('Dialog/DIALOG_Msg:8021', false)
  1007. >         else:
  1008. >             run Sub_grp_Event5()
  1009. 98a105,110
  1010. >
  1011. > local flow Sub_grp_Event5():
  1012. >     if EventFlowSystemActor.SaveIsBroken():
  1013. >         run Broken(BGUIOn=BGUIOn)
  1014. >     else:
  1015. >         run UnexpectedError(BGUIOn=BGUIOn)
  1016. diff -r 1.6.0/System_GrowUp.evfl.txt 1.7.0/System_GrowUp.evfl.txt
  1017. 35a36
  1018. >     System.EventFlags['cLand:GrowUpAfterPatch1_7'] = true
  1019. diff -r 1.6.0/System_SaveDataRestoring.evfl.txt 1.7.0/System_SaveDataRestoring.evfl.txt
  1020. 19a20,21
  1021. >                 EventFlowSystemActor.SaveRegisterBackupAgent()
  1022. >                 EventFlowSystemActor.SaveSimpleSave('cAll')
  1023. diff -r 1.6.0/System_ServerRegistration.evfl.txt 1.7.0/System_ServerRegistration.evfl.txt
  1024. 35a36
  1025. >         EventFlowSystemActor.MessageLockNext(1)
  1026. diff -r 1.6.0/Tutorials_Prologue1_Charactermaking_PlayerMoving.evfl.txt 1.7.0/Tutorials_Prologue1_Charactermaking_PlayerMoving.evfl.txt
  1027. 128,129c128,129
  1028. <                         # ((And there we go!  The moving process is complete!
  1029. <                         MainNpc.OpenMessageWindow('Tutorials/Tutorials_Prologue1_Airport:2006', false)
  1030. ---
  1031. >                         # ((And there we go!  The moving process is complete!However, there is one tiny detail to wrap up regarding your old home, so please wait one momentnKd ...
  1032. >                         MainNpc.OpenMessageWindow('Tutorials/Tutorials_Prologue1_Airport:2010', false)
Advertisement
Add Comment
Please, Sign In to add comment