Advertisement
Guest User

ACNH EventFlow 2.0.0/2.0.1 diff

a guest
Dec 16th, 2021
20
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.58 KB | None | 0 0
  1. diff -r 2.0.0/Demo_Common_Wherearen.evfl.txt 2.0.1/Demo_Common_Wherearen.evfl.txt
  2. 71c71
  3. <     if (not System.EventFlags['cWherearenPlayer:PutAmiiboDeviceInOffice']) and (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 6):
  4. ---
  5. >     if (not System.EventFlags['cWherearenPlayer:PutAmiiboDeviceInOffice']) and (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 6) and (EventFlowSystemActor.WherearenNpcOrderType() == 0):
  6. 306,307c306,310
  7. <     elif (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 30) and (not System.EventFlags['cWherearenPlayer:Unlock_Faclility_Tailor']):
  8. <         SubflowResults[16] = 7
  9. ---
  10. >     elif System.EventFlags['cWherearenPlayer:NewBuildCount'] == 30:
  11. >         if not System.EventFlags['cWherearenPlayer:Unlock_Faclility_Tailor']:
  12. >             SubflowResults[16] = 7
  13. >     elif (System.EventFlags['cWherearenPlayer:NewBuildCount'] >= 7) and (not System.EventFlags['cWherearenPlayer:Unlock_Faclility_School']):
  14. >         SubflowResults[16] = 8
  15. Only in 2.0.1: functions-2.0.1.csv
  16. Only in 2.0.0: functions.csv
  17. diff -r 2.0.0/NNPC_Spot_WherearenGarden.evfl.txt 2.0.1/NNPC_Spot_WherearenGarden.evfl.txt
  18. 18c18
  19. <     if SubflowResults@8[16] == 0:
  20. ---
  21. >     if SubflowResults@9[16] == 0:
  22. diff -r 2.0.0/Obj_WherearenAmiiboDevice.evfl.txt 2.0.1/Obj_WherearenAmiiboDevice.evfl.txt
  23. 114c114
  24. <         if SubflowResults@8[16] == 0:
  25. ---
  26. >         if SubflowResults@9[16] == 0:
  27. Only in 2.0.0: .Player_GetDemo_20_Fishing.evfl.txt.swp
  28. Only in 2.0.0: .Player_GetDemo_30_Diving.evfl.txt.swp
  29. Only in 2.0.0: .Player_GetDemo_Recipe_Cooking.evfl.txt.swp
  30. diff -r 2.0.0/SNPC_boa_Wherearen.evfl.txt 2.0.1/SNPC_boa_Wherearen.evfl.txt
  31. 36a37,38
  32. >     System.EventFlags['cWherearenPlayer:BoaGetTurnipToday'] = true
  33. >     System.EventFlags['cWherearenPlayer:BoaGiveTurnipFailed'] = false
  34. Only in 2.0.0: .SNPC_fox.evfl.txt.un~
  35. diff -r 2.0.0/SNPC_otg_01_WherearenOffice.evfl.txt 2.0.1/SNPC_otg_01_WherearenOffice.evfl.txt
  36. 145a146,151
  37. > flow CreateSchool():
  38. >     run StoryEvent_WorkModeOn()
  39. >     run SNPC_otg_15_WherearenEvent_School::Root()
  40. >     run OrderClose_EndTalk()
  41. >     EventFlowSystemActor.ExitFlowchart()
  42. >
  43. 978c984
  44. <         switch SubflowResults@8[16]:
  45. ---
  46. >         switch SubflowResults@9[16]:
  47. 1009a1016,1017
  48. >             case 8:
  49. >                 run CreateSchool()
  50. 1014,1017c1022
  51. <             run StoryEvent_WorkModeOn()
  52. <             run SNPC_otg_15_WherearenEvent_School::Root()
  53. <             run OrderClose_EndTalk()
  54. <             EventFlowSystemActor.ExitFlowchart()
  55. ---
  56. >             run CreateSchool()
  57. 1021c1026
  58. <     if SubflowResults@8[16] in (0, 1, 2, 3, 4, 5, 6):
  59. ---
  60. >     if SubflowResults@9[16] in (0, 1, 2, 3, 4, 5, 6, 8):
  61. diff -r 2.0.0/SNPC_otg_31_WherearenEvent_EntryOffice.evfl.txt 2.0.1/SNPC_otg_31_WherearenEvent_EntryOffice.evfl.txt
  62. 34c34
  63. <         if SubflowResults@8[16] in (0, 1, 2, 3, 4):
  64. ---
  65. >         if SubflowResults@9[16] in (0, 1, 2, 3, 4):
  66. diff -r 2.0.0/SNPC_rco_11_CoordinateNpcHouse_Office.evfl.txt 2.0.1/SNPC_rco_11_CoordinateNpcHouse_Office.evfl.txt
  67. 246,264c246,249
  68. <     if EventFlowSystemActor.IsSharePlay(0):
  69. <         # I noticed you have guests over right now, and since planning out a remodel can take a while… Why don't we wait until your guests leave, hm? Rushing a…
  70. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:101', false)
  71. <     elif Player.HasNoAcquaintance():
  72. <         # Yes, we… Wait, what? How long have you lived here? And you still don't know ANYONE on the island? Naturally, leaving your home in the hands of a stra…
  73. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:063', false)
  74. <     elif System.EventFlags['cPlayer:NpcHouseCoordinateTodayCount'] <= 0:
  75. <         # Oho! You'd like to pitch some new home designs to a resident? We can certainly arrange that. To get started, I'll need 9,000 Bells up front. That's a…
  76. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001', true)
  77. <         EventFlowSystemActor.UIMoneyAppear()
  78. <         # What do you say, hm? Are you ready to brainstorm some ideas?
  79. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001_01', false)
  80. <         if EventFlowSystemActor.GeneralTalkChoice2() != 0:
  81. <             run Cancel_First()
  82. <         elif EventFlowSystemActor.HasBellCount(9000):
  83. <             # Fantastic! Let's not waste any time. Who would you like to talk to about redesigning their home?
  84. <             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:002', true)
  85. <             EventFlowSystemActor.UIMoneyDisappear()
  86. <             run Sub_Event12()
  87. ---
  88. >     if EventFlowSystemActor.NetIsConnected():
  89. >         if EventFlowSystemActor.IsVillageGateOpened():
  90. >             # Actually, on second thought… a visitor could arrive at any moment. That would be inopportune, hm? If you wouldn't mind closing the gate at the airpor…
  91. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:102', false)
  92. 266c251,252
  93. <             run Cancel_NotEnoughMoney()
  94. ---
  95. >             EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false)
  96. >             run Sub_grp_Event89()
  97. 268,275c254
  98. <         # Oh! Did you come up with some new design ideas? Either for an existing pitch or maybe a new one?
  99. <         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:011', false)
  100. <         if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  101. <             # No problem. Who is it?
  102. <             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:012', true)
  103. <             run Sub_Event12()
  104. <         else:
  105. <             run Cancel_First()
  106. ---
  107. >         run Sub_grp_Event89()
  108. 402a382,413
  109. >
  110. > local flow Sub_grp_Event89():
  111. >     if EventFlowSystemActor.IsSharePlay(0):
  112. >         # I noticed you have guests over right now, and since planning out a remodel can take a while… Why don't we wait until your guests leave, hm? Rushing a…
  113. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:101', false)
  114. >     elif Player.HasNoAcquaintance():
  115. >         # Yes, we… Wait, what? How long have you lived here? And you still don't know ANYONE on the island? Naturally, leaving your home in the hands of a stra…
  116. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:063', false)
  117. >     elif System.EventFlags['cPlayer:NpcHouseCoordinateTodayCount'] <= 0:
  118. >         # Oho! You'd like to pitch some new home designs to a resident? We can certainly arrange that. To get started, I'll need 9,000 Bells up front. That's a…
  119. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001', true)
  120. >         EventFlowSystemActor.UIMoneyAppear()
  121. >         # What do you say, hm? Are you ready to brainstorm some ideas?
  122. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001_01', false)
  123. >         if EventFlowSystemActor.GeneralTalkChoice2() != 0:
  124. >             run Cancel_First()
  125. >         elif EventFlowSystemActor.HasBellCount(9000):
  126. >             # Fantastic! Let's not waste any time. Who would you like to talk to about redesigning their home?
  127. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:002', true)
  128. >             EventFlowSystemActor.UIMoneyDisappear()
  129. >             run Sub_Event12()
  130. >         else:
  131. >             run Cancel_NotEnoughMoney()
  132. >     else:
  133. >         # Oh! Did you come up with some new design ideas? Either for an existing pitch or maybe a new one?
  134. >         MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:011', false)
  135. >         if EventFlowSystemActor.GeneralTalkChoice2() == 0:
  136. >             # No problem. Who is it?
  137. >             MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:012', true)
  138. >             run Sub_Event12()
  139. >         else:
  140. >             run Cancel_First()
  141. diff -r 2.0.0/System_CastUI_Amiibo.evfl.txt 2.0.1/System_CastUI_Amiibo.evfl.txt
  142. 3a4
  143. >     EventFlowSystemActor.CheckNfpController(NpadId)
  144. diff -r 2.0.0/System_WherearenGrowUp.evfl.txt 2.0.1/System_WherearenGrowUp.evfl.txt
  145. 32a33
  146. >     run Repair_EventFlag()
  147. 124a126
  148. >     run Repair_EventFlag()
  149. 142a145,150
  150. >
  151. > flow Repair_EventFlag():
  152. >     if (System.EventFlags['cWherearenPlayer:Unlock_Faclility_School']) and (not System.EventFlags['cPlayer:WHEREAREN_Unlock_RoomSizeModeUnlock']):
  153. >         System.EventFlags['cPlayer:WHEREAREN_Unlock_RoomSizeModeUnlock'] = true
  154. >         System.EventFlags['cWherearenPlayer:Unlock_Item_Event_After_Facility_School'] = true
  155. >         System.EventFlags['cPlayer:OtgTipsCompleteSchoolBuild'] = true
  156.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement