Finished the skeleton of the CC_Junimo birthday event and added in trnaslated string spots for the junimo birthday letter.

This commit is contained in:
JoshuaNavarro 2019-12-06 15:18:23 -08:00
parent 650bfdc84b
commit 3da95865a3
5 changed files with 23 additions and 16 deletions

View File

@ -139,6 +139,7 @@ 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",
["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",
@ -149,6 +150,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -158,6 +160,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "ƒорогой @,^ — днем рождени¤, мо¤ радость. Ёто были замечательные моменты, когда ты выростал в доброго, трудолюбивого человека. я надеюсь, в твоей жизни будет куча превосходных моментов. ^ — любовью, мама ^ P.S. «десь находить небольшой подарок, который ¤ сделала дл¤ теб¤. %item object 221 1 %%",
["Mail:birthdayDad"] = "ƒорогой @,^ — днем рождени¤, мой ребенок. «десь немного тихо в твой день рождени¤ с тех пор, как ты уехал на ферму, но тво¤ мать и ¤ знаем, что ты со своим дедушкой делаешь нас гордыми. ћы оба знаем, что жить на ферме может быть трудно, но мы верим в теб¤ на все 100%, просто продолжай следовать своим мечтам.^ — любовью папа ^ P.S. “ут есть немного денег, которые помогут тебе на ферме. ”дачи! %item money 5000 5001%%",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "Ёто твой день рождени¤! — днем рождени¤!",
["Happy Birthday: Farmhand Birthday Message"] = "Ёто твой день рождени¤! ѕоздравл¤ю с этим!",
["Season"] = "Season",
@ -167,6 +170,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "亲爱的@^ 生日快乐宝贝。看着你成长成为一个善良努力的人,就如我一直梦想着你成为的样子,我感到十分欣喜。我希望你能继续跟你爱的人制造更多美好的回忆。 ^ 爱你的,妈妈 ^ 附言:这是我给你做的一点小礼物。 %item object 221 1 %%",
["Mail:birthdayDad"] = "亲爱的@^ 生日快乐孩子。你生日的这天没有你,我们这儿还挺寂寞的,但我和你妈妈都知道你让我们和你爷爷感到骄傲。我们知道你一个人生活可能会很艰难,但我们百分百相信你能做到,所以继续追求你的梦想吧。^ 爱你的,爸爸 ^ 附言:这是能在农场上帮到你的一些零用钱。祝你好运! %item money 5000 5001 %%",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "今天是你的生日!生日快乐!",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -176,6 +180,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -185,6 +190,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -194,6 +200,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -203,6 +210,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -212,6 +220,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -221,6 +230,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -230,6 +240,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -239,6 +250,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -248,6 +260,7 @@ namespace Omegasis.HappyBirthday
{
["Mail:birthdayMom"] = "",
["Mail:birthdayDad"] = "",
["Mail:birthdayJunimos"] = "",
["Happy Birthday: Star Message"] = "",
["Happy Birthday: Farmhand Birthday Message"] = "",
["Season"] = "Season",
@ -296,7 +309,6 @@ namespace Omegasis.HappyBirthday
if (!Directory.Exists(basePath))
{
Directory.CreateDirectory(basePath);
HappyBirthday.ModMonitor.Log("Create dir1: " + basePath, LogLevel.Info);
}
string tempBirthdayFile = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("BirthdayWishes", translation.Key));
string tempSpouseBirthdayFile = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("SpouseBirthdayWishes", translation.Key));

View File

@ -20,7 +20,7 @@ namespace Omegasis.HappyBirthday.Framework
/// Creates the junimo birthday party event.
/// </summary>
/// <returns></returns>
public static EventHelper CommunityCenterBirthday()
public static EventHelper CommunityCenterJunimoBirthday()
{
List<EventPrecondition> conditions = new List<EventPrecondition>();
conditions.Add(new FarmerBirthdayPrecondition());
@ -28,8 +28,9 @@ namespace Omegasis.HappyBirthday.Framework
conditions.Add(new TimePrecondition(600, 2600));
conditions.Add(new CanReadJunimo());
conditions.Add(new StardustCore.Events.Preconditions.PlayerSpecific.JojaMember(false));
conditions.Add(new CommunityCenterCompleted(false));
//conditions.Add(new HasUnlockedCommunityCenter()); //Infered by the fact that you must enter the community center to trigger this event anyways.
EventHelper e = new EventHelper("CommunityCenterBirthday",19950, conditions, new EventStartData(EventStartData.MusicToPlayType.Continue, 32, 16, new EventStartData.FarmerData(32, 22, EventHelper.FacingDirection.Up),new List<EventStartData.NPCData>()));
EventHelper e = new EventHelper("CommunityCenterBirthday",19950, conditions, new EventStartData("playful", 32, 16, new EventStartData.FarmerData(32, 22, EventHelper.FacingDirection.Up),new List<EventStartData.NPCData>()));
e.AddInJunimoActor("Juni", new Microsoft.Xna.Framework.Vector2(32, 14), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddInJunimoActor("Juni2", new Microsoft.Xna.Framework.Vector2(30, 15), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());

View File

@ -110,11 +110,6 @@ namespace Omegasis.HappyBirthday
if (e.NewLocation == Game1.getLocationFromName("CommunityCenter"))
{
EventHelper eve=this.eventManager.getEvent("CommunityCenterBirthday");
this.Monitor.Log("Birthday event can occur: " + eve.canEventOccur(), LogLevel.Info);
this.Monitor.Log("Birthday event info: " + eve.getEventString(), LogLevel.Info);
eve.startEventAtLocationifPossible();
}
}
@ -140,12 +135,9 @@ namespace Omegasis.HappyBirthday
{
IDictionary<string, string> data = asset.AsDictionary<string, string>().Data;
string momMail = BirthdayMessages.GetTranslatedString("Mail:birthdayMom");
string dadMail = BirthdayMessages.GetTranslatedString("Mail:birthdayDad");
data["birthdayMom"] = momMail;
data["birthdayDad"] = dadMail;
data["birthdayJunimos"] = "Please come to the community center. ^ Sincerly,^ -The Junimos";
data["birthdayMom"] = BirthdayMessages.GetTranslatedString("Mail:birthdayMom");
data["birthdayDad"] = BirthdayMessages.GetTranslatedString("Mail:birthdayDad");
data["birthdayJunimos"] = BirthdayMessages.GetTranslatedString("Mail:birthdayJunimos");
}
@ -559,7 +551,7 @@ namespace Omegasis.HappyBirthday
MultiplayerSupport.SendBirthdayInfoToOtherPlayers();
}
this.eventManager.addEvent(BirthdayEvents.CommunityCenterBirthday());
this.eventManager.addEvent(BirthdayEvents.CommunityCenterJunimoBirthday());
if (Game1.player.mailReceived.Contains("birthdayMom"))
{
Game1.player.mailReceived.Remove("birthdayMom");

View File

@ -125,6 +125,7 @@ namespace StardustCore.Events
{
if (this.events.ContainsKey(EventName))
{
if (Game1.eventUp == true) return;
this.concurrentEventActions.Clear(); //Clean all old parallel actions before starting a new event.
this.events[EventName].startEventAtLocationifPossible();
}

View File

@ -165,7 +165,8 @@ namespace StardustCore.Events
this.builder = new StringBuilder();
this.add(SongToPlay);
this.add(CameraTileX.ToString());
this.add(CameraTileY.ToString());
this.builder.Append(" ");
this.builder.Append(CameraTileY.ToString());
StringBuilder npcData = new StringBuilder();
if (Farmer != null)