More bug fixes

Author: jsbrn

assets/definitions/dialogues.json

@@ -296,16 +296,7 @@
       "Not if you want that amulet back. I'd start by exploring the dungeons nearby. The farther you travel, the more dangerous they get."
     ],
     "options": [
-      { "label": "Thanks for the tip.", "pointsTo": "collector_6"}
-    ]
-  },
-  {
-    "id": "collector_6",
-    "texts": [
-      "One more thing. You'll probably need a Healing spell. Take this one, on the house. But the next one will cost ya."
-    ],
-    "options": [
-      { "label": "(Accept healing spell)", "pointsTo": "collector_7"}
+      { "label": "Thanks for the tip.", "pointsTo": "collector_7"}
     ]
   },
   {

assets/tips.txt

@@ -1,4 +1,5 @@
 Zombies are much more powerful in groups. Once they grab you, it's hard to break free.
+If a zombie has grabbed you, fire a damage spell repeatedly until you get an opening.
 Press CTRL + Backspace to clear text fields.
 Stuck? Try talking to people you've met. They might have the answer.
 Want to stay in the loop? Check the website for the latest news and updates.

gui/elements/Picker.java

@@ -44,7 +44,7 @@ public void onClick(int button) {
 
     public void onValueChange() {}
 
-    public void refresh() {
+    private void refresh() {
         if (labels != null) label.setText(labels[value]);
     }
 

gui/menus/SpellcraftingMenu.java

@@ -74,8 +74,8 @@ public void onClick(int button) {
         iconChooser = new Picker(0, 14, 1, 8, null) {
             @Override
             public void onValueChange() {
-                icon.setImage(Assets.getImage("assets/gui/icons/spells/"+this.getValue()+".png"));
                 spell.setIconIndex(getValue());
+                refresh();
             }
         };
         iconChooser.addChild(icon, 0, -16, GUIAnchor.TOP_MIDDLE);
@@ -269,6 +269,7 @@ public boolean onMouseMoved(int ogx, int ogy) {
 
     @Override
     public void onShow() {
+
         nameField.grabFocus();
     }
 
@@ -294,6 +295,7 @@ private void refresh() {
         this.nameField.setText(spell.getName());
         this.icon.setFilter(spell.getColor());
         this.iconChooser.setValue(spell.getIconIndex());
+        icon.setImage(Assets.getImage("assets/gui/icons/spells/"+iconChooser.getValue()+".png"));
         this.colorChooser.setColor(spell.getColor());
         refreshTechniquesPanel();
     }

world/World.java

@@ -110,7 +110,8 @@ public static void load() {
             JSONObject jsonPlayer = (JSONObject)world.get("player");
             spawnPlayer((int)(double)jsonPlayer.get("x"), (int)(double)jsonPlayer.get("y"), (int)(long)jsonPlayer.get("rotation"), (String)jsonPlayer.get("region"));
             getLocalPlayer().deserialize(jsonPlayer);
-            for (Region r: regions.values()) r.loadSavedChunks();
+            getLocalPlayer().getLocation().getRegion().plan();
+            for (Region r: regions.values()) { r.loadSavedChunks(); }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (ParseException e) {

world/entities/types/humanoids/Player.java

@@ -40,7 +40,8 @@ public Player() {
         this.setMaxMana(100);
         this.setMana(100);
 
-        getSpellbook().addSpell(SpellFactory.createSpell(SpellFactory.DAMAGE, 3));
+        getSpellbook().addSpell(SpellFactory.createSpell(SpellFactory.DAMAGE, 2));
+        getSpellbook().addSpell(SpellFactory.createSpell(SpellFactory.HEALING, 1));
 
         this.getAnimationLayer("head").setColor(SKIN_COLORS[0]);
 

world/entities/types/humanoids/npcs/Collector.java

@@ -142,7 +142,7 @@ public void handle(Event e) {
                             return;
                         } else {
                             exitState();
-                            pre.getPlayer().getSpellbook().addSpell(SpellFactory.createSpell(spellTypes[pre.getOption()], (int)MiscMath.random(1, 2)));
+                            pre.getPlayer().getSpellbook().addSpell(SpellFactory.createSpell(spellTypes[pre.getOption()], (int)MiscMath.random(2, 3)));
                             getActionQueue().queueAction(new SpeakAction("Hope it serves you well."));
                         }
                     }

world/generators/chunk/overworld/ForestGenerator.java

@@ -16,7 +16,7 @@ public ForestGenerator(int seed) {
 
     @Override
     public byte getTop(int x, int y) {
-        if (rng().nextFloat() > 1 - density) return Tiles.TREE;
+        if (rng().nextFloat() <= density) return Tiles.TREE;
         return super.getTop(x, y);
     }