Fixed a bunch of npc event issues. Also finished the penny dating party.

This commit is contained in:
JoshuaNavarro 2019-12-06 20:59:05 -08:00
parent 765e0860ce
commit 4c4fc7900b
10 changed files with 116 additions and 154 deletions

View File

@ -140,13 +140,14 @@ namespace Omegasis.HappyBirthday
["Mail:birthdayMom"] = "Dear @,^ Happy birthday sweetheart. It's been amazing watching you grow into the kind, hard working person that I've always dreamed that you would become. I hope you continue to make many more fond memories with the ones you love. ^ Love, Mom ^ P.S. Here's a little something that I made for you. %item object 221 1 %%",
["Mail:birthdayDad"] = "Dear @,^ Happy birthday kiddo. It's been a little quiet around here on your birthday since you aren't around, but your mother and I know that you are making both your grandpa and us proud. We both know that living on your own can be tough but we believe in you one hundred percent, just keep following your dreams.^ Love, Dad ^ P.S. Here's some spending money to help you out on the farm. Good luck! %item money 5000 5001 %%",
["Mail:birthdayJunimos"] = "Please come to the community center. ^ Sincerly,^ -The Junimos",
["Mail:birthdayDatingPenny"] = "Dear @. ^ My mom and I decided to have a little birthday party for you. Could you come by sometime today?^Sincerly,^ -Penny",
["Happy Birthday: Star Message"] = "It's your birthday today! Happy birthday!",
["Happy Birthday: Farmhand Birthday Message"] = "It's @'s birthday! Happy birthday to them!",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "It looks like the junimos wanted to throw you a party!",
["Event:JunimoBirthdayParty_1"] = "It looks like there was some cake left over too!",
["Event:JunimoBirthdayParty_2"] = "That was a fun party. Back to work!"
["Event:PartyOver"] = "That was a fun party. Back to work!"
},
[StardewValley.LocalizedContentManager.LanguageCode.ja] = new Dictionary<string, string>()
@ -154,156 +155,168 @@ namespace Omegasis.HappyBirthday
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.ru] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "ƒорогой @,^ — днем рождени¤, мо¤ радость. Ёто были замечательные моменты, когда ты выростал в доброго, трудолюбивого человека. я надеюсь, в твоей жизни будет куча превосходных моментов. ^ — любовью, мама ^ P.S. «десь находить небольшой подарок, который ¤ сделала дл¤ теб¤. %item object 221 1 %%",
["Mail:birthdayDad"] = "ƒорогой @,^ — днем рождени¤, мой ребенок. «десь немного тихо в твой день рождени¤ с тех пор, как ты уехал на ферму, но тво¤ мать и ¤ знаем, что ты со своим дедушкой делаешь нас гордыми. ћы оба знаем, что жить на ферме может быть трудно, но мы верим в теб¤ на все 100%, просто продолжай следовать своим мечтам.^ — любовью папа ^ P.S. “ут есть немного денег, которые помогут тебе на ферме. ”дачи! %item money 5000 5001%%",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "Ёто твой день рождени¤! — днем рождени¤!",
["Happy Birthday: Farmhand Birthday Message"] = "Ёто твой день рождени¤! ѕоздравл¤ю с этим!",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.zh] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "亲爱的@^ 生日快乐宝贝。看着你成长成为一个善良努力的人,就如我一直梦想着你成为的样子,我感到十分欣喜。我希望你能继续跟你爱的人制造更多美好的回忆。 ^ 爱你的,妈妈 ^ 附言:这是我给你做的一点小礼物。 %item object 221 1 %%",
["Mail:birthdayDad"] = "亲爱的@^ 生日快乐孩子。你生日的这天没有你,我们这儿还挺寂寞的,但我和你妈妈都知道你让我们和你爷爷感到骄傲。我们知道你一个人生活可能会很艰难,但我们百分百相信你能做到,所以继续追求你的梦想吧。^ 爱你的,爸爸 ^ 附言:这是能在农场上帮到你的一些零用钱。祝你好运! %item money 5000 5001 %%",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "今天是你的生日!生日快乐!",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.pt] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.es] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.de] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.th] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.fr] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.ko] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.it] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.tr] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
[StardewValley.LocalizedContentManager.LanguageCode.hu] = new Dictionary<string, string>()
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Mail:birthdayDatingPenny"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
["Date"] = "Date",
["Event:JunimoBirthdayParty_0"] = "",
["Event:JunimoBirthdayParty_1"] = "",
["Event:JunimoBirthdayParty_2"] = ""
["Event:PartyOver"] = ""
},
};

