Guest User

ACNH EventFlow 1.10.0/1.11.0 diff

a guest
Sep 24th, 2021
90
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -r 1.10.0/AI_NPC_Outdoor.evfl.txt 1.11.0/AI_NPC_Outdoor.evfl.txt
  2. 45a46,62
  3. > flow ApproachFortune():
  4. >     if MainNpc.EventFlags['cNpcTemp:FortuneApproach']:
  5. >         if MainNpc.CheckCurrentNpcAIState('cPreActiveApproach') == 0:
  6. >             switch EventFlowSystemActor.FortuneBranchPost():
  7. >                 case 3:
  8. >                     run ToActiveApproachNotice(TalkEntryName='Root', TalkFlowName='NNPC_ApproachH_FortuneFriendship')
  9. >                     EventFlowSystemActor.ExitFlowchart()
  10. >                 case 5:
  11. >                     run ToActiveApproachNotice(TalkEntryName='Root', TalkFlowName='NNPC_ApproachH_FortuneItem')
  12. >                     EventFlowSystemActor.ExitFlowchart()
  13. >                 default:
  14. >                     return
  15. >         else:
  16. >             MainNpc.SetIsStartNeedActivity('cOff')
  17. >             MainNpc.NpcChangeAIState('cPreActiveApproach', '', '', '', false, false)
  18. >             EventFlowSystemActor.ExitFlowchart()
  19. >
  20. 333,334d349
  21. <                 MainNpc.SetDefaultWaitAs('cDefault')
  22. <                 run ResetFeel()
  23. 337a353,354
  24. >                     MainNpc.SetDefaultWaitAs('cDefault')
  25. >                     run ResetFeel()
  26. diff -r 1.10.0/AI_NPC_Owl.evfl.txt 1.11.0/AI_NPC_Owl.evfl.txt
  27. 59c59
  28. <             case `BlathersMuseumNoArt`, `BlathersMuseumArt`:
  29. ---
  30. >             case `BlathersMuseumNoArt`, `BlathersMuseumArt`, `Unknown4`:
  31. diff -r 1.10.0/AI_NPC_Rco.evfl.txt 1.11.0/AI_NPC_Rco.evfl.txt
  32. 102c102
  33. <     else:
  34. ---
  35. >     elif System.EventFlags['cPlayer:RcoMachineEnableExchange']:
  36. 103a104,105
  37. >     else:
  38. >         SubflowResults[0] = 0
  39. diff -r 1.10.0/Demo_PublicAnnouncement_21_CmnEvChk.evfl.txt 1.11.0/Demo_PublicAnnouncement_21_CmnEvChk.evfl.txt
  40. 170,175d169
  41. < flow CmnRegulationChk():
  42. <     if EventFlowSystemActor.TodayChangeRegulation() in (1, 2, 3, 4, 5):
  43. <         SubflowResults[17] = 1
  44. <         SubflowResults[18] = 1
  45. <         SubflowResults[4] = 1
  46. <
  47. 180a175,179
  48. >
  49. > flow RegulationUnlockNotice():
  50. >     SubflowResults[17] = 1
  51. >     SubflowResults[18] = 1
  52. >     SubflowResults[4] = 1
  53. diff -r 1.10.0/Demo_PublicAnnouncement_33_CmnNewsFacilities.evfl.txt 1.11.0/Demo_PublicAnnouncement_33_CmnNewsFacilities.evfl.txt
  54. 165c165
  55. <                 if EventFlowSystemActor.EnvHourCompare(22, -1, true, true) in (0, 1):
  56. ---
  57. >                 if EventFlowSystemActor.EnvHourCompare(22, -1, true, true) == 0:
  58. diff -r 1.10.0/Demo_PublicAnnouncement_50_CmnGEventInfo.evfl.txt 1.11.0/Demo_PublicAnnouncement_50_CmnGEventInfo.evfl.txt
  59. 167c167
  60. <                 # **Both Leif and Timmy have begun selling pumpkin starts. They'll help you get…started growing some! Also, Timmy now has candy for sale. I highly sugg…
  61. ---
  62. >                 # **If you're interested in planting pumpkins, the time has come to get…started! Yes, yes! Leif will be selling his pumpkin starts at a special price t…
  63. 174c174
  64. <                 # **Both Leif and Nook's Cranny have begun selling pumpkin starts. They can get you…started growing some! Also, Nook's Cranny now has candy for sale. I…
  65. ---
  66. >                 # **If you're interested in planting pumpkins, the time has come to get…started! Yes, yes! Leif will be selling his pumpkin starts at a special price t…
  67. 182a183
  68. >         System.EventFlags['cPlayer:AnnounceHalloween2Ready'] = true
  69. 192c193
  70. <             # I've heard that Nook's Cranny and Leif are now selling pumpkin starts. I hope everyone starts growing them! Wouldn't it be wonderful to see pumpkins …
  71. ---
  72. >             # I heard Leif will be selling pumpkin starts at a special seasonal price. But in case you can't find him, Nook's Cranny will also be carrying pumpkin …
  73. 200a202
  74. >         System.EventFlags['cPlayer:AnnounceHalloween2Ready'] = true
  75. 217a220
  76. >                 System.EventFlags['cPlayer:AnnounceHalloween2'] = true
  77. 226c229
  78. <                 # Tonight from 5 PM to 12 midnight, we'll be treating you to a Halloween event. And, no, this is not a trick! Everyone will be dressed up or will give …
  79. ---
  80. >                 # Tonight from 5 PM to midnight, we'll be treating you to a Halloween event. And no, this is not a trick! Everyone will be dressed up or will give out …
  81. 231c234
  82. <                 # Until 12 midnight tonight, we'll be treating you to a special Halloween event. And, no, this is not a trick! Everyone will be dressed up or will give…
  83. ---
  84. >                 # Until midnight tonight, we'll be treating you to a special Halloween event. And no, this is not a trick! Everyone will be dressed up or will give out…
  85. 236a240
  86. >                 System.EventFlags['cPlayer:AnnounceHalloween2'] = true
  87. 387a392
  88. >     System.EventFlags['cPlayer:AnnounceHalloween2'] = true
  89. 391a397
  90. >     System.EventFlags['cPlayer:AnnounceHalloween2'] = true
  91. diff -r 1.10.0/Ftr_Chest.evfl.txt 1.11.0/Ftr_Chest.evfl.txt
  92. 103,107d102
  93. < flow DummyDemo_BusinessMode():
  94. <     EventFlowSystemActor.DummyFadeOut('初回はお仕事モードに変更')
  95. <     EventFlowSystemActor.WaitFrame(60)
  96. <     EventFlowSystemActor.FadeIn(true)
  97. <
  98. diff -r 1.10.0/NNPC_FreeH_Progress.evfl.txt 1.11.0/NNPC_FreeH_Progress.evfl.txt
  99. 6,7c6,9
  100. <             MainNpc.EventFlags['cNpcMemory:TalkProgressMuseumBuilt2'] = true
  101. <             run Sub_Event83()
  102. ---
  103. >             run Sub_Event95()
  104. >         case `Unknown4`:
  105. >             MainNpc.EventFlags['cNpcMemory:TalkProgressMuseumBuiltCafe'] = true
  106. >             run Sub_Event95()
  107. 129a132,135
  108. >
  109. > local flow Sub_Event95():
  110. >     MainNpc.EventFlags['cNpcMemory:TalkProgressMuseumBuilt2'] = true
  111. >     run Sub_Event83()
  112. diff -r 1.10.0/NNPC_GEvent_CatchFishFes.evfl.txt 1.11.0/NNPC_GEvent_CatchFishFes.evfl.txt
  113. 95c95
  114. <             # It's a real scorcher today, but the fishies are as active as ever. Maybe I oughtta jump in the water and see if they'll let me chill with them for a …
  115. ---
  116. >             # It's a real scorcher today, but the fishies are as active as ever. Maybe I oughta jump in the water and see if they'll let me chill with them for a w…
  117. 119c119
  118. <             # It's a real scorcher today, but the fishies are as active as ever. Maybe I oughtta jump in the water and see if they'll let me chill with them for a …
  119. ---
  120. >             # It's a real scorcher today, but the fishies are as active as ever. Maybe I oughta jump in the water and see if they'll let me chill with them for a w…
  121. diff -r 1.10.0/NNPC_GEvent_CatchInsectFes.evfl.txt 1.11.0/NNPC_GEvent_CatchInsectFes.evfl.txt
  122. 145c145
  123. <             # The last Bug-Off of spring? Already? That can't be right… I won't be too lonely though. I'll still see all my bug pals tomorrow.
  124. ---
  125. >             # The last Bug-Off of <110:17>? Already? That can't be right… I won't be too lonely though. I'll still see all my bug pals tomorrow.
  126. diff -r 1.10.0/NNPC_GEvent_Halloween.evfl.txt 1.11.0/NNPC_GEvent_Halloween.evfl.txt
  127. 73c73
  128. <                 # Halloween is the best! I mean, when else do folks just GIVE you candy? It's so made for me that they oughta call it <110:10> Day!
  129. ---
  130. >                 # Halloween is the best! I mean, when else do folks just GIVE you <item>candy? It's so made for me that they oughta call it <110:10> Day!
  131. 77c77
  132. <                 # There's a lot to like about Halloween. I get to dress up, scare folks, and eat candy. But I think my favorite part is that it happens at night, so I …
  133. ---
  134. >                 # There's a lot to like about Halloween. I get to dress up, scare folks, and eat <item>candy. But I think my favorite part is that it happens at night,…
  135. 96c96
  136. <                 # Nice night, huh? Especially 'cause it's finally time! Halloween is here! You gotta be careful though. If you don't give candy to someone in a costume…
  137. ---
  138. >                 # Nice night, huh? Especially 'cause it's finally time! Halloween is here! You gotta be careful though. If you don't give <item>candy to someone in a c…
  139. 101c101
  140. <                 # Nice night, huh? Especially 'cause it's finally time! Halloween is here! You gotta be careful though. If you don't give candy to someone in a costume…
  141. ---
  142. >                 # Nice night, huh? Especially 'cause it's finally time! Halloween is here! You gotta be careful though. If you don't give <item>candy to someone in a c…
  143. 104c104
  144. <             # Trick or treat! Gimme some candy! If you don't, I'm gonna play a dirty trick on you!
  145. ---
  146. >             # Trick or treat! Gimme some <item>candy! If you don't, I'm gonna play a dirty trick on you!
  147. 122c122
  148. <                         # Yahoo! Thanks for the sweets! I'll put it with the rest of my haul for later.
  149. ---
  150. >                         # Yahoo! Thanks for the candy! I'll put it with the rest of my haul for later.
  151. 138c138
  152. <             # Trick or treat! Gimme some candy! If you don't, I'm gonna play a dirty trick on you!
  153. ---
  154. >             # Trick or treat! Gimme some <item>candy! If you don't, I'm gonna play a dirty trick on you!
  155. 217c217
  156. <         # Hey, since it's a real special night, I'm gonna teach you the perfect Reaction for Halloween! GRAAAAWWWWWWRRRRRRRR! Gimme caaaandy or get praaaanked!…
  157. ---
  158. >         # Hey, since it's a real special night, I'm gonna teach you the perfect Reaction for Halloween! GRAAAAWWWWWWRRRRRRRR! Gimme <item>candy or get pranked!…
  159. 452c452
  160. <         # Hmm…where's your candy though? Guess you got me this time. But if you get any later, I'll take it!
  161. ---
  162. >         # Hmm…where's your <item>candy though? Guess you got me this time. But if you get any later, I'll take it!
  163. diff -r 1.10.0/NNPC_Quest_Delivery_End.evfl.txt 1.11.0/NNPC_Quest_Delivery_End.evfl.txt
  164. 174c174
  165. <                 # Oh, hey. I guess I left behind [a|an] <125:0:0000>! I'll give it to you! You're a winner!
  166. ---
  167. >                 # A huh huh! I guess I left behind my <125:0:0000>! All yours now! You're a winner!
  168. 210c210
  169. <     # Thanks for delivering this. Ya really did me a solid. Say hey to <115:1:cd01> for me, <110:5>!
  170. ---
  171. >     # Thanks for delivering the delivery. Ya really did me a solid. Say hey to <115:1:cd01> for me, <110:5>!
  172. 285c285
  173. <         # Here ya go. As a thank you, have [a|an]<125:4:0000>!
  174. ---
  175. >         # Here ya go. As a thank-you, have [a|an]<125:4:0000>!
  176. diff -r 1.10.0/NNPC_Quest_Delivery_Give.evfl.txt 1.11.0/NNPC_Quest_Delivery_Give.evfl.txt
  177. 313c313
  178. <     # Thanks for bringing this over. Tell <115:1:cd01> I said thanks too, <110:5>!
  179. ---
  180. >     # Thanks for the delivery. Oh, and tell <115:1:cd01> I said thanks too, <110:5>!
  181. diff -r 1.10.0/NNPC_Quest_LostProperty_End.evfl.txt 1.11.0/NNPC_Quest_LostProperty_End.evfl.txt
  182. 189c189
  183. <         # Huh? Like what?
  184. ---
  185. >         # Huh? I did?
  186. diff -r 1.10.0/NNPC_Reaction_Mood.evfl.txt 1.11.0/NNPC_Reaction_Mood.evfl.txt
  187. 192a193
  188. >         EventFlowSystemActor.ExitFlowchart()
  189. diff -r 1.10.0/NNPC_Talk_Force.evfl.txt 1.11.0/NNPC_Talk_Force.evfl.txt
  190. 221,222d220
  191. <     if MainNpc.EventFlags['cNpcTemp:IndoorTalkCount'] < 0:
  192. <         MainNpc.EventFlags['cNpcTemp:NotAddIndoorTalkCount'] = true
  193. diff -r 1.10.0/Obj_Bed_Dream.evfl.txt 1.11.0/Obj_Bed_Dream.evfl.txt
  194. 43d42
  195. <         EventFlowSystemActor.RevokeTreasureQuest()
  196. diff -r 1.10.0/Obj_RcoMachine.evfl.txt 1.11.0/Obj_RcoMachine.evfl.txt
  197. 47a48,51
  198. > flow ChkRcoNoticeFence():
  199. >     if (not System.EventFlags['cPlayer:MakeVillagePlayerFlag']) and (System.EventFlags['cLand:RcmImmQuestComplete']) and (not System.EventFlags['cPlayer:ObjRcoMachineHeardFenceRecipe']):
  200. >         System.EventFlags['cPlayer:ObjRcoMachineHeardFenceRecipe'] = true
  201. >
  202. 323a328
  203. >             run ChkRcoNoticeFence()
  204. diff -r 1.10.0/Obj_WorldMyDesignGallery_04_Search.evfl.txt 1.11.0/Obj_WorldMyDesignGallery_04_Search.evfl.txt
  205. 75a76
  206. >                     System.EventFlags['cPlayerTemp:MyDesignExchangeCallMyIdList'] = false
  207. diff -r 1.10.0/Obj_WorldMyDesignGallery_05_MyOpus.evfl.txt 1.11.0/Obj_WorldMyDesignGallery_05_MyOpus.evfl.txt
  208. 47a48
  209. >                     System.EventFlags['cPlayerTemp:MyDesignExchangeCallMyIdList'] = false
  210. 81a83
  211. >                     System.EventFlags['cPlayerTemp:MyDesignExchangeCallMyIdList'] = false
  212. diff -r 1.10.0/Obj_WorldMyDesignGallery_06_Search2.evfl.txt 1.11.0/Obj_WorldMyDesignGallery_06_Search2.evfl.txt
  213. 28a29
  214. >                     System.EventFlags['cPlayerTemp:MyDesignExchangeCallMyIdList'] = false
  215. 63a65
  216. >                     System.EventFlags['cPlayerTemp:MyDesignExchangeCallMyIdList'] = false
  217. diff -r 1.10.0/Player_GetDemo_Recipe_DIY.evfl.txt 1.11.0/Player_GetDemo_Recipe_DIY.evfl.txt
  218. 67c67
  219. <         EventFlowSystemActor.ReservePlayerMutterDemo('GetRecipe_PitFallSeed', 'cNextDemoEnd_Simple', 'Player_GetDemo_Recipe_DIY', true)
  220. ---
  221. >         EventFlowSystemActor.ReservePlayerMutterDemo('GetRecipe_PitFallSeed', 'cNextDemoEnd_SimpleWithGetCamera', 'Player_GetDemo_Recipe_DIY', true)
  222. diff -r 1.10.0/SNPC_alp_01_Studio.evfl.txt 1.11.0/SNPC_alp_01_Studio.evfl.txt
  223. 112a113,136
  224. > local flow Sub_Event64():
  225. >     if MainNpc.NpcIsSitting() in (0, 1, 2, 3, 5):
  226. >         MainNpc.SetEventRewardToPlayerBaggage('cFree')
  227. >         if EventFlowSystemActor.PlayerHasCraftRecipe(12695, ''):
  228. >             # Actually, if you check your pockets, you'll see I already snuck 'em in there. Anyhoo, enjoy!
  229. >             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:023_01', false)
  230. >             run Sub_Event57()
  231. >         else:
  232. >             # I went ahead and stuck it in your pockets. Hope you don't mind. Be sure to think of us when you're makin' it, ya hear?
  233. >             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:023', false)
  234. >             run Sub_Event57()
  235. >     else:
  236. >         MainNpc.SetDeliveryItem(1, true)
  237. >         EventFlowSystemActor.MessageSuspend()
  238. >         MainNpc.NpcDelivery(1, 'Default')
  239. >         if EventFlowSystemActor.PlayerHasCraftRecipe(12695, ''):
  240. >             # By the by, I'd be happy to take those back from you if any of this wedding stuff catches your eye, squirt. Come on back if you feel like tradin'! Or …
  241. >             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:021_01', false)
  242. >             run Sub_Event57()
  243. >         else:
  244. >             # Be sure to think of us when you're makin' it, ya hear?
  245. >             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:021', false)
  246. >             run Sub_Event57()
  247. >
  248. 120c144
  249. <                 run Sub_grp_Event64()
  250. ---
  251. >                 run Sub_Event64()
  252. 134c158
  253. <                 run Sub_grp_Event64()
  254. ---
  255. >                 run Sub_Event64()
  256. 148,170d171
  257. <
  258. < local flow Sub_grp_Event64():
  259. <     if MainNpc.NpcIsSitting() in (0, 1, 2, 3, 5):
  260. <         MainNpc.SetEventRewardToPlayerBaggage('cFree')
  261. <         if EventFlowSystemActor.PlayerHasCraftRecipe(12695, ''):
  262. <             # Actually, if you check your pockets, you'll see I already snuck 'em in there. Anyhoo, enjoy!
  263. <             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:023_01', false)
  264. <         else:
  265. <             # I went ahead and stuck it in your pockets. Hope you don't mind. Be sure to think of us when you're makin' it, ya hear?
  266. <             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:023', false)
  267. <             run Sub_Event57()
  268. <     else:
  269. <         MainNpc.SetDeliveryItem(1, true)
  270. <         EventFlowSystemActor.MessageSuspend()
  271. <         MainNpc.NpcDelivery(1, 'Default')
  272. <         if EventFlowSystemActor.PlayerHasCraftRecipe(12695, ''):
  273. <             # By the by, I'd be happy to take those back from you if any of this wedding stuff catches your eye, squirt. Come on back if you feel like tradin'! Or …
  274. <             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:021_01', false)
  275. <             run Sub_Event57()
  276. <         else:
  277. <             # Be sure to think of us when you're makin' it, ya hear?
  278. <             MainNpc.OpenMessageWindow('TalkSNpc/alp/GEvent/SP_alp_GEvent_JuneBride:021', false)
  279. <             run Sub_Event57()
  280. diff -r 1.10.0/SNPC_alw_01_Studio.evfl.txt 1.11.0/SNPC_alw_01_Studio.evfl.txt
  281. 544c544
  282. <                                 # I want to take a picture in a chic set. You know…big-city sophistication, subtle hues of brown, beige, and black… Got it?
  283. ---
  284. >                                 # I want to take a picture in a chic set. You know…big-city sophistication, subtle hues of brown, beige, white, and black… Got it?
  285. 547c547
  286. <                                 # I want to take a picture in a garden- themed set, surrounded by nature… It should be filled with gentle, natural colors like green, yellow, and brown…
  287. ---
  288. >                                 # I want to take a picture in a garden- themed set, surrounded by nature… It should be filled with lots of gentle, natural colors, like green, yellow, …
  289. 679c679
  290. <             # I want to take a picture in a chic set. You know…big-city sophistication, subtle hues of brown, beige, and black… Got it?
  291. ---
  292. >             # I want to take a picture in a chic set. You know…big-city sophistication, subtle hues of brown, beige, white, and black… Got it?
  293. 682c682
  294. <             # I want to take a picture in a garden- themed set, surrounded by nature… It should be filled with gentle, natural colors like green, yellow, and brown…
  295. ---
  296. >             # I want to take a picture in a garden- themed set, surrounded by nature… It should be filled with lots of gentle, natural colors, like green, yellow, …
  297. diff -r 1.10.0/SNPC_doc_52_CommuneIsland.evfl.txt 1.11.0/SNPC_doc_52_CommuneIsland.evfl.txt
  298. 136,137d135
  299. <     elif EventFlowSystemActor.YMD(2020, 5, 31, 'cLastGrowUpTime') in (0, 1):
  300. <         run Doc_NoService()
  301. diff -r 1.10.0/SNPC_dod_01_Airport_NormalSeq.evfl.txt 1.11.0/SNPC_dod_01_Airport_NormalSeq.evfl.txt
  302. 210d209
  303. <         EventFlowSystemActor.RevokeTreasureQuest()
  304. 235a235,237
  305. >         if Player.PlayerIsUseCoordinate():
  306. >             # By the by, it looks like you're under the effect of a transformation wand at the moment. Since we need you to go empty- handed, we're gonna need to u…
  307. >             MainNpc.OpenMessageWindow('TalkSNpc/dod/SP_dod_AirPort:1308', false)
  308. 240d241
  309. <             EventFlowSystemActor.RevokeTreasureQuest()
  310. 310d310
  311. <     EventFlowSystemActor.RevokeTreasureQuest()
  312. diff -r 1.10.0/SNPC_fox_GEvent_Fireworks.evfl.txt 1.11.0/SNPC_fox_GEvent_Fireworks.evfl.txt
  313. 19,20c19
  314. <                     # You're excited, I can tell!
  315. <                     MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:002_04', false)
  316. ---
  317. >                     run Sub_Event142(Price=Price)
  318. 24,25c23
  319. <                     # You're excited, I can tell!
  320. <                     MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:002_04', false)
  321. ---
  322. >                     run Sub_Event142(Price=Price)
  323. 29,31c27,28
  324. <                     # You're excited, I can tell!
  325. <                     MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:002_04', false)
  326. <             # It's only <90:20:0000> a ticket, and each ticket nets a prize. That's right. Every ticket is a winner! So, whaddaya say?
  327. ---
  328. >                     run Sub_Event142(Price=Price)
  329. >             # Only <90:20:0000> a ticket! Knickknacks, snacks, and drinks to toss back—any and all could be yours! Each ticket nets a prize! You heard that right. …
  330. 44,53c41,69
  331. <     if (EventFlowSystemActor.IsMyVillage()) and (not System.EventFlags['cPlayer:FoxFirstTalkFireworksFlag']):
  332. <         System.EventFlags['cPlayer:FoxFirstTalkFireworksFlag'] = true
  333. <         if not System.EventFlags['cPlayer:TunekichiTalkBefore']:
  334. <             System.EventFlags['cPlayer:TunekichiTalkBefore'] = true
  335. <             System.EventFlags['cPlayer:FoxTalkOnlyStandShopFlag'] = true
  336. <             SubflowResults[1] = 1
  337. <         elif (not System.EventFlags['cLand:Museum2ConstructionToday']) and (not System.EventFlags['cLand:MuseumGrowupEnable2']) and (not System.EventFlags['cLand:Museum3Built']) and (System.EventFlags['cPlayer:FoxPreVisitWantSellFlag']):
  338. <             SubflowResults[1] = 3
  339. <         else:
  340. <             SubflowResults[1] = 2
  341. ---
  342. >     if EventFlowSystemActor.IsMyVillage():
  343. >         if not System.EventFlags['cPlayer:FoxFirstTalkFireworksFlag']:
  344. >             System.EventFlags['cPlayer:FoxFirstTalkTodayFireworksFlag'] = true
  345. >             System.EventFlags['cPlayer:FoxTalk2020FireworksFlag'] = true
  346. >             System.EventFlags['cPlayer:FoxFirstTalkFireworksFlag'] = true
  347. >             if System.EventFlags['cPlayer:TunekichiTalkBefore']:
  348. >                 run Sub_grp_Event76()
  349. >             else:
  350. >                 System.EventFlags['cPlayer:TunekichiTalkBefore'] = true
  351. >                 System.EventFlags['cPlayer:FoxTalkOnlyStandShopFlag'] = true
  352. >                 SubflowResults[1] = 1
  353. >         elif not System.EventFlags['cPlayer:FoxFirstTalkTodayFireworksFlag']:
  354. >             System.EventFlags['cPlayer:FoxFirstTalkTodayFireworksFlag'] = true
  355. >             run Sub_grp_Event76()
  356. >
  357. > flow FoodComment():
  358. >     switch SubflowResults@3[0]:
  359. >         case 1:
  360. >             if not System.EventFlags['cPlayer:FoxTalkIceCandyTodayFlag']:
  361. >                 # Oh! I'm legally obligated to warn you that there are no refunds if you trip and drop that. Watch your step!
  362. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:313', false)
  363. >                 System.EventFlags['cPlayer:FoxTalkIceCandyTodayFlag'] = true
  364. >         case 2:
  365. >             if not System.EventFlags['cPlayer:FoxTalkTapiocaTodayFlag']:
  366. >                 # Ah! The fine print. No refunds if you trip and spill that. But come back and try for another if you do!
  367. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:327', false)
  368. >                 System.EventFlags['cPlayer:FoxTalkTapiocaTodayFlag'] = true
  369. >         default:
  370. >             return
  371. 74,80c90,100
  372. <         if (EventFlowSystemActor.CatalogItemFrom('FoxStand')) and (EventFlowSystemActor.CatalogItemFrom('FoxStandNonExpendable')) and (EventFlowSystemActor.CatalogItemFrom('FoxStandBalloon')):
  373. <             if not EventFlowSystemActor.PercentChoice(80):
  374. <                 MainNpc.DecideEventReward('cFireWorksFoxNonExpendable')
  375. <             elif EventFlowSystemActor.PercentChoice(25):
  376. <                 MainNpc.DecideEventReward('cFireWorksFoxBalloon')
  377. <             else:
  378. <                 MainNpc.DecideEventReward('cFireWorksFoxExpendable')
  379. ---
  380. >         if (EventFlowSystemActor.CatalogItemFrom('FoxStand')) and (EventFlowSystemActor.CatalogItemFrom('FoxStandNonExpendable')) and (EventFlowSystemActor.CatalogItemFrom('FoxStandBalloon')) and (EventFlowSystemActor.CatalogItemFrom('FoxFood')):
  381. >             switch EventFlowSystemActor.PercentChoice3(40, 10, 50):
  382. >                 case 0:
  383. >                     MainNpc.DecideEventReward('cFireWorksFoxExpendable')
  384. >                 case 1:
  385. >                     MainNpc.DecideEventReward('cFireWorksFoxNonExpendable')
  386. >                 case 2:
  387. >                     if EventFlowSystemActor.PercentChoice(25):
  388. >                         MainNpc.DecideEventReward('cFireWorksFoxBalloon')
  389. >                     else:
  390. >                         MainNpc.DecideEventReward('cFireWorksFoxFood')
  391. 84a105
  392. >         EventFlowSystemActor.MessageSuspend()
  393. 87a109
  394. >         run FoodComment()
  395. 105a128
  396. >     SubflowResults[0] = 0
  397. 116c139
  398. <         # Big score! It's number 4!<100:3:cd03> I've got a <item>bubble blower with your name on it! Congratulations!
  399. ---
  400. >         # Big score! It's number 4!<100:3:cd03> I've got some <item>bubble blowers with your name on 'em! Congratulations!
  401. 141a165,221
  402. >     elif MainNpc.EventRewardItem(14632):
  403. >         # Lucky number 13! Don't let anyone tell you otherwise!<100:3:cd03> You've won a <item>ramune-soda frozen treat! Enjoy!
  404. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:310', false)
  405. >         SubflowResults[0] = 1
  406. >     elif MainNpc.EventRewardItem(14633):
  407. >         # Big number 14 it is!<100:3:cd03> And here's your <item>orange frozen treat! Enjoy!
  408. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:311', false)
  409. >         SubflowResults[0] = 1
  410. >     elif MainNpc.EventRewardItem(14631):
  411. >         # And we've got the number 15!<100:3:cd03> Chow down on this <item>chocolate frozen treat! Enjoy!
  412. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:312', false)
  413. >         SubflowResults[0] = 1
  414. >     elif MainNpc.EventRewardItem(14629):
  415. >         # Why, it's sweet number 16!<100:3:cd03> That'll get you some <item>plain cotton candy! Enjoy!
  416. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:318', false)
  417. >     elif MainNpc.EventRewardItem(14743):
  418. >         # Number 17, in its prime!<100:3:cd03> You've won yourself some <item>melon cotton candy! Enjoy!
  419. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:319', false)
  420. >     elif MainNpc.EventRewardItem(14744):
  421. >         # Looks like it's the number 18!<100:3:cd03> Here's your <item>ramune-soda cotton candy! Enjoy!
  422. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:320', false)
  423. >     elif MainNpc.EventRewardItem(14748):
  424. >         # Number 19!<100:3:cd03> You've won one of my favorites—<item>strawberry cotton candy! Enjoy!
  425. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:321', false)
  426. >     else:
  427. >         if MainNpc.EventRewardItem(14628):
  428. >             # It's biiiiiiiiig number 20!<100:3:cd03> That wins you some <item>boba milk tea! Enjoy!
  429. >             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:322', false)
  430. >         else:
  431. >             if MainNpc.EventRewardItem(14742):
  432. >                 # How about that! Number 21!<100:3:cd03> I sure hope you like <item>boba coffee! Enjoy!
  433. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:323', false)
  434. >             elif MainNpc.EventRewardItem(14745):
  435. >                 # It's number 22! The double deuces!<100:3:cd03> Some <item>boba strawberry tea for the lucky winner! Enjoy!
  436. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:324', false)
  437. >             elif MainNpc.EventRewardItem(14746):
  438. >                 # Number 23 sounds great to me!<100:3:cd03> Here's your <item>boba mango tea! Enjoy!
  439. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:325', false)
  440. >             else:
  441. >                 # Ah! The number 24! It's like a two- for-one deal on the number 12!<100:3:cd03> Here's your <item>boba green tea! Enjoy!
  442. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:326', false)
  443. >         SubflowResults[0] = 2
  444. >
  445. > flow PrizeCommentFood():
  446. >     if (not System.EventFlags['cPlayer:FoxTalk2020FireworksFlag']) and (not System.EventFlags['cPlayer:FoxTalkFireworksFoodFlag']):
  447. >         System.EventFlags['cPlayer:FoxTalkFireworksFoodFlag'] = true
  448. >         # And this year I've also brought tasty treats to treat your mouth during the big show!
  449. >         MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:300', false)
  450. >         switch EventFlowSystemActor.EventCheck('Fireworks'):
  451. >             case 0:
  452. >                 # That's right! Just a raffle ticket away! Don't forget to come back once the fireworks start at 7 and buy a ticket!
  453. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:302', false)
  454. >             case 1:
  455. >                 # That's right! And they're just a raffle ticket away! Act fast and act often!
  456. >                 MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:301', false)
  457. >             default:
  458. >                 return
  459. 167a248,249
  460. >             run PrizeCommentFood()
  461. >             EventFlowSystemActor.MessageSuspend()
  462. 172a255,269
  463. > local flow Sub_Event139():
  464. >     run PrizeCommentFood()
  465. >     EventFlowSystemActor.MessageSuspend()
  466. >
  467. > local flow Sub_Event142(Price: int):
  468. >     run PrizeCommentFood()
  469. >     # You're excited, I can tell!
  470. >     MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:002_04', false)
  471. >
  472. > local flow Sub_grp_Event76():
  473. >     if (not System.EventFlags['cLand:Museum2ConstructionToday']) and (not System.EventFlags['cLand:MuseumGrowupEnable2']) and (not System.EventFlags['cLand:Museum3Built']) and (System.EventFlags['cPlayer:FoxPreVisitWantSellFlag']):
  474. >         SubflowResults[1] = 3
  475. >     else:
  476. >         SubflowResults[1] = 2
  477. >
  478. 199c296,297
  479. <             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:102', true)
  480. ---
  481. >             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:102', false)
  482. >             run Sub_Event139()
  483. 201,202c299,301
  484. <             # Sorry, I'm not open yet.<10:4> Oh! Why, it's none other than my favorite cousin! How are ya, PLAYER? Actually, we'll skip the chitchat. I'm sure you'…
  485. <             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:103', true)
  486. ---
  487. >             # Sorry—I'm not open yet.<10:4> Oh! Why, it's none other than my favorite cousin! How are ya, PLAYER? Actually, we'll skip the chitchat. I'm sure you'r…
  488. >             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:103', false)
  489. >             run Sub_Event139()
  490. 205c304,305
  491. <             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:104', true)
  492. ---
  493. >             MainNpc.OpenMessageWindow('TalkSNpc/fox/GEvent/SP_fox_GEvent_Fireworks:104', false)
  494. >             run Sub_Event139()
  495. diff -r 1.10.0/SNPC_hgh_11_In.evfl.txt 1.11.0/SNPC_hgh_11_In.evfl.txt
  496. 8a9
  497. >             System.EventFlags['cPlayerTemp:TailorChkObject'] = false
  498. diff -r 1.10.0/SNPC_owl_00_Common.evfl.txt 1.11.0/SNPC_owl_00_Common.evfl.txt
  499. 55,58c55,61
  500. <     if not System.EventFlags['cLand:OwlFoundDiveFish']:
  501. <         run SNPC_owl_23_Museum_DiveFish::Select4_DiveFish()
  502. <     elif System.EventFlags['cPlayer:OwlShowDiveFishReport']:
  503. <         run Painting()
  504. ---
  505. >     if System.EventFlags['cLand:OwlFoundDiveFish']:
  506. >         if System.EventFlags['cPlayer:OwlShowDiveFishReport']:
  507. >             run Painting()
  508. >         else:
  509. >             run SNPC_owl_23_Museum_DiveFish::TodayTalk1st()
  510. >     elif (EventFlowSystemActor.HasKindItem('cFilter', 'Picture', 'OwlDonation1_5')) and (not System.EventFlags['cLand:OwlWantsPainting']):
  511. >         run SNPC_owl_22_Museum_RenualQuest::QuestCheck()
  512. 60c63
  513. <         run SNPC_owl_23_Museum_DiveFish::TodayTalk1st()
  514. ---
  515. >         run SNPC_owl_23_Museum_DiveFish::Select4_DiveFish()
  516. 207a211,213
  517. >
  518. > flow owlNoFishArt():
  519. >     run Select4()
  520. diff -r 1.10.0/SNPC_owl_01_Museum_Donation.evfl.txt 1.11.0/SNPC_owl_01_Museum_Donation.evfl.txt
  521. 231c231
  522. <         # Woo hoo! Several things, I see! Let us take a look,« shall we?»<10:8:001e0000>
  523. ---
  524. >         # Woo hoo! Several things, I see! Let us take a look,« shall we?»<10:8:005a0000>
  525. diff -r 1.10.0/SNPC_owl_23_Museum_DiveFish.evfl.txt 1.11.0/SNPC_owl_23_Museum_DiveFish.evfl.txt
  526. 83c83
  527. <             run SNPC_owl_10_Tent::OwlTentDefaultChoice()
  528. ---
  529. >             run SNPC_owl_00_Common::owlNoFishArt()
  530. diff -r 1.10.0/SNPC_pkn.evfl.txt 1.11.0/SNPC_pkn.evfl.txt
  531. 20c20
  532. <                 # Oh! You brought me some sweets! Trick or treat! <10:4>Hand me that <item>candy, pumpkin!
  533. ---
  534. >                 # Oh! You brought me some candy! Trick or treat! <10:4>Hand me that <item>candy, pumpkin!
  535. 27c27
  536. <                 # Oh! You brought me some sweets! Trick or treat! <10:4>Hand me that <item>candy, pumpkin!
  537. ---
  538. >                 # Oh! You brought me some candy! Trick or treat! <10:4>Hand me that <item>candy, pumpkin!
  539. 306,308c306,312
  540. <     if (System.EventFlags['cPlayer:PknGiveCandyCount'] != 0) and (EventFlowSystemActor.RandomChoice2(2) != 0):
  541. <         # Oh ho ho! Whee hee hee! What frightful fun! Now, if you've learned your lesson, go and fetch me <item>candy or a <item>lollipop! My hunger is never s…
  542. <         MainNpc.OpenMessageWindow('TalkSNpc/pkn/SP_pkn:063', false)
  543. ---
  544. >     if System.EventFlags['cPlayer:PknGiveCandyCount'] != 0:
  545. >         if EventFlowSystemActor.RandomChoice2(2) == 0:
  546. >             # Ho ho ho! Hee hee hee! See what becomes of those who oppose the tycoon of terror! Now then, if you're all tricked out, hand over some <item>candy or …
  547. >             MainNpc.OpenMessageWindow('TalkSNpc/pkn/SP_pkn:064', false)
  548. >         else:
  549. >             # Oh ho ho! Whee hee hee! What frightful fun! Now, if you've learned your lesson, go and fetch me <item>candy or a <item>lollipop! My hunger is never s…
  550. >             MainNpc.OpenMessageWindow('TalkSNpc/pkn/SP_pkn:063', false)
  551. 310,311c314,315
  552. <         # Ho ho ho! Hee hee hee! See what becomes of those who oppose the tycoon of terror! Now then, if you're all tricked out, hand over the treats like a go…
  553. <         MainNpc.OpenMessageWindow('TalkSNpc/pkn/SP_pkn:064', false)
  554. ---
  555. >         # Oh ho ho! Whee hee hee! What frightful fun! Now, if you've learned your lesson, go and fetch me <item>candy! My hunger is never sated, minion!
  556. >         MainNpc.OpenMessageWindow('TalkSNpc/pkn/SP_pkn:063_01', false)
  557. 332c336
  558. <                 # You've not seen the last of the czar of Halloween. Next year's fears will be here in a blink. Have candy on hand, and I'll not demand a forfeit, pump…
  559. ---
  560. >                 # You've not seen the last of the czar of Halloween. Next year's fears will be here in a blink. Have <item>candy on hand, and I'll not demand a forfeit…
  561. 399c403
  562. <         # Ah! I know that smell. You're in possession of scrumptious candy, aren't you? Oh, there's no hiding it from me, pumpkin. Jack always knows. Trick or …
  563. ---
  564. >         # Ah! I know that smell. You're in possession of scrumptious <item>candy, aren't you? Oh, there's no hiding it from me, pumpkin. Jack always knows. Tri…
  565. diff -r 1.10.0/SNPC_rco_10_Common_MoveNpcFacility.evfl.txt 1.11.0/SNPC_rco_10_Common_MoveNpcFacility.evfl.txt
  566. 315d314
  567. <     Player.TurnNeck(0)
  568. diff -r 1.10.0/SNPC_rco_52_DonationRewardEntries.evfl.txt 1.11.0/SNPC_rco_52_DonationRewardEntries.evfl.txt
  569. 73c73
  570. <         # I've given you [a|an] <125:0:0000>—<10:4>just a little sampling of a product we sell. Go ahead and do some planting, and after a few days, you'll hav…
  571. ---
  572. >         # I've given you [a|an] <125:0:0200>—<10:4>just a little sampling of a product we sell. Go ahead and do some planting, and after a few days, you'll hav…
  573. 76c76
  574. <         # I've given you [a|an] <125:0:0000>!<10:4> Just a little sampling of a product we sell. Go ahead and do some planting, and after a few days, you'll ha…
  575. ---
  576. >         # I've given you [a|an] <125:0:0200>!<10:4> Just a little sampling of a product we sell. Go ahead and do some planting, and after a few days, you'll ha…
  577. diff -r 1.10.0/SNPC_rco_53_MigrantsQuest.evfl.txt 1.11.0/SNPC_rco_53_MigrantsQuest.evfl.txt
  578. 327c327
  579. <         System.EventFlags['cPlayer:RcoMigrantProgressTalk1st'] = false
  580. ---
  581. >         System.EventFlags['cPlayer:RcoMigrantProgressTalk1st'] = true
  582. diff -r 1.10.0/SNPC_sza_GEvent_Fireworks.evfl.txt 1.11.0/SNPC_sza_GEvent_Fireworks.evfl.txt
  583. 224c224
  584. <                         # Amazing! I can't wait to see your work lighting up the night sky. I'll get everything prepped in time for launch tonight.
  585. ---
  586. >                         # Amazing! I can't wait to see your work lighting up the night sky. I'll get everything prepped and ready for launch.
  587. diff -r 1.10.0/SNPC_tap.evfl.txt 1.11.0/SNPC_tap.evfl.txt
  588. 483c483
  589. <     switch EventFlowSystemActor.GeneralTalkChoice5():
  590. ---
  591. >     switch EventFlowSystemActor.GeneralTalkChoice4():
  592. 493c493
  593. <         case 3, 4:
  594. ---
  595. >         case 3:
  596. diff -r 1.10.0/SNPC_tkk.evfl.txt 1.11.0/SNPC_tkk.evfl.txt
  597. 8,20c8,9
  598. <                 # I've got something a little different in mind tonight. I'm here to sing a song for a special cat on this island. Do me a solid and bring 'em here, wo…
  599. <                 MainNpc.OpenMessageWindow('TalkSNpc/tkk/SP_tkk:052', false)
  600. <         elif EventFlowSystemActor.EnvHourCompare(0, -1, true, true) != 0:
  601. <             # Sorry, cool cat, but I'm all jammed out. Swing by again sometime if you want to catch the gig, dig?
  602. <             MainNpc.OpenMessageWindow('TalkSNpc/tkk/SP_tkk:001', false)
  603. <         elif EventFlowSystemActor.EnvHourCompare(18, -1, true, true) != 0:
  604. <             if EventFlowSystemActor.IsMyVillage():
  605. <                 System.EventFlags['cPlayer:TotakekeTalkBeforeFlag'] = true
  606. <                 if System.EventFlags['cPlayer:TotakekeLiveCount'] < 1:
  607. <                     System.EventFlags['cPlayer:TkkFirstLiveToday'] = true
  608. <                     run Tkk_FirstLive()
  609. <                 elif System.EventFlags['cPlayer:TkkLiveToday']:
  610. <                     run Tkk_LiveAgainToday()
  611. ---
  612. >                 if System.EventFlags['cPlayerVisit:TkkVisitorLive']:
  613. >                     run Sub_grp_Event2()
  614. 22,32c11,12
  615. <                     run Tkk_FirstLiveToday()
  616. <             elif System.EventFlags['cPlayerVisit:TkkVisitorLive']:
  617. <                 run Tkk_LiveAgainToday()
  618. <             else:
  619. <                 run Tkk_FirstLiveToday()
  620. <         elif EventFlowSystemActor.IsMyVillage():
  621. <             if System.EventFlags['cPlayer:TkkTalkToday']:
  622. <                 run Sub_grp_Event145()
  623. <             else:
  624. <                 System.EventFlags['cPlayer:TkkTalkToday'] = true
  625. <                 run Sub_grp_Event173()
  626. ---
  627. >                     # I've got something a little different in mind tonight. I'm here to sing a song for a special cat on this island. Do me a solid and bring 'em here, wo…
  628. >                     MainNpc.OpenMessageWindow('TalkSNpc/tkk/SP_tkk:052', false)
  629. 34,38c14
  630. <             if System.EventFlags['cPlayerVisit:TkkVisitorTalk']:
  631. <                 run Sub_grp_Event145()
  632. <             else:
  633. <                 System.EventFlags['cPlayerVisit:TkkVisitorTalk'] = true
  634. <                 run Sub_grp_Event173()
  635. ---
  636. >             run Sub_grp_Event2()
  637. 147a124,154
  638. >
  639. > local flow Sub_grp_Event2():
  640. >     if EventFlowSystemActor.EnvHourCompare(0, -1, true, true) != 0:
  641. >         # Sorry, cool cat, but I'm all jammed out. Swing by again sometime if you want to catch the gig, dig?
  642. >         MainNpc.OpenMessageWindow('TalkSNpc/tkk/SP_tkk:001', false)
  643. >     elif EventFlowSystemActor.EnvHourCompare(18, -1, true, true) != 0:
  644. >         if EventFlowSystemActor.IsMyVillage():
  645. >             System.EventFlags['cPlayer:TotakekeTalkBeforeFlag'] = true
  646. >             if System.EventFlags['cPlayer:TotakekeLiveCount'] < 1:
  647. >                 System.EventFlags['cPlayer:TkkFirstLiveToday'] = true
  648. >                 run Tkk_FirstLive()
  649. >             elif System.EventFlags['cPlayer:TkkLiveToday']:
  650. >                 run Tkk_LiveAgainToday()
  651. >             else:
  652. >                 run Tkk_FirstLiveToday()
  653. >         elif System.EventFlags['cPlayerVisit:TkkVisitorLive']:
  654. >             run Tkk_LiveAgainToday()
  655. >         else:
  656. >             run Tkk_FirstLiveToday()
  657. >     elif EventFlowSystemActor.IsMyVillage():
  658. >         if System.EventFlags['cPlayer:TkkTalkToday']:
  659. >             run Sub_grp_Event145()
  660. >         else:
  661. >             System.EventFlags['cPlayer:TkkTalkToday'] = true
  662. >             run Sub_grp_Event173()
  663. >     else:
  664. >         if System.EventFlags['cPlayerVisit:TkkVisitorTalk']:
  665. >             run Sub_grp_Event145()
  666. >         else:
  667. >             System.EventFlags['cPlayerVisit:TkkVisitorTalk'] = true
  668. >             run Sub_grp_Event173()
  669. diff -r 1.10.0/SNPC_xct.evfl.txt 1.11.0/SNPC_xct.evfl.txt
  670. 55a56,70
  671. > flow XctMessageCafe():
  672. >     switch EventFlowSystemActor.RandomChoice4(4):
  673. >         case 0:
  674. >             System.EventFlags['cPlayer:XctCalledMessageBefore'] = 1
  675. >             MainNpc.OpenMessageWindow('TalkSNpc/xct/SP_xct:021_01', false)
  676. >         case 1:
  677. >             System.EventFlags['cPlayer:XctCalledMessageBefore'] = 2
  678. >             MainNpc.OpenMessageWindow('TalkSNpc/xct/SP_xct:021_02', false)
  679. >         case 2:
  680. >             System.EventFlags['cPlayer:XctCalledMessageBefore'] = 3
  681. >             MainNpc.OpenMessageWindow('TalkSNpc/xct/SP_xct:021_03', false)
  682. >         case 3:
  683. >             System.EventFlags['cPlayer:XctCalledMessageBefore'] = 4
  684. >             MainNpc.OpenMessageWindow('TalkSNpc/xct/SP_xct:021_04', false)
  685. >
  686. diff -r 1.10.0/System_Door_TownOffice.evfl.txt 1.11.0/System_Door_TownOffice.evfl.txt
  687. 2c2,4
  688. <     if EventFlowSystemActor.NetIsDreaming():
  689. ---
  690. >     if (not EventFlowSystemActor.NetIsDreaming()) and (not EventFlowSystemActor.GlobalEventNow('Countdown', 'cMainOnly', false)):
  691. >         EventFlowSystemActor.SetCheckResultStructureDoor(0)
  692. >     else:
  693. 6,7d7
  694. <     else:
  695. <         EventFlowSystemActor.SetCheckResultStructureDoor(0)
  696. diff -r 1.10.0/System_GameClose.evfl.txt 1.11.0/System_GameClose.evfl.txt
  697. 63a64
  698. >     EventFlowSystemActor.MessageSuspend()
  699. diff -r 1.10.0/System_GrowUp.evfl.txt 1.11.0/System_GrowUp.evfl.txt
  700. 39a40
  701. >     System.EventFlags['cLand:GrowUpAfterPatch1_11'] = true
  702. diff -r 1.10.0/System_GrowUp_WeatherControl.evfl.txt 1.11.0/System_GrowUp_WeatherControl.evfl.txt
  703. 27c27
  704. <     elif (EventFlowSystemActor.YMD(2020, 10, 31, 'cLastGrowUpTime') in (0, 2)) and (EventFlowSystemActor.YMD(2020, 12, 24, 'cLastGrowUpTime') in (0, 2)) and (EventFlowSystemActor.YMD(2020, 12, 25, 'cLastGrowUpTime') in (0, 2)):
  705. ---
  706. >     elif (EventFlowSystemActor.YMD(2021, 10, 31, 'cLastGrowUpTime') in (0, 2)) and (EventFlowSystemActor.YMD(2020, 12, 24, 'cLastGrowUpTime') in (0, 2)) and (EventFlowSystemActor.YMD(2020, 12, 25, 'cLastGrowUpTime') in (0, 2)):
  707. diff -r 1.10.0/System_IslandEvaluationCheck.evfl.txt 1.11.0/System_IslandEvaluationCheck.evfl.txt
  708. 149a150
  709. >     run ChkStarRating()
  710. 152,153d152
  711. <     else:
  712. <         run ChkStarRating()
  713.  
RAW Paste Data