Soujuurou/Charlotte/Hakunon/Van Gogh(Miner)/BB Dubai/Ptolemy

[ArthurKun21]

Soujuurou/Charlotte/Hakunon/Van Gogh(Miner)/BB Dubai/Ptolemy

Pull Request Type

• Bugfix
• Feature Implementation
• Documentation
• Other

Related issue

fixes #1841

Description

Added the following servants to the Command Card System:

• Soujuurou
• Charlotte
• Hakunon
• Van Gogh(Miner)
• BB Dubai
• Ptolemy

---

Introduced new commands to handle future servants with unique skills.

Added the following commands:

• [Ch3A] - 3 Choices and Select A option.
• [Ch3B]- 3 Choices and Select B option.
• [Ch3C] - 3 Choices and Select C option.

All new special targets have special condition that one of the commands must not look like the starting string for another code

For Example

[Ch3A] -> 3 Choices and Select A option.

There should be no [Ch3] command, as having so will create problems when parsing. Already added checker on the code that will throw an error when run on device.

---

Updated the error message when manually entering skill command for more clarity

Screenshots

3 Choices

---

New Command System in action Choices (3)

---

Error Message when command does not exist

---

Updated Look

Skill 1

Skill 2

Skill 3

---

Hints

Kukulkan

Emiya/BB Dubai

Hakunon/Charlotte/Soujuurou

Van Gogh (Miner)

Space Ishtar

Melusine/Ptolemy

---

Button Labels

Helps user to know what is the effect of the skill. Defaults to just generic option message.

Emiya/BB Dubai

Hakunon/Charlotte/Soujuurou

Van Gogh (Miner)

Kukulkan

Space Ishtar

Testing

Additional context

[reconman]

What I've changed in my last commit:

• Add Summer Barghest's 3rd skill to the 2 choices options
• Also move "Choice (2)" to special targets, but keep the old options in so old configs for Kukulkan can still be used
• Rename "Two Target" and "Three Target" to "NP Type (2)" and "NP Type (3)"
• Fix Skill Target UI for wide screen phones. Before, the No Target button would overlap the Servant ones.

Still needed:

• Rename some variables after the "Two Target" and "Three Target" change
• Optional: Convert the skill command in the builder to a more user-readable format. We only need the [Ch3A] text when parsing it and when users edit the command manually, but it's not needed for displaying the finished command.
• Testing
• Adjust Battle.md documentation

[vybze]

Why not name them special options instead of choices?

[ArthurKun21]

Why not name them special options instead of choices?

naming is hard.

 data object SpecialOptions3OptionA : SpecialTarget("Ch3A") 
 data object SpecialOptions3OptionB : SpecialTarget("Ch3B") 
 data object SpecialOptions3OptionC : SpecialTarget("Ch3C") 

FGA/scripts/src/main/java/io/github/fate_grand_automata/scripts/models/ServantTarget.kt

Lines 50 to 53 in 6c922a7

	// Soujuurou/Charlotte/Hakuno
	data object Choice3OptionA : SpecialTarget("Ch3A")
	data object Choice3OptionB : SpecialTarget("Ch3B")
	data object Choice3OptionC : SpecialTarget("Ch3C")