Final commit

gdesimone97 · Dec 12, 2019 · bb5022f · bb5022f
1 parent 09f4fef
commit bb5022f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/unisalife/src/game/GameObjects/Item.java b/unisalife/src/game/GameObjects/Item.java
@@ -91,7 +91,7 @@ public String toString() {
 
     @Override
     public void render(Graphics g) {
-        g.drawImage(facingDownImage, (int) x, (int) y, width, height, null);
+        g.drawImage(facingDownImage, (int) x, (int) y, width-10, height-10, null);
     }
 
     @Override

diff --git a/unisalife/src/game/GameResources/Game.java b/unisalife/src/game/GameResources/Game.java
@@ -118,9 +118,9 @@ private void initResources() {
         t1.loadMap("/Maps/ExtMap.map");
         maps[0] = new Map(t0);
 
-        maps[0].addObject(new Item(100, 170, "/Sprites/calculator.png", ItemDef.calcolatrice.toString(), 0,ItemDef.calcolatrice));
-        maps[0].addObject(new Item(100, 200, "/Sprites/note.png", ItemDef.appuntidimatematica1.toString(), 0,ItemDef.appuntidimatematica1));
-        maps[0].addObject(new Item(100, 230, "/Sprites/note.png", ItemDef.appuntidimatematica2.toString(), 0,ItemDef.appuntidimatematica2));
+        maps[0].addObject(new Item(440, 270, "/Sprites/calculator.png", ItemDef.calcolatrice.toString(), 0,ItemDef.calcolatrice));
+        maps[0].addObject(new Item(300, 160, "/Sprites/note.png", ItemDef.appuntidimatematica1.toString(), 0,ItemDef.appuntidimatematica1));
+        maps[0].addObject(new Item(300, 360, "/Sprites/note.png", ItemDef.appuntidimatematica2.toString(), 0,ItemDef.appuntidimatematica2));
 
         maps[0].addObject(new Professor("Foggia", 200, 200, "/Sprites/foggia.png",Materia.matematica));
         maps[0].addObject(new Block(256+16,208+16,160,128)); //blocco E

diff --git a/unisalife/src/unisagui/GameFrame.form b/unisalife/src/unisagui/GameFrame.form
@@ -2703,7 +2703,6 @@
             </Component>
             <Component class="javax.swing.JLabel" name="AvatarImage">
               <Properties>
-                <Property name="text" type="java.lang.String" value="immagine avatar"/>
                 <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                   <Dimension value="[200, 200]"/>
                 </Property>

diff --git a/unisalife/src/unisagui/GameFrame.java b/unisalife/src/unisagui/GameFrame.java
@@ -178,7 +178,7 @@ private void initComponents() {
         MusicButton = new javax.swing.JButton();
         KeyboardButton = new javax.swing.JButton();
         ReturnToMainMenuButton = new javax.swing.JButton();
-        LanguageComboBox = new javax.swing.JComboBox<String>();
+        LanguageComboBox = new javax.swing.JComboBox<>();
         SettingsCloseButton = new javax.swing.JButton();
         RequestDialog = new javax.swing.JDialog();
         RequestPanel = new javax.swing.JPanel();
@@ -213,7 +213,7 @@ private void initComponents() {
         QuestDialog = new javax.swing.JDialog();
         QuestPanel = new javax.swing.JPanel();
         QuestListScrollPane = new javax.swing.JScrollPane();
-        QuestList = new javax.swing.JList<String>();
+        QuestList = new javax.swing.JList<>();
         QuestTextScrollPane = new javax.swing.JScrollPane();
         QuestTextArea = new javax.swing.JTextArea();
         ExitQuestDialogLabel = new javax.swing.JLabel();
@@ -1162,7 +1162,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         LanguageComboBox.setBackground(new java.awt.Color(75, 125, 167));
         LanguageComboBox.setFont(new java.awt.Font("Arial Black", 1, 18)); // NOI18N
         LanguageComboBox.setForeground(new java.awt.Color(255, 255, 255));
-        LanguageComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "English", " " }));
+        LanguageComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "English", " " }));
         LanguageComboBox.setMaximumSize(new java.awt.Dimension(200, 50));
         LanguageComboBox.setMinimumSize(new java.awt.Dimension(200, 50));
         LanguageComboBox.setPreferredSize(new java.awt.Dimension(200, 50));
@@ -1446,7 +1446,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        AvatarImage.setText("immagine avatar");
         AvatarImage.setMaximumSize(new java.awt.Dimension(200, 200));
         AvatarImage.setMinimumSize(new java.awt.Dimension(200, 200));
         AvatarImage.setName(""); // NOI18N
@@ -1731,10 +1730,10 @@ public void windowLostFocus(java.awt.event.WindowEvent evt) {
         QuestListScrollPane.setPreferredSize(new java.awt.Dimension(190, 350));
 
         QuestList.setBorder(javax.swing.BorderFactory.createTitledBorder("Quest"));
-        QuestList.setModel(new javax.swing.AbstractListModel() {
+        QuestList.setModel(new javax.swing.AbstractListModel<String>() {
             String[] strings = { "Collect your first dollar!", "It's time to get Math Exam!" };
             public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+            public String getElementAt(int i) { return strings[i]; }
         });
         QuestList.setMaximumSize(new java.awt.Dimension(190, 350));
         QuestList.setMinimumSize(new java.awt.Dimension(190, 350));