max/bitsy-parser
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

convert int IDs to strings

Browse Source
This commit is contained in:
Max Bradbury
2020-06-18 14:44:20 +01:00
parent e895f932a6
commit fe6f3f5c84
7 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sprite.rs
View File

@@ -4,11 +4,11 @@ use std::str::FromStr;
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Sprite {
pub id: u64,
pub id: String,
pub name: Option<String>,
pub animation_frames: Vec<Image>,
pub dialogue_id: Option<String>,
pub room_id: Option<u64>,
pub room_id: Option<String>,
pub position: Option<Position>,
pub colour_id: Option<u64>,
pub items: Vec<String>,
@@ -30,7 +30,7 @@ impl Sprite {
if self.room_id.is_some() && self.position.is_some() {
format!(
"\nPOS {} {}",
self.room_id.unwrap().to_base36(),
self.room_id.as_ref().unwrap(),
self.position.as_ref().unwrap().to_string()
)
} else {
@@ -59,10 +59,10 @@ impl From<String> for Sprite {
fn from(string: String) -> Sprite {
let mut lines: Vec<&str> = string.lines().collect();
let id = from_base36(&lines[0].replace("SPR ", ""));
let id = lines[0].replace("SPR ", "");
let mut name = None;
let mut dialogue_id: Option<String> = None;
let mut room_id: Option<u64> = None;
let mut room_id: Option<String> = None;
let mut position: Option<Position> = None;
let mut colour_id: Option<u64> = None;
let mut items: Vec<String> = Vec::new();
@@ -77,7 +77,7 @@ impl From<String> for Sprite {
} else if last_line.starts_with("POS") {
let last_line = last_line.replace("POS ", "");
let room_position: Vec<&str> = last_line.split(' ').collect();
room_id = Some(from_base36(&room_position[0]));
room_id = Some(room_position[0].to_string());
if room_position.len() < 2 {
panic!("Bad room/position for sprite: {}", string);
@@ -118,7 +118,7 @@ impl ToString for Sprite {
fn to_string(&self) -> String {
format!(
"SPR {}\n{}{}{}{}{}{}",
self.id.to_base36(),
self.id,
self.animation_frames.to_string(),
self.name_line(),
self.dialogue_line(),