From 93e8642bc91fdd3bfccaf880147be8c6a0ce8014 Mon Sep 17 00:00:00 2001
From: Madeline Lim <deltabouche@gmail.com>
Date: Sun, 20 May 2018 12:15:30 -0700
Subject: [PATCH] Rename CelesteMapReader to CelesteMap because it is r/w,
 map2xml should be map2json

---
 README.md                               | 2 +-
 celeste_map_reader.rb => celeste_map.rb | 2 +-
 json2map.rb                             | 4 ++--
 map2json.rb                             | 9 +++++++++
 map2xml.rb                              | 9 ---------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename celeste_map_reader.rb => celeste_map.rb (99%)
 create mode 100644 map2json.rb
 delete mode 100644 map2xml.rb

diff --git a/README.md b/README.md
index d28bc5a..4a07ed4 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ If you right click on a level it takes you to the level view, where you will als
 
 ![Screenshot of Level view for one of the Celestial Resort B-side levels](screenshot/levelview2.png)
 
-For this, I took the levels and used `map2xml.rb` to convert them into JSON for easier JS manipulation and wrote a viewer in p5.js. Here's an [example](http://deltabouche.com/celeste/json/0-Intro.json) of what one of these looks like, which again might get taken down if requested.
+For this, I took the levels and used `map2json.rb` to convert them into JSON for easier JS manipulation and wrote a viewer in p5.js. Here's an [example](http://deltabouche.com/celeste/json/0-Intro.json) of what one of these looks like, which again might get taken down if requested.
 
 # Tools used
 
diff --git a/celeste_map_reader.rb b/celeste_map.rb
similarity index 99%
rename from celeste_map_reader.rb
rename to celeste_map.rb
index f9c2341..1febfff 100644
--- a/celeste_map_reader.rb
+++ b/celeste_map.rb
@@ -96,7 +96,7 @@ class Element
   end
 end
 
-class CelesteMapReader
+class CelesteMap
   attr_accessor :debug, :rom, :package, :string_lookup, :root, :writer
   def initialize fn, fmt: :bin, debug: false
     @debug = debug
diff --git a/json2map.rb b/json2map.rb
index f15ea60..bf63d4a 100644
--- a/json2map.rb
+++ b/json2map.rb
@@ -1,8 +1,8 @@
-require "./celeste_map_reader"
+require "./celeste_map"
 # fn = 'app/Content/Maps/1-ForsakenCity.bin'
 
 ARGV.each do |fn|
   base = File.basename(fn, ".json")
-  a = CelesteMapReader.new(fn, fmt: :json)
+  a = CelesteMap.new(fn, fmt: :json)
   a.write "bin/#{base}.bin"
 end
diff --git a/map2json.rb b/map2json.rb
new file mode 100644
index 0000000..3e29aab
--- /dev/null
+++ b/map2json.rb
@@ -0,0 +1,9 @@
+require "./celeste_map"
+# fn = 'app/Content/Maps/1-ForsakenCity.bin'
+
+ARGV.each do |fn|
+  base = File.basename(fn, ".bin")
+  a = CelesteMap.new(fn)
+  File.open("#{base}.xml", "wb") { |f| f.write a.root.inspect } # Note: not valid XML, just for display
+  a.write_json("#{base}.json")
+end
diff --git a/map2xml.rb b/map2xml.rb
deleted file mode 100644
index 3436096..0000000
--- a/map2xml.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require "./celeste_map_reader"
-# fn = 'app/Content/Maps/1-ForsakenCity.bin'
-
-ARGV.each do |fn|
-  base = File.basename(fn, ".bin")
-  a = CelesteMapReader.new(fn)
-  File.open("#{base}.xml", "wb") { |f| f.write a.root.inspect }
-  a.write_json("#{base}.json")
-end