Skip to content

Commit

Permalink
Merge pull request #5 from ilujito2/AddingOtherTarget
Browse files Browse the repository at this point in the history
Adding otherTarget to the translated mission files - Part2
  • Loading branch information
GlowPuff authored Jul 3, 2024
2 parents b5994ac + 1e242c7 commit 32ae5ba
Show file tree
Hide file tree
Showing 35 changed files with 327 additions and 2 deletions.
21 changes: 21 additions & 0 deletions AppModels/MissionPanelUIHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -376,5 +376,26 @@ public static void CreateD6( int eaIdx, TranslatedEvent dataSource, StackPanel p

panel.Children.Add( UIFactory.Border( stackPanel ) );
}

public static void CreateGM2(int eaIdx, TranslatedEvent dataSource, StackPanel panel, bool isEnabled, bool useContext)
{
var ea = dataSource.eventActions[eaIdx] as TranslatedChangeTarget;
if (ea.otherTarget != null)
{
StackPanel stackPanel = new StackPanel();
stackPanel.Children.Add(UIFactory.SubHeading($"{ea.eaName}", Utils.missingTranslations.Contains(ea.GUID)));

stackPanel.Children.Add(UIFactory.TBlock("otherTarget"));
stackPanel.Children.Add(UIFactory.TBox(ea.otherTarget, null, true, isEnabled, (a, b) =>
{
if (useContext)
{
ea.otherTarget = (a as TextBox).Text.Trim();
}
}));

panel.Children.Add(UIFactory.Border(stackPanel));
}
}
}
}
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Bespin/BESPIN1_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,12 @@
"eventActionType": 2,
"eaName": "Change Objective"
},
{
"otherTarget": "the Rebel carrying the dead drop",
"GUID": "6a7f462e-0f05-49e6-9814-bf12e373bac9",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"repositionText": "Block access to the catwalk.",
"GUID": "1a759d96-959d-4e7f-bb7f-d87b11f47194",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Bespin/BESPIN3_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,12 @@
"eventActionType": 17,
"eaName": "Change Reposition Instructions"
},
{
"otherTarget": "the Rebel figure closest to Agent Blaise",
"GUID": "d58dfec3-6537-43fa-a5cd-586b8d347326",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"tbText": "Agent Blaise, who has been busy checking data on a terminal, looks up in surprise as you barge into the command center. He draws his weapon, a move quickly mirrored by his aide. ",
"GUID": "4e0945ac-4637-4d06-8259-c0343b70833b",
Expand Down
9 changes: 8 additions & 1 deletion Assets/sources/Missions/Bespin/BESPIN6_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,14 @@
"eventName": "FtF Yes",
"GUID": "3f099e0c-e7a2-4206-832f-4dddd9337417",
"eventText": "The Duke looks up from his desk. “Davith, my boy, its so good to see you again. I hope you understand that keeping you in the dark was never personal. You were too valuable to the organization to risk losing.”",
"eventActions": []
"eventActions": [
{
"otherTarget": null,
"GUID": "eda13a57-327e-4733-8fc6-cbd540f8554e",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
{
"eventName": "FtF No",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Core/CORE12_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,12 @@
"GUID": "70691985-cfc9-4cf6-aef0-87a184f58d6c",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": "the hero carrying the data core",
"GUID": "ec60074f-7e3a-4fb6-a011-0c57a1875462",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand Down
30 changes: 30 additions & 0 deletions Assets/sources/Missions/Core/CORE14_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@
"GUID": "f7b125d1-360f-402b-b8c1-b52dd9377117",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": null,
"GUID": "6d60aae2-4920-4ffa-a783-db545534f424",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand All @@ -142,6 +148,12 @@
"GUID": "6810a3e4-5576-4d79-9900-da3c833781f1",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": "the closest closed door",
"GUID": "0b66bfd3-bed6-4bed-8860-63afd80b77dd",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand All @@ -167,6 +179,12 @@
"GUID": "b4f37196-a497-4c40-b039-4ca75b950b49",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": null,
"GUID": "45127d06-07ce-4c1a-b04d-bed9920fe327",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand All @@ -175,6 +193,12 @@
"GUID": "fc04bc99-4637-44f2-8a96-2a9fe9e930df",
"eventText": "The door slams shut, protecting Luke - for the moment. It won't withstand the onslaught for long.",
"eventActions": [
{
"otherTarget": "the closest closed door",
"GUID": "38554f16-3677-4b65-9c91-0ea677fa5148",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"translatedEntityProperties": [
{
Expand Down Expand Up @@ -243,6 +267,12 @@
"GUID": "bf3a2f63-b4d3-4e16-8099-7b465c4c3e54",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": null,
"GUID": "fce6eeb8-22e3-43c7-8969-df0100ef500f",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Core/CORE20_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@
"eventActionType": 1,
"eaName": "Change Mission Info"
},
{
"otherTarget": null,
"GUID": "89ef1ffc-99fe-40d9-a9b6-5cf6978cf2c6",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"translatedEntityProperties": [
{
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Core/CORE27_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@
"eventActionType": 6,
"eaName": "Deploy: DG006/Imperial Officer (Elite)"
},
{
"otherTarget": "the Rebel carrying the data core",
"GUID": "84b50882-5474-407b-958e-5860135de61d",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"newInstructions": "If the Courier is carrying the data core:\r\n\r\n{A} Move 4 towards the Entrance.\r\n{A} Move 4 towards the Entrance.\r\n\r\nIf the Courier is not carrying the data core:\r\n\r\n{-} The other two closest Imperial figures become <color=\"red\">Focused</color>.",
"GUID": "f31ec38b-7744-4f81-b0bb-0260839d83fa",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Core/CORE6_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@
"eventActionType": 2,
"eaName": "Change Objective"
},
{
"otherTarget": null,
"GUID": "f64233e3-a718-4f90-905d-3bf5c6836072",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"repositionText": "Block access to the Exit.",
"GUID": "2c901212-a768-41fb-b146-ff128d088447",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Core/CORE7_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@
"eventActionType": 16,
"eaName": "Text Box"
},
{
"otherTarget": "the captive",
"GUID": "59b25a97-e886-475b-a59f-a471def8fdc8",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"repositionText": "Block access to the exit.",
"GUID": "3af0142c-341f-4b91-b400-2afab9479cf9",
Expand Down
12 changes: 12 additions & 0 deletions Assets/sources/Missions/Empire/EMPIRE13_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
"GUID": "edc56ae0-7e4f-4ecd-9176-26e69bfd835a",
"eventText": "By the time you reach the scene, chaos has already engulfed the streets. Civilians cower behind what cover they can find, desperate to escape the Empire's towering war machines.\r\n\r\n{-} Deploy the heroes to the Rebel mission token.",
"eventActions": [
{
"otherTarget": "the closest civilian",
"GUID": "13df9421-7be5-4584-a465-b28dbe6f0a1d",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"tbText": "Former protesters cower in fear or sprint for cover.\r\n\r\n{-} Place 1 neutral mission token on each red highlighted space.\r\n{-} Neutral mission tokens represent civilians. Civilians are neutral figures. Imperial figures can attack civilians (Health: 4).\r\n{-} The Rebel mission token represents an escape route. When a civilian enters a space on or adjacent to the escape route, click the escape route and select \"Civilian escapes\".\r\n{-} When a civilian is defeated, click the escape route and select \"Civilian defeated\".\r\n{-} At the end of a hero's activation, that hero may move a civilian within 2 spaces up to 2 spaces.",
"GUID": "561387f9-553b-46ec-a660-6061017be9d0",
Expand Down Expand Up @@ -150,6 +156,12 @@
"GUID": "0bb9fb9f-d9a4-489f-a1c7-0ea302f87cfe",
"eventText": "As reinforcements close in, remaining protesters attempt to huddle in safety. Your pilot zooms overhead, launching an EMP blast targeting the AT-DP's shield generators.\r\n\r\nWith its weaknesses now revealed, you aim your weapons and prepare to take down the less-intimidating walker.\r\n\r\n{-} The <color=\"red\">AT-DP</color> can now suffer {H}.\r\n{-} The Rebels win when the <color=\"red\">AT-DP</color> is defeated.",
"eventActions": [
{
"otherTarget": null,
"GUID": "983c4f28-68df-42d9-a8e7-cff7cbc9ced2",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"shortText": "Take down the <color=\"red\">AT-DP</color>.",
"longText": null,
Expand Down
12 changes: 12 additions & 0 deletions Assets/sources/Missions/Empire/EMPIRE3_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@
"GUID": "edc56ae0-7e4f-4ecd-9176-26e69bfd835a",
"eventText": "“Your reputation precedes you, Maul,” Zaaryn says in the transmission you intercepted. “I am willing to deal, but you must do something for me first to prove your good faith. Help me quash this unrest, and then we'll talk.\"\r\n\r\nYou arrive at the meeting coordinates provided in the transmission to find civilians gathered for a protest in the streets.",
"eventActions": [
{
"otherTarget": "the closest protester",
"GUID": "d53c4103-7ecc-48fe-92b8-835d41cbcc1d",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"translatedEntityProperties": [
{
Expand Down Expand Up @@ -1823,6 +1829,12 @@
"GUID": "9d00693d-e7e0-4467-bc3f-119688843f6a",
"eventActionType": 2,
"eaName": "Change Objective"
},
{
"otherTarget": null,
"GUID": "a921c557-f8b3-47c1-b409-1c00ebc1aa75",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH12_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@
"GUID": "6b5deffb-8a13-46f8-9c10-5b4b2160d27c",
"eventText": "Finally, the door to the containment area bursts open. Behind lies a large room where everything is being prepared for the execution.",
"eventActions": [
{
"otherTarget": "Draylen",
"GUID": "21a17bc4-7ff4-40e2-bf2a-74cd27c4d5d3",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"repositionText": "Block access to the evacuation point.",
"GUID": "0be64fde-67df-477e-91eb-9fd7f5ab485f",
Expand Down
12 changes: 12 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH13_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@
"eventActionType": 16,
"eaName": "Text Box"
},
{
"otherTarget": "the shuttle door",
"GUID": "90cbc99c-329c-4aca-9116-4acc91318ec7",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"repositionText": "Move to the Shuttle.",
"GUID": "3978e551-8df7-426d-b5d3-0a39ff020cc0",
Expand Down Expand Up @@ -324,6 +330,12 @@
"GUID": "3170c859-2774-44a4-ab2a-b37a836744a1",
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": null,
"GUID": "7df5e828-1d5a-42f0-9721-1f8fc5587358",
"eventActionType": 12,
"eaName": "Change Priority Target"
}
]
},
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH16_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@
"eventActionType": 6,
"eaName": "Deploy: DG016/Trandoshan Hunter (Elite)"
},
{
"otherTarget": null,
"GUID": "7fb9ab79-50fa-46bd-89cd-3b3f959e801c",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"enemyName": null,
"customText": "",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH1_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,12 @@
"GUID": "fe083aee-09fc-46bc-a828-0bfa260db962",
"eventText": "Now that you can see better how much people there are still left, you realize you won't be able to save everyone. You hurry forward, dedicated to rescue as many as possible.\r\n\r\n{-} Heroes gain {A}: Push an adjacent evacuee up to 4 spaces.\r\n{-} At the start of each Round, the Rebels rescue a liberated evacuee. Then, they may move each additional liberated evacuee up to 4 spaces. Evacuees cannot end their movement in a space containing another evacuee.\r\n{-} An Imperial figure can attack an evacuee (Health: 5, Defense: None). While an evacuee adjacent to a healthy hero is defending, it adds 1 white die to its defense pool. When an evacuee is defeated, the Empire claims that evacuee. Click the red highlight and select \"Evacuee defeated\".\r\n{-} The Rebels win when the Rebel players have rescued 6 evacuees.",
"eventActions": [
{
"otherTarget": "the closest evacuee",
"GUID": "3ab08684-de77-43ea-ae8c-70a85da46bb4",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"translatedEntityProperties": [
{
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH2_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@
"eventActionType": 6,
"eaName": "Deploy: DG004/Imperial Officer"
},
{
"otherTarget": "the closest refugee",
"GUID": "068bca4a-baa3-486d-b916-a28d87047712",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"newInstructions": "{-} Imperial figures will attack a door if it is the shortest direct way to their target.",
"GUID": "16dce7d9-9440-432a-b77c-b16af74ee74c",
Expand Down
12 changes: 12 additions & 0 deletions Assets/sources/Missions/Hoth/HOTH8_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@
"eventActionType": 11,
"eaName": "Change Group Instructions"
},
{
"otherTarget": "the closest defense checkpoint",
"GUID": "ca525fcf-8102-4ca5-a1d9-8835fa830428",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"enemyName": null,
"customText": "",
Expand Down Expand Up @@ -467,6 +473,12 @@
"eventActionType": 11,
"eaName": "Change Group Instructions"
},
{
"otherTarget": "the siege wall",
"GUID": "bbb4da19-20f0-4f57-bef8-281d8adab839",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"newInstructions": "{-} When a healthy Rebel figure is adjacent to the siege wall that is the target of an attack, that Rebel figure becomes the target of the attack.\r\n{-} When BOMBARD is not the bonus effect, this figure gains \"BOMBARD: This figure's attacks do not require line of sight or Accuracy.\" When BOMBARD is the bonus effect, this figure gains 1 {g}.\r\n{-} DEFENSIBLE: Recover 3 {H}.\r\n{Q}{A} Attack the siege wall. Then, attack the healthy Rebel closest to the siege wall.\r\n{Q} Attack the siege wall.\r\n{A} If this figure has suffered {H}, it recovers 3 {H}.\r\n{A} If this figure has suffered {H}, it recovers 3 {H}.",
"GUID": "61422704-b6c7-4ee4-a51a-2b7001670aba",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Jabba/JABBA3_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,12 @@
"eventActionType": 15,
"eaName": "Modify Map Entity"
},
{
"otherTarget": null,
"GUID": "defcfe45-6777-4c22-8502-b2d5950c4735",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"shortText": "Get to the Extraction Zone.",
"longText": null,
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Jabba/JABBA5_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@
"GUID": "edc56ae0-7e4f-4ecd-9176-26e69bfd835a",
"eventText": "You depart the skiff at a warehouse on the outskirts of Mos Eisley. You meet a hooded Gotal, who ignores your introduction and hands you a barrel. When you try to peek inside the package he slaps your hand. “No questions,” he bleats. “Just work.” He points to a stack of similar barrels, then to his YV-666 outside. Before long, the crates are loaded and you depart.\r\n\r\nAs you approach a ruined temple you note several mercenaries stationed throughout the Dosha jungle.",
"eventActions": [
{
"otherTarget": "a Rebel figure carrying a spice barrel",
"GUID": "2d38f322-40a2-40b8-add9-63358d5a3d00",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"enemyName": null,
"customText": "",
Expand Down
6 changes: 6 additions & 0 deletions Assets/sources/Missions/Jabba/JABBA6_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,12 @@
"eventActionType": 16,
"eaName": "Text Box"
},
{
"otherTarget": "the closest weak point",
"GUID": "d2da4480-b0ea-48f2-888c-cf7096ef23ec",
"eventActionType": 12,
"eaName": "Change Priority Target"
},
{
"shortText": "Defend the base. Weak points destroyed: &Weak Points&/4.",
"longText": null,
Expand Down
Loading

0 comments on commit 32ae5ba

Please sign in to comment.