Skip to content

Commit

Permalink
Redid the text/lore system in the code & did some transition stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
BubkisLord committed Oct 27, 2022
1 parent 7ddb514 commit 0c901f5
Show file tree
Hide file tree
Showing 26 changed files with 631 additions and 413 deletions.
Binary file modified .vs/CharmMod/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified .vs/CharmMod/v17/.futdcache.v2
Binary file not shown.
Binary file modified .vs/CharmMod/v17/.suo
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/charmmod.metadata.v5.1
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/charmmod.projects.v5.1
Binary file not shown.
402 changes: 19 additions & 383 deletions CharmMod.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Room.cs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void DestroyGO(string name)
/// </summary>
public void ReplaceText(string key, string text, string sheetKey = "")
{
Fyrenest.instance.AddReplacement(key, text, sheetKey);
ReplaceText(key, text, sheetKey);
}

/// <summary>
Expand Down
20 changes: 20 additions & 0 deletions Rooms/Abyss/Abyss_08.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Fyrenest.Rooms.Abyss
{
internal class Abyss_08 : Room
{
public Abyss_08() : base("Abyss_08") { }

public override void OnBeforeLoad()
{
SetDarkness(true);
SetColor(Color.black);
SetHeroLightColor(Color.black);
}
}
}
10 changes: 8 additions & 2 deletions Rooms/CrystalPeak/Mines_37.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ internal class Mines_37 : Room
{
public Mines_37() : base("Mines_37") { }

public override void OnBeforeLoad()
public override void OnWorldInit()
{
PlaceTransition("Mines_37", "left1", "Deepnest_09", "left1", 2.25f, 24, new Vector2(1.5f, 2.5f), new Vector2(2, 0), GameManager.SceneLoadVisualizations.Default);
// Make this go somewhere other than the deepnest stag station
PlaceTransition("Mines_37", "left1", "Crossroads_30", "left1", 2.25f, 24, new Vector2(1.5f, 2.5f), new Vector2(2, 0), GameManager.SceneLoadVisualizations.Default);
}
}
internal class Crossroads_30 : Room
{
// Flip target room
public Crossroads_30() : base("Crossroads_30") { IsFlipped = true; }
}
}
30 changes: 27 additions & 3 deletions Rooms/Deepnest/Deepnest_9.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,35 @@ namespace Fyrenest.Rooms.Deepnest
{
internal class Deepnest_9 : Room
{
public Deepnest_9() : base("Deepnest_09") { IsFlipped = true; }
public Deepnest_9() : base("Deepnest_09") { }
public override void OnBeforeLoad()
{
SetColor(Color.magenta);
//SetSaturation(100f);
SetColor(Color.black);
SetSaturation(10);
if (PlayerData.instance.royalCharmState != 3)
{
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 0.5f, 5, Quaternion.Euler(0, 0, 270));
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 0.5f, 6, Quaternion.Euler(0, 0, 270));
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 0.5f, 7, Quaternion.Euler(0, 0, 270));
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 0.5f, 8, Quaternion.Euler(0, 0, 270));
}
}
public override void OnWorldInit()
{
// Go to joni's blessing area.
SetTransition("Deepnest_09", "left1", "Abyss_08", "right1");

// Make it possible to get to Deepnest Stag station.
SetItem(LocationNames.Geo_Rock_Abyss_3, ItemNames.Distant_Village_Stag);

// Make deepnest stag go to void heart.
SetItem(LocationNames.Jonis_Blessing, ItemNames.Void_Heart);

// Get world sense after The Climb.
SetItem(LocationNames.Void_Heart, ItemNames.World_Sense);

// Get Joni's Blessing at hk room.
SetItem(LocationNames.World_Sense, ItemNames.Jonis_Blessing);
}
}
}
15 changes: 1 addition & 14 deletions Rooms/Dirtmouth/Crossroads1.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
using ItemChanger;
using ItemChanger.Components;
using ItemChanger.Internal;
using ItemChanger.Locations;
using ItemChanger.Locations.SpecialLocations;
using ItemChanger.Placements;
using ItemChanger.UIDefs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Fyrenest.Rooms.Crossroads
namespace Fyrenest.Rooms.Crossroads
{
internal class Crossroads1 : Room
{
Expand Down
13 changes: 13 additions & 0 deletions Rooms/Dirtmouth/Crossroads_08.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Fyrenest.Rooms.Crossroads
{
internal class Crossroads_08 : Room
{
public Crossroads_08() : base("Crossroads_08") { }
public override void OnBeforeLoad()
{
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 50, 20, Quaternion.Euler(0, 0, 270));
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 50, 23, Quaternion.Euler(0, 0, 270));
PlaceGO(Prefabs.LARGE_PLATFORM.Object, 50, 26, Quaternion.Euler(0, 0, 270));
}
}
}
10 changes: 1 addition & 9 deletions Rooms/Dirtmouth/Dirtmouth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
using ItemChanger.Internal;
using ItemChanger.Locations;
using ItemChanger.Locations.SpecialLocations;
using ItemChanger.Placements;
using ItemChanger.UIDefs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Fyrenest.Rooms.Abyss
namespace Fyrenest.Rooms.Dirtmouth
{
internal class Dirtmouth : Room
{
Expand Down
34 changes: 34 additions & 0 deletions Rooms/Kingdom'sEdge/KingdomsEdge.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using ItemChanger;
using ItemChanger.Components;
using ItemChanger.Internal;
using ItemChanger.Locations;
using ItemChanger.Locations.SpecialLocations;
using ItemChanger.Placements;
using ItemChanger.UIDefs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Fyrenest.Rooms.KingdomsEdge
{
internal class KingdomsEdge : Room
{
public KingdomsEdge() : base("Deepnest_East_01") { }
public override void OnWorldInit()
{
AbstractPlacement placement = Finder.GetLocation(LocationNames.Kings_Brand).Wrap();
AbstractItem aitem = new VoidSoul();
aitem.UIDef = new MsgUIDef()
{
name = new BoxedString("VoidSoul"),
sprite = new BoxedSprite(EmbeddedSprite.Get("VoidSoul.png")),
};
// Add a cost to get.
//aitem.AddTag<CostTag>().Cost = new GeoCost(1200);
placement.Add(aitem);
ItemChangerMod.AddPlacements(new AbstractPlacement[] { placement }, PlacementConflictResolution.MergeKeepingNew);
}
}
}
Loading

0 comments on commit 0c901f5

Please sign in to comment.