Skip to content

Commit

Permalink
Use load, simplify schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
@Albrekka
Albrekka committed Jan 27, 2024
1 parent e98f2af commit b8e6126
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 181 deletions.
116 changes: 31 additions & 85 deletions [CP] StardewAP - SVE Patch/NPCs/Claire.json
View file
Original file line number Diff line number Diff line change
@@ -1,109 +1,55 @@
{
"Changes": [
{
"Action": "EditData",
"Action": "Load",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag | contains=apAbandonedJojaMart": false
},
"Entries": {
"Mon": "0 Custom_Claire_WarpRoom 1 3 3/800 JojaMart 9 25 1 Claire_Idle/2210 BusStop 12 8 0/2420 Custom_DayEnd_WarpRoom 3 3 0",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3/800 JojaMart 9 25 1 Claire_Idle/2210 BusStop 12 8 0/2420 Custom_DayEnd_WarpRoom 3 3 0",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3/800 JojaMart 9 25 1 Claire_Idle/2210 BusStop 12 8 0/2420 Custom_DayEnd_WarpRoom 3 3 0",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3/800 JojaMart 9 25 1 Claire_Idle/2210 BusStop 12 8 0/2420 Custom_DayEnd_WarpRoom 3 3 0",
"Sun": "0 Custom_Claire_WarpRoom 1 3 3/800 JojaMart 9 25 1 Claire_Idle/2210 BusStop 12 8 0/2420 Custom_DayEnd_WarpRoom 3 3 0",
"Sat": "0 Custom_Claire_WarpRoom 1 3 3/700 JojaMart 2 13 1 Claire_Stocking/1000 JojaMart 18 14 1 Claire_Stocking/1050 JojaMart 27 16 1 Claire_Stocking/1210 JojaMart 11 25 3/1250 BusStop 12 8 0/1500 Custom_DayEnd_WarpRoom 3 3 0",
"spring": "0 Custom_Claire_WarpRoom 1 3 3",
"JojaMart_Replacement": "MovieTheater 7 5 2 Claire_Idle"
}
},
{
"Action": "Load",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag |contains=ccMovieTheater": false,
"HasFlag": "apAbandonedJojaMart"
},
"Entries": {
"Mon": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Tue": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Sat": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Sun": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"spring": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3"
"Mon": "0 Custom_Claire_WarpRoom 1 3 3",
"Tue": "0 Custom_Claire_WarpRoom 1 3 3/840 Town 96 65 1/1420 Custom_DayEnd_WarpRoom 3 3 0",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3",
"Sat": "0 Custom_Claire_WarpRoom 1 3 3",
"Sun": "0 Custom_Claire_WarpRoom 1 3 3",
"spring": "0 Custom_Claire_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Action": "Load",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag": "ccMovieTheater"
"HasFlag": "contains=ccMovieTheater"
},
"Entries": {
"Mon": "0 Custom_Claire_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"Tue": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"Sat": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Sun": "0 Custom_Claire_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"spring": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag": "ccMovieTheater",
"HasSeenEvent |contains=3219873": true,
"DayEvent": "flower dance, dance of the moonlight jellies, egg festival, feast of the winter star, festival of ice, luau, stardew valley fair, spirit's eve"
},
"Entries": {
"Mon": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Sun": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Claire",
"When": {
"HasSeenEvent |contains=3219873": true,
"DayEvent": "egg festival, feast of the winter star, stardew valley fair, spirit's eve"
},
"Entries": {
"Tue": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3",
"Sat": "0 Custom_Claire_WarpRoom 1 3 3/610 Custom_Claire_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Target": "Characters/Schedules/Claire",
"When": {
"DayEvent |contains=flower dance, dance of the moonlight jellies, egg festival, feast of the winter star, festival of ice, luau, stardew valley fair, spirit's eve": false
},
"Entries": {
"marriage_Mon": "740 JojaMart 9 25 1 \"Strings\\schedules\\Claire:JojaMart.000\"/1900 BusStop -1 23 3",
"marriage_Tue": "1030 SeedShop 26 17 1 \"Strings\\schedules\\Claire:AerobicsClass.000\"/1300 SeedShop 23 18 2 Claire_Dance \"Strings\\schedules\\Claire:AerobicsClass.001\"/1600 BusStop -1 23 3",
"marriage_Wed": "740 JojaMart 9 25 1 \"Strings\\schedules\\Claire:JojaMart.001\"/1900 BusStop -1 23 3",
"marriage_Thu": "740 JojaMart 9 25 1 \"Strings\\schedules\\Claire:JojaMart.002\"/1900 BusStop -1 23 3",
"marriage_Sun": "740 JojaMart 9 25 1 \"Strings\\schedules\\Claire:JojaMart.003\"/1900 BusStop -1 23 3"
}
},
{
"Action": "EditData",
"Target": "Characters/Schedules/Claire",
"When": {
"HasFlag": "ccMovieTheater",
"DayEvent |contains=flower dance, dance of the moonlight jellies, egg festival, feast of the winter star, festival of ice, luau, stardew valley fair, spirit's eve": false
},
"Entries": {
"marriage_Mon": "640 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink \"Strings\\schedules\\Claire:MovieTheater.000\"/2100 BusStop 12 8 0/2310 BusStop -1 23 3",
"marriage_Tue": "1030 SeedShop 26 17 1 \"Strings\\schedules\\Claire:AerobicsClass.000\"/1300 SeedShop 23 18 2 Claire_Dance \"Strings\\schedules\\Claire:AerobicsClass.001\"/1600 BusStop -1 23 3",
"marriage_Wed": "640 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink \"Strings\\schedules\\Claire:MovieTheater.001\"/2100 BusStop 12 8 0/2310 BusStop -1 23 3",
"marriage_Thu": "640 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink \"Strings\\schedules\\Claire:MovieTheater.002\"/2100 BusStop 12 8 0/2310 BusStop -1 23 3",
"marriage_Sun": "640 Town 92 44 2/850 MovieTheater 7 5 2 Claire_Blink \"Strings\\schedules\\Claire:MovieTheater.003\"/2100 BusStop 12 8 0/2310 BusStop -1 23 3"
}
},
{
"Action": "EditData",
"Target": "Characters/Schedules/Claire",
"When": {
"HasFlag": "ccMovieTheater, ccMovieTheaterJoja",
"DayEvent |contains=flower dance, dance of the moonlight jellies, egg festival, feast of the winter star, festival of ice, luau, stardew valley fair, spirit's eve": false,
"HasSeenEvent |contains=4269703": true
},
"Entries": {
"marriage_Wed": "800 BusStop 12 8 0/850 Custom_DayEnd_WarpRoom 2 2 0/2030 BusStop 12 8 2/2050 BusStop -1 23 3"
}

"spring": "0 Custom_Claire_WarpRoom 1 3 3"
}
}
]
}
90 changes: 21 additions & 69 deletions [CP] StardewAP - SVE Patch/NPCs/Martin.json
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,45 @@
{
"Changes": [
{
"Action": "EditData",
"Action": "Load",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag | contains=apAbandonedJojaMart": false
},
"Entries": {
"Tue": "0 Custom_Martin_WarpRoom 1 3 3/800 JojaMart 9 25 1 Martin_Idle/2200 BusStop 12 8 0/2410 Custom_DayEnd_WarpRoom 3 3 0",
"Sat": "0 Custom_Martin_WarpRoom 1 3 3/800 JojaMart 9 25 1 Martin_Idle/2200 BusStop 12 8 0/2410 Custom_DayEnd_WarpRoom 3 3 0",
"Sun": "0 Custom_Martin_WarpRoom 1 3 3/800 ArchaeologyHouse 7 16 2 Martin_Read/1240 BusStop 12 8 0/1500 Custom_DayEnd_WarpRoom 3 3 0",
"spring": "0 Custom_Martin_WarpRoom 1 3 3",
"JojaMart_Replacement": "MovieTheater 7 5 2 Martin_Idle"
}
},
{
"Action": "Load",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag |contains=ccMovieTheater": false,
"HasFlag": "apAbandonedJojaMart"
},
"Entries": {
"Tue": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Sat": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"spring": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Tue": "0 Custom_Martin_WarpRoom 1 3 3",
"Sat": "0 Custom_Martin_WarpRoom 1 3 3",
"spring": "0 Custom_Martin_WarpRoom 1 3 3",
"Sun": "0 Custom_Martin_WarpRoom 1 3 3/800 ArchaeologyHouse 7 16 2 Martin_Read/1240 BusStop 12 8 0/1500 Custom_DayEnd_WarpRoom 3 3 0"
}
},
{
"Action": "EditData",
"Action": "Load",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag": "ccMovieTheater"
},
},
"Entries": {
"Tue": "0 Custom_Martin_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Martin_Blink/1530 BusStop 12 8 0/1740 Custom_DayEnd_WarpRoom 3 3 0",
"Sat": "0 Custom_Martin_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Martin_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"Sun": "0 Custom_Martin_WarpRoom 1 3 3/800 ArchaeologyHouse 7 16 2 Martin_Read/1240 BusStop 12 8 0/1500 Custom_DayEnd_WarpRoom 3 3 0",
"spring": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3"
"spring": "0 Custom_Martin_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag": "ccMovieTheater",
"HasSeenEvent |contains=3219873": true,
"DayEvent": "flower dance, dance of the moonlight jellies, egg festival, feast of the winter star, festival of ice, luau, stardew valley fair, spirit's eve"
},
"Entries": {
"Mon": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Wed": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Thu": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Fri": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3",
"Sun": "0 Custom_Martin_WarpRoom 1 3 3/610 Custom_Martin_WarpRoom 1 3 3"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"Spouse": "Claire"
},
"Entries": {
"Fri": "0 Custom_Martin_WarpRoom 1 3 3/800 JojaMart 9 25 1 Martin_Idle/2200 BusStop 12 8 0/2410 Custom_DayEnd_WarpRoom 3 3 0",
"rain": "0 Custom_Martin_WarpRoom 1 3 3/800 JojaMart 9 25 1 Martin_Idle/2200 BusStop 12 8 0/2410 Custom_DayEnd_WarpRoom 3 3 0"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"Spouse": "Claire",
"HasSeenEvent |contains=4269703": true
},
"Entries": {
"Wed": "0 Custom_Martin_WarpRoom 1 3 3/800 JojaMart 9 25 1 Martin_Idle/2200 BusStop 12 8 0/2410 Custom_DayEnd_WarpRoom 3 3 0"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag": "ccMovieTheater",
"Spouse": "Claire"
},
"Entries": {
"Fri": "0 Custom_Martin_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Martin_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0",
"rain": "0 Custom_Martin_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Martin_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0"
}
},
{
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag": "ccMovieTheater",
"Spouse": "Claire",
"HasSeenEvent |contains=4269703": true
},
"Entries": {
"Wed": "0 Custom_Martin_WarpRoom 1 3 3/650 Town 92 44 2/850 MovieTheater 7 5 2 Martin_Blink/2130 BusStop 12 8 0/2340 Custom_DayEnd_WarpRoom 3 3 0"
}
}
]
}
27 changes: 0 additions & 27 deletions [CP] StardewAP - SVE Patch/NPCs/Morris.json
View file

This file was deleted.

0 comments on commit b8e6126

Please sign in to comment.