From ff71f322b52c16fe3a0906c3a1c5e1d63c8192dc Mon Sep 17 00:00:00 2001 From: AgentLyoko <163772536+AgentLyoko@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:06:22 -0500 Subject: [PATCH 1/4] NPCA Alpha changes Changes for the 1.6 NPCA Alpha - should not be published to Nexus unless NPCA itself publishes to Nexus for the 1.6 update --- .../companions/Alissa.json | 10 +++---- .../companions/Anton.json | 12 ++++----- .../companions/Blair.json | 10 +++---- .../companions/Bryle.json | 14 +++++----- .../companions/Corine.json | 26 +++++++++---------- .../companions/Daia.json | 22 ++++++++-------- .../companions/Faye.json | 20 +++++++------- .../companions/Flor.json | 10 +++---- .../companions/Ian.json | 14 +++++----- .../companions/Irene.json | 12 ++++----- .../companions/Jeric.json | 10 +++---- .../companions/Jio.json | 22 ++++++++-------- .../companions/June.json | 18 ++++++------- .../companions/Keahi.json | 8 +++--- .../companions/Kenneth.json | 10 +++---- .../companions/Kiarra.json | 10 +++---- .../companions/Kiwi.json | 4 +-- .../companions/Lenny.json | 6 ++--- .../companions/Louie.json | 8 +++--- .../companions/Maddie.json | 17 ++++++------ .../companions/Paula.json | 20 +++++++------- .../companions/Philip.json | 10 +++---- .../companions/Sean.json | 12 ++++----- .../companions/Shiro.json | 10 +++---- .../companions/Trinnie.json | 8 +++--- .../companions/Ysabelle.json | 14 +++++----- .../companions/Yuuma.json | 8 +++--- .../companions/Zayne.json | 10 +++---- 28 files changed, 178 insertions(+), 177 deletions(-) diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Alissa.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Alissa.json index dfb87766..1436868d 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Alissa.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Alissa.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Alissa", //Fighter and Forager with +3 Farming "Skills": [ @@ -25,13 +25,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Alissa/!f Alissa 2000": "reject", - "O Alissa": "accept", + "PLAYER_NPC_RELATIONSHIP Current Alissa Married, !PLAYER_HEARTS Current Alissa 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Alissa Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Alissa 1000": "reject", - "k 75160115": "reject", + "!PLAYER_HEARTS Current Alissa 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160115": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json index 42485e6a..c4566230 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Anton", "Skills": [ @@ -34,14 +34,14 @@ ], "Rules": { //Marriage - //Reject if under 8 hearts, otherwise always go - "O Anton/!f Anton 2000": "reject", - "O Anton": "accept", + //Reject if under 8 hearts, otherwise always go + "PLAYER_NPC_RELATIONSHIP Current Anton Married, !PLAYER_HEARTS Current Anton 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Anton Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Anton 1000": "reject", - "k 75160302": "reject", + "!PLAYER_HEARTS Current Anton 4": "reject", + "!PLAYER_HAS_SEEN_EVENT 75160302": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Blair.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Blair.json index 463e6204..58ac9a75 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Blair.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Blair.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Blair", "Skills": [ @@ -30,13 +30,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Blair/!f Blair 2000": "reject", - "O Blair": "accept", + "PLAYER_NPC_RELATIONSHIP Current Blair Married, !PLAYER_HEARTS Current Blair 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Blair Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Blair 1000": "reject", - "k 75160310": "reject", + "!PLAYER_HEARTS Current Blair 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160310": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Bryle.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Bryle.json index 3bc47d20..0d6a77a1 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Bryle.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Bryle.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Bryle", "Skills": [ @@ -35,19 +35,19 @@ "CanSuggest": false, "Price": 500, "Sales": { - "O Bryle": 0.0, - "f Bryle 2000/e 75160453": 0.5, + "PLAYER_NPC_RELATIONSHIP Current Bryle Married": 0.0, + "PLAYER_HEARTS Current Bryle 8, PLAYER_HAS_SEEN_EVENT Current 75160453": 0.5, }, "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Bryle/!f Bryle 2000": "reject", - "O Bryle": "accept", + "PLAYER_NPC_RELATIONSHIP Current Bryle Married, !PLAYER_HEARTS Bryle 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Bryle Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - //"!f Bryle 1000": "reject", - //"k 75160451": "reject", + "!PLAYER_HEARTS Current Bryle 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160451": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Corine.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Corine.json index c7b4a92c..0474f64e 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Corine.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Corine.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Corine", "Skills": [ @@ -29,27 +29,27 @@ ], "Rules": { //Saloon - reject - "t 1500 2300/!z rainy/!O Corine/!d Fri": "reject companionRejectedSaloon", - "t 1330 2000/!z rainy/O Corine/!d Fri": "reject companionRejectedSaloon_Spouse", + "TIME 1500 2300, WEATHER Town Rain Storm GreenRain, !PLAYER_NPC_RELATIONSHIP Current Corine Married, DAY_OF_WEEK Fri": "reject companionRejectedSaloon", + "TIME 1330 2000, WEATHER Town Rain Storm GreenRain, PLAYER_NPC_RELATIONSHIP Current Corine Married, DAY_OF_WEEK Fri": "reject companionRejectedSaloon_Spouse", //Marriage //Reject if under 8 hearts, otherwise always go - "O Corine/!f Corine 2000": "reject", - "O Corine": "accept", + "PLAYER_NPC_RELATIONSHIP Current Corine Married, !PLAYER_HEARTS Current Corine 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Corine Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Corine 1000": "reject", - "k 75160123": "reject", + "!PLAYER_HEARTS Current Corine 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160123": "reject", //Pika's - accept - "t 900 2300/e 75160125/Hn GH1letter/!z rainy/!O Corine/d Tue Fri Thu": "accept companionAcceptedWork", - "t 900 2300/Hn GH1letter/!z rainy/!O Corine/d Tue Fri": "accept companionAcceptedWork", - "t 900 2300/e 75160125/!z rainy/!O Corine/d Thu Fri": "accept companionAcceptedWork", - "t 900 2300/!z rainy/!O Corine/d Fri": "accept companionAcceptedWork", + "TIME 900 2300, PLAYER_HAS_SEEN_EVENT Current 75160125, PLAYER_HAS_MAIL Host GH1letter, WEATHER Town Rain Storm GreenRain, !PLAYER_NPC_RELATIONSHIP Current Corine Married, !DAY_OF_WEEK Tue Fri Thu": "accept companionAcceptedWork", + "TIME 900 2300, PLAYER_HAS_MAIL Host GH1letter, WEATHER Town Rain Storm GreenRain, !PLAYER_NPC_RELATIONSHIP Current Corine Married, !DAY_OF_WEEK Tue Fri": "accept companionAcceptedWork", + "TIME 900 2300, PLAYER_HAS_SEEN_EVENT Current 75160125, WEATHER Town Rain Storm GreenRain, !PLAYER_NPC_RELATIONSHIP Current Corine Married, !DAY_OF_WEEK Thu Fri": "accept companionAcceptedWork", + "TIME 900 2300, WEATHER Town Rain Storm GreenRain, !PLAYER_NPC_RELATIONSHIP Current Corine Married, !DAY_OF_WEEK Fri": "accept companionAcceptedWork", - "t 1200 1800/e 75160125/!z rainy/O Corine/d Tue Fri Thu Sat Sun": "accept companionAcceptedWork_Spouse", - "t 1200 1800/!z rainy/O Corine/d Tue Fri Sat Sun": "accept companionAcceptedWork_Spouse", + "TIME 1200 1800, PLAYER_HAS_SEEN_EVENT Current 75160125, WEATHER Town Rain Storm GreenRain, PLAYER_NPC_RELATIONSHIP Current Corine Married, DAY_OF_WEEK Mon Wed": "accept companionAcceptedWork_Spouse", + "TIME 1200 1800, WEATHER Town Rain Storm GreenRain, PLAYER_NPC_RELATIONSHIP Current Corine Married, DAY_OF_WEEK Mon Wed Thu": "accept companionAcceptedWork_Spouse", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Daia.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Daia.json index 21414d48..454e3510 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Daia.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Daia.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Daia", "Skills": [ @@ -47,25 +47,25 @@ "CanSuggest": false, "Price": 1000, "Sales": { - "O Daia": 0.0, - "f Daia 2000/e 75160205": 0.5, + "PLAYER_NPC_RELATIONSHIP Current Daia Married": 0.0, + "PLAYER_HEARTS Current Daia 8, PLAYER_HAS_SEEN_EVENT Current 75160205": 0.5, }, "Rules": { //Combat - "z fall/z winter/t 2000 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!z fall/t 1900 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!z winter/t 1800 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!SkillLevel combat 6": "reject companionRejected_Weak", + "SEASON Spring Summer, TIME 2000 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "SEASON fall, TIME 1900 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "SEASON winter, TIME 1800 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "!PLAYER_COMBAT_LEVEL Current 6": "reject companionRejected_Weak", //Marriage //Reject if under 8 hearts, otherwise always go - "O Daia/!f Daia 2000": "reject", - "O Daia": "accept", + "PLAYER_NPC_RELATIONSHIP Current Daia Married, !PLAYER_HEARTS Current Daia 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Daia Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - //"!f Daia 1000": "reject", - //"k 75160202": "reject", + "!PLAYER_HEARTS Current Daia 4": "reject", + "!PLAYER_HAS_SEEN_EVENT 75160202": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Faye.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Faye.json index 03393af3..8285b1a6 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Faye.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Faye.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Faye", "Skills": [ @@ -29,21 +29,21 @@ ], "Rules": { //Work - "t 900 1400/!O Faye/!z rainy/!d Tue/Hn GH1letter": "reject companionRejectedWork", - "t 900 1200/!O Faye/!z rainy/d Thu": "reject companionRejectedWork", - "t 1800 2300/!O Faye/!z rainy/d Thu": "reject companionRejectedWork", - "t 1000 1400/O Faye/!z rainy/d Tue Wed Thu Sat Sun": "reject companionRejectedWork_Spouse", - "t 1800 2000/O Faye/!z rainy/d Tue Wed Thu Sat Sun": "reject companionRejectedWork_Spouse", + "TIME 900 1400, !PLAYER_NPC_RELATIONSHIP Current Faye Married, WEATHER Town Rain Storm GreenRain, DAY_OF_WEEK Tue, PLAYER_HAS_MAIL Host GH1letter": "reject companionRejectedWork", + "TIME 900 1200, !PLAYER_NPC_RELATIONSHIP Current Faye Married, WEATHER Town Rain Storm GreenRain, !DAY_OF_WEEK Thu": "reject companionRejectedWork", + "TIME 1800 2300, !PLAYER_NPC_RELATIONSHIP Current Faye Married, WEATHER Town Rain Storm GreenRain, !DAY_OF_WEEK Thu": "reject companionRejectedWork", + "TIME 1000 1400, PLAYER_NPC_RELATIONSHIP Current Faye Married, WEATHER Town Rain Storm GreenRain, DAY_OF_WEEK Mon Fri": "reject companionRejectedWork_Spouse", + "TIME 1800 2000, PLAYER_NPC_RELATIONSHIP Current Faye Married, WEATHER Town Rain Storm GreenRain, DAY_OF_WEEK Mon Fri": "reject companionRejectedWork_Spouse", //Marriage //Reject if under 8 hearts, otherwise always go - "O Faye/!f Faye 2000": "reject", - "O Faye": "accept", + "PLAYER_NPC_RELATIONSHIP Current Faye Married, !PLAYER_HEARTS Current Faye 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Faye Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Faye 1000": "reject", - "k 75160318": "reject", + "!PLAYER_HEARTS Current Faye 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160318": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Flor.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Flor.json index 3fd948a4..3642b43d 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Flor.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Flor.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Flor", "Skills": [ //Doctor Skill @@ -43,13 +43,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Flor/!f Flor 2000": "reject", - "O Flor": "accept", + "PLAYER_NPC_RELATIONSHIP Current Flor Married, !PLAYER_HEARTS Current Flor 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Flor Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Flor 1000": "reject", - "k 75160129": "reject", + "!PLAYER_HEARTS Current Flor 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160129": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ian.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ian.json index 14fc66f2..53cc85d9 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ian.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ian.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Ian", "Skills": [ @@ -29,19 +29,19 @@ "CanSuggest": false, "Price": 500, "Sales": { - "O Ian": 0.0, - "f Ian 2000/e 75160149": 0.5, + "PLAYER_NPC_RELATIONSHIP Current Ian Married": 0.0, + "PLAYER_HEARTS Current Ian 8, PLAYER_HAS_SEEN_EVENT Current 75160149": 0.5, }, "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Ian/!f Ian 2000": "reject", - "O Ian": "accept", + "PLAYER_NPC_RELATIONSHIP Current Ian Married, !PLAYER_HEARTS Current Ian 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Ian Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - //"!f Ian 1000": "reject", - //"k 75160147": "reject", + "!PLAYER_HEARTS Current Ian 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160147": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Irene.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Irene.json index 2ae1a8d3..b2a56c40 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Irene.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Irene.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Irene", "Skills": [ @@ -32,14 +32,14 @@ //Marriage - //Reject if under 8 hearts, otherwise always go - "O Irene/!f Irene 2000": "reject", - "O Irene": "accept", + //Reject if under 8 hearts, otherwise always go + "PLAYER_NPC_RELATIONSHIP Current Irene Married, !PLAYER_HEARTS Current Irene 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Irene Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Irene 1000": "reject", - "k 75160321": "reject", + "!PLAYER_HEARTS Current Irene 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160321": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jeric.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jeric.json index 190bf02f..ab4f4a24 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jeric.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jeric.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Jeric", "Skills": [ @@ -30,13 +30,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Jeric/!f Jeric 2000": "reject", - "O Jeric": "accept", + "PLAYER_NPC_RELATIONSHIP Current Jeric Married, !PLAYER_HEARTS Current Jeric 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Jeric Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Jeric 1000": "reject", - "k 75160152": "reject", + "!PLAYER_HEARTS Current Jeric 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160152": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jio.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jio.json index 1ff081fb..6caa8351 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jio.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Jio.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Jio", "Skills": [ @@ -51,25 +51,25 @@ "CanSuggest": false, "Price": 1000, "Sales": { - "O Jio": 0.0, - "f Jio 2000/e 75160081": 0.5, + "PLAYER_NPC_RELATIONSHIP Current Jio Married": 0.0, + "PLAYER_HEARTS Current Jio 8, PLAYER_HAS_SEEN_EVENT Current 75160081": 0.5, }, "Rules": { //Combat - "z fall/z winter/t 2000 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!z fall/t 1900 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!z winter/t 1800 2600/!SkillLevel combat 6": "reject companionRejectedNight_Weak", - "!SkillLevel combat 6": "reject companionRejected_Weak", + "SEASON Spring Summer, TIME 2000 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "SEASON fall, TIME 1900 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "SEASON winter, TIME 1800 2600, !PLAYER_COMBAT_LEVEL Current 6": "reject companionRejectedNight_Weak", + "!PLAYER_COMBAT_LEVEL Current 6": "reject companionRejected_Weak", //Marriage //Reject if under 8 hearts, otherwise always go - "O Jio/!f Jio 2000": "reject", - "O Jio": "accept", + "PLAYER_NPC_RELATIONSHIP Current Jio Married, !PLAYER_HEARTS Current Jio 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Jio Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - //"!f Jio 1000": "reject", - //"k 75160079": "reject", + "!PLAYER_HEARTS Current Jio 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160079": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/June.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/June.json index 1bc558f5..4191fd2a 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/June.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/June.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "June", "Skills": [ @@ -35,20 +35,20 @@ ], "Rules": { //Work - "t 1700 2100/d Mon Tue Wed Sun/!O June": "reject companionRejectedWork", - "t 1200 1500/d Mon Tue Wed Thu Fri/!O June": "reject companionRejectedWork", - "t 1200 1800/!d Sat/O June/!z rainy": "reject companionRejectedWork_Spouse", - "t 1200 1500/!d Sun/O June/!z rainy": "reject companionRejectedWork_Spouse", + "TIME 1700 2100, DAY_OF_WEEK Thu Fri Sat, !PLAYER_NPC_RELATIONSHIP Current June Married": "reject companionRejectedWork", + "TIME 1200 1500, DAY_OF_WEEK Sat Sun, !PLAYER_NPC_RELATIONSHIP Current June Married": "reject companionRejectedWork", + "TIME 1200 1800, DAY_OF_WEEK Sat, PLAYER_NPC_RELATIONSHIP Current June Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork_Spouse", + "TIME 1200 1500, DAY_OF_WEEK Sun, PLAYER_NPC_RELATIONSHIP Current June Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork_Spouse", //Marriage //Reject if under 8 hearts, otherwise always go - "O June/!f June 2000": "reject", - "O June": "accept", + "PLAYER_NPC_RELATIONSHIP Current June Married, !PLAYER_HEARTS Current June 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current June Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f June 1000": "reject", - "k 94620004": "reject", + "!PLAYER_HEARTS Current June 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 94620004": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Keahi.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Keahi.json index da4a9021..2333ae90 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Keahi.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Keahi.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Keahi", "Skills": [ @@ -12,9 +12,9 @@ "Rules": { //Normal //Requires seen 4 heart event + 4 hearts and above with Keahi and Pika - "!f Pika 1000": "reject", - "!f Keahi 1000": "reject", - "k 75160083": "reject", + "!PLAYER_HEARTS Current Pika 4": "reject", + "!PLAYER_HEARTS Current Keahi 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160083": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kenneth.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kenneth.json index d79cb787..55952661 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kenneth.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kenneth.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Kenneth", "Skills": [ @@ -40,13 +40,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Kenneth/!f Kenneth 2000": "reject", - "O Kenneth": "accept", + "PLAYER_NPC_RELATIONSHIP Current Kenneth Married, !PLAYER_HEARTS Current Kenneth 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Kenneth Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Kenneth 1000": "reject", - "k 75160158": "reject", + "!PLAYER_HEARTS Current Kenneth 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160158": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiarra.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiarra.json index 7a051343..56a85ac4 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiarra.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiarra.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Kiarra", "Skills": [ @@ -29,13 +29,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Kiarra/!f Kiarra 2000": "reject", - "O Kiarra": "accept", + "PLAYER_NPC_RELATIONSHIP Current Kiarra Married, !PLAYER_HEARTS Current Kiarra 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Kiarra Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Kiarra 1000": "reject", - "k 75160326": "reject", + "!PLAYER_HEARTS Current Kiarra 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160326": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiwi.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiwi.json index a402bd31..9b6fefe4 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiwi.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Kiwi.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Kiwi", "Skills": [ @@ -30,7 +30,7 @@ "Rules": { //Normal //Requires seen 8 heart event + 10 hearts - "f Kiwi 2500/e 75160180": "accept", + "PLAYER_HEARTS Current Kiwi 10, PLAYER_HAS_SEEN_EVENT Current 75160180": "accept", //Basics "": "reject", diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Lenny.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Lenny.json index e999d4f0..1f93bbbf 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Lenny.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Lenny.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Lenny", "Skills": [ @@ -32,8 +32,8 @@ "Rules": { //Normal //Requires seen 6 heart event + 6 hearts and above - "!f Lenny 1500": "reject", - "k 75160088": "reject", + "!PLAYER_HEARTS Current Lenny 6": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160088": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Louie.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Louie.json index 29583eac..8d5d9266 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Louie.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Louie.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Louie", "Skills": [ @@ -22,11 +22,11 @@ "Rules": { //Normal //Requires seen 4 heart event + 4 hearts and above with Louie, Sonny/Maive - "e 75160372/f Louie 1000/f Sonny 1000": "accept", - "e 75160372/f Louie 1000/f Maive 1000": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160372, PLAYER_HEARTS Current Louie 4, PLAYER_HEARTS Current Sonny 4": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160372, PLAYER_HEARTS Current Louie 4, PLAYER_HEARTS Current Maive 4": "accept", //Basics - "": "reject", //acceptance when asked + "": "reject", //reject when asked otherwise }, "Bedtime": "2000", diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Maddie.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Maddie.json index 2682bb17..df7e698a 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Maddie.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Maddie.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Maddie", "Skills": [ @@ -28,20 +28,21 @@ ], "Rules": { + //Work - "t 1130 1400/Hn GH1Letter/!d Mon/!O Maddie/!z rainy": "reject companionRejectedWork", - "t 1000 1400/!u 10 20/d Sun/!O Maddie": "reject companionRejectedWork", - "t 1200 1400/d Tue Thu Fri Sat Sun/O Maddie/!z rainy": "reject companionRejectedWork_Spouse", + "TIME 1130 1400, PLAYER_HAS_MAIL Host GH1Letter, DAY_OF_WEEK Mon, !PLAYER_NPC_RELATIONSHIP Current Maddie Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork", + "TIME 1000 1400, !DAY_OF_MONTH 10 20, DAY_OF_WEEK Sun, !PLAYER_NPC_RELATIONSHIP Current Maddie Married": "reject companionRejectedWork", + "TIME 1200 1400, DAY_OF_WEEK Mon Wed, PLAYER_NPC_RELATIONSHIP Current Maddie Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork_Spouse", //Marriage //Reject if under 8 hearts, otherwise always go - "O Maddie/!f Maddie 2000": "reject", - "O Maddie": "accept", + "PLAYER_NPC_RELATIONSHIP Current Maddie Married, !PLAYER_HEARTS Current Maddie 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Maddie Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Maddie 1000": "reject", - "k 75160135": "reject", + "!PLAYER_HEARTS Current Maddie 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160135": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json index 54fb5640..e2c7b7c0 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Paula", "Skills": [ @@ -33,20 +33,20 @@ ], "Rules": { //Work - "t 800 1400/!d Sun/Hn GH1Letter/!O Paula/!z rainy": "reject companionRejectedWork", - "t 1000 1700/!d Wed/!O Paula/!z rainy": "reject companionRejectedWork", - "t 800 1700/d Wed/!O Paula": "reject companionRejectedWork", - "t 800 1600/d Tue Thu Sat Sun/O Paula/!z rainy": "reject companionRejectedWork_Spouse", + "TIME 800 1400, DAY_OF_WEEK Sun/PLAYER_HAS_MAIL Host GH1Letter, !PLAYER_NPC_RELATIONSHIP Current Paula Married/!z rainy": "reject companionRejectedWork", + "TIME 1000 1700, DAY_OF_WEEK Wed, !PLAYER_NPC_RELATIONSHIP Current Paula Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork", + "TIME 800 1700, !DAY_OF_WEEK Wed, !PLAYER_NPC_RELATIONSHIP Current Paula Married": "reject companionRejectedWork", + "TIME 800 1600, DAY_OF_WEEK Mon Wed Fri, PLAYER_NPC_RELATIONSHIP Current Paula Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork_Spouse", //Marriage - //Reject if under 8 hearts, otherwise always go - "O Paula/!f Paula 2000": "reject", - "O Paula": "accept", + //Reject if under 8 hearts, otherwise always go + "PLAYER_NPC_RELATIONSHIP Current Paula Married, !PLAYER_HEARTS Current Paula 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Paula Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Paula 1000": "reject", - "k 75160349": "reject", + "!PLAYER_HEARTS Current Paula 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160349": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Philip.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Philip.json index fc1e53e3..225844cd 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Philip.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Philip.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Philip", "Skills": [ //Doctor Skill @@ -33,13 +33,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Philip/!f Philip 2000": "reject", - "O Philip": "accept", + "PLAYER_NPC_RELATIONSHIP Current Philip Married, !PLAYER_HEARTS Current Philip 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Philip Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Philip 1000": "reject", - "k 75160164": "reject", + "!PLAYER_HEARTS Current Philip 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160164": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Sean.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Sean.json index 0fa97ba1..ed63c197 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Sean.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Sean.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Sean", "Skills": [ @@ -28,14 +28,14 @@ ], "Rules": { //Marriage - //Reject if under 8 hearts, otherwise always go - "O Sean/!f Sean 2000": "reject", - "O Sean": "accept", + //Reject if under 8 hearts, otherwise always go + "PLAYER_NPC_RELATIONSHIP Current Sean Married, !PLAYER_HEARTS Current Sean 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Sean Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Sean 1000": "reject", - "k 75160354": "reject", + "!PLAYER_HEARTS Current Sean 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160354": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Shiro.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Shiro.json index 8f1c224b..6a818237 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Shiro.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Shiro.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Shiro", "Skills": [ @@ -51,13 +51,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Shiro/!f Shiro 2000": "reject", - "O Shiro": "accept", + "PLAYER_NPC_RELATIONSHIP Current Shiro Married, !PLAYER_HEARTS Current Shiro 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Shiro Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Shiro 1000": "reject", - "k 75160169": "reject", + "!PLAYER_HEARTS Current Shiro 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160169": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Trinnie.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Trinnie.json index 1b08852b..3b404a26 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Trinnie.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Trinnie.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Trinnie", "Skills": [ @@ -16,11 +16,11 @@ "Rules": { //Normal //Requires seen 4 heart event + 4 hearts and above with Trinnie and Olga/Bert - "e 75160107/f Trinnie 1000/f Bert 1000": "accept", - "e 75160107/f Trinnie 1000/f Olga 1000": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160107, PLAYER_HEARTS Current Trinnie 4, PLAYER_HEARTS Current Bert 4": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160107, PLAYER_HEARTS Current Trinnie 4, PLAYER_HEARTS Current Olga 4": "accept", //Basics - "": "reject", //acceptance when asked + "": "reject", //reject when asked }, "Bedtime": "2000", diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ysabelle.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ysabelle.json index 18577341..7c490adf 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ysabelle.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Ysabelle.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Ysabelle", "Skills": [ @@ -29,20 +29,20 @@ "Duration": 5, "Cooldown": 120, "Amount": 3, //Increase of attack power IF Attack Type protector - "Description": "[Ysa.protector]" + "Description": "[June.protector]" }, ], "Rules": { //Marriage - //Reject if under 8 hearts, otherwise always go - "O Ysabelle/!f Ysabelle 2000": "reject", - "O Ysabelle": "accept", + //Reject if under 8 hearts, otherwise always go + "PLAYER_NPC_RELATIONSHIP Current Ysabelle Married, !PLAYER_HEARTS Current Ysabelle 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Ysabelle Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Ysabelle 1000": "reject", - "k 75160142": "reject", + "!PLAYER_HEARTS Current Ysabelle 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160142": "reject", //Basics "": "accept", //acceptance when asked diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Yuuma.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Yuuma.json index ab82cc43..feb7f235 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Yuuma.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Yuuma.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Yuuma", "Skills": [ @@ -15,11 +15,11 @@ "Rules": { //Normal //Requires seen 4 heart event + 4 hearts and above with Yuuma and Naomi/Shiro - "e 75160111/f Yuuma 1000/f Shiro 1000": "accept", - "e 75160111/f Yuuma 1000/f Naomi 1000": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160111, PLAYER_HEARTS Current Yuuma 4, PLAYER_HEARTS Current Shiro 4": "accept", + "PLAYER_HAS_SEEN_EVENT Current 75160111, PLAYER_HEARTS Current Yuuma 4, PLAYER_HEARTS Current Naomi 4": "accept", //Basics - "": "reject", //acceptance when asked + "": "reject", //reject when asked }, "Bedtime": "2000", diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Zayne.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Zayne.json index 4f1c46dd..76737cff 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Zayne.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Zayne.json @@ -1,5 +1,5 @@ { - "Format": "2.0", + "Format": "2.1", "Name": "Zayne", "Skills": [ @@ -32,13 +32,13 @@ "Rules": { //Marriage //Reject if under 8 hearts, otherwise always go - "O Zayne/!f Zayne 2000": "reject", - "O Zayne": "accept", + "PLAYER_NPC_RELATIONSHIP Current Zayne Married, !PLAYER_HEARTS Current Zayne 8": "reject", + "PLAYER_NPC_RELATIONSHIP Current Zayne Married": "accept", //Normal //Requires seen 4 heart event + 4 hearts and above - "!f Zayne 1000": "reject", - "k 75160437": "reject", + "!PLAYER_HEARTS Current Zayne 4": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160437": "reject", //Basics "": "accept", //acceptance when asked From eb40a2061d3ce1a175f04bb27fe3e4f806abd625 Mon Sep 17 00:00:00 2001 From: AgentLyoko <163772536+AgentLyoko@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:51:07 -0500 Subject: [PATCH 2/4] Paula fix for NPCA Missed a change from EPU to GSQ, fixed here --- .../RSV NPC Adventures NA Component/companions/Paula.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json index e2c7b7c0..ced6f609 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Paula.json @@ -33,7 +33,7 @@ ], "Rules": { //Work - "TIME 800 1400, DAY_OF_WEEK Sun/PLAYER_HAS_MAIL Host GH1Letter, !PLAYER_NPC_RELATIONSHIP Current Paula Married/!z rainy": "reject companionRejectedWork", + "TIME 800 1400, DAY_OF_WEEK Sun, PLAYER_HAS_MAIL Host GH1Letter, !PLAYER_NPC_RELATIONSHIP Current Paula Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork", "TIME 1000 1700, DAY_OF_WEEK Wed, !PLAYER_NPC_RELATIONSHIP Current Paula Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork", "TIME 800 1700, !DAY_OF_WEEK Wed, !PLAYER_NPC_RELATIONSHIP Current Paula Married": "reject companionRejectedWork", "TIME 800 1600, DAY_OF_WEEK Mon Wed Fri, PLAYER_NPC_RELATIONSHIP Current Paula Married, WEATHER Town Rain Storm GreenRain": "reject companionRejectedWork_Spouse", From d1759758f81e11c9bf41f1aabdad51eb4d621d94 Mon Sep 17 00:00:00 2001 From: AgentLyoko <163772536+AgentLyoko@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:17:21 -0500 Subject: [PATCH 3/4] Anton NPCA Fix Fixes GSQ from Anton --- .../RSV NPC Adventures NA Component/companions/Anton.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json index c4566230..19a46bc4 100644 --- a/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json +++ b/Addons/[NA] RSV NPC Adventures/RSV NPC Adventures NA Component/companions/Anton.json @@ -41,7 +41,7 @@ //Normal //Requires seen 4 heart event + 4 hearts and above "!PLAYER_HEARTS Current Anton 4": "reject", - "!PLAYER_HAS_SEEN_EVENT 75160302": "reject", + "!PLAYER_HAS_SEEN_EVENT Current 75160302": "reject", //Basics "": "accept", //acceptance when asked From 68dd4ffe8d2b15ca2b188a757ecc1eb2f4d8cb31 Mon Sep 17 00:00:00 2001 From: AgentLyoko <163772536+AgentLyoko@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:42:38 -0600 Subject: [PATCH 4/4] i18n key update Fixes a few broken offering keys --- .../[CP] Ridgeside Village/i18n/default.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Ridgeside Development/[CP] Ridgeside Village/i18n/default.json b/Ridgeside Development/[CP] Ridgeside Village/i18n/default.json index 6a04af31..22fa3cef 100644 --- a/Ridgeside Development/[CP] Ridgeside Village/i18n/default.json +++ b/Ridgeside Development/[CP] Ridgeside Village/i18n/default.json @@ -9326,11 +9326,12 @@ I've put random lines of appreciation to my team everywhere here. If you're a tr "Offering.Hero.1": "Oh! Isn't this Cyril's statue?$h#$b#He was once a brave adventurer who saved this village from a hoard of Serpentine Beasts.#$b#In his final days, he was also the one who taught your grandmother how to fight.#$b#This statue commemorates his memory, though some mysterious flash of light seemed to wipe out the memories of the locals about this.$s#$b#So his stories of heroism are now lost.$s#$b#I'm surprised you found this relic though.$h#$b#It wards off any Serpentine Beast in the forest.#$b#So I'll be returning this back to you.$h", "Offering.OldFox.1": "Isn't this?$l#$b#Yes... It's hers...$l#$b#A bundle of my fur, a piece of my beloved's scarf, and her special green rubber band to tie them all as one.$4#$b#This was her lucky charm. It means so much to me to have it once more...$4#$b#Please receive this blessing, dear farmer.$4", "Offering.OldFox.2": "You now have max luck for the rest of the day!", -"Offering.mistbloom": "Oh! These flowers sure are beautiful, aren't they? And rare, too!$1#$b#I know how hard they are to come by, so I'll bless you with a chance to get some again tomorrow.#$b#Thank you, dear farmer.$1", -"Offering.amancay": "Ah, what a gorgeous flower! Its petals reflect the sunlight so beautifully.$4#$b#You've inspired me, farmer! Tomorrow we will all be blessed with sunny weather.$1#$b#Thank you, thank you!$1", -"Offering.loverPie": "Oh, isn't this sweet!$1#$b#You know, I heard that it's a tradition in the village to give this to someone you love... Perhaps this blessing will help you out in that arena?$4#$b#No, I won't explain what it is! Perhaps you'll find out tonight, oh farmer.$4", -"Offering.fairyFish": "Oh! I thought I saw you fishing here the other day!$1#$b#The mermaids say these fish are what fairies look like beneath the water... If it's true, maybe this fairy will visit you tonight!$1#$b#Thank you, dear farmer!$1", -"Offering.nightblack": "Oh, my! You braved that monster-infested forest in the dark just to bring this to me? Thank you, farmer!$1#$b#This rock is not of this earth, you know. Perhaps... Perhaps I can show you it in its original form?#$b#It will be difficult, but I'll do my best to bring you a blessing tonight, oh farmer!$1", + +"Offering.mistbloomOffering": "Oh! These flowers sure are beautiful, aren't they? And rare, too!$1#$b#I know how hard they are to come by, so I'll bless you with a chance to get some again tomorrow.#$b#Thank you, dear farmer.$1", +"Offering.amancayOffering": "Ah, what a gorgeous flower! Its petals reflect the sunlight so beautifully.$4#$b#You've inspired me, farmer! Tomorrow we will all be blessed with sunny weather.$1#$b#Thank you, thank you!$1", +"Offering.loverPieOffering": "Oh, isn't this sweet!$1#$b#You know, I heard that it's a tradition in the village to give this to someone you love... Perhaps this blessing will help you out in that arena?$4#$b#No, I won't explain what it is! Perhaps you'll find out tonight, oh farmer.$4", +"Offering.fairyFishOffering": "Oh! I thought I saw you fishing here the other day!$1#$b#The mermaids say these fish are what fairies look like beneath the water... If it's true, maybe this fairy will visit you tonight!$1#$b#Thank you, dear farmer!$1", +"Offering.nightblackOffering": "Oh, my! You braved that monster-infested forest in the dark just to bring this to me? Thank you, farmer!$1#$b#This rock is not of this earth, you know. Perhaps... Perhaps I can show you it in its original form?#$b#It will be difficult, but I'll do my best to bring you a blessing tonight, oh farmer!$1", "MapString.rsv.summitgrave1": "'May the spirit of the mountain guide your soul towards Yoba's arms.'#'Rest well, Rafael.'", "MapString.rsv.summitgrave2": "'This beautiful land shall forever remember your love and care as you took care of it.'#'Sleep well, Marese.'",