cthangover/mod_rpg
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Map events apart from the map: map_events/<map>/*.json of any mod merged by id (RpgMapEventResolver, RpgMapEventMerge); item Icon look for events; rpg_walk checks a pickup across leaving the map and loading a save

Browse Source
This commit is contained in:
cthangover committed 2026-10-23 19:09:37 +02:00
1 parent 281b722667
commit c4d6adf8fb
13 files changed
+396 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/RpgStateTests.cs
+52 -3
View File
@@ -57,7 +57,6 @@ namespace Cthangover.Mods.Rpg.Tests
{
var json = @"{""Id"":""m"",""Tileset"":""village"",""Width"":2,""Height"":1,
""Spawn"":{""X"":1,""Y"":0,""Dir"":""left""},
""Events"":[{""Id"":""door"",""X"":0,""Y"":0,""Trigger"":""touch"",""Teleport"":{""Map"":""x"",""X"":3,""Y"":4,""Dir"":""Up""}}],
""Encounters"":{""Steps"":20,""Groups"":[""slime""]}}";
var map = JsonSerializer.Deserialize<RpgMap>(json, Cthangover.Core.Utils.JsonOptionsProvider.ReadOptions);
@@ -65,12 +64,62 @@ namespace Cthangover.Mods.Rpg.Tests
ModAssert.Equal("m", again.ID, "id");
ModAssert.Equal("Left", again.Spawn.Dir.ToString(), "spawn facing, read in any case");
ModAssert.Equal(20, again.Encounters.Steps, "encounter steps");
ModAssert.Equal("slime", again.Encounters.Groups[0], "encounter group");
ModAssert.Equal(2, again.Zoom, "zoom default");
}
[ModTest("state/event_file_round_trip")]
static void EventFileRoundTrip(ModTestContext ctx)
{
var json = @"{""Events"":[
{""Id"":""door"",""X"":0,""Y"":0,""Trigger"":""touch"",""Teleport"":{""Map"":""x"",""X"":3,""Y"":4,""Dir"":""Up""}},
{""Id"":""herb"",""X"":2,""Y"":1,""Icon"":""rpg_demo/forest_mushroom"",""Commands"":[""end""],""Condition"":""herb != 1""}]}";
var file = JsonSerializer.Deserialize<RpgMapEventFile>(json, Cthangover.Core.Utils.JsonOptionsProvider.ReadOptions);
file.Events[0].ModId = "some_mod";
var text = JsonSerializer.Serialize(file);
var again = JsonSerializer.Deserialize<RpgMapEventFile>(text, Cthangover.Core.Utils.JsonOptionsProvider.ReadOptions);
ModAssert.Equal(2, again.Events.Count, "both events");
ModAssert.Equal("Touch", again.Events[0].Trigger.ToString(), "trigger");
ModAssert.Equal("x", again.Events[0].Teleport.Map, "teleport map");
ModAssert.Equal(4, again.Events[0].Teleport.Y, "teleport y");
ModAssert.False(again.Events[0].IsSolid, "an invisible event does not block");
ModAssert.Equal(20, again.Encounters.Steps, "encounter steps");
ModAssert.Equal(2, again.Zoom, "zoom default");
ModAssert.Equal("rpg_demo/forest_mushroom", again.Events[1].Icon, "icon");
ModAssert.True(again.Events[1].IsSolid, "an icon is drawn, so it blocks unless told otherwise");
ModAssert.Equal("herb != 1", again.Events[1].Condition, "condition");
ModAssert.Equal("end", again.Events[1].Commands[0], "commands");
ModAssert.False(text.Contains("some_mod"), "where an event came from is not written");
}
[ModTest("state/event_merge_adds_and_replaces")]
static void EventMergeAddsAndReplaces(ModTestContext ctx)
{
var merge = new RpgMapEventMerge();
merge.Add("village", "base_game", "map_events/village/events.json", new[]
{
new RpgMapEvent { Id = "elder", X = 1, Y = 1 },
new RpgMapEvent { Id = "sign", X = 2, Y = 1 },
new RpgMapEvent { Id = " " }
});
var replaced = merge.Add("VILLAGE", "quest_mod", "map_events/village/quest.json", new[]
{
new RpgMapEvent { Id = "Elder", X = 5, Y = 5 },
new RpgMapEvent { Id = "quest_giver", X = 3, Y = 3 }
});
merge.Add("forest", "quest_mod", "map_events/forest/a.json", null);
var village = merge.Maps["village"];
ModAssert.Equal(3, village.Count, "an event without an id is skipped, a new id is added");
ModAssert.Equal(1, replaced.Count, "one replacement reported");
ModAssert.Equal("Elder", replaced[0], "the replacing id");
ModAssert.Equal(5, village[0].X, "the later mod's event replaces in place (any case)");
ModAssert.Equal("quest_mod", village[0].ModId, "the replacement remembers its mod");
ModAssert.Equal("sign", village[1].Id, "the others keep their order");
ModAssert.Equal("base_game", village[1].ModId, "and their mod");
ModAssert.Equal("map_events/village/quest.json", village[2].File, "an added event remembers its file");
ModAssert.Equal(0, merge.Maps["forest"].Count, "a file without events adds nothing");
}
}
}