Finished the junimo birthday event.

This commit is contained in:
JoshuaNavarro 2019-12-06 19:38:13 -08:00
parent e4913d9720
commit 765e0860ce
5 changed files with 52 additions and 8 deletions

View File

@ -38,6 +38,8 @@ namespace Omegasis.HappyBirthday.Framework
e.AddInJunimoActor("Juni4", new Microsoft.Xna.Framework.Vector2(26, 11), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddInJunimoActor("Juni5", new Microsoft.Xna.Framework.Vector2(28, 11), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddInJunimoActor("Juni6Tank", new Vector2(38, 10), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddInJunimoActor("Juni7", new Vector2(27, 16), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddInJunimoActor("Juni8", new Vector2(40, 15), StardustCore.IlluminateFramework.Colors.getRandomJunimoColor());
e.AddJunimoAdvanceMoveTiles(new StardustCore.Utilities.JunimoAdvanceMoveData("Juni6Tank", new List<Point>()
{
new Point(38,10),
@ -56,12 +58,7 @@ namespace Omegasis.HappyBirthday.Framework
e.FlipJunimoActor("Juni5", true);
e.junimoFaceDirection("Juni4", EventHelper.FacingDirection.Right); //Make a junimo face right.
e.junimoFaceDirection("Juni5", EventHelper.FacingDirection.Left);
e.globalFadeIn();
e.moveFarmerUp(10, EventHelper.FacingDirection.Up, true);
//e.moveActorLeft("Juni", 1, EventHelper.FacingDirection.Down, false);
e.junimoFaceDirection("Juni7", EventHelper.FacingDirection.Down);
e.animate("Juni", true, true, 250, new List<int>()
{
28,
@ -69,11 +66,29 @@ namespace Omegasis.HappyBirthday.Framework
30,
31
});
e.animate("Juni7", false, true, 250, new List<int>()
{
44,45,46,47
});
e.animate("Juni8", false, true, 250, new List<int>()
{
12,13,14,15
});
e.globalFadeIn();
e.moveFarmerUp(10, EventHelper.FacingDirection.Up, true);
e.junimoFaceDirection("Juni4", EventHelper.FacingDirection.Down);
e.junimoFaceDirection("Juni5", EventHelper.FacingDirection.Down);
e.RemoveJunimoAdvanceMove("Juni6Tank");
e.junimoFaceDirection("Juni6Tank", EventHelper.FacingDirection.Down);
e.junimoFaceDirection("Juni7", EventHelper.FacingDirection.Right);
e.FlipJunimoActor("Juni8",true);
e.junimoFaceDirection("Juni8", EventHelper.FacingDirection.Left);
e.playSound("junimoMeep1");
e.emoteFarmer_ExclamationMark();
e.showMessage(HappyBirthday.Config.translationInfo.getTranslatedString("Event:JunimoBirthdayParty_0"));
e.emoteFarmer_Heart();

View File

@ -185,5 +185,15 @@ namespace StardustCore.Events
EventHelper.add(b);
}
public static void RemoveJunimoAdvanceMove(this EventHelper EventHelper, string ActorName)
{
StringBuilder b = new StringBuilder();
b.Append("Omegasis.EventFramework.RemoveJunimoAdvanceMove ");
b.Append(ActorName);
b.Append(" ");
EventHelper.add(b);
}
}
}

View File

@ -35,6 +35,7 @@ namespace StardustCore.Events
this.customEventLogic.Add("Omegasis.EventFramework.SetUpAdvanceJunimoMovement", ExtraEventActions.SetUpAdvanceJunimoMovement);
this.customEventLogic.Add("Omegasis.EventFramework.FinishAdvanceJunimoMovement", ExtraEventActions.FinishAdvanceJunimoMovement);
this.customEventLogic.Add("Omegasis.EventFramework.AddInJunimoAdvanceMove", ExtraEventActions.AddInJunimoAdvanceMove);
this.customEventLogic.Add("Omegasis.EventFramework.RemoveJunimoAdvanceMove", ExtraEventActions.RemoveAdvanceJunimoMovement);
}
/// <summary>

View File

@ -208,5 +208,23 @@ namespace StardustCore.Events
pair.Value.update();
}
}
/// <summary>
/// Removes, aka stops the junimo actor from doing their advance movement.
/// </summary>
/// <param name="EventManager"></param>
/// <param name="EventData"></param>
public static void RemoveAdvanceJunimoMovement(EventManager EventManager, string EventData)
{
string[] splits = EventData.Split(' ');
string name = splits[0];
string actorName = splits[1];
if (junimoLerpData.ContainsKey(actorName))
{
junimoLerpData.Remove(actorName);
}
++Game1.CurrentEvent.CurrentCommand; //I've been told ++<int> is more efficient than <int>++;
}
}
}

View File

@ -57,7 +57,7 @@ namespace StardustCore.Utilities
//junimo.Sprite.Animate(Game1.currentGameTime, 0, 8, 50f);
if (junimo.Sprite.CurrentAnimation==null)
{
junimo.Sprite.Animate(Game1.currentGameTime, 16, 7, 50f);
junimo.Sprite.Animate(Game1.currentGameTime, 16, 8, 50f);
}
}
if (nextPoint.X < this.getCurrentPoint().X)
@ -67,7 +67,7 @@ namespace StardustCore.Utilities
//junimo.Sprite.Animate(Game1.currentGameTime, 0, 8, 50f);
if (junimo.Sprite.CurrentAnimation== null)
{
junimo.Sprite.Animate(Game1.currentGameTime, 16, 7 , 50f);
junimo.Sprite.Animate(Game1.currentGameTime, 16, 8, 50f);
}
}
if (nextPoint.Y < this.getCurrentPoint().Y)