Merge pull request erasels#213 from modargo/main

Monster Zoo/Wildfire zones: change how the rooms are placed to avoid reducing the total number of non-monster rooms on the map

src/main/java/spireMapOverhaul/zones/monsterZoo/MonsterZooZone.java

@@ -11,13 +11,16 @@
 import com.megacrit.cardcrawl.powers.StrengthPower;
 import com.megacrit.cardcrawl.random.Random;
 import com.megacrit.cardcrawl.rewards.RewardItem;
+import com.megacrit.cardcrawl.rooms.AbstractRoom;
 import com.megacrit.cardcrawl.rooms.MonsterRoom;
 import spireMapOverhaul.abstracts.AbstractZone;
 import spireMapOverhaul.util.Wiz;
 import spireMapOverhaul.zoneInterfaces.CombatModifyingZone;
 import spireMapOverhaul.zoneInterfaces.RenderableZone;
 import spireMapOverhaul.zoneInterfaces.RewardModifyingZone;
 
+import java.util.ArrayList;
+
 public class MonsterZooZone extends AbstractZone implements RewardModifyingZone, CombatModifyingZone, RenderableZone {
     public static final String ID = "MonsterZoo";
 
@@ -39,12 +42,18 @@ public Color getColor() {
     }
 
     @Override
-    public void replaceRooms(Random rng) {
-        //Replace all non monster rooms with monster rooms
-        for (MapRoomNode node : this.nodes) {
-            if(!(node.room instanceof MonsterRoom)) { //Replaces shop/rest/event with normal monster room
-                node.setRoom(new MonsterRoom());
-            }
+    public void distributeRooms(Random rng, ArrayList<AbstractRoom> roomList) {
+        // This fills the zone with monster rooms, with half taken from the room distribution list (which means they
+        // could be elite rooms instead of normal monster rooms, and that it uses up some of the expected distribution
+        // of those room types), and half simply set directly (which means they are always normal monster rooms and do
+        // not use up any of the expected distribution of those room types)
+        int half = nodes.size() / 2;
+        int i;
+        for (i = 0; i < half; ++i) {
+            nodes.get(i).setRoom(roomOrDefault(roomList, (room) -> room instanceof MonsterRoom, MonsterRoom::new));
+        }
+        for (; i < nodes.size(); ++i) {
+            nodes.get(i).setRoom(new MonsterRoom());
         }
     }
 

src/main/java/spireMapOverhaul/zones/wildfire/Wildfire.java

@@ -13,9 +13,7 @@
 import com.megacrit.cardcrawl.cards.AbstractCard;
 import com.megacrit.cardcrawl.map.MapRoomNode;
 import com.megacrit.cardcrawl.random.Random;
-import com.megacrit.cardcrawl.rooms.EventRoom;
-import com.megacrit.cardcrawl.rooms.MonsterRoom;
-import com.megacrit.cardcrawl.rooms.ShopRoom;
+import com.megacrit.cardcrawl.rooms.*;
 import spireMapOverhaul.abstracts.AbstractZone;
 import spireMapOverhaul.util.Wiz;
 import spireMapOverhaul.zoneInterfaces.CombatModifyingZone;
@@ -107,12 +105,16 @@ protected boolean canIncludeEarlyRows() {
     }
 
     @Override
-    public void replaceRooms(Random rng) {
-        //Replace all event and shop rooms with monster rooms
-        for (MapRoomNode node : this.nodes) {
-            if (node.room != null && (EventRoom.class.equals(node.room.getClass()) || ShopRoom.class.equals(node.room.getClass()))) {
-                node.setRoom(new MonsterRoom());
-            }
+    public void distributeRooms(Random rng, ArrayList<AbstractRoom> roomList) {
+        // This makes all rooms in the zone either monster rooms (which could be elites) or campfires.
+        // See the comment in Monster Zoo's distributeRooms method for a more detailed explanation of this approach.
+        int half = nodes.size() / 2;
+        int i;
+        for (i = 0; i < half; ++i) {
+            nodes.get(i).setRoom(roomOrDefault(roomList, (room) -> room instanceof MonsterRoom || room instanceof RestRoom, MonsterRoom::new));
+        }
+        for (; i < nodes.size(); ++i) {
+            nodes.get(i).setRoom(new MonsterRoom());
         }
     }