From c0e9f5feef0ac09389d94f608687d8b34a8d358b Mon Sep 17 00:00:00 2001
From: Jalen Winslow <jalenwinslow@yahoo.com>
Date: Mon, 6 Nov 2017 14:10:05 -0700
Subject: [PATCH] added walls to map

---
 build/com/hobogames/utils/Map.class | Bin 2911 -> 3281 bytes
 res/maps/Game1_tutorialMap.txt      |   1 +
 src/com/hobogames/utils/Map.java    |  46 ++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/build/com/hobogames/utils/Map.class b/build/com/hobogames/utils/Map.class
index 69cef8bc032a1006c65ee03968b5aa18d223b8a1..55efaef6ad14ca874ffbeea538458524f81d6333 100644
GIT binary patch
literal 3281
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

delta 1664
zcmZWpYfKzf7(MsS4zoMV(q$<NE4zR!g|fVd1<F?1@_yBpcEJV}0);-Mq9C^QwX|KM
zHvWO}k0b`IX^E|AY}KW<rZLv~Xkv`oA0{R?(Wp_QzZzpGZT;>A8yjYK?)lES-??+|
zcW3U`-fN!jE4R*H1Q5dWI`YxrKpq-(YMSh5*3p7i(X`pouA>7R?YLjZCT!MFC^9>R
zxW$gG0wZ>G+0kvs1NO<bK)wTm7}BsqM>ZNnvr{y?bnM0+(d^amh=$?G<JS`tMz-(W
zG57>S%0t#0Y^8OTW!l0T_E~?kd}k3t23DiMKqW#}kOwwAYG4G98F(C{3{0m)17jdN
z%hoV%;7RN^5JaJY131WF8yy*;jHmE4#k&WFhplPeWc|d`5}q;eES{TEe5p}P7&wGc
z4TlXJ5rfANdbeEpjRo?kEC8n;O+rRAG@%U)MJT4W#Hv*@YD!5<f<kQ~^%-!$i85jy
zasoQaVG@c+j6;(}1yx<RCsj|iaO*PDMebzjG^iI)mz+$jU*yxH|D+r{p!8Wks8vzk
zTj(?0jyUX_iWM_#<5jBH7Kihcc-)V4J1%<zLBg}2ADylzJbdNGT!?V=%ZlI&gjZ1-
zI8As7r5|JxPND3h8p7?UocNw_tNQU*FA^T}+T2NTtaueKDOKt$ju3anqe3`n6T%n?
z$ueP&D)=CAx8ywuf=7s_NZzIi-ave%<TZA|D~P8`Uf`0391=WINOws`G6`u?&|G9m
zRZogiu?J~(;-aF+GVdq+knV5k{+;@%kSv{UDl==g`m|7TdL*W?+1ua65~%%T7QYBJ
z>2B33bELL=BeOUfd=EykYMz5`7TW~4?;&|?xtu}r!^>qK$xYUP!xJr8-YJGkTP|lt
zVw}z1d{e3QiO!41a7kI`7opE2^3G!9H$TIS&(<$fW>D>43@K#>L78IfH${?5lBh`u
z=BG={^t=7^@P40dh|gfNUqb7mYv_M2G7XVQ&Yg0p$L&7>w@j3MZvXMShjcFWxgC+1
zLKW^1Yq=dhW6*{u5O4cw6k2}W8y$k5jUtmxAd5{CzE1oEa@bqQWph}?E+da!Bm9~8
zA1Gjdp^$SFaTO)pi&E}GIWL3B>1*OGsO0Ua=6zVh2N34tSj!KfmcI-ypF$mf4fXsa
z8u<HY<iDbsUq?$+38P(U!A4~Z>XmJ%Q+m-UKfj&O**JabRj7u>c40l%P?W&V-_hRw
zPotqbP=hcn&E)-9OL?3MdQN&3{tCX3UOEVrzNODON$JFW<j7^HrE2tI^-Y)>*0EdI
zN1$OnTOlu(%UNNaO3W<s$m<`Z%tKwES9*cwcLOa(zTa?=M1MLRHY}YfhLIP|x`6DS
zIovCbh8(dU8K%#qFpfYRxpG6kIg6|~R>c@?&V@5~_9hb=#SuEmx{!`;ntT`5VH+Ar
wYe$bPPc|*qNsAHX5vOCTT%tI!Iu@6hEf+?|*#fwn>^#cmX-I}TO5&*h7Z5%(cK`qY

diff --git a/res/maps/Game1_tutorialMap.txt b/res/maps/Game1_tutorialMap.txt
index 29fb22a..e210d3b 100644
--- a/res/maps/Game1_tutorialMap.txt
+++ b/res/maps/Game1_tutorialMap.txt
@@ -9,6 +9,7 @@ hall 23 2 3 1
 hall 0 7 4 1
 hall 7 8 6 1
 hall 17 9 1 3
+make_walls
 switch 17 11 1
 lock_door 12 8 1
 exit 0 7
diff --git a/src/com/hobogames/utils/Map.java b/src/com/hobogames/utils/Map.java
index 967fc87..c595361 100644
--- a/src/com/hobogames/utils/Map.java
+++ b/src/com/hobogames/utils/Map.java
@@ -39,6 +39,25 @@ public class Map {
                         }
                     }
                     break;
+                case "make_walls":
+                    for (int j = 0; j < mapData.length; j++) {
+                        for (int i = 0; i < mapData[j].length; i++) {
+                            String wall = "%";
+                            if (j+1 != mapData.length && mapData[j+1][i] != null &&
+                            mapData[j+1][i].equals(".") && mapData[j][i] == null) 
+                                mapData[j][i] = wall;
+                            if (j-1 != -1 && mapData[j-1][i] != null &&
+                            mapData[j-1][i].equals(".") && mapData[j][i] == null)
+                                mapData[j][i] = wall;
+                            if (i+1 != mapData[j].length && mapData[j][i+1] != null &&
+                            mapData[j][i+1].equals(".") && mapData[j][i] == null)
+                                mapData[j][i] = wall;
+                            if (i-1 != -1 && mapData[j][i-1] != null &&
+                            mapData[j][i-1].equals(".") && mapData[j][i] == null)
+                                mapData[j][i] = wall;
+                        }
+                    }
+                    break;
                 case "switch":
                     mapData[Integer.parseInt(object[2])][Integer.parseInt(object[1])] = "S";
                     break;
@@ -62,8 +81,31 @@ public class Map {
                     break;
             }
         }
+
         for (int j = 0; j < mapData.length; j++) {
             for (int i = 0; i < mapData[j].length; i++) {
+                if (mapData[j][i] == null) mapData[j][i] = " ";
+            }
+        }
+        /*
+        for (int j = 0; j < mapData.length; j++) {
+            for (int i = 0; i < mapData[j].length; i++) {
+                if (mapData[j][i] == null) {
+                    if (j+1 != mapData.length) {
+                        if (mapData[j+1][i] != null) mapData[j][i] = "#";
+                    }
+                    if (j-1 != -1) {
+                        if (mapData[j-1][i] != null) mapData[j][i] = "#";
+                    }
+                    if (i+1 != mapData[j].length) {
+                        if (mapData[j][i+1] != null) mapData[j][i] = "#";
+                    }
+                    if (i-1 != -1) {
+                        if (mapData[j][i-1] != null) mapData[j][i] = "#";
+                    }
+                }
+                
+                /*
                 if (mapData[j][i] == null) {
                     if (j+1 != mapData.length && i+1 != mapData[j].length && 
                         (mapData[j+1][i] != null || mapData[j][i+1] != null)) {
@@ -74,9 +116,9 @@ public class Map {
                         mapData[j][i] = "#";
                     } else
                         mapData[j][i] = " ";
-                }
+                }//
             }
-        }
+        }   */
     }
 
     public void displayMap() {