Elliott birthday finished.

GeneralMods/HappyBirthday/BirthdayMessages.cs

@@ -148,6 +148,7 @@ namespace Omegasis.HappyBirthday
                 ["Mail:birthdayDatingEmily"] = "Hi @. ^ I thought it would be nice to have a birthday party for you at our place. Could you come by my house sometime today?^Sincerly,^      -Emily",
                 ["Mail:birthdayDatingHaley"] = "Hey @. ^ I thought it would be nice to have a birthday party for you at our place. Could you come by my house sometime today?^Sincerly,^      -Haley",
                 ["Mail:birthdayDatingHarvey"] = "Hey @. ^ I thought it would be nice to have a birthday party for you at my place. Could you come by my room on the second floor of the clinic sometime today?^Sincerly,^      -Harvey",
+                ["Mail:birthdayDatingElliott"] = "Hello @. ^ I thought it would be nice to have a birthday party for you at my place. Could you come by my humble home later today?^Sincerly,^      -Elloitt",
 
                 ["Happy Birthday: Star Message"] = "It's your birthday today! Happy birthday!",
                 ["Happy Birthday: Farmhand Birthday Message"] = "It's @'s birthday! Happy birthday to them!",
@@ -199,7 +200,7 @@ namespace Omegasis.HappyBirthday
                 ["Event:DatingLeahBirthday_Leah:2"] = "You know I haven't celebrated a birthday with anyone in a few years, but somehow I felt like I really wanted to spend today with you.$l",
                 ["Event:DatingLeahBirthday_Leah:3"] = "I would have never though I'd change my mind about celebrations like this but I guess being with you has really opened me up again.$l",
                 ["Event:DatingLeahBirthday_Leah:4"] = "Anyways enough of this embarrasing talk. Happy birthday @. Now shall we have some cake?$h",
-                ["Event:DatingLeahBirthday_Finish:0"] = "It was nice celebrating my birthday with Leah.",
+                ["Event:DatingLeahBirthday_Finish:0"] = "It was nice celebrating my birthday with just Leah.",
                 ["Event:DatingLeahBirthday_Finish:1"] = "It looks like there was some leftover cake too!",
 
                 ["Event:DatingAbigailBirthday_Abigail:0"] = "Hey @! You are just in time for the party!$h",
@@ -221,7 +222,7 @@ namespace Omegasis.HappyBirthday
                 ["Event:DatingEmilyBirthday_Emily:3"] = "Anyways I made us some chocolate cake! It's made with all natural ingredients and sweetened with cactus syrup!$h",
                 ["Event:DatingEmilyBirthday_Emily:4"] = "Make a wish @!$h",
                 ["Event:DatingEmilyBirthday_Emily:5"] = "Happy birthday @! I feel a strong fortune energy coming from the spirits for you this year. $l",
-                ["Event:DatingEmilyBirthday_Finish:0"] = "It was nice celebrating my birthday with Emily.",
+                ["Event:DatingEmilyBirthday_Finish:0"] = "It was nice celebrating my birthday with just Emily.",
                 ["Event:DatingEmilyBirthday_Finish:1"] = "It looks like there was some leftover cake too!",
 
                 ["Event:DatingHaleyBirthday_Haley:0"] = "Hey, @ you are just in time for the party!$h",
@@ -229,16 +230,26 @@ namespace Omegasis.HappyBirthday
                 ["Event:DatingHaleyBirthday_Haley:2"] = "I think birthdays can be pretty fun when you do them right, but I wanted this to be special because... you are special you know?$l",
                 ["Event:DatingHaleyBirthday_Haley:3"] = "Anyways, I got us some cake to eat too! Make sure to make a wish alright?$h",
                 ["Event:DatingHaleyBirthday_Haley:4"] = "Happy Birthday @. I'm so glad we got to spend some time together. Let's take a picture to remember this moment. $l",
