piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add 2 More Slots for Power Discs on Emulated Base

Browse Source
This commit is contained in:
deReeperJosh
2024-05-11 17:10:15 +01:00
committed by Joshua de Reeper
parent 0cc1d4c62d
commit a87ea694a9
7 changed files with 74 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
View File

@ -80,7 +80,6 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
private var infinityFigureData = Figure(-1, "Position")
private var skylanderSlot = -1
private var infinityPosition = -1
private var infinityListPosition = -1
private lateinit var skylandersBinding: DialogNfcFiguresManagerBinding
private lateinit var infinityBinding: DialogNfcFiguresManagerBinding
@ -140,12 +139,14 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
if (infinityFigures.isEmpty()) {
infinityFigures.apply {
add(FigureSlot(getString(R.string.infinity_hexagon_label), 0))
add(FigureSlot(getString(R.string.infinity_p1_label), 1))
add(FigureSlot(getString(R.string.infinity_p1a1_label), 3))
add(FigureSlot(getString(R.string.infinity_power_hex_two_label), 1))
add(FigureSlot(getString(R.string.infinity_power_hex_three_label), 2))
add(FigureSlot(getString(R.string.infinity_p1_label), 3))
add(FigureSlot(getString(R.string.infinity_p1a1_label), 4))
add(FigureSlot(getString(R.string.infinity_p1a2_label), 5))
add(FigureSlot(getString(R.string.infinity_p2_label), 2))
add(FigureSlot(getString(R.string.infinity_p2a1_label), 4))
add(FigureSlot(getString(R.string.infinity_p2a2_label), 6))
add(FigureSlot(getString(R.string.infinity_p2_label), 6))
add(FigureSlot(getString(R.string.infinity_p2a1_label), 7))
add(FigureSlot(getString(R.string.infinity_p2a2_label), 8))
}
}
}
@ -164,7 +165,6 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
putInt(EXTRA_SKYLANDER_VAR, skylanderData.variant)
putString(EXTRA_SKYLANDER_NAME, skylanderData.name)
putInt(EXTRA_INFINITY_POSITION, infinityPosition)
putInt(EXTRA_INFINITY_LIST_POSITION, infinityListPosition)
putLong(EXTRA_INFINITY_NUM, infinityFigureData.number)
putString(EXTRA_INFINITY_NAME, infinityFigureData.name)
}
@ -183,7 +183,6 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
savedInstanceState.getString(EXTRA_SKYLANDER_NAME)!!
)
infinityPosition = savedInstanceState.getInt(EXTRA_INFINITY_POSITION)
infinityListPosition = savedInstanceState.getInt(EXTRA_INFINITY_LIST_POSITION)
infinityFigureData = Figure(
savedInstanceState.getLong(EXTRA_INFINITY_NUM),
savedInstanceState.getString(EXTRA_INFINITY_NAME)!!
@ -297,11 +296,10 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
} else if (requestCode == REQUEST_INFINITY_FIGURE_FILE) {
val label = InfinityConfig.loadFigure(infinityPosition, result!!.data.toString())
if (label != null && label != "Unknown Figure") {
clearInfinityFigure(infinityListPosition)
infinityFigures[infinityListPosition].label = label
infinityBinding.figureManager.adapter?.notifyItemChanged(infinityListPosition)
clearInfinityFigure(infinityPosition)
infinityFigures[infinityPosition].label = label
infinityBinding.figureManager.adapter?.notifyItemChanged(infinityPosition)
infinityPosition = -1
infinityListPosition = -1
infinityFigureData = Figure.BLANK_FIGURE
} else {
MaterialAlertDialogBuilder(this)
@ -317,11 +315,10 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
result!!.data.toString(),
infinityPosition
)
clearInfinityFigure(infinityListPosition)
infinityFigures[infinityListPosition].label = label!!
infinityBinding.figureManager.adapter?.notifyItemChanged(infinityListPosition)
clearInfinityFigure(infinityPosition)
infinityFigures[infinityPosition].label = label!!
infinityBinding.figureManager.adapter?.notifyItemChanged(infinityPosition)
infinityPosition = -1
infinityListPosition = -1
infinityFigureData = Figure.BLANK_FIGURE
}
}
@ -906,18 +903,19 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
fun setInfinityFigureData(num: Long, name: String, position: Int, listPosition: Int) {
infinityFigureData = Figure(num, name)
infinityPosition = position
infinityListPosition = listPosition
}
fun clearInfinityFigure(position: Int) {
when (position) {
0 -> infinityFigures[position].label = getString(R.string.infinity_hexagon_label)
1 -> infinityFigures[position].label = getString(R.string.infinity_p1_label)
2 -> infinityFigures[position].label = getString(R.string.infinity_p1a1_label)
3 -> infinityFigures[position].label = getString(R.string.infinity_p1a2_label)
4 -> infinityFigures[position].label = getString(R.string.infinity_p2_label)
5 -> infinityFigures[position].label = getString(R.string.infinity_p2a1_label)
6 -> infinityFigures[position].label = getString(R.string.infinity_p2a2_label)
1 -> infinityFigures[position].label = getString(R.string.infinity_power_hex_two_label)
2 -> infinityFigures[position].label = getString(R.string.infinity_power_hex_three_label)
3 -> infinityFigures[position].label = getString(R.string.infinity_p1_label)
4 -> infinityFigures[position].label = getString(R.string.infinity_p1a1_label)
5 -> infinityFigures[position].label = getString(R.string.infinity_p1a2_label)
6 -> infinityFigures[position].label = getString(R.string.infinity_p2_label)
7 -> infinityFigures[position].label = getString(R.string.infinity_p2a1_label)
8 -> infinityFigures[position].label = getString(R.string.infinity_p2a2_label)
}
infinityBinding.figureManager.adapter?.notifyItemChanged(position)
}

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/infinitybase/ui/FigureSlotAdapter.kt
View File

@ -75,6 +75,11 @@ class FigureSlotAdapter(
}
1, 2 -> {
// Hexagon Power Discs
validFigures.filter { (_, value) -> value in 4000000..4999999 }
}
3, 6 -> {
// Characters
validFigures.filter { (_, value) -> value in 1000000..1999999 }
}

2
Source/Android/app/src/main/res/values/strings.xml
View File

@ -914,6 +914,8 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="infinity_number">Figure Number</string>
<string name="invalid_infinity_figure">Invalid Figure Selection</string>
<string name="infinity_hexagon_label">Power Disc/Play Set</string>
<string name="infinity_power_hex_two_label">Power Disc Two</string>
<string name="infinity_power_hex_three_label">Power Disc Three</string>
<string name="infinity_p1_label">Player One</string>
<string name="infinity_p2_label">Player Two</string>
<string name="infinity_p1a1_label">P1 Ability One</string>