diff --git a/pack_2/green_blocks/bullet.png b/pack_2/green_blocks/bullet.png index cba0e66c..debb7b2c 100755 Binary files a/pack_2/green_blocks/bullet.png and b/pack_2/green_blocks/bullet.png differ diff --git a/pack_2/green_blocks/entry.png b/pack_2/green_blocks/entry.png index 37217b63..f6b3555d 100755 Binary files a/pack_2/green_blocks/entry.png and b/pack_2/green_blocks/entry.png differ diff --git a/pack_2/green_blocks/green_blocks.script b/pack_2/green_blocks/green_blocks.script index 0e6b24fd..0ca41090 100755 --- a/pack_2/green_blocks/green_blocks.script +++ b/pack_2/green_blocks/green_blocks.script @@ -31,34 +31,18 @@ status = "normal"; fun dialog_setup() { - local.box; - local.lock; local.entry; - box.image = Image("box.png"); - lock.image = Image("lock.png"); + global.max_chars = 23; + entry.image = Image("entry.png"); - box.sprite = Sprite(box.image); - box.x = Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth ()/2; - box.y = Window.GetY() + Window.GetHeight() / 2 - box.image.GetHeight()/2; - box.z = 10000; - box.sprite.SetPosition(box.x, box.y, box.z); - - lock.sprite = Sprite(lock.image); - lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2; - lock.y = box.y + box.image.GetHeight()/2 - lock.image.GetHeight()/2; - lock.z = box.z + 1; - lock.sprite.SetPosition(lock.x, lock.y, lock.z); - entry.sprite = Sprite(entry.image); - entry.x = lock.x + lock.image.GetWidth(); - entry.y = box.y + box.image.GetHeight()/2 - entry.image.GetHeight()/2; - entry.z = box.z + 1; + entry.x = Window.GetX() + Window.GetWidth() / 2 - entry.image.GetWidth ()/2; + entry.y = Window.GetY() + Window.GetHeight() / 2 + Window.GetHeight() / 4 - entry.image.GetHeight()/2; + entry.z = 10000; entry.sprite.SetPosition(entry.x, entry.y, entry.z); - global.dialog.box = box; - global.dialog.lock = lock; global.dialog.entry = entry; global.dialog.bullet_image = Image("bullet.png"); dialog_opacity (1); @@ -66,8 +50,6 @@ fun dialog_setup() fun dialog_opacity(opacity) { - dialog.box.sprite.SetOpacity (opacity); - dialog.lock.sprite.SetOpacity (opacity); dialog.entry.sprite.SetOpacity (opacity); for (index = 0; dialog.bullet[index]; index++) { @@ -94,15 +76,16 @@ fun display_password_callback (prompt, bullets) if (!dialog.bullet[index]) { dialog.bullet[index].sprite = Sprite(dialog.bullet_image); - dialog.bullet[index].x = dialog.entry.x + index * dialog.bullet_image.GetWidth(); + # the "+ 1" of (index + 1) for the line bellow is a hack to add 1 character of padding + dialog.bullet[index].x = dialog.entry.x + (index + 1) * dialog.bullet_image.GetWidth(); dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2; dialog.bullet[index].z = dialog.entry.z + 1; dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z); } - if (index < bullets) - dialog.bullet[index].sprite.SetOpacity(1); + if (index < bullets && index < max_chars) + dialog.bullet[index].sprite.SetOpacity(1); else - dialog.bullet[index].sprite.SetOpacity(0); + dialog.bullet[index].sprite.SetOpacity(0); } } diff --git a/pack_2/green_blocks/preview.png b/pack_2/green_blocks/preview.png new file mode 100644 index 00000000..4418f79f Binary files /dev/null and b/pack_2/green_blocks/preview.png differ