-                ["Event:DatingHaleyBirthday_Finish:0"] = "It was nice celebrating my birthday with Haley.",
+                ["Event:DatingHaleyBirthday_Finish:0"] = "It was nice celebrating my birthday with just Haley.",
                 ["Event:DatingHaleyBirthday_Finish:1"] = "It looks like there was some leftover cake too!",
 
                 ["Event:DatingHarveyBirthday_Harvey:0"] = "Hi there, @ you are just in time! Let me clean up a bit.$h",
                 ["Event:DatingHarveyBirthday_Harvey:1"] = "I though it would be nice to have a small celebration for you so I cooked us something special.$l",
                 ["Event:DatingHarveyBirthday_Harvey:2"] = "Don't worry about the wine. A little moderation is needed but this is a special day!$h",
                 ["Event:DatingHarveyBirthday_Harvey:3"] = "Now cheers! Happy Birthday, here is to good health and many more years to come!$l",
-                ["Event:DatingHarveyBirthday_Finish:0"] = "It was nice celebrating my birthday with Harvey.",
+                ["Event:DatingHarveyBirthday_Finish:0"] = "It was nice celebrating my birthday with just Harvey.",
                 ["Event:DatingHarveyBirthday_Finish:1"] = "It looks like there was some leftover food too!",
 
+
+                ["Event:DatingElliottBirthday_Elliott:0"] = "Ahh @, wonderful! You are just in time! $h",
+                ["Event:DatingElliottBirthday_Elliott:1"] = "I thought it would be splendid if we had a small celebration together in honor of your birthday!$h",
+                ["Event:DatingElliottBirthday_Elliott:2"] = "I know that birthdays can be quite an ordeal and I'm sure you are quite busy today, but I do appreciate you coming out all this way to spend your special day with me. $l",
+                ["Event:DatingElliottBirthday_Elliott:3"] = "Alas, I tried writing something for you to express my affection for you but somehow words just couldn't seem to capture every little detail.$l",
+                ["Event:DatingElliottBirthday_Elliott:4"] = "Alright now how about we have some cake to mark the occassion. Go ahead and make a wish!",
+                ["Event:DatingElliottBirthday_Elliott:5"] = "Happy birthday @! Here is hoping there are many more stories to be told with your life! $l",
+                ["Event:DatingElliottBirthday_Finish:0"] = "It was nice celebrating my birthday with just Elliott.",
+                ["Event:DatingElliottBirthday_Finish:1"] = "It looks like there was some leftover food too!",
+
                 ["Event:PartyOver"] = "That was a fun party. Back to work!"
 
             },

GeneralMods/HappyBirthday/Framework/BirthdayEvents.cs

@@ -495,11 +495,44 @@ namespace Omegasis.HappyBirthday.Framework
         }
 
 