View File

@ -1,35 +0,0 @@
{
"Robin": "Hey, @, happy birthday! I'm really glad you decided to move to the valley. ",
"Demetrius": "Happy birthday, @! Make sure you take some time off today to enjoy yourself. $h",
"Maru": "Happy birthday, @. I tried to make an everlasting candle for you, but sadly that didn't work out. Maybe next year, right? $h",
"Sebastian": "Happy birthday, @. Hope things are going well down at the farm.",
"Linus": "Happy birthday, @. Thanks for visiting me even on your birthday. It makes me really happy. ",
"Pierre": "Hey @, happy birthday! Hopefully this next year will be a great one for you! ",
"Caroline": "Happy birthday, @. Thank you for all that you've done for our community. I'm sure your parents must be proud of you.$h",
"Abigail": "Happy birthday, @! Hopefully this year we can go on even more adventures together $h!",
"Alex": "Yo @, happy birthday! Here's to making this the best year yet!$h",
"George": "When you get to my age, birthdays start to come and go. Still, happy birthday, @.",
"Evelyn": "Happy birthday, @. You have grown into such a fine individual, and I'm sure your grandfather would be proud to see who you've become. ",
"Lewis": "Happy birthday, @! I really appreciate everything you've done for the town. Keep up the good work.",
"Clint": "Hey, happy birthday, @. I'm sure this year is going to be great for you.",
"Penny": "Happy birthday, @. May you enjoy all of life's blessings this year. ",
"Pam": "Happy birthday, kid. We should have a drink to celebrate another year of life for you! $h",
"Emily": "Happy birthday, @! I can see your future shining bright.$h",
"Haley": "Happy birthday, @. Hopefully this year you'll get some good presents!$h",
"Jas": "Happy birthday, @. I'm glad I decided to get to know you.",
"Vincent": "Hey, @, have you come to pl... oh, it's your birthday? Happy birthday! ",
"Jodi": "Hello there, @. Rumor has it that today is your birthday. In that case, happy birthday!$h",
"Kent": "Jodi told me that it was your birthday today, @. Happy birthday, and make sure to cherish every single day.",
"Sam": "Hey @, happy birthday! We'll have to have a birthday jam session for you sometime!$h ",
"Leah": "Hey @, happy birthday! I'm glad to see you're doing well on the farm.$h ",
"Shane": "Happy birthday, @. Keep working hard, and I'm sure this next year will be a great one for you.",
"Marnie": "Hi, @! Everyone is talking about your birthday today, and I wanted to make sure that I wished you a happy birthday as well. So, happy birthday! $h ",
"Elliott": "What a wonderful day, isn't it, @? Though I'm sure it's even lovelier to you, it being your birthday!$h#$b#I was actually in the middle of writing a poem for the occasion, but a 'happy birthday' will have to suffice for now.",
"Gus": "Hey, @, happy birthday! Hopefully you enjoy the rest of the day, and make sure you aren't a stranger at the saloon!",
"Dwarf": "Happy birthday, @. Wait, humans celebrate those, right?",
"Wizard": "Happy birthday, @. Never forget that you alone make your future.#$e#How did I know? Ah, I overheard a few of the locals conferring on what gifts to give you. I think you'll appreciate them.",
"Harvey": "Happy birthday, @. Come in for a checkup sometime, alright? I want to make sure you'll see plenty more.",
"Sandy": "Aww, sweetie, you came all the way out here to see me on your birthday?$h#$b#Well, then, the least I can do is wish you a happy one!~",
"Willy": "Ahoy, @, happy birthday. Looking at you reminds me of the days when I was just a guppy myself. $bEnjoy yours while you can, young'un.$h",
"Krobus": "Happy birthday, @. I still don't quite understand humans, but I'm glad to have met you all the same."
}

