Merge pull request #6733 from MahtraDR/add_bush

[scripts][safe-room] Add 'bush' to plant types
elanthia-online · Nov 16, 2023 · bde9102 · bde9102
2 parents adcce18 + b661afc
commit bde9102
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/safe-room.lic b/safe-room.lic
@@ -200,7 +200,7 @@ class SafeRoom
 
     DRC.release_invisibility
 
-    if /.*vela.tohr (\w+)/ =~ DRRoom.room_objs.grep(/vela'tohr (plant|thicket)/).to_s
+    if /.*vela.tohr (\w+)/ =~ DRRoom.room_objs.grep(/vela'tohr (plant|thicket|bush)/).to_s
       fput("touch #{Regexp.last_match(1)}")
     end
 
@@ -265,10 +265,10 @@ class SafeRoom
     return false unless empath
 
     DRCT.walk_to room_id
-    return false unless DRRoom.pcs.include?(empath) || DRRoom.room_objs.grep(/vela'tohr (plant|thicket)/)
+    return false unless DRRoom.pcs.include?(empath) || DRRoom.room_objs.grep(/vela'tohr (plant|thicket|bush)/)
 
     unless DRRoom.pcs.include?(empath)
-      if /.*vela.tohr (\w+)/ =~ DRRoom.room_objs.grep(/vela'tohr (plant|thicket)/).to_s
+      if /.*vela.tohr (\w+)/ =~ DRRoom.room_objs.grep(/vela'tohr (plant|thicket|bush)/).to_s
         fput("touch #{Regexp.last_match(1)}")
       end
     end