Merge branch 'zuul-with-items-v1' into 'master'

Zuul With Items V1

1 files changed, 172 insertions, 173 deletions

diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index 36b928e..4f87ef6 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -25,232 +25,231 @@ import java.awt.Font;
 
 public abstract class UserInterface implements View, ActionListener {
 
-        protected Game aGame;
-        private GameEngine aGameEngine;
+        protected Game game;
+        private GameEngine gameEngine;
 
-        private JPanel aLayout;
+        private JPanel layout;
 
-        private JTextPane aQuestTextPane;
-        private JTextPane aInfoTextPane;
+        private JTextPane questTextPane;
+        private JTextPane infoTextPane;
 
-        private JLabel aImageLabel;
+        private JLabel imageLabel;
 
-        private HashMap<String, JButton> aGameButtons;
-        private HashMap<String, JButton> aControlButtons;
-        private JTextField aInputField;
+        private HashMap<String, JButton> gameButtons;
+        private HashMap<String, JButton> controlButtons;
+        private JTextField inputField;
 
         /**
          * Create the panel.
          */
         public UserInterface() {
                 this.buildUI();
-                this.aInputField.addActionListener(this);
+                this.inputField.addActionListener(this);
                 this.setControlsState(false);
-                aInputField.setEnabled(true);
+                inputField.setEnabled(true);
         }
 
         private void buildUI() {
-                this.aLayout = new JPanel();
-                this.aLayout.setLayout(new BorderLayout(0, 0));
+                this.layout = new JPanel();
+                this.layout.setLayout(new BorderLayout(0, 0));
 
-                JPanel vMenuPanel = new JPanel();
-                this.aLayout.add(vMenuPanel, BorderLayout.NORTH);
-                vMenuPanel.setLayout(new BorderLayout(0, 0));
+                JPanel menuPanel = new JPanel();
+                this.layout.add(menuPanel, BorderLayout.NORTH);
+                menuPanel.setLayout(new BorderLayout(0, 0));
 
-                JPanel vQuestPanel = new JPanel();
-                vMenuPanel.add(vQuestPanel, BorderLayout.CENTER);
+                JPanel questPanel = new JPanel();
+                menuPanel.add(questPanel, BorderLayout.CENTER);
 
-                this.aQuestTextPane = new JTextPane();
-                this.aQuestTextPane.setEditable(false);
-                this.aQuestTextPane.setText("ESIEEquest");
-                vQuestPanel.add(this.aQuestTextPane);
+                this.questTextPane = new JTextPane();
+                this.questTextPane.setEditable(false);
+                this.questTextPane.setText("ESIEEquest");
+                questPanel.add(this.questTextPane);
 
-                JPanel vGamePanel = new JPanel();
-                vMenuPanel.add(vGamePanel, BorderLayout.WEST);
+                JPanel gamePanel = new JPanel();
+                menuPanel.add(gamePanel, BorderLayout.WEST);
 
-                JButton vNewButton = new JButton("New");
-                vNewButton.setToolTipText("New game");
-                vGamePanel.add(vNewButton);
+                JButton newButton = new JButton("New");
+                newButton.setToolTipText("New game");
+                gamePanel.add(newButton);
 
-                JButton vSoundButton = new JButton("Sound");
-                vSoundButton.setToolTipText("Toggle sound");
-                vGamePanel.add(vSoundButton);
+                JButton soundButton = new JButton("Sound");
+                soundButton.setToolTipText("Toggle sound");
+                gamePanel.add(soundButton);
 
                 JPanel filePanel = new JPanel();
-                vMenuPanel.add(filePanel, BorderLayout.EAST);
-
-                JButton vLoadButton = new JButton("Load");
-                vLoadButton.setToolTipText("Load a game");
-                filePanel.add(vLoadButton);
-
-                JButton vSaveButton = new JButton("Save");
-                vSaveButton.setToolTipText("Save the current game");
-                filePanel.add(vSaveButton);
-
-                JPanel vImagePanel = new JPanel();
-                aLayout.add(vImagePanel, BorderLayout.CENTER);
-                vImagePanel.setLayout(new BorderLayout(0, 0));
-
-                this.aImageLabel = new JLabel();
-                vImagePanel.add(this.aImageLabel);
-
-                JPanel vUserPanel = new JPanel();
-                this.aLayout.add(vUserPanel, BorderLayout.SOUTH);
-                vUserPanel.setLayout(new BorderLayout(0, 0));
-
-                JPanel vDispPanel = new JPanel();
-                vDispPanel.setBorder(new EmptyBorder(5, 5, 5, 0));
-                vUserPanel.add(vDispPanel, BorderLayout.CENTER);
-                vDispPanel.setLayout(new BorderLayout(0, 0));
-
-                this.aInfoTextPane = new JTextPane();
-                this.aInfoTextPane.setEditable(false);
-                this.aInfoTextPane.setText("Welcome to ESIEEquest!");
-                vDispPanel.add(this.aInfoTextPane);
-
-                aInputField = new JTextField();
-                vDispPanel.add(aInputField, BorderLayout.SOUTH);
-                aInputField.setColumns(10);
-
-                JPanel vControlPanel = new JPanel();
-                vControlPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-                vUserPanel.add(vControlPanel, BorderLayout.EAST);
-                vControlPanel.setLayout(new BorderLayout(0, 0));
-
-                JPanel vTopControlPanel = new JPanel();
-                vControlPanel.add(vTopControlPanel, BorderLayout.NORTH);
-                vTopControlPanel.setLayout(new BorderLayout(0, 0));
-
-                JButton vForwardButton = new JButton("↥");
-                vForwardButton.setFont(new Font("Dialog", Font.BOLD, 19));
-                vForwardButton.setToolTipText("Go forward");
-                vTopControlPanel.add(vForwardButton, BorderLayout.CENTER);
-
-                JButton vInventoryButton = new JButton("⇱");
-                vInventoryButton.setFont(new Font("Dialog", Font.BOLD, 19));
-                vInventoryButton.setToolTipText("Use item");
-                vTopControlPanel.add(vInventoryButton, BorderLayout.WEST);
-
-                JButton vActionButton = new JButton("⇲");
-                vActionButton.setFont(new Font("Dialog", Font.BOLD, 19));
-                vActionButton.setToolTipText("Talk/Take item");
-                vTopControlPanel.add(vActionButton, BorderLayout.EAST);
-
-                JPanel vBottomControlPanel = new JPanel();
-                vControlPanel.add(vBottomControlPanel, BorderLayout.SOUTH);
-                vBottomControlPanel.setLayout(new BorderLayout(0, 0));
-
-                JButton vBackButton = new JButton("↧");
-                vBackButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                menuPanel.add(filePanel, BorderLayout.EAST);
+
+                JButton loadButton = new JButton("Load");
+                loadButton.setToolTipText("Load a game");
+                filePanel.add(loadButton);
+
+                JButton saveButton = new JButton("Save");
+                saveButton.setToolTipText("Save the current game");
+                filePanel.add(saveButton);
+
+                JPanel imagePanel = new JPanel();
+                layout.add(imagePanel, BorderLayout.CENTER);
+                imagePanel.setLayout(new BorderLayout(0, 0));
+
+                this.imageLabel = new JLabel();
+                imagePanel.add(this.imageLabel);
+
+                JPanel userPanel = new JPanel();
+                this.layout.add(userPanel, BorderLayout.SOUTH);
+                userPanel.setLayout(new BorderLayout(0, 0));
+
+                JPanel dispPanel = new JPanel();
+                dispPanel.setBorder(new EmptyBorder(5, 5, 5, 0));
+                userPanel.add(dispPanel, BorderLayout.CENTER);
+                dispPanel.setLayout(new BorderLayout(0, 0));
+
+                this.infoTextPane = new JTextPane();
+                this.infoTextPane.setEditable(false);
+                this.infoTextPane.setText("Welcome to ESIEEquest!");
+                dispPanel.add(this.infoTextPane);
+
+                inputField = new JTextField();
+                dispPanel.add(inputField, BorderLayout.SOUTH);
+                inputField.setColumns(10);
+
+                JPanel controlPanel = new JPanel();
+                controlPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+                userPanel.add(controlPanel, BorderLayout.EAST);
+                controlPanel.setLayout(new BorderLayout(0, 0));
+
+                JPanel topControlPanel = new JPanel();
+                controlPanel.add(topControlPanel, BorderLayout.NORTH);
+                topControlPanel.setLayout(new BorderLayout(0, 0));
+
+                JButton forwardButton = new JButton("↥");
+                forwardButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                forwardButton.setToolTipText("Go forward");
+                topControlPanel.add(forwardButton, BorderLayout.CENTER);
+
+                JButton inventoryButton = new JButton("⇱");
+                inventoryButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                inventoryButton.setToolTipText("Use item");
+                topControlPanel.add(inventoryButton, BorderLayout.WEST);
+
+                JButton actionButton = new JButton("⇲");
+                actionButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                actionButton.setToolTipText("Talk/Take item");
+                topControlPanel.add(actionButton, BorderLayout.EAST);
+
+                JPanel bottomControlPanel = new JPanel();
+                controlPanel.add(bottomControlPanel, BorderLayout.SOUTH);
+                bottomControlPanel.setLayout(new BorderLayout(0, 0));
+
+                JButton backButton = new JButton("↧");
+                backButton.setFont(new Font("Dialog", Font.BOLD, 19));