- Added selection menu logic

iarwain · Jan 31, 2021 · efec536 · efec536
1 parent ae175c7
commit efec536
Show file tree

Hide file tree

Showing 5 changed files with 249 additions and 68 deletions.
diff --git a/data/config/LostEcho.ini b/data/config/LostEcho.ini
@@ -15,7 +15,7 @@ Sound           = game.dat # ../data/sound
 
 [Input]
 DefaultThreshold= 0.4
-SetList         = MainInput
+SetList         = MainInput # SelectInput
 
 [MainInput]
 KEY_ESCAPE      = Quit
@@ -38,6 +38,75 @@ JOY_A_2         = Restart # Start
 JOY_A_3         = Restart # Start
 JOY_A_4         = Restart # Start
 
+[SelectInput]
+KEY_ESCAPE      = Quit
+KEY_SPACE       = 1P # Start
+KEY_ENTER       = 1P # Start
+KEY_1           = 1P # Start
+KEY_2           = 2P # Start
+KEY_3           = 3P # Start
+KEY_4           = 4P # Start
+
+JOY_START_1     = 1P # Start
+JOY_START_2     = 2P # Start
+JOY_START_3     = 3P # Start
+JOY_START_4     = 4P # Start
+
+JOY_A_1         = 1P # Start
+JOY_A_2         = 2P # Start
+JOY_A_3         = 3P # Start
+JOY_A_4         = 4P # Start
+
+KEY_A           = PreviousCount
+KEY_LEFT        = PreviousCount
+KEY_D           = NextCount
+KEY_RIGHT       = NextCount
+
+-JOY_LX_1       = PreviousCount
+JOY_LEFT_1      = PreviousCount
++JOY_LX_1       = NextCount
+JOY_RIGHT_1     = NextCount
+
+-JOY_LX_2       = PreviousCount
+JOY_LEFT_2      = PreviousCount
++JOY_LX_2       = NextCount
+JOY_RIGHT_2     = NextCount
+
+-JOY_LX_3       = PreviousCount
+JOY_LEFT_3      = PreviousCount
++JOY_LX_3       = NextCount
+JOY_RIGHT_3     = NextCount
+
+-JOY_LX_4       = PreviousCount
+JOY_LEFT_4      = PreviousCount
++JOY_LX_4       = NextCount
+JOY_RIGHT_4     = NextCount
+
+KEY_W           = PreviousDeck
+KEY_UP          = PreviousDeck
+KEY_S           = NextDeck
+KEY_DOWN        = NextDeck
+
+-JOY_LY_1       = PreviousDeck
+JOY_UP_1        = PreviousDeck
++JOY_LY_1       = NextDeck
+JOY_DOWN_1      = NextDeck
+
+-JOY_LY_2       = PreviousDeck
+JOY_UP_2        = PreviousDeck
++JOY_LY_2       = NextDeck
+JOY_DOWN_2      = NextDeck
+
+-JOY_LY_3       = PreviousDeck
+JOY_UP_3        = PreviousDeck
++JOY_LY_3       = NextDeck
+JOY_DOWN_3      = NextDeck
+
+-JOY_LY_4       = PreviousDeck
+JOY_UP_4        = PreviousDeck
++JOY_LY_4       = NextDeck
+JOY_DOWN_4      = NextDeck
+
 [MainViewport]
 Camera          = MainCamera
 BackgroundColor = (25, 50, 60)
@@ -61,7 +130,9 @@ Pivot           = center truncate
 [Game]
 ViewportList    = MainViewport
 WrapAround      = false
-
+Counts          = 16 # 28 # 36
+Count           = 28
+Deck            = GeoDeck
 
 @player.ini@
 @table.ini@

diff --git a/data/config/select.ini b/data/config/select.ini
@@ -1,5 +1,10 @@
 [Select]
-ChildList   = ModeTitle # PlayerSelection # InputText
+ChildList       = ModeTitle # PlayerSelection # InputText # SelectTable
+
+[SelectTable@Table]
+Scale           = 0.65
+SelectDeck      = 1
+SelectCount     = 1
 
 [ModeTitle]
 ParentCamera    = MainCamera
@@ -30,8 +35,8 @@ Position        = (0, .35)
 Scale           = 5
 Graphic         = @
 Text            = @
-String          = "[RIGHT, LEFT] CHOOSE NUMBER OF CARDS
-[UP, DOWN] CHOOSE DECK"
+String          = "[RIGHT, LEFT] CHOOSE DECK SIZE
+[UP, DOWN] CHOOSE DECK TYPE"
 
 [BlinkTrack]
 1               = Object.SetAlpha ^ 0

diff --git a/data/config/table.ini b/data/config/table.ini
@@ -1,15 +1,26 @@
-[Scene]
-ChildList   = Player1 # Player2 # Table
+[1P]
+ChildList       = Player1 # Table
+
+[2P]
+ChildList       = Player1 # Player2 # Table
+
+[3P]
+ChildList       = Player1 # Player2 # Player3 # Table
+
+[4P]
+ChildList       = Player1 # Player2 # Player3 # Player4 # Table
+
+[Scene@2P]
 
 [Table]
-Count       = 20
-AttractDelay= 0.2 ~ 1.5
-Padding     = (65, 65)
-Deck        = GeoDeck
+AttractDelay    = 0.2 ~ 1.5
+Padding         = (65, 65)
+Count           = @Game
+Deck            = @Game
 
 [Slot]
 
 [EmptySlot]
-Scale       = 4
-Graphic     = @
-Texture     = empty.png
+Scale           = 4
+Graphic         = @
+Texture         = empty.png
diff --git a/include/Table.h b/include/Table.h
@@ -26,6 +26,7 @@ class Table : public Object
                 orxU32          u32Height               = 0;
                 orxBOOL         bGameOver               = orxFALSE;
                 orxBOOL         bAttract                = orxFALSE;
+                orxBOOL         bSelect                 = orxFALSE;
 
 
 protected: