Skip to content

Commit

Permalink
Revert some changes, clean up some code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Albrekka
Albrekka committed Jan 29, 2024
1 parent dac77c1 commit 4b2f94c
Show file tree
Hide file tree
Showing 5 changed files with 216 additions and 17 deletions.
86 changes: 77 additions & 9 deletions [CP] StardewAP - SVE Patch/NPCs/Claire.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"Changes": [
{
"Action": "Load",
"Action": "EditData",
"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",
Expand All @@ -18,15 +15,15 @@
}
},
{
"Action": "Load",
"Action": "EditData",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag |contains=ccMovieTheater": false,
"HasFlag": "apAbandonedJojaMart"
"HasFlag": "abandonedJojaMartAccessible"
},
"Entries": {
"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",
"Tue": "0 Custom_Claire_WarpRoom 1 3 3/940 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",
Expand All @@ -36,10 +33,10 @@
}
},
{
"Action": "Load",
"Action": "EditData",
"Target": "Characters/schedules/Claire",
"When": {
"HasFlag": "contains=ccMovieTheater"
"HasFlag": "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",
Expand All @@ -50,6 +47,77 @@

"spring": "0 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",
"Wed": "0 Custom_Claire_WarpRoom 1 3 3",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3",
"Fri": "0 Custom_Claire_WarpRoom 1 3 3",
"Sun": "0 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",
"Thu": "0 Custom_Claire_WarpRoom 1 3 3",
"Sat": "0 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"
}
}
]
}
74 changes: 68 additions & 6 deletions [CP] StardewAP - SVE Patch/NPCs/Martin.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Changes": [
{
"Action": "Load",
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag | contains=apAbandonedJojaMart": false
"HasFlag | contains=abandonedJojaMartAccessible": 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",
Expand All @@ -15,11 +15,11 @@
}
},
{
"Action": "Load",
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag |contains=ccMovieTheater": false,
"HasFlag": "apAbandonedJojaMart"
"HasFlag": "abandonedJojaMartAccessible"
},
"Entries": {
"Tue": "0 Custom_Martin_WarpRoom 1 3 3",
Expand All @@ -29,7 +29,7 @@
}
},
{
"Action": "Load",
"Action": "EditData",
"Target": "Characters/schedules/Martin",
"When": {
"HasFlag": "ccMovieTheater"
Expand All @@ -40,6 +40,68 @@
"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"
}
}
},
{
"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",
"Wed": "0 Custom_Martin_WarpRoom 1 3 3",
"Thu": "0 Custom_Martin_WarpRoom 1 3 3",
"Fri": "0 Custom_Martin_WarpRoom 1 3 3",
"Sun": "0 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"
}
}
]
}
69 changes: 69 additions & 0 deletions [CP] StardewAP - SVE Patch/NPCs/Morris.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"Changes": [
{
"Action": "EditData",
"Target": "Characters/schedules/MorrisTod",
"When": {
"HasFlag": "apAbandonedJojaMart"
},
"Entries": {
"spring": "610 Town 88 51 2/940 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Mon": "610 Town 88 51 2/940 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Tue": "610 Town 100 60 2/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Wed": "610 Town 43 59 1 Morris_Coupon/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Thu": "610 Town 72 54 2/930 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Fri": "610 Town 93 52 2/940 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Sat": "610 Town 97 63 1/900 Town 88 51 2/930 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"Sun": "610 Town 76 54 2/930 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"rain": "610 Town 92 44 3/630 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"3": "610 Town 43 59 1 Morris_Coupon/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"10": "610 Town 44 59 1 Morris_Coupon/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"17": "610 Town 42 59 1 Morris_Coupon/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"24": "610 Town 43 60 1 Morris_Coupon/900 Town 86 63 3/2300 BusStop 12 8 0/2520 Custom_DayEnd_WarpRoom 3 3 0",
"JojaMart_Replacement": "Town 86 63 3"
}
},
{
"Action": "EditData",
"Target": "characters/schedules/MorrisTod",
"When": {
"HasSeenEvent |contains=6663408": true,
"HasSeenEvent |contains=5553210": false
},
"Entries": {
"spring": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Mon": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Tue": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Thu": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Fri": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Sat": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Sun": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"rain": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/830 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"3": "0 Town 43 59 2/610 Town 43 59 1 Morris_Coupon/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"10": "0 Town 43 59 2/610 Town 44 59 1 Morris_Coupon/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"17": "0 Town 43 59 2/610 Town 42 59 1 Morris_Coupon/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"24": "0 Town 43 59 2/610 Town 43 60 1 Morris_Coupon/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"JojaMart_Replacement": "Town 86 63 3"
}
},
{
"Action": "EditData",
"Target": "characters/schedules/MorrisTod",
"When": {
"HasSeenEvent |contains=6663408": true,
"HasSeenEvent |contains=5553210": true
},
"Entries": {
"spring": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Mon": "0 Custom_MorrisHouse 16 6 2/800 Town 29 57 2/1400 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Tue": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 5 7 0/900 JojaMart 24 26 3/1910 Custom_MorrisHouse 5 7 0/2230 Custom_MorrisHouse 16 6 0",
"Wed": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/800 Town 108 30 2/1300 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Thu": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Fri": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 6 21 0/840 Town 29 57 2/1330 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"Sat": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/730 Town 29 57 2/1210 JojaMart 24 26 3/1500 Town 88 50 2/1740 JojaMart 24 26 3/2130 Custom_MorrisHouse 16 6 0",
"Sun": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 5 7 0/900 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0",
"rain": "0 Custom_MorrisHouse 16 6 2/610 Custom_MorrisHouse 14 25 2/1000 JojaMart 24 26 3/2200 Custom_MorrisHouse 16 6 0"
}
}
]
}
2 changes: 1 addition & 1 deletion [CP] StardewAP - SVE Patch/content.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Changes": [
{
"Action": "Include",
"FromFile": "npcs/claire.json, npcs/martin.json, npcs/marlonfay.json, events/modifiedeventreqs.json, specialorders/auroravineyard.json, specialorders/grandpasshed.json, maps/grandpashedpatch.json"
"FromFile": "npcs/claire.json, npcs/martin.json, npcs/morris.json, npcs/marlonfay.json, events/modifiedeventreqs.json, specialorders/auroravineyard.json, specialorders/grandpasshed.json, maps/grandpashedpatch.json"
}
]
}
2 changes: 1 addition & 1 deletion [CP] StardewAP - SVE Patch/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "StardewAP - SVE Patch",
"Author": "Witchybun",
"Version": "1.0.2",
"Version": "1.1.0",
"Description": "Patching SVE content patcher content to work with StardewArchipelago.",
"UniqueID": "Witchybun.StardewArchipelagoSVE",
"MinimumApiVersion": "3.0",
Expand Down

0 comments on commit 4b2f94c

Please sign in to comment.