-        /*
+        
         public static EventHelper DatingBirthday_Elliott()
         {
+            List<EventPrecondition> conditions = new List<EventPrecondition>();
+            conditions.Add(new FarmerBirthdayPrecondition());
+            conditions.Add(new LocationPrecondition(Game1.getLocationFromName("ElliottHouse")));
+            conditions.Add(new TimePrecondition(600, 2600));
 
+            NPC elliott = Game1.getCharacterFromName("Elliott");
+
+            //conditions.Add(new StardustCore.Events.Preconditions.NPCSpecific.DatingNPC(elliott));
+
+            EventHelper e = new EventHelper("BirthdayDating:Elliott", 19957, conditions, new EventStartData("playful", 3, 5, new EventStartData.FarmerData(3, 8, EventHelper.FacingDirection.Up), new List<EventStartData.NPCData>() {
+                new EventStartData.NPCData(elliott,3,5, EventHelper.FacingDirection.Down),
+            }));
+            e.globalFadeIn();
+
+            //Dialogue here.
+            e.moveFarmerUp(2, EventHelper.FacingDirection.Up, false);
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:0"));
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:1"));
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:2"));
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:3"));
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:4"));
+            e.emoteFarmer_Thinking();
+            e.speak(elliott, GetTranslatedString("Event:DatingElliottBirthday_Elliott:5"));
+            e.emoteFarmer_Heart();
+            e.emote_Heart("Elliott");
+            e.globalFadeOut(0.010);
+            e.setViewportPosition(-100, -100);
+            e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:DatingElliottBirthday_Finish:0")); //abi party finish 0
+            e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:DatingElliottBirthday_Finish:1")); //abi party finish 0
+            e.addObjectToPlayersInventory(220, 1, false);
+            e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:PartyOver"));
+            e.end();
+            return e;
         }
+        /*
         
             public static EventHelper DatingBirthday_Shane()
             {

GeneralMods/HappyBirthday/HappyBirthday.cs

@@ -147,6 +147,11 @@ namespace Omegasis.HappyBirthday
                 EventHelper eve = this.eventManager.getEvent("BirthdayDating:Harvey");
                 eve.startEventAtLocationifPossible();
             }
+            if (e.NewLocation == Game1.getLocationFromName("ElliottHouse"))
+            {
+                EventHelper eve = this.eventManager.getEvent("BirthdayDating:Elliott");
+                eve.startEventAtLocationifPossible();
+            }
         }
 
         private void GameLoop_GameLaunched(object sender, GameLaunchedEventArgs e)
@@ -181,6 +186,7 @@ namespace Omegasis.HappyBirthday
             data["birthdayDatingEmily"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDatingEmily");
             data["birthdayDatingHaley"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDatingHaley");
             data["birthdayDatingHarvey"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDatingHarvey");
+            data["birthdayDatingElliott"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDatingElliott");
         }
 
 
@@ -638,6 +644,10 @@ namespace Omegasis.HappyBirthday
             {
                 Game1.player.mailReceived.Remove("birthdayDatingHarvey");
             }
+            if (Game1.player.mailReceived.Contains("birthdayDatingElliott"))
+            {
+                Game1.player.mailReceived.Remove("birthdayDatingElliott");
+            }
 
 
             EventHelper communityCenterJunimoBirthday = BirthdayEvents.CommunityCenterJunimoBirthday();
@@ -649,6 +659,7 @@ namespace Omegasis.HappyBirthday
             EventHelper birthdayDating_Emily = BirthdayEvents.DatingBirthday_Emily();
             EventHelper birthdayDating_Haley = BirthdayEvents.DatingBirthday_Haley();
             EventHelper birthdayDating_Harvey = BirthdayEvents.DatingBirthday_Harvey();
+            EventHelper birthdayDating_Elliott = BirthdayEvents.DatingBirthday_Elliott();
 
             this.eventManager.addEvent(communityCenterJunimoBirthday);
             this.eventManager.addEvent(birthdayDating_Penny);
@@ -659,6 +670,7 @@ namespace Omegasis.HappyBirthday
             this.eventManager.addEvent(birthdayDating_Emily);
             this.eventManager.addEvent(birthdayDating_Haley);
             this.eventManager.addEvent(birthdayDating_Harvey);
+            this.eventManager.addEvent(birthdayDating_Elliott);
             if (Game1.player.eventsSeen.Contains(communityCenterJunimoBirthday.getEventID()))
             {
                 Game1.player.eventsSeen.Remove(communityCenterJunimoBirthday.getEventID()); //Repeat the event.
@@ -695,6 +707,10 @@ namespace Omegasis.HappyBirthday
             {
                 Game1.player.eventsSeen.Remove(birthdayDating_Harvey.getEventID()); //Repeat the event.
             }
+            if (Game1.player.eventsSeen.Contains(birthdayDating_Elliott.getEventID()))
+            {
+                Game1.player.eventsSeen.Remove(birthdayDating_Elliott.getEventID()); //Repeat the event.
+            }
         }
 
         /// <summary>Raised before the game begins writes data to the save file (except the initial save creation).</summary>
@@ -809,6 +825,13 @@ namespace Omegasis.HappyBirthday
                             Game1.player.mailbox.Add("birthdayDatingHarvey");
                         }
                     }
+                    if (Game1.player.friendshipData.ContainsKey("Elliott"))
+                    {
+                        if (Game1.player.friendshipData["Elliott"].IsDating())
+                        {
+                            Game1.player.mailbox.Add("birthdayDatingElliott");
+                        }
+                    }
 
 
                     if (Game1.player.CanReadJunimo())