diff --git a/jmap_config.json5 b/jmap_config.json5 index e149d10..56c15a5 100644 --- a/jmap_config.json5 +++ b/jmap_config.json5 @@ -1,4 +1,20 @@ -spikeUp: { - layer: "Threats", - object_index: "objSpikeUp", +defaultLayer: "Instances" + +objects: { + spikeUp: { + layer: "Threats", + objectName: "objSpikeUp", + }, + spikeDown: { + layer: "Threats", + objectName: "objSpikeDown", + }, + spikeLeft: { + layer: "Threats", + objectName: "objSpikeLeft", + }, + spikeRight: { + layer: "Threats", + objectName: "objSpikeRight", + }, } diff --git a/main.odin b/main.odin index 8790f74..47bd6e9 100644 --- a/main.odin +++ b/main.odin @@ -383,6 +383,54 @@ jmap_object_list_from_text :: proc(text: string, allocator: mem.Allocator, temp_ return object_list, .None } +JmapObject :: enum { + Block = 1, + MiniBlock = 2, + SpikeUp = 3, + SpikeRight = 4, + SpikeLeft = 5, + SpikeDown = 6, + MiniSpikeUp = 7, + MiniSpikeRight = 8, + MiniSpikeLeft = 9, + MiniSpikeDown = 10, + Fruit = 11, + Save = 12, + Platform = 13, + Water1 = 14, + Water3 = 15, + VineR = 16, + VineL = 17, + KillerBlock = 18, + PlayerStart = 20, + Warp = 21, + JumpRefresher = 22, + Water2 = 23, + GravityFlipperUp = 24, + GravityFlipperDown = 25, + SaveFlipped = 26, + BulletBlocker = 27, + SidewaysPlatform = 28, + MiniWater1 = 30, + MiniWater3 = 31, + MiniWater2 = 32, + MiniCatharsisWater = 33, + WaterNekoron = 34, + MiniWaterNekoron = 35, + LineSpikeUp = 36, + LineSpikeRight = 37, + LineSpikeLeft = 38, + LineSpikeDown = 39, + MiniLineSpikeUp = 40, + MiniLineSpikeRight = 41, + MiniLineSpikeLeft = 42, + MiniLineSpikeDown = 43, + LineBlockHorizontal = 44, + LineBlockVertical = 45, + MiniLineBlockHorizontal = 46, + MiniLineBlockVertical = 47, +} + jmap_object_map := map[int]string { 1 = "block", 2 = "miniBlock", @@ -432,3 +480,55 @@ jmap_object_map := map[int]string { } jmap_object_map_reverse: map[string]int + +GameMakerInstanceDefinition :: struct { + object_name: string, +} + +jmap_instance_to_gamemaker_instance_map := #sparse [JmapObject]GameMakerInstanceDefinition { + .Block = {object_name = "objBlock"}, + .MiniBlock = {object_name = "objMiniBlock"}, + .SpikeUp = {object_name = "objSpikeUp"}, + .SpikeRight = {object_name = "objSpikeRight"}, + .SpikeLeft = {object_name = "objSpikeLeft"}, + .SpikeDown = {object_name = "objSpikeDown"}, + .MiniSpikeUp = {object_name = "objMiniSpikeUp"}, + .MiniSpikeRight = {object_name = "objMiniSpikeRight"}, + .MiniSpikeLeft = {object_name = "objMiniSpikeLeft"}, + .MiniSpikeDown = {object_name = "objMiniSpikeDown"}, + .Fruit = {object_name = "objCherry"}, + .Save = {object_name = "objSave"}, + .Platform = {object_name = "objPlatform"}, + .Water1 = {object_name = "objWater1"}, + .Water3 = {object_name = "objWater3"}, + .VineR = {object_name = "objVineR"}, + .VineL = {object_name = "objVineL"}, + .KillerBlock = {object_name = "objKillerBlock"}, + .PlayerStart = {object_name = "objPlayerStart"}, + .Warp = {object_name = "objWarp"}, + .JumpRefresher = {object_name = "objJumpRefresher"}, + .Water2 = {object_name = "objWater2"}, + .GravityFlipperUp = {object_name = "objGravityFlipperUp"}, + .GravityFlipperDown = {object_name = "objGravityFlipperDown"}, + .SaveFlipped = {object_name = "objSaveFlipped"}, + .BulletBlocker = {object_name = "objBulletBlocker"}, + .SidewaysPlatform = {object_name = "objSidewaysPlatform"}, + .MiniWater1 = {object_name = "objMiniWater1"}, + .MiniWater3 = {object_name = "objMiniWater3"}, + .MiniWater2 = {object_name = "objMiniWater2"}, + .MiniCatharsisWater = {object_name = "objMiniCatharsisWater"}, + .WaterNekoron = {object_name = "objWaterNekoron"}, + .MiniWaterNekoron = {object_name = "objMiniWaterNekoron"}, + .LineSpikeUp = {object_name = "objLineSpikeUp"}, + .LineSpikeRight = {object_name = "objLineSpikeRight"}, + .LineSpikeLeft = {object_name = "objLineSpikeLeft"}, + .LineSpikeDown = {object_name = "objLineSpikeDown"}, + .MiniLineSpikeUp = {object_name = "objMiniLineSpikeUp"}, + .MiniLineSpikeRight = {object_name = "objMiniLineSpikeRight"}, + .MiniLineSpikeLeft = {object_name = "objMiniLineSpikeLeft"}, + .MiniLineSpikeDown = {object_name = "objMiniLineSpikeDown"}, + .LineBlockHorizontal = {object_name = "objLineBlockHorizontal"}, + .LineBlockVertical = {object_name = "objLineBlockVertical"}, + .MiniLineBlockHorizontal = {object_name = "objMiniLineBlockHorizontal"}, + .MiniLineBlockVertical = {object_name = "objMiniLineBlockVertical"}, +} diff --git a/notes.txt b/notes.txt new file mode 100644 index 0000000..e69de29