diff --git a/NS.py b/NS.py index ea5cc8b..26efe79 100644 --- a/NS.py +++ b/NS.py @@ -4,7 +4,7 @@ from random import randint, choice from math import pi from copy import copy from glob import iglob -from os.path import basename +from os.path import basename, join from threading import Thread from serial import Serial from PIL import Image, ImageDraw @@ -803,7 +803,7 @@ class Platform(GameChild): class Light(Animation): - MAX_GLOW_INDEX = 16 + MAX_GLOW_INDEX = 25 INTRODUCTION_OFFSET = 80 def __init__(self, parent, color, position): @@ -875,19 +875,31 @@ class Light(Animation): return self.points def draw_glow(self): - for ii in reversed(xrange(0, self.glow_index, 1)): + for ii, y in enumerate(xrange(0, self.glow_index, 3)): shifted = [] for point in self.get_points(): - shifted.append((point[0], point[1] - ii)) - ratio = 1 - float(ii + 1) / (self.MAX_GLOW_INDEX + 1) - alpha = int(ratio * 255) - color = Color(self.color.r, self.color.g, self.color.b, alpha) - ds = self.get_display_surface() - intermediate = Surface(ds.get_size(), SRCALPHA) - lines(intermediate, - get_hsla_color(int(color.hsla[0]), int(color.hsla[1]), int(color.hsla[2]), int(ratio * 100)), - True, shifted, 5) - ds.blit(intermediate, (0, 0)) + shifted.append((point[0], point[1] - y)) + # ratio = 1 - float(y + 1) / (self.MAX_GLOW_INDEX + 1) + # alpha = int(ratio * 255) + # color = Color(self.color.r, self.color.g, self.color.b, alpha) + # ds = self.get_display_surface() + # intermediate = Surface(ds.get_size(), SRCALPHA) + if self.position == NS.LSW: + saturation = 0 + else: + saturation = int((self.color.hsla[1] + 80) % 100) + if not ii % 2: + lightness = 0 + else: + lightness = 40 + lines( + self.get_display_surface(), + get_hsla_color( + int(self.color.hsla[0]), saturation, lightness + ), + True, shifted, 3 + ) + # ds.blit(intermediate, (0, 0)) def in_orientation(self, orientation): if self.position == NS.LNW: @@ -1097,6 +1109,8 @@ class Boss(Animation): self.kool_man = RainbowSprite(self, load(self.get_resource("Kool_man_waah.png")).convert_alpha(), 30) self.visitor = RainbowSprite(self, load(self.get_resource("Visitor.png")).convert_alpha(), 30) self.spoopy = RainbowSprite(self, load(self.get_resource("Spoopy.png")).convert_alpha(), 30) + for sprite in self.kool_man, self.visitor, self.spoopy: + sprite.location.topleft = 100, 0 self.health = Health(self) self.sword = Sword(self) self.register(self.brandish, self.cancel_flash, self.show_introduction_dialogue, @@ -1109,9 +1123,9 @@ class Boss(Animation): self.spoopy_avatar = load(self.get_resource("Spoopy_avatar.png")).convert() self.advance_prompt = AdvancePrompt(self) self.backgrounds = [Sprite(self), Sprite(self), Sprite(self)] - self.backgrounds[0].load_from_path(self.get_resource("local/bg001.png")) - self.backgrounds[1].load_from_path(self.get_resource("local/bg002.png")) - self.backgrounds[2].load_from_path(self.get_resource("local/bg003.png")) + self.backgrounds[0].load_from_path(self.get_resource("bg/bg001.png")) + self.backgrounds[1].load_from_path(self.get_resource("bg/bg002.png")) + self.backgrounds[2].load_from_path(self.get_resource("bg/bg003.png")) def cancel_flash(self): if self.level_index == 0: @@ -1467,73 +1481,76 @@ class Boss(Animation): class Sword(Animation): - OFFSET = 10 + SHIFT = 15 SPRITE_COUNT = 6 def __init__(self, parent): Animation.__init__(self, parent) swords = self.swords = [] - for path in ("Sword_kool_man.png", "Sword_visitor.png", "Sword_spoopy.png"): - swords.append([]) - image = load(self.get_resource(path)).convert_alpha() - for _ in xrange(6): - sprite = Sprite(self) - sprite.add_frame(image) - for angle in 270, 315, 45: - sprite.add_frame(rotate(image, angle)) - sprite.add_frameset([0], name="vertical") - sprite.add_frameset([1], name="horizontal") - sprite.add_frameset([2], name="rdiagonal") - sprite.add_frameset([3], name="ldiagonal") - sprite.set_frameset("vertical") - sprite.location.center = self.get_display_surface().get_rect().center - swords[-1].append(sprite) - # for _ in xrange(self.SPRITE_COUNT): - # sprite = Sprite(self) - # sprite.load_from_path(self.get_resource("kool/"), True, query="[0-9]-*.png") - # for ii in xrange(6): - # sprite.add_frameset(ii) - # sprite.location.topleft = 114, 0 - # sprites.append(sprite) + for root in "Sword_kool_man/", "Sword_visitor/", "Sword_spoopy/": + swords.append([[], [], [], [], [], []]) + for path in sorted(iglob(join(self.get_resource(root), "*.png"))): + base = load(self.get_resource(path)).convert_alpha() + for position in xrange(6): + if position == NS.N or position == NS.S: + rotated = rotate(base, 270) + elif position == NS.NW: + rotated = rotate(base, 45) + elif position == NS.NE: + rotated = rotate(base, 310) + else: + rotated = base + surface = rotated.copy() + colors = self.get_game().platform.get_color_pair_from_edge(position) + color_a = Color(colors[0].r, colors[0].g, colors[0].b, 255) + color_b = Color(colors[1].r, colors[1].g, colors[1].b, 255) + rect = surface.get_rect() + if position == NS.N or position == NS.S: + surface.fill(color_a, (0, 0, rect.w / 2, rect.h), BLEND_RGBA_MIN) + surface.fill(color_b, (rect.centerx, 0, rect.w / 2, rect.h), BLEND_RGBA_MIN) + else: + surface.fill(color_a, (0, 0, rect.w, rect.h / 2), BLEND_RGBA_MIN) + surface.fill(color_b, (0, rect.centery, rect.w, rect.h / 2), BLEND_RGBA_MIN) + swords[-1][position].append(surface) + masks = self.masks = [] + for alpha in xrange(16, 255, 16): + surface = Surface((300, 300), SRCALPHA) + surface.fill((255, 255, 255, alpha)) + masks.append(surface) self.register(self.brandish, self.lower) def reset(self): self.halt(self.brandish) self.halt(self.lower) self.next_index = 0 - self.sprites = self.swords[self.get_game().boss.level_index] - for sword in self.swords: - for sprite in sword: - sprite.hide() + self.sprites = [] def brandish(self): - sprite = self.sprites[self.next_index] - sprite.sword_position = position = self.parent.unbrandished.pop(0) - self.next_index += 1 - sprite.unhide() + position = self.parent.unbrandished.pop(0) + offset = -self.SHIFT + for ii, queued in enumerate(self.parent.queue): + offset += self.SHIFT * (queued == position) + if len(self.parent.unbrandished) == len(self.parent.queue) - ii - 1: + break dsr = self.get_display_surface().get_rect() + sprite = Sprite(self) + for frame in self.swords[self.parent.level_index][position]: + sprite.add_frame(frame) if position in (NS.W, NS.E): - sprite.set_frameset("vertical") - sprite.location.centery = dsr.centery - 100 + sprite.location.centery = dsr.centery - 100 + offset if position == NS.W: - sprite.location.centerx = dsr.centerx - 100 + sprite.location.centerx = dsr.centerx - 100 - offset else: - sprite.location.centerx = dsr.centerx + 100 + sprite.location.centerx = dsr.centerx + 100 - offset elif position in (NS.N, NS.S): - sprite.set_frameset("horizontal") - sprite.location.centerx = dsr.centerx + sprite.location.centerx = dsr.centerx - offset if position == NS.N: - # sprite.location.centery = dsr.centery - 200 - sprite.location.centery = dsr.centery - 170 + sprite.location.centery = dsr.centery - 170 + offset else: - sprite.location.centery = dsr.centery + sprite.location.centery = dsr.centery + offset else: - if position == NS.NW: - sprite.set_frameset("ldiagonal") - else: - sprite.set_frameset("rdiagonal") - sprite.location.center = dsr.centerx, dsr.centery - 100 - # sprite.set_frameset(position + 1) + sprite.location.center = dsr.centerx - offset, dsr.centery - 100 + self.sprites.append(sprite) self.get_game().sfx["brandish"].play() self.play(self.lower, delay=400, play_once=True) if len(self.parent.unbrandished) > 0: @@ -1541,52 +1558,25 @@ class Sword(Animation): play_once=True) def lower(self): - # self.hide() if len(self.parent.unbrandished) == 0: - self.next_index = 0 self.parent.brandish_complete = True def block(self): - for sprite in self.sprites: - if not sprite.is_hidden(): - sprite.hide() - break + if len(self.sprites): + self.sprites.pop(0) def update(self): Animation.update(self) - display_count = 0 - offset = [self.OFFSET] * 6 - for sprite in self.sprites: - if not sprite.is_hidden(): - display_count += 1 - offset[sprite.sword_position] -= self.OFFSET - display_index = 0 - for sprite in reversed(self.sprites): - if not sprite.is_hidden(): - display_index += 1 - alpha = int(float(display_index) / display_count * 255) - surface = sprite.get_current_frame().copy() - rect = surface.get_rect() - colors = self.get_game().platform.get_color_pair_from_edge(sprite.sword_position) - color_a = colors[0].r, colors[0].g, colors[0].b, alpha - color_b = colors[1].r, colors[1].g, colors[1].b, alpha - # color_a = 255, 255, 255, alpha - # color_b = 255, 255, 255, alpha - if sprite.sword_position == NS.NE: - location = sprite.location.move(*([offset[sprite.sword_position]] * 2)).topleft - else: - location = sprite.location.move(offset[sprite.sword_position], - -offset[sprite.sword_position]) - if sprite.sword_position == NS.N or sprite.sword_position == NS.S: - surface.fill(color_a, (0, 0, rect.w / 2, rect.h), BLEND_RGBA_MIN) - surface.fill(color_b, (rect.centerx, 0, rect.w / 2, rect.h), BLEND_RGBA_MIN) - else: - surface.fill(color_a, (0, 0, rect.w, rect.h / 2), BLEND_RGBA_MIN) - surface.fill(color_b, (0, rect.centery, rect.w, rect.h / 2), BLEND_RGBA_MIN) - surface.fill((255, 255, 255, alpha), None, BLEND_RGBA_MIN) - self.get_display_surface().blit(surface, location) - offset[sprite.sword_position] += self.OFFSET - # sprite.update() + for ii, sprite in enumerate(reversed(self.sprites)): + if ii == len(self.sprites) - 1: + substitute = None + else: + mask = self.masks[int(float(ii + 1) / len(self.sprites) * len(self.masks))] + frame = sprite.get_current_frame() + copy = frame.copy() + copy.blit(mask, (0, 0), None, BLEND_RGBA_MIN) + substitute = copy + sprite.update(substitute=substitute) class Health(GameChild): diff --git a/resource/Kool_man_waah.png b/resource/Kool_man_waah.png index 3608a1a..b1a328f 100644 Binary files a/resource/Kool_man_waah.png and b/resource/Kool_man_waah.png differ diff --git a/resource/Spoopy.png b/resource/Spoopy.png index a4e047c..888ccd5 100644 Binary files a/resource/Spoopy.png and b/resource/Spoopy.png differ diff --git a/resource/Sword_kool_man/00.png b/resource/Sword_kool_man/00.png new file mode 100644 index 0000000..cf0bdeb Binary files /dev/null and b/resource/Sword_kool_man/00.png differ diff --git a/resource/Sword_kool_man/01.png b/resource/Sword_kool_man/01.png new file mode 100644 index 0000000..c6dbaea Binary files /dev/null and b/resource/Sword_kool_man/01.png differ diff --git a/resource/Sword_kool_man/02.png b/resource/Sword_kool_man/02.png new file mode 100644 index 0000000..99d9484 Binary files /dev/null and b/resource/Sword_kool_man/02.png differ diff --git a/resource/Sword_kool_man/03.png b/resource/Sword_kool_man/03.png new file mode 100644 index 0000000..cda3e9c Binary files /dev/null and b/resource/Sword_kool_man/03.png differ diff --git a/resource/Sword_kool_man/04.png b/resource/Sword_kool_man/04.png new file mode 100644 index 0000000..563f405 Binary files /dev/null and b/resource/Sword_kool_man/04.png differ diff --git a/resource/Sword_kool_man/05.png b/resource/Sword_kool_man/05.png new file mode 100644 index 0000000..ce5491d Binary files /dev/null and b/resource/Sword_kool_man/05.png differ diff --git a/resource/Sword_kool_man/06.png b/resource/Sword_kool_man/06.png new file mode 100644 index 0000000..475ecfc Binary files /dev/null and b/resource/Sword_kool_man/06.png differ diff --git a/resource/Sword_kool_man/07.png b/resource/Sword_kool_man/07.png new file mode 100644 index 0000000..7845fdc Binary files /dev/null and b/resource/Sword_kool_man/07.png differ diff --git a/resource/Sword_kool_man/08.png b/resource/Sword_kool_man/08.png new file mode 100644 index 0000000..a6dcf64 Binary files /dev/null and b/resource/Sword_kool_man/08.png differ diff --git a/resource/Sword_kool_man/09.png b/resource/Sword_kool_man/09.png new file mode 100644 index 0000000..3f2d2ea Binary files /dev/null and b/resource/Sword_kool_man/09.png differ diff --git a/resource/Sword_kool_man/10.png b/resource/Sword_kool_man/10.png new file mode 100644 index 0000000..a438de6 Binary files /dev/null and b/resource/Sword_kool_man/10.png differ diff --git a/resource/Sword_kool_man/11.png b/resource/Sword_kool_man/11.png new file mode 100644 index 0000000..152a97d Binary files /dev/null and b/resource/Sword_kool_man/11.png differ diff --git a/resource/Sword_kool_man/12.png b/resource/Sword_kool_man/12.png new file mode 100644 index 0000000..bcc714d Binary files /dev/null and b/resource/Sword_kool_man/12.png differ diff --git a/resource/Sword_kool_man/13.png b/resource/Sword_kool_man/13.png new file mode 100644 index 0000000..c7f34be Binary files /dev/null and b/resource/Sword_kool_man/13.png differ diff --git a/resource/Sword_kool_man/14.png b/resource/Sword_kool_man/14.png new file mode 100644 index 0000000..aebf5d0 Binary files /dev/null and b/resource/Sword_kool_man/14.png differ diff --git a/resource/Sword_kool_man/15.png b/resource/Sword_kool_man/15.png new file mode 100644 index 0000000..2e4b06f Binary files /dev/null and b/resource/Sword_kool_man/15.png differ diff --git a/resource/Sword_kool_man/16.png b/resource/Sword_kool_man/16.png new file mode 100644 index 0000000..d4a47b6 Binary files /dev/null and b/resource/Sword_kool_man/16.png differ diff --git a/resource/Sword_kool_man/17.png b/resource/Sword_kool_man/17.png new file mode 100644 index 0000000..6f2a864 Binary files /dev/null and b/resource/Sword_kool_man/17.png differ diff --git a/resource/Sword_kool_man/18.png b/resource/Sword_kool_man/18.png new file mode 100644 index 0000000..7fc416c Binary files /dev/null and b/resource/Sword_kool_man/18.png differ diff --git a/resource/Sword_kool_man/19.png b/resource/Sword_kool_man/19.png new file mode 100644 index 0000000..9d2e1b7 Binary files /dev/null and b/resource/Sword_kool_man/19.png differ diff --git a/resource/Sword_kool_man/20.png b/resource/Sword_kool_man/20.png new file mode 100644 index 0000000..486eac4 Binary files /dev/null and b/resource/Sword_kool_man/20.png differ diff --git a/resource/Sword_kool_man/21.png b/resource/Sword_kool_man/21.png new file mode 100644 index 0000000..07dff8c Binary files /dev/null and b/resource/Sword_kool_man/21.png differ diff --git a/resource/Sword_kool_man/22.png b/resource/Sword_kool_man/22.png new file mode 100644 index 0000000..0a93f24 Binary files /dev/null and b/resource/Sword_kool_man/22.png differ diff --git a/resource/Sword_kool_man/23.png b/resource/Sword_kool_man/23.png new file mode 100644 index 0000000..3833269 Binary files /dev/null and b/resource/Sword_kool_man/23.png differ diff --git a/resource/Sword_kool_man/24.png b/resource/Sword_kool_man/24.png new file mode 100644 index 0000000..8bbe891 Binary files /dev/null and b/resource/Sword_kool_man/24.png differ diff --git a/resource/Sword_kool_man/25.png b/resource/Sword_kool_man/25.png new file mode 100644 index 0000000..f16e0de Binary files /dev/null and b/resource/Sword_kool_man/25.png differ diff --git a/resource/Sword_kool_man/26.png b/resource/Sword_kool_man/26.png new file mode 100644 index 0000000..eee49aa Binary files /dev/null and b/resource/Sword_kool_man/26.png differ diff --git a/resource/Sword_kool_man/27.png b/resource/Sword_kool_man/27.png new file mode 100644 index 0000000..cd93bce Binary files /dev/null and b/resource/Sword_kool_man/27.png differ diff --git a/resource/Sword_kool_man/28.png b/resource/Sword_kool_man/28.png new file mode 100644 index 0000000..2eb1d32 Binary files /dev/null and b/resource/Sword_kool_man/28.png differ diff --git a/resource/Sword_kool_man/29.png b/resource/Sword_kool_man/29.png new file mode 100644 index 0000000..dd819ab Binary files /dev/null and b/resource/Sword_kool_man/29.png differ diff --git a/resource/Sword_kool_man/30.png b/resource/Sword_kool_man/30.png new file mode 100644 index 0000000..ef91066 Binary files /dev/null and b/resource/Sword_kool_man/30.png differ diff --git a/resource/Sword_kool_man/31.png b/resource/Sword_kool_man/31.png new file mode 100644 index 0000000..5b297ab Binary files /dev/null and b/resource/Sword_kool_man/31.png differ diff --git a/resource/Sword_kool_man/32.png b/resource/Sword_kool_man/32.png new file mode 100644 index 0000000..cf70373 Binary files /dev/null and b/resource/Sword_kool_man/32.png differ diff --git a/resource/Sword_kool_man/33.png b/resource/Sword_kool_man/33.png new file mode 100644 index 0000000..2265cc0 Binary files /dev/null and b/resource/Sword_kool_man/33.png differ diff --git a/resource/Sword_kool_man/34.png b/resource/Sword_kool_man/34.png new file mode 100644 index 0000000..f58e19b Binary files /dev/null and b/resource/Sword_kool_man/34.png differ diff --git a/resource/Sword_spoopy/00.png b/resource/Sword_spoopy/00.png new file mode 100644 index 0000000..8b3ccae Binary files /dev/null and b/resource/Sword_spoopy/00.png differ diff --git a/resource/Sword_spoopy/01.png b/resource/Sword_spoopy/01.png new file mode 100644 index 0000000..78ba6cb Binary files /dev/null and b/resource/Sword_spoopy/01.png differ diff --git a/resource/Sword_spoopy/02.png b/resource/Sword_spoopy/02.png new file mode 100644 index 0000000..7a08635 Binary files /dev/null and b/resource/Sword_spoopy/02.png differ diff --git a/resource/Sword_spoopy/03.png b/resource/Sword_spoopy/03.png new file mode 100644 index 0000000..1055317 Binary files /dev/null and b/resource/Sword_spoopy/03.png differ diff --git a/resource/Sword_spoopy/04.png b/resource/Sword_spoopy/04.png new file mode 100644 index 0000000..5661666 Binary files /dev/null and b/resource/Sword_spoopy/04.png differ diff --git a/resource/Sword_spoopy/05.png b/resource/Sword_spoopy/05.png new file mode 100644 index 0000000..6961a8d Binary files /dev/null and b/resource/Sword_spoopy/05.png differ diff --git a/resource/Sword_spoopy/06.png b/resource/Sword_spoopy/06.png new file mode 100644 index 0000000..1829775 Binary files /dev/null and b/resource/Sword_spoopy/06.png differ diff --git a/resource/Sword_spoopy/07.png b/resource/Sword_spoopy/07.png new file mode 100644 index 0000000..a16c6e9 Binary files /dev/null and b/resource/Sword_spoopy/07.png differ diff --git a/resource/Sword_spoopy/08.png b/resource/Sword_spoopy/08.png new file mode 100644 index 0000000..2ebc9fa Binary files /dev/null and b/resource/Sword_spoopy/08.png differ diff --git a/resource/Sword_spoopy/09.png b/resource/Sword_spoopy/09.png new file mode 100644 index 0000000..401c217 Binary files /dev/null and b/resource/Sword_spoopy/09.png differ diff --git a/resource/Sword_spoopy/10.png b/resource/Sword_spoopy/10.png new file mode 100644 index 0000000..d202908 Binary files /dev/null and b/resource/Sword_spoopy/10.png differ diff --git a/resource/Sword_spoopy/11.png b/resource/Sword_spoopy/11.png new file mode 100644 index 0000000..a84564b Binary files /dev/null and b/resource/Sword_spoopy/11.png differ diff --git a/resource/Sword_spoopy/12.png b/resource/Sword_spoopy/12.png new file mode 100644 index 0000000..7723a26 Binary files /dev/null and b/resource/Sword_spoopy/12.png differ diff --git a/resource/Sword_spoopy/13.png b/resource/Sword_spoopy/13.png new file mode 100644 index 0000000..55b52bf Binary files /dev/null and b/resource/Sword_spoopy/13.png differ diff --git a/resource/Sword_spoopy/14.png b/resource/Sword_spoopy/14.png new file mode 100644 index 0000000..4505aec Binary files /dev/null and b/resource/Sword_spoopy/14.png differ diff --git a/resource/Sword_spoopy/15.png b/resource/Sword_spoopy/15.png new file mode 100644 index 0000000..3f05dc7 Binary files /dev/null and b/resource/Sword_spoopy/15.png differ diff --git a/resource/Sword_spoopy/16.png b/resource/Sword_spoopy/16.png new file mode 100644 index 0000000..0145684 Binary files /dev/null and b/resource/Sword_spoopy/16.png differ diff --git a/resource/Sword_spoopy/17.png b/resource/Sword_spoopy/17.png new file mode 100644 index 0000000..f12aef1 Binary files /dev/null and b/resource/Sword_spoopy/17.png differ diff --git a/resource/Sword_spoopy/18.png b/resource/Sword_spoopy/18.png new file mode 100644 index 0000000..dc3056f Binary files /dev/null and b/resource/Sword_spoopy/18.png differ diff --git a/resource/Sword_spoopy/19.png b/resource/Sword_spoopy/19.png new file mode 100644 index 0000000..e522526 Binary files /dev/null and b/resource/Sword_spoopy/19.png differ diff --git a/resource/Sword_spoopy/20.png b/resource/Sword_spoopy/20.png new file mode 100644 index 0000000..215e119 Binary files /dev/null and b/resource/Sword_spoopy/20.png differ diff --git a/resource/Sword_spoopy/21.png b/resource/Sword_spoopy/21.png new file mode 100644 index 0000000..f97f15b Binary files /dev/null and b/resource/Sword_spoopy/21.png differ diff --git a/resource/Sword_spoopy/22.png b/resource/Sword_spoopy/22.png new file mode 100644 index 0000000..831517f Binary files /dev/null and b/resource/Sword_spoopy/22.png differ diff --git a/resource/Sword_spoopy/23.png b/resource/Sword_spoopy/23.png new file mode 100644 index 0000000..f4163be Binary files /dev/null and b/resource/Sword_spoopy/23.png differ diff --git a/resource/Sword_spoopy/24.png b/resource/Sword_spoopy/24.png new file mode 100644 index 0000000..49775a4 Binary files /dev/null and b/resource/Sword_spoopy/24.png differ diff --git a/resource/Sword_spoopy/25.png b/resource/Sword_spoopy/25.png new file mode 100644 index 0000000..965a62c Binary files /dev/null and b/resource/Sword_spoopy/25.png differ diff --git a/resource/Sword_spoopy/26.png b/resource/Sword_spoopy/26.png new file mode 100644 index 0000000..abeefe5 Binary files /dev/null and b/resource/Sword_spoopy/26.png differ diff --git a/resource/Sword_spoopy/27.png b/resource/Sword_spoopy/27.png new file mode 100644 index 0000000..fbe1e7a Binary files /dev/null and b/resource/Sword_spoopy/27.png differ diff --git a/resource/Sword_spoopy/28.png b/resource/Sword_spoopy/28.png new file mode 100644 index 0000000..f0330a3 Binary files /dev/null and b/resource/Sword_spoopy/28.png differ diff --git a/resource/Sword_spoopy/29.png b/resource/Sword_spoopy/29.png new file mode 100644 index 0000000..3f3a240 Binary files /dev/null and b/resource/Sword_spoopy/29.png differ diff --git a/resource/Sword_spoopy/30.png b/resource/Sword_spoopy/30.png new file mode 100644 index 0000000..fc0f6f4 Binary files /dev/null and b/resource/Sword_spoopy/30.png differ diff --git a/resource/Sword_spoopy/31.png b/resource/Sword_spoopy/31.png new file mode 100644 index 0000000..067bf91 Binary files /dev/null and b/resource/Sword_spoopy/31.png differ diff --git a/resource/Sword_spoopy/32.png b/resource/Sword_spoopy/32.png new file mode 100644 index 0000000..22af272 Binary files /dev/null and b/resource/Sword_spoopy/32.png differ diff --git a/resource/Sword_spoopy/33.png b/resource/Sword_spoopy/33.png new file mode 100644 index 0000000..ccdbe6a Binary files /dev/null and b/resource/Sword_spoopy/33.png differ diff --git a/resource/Sword_spoopy/34.png b/resource/Sword_spoopy/34.png new file mode 100644 index 0000000..364439e Binary files /dev/null and b/resource/Sword_spoopy/34.png differ diff --git a/resource/Sword_visitor/00.png b/resource/Sword_visitor/00.png new file mode 100644 index 0000000..38bfdf0 Binary files /dev/null and b/resource/Sword_visitor/00.png differ diff --git a/resource/Sword_visitor/01.png b/resource/Sword_visitor/01.png new file mode 100644 index 0000000..8f8537e Binary files /dev/null and b/resource/Sword_visitor/01.png differ diff --git a/resource/Sword_visitor/02.png b/resource/Sword_visitor/02.png new file mode 100644 index 0000000..a1e00e0 Binary files /dev/null and b/resource/Sword_visitor/02.png differ diff --git a/resource/Sword_visitor/03.png b/resource/Sword_visitor/03.png new file mode 100644 index 0000000..e32cf38 Binary files /dev/null and b/resource/Sword_visitor/03.png differ diff --git a/resource/Sword_visitor/04.png b/resource/Sword_visitor/04.png new file mode 100644 index 0000000..a25256e Binary files /dev/null and b/resource/Sword_visitor/04.png differ diff --git a/resource/Sword_visitor/05.png b/resource/Sword_visitor/05.png new file mode 100644 index 0000000..05ebc03 Binary files /dev/null and b/resource/Sword_visitor/05.png differ diff --git a/resource/Sword_visitor/06.png b/resource/Sword_visitor/06.png new file mode 100644 index 0000000..6a47c1a Binary files /dev/null and b/resource/Sword_visitor/06.png differ diff --git a/resource/Sword_visitor/07.png b/resource/Sword_visitor/07.png new file mode 100644 index 0000000..cb1f740 Binary files /dev/null and b/resource/Sword_visitor/07.png differ diff --git a/resource/Sword_visitor/08.png b/resource/Sword_visitor/08.png new file mode 100644 index 0000000..a01acd5 Binary files /dev/null and b/resource/Sword_visitor/08.png differ diff --git a/resource/Sword_visitor/09.png b/resource/Sword_visitor/09.png new file mode 100644 index 0000000..a6cdce6 Binary files /dev/null and b/resource/Sword_visitor/09.png differ diff --git a/resource/Sword_visitor/10.png b/resource/Sword_visitor/10.png new file mode 100644 index 0000000..0fb0de0 Binary files /dev/null and b/resource/Sword_visitor/10.png differ diff --git a/resource/Sword_visitor/11.png b/resource/Sword_visitor/11.png new file mode 100644 index 0000000..7f38685 Binary files /dev/null and b/resource/Sword_visitor/11.png differ diff --git a/resource/Sword_visitor/12.png b/resource/Sword_visitor/12.png new file mode 100644 index 0000000..37f1e28 Binary files /dev/null and b/resource/Sword_visitor/12.png differ diff --git a/resource/Sword_visitor/13.png b/resource/Sword_visitor/13.png new file mode 100644 index 0000000..2049950 Binary files /dev/null and b/resource/Sword_visitor/13.png differ diff --git a/resource/Sword_visitor/14.png b/resource/Sword_visitor/14.png new file mode 100644 index 0000000..a0ffde5 Binary files /dev/null and b/resource/Sword_visitor/14.png differ diff --git a/resource/Sword_visitor/15.png b/resource/Sword_visitor/15.png new file mode 100644 index 0000000..76cefdb Binary files /dev/null and b/resource/Sword_visitor/15.png differ diff --git a/resource/Sword_visitor/16.png b/resource/Sword_visitor/16.png new file mode 100644 index 0000000..6c8f92b Binary files /dev/null and b/resource/Sword_visitor/16.png differ diff --git a/resource/Sword_visitor/17.png b/resource/Sword_visitor/17.png new file mode 100644 index 0000000..d6e9e1d Binary files /dev/null and b/resource/Sword_visitor/17.png differ diff --git a/resource/Sword_visitor/18.png b/resource/Sword_visitor/18.png new file mode 100644 index 0000000..947c63a Binary files /dev/null and b/resource/Sword_visitor/18.png differ diff --git a/resource/Sword_visitor/19.png b/resource/Sword_visitor/19.png new file mode 100644 index 0000000..e1a0e4b Binary files /dev/null and b/resource/Sword_visitor/19.png differ diff --git a/resource/Sword_visitor/20.png b/resource/Sword_visitor/20.png new file mode 100644 index 0000000..c7b2034 Binary files /dev/null and b/resource/Sword_visitor/20.png differ diff --git a/resource/Sword_visitor/21.png b/resource/Sword_visitor/21.png new file mode 100644 index 0000000..58313d3 Binary files /dev/null and b/resource/Sword_visitor/21.png differ diff --git a/resource/Sword_visitor/22.png b/resource/Sword_visitor/22.png new file mode 100644 index 0000000..f16d063 Binary files /dev/null and b/resource/Sword_visitor/22.png differ diff --git a/resource/Sword_visitor/23.png b/resource/Sword_visitor/23.png new file mode 100644 index 0000000..1682d74 Binary files /dev/null and b/resource/Sword_visitor/23.png differ diff --git a/resource/Sword_visitor/24.png b/resource/Sword_visitor/24.png new file mode 100644 index 0000000..0726084 Binary files /dev/null and b/resource/Sword_visitor/24.png differ diff --git a/resource/Sword_visitor/25.png b/resource/Sword_visitor/25.png new file mode 100644 index 0000000..abd0283 Binary files /dev/null and b/resource/Sword_visitor/25.png differ diff --git a/resource/Sword_visitor/26.png b/resource/Sword_visitor/26.png new file mode 100644 index 0000000..b44423b Binary files /dev/null and b/resource/Sword_visitor/26.png differ diff --git a/resource/Sword_visitor/27.png b/resource/Sword_visitor/27.png new file mode 100644 index 0000000..b2e4b65 Binary files /dev/null and b/resource/Sword_visitor/27.png differ diff --git a/resource/Sword_visitor/28.png b/resource/Sword_visitor/28.png new file mode 100644 index 0000000..6fba97c Binary files /dev/null and b/resource/Sword_visitor/28.png differ diff --git a/resource/Sword_visitor/29.png b/resource/Sword_visitor/29.png new file mode 100644 index 0000000..fb99fc8 Binary files /dev/null and b/resource/Sword_visitor/29.png differ diff --git a/resource/Sword_visitor/30.png b/resource/Sword_visitor/30.png new file mode 100644 index 0000000..f6e29c8 Binary files /dev/null and b/resource/Sword_visitor/30.png differ diff --git a/resource/Sword_visitor/31.png b/resource/Sword_visitor/31.png new file mode 100644 index 0000000..a9f7e6a Binary files /dev/null and b/resource/Sword_visitor/31.png differ diff --git a/resource/Sword_visitor/32.png b/resource/Sword_visitor/32.png new file mode 100644 index 0000000..0605a24 Binary files /dev/null and b/resource/Sword_visitor/32.png differ diff --git a/resource/Sword_visitor/33.png b/resource/Sword_visitor/33.png new file mode 100644 index 0000000..6f6277b Binary files /dev/null and b/resource/Sword_visitor/33.png differ diff --git a/resource/Sword_visitor/34.png b/resource/Sword_visitor/34.png new file mode 100644 index 0000000..00e20ec Binary files /dev/null and b/resource/Sword_visitor/34.png differ diff --git a/resource/Visitor.png b/resource/Visitor.png index b55ef82..2ce93bd 100644 Binary files a/resource/Visitor.png and b/resource/Visitor.png differ diff --git a/resource/bg/bg001.png b/resource/bg/bg001.png new file mode 100644 index 0000000..fdcaaa2 Binary files /dev/null and b/resource/bg/bg001.png differ diff --git a/resource/bg/bg002.png b/resource/bg/bg002.png new file mode 100644 index 0000000..261b18b Binary files /dev/null and b/resource/bg/bg002.png differ diff --git a/resource/bg/bg003.png b/resource/bg/bg003.png new file mode 100644 index 0000000..5082170 Binary files /dev/null and b/resource/bg/bg003.png differ diff --git a/resource/scores b/resource/scores index c281cda..e2ae970 100644 --- a/resource/scores +++ b/resource/scores @@ -10,3 +10,7 @@ 5999999 293967 283074 +333829 +185016 +162629 +209208