View File

@ -1,14 +0,0 @@
{
"Alex": "",
"Elliott": "",
"Harvey": "",
"Sam": "",
"Sebastian": "",
"Shane": "",
"Abigail": "",
"Emily": "",
"Haley": "",
"Leah": "",
"Maru": "",
"Penny": ""
}

View File

@ -1,8 +0,0 @@
{
"Mail:birthdayMom": "Dear @,^ Happy birthday sweetheart. It's been amazing watching you grow into the kind, hard working person that I've always dreamed that you would become. I hope you continue to make many more fond memories with the ones you love. ^ Love, Mom ^ P.S. Here's a little something that I made for you. %item object 221 1 %%",
"Mail:birthdayDad": "Dear @,^ Happy birthday kiddo. It's been a little quiet around here on your birthday since you aren't around, but your mother and I know that you are making both your grandpa and us proud. We both know that living on your own can be tough but we believe in you one hundred percent, just keep following your dreams.^ Love, Dad ^ P.S. Here's some spending money to help you out on the farm. Good luck! %item money 5000 5001 %%",
"Happy Birthday: Star Message": "It's your birthday today! Happy birthday!",
"Happy Birthday: Farmhand Birthday Message": "It's @'s birthday! Happy birthday to them!",
"Season": "Season",
"Date": "Date"
}

View File

@ -95,7 +95,7 @@ namespace Omegasis.HappyBirthday.Framework
e.globalFadeOut(0.010);
e.setViewportPosition(-100, -100);
e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:JunimoBirthdayParty_1"));
e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:JunimoBirthdayParty_2"));
e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:PartyOver"));
e.addObjectToPlayersInventory(220, 1, false);
e.end();
@ -103,11 +103,62 @@ namespace Omegasis.HappyBirthday.Framework
return e;
}
/*
public static EventHelper DatingBirthday_Penny()
{
List<EventPrecondition> conditions = new List<EventPrecondition>();
conditions.Add(new FarmerBirthdayPrecondition());
conditions.Add(new LocationPrecondition(Game1.getLocationFromName("Trailer")));
conditions.Add(new TimePrecondition(600, 2600));
NPC penny = Game1.getCharacterFromName("Penny");
NPC pam = Game1.getCharacterFromName("Pam");
//conditions.Add(new StardustCore.Events.Preconditions.NPCSpecific.DatingNPC(Game1.getCharacterFromName("Penny"));
EventHelper e = new EventHelper("BirthdayDating:Penny", 19951, conditions, new EventStartData("playful", 12, 8, new EventStartData.FarmerData(12, 9, EventHelper.FacingDirection.Up), new List<EventStartData.NPCData>() {
new EventStartData.NPCData(penny,12,7, EventHelper.FacingDirection.Up),
new EventStartData.NPCData(pam,15,4, EventHelper.FacingDirection.Down)
}));
e.globalFadeIn();
e.moveFarmerUp(1, EventHelper.FacingDirection.Up, false);
e.actorFaceDirection("Penny", EventHelper.FacingDirection.Down);
string starting = "Oh, @ you are here just in time!$h";
//starting = starting.Replace("@", Game1.player.Name);
e.speak(penny, starting);
e.speak(pam, "Come on in kid. The party has just begun!$h");
e.speak(penny, "I thought it would be nice if we threw you a small party. Granted it's not much but I hope you like it. $l");
e.speak(pam, "Here, pull up a seat and have a beer to celebrate!");
e.emote_Angry("Penny");
e.speak(penny, "Mom!$a");
e.speak(penny, "*sigh* Well make yourself at home. I'll get the cake out.");
e.moveActorLeft("Penny", 3, EventHelper.FacingDirection.Up, true);
e.moveFarmerRight(2, EventHelper.FacingDirection.Up, false);
e.moveFarmerUp(3, EventHelper.FacingDirection.Down, false);
e.moveActorRight("Penny", 5, EventHelper.FacingDirection.Up, true);
e.moveActorUp("Penny", 1, EventHelper.FacingDirection.Up, true);
e.speak(pam, "Alright, cheers kid! Happy birthday and here is to another great year! $h");
e.speak(penny, "Happy birthday @. Here is hoping we get to spend many more birthdays together. $l");
e.emoteFarmer_Heart();
e.emote_Heart("Penny");
e.globalFadeOut(0.010);
e.setViewportPosition(-100, -100);
e.showMessage("It was nice celebrating my birthday with Pam and Penny.");
e.showMessage("Looks like there was some leftover cake and beer too!");
e.addObjectToPlayersInventory(220, 1, false);
e.addObjectToPlayersInventory(346, 1, false);
e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:PartyOver"));
e.end();
return e;
}
/*
public static EventHelper DatingBirthday_Maru()
{

View File

@ -163,7 +163,7 @@ namespace Omegasis.HappyBirthday.Framework
{
if (language != LanguageName.English)
{
return FileName + "." + this.getFileExtentionForTranslation(language, FileType.JSON);
return FileName + this.getFileExtentionForTranslation(language, FileType.JSON);
}
else
{

View File

@ -112,6 +112,12 @@ namespace Omegasis.HappyBirthday
EventHelper eve=this.eventManager.getEvent("CommunityCenterBirthday");
eve.startEventAtLocationifPossible();
}
if (e.NewLocation == Game1.getLocationFromName("Trailer"))
{
EventHelper eve = this.eventManager.getEvent("BirthdayDating:Penny");
this.Monitor.Log(eve.getEventString(), LogLevel.Info);
eve.startEventAtLocationifPossible();
}
}
private void GameLoop_GameLaunched(object sender, GameLaunchedEventArgs e)
@ -138,6 +144,7 @@ namespace Omegasis.HappyBirthday
data["birthdayMom"] = BirthdayMessages.GetTranslatedString("Mail:birthdayMom");
data["birthdayDad"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDad");
data["birthdayJunimos"] = BirthdayMessages.GetTranslatedString("Mail:birthdayJunimos");
data["birthdayDatingPenny"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDatingPenny");
}
@ -563,14 +570,24 @@ namespace Omegasis.HappyBirthday
{
Game1.player.mailReceived.Remove("birthdayJunimos");
}
if (Game1.player.mailReceived.Contains("birthdayDatingPenny"))
{
Game1.player.mailReceived.Remove("birthdayDatingPenny");
}
EventHelper communityCenterJunimoBirthday = BirthdayEvents.CommunityCenterJunimoBirthday();
EventHelper birthdayDating_Penny = BirthdayEvents.DatingBirthday_Penny();
this.eventManager.addEvent(communityCenterJunimoBirthday);
this.eventManager.addEvent(birthdayDating_Penny);
if (Game1.player.eventsSeen.Contains(communityCenterJunimoBirthday.getEventID()))
{
Game1.player.eventsSeen.Remove(communityCenterJunimoBirthday.getEventID()); //Repeat the event.
}
if (Game1.player.eventsSeen.Contains(birthdayDating_Penny.getEventID()))
{
Game1.player.eventsSeen.Remove(birthdayDating_Penny.getEventID()); //Repeat the event.
}
}
/// <summary>Raised before the game begins writes data to the save file (except the initial save creation).</summary>
@ -626,6 +643,13 @@ namespace Omegasis.HappyBirthday
Game1.player.mailbox.Add("birthdayMom");
Game1.player.mailbox.Add("birthdayDad");
if (Game1.player.friendshipData.ContainsKey("Penny"))
{
if (Game1.player.friendshipData["Penny"].IsDating()){
Game1.player.mailbox.Add("birthdayDatingPenny");
}
}
if (Game1.player.CanReadJunimo())
{
Game1.player.mailbox.Add("birthdayJunimos");

View File

@ -100,86 +100,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Content\Dialogue\fr-FR\BirthdayWishes.fr-FR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\fr-FR\SpouseBirthdayWishes.fr-FR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\fr-FR\TranslatedStrings.fr-FR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\hu-HU\BirthdayWishes.hu-HU.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\hu-HU\SpouseBirthdayWishes.hu-HU.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\hu-HU\TranslatedStrings.hu-HU.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\it-IT\BirthdayWishes.it-IT.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\it-IT\SpouseBirthdayWishes.it-IT.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\it-IT\TranslatedStrings.it-IT.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\ko-KR\BirthdayWishes.ko-KR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\ko-KR\SpouseBirthdayWishes.ko-KR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\ko-KR\TranslatedStrings.ko-KR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\pt-BR\BirthdayWishes.pt-BR.json" />
<None Include="Content\Dialogue\pt-BR\SpouseBirthdayWishes.pt-BR.json" />
<None Include="Content\Dialogue\pt-BR\TranslatedStrings.pt-BR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\tr-TR\BirthdayWishes.tr-TR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\tr-TR\SpouseBirthdayWishes.tr-TR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\tr-TR\TranslatedStrings.tr-TR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\zh-CN\BirthdayWishes.zh-CN.json" />
<None Include="Content\Dialogue\zh-CN\SpouseBirthdayWishes.zh-CN.json" />
<None Include="Content\Dialogue\zh-CN\TranslatedStrings.zh-CN.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\en-US\BirthdayWishes.json" />
<None Include="Content\Dialogue\en-US\SpouseBirthdayWishes.json" />
<None Include="Content\Dialogue\en-US\TranslatedStrings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\de-DE\BirthdayWishes.de-DE.json" />
<None Include="Content\Dialogue\de-DE\SpouseBirthdayWishes.de-DE.json" />
<None Include="Content\Dialogue\de-DE\TranslatedStrings.de-DE.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\ja-JP\BirthdayWishes.ja-JP.json" />
<None Include="Content\Dialogue\ja-JP\SpouseBirthdayWishes.ja-JP.json" />
<None Include="Content\Dialogue\ja-JP\TranslatedStrings.ja-JP.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\ru-RU\BirthdayWishes.ru-RU.json" />
<None Include="Content\Dialogue\ru-RU\SpouseBirthdayWishes.ru-RU.json" />
<None Include="Content\Dialogue\ru-RU\TranslatedStrings.ru-RU.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Dialogue\es-ES\BirthdayWishes.es-ES.json" />
<None Include="Content\Dialogue\es-ES\SpouseBirthdayWishes.es-ES.json" />
<None Include="Content\Dialogue\es-ES\TranslatedStrings.es-ES.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Gifts\BirthdayGifts.json" />
<None Include="Content\Gifts\SpouseBirthdayGifts.json" />
<None Include="manifest.json" />

View File

@ -1771,7 +1771,9 @@ namespace StardustCore.Events
b.Append("speak ");
b.Append(npc.Name);
b.Append(" ");
b.Append('"');
b.Append(Message);
b.Append('"');
this.add(b);
}

View File

@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using StardewValley;
using static StardustCore.Events.EventHelper;
namespace StardustCore.Events
{
@ -40,11 +41,17 @@ namespace StardustCore.Events
b.Append(" ");
b.Append(this.yPosition.ToString());
b.Append(" ");
b.Append(((int)this.direction).ToString());
b.Append(this.getFacingDirectionNumber(this.direction).ToString());
return b.ToString();
}
protected int getFacingDirectionNumber(FacingDirection Dir)
{
return (int)Dir;
}
}
/// <summary>
/// Data pertaining to the farmer data for the event.
/// </summary>
@ -144,6 +151,7 @@ namespace StardustCore.Events
{
foreach(var v in NPCS)
{
npcData.Append(" ");
npcData.Append(v.ToString());
}
}
@ -177,6 +185,7 @@ namespace StardustCore.Events
{
foreach (var v in NPCS)
{
npcData.Append(" ");
npcData.Append(v.ToString());
}
}