View difference between Paste ID: NMXBkX4V and R9sGZX6V
SHOW: | | - or go back to the newest paste.
1
diff -r 2.0.1/AI_NPC_Pge_TourIsland.evfl.txt 2.0.2/AI_NPC_Pge_TourIsland.evfl.txt
2
2c2
3
<     MainNpc.NpcAISetting(8, true)
4
---
5
>     return
6-
Only in 2.0.1: functions-2.0.1.csv
6+
7-
Only in 2.0.2: functions-2.0.2.csv
7+
8
>         MainNpc.EventFlags['cNpcTemp:VisitQuestFurnitureTrade'] = false
9
diff -r 2.0.1/NNPC_Spot_WherearenMainField.evfl.txt 2.0.2/NNPC_Spot_WherearenMainField.evfl.txt
10
108c108
11
<     elif MainNpc.WherearenIsNpcLiveTogether():
12
---
13
>     elif (MainNpc.WherearenIsNpcLiveTogether()) or (not System.EventFlags['cWherearenPlayer:Unlock_ShareHouse']):
14
110c110,123
15
<             run Sub_grp_Event112()
16
---
17
>             fork:
18
>                 branch:
19
>                     EventFlowSystemActor.UIWherearenIslandsMsgPhotoAppear('cJpegMainNpcActor', 0, false, 0.0, 0.0, '')
20
>                 branch:
21
>                     # Hey, aren't you super-duper busy? Do you need me for something?
22
>                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:004', false)
23
>             switch EventFlowSystemActor.GeneralTalkChoice3():
24
>                 case 0:
25
>                     run Sub_Event66()
26
>                 case 1:
27
>                     run NNPC_Spot_WherearenGarden::Reform()
28
>                 case 2:
29
>                     # Yay! I love chatting. But, um…is this one of those chats where I do all the talking and you just stand there staring at me? 'Cause those're the best!…
30
>                     MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:012', false)
31
122,141c135,139
32
<     else:
33
<         if System.EventFlags['cWherearenPlayer:Unlock_ShareHouse']:
34
<             if (EventFlowSystemActor.WherearenKKFesStatus(false) == 0) and (not MainNpc.WherearenNpcIsLocatedSea()):
35
<                 fork:
36
<                     branch:
37
<                         EventFlowSystemActor.UIWherearenIslandsMsgPhotoAppear('cJpegMainNpcActor', 0, false, 0.0, 0.0, '')
38
<                     branch:
39
<                         # Hey, aren't you super-duper busy? Do you need me for something?
40
<                         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:003', false)
41
<                 switch EventFlowSystemActor.GeneralTalkChoice4():
42
<                     case 0:
43
<                         run Sub_Event66()
44
<                     case 1:
45
<                         run NNPC_Spot_WherearenGarden::Reform()
46
<                     case 2:
47
<                         run NNPC_Spot_WherearenGarden::StartShareHouse()
48
<                     case 3:
49
<                         # Yay! I love chatting. But, um…is this one of those chats where I do all the talking and you just stand there staring at me? 'Cause those're the best!…
50
<                         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:012', false)
51
<             else:
52
---
53
>     elif (EventFlowSystemActor.WherearenKKFesStatus(false) == 0) and (not MainNpc.WherearenNpcIsLocatedSea()):
54
>         fork:
55
>             branch:
56
>                 EventFlowSystemActor.UIWherearenIslandsMsgPhotoAppear('cJpegMainNpcActor', 0, false, 0.0, 0.0, '')
57
>             branch:
58
144,155c142,146
59
<                 switch EventFlowSystemActor.GeneralTalkChoice4():
60
<                     case 0:
61
<                         run Sub_Event66()
62
<                     case 1:
63
<                         run NNPC_Spot_WherearenGarden::Reform()
64
<                     case 2:
65
<                         run NNPC_Spot_WherearenGarden::StartShareHouse()
66
<                     case 3:
67
<                         # Yay! I love chatting. But, um…is this one of those chats where I do all the talking and you just stand there staring at me? 'Cause those're the best!…
68
<                         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:012', false)
69
<         else:
70
<             run Sub_grp_Event112()
71
---
72
>         run Sub_grp_Event2()
73
>     else:
74
>         # Hey, aren't you super-duper busy? Do you need me for something?
75
>         MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:003', false)
76
>         run Sub_grp_Event2()
77
232,247d222
78
< local flow Sub_grp_Event112():
79
<     fork:
80
<         branch:
81
<             EventFlowSystemActor.UIWherearenIslandsMsgPhotoAppear('cJpegMainNpcActor', 0, false, 0.0, 0.0, '')
82
<         branch:
83
<             # Hey, aren't you super-duper busy? Do you need me for something?
84
<             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:004', false)
85
<     switch EventFlowSystemActor.GeneralTalkChoice3():
86
<         case 0:
87
<             run Sub_Event66()
88
<         case 1:
89
<             run NNPC_Spot_WherearenGarden::Reform()
90
<         case 2:
91
<             # Yay! I love chatting. But, um…is this one of those chats where I do all the talking and you just stand there staring at me? 'Cause those're the best!…
92
<             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:012', false)
93
< 
94
288a264,275
95
> 
96
> local flow Sub_grp_Event2():
97
>     switch EventFlowSystemActor.GeneralTalkChoice4():
98
>         case 0:
99
>             run Sub_Event66()
100
>         case 1:
101
>             run NNPC_Spot_WherearenGarden::Reform()
102
>         case 2:
103
>             run NNPC_Spot_WherearenGarden::StartShareHouse()
104
>         case 3:
105
>             # Yay! I love chatting. But, um…is this one of those chats where I do all the talking and you just stand there staring at me? 'Cause those're the best!…
106
>             MainNpc.OpenMessageWindow('TalkNNpc/B1_Bo/OneRoom/BO_Spot_WherearenMainField:012', false)
107
diff -r 2.0.1/Obj_Radio_RadioGymnastics.evfl.txt 2.0.2/Obj_Radio_RadioGymnastics.evfl.txt
108
33d32
109
<     run StartAgain()
110
134a134
111
>             run SelectMenu()
112
diff -r 2.0.1/SNPC_otg_32_WherearenEvent_PhoneCall.evfl.txt 2.0.2/SNPC_otg_32_WherearenEvent_PhoneCall.evfl.txt
113
2,4c2
114
<     if System.EventFlags['cPlayer:UnlockInterior_CeilingFurniture']:
115
<         System.EventFlags['cPlayer:RepayMileInteriorModePro'] = true
116
<     else:
117
---
118
>     if not System.EventFlags['cPlayer:UnlockInterior_CeilingFurniture']:
119
5a4,6
120
>     elif not System.EventFlags['cWherearenPlayer:SeqCeilingEventOrRepayDone']:
121
>         System.EventFlags['cPlayer:RepayMileInteriorModePro'] = true
122
>         System.EventFlags['cWherearenPlayer:SeqCeilingEventOrRepayDone'] = true
123
24a26
124
>     System.EventFlags['cWherearenPlayer:SeqCeilingEventOrRepayDone'] = true
125