No OneTemporary
Actions

Size

65 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/data/gfx/Credits.jpg b/data/gfx/Credits.jpg
	new file mode 100644
	index 0000000..002fb3d
	Binary files /dev/null and b/data/gfx/Credits.jpg differ
	diff --git a/data/gfx/Doodads.png b/data/gfx/Doodads.png
	index 0e7e22f..b7d0db1 100644
	Binary files a/data/gfx/Doodads.png and b/data/gfx/Doodads.png differ
	diff --git a/data/gfx/FighterStats.jpg b/data/gfx/FighterStats.jpg
	new file mode 100644
	index 0000000..5585c20
	Binary files /dev/null and b/data/gfx/FighterStats.jpg differ
	diff --git a/data/gfx/Foot.jpg b/data/gfx/Foot.jpg
	new file mode 100644
	index 0000000..cb45306
	Binary files /dev/null and b/data/gfx/Foot.jpg differ
	diff --git a/data/gfx/Foot.mask.png b/data/gfx/Foot.mask.png
	new file mode 100644
	index 0000000..a33b2a6
	Binary files /dev/null and b/data/gfx/Foot.mask.png differ
	diff --git a/data/gfx/GameOver.jpg b/data/gfx/GameOver.jpg
	new file mode 100644
	index 0000000..77a04db
	Binary files /dev/null and b/data/gfx/GameOver.jpg differ
	diff --git a/data/gfx/Makefile.am b/data/gfx/Makefile.am
	index 9de9202..5925bf8 100644
	--- a/data/gfx/Makefile.am
	+++ b/data/gfx/Makefile.am
	@@ -1,15 +1,24 @@
	-## Process this file with automake to produce Makefile.in
	-
	-gfxdatadir = $(pkgdatadir)/gfx
	-gfxdata_DATA = \
	-Credits.png level10_hill.png level4.desc level7_cumi.png level8.png \
	-Doodads.png level10_sky.png level4_earth.png level7.desc level9.png \
	-FighterStats.png level1.png level4_ground.png level7_ground1.png Makefile.am \
	-Foot.png level2.png level4_moon.png level7_ground2.png Makefile.in \
	-GameOver.png level3_city.png level4_nebula.png level7_ground3.png Mortal.png \
	-icon.bmp level3.desc level4_rock.png level7_ground4.png PlayerSelect_chat.png \
	-icon.png level3_ground.png level4_saturn.png level7_logo.png PlayerSelect.png \
	-level10.desc level3_moon.png level5.png level7_sky.png Story1.png
	-
	-
	-EXTRA_DIST = $(gfxdata_DATA)
	+## Process this file with automake to produce Makefile.in
	+
	+gfxdatadir = $(pkgdatadir)/gfx
	+gfxdata_DATA = \
	+Credits.jpg level3_ground.png level7_cumi.png \
	+Doodads.png level3_moon.png level7.desc \
	+FighterStats.jpg level3_sky.png level7_ground1.png \
	+Foot.jpg level4.desc level7_ground2.png \
	+Foot.mask.png level4_earth.jpg level7_ground3.png \
	+GameOver.jpg level4_earth.mask.png level7_ground4.png \
	+icon.bmp level4_ground.jpg level7_logo.png \
	+icon.png level4_ground.mask.png level7_sky.png \
	+level10.desc level4_moon.jpg level7_upi.png \
	+level10_ground.png level4_moon.mask.png level8.jpg \
	+level10_hill.png level4_nebula.jpg level9.jpg \
	+level10_sky.png level4_rock.jpg Mortal-en.jpg \
	+level11.jpg level4_rock.mask.png Mortal.jpg \
	+level1.jpg level4_saturn.jpg Story1.jpg \
	+level2.jpg level4_saturn.mask.png Story2.jpg \
	+level3_city.png level5.jpg eu.jpg\
	+level3.desc level6.jpg
	+
	+
	+EXTRA_DIST = $(gfxdata_DATA)
	diff --git a/data/gfx/Makefile.in b/data/gfx/Makefile.in
	index e8299eb..71da4bf 100644
	--- a/data/gfx/Makefile.in
	+++ b/data/gfx/Makefile.in
	@@ -1,214 +1,213 @@
	-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
	-
	-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
	-# This Makefile.in is free software; the Free Software Foundation
	-# gives unlimited permission to copy and/or distribute it,
	-# with or without modifications, as long as this notice is preserved.
	-
	-# This program is distributed in the hope that it will be useful,
	-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
	-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
	-# PARTICULAR PURPOSE.
	-
	-
	-SHELL = @SHELL@
	-
	-srcdir = @srcdir@
	-top_srcdir = @top_srcdir@
	-VPATH = @srcdir@
	-prefix = @prefix@
	-exec_prefix = @exec_prefix@
	-
	-bindir = @bindir@
	-sbindir = @sbindir@
	-libexecdir = @libexecdir@
	-datadir = @datadir@
	-sysconfdir = @sysconfdir@
	-sharedstatedir = @sharedstatedir@
	-localstatedir = @localstatedir@
	-libdir = @libdir@
	-infodir = @infodir@
	-mandir = @mandir@
	-includedir = @includedir@
	-oldincludedir = /usr/include
	-
	-DESTDIR =
	-
	-pkgdatadir = $(datadir)/@PACKAGE@
	-pkglibdir = $(libdir)/@PACKAGE@
	-pkgincludedir = $(includedir)/@PACKAGE@
	-
	-top_builddir = ../..
	-
	-ACLOCAL = @ACLOCAL@
	-AUTOCONF = @AUTOCONF@
	-AUTOMAKE = @AUTOMAKE@
	-AUTOHEADER = @AUTOHEADER@
	-
	-INSTALL = @INSTALL@
	-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
	-INSTALL_DATA = @INSTALL_DATA@
	-INSTALL_SCRIPT = @INSTALL_SCRIPT@
	-transform = @program_transform_name@
	-
	-NORMAL_INSTALL = :
	-PRE_INSTALL = :
	-POST_INSTALL = :
	-NORMAL_UNINSTALL = :
	-PRE_UNINSTALL = :
	-POST_UNINSTALL = :
	-build_alias = @build_alias@
	-build_triplet = @build@
	-host_alias = @host_alias@
	-host_triplet = @host@
	-target_alias = @target_alias@
	-target_triplet = @target@
	-AUTODIRS = @AUTODIRS@
	-CXX = @CXX@
	-FT2_CFLAGS = @FT2_CFLAGS@
	-FT2_CONFIG = @FT2_CONFIG@
	-FT2_LIBS = @FT2_LIBS@
	-MAKEINFO = @MAKEINFO@
	-PACKAGE = @PACKAGE@
	-PERL = @PERL@
	-SDL_CFLAGS = @SDL_CFLAGS@
	-SDL_CONFIG = @SDL_CONFIG@
	-SDL_LIBS = @SDL_LIBS@
	-VERSION = @VERSION@
	-perl_embed_ccflags = @perl_embed_ccflags@
	-perl_embed_ldflags = @perl_embed_ldflags@
	-
	-gfxdatadir = $(pkgdatadir)/gfx
	-gfxdata_DATA = Credits.png icon.png level1.png level3_sky.png level4_rock.png Doodads.png level2.png level4.desc level4_saturn.png Mortal.png FighterStats.png level3_city.png level4_earth.png level5.png PlayerSelect.png Foot.png level3.desc level4_ground.png level6.png Story1.png GameOver.png level3_ground.png level4_moon.png Story2.png icon.bmp level3_moon.png level4_nebula.png PlayerSelect_chat.png level7_cumi.png level7_ground1.png level7_ground3.png level7_logo.png level7_upi.png level7.desc level7_ground2.png level7_ground4.png level7_sky.png level8.png
	-
	-
	-EXTRA_DIST = $(gfxdata_DATA)
	-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
	-CONFIG_HEADER = ../../config.h
	-CONFIG_CLEAN_FILES =
	-DATA = $(gfxdata_DATA)
	-
	-DIST_COMMON = Makefile.am Makefile.in
	-
	-
	-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
	-
	-TAR = gtar
	-GZIP_ENV = --best
	-all: all-redirect
	-.SUFFIXES:
	-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
	- cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gfx/Makefile
	-
	-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
	- cd $(top_builddir) \
	- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
	-
	-
	-install-gfxdataDATA: $(gfxdata_DATA)
	- @$(NORMAL_INSTALL)
	- $(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
	- @list='$(gfxdata_DATA)'; for p in $$list; do \
	- if test -f $(srcdir)/$$p; then \
	- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p"; \
	- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p; \
	- else if test -f $$p; then \
	- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p"; \
	- $(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p; \
	- fi; fi; \
	- done
	-
	-uninstall-gfxdataDATA:
	- @$(NORMAL_UNINSTALL)
	- list='$(gfxdata_DATA)'; for p in $$list; do \
	- rm -f $(DESTDIR)$(gfxdatadir)/$$p; \
	- done
	-tags: TAGS
	-TAGS:
	-
	-
	-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
	-
	-subdir = data/gfx
	-
	-distdir: $(DISTFILES)
	- here=`cd $(top_builddir) && pwd`; \
	- top_distdir=`cd $(top_distdir) && pwd`; \
	- distdir=`cd $(distdir) && pwd`; \
	- cd $(top_srcdir) \
	- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/gfx/Makefile
	- @for file in $(DISTFILES); do \
	- d=$(srcdir); \
	- if test -d $$d/$$file; then \
	- cp -pr $$d/$$file $(distdir)/$$file; \
	- else \
	- test -f $(distdir)/$$file \
	- \|\| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	- \|\| cp -p $$d/$$file $(distdir)/$$file \|\| :; \
	- fi; \
	- done
	-info-am:
	-info: info-am
	-dvi-am:
	-dvi: dvi-am
	-check-am: all-am
	-check: check-am
	-installcheck-am:
	-installcheck: installcheck-am
	-install-exec-am:
	-install-exec: install-exec-am
	-
	-install-data-am: install-gfxdataDATA
	-install-data: install-data-am
	-
	-install-am: all-am
	- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
	-install: install-am
	-uninstall-am: uninstall-gfxdataDATA
	-uninstall: uninstall-am
	-all-am: Makefile $(DATA)
	-all-redirect: all-am
	-install-strip:
	- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
	-installdirs:
	- $(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
	-
	-
	-mostlyclean-generic:
	-
	-clean-generic:
	-
	-distclean-generic:
	- -rm -f Makefile $(CONFIG_CLEAN_FILES)
	- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
	-
	-maintainer-clean-generic:
	-mostlyclean-am: mostlyclean-generic
	-
	-mostlyclean: mostlyclean-am
	-
	-clean-am: clean-generic mostlyclean-am
	-
	-clean: clean-am
	-
	-distclean-am: distclean-generic clean-am
	-
	-distclean: distclean-am
	-
	-maintainer-clean-am: maintainer-clean-generic distclean-am
	- @echo "This command is intended for maintainers to use;"
	- @echo "it deletes files that may require special tools to rebuild."
	-
	-maintainer-clean: maintainer-clean-am
	-
	-.PHONY: uninstall-gfxdataDATA install-gfxdataDATA tags distdir info-am \
	-info dvi-am dvi check check-am installcheck-am installcheck \
	-install-exec-am install-exec install-data-am install-data install-am \
	-install uninstall-am uninstall all-redirect all-am all installdirs \
	-mostlyclean-generic distclean-generic clean-generic \
	-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
	-
	-
	-# Tell versions [3.59,3.63) of GNU make to not export all variables.
	-# Otherwise a system limit (for SysV at least) may be exceeded.
	-.NOEXPORT:
	+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
	+
	+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
	+# This Makefile.in is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
	+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
	+# PARTICULAR PURPOSE.
	+
	+
	+SHELL = @SHELL@
	+
	+srcdir = @srcdir@
	+top_srcdir = @top_srcdir@
	+VPATH = @srcdir@
	+prefix = @prefix@
	+exec_prefix = @exec_prefix@
	+
	+bindir = @bindir@
	+sbindir = @sbindir@
	+libexecdir = @libexecdir@
	+datadir = @datadir@
	+sysconfdir = @sysconfdir@
	+sharedstatedir = @sharedstatedir@
	+localstatedir = @localstatedir@
	+libdir = @libdir@
	+infodir = @infodir@
	+mandir = @mandir@
	+includedir = @includedir@
	+oldincludedir = /usr/include
	+
	+DESTDIR =
	+
	+pkgdatadir = $(datadir)/@PACKAGE@
	+pkglibdir = $(libdir)/@PACKAGE@
	+pkgincludedir = $(includedir)/@PACKAGE@
	+
	+top_builddir = ../..
	+
	+ACLOCAL = @ACLOCAL@
	+AUTOCONF = @AUTOCONF@
	+AUTOMAKE = @AUTOMAKE@
	+AUTOHEADER = @AUTOHEADER@
	+
	+INSTALL = @INSTALL@
	+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
	+INSTALL_DATA = @INSTALL_DATA@
	+INSTALL_SCRIPT = @INSTALL_SCRIPT@
	+transform = @program_transform_name@
	+
	+NORMAL_INSTALL = :
	+PRE_INSTALL = :
	+POST_INSTALL = :
	+NORMAL_UNINSTALL = :
	+PRE_UNINSTALL = :
	+POST_UNINSTALL = :
	+build_alias = @build_alias@
	+build_triplet = @build@
	+host_alias = @host_alias@
	+host_triplet = @host@
	+target_alias = @target_alias@
	+target_triplet = @target@
	+AUTODIRS = @AUTODIRS@
	+CC = @CC@
	+CXX = @CXX@
	+FT2_CFLAGS = @FT2_CFLAGS@
	+FT2_CONFIG = @FT2_CONFIG@
	+FT2_LIBS = @FT2_LIBS@
	+HAVE_LIB = @HAVE_LIB@
	+LIB = @LIB@
	+LTLIB = @LTLIB@
	+MAKEINFO = @MAKEINFO@
	+PACKAGE = @PACKAGE@
	+PERL = @PERL@
	+SDL_CFLAGS = @SDL_CFLAGS@
	+SDL_CONFIG = @SDL_CONFIG@
	+SDL_LIBS = @SDL_LIBS@
	+VERSION = @VERSION@
	+perl_embed_ccflags = @perl_embed_ccflags@
	+perl_embed_ldflags = @perl_embed_ldflags@
	+
	+gfxdatadir = $(pkgdatadir)/gfx
	+gfxdata_DATA = Credits.jpg level3_ground.png level7_cumi.png Doodads.png level3_moon.png level7.desc FighterStats.jpg level3_sky.png level7_ground1.png Foot.jpg level4.desc level7_ground2.png Foot.mask.png level4_earth.jpg level7_ground3.png GameOver.jpg level4_earth.mask.png level7_ground4.png icon.bmp level4_ground.jpg level7_logo.png icon.png level4_ground.mask.png level7_sky.png level10.desc level4_moon.jpg level7_upi.png level10_ground.png level4_moon.mask.png level8.jpg level10_hill.png level4_nebula.jpg level9.jpg level10_sky.png level4_rock.jpg Mortal-en.jpg level11.jpg level4_rock.mask.png Mortal.jpg level1.jpg level4_saturn.jpg Story1.jpg level2.jpg level4_saturn.mask.png Story2.jpg level3_city.png level5.jpg eu.jpg level3.desc level6.jpg
	+
	+
	+EXTRA_DIST = $(gfxdata_DATA)
	+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
	+CONFIG_HEADER = ../../config.h
	+CONFIG_CLEAN_FILES =
	+DATA = $(gfxdata_DATA)
	+
	+DIST_COMMON = Makefile.am Makefile.in
	+
	+
	+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
	+
	+TAR = gtar
	+GZIP_ENV = --best
	+all: all-redirect
	+.SUFFIXES:
	+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
	+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/gfx/Makefile
	+
	+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	+ cd $(top_builddir) \
	+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
	+
	+
	+install-gfxdataDATA: $(gfxdata_DATA)
	+ @$(NORMAL_INSTALL)
	+ $(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
	+ @list='$(gfxdata_DATA)'; for p in $$list; do \
	+ if test -f $(srcdir)/$$p; then \
	+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p"; \
	+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p; \
	+ else if test -f $$p; then \
	+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p"; \
	+ $(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p; \
	+ fi; fi; \
	+ done
	+
	+uninstall-gfxdataDATA:
	+ @$(NORMAL_UNINSTALL)
	+ list='$(gfxdata_DATA)'; for p in $$list; do \
	+ rm -f $(DESTDIR)$(gfxdatadir)/$$p; \
	+ done
	+tags: TAGS
	+TAGS:
	+
	+
	+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
	+
	+subdir = data/gfx
	+
	+distdir: $(DISTFILES)
	+ @for file in $(DISTFILES); do \
	+ d=$(srcdir); \
	+ if test -d $$d/$$file; then \
	+ cp -pr $$d/$$file $(distdir)/$$file; \
	+ else \
	+ test -f $(distdir)/$$file \
	+ \|\| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	+ \|\| cp -p $$d/$$file $(distdir)/$$file \|\| :; \
	+ fi; \
	+ done
	+info-am:
	+info: info-am
	+dvi-am:
	+dvi: dvi-am
	+check-am: all-am
	+check: check-am
	+installcheck-am:
	+installcheck: installcheck-am
	+install-exec-am:
	+install-exec: install-exec-am
	+
	+install-data-am: install-gfxdataDATA
	+install-data: install-data-am
	+
	+install-am: all-am
	+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
	+install: install-am
	+uninstall-am: uninstall-gfxdataDATA
	+uninstall: uninstall-am
	+all-am: Makefile $(DATA)
	+all-redirect: all-am
	+install-strip:
	+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
	+installdirs:
	+ $(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
	+
	+
	+mostlyclean-generic:
	+
	+clean-generic:
	+
	+distclean-generic:
	+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
	+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
	+
	+maintainer-clean-generic:
	+mostlyclean-am: mostlyclean-generic
	+
	+mostlyclean: mostlyclean-am
	+
	+clean-am: clean-generic mostlyclean-am
	+
	+clean: clean-am
	+
	+distclean-am: distclean-generic clean-am
	+
	+distclean: distclean-am
	+
	+maintainer-clean-am: maintainer-clean-generic distclean-am
	+ @echo "This command is intended for maintainers to use;"
	+ @echo "it deletes files that may require special tools to rebuild."
	+
	+maintainer-clean: maintainer-clean-am
	+
	+.PHONY: uninstall-gfxdataDATA install-gfxdataDATA tags distdir info-am \
	+info dvi-am dvi check check-am installcheck-am installcheck \
	+install-exec-am install-exec install-data-am install-data install-am \
	+install uninstall-am uninstall all-redirect all-am all installdirs \
	+mostlyclean-generic distclean-generic clean-generic \
	+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
	+
	+
	+# Tell versions [3.59,3.63) of GNU make to not export all variables.
	+# Otherwise a system limit (for SysV at least) may be exceeded.
	+.NOEXPORT:
	diff --git a/data/gfx/Mortal-en.jpg b/data/gfx/Mortal-en.jpg
	new file mode 100644
	index 0000000..b9f9dbf
	Binary files /dev/null and b/data/gfx/Mortal-en.jpg differ
	diff --git a/data/gfx/Mortal.jpg b/data/gfx/Mortal.jpg
	new file mode 100644
	index 0000000..88d788b
	Binary files /dev/null and b/data/gfx/Mortal.jpg differ
	diff --git a/data/gfx/Story1.jpg b/data/gfx/Story1.jpg
	new file mode 100644
	index 0000000..4720f8f
	Binary files /dev/null and b/data/gfx/Story1.jpg differ
	diff --git a/data/gfx/Story2.jpg b/data/gfx/Story2.jpg
	new file mode 100644
	index 0000000..4d240e9
	Binary files /dev/null and b/data/gfx/Story2.jpg differ
	diff --git a/data/gfx/eu.jpg b/data/gfx/eu.jpg
	new file mode 100644
	index 0000000..110b42f
	Binary files /dev/null and b/data/gfx/eu.jpg differ
	diff --git a/data/gfx/level1.jpg b/data/gfx/level1.jpg
	new file mode 100644
	index 0000000..02f2011
	Binary files /dev/null and b/data/gfx/level1.jpg differ
	diff --git a/data/gfx/level10.desc b/data/gfx/level10.desc
	new file mode 100644
	index 0000000..75886c8
	--- /dev/null
	+++ b/data/gfx/level10.desc
	@@ -0,0 +1,7 @@
	+8
	+level10_sky.png
	+0 0 0.2
	+level10_hill.png
	+0 5 0.42
	+level10_ground.png
	+0 30 1.0
	diff --git a/data/gfx/level10_ground.png b/data/gfx/level10_ground.png
	new file mode 100644
	index 0000000..369669b
	Binary files /dev/null and b/data/gfx/level10_ground.png differ
	diff --git a/data/gfx/level10_hill.png b/data/gfx/level10_hill.png
	new file mode 100644
	index 0000000..66767cb
	Binary files /dev/null and b/data/gfx/level10_hill.png differ
	diff --git a/data/gfx/level10_sky.png b/data/gfx/level10_sky.png
	new file mode 100644
	index 0000000..8d9c3a0
	Binary files /dev/null and b/data/gfx/level10_sky.png differ
	diff --git a/data/gfx/level11.jpg b/data/gfx/level11.jpg
	new file mode 100644
	index 0000000..2185e13
	Binary files /dev/null and b/data/gfx/level11.jpg differ
	diff --git a/data/gfx/level2.jpg b/data/gfx/level2.jpg
	new file mode 100644
	index 0000000..a991026
	Binary files /dev/null and b/data/gfx/level2.jpg differ
	diff --git a/data/gfx/level3.desc b/data/gfx/level3.desc
	index 2a17f1b..4e6cc30 100644
	--- a/data/gfx/level3.desc
	+++ b/data/gfx/level3.desc
	@@ -1,9 +1,9 @@
	-4
	-level3_sky.png
	-0 0 0.068
	-level3_moon.png
	-330 5 0.2
	-level3_city.png
	-0 39 0.31
	-level3_ground.png
	-0 365 1.0
	+4
	+level3_sky.png
	+0 0 0.068
	+level3_moon.png
	+330 5 0.2
	+level3_city.png
	+0 39 0.31
	+level3_ground.png
	+0 365 1.0
	diff --git a/data/gfx/level4.desc b/data/gfx/level4.desc
	index 8a3d20b..c73da3b 100644
	--- a/data/gfx/level4.desc
	+++ b/data/gfx/level4.desc
	@@ -1,13 +1,13 @@
	-6
	-level4_nebula.png
	-0 0 0.25
	-level4_saturn.png
	-700 0 0.6
	-level4_earth.png
	-500 38 0.8
	-level4_moon.png
	-530 50 0.7
	-level4_rock.png
	-1279 143 1.0
	-level4_ground.png
	-0 345 1.0
	+6
	+level4_nebula.jpg
	+0 0 0.25
	+level4_saturn.jpg
	+700 0 0.6
	+level4_earth.jpg
	+500 38 0.8
	+level4_moon.jpg
	+530 50 0.7
	+level4_rock.jpg
	+1279 143 1.0
	+level4_ground.jpg
	+0 345 1.0
	diff --git a/data/gfx/level4_earth.jpg b/data/gfx/level4_earth.jpg
	new file mode 100644
	index 0000000..6fa07e7
	Binary files /dev/null and b/data/gfx/level4_earth.jpg differ
	diff --git a/data/gfx/level4_earth.mask.png b/data/gfx/level4_earth.mask.png
	new file mode 100644
	index 0000000..b974cd4
	Binary files /dev/null and b/data/gfx/level4_earth.mask.png differ
	diff --git a/data/gfx/level4_ground.jpg b/data/gfx/level4_ground.jpg
	new file mode 100644
	index 0000000..002aad7
	Binary files /dev/null and b/data/gfx/level4_ground.jpg differ
	diff --git a/data/gfx/level4_ground.mask.png b/data/gfx/level4_ground.mask.png
	new file mode 100644
	index 0000000..f726c3f
	Binary files /dev/null and b/data/gfx/level4_ground.mask.png differ
	diff --git a/data/gfx/level4_moon.jpg b/data/gfx/level4_moon.jpg
	new file mode 100644
	index 0000000..56a2299
	Binary files /dev/null and b/data/gfx/level4_moon.jpg differ
	diff --git a/data/gfx/level4_moon.mask.png b/data/gfx/level4_moon.mask.png
	new file mode 100644
	index 0000000..8647586
	Binary files /dev/null and b/data/gfx/level4_moon.mask.png differ
	diff --git a/data/gfx/level4_nebula.jpg b/data/gfx/level4_nebula.jpg
	new file mode 100644
	index 0000000..e995e82
	Binary files /dev/null and b/data/gfx/level4_nebula.jpg differ
	diff --git a/data/gfx/level4_rock.jpg b/data/gfx/level4_rock.jpg
	new file mode 100644
	index 0000000..455057a
	Binary files /dev/null and b/data/gfx/level4_rock.jpg differ
	diff --git a/data/gfx/level4_rock.mask.png b/data/gfx/level4_rock.mask.png
	new file mode 100644
	index 0000000..a71377e
	Binary files /dev/null and b/data/gfx/level4_rock.mask.png differ
	diff --git a/data/gfx/level4_saturn.jpg b/data/gfx/level4_saturn.jpg
	new file mode 100644
	index 0000000..03b4ebf
	Binary files /dev/null and b/data/gfx/level4_saturn.jpg differ
	diff --git a/data/gfx/level4_saturn.mask.png b/data/gfx/level4_saturn.mask.png
	new file mode 100644
	index 0000000..5742ca9
	Binary files /dev/null and b/data/gfx/level4_saturn.mask.png differ
	diff --git a/data/gfx/level5.jpg b/data/gfx/level5.jpg
	new file mode 100644
	index 0000000..2bd61a9
	Binary files /dev/null and b/data/gfx/level5.jpg differ
	diff --git a/data/gfx/level6.jpg b/data/gfx/level6.jpg
	new file mode 100644
	index 0000000..a33ceb9
	Binary files /dev/null and b/data/gfx/level6.jpg differ
	diff --git a/data/gfx/level7.desc b/data/gfx/level7.desc
	index 1958783..3a2ffba 100644
	--- a/data/gfx/level7.desc
	+++ b/data/gfx/level7.desc
	@@ -1,17 +1,17 @@
	-8
	-level7_sky.png
	-0 0 0.1
	-level7_logo.png
	-153 20 0.0
	-level7_ground1.png
	-0 440 1.0
	-level7_ground2.png
	-0 413 0.9
	-level7_ground3.png
	-0 389 0.8
	-level7_ground4.png
	-0 368 0.7
	-level7_cumi.png
	-860 0 0.7
	-level7_upi.png
	-170 0 0.7
	+8
	+level7_sky.png
	+0 0 0.1
	+level7_logo.png
	+153 20 0.0
	+level7_ground1.png
	+0 440 1.0
	+level7_ground2.png
	+0 413 0.9
	+level7_ground3.png
	+0 389 0.8
	+level7_ground4.png
	+0 368 0.7
	+level7_cumi.png
	+860 0 0.7
	+level7_upi.png
	+170 0 0.7
	diff --git a/data/gfx/level8.jpg b/data/gfx/level8.jpg
	new file mode 100644
	index 0000000..e0566b8
	Binary files /dev/null and b/data/gfx/level8.jpg differ
	diff --git a/data/gfx/level9.jpg b/data/gfx/level9.jpg
	new file mode 100644
	index 0000000..88d7a18
	Binary files /dev/null and b/data/gfx/level9.jpg differ
	diff --git a/data/script/DataHelper.pl b/data/script/DataHelper.pl
	index 6f5d349..1a75a75 100644
	--- a/data/script/DataHelper.pl
	+++ b/data/script/DataHelper.pl
	@@ -1,682 +1,695 @@
	# DataHelper contains subroutines useful for loading a character's
	# frames, and creating his states.

	use strict;


	require 'FighterStats.pl';



	=comment


	SITUATIONS ARE:

	Ready, Stand, Crouch, (Midair = any + character is flying), Falling



	SITUATION DEPENDENT EVENTS ARE:

	Highhit, Uppercut, Hit, Groinhit, Leghit, Fall



	STANDBY EVENTS ARE:

	Won, Hurt, Threat, Fun, Turn




	________\|___Ready___________Block___Stand___________Crouch______________Midair______Falling
	Highhit \| HighPunched - HighPunched KneelingPunched (...) (...)
	Uppercut\| Falling - Falling KneelingPunched (...) (...)
	Hit \| LowPunched - LowPunched KneelingKicked
	Groinhit\| GroinKicked - GroinKicked KneelingKicked
	Leghit \| Swept - Swept KneelingKicked
	Fall \| Falling - Falling KneelingPunched



	FRAME MEMBER DESCRIPTION IS:

	x int X coordinate offset of the image relative to the character's anchor.
	y int Y coordinate offset of the image relative to the character's anchor.
	w int The width of the image.
	h int The height of the image.
	head array The coordinates of a polygon marking the head within the image, relative to the anchor.
	body array The coordinates of a polygon marking the body within the image, relative to the anchor.
	legs array The coordinates of a polygon marking the legs within the image, relative to the anchor.
	hit array The coordinates of a polygon marking the hit within the image, relative to the anchor.


	STATE MEMBER DESCRIPTION IS:

	F int The number of the visible frame.
	SITU string The situation associated with this state (Ready, Stand, Crouch, Falling)
	DEL int The delay before moving to the next state.
	NEXTST string The name of the state which follows this state, if none of the CONs is used.
	CON hash Connections from this state. The keys are either events or keyboard input.
	HIT ? The hit delivered at the beginning of this state.
	BLOCK int If true, the character is blocking in his current state.
	MOVE int The character's anchor should continously move this much during this state.
	DELTAX int The character's anchor should immediately change by this much after this state.
	PUSHX int The character is pushed, with this much momentum upon entering this state.
	TURN int If true, the character's facing direction changes after this state.
	JUMP int The character leaps into the air, with this much initial momentum upon entering this state.
	DOODAD string A doodad is created at the beginning of this state. The string contains the doodad's type and speed.
	SOUND string The sound effect associated with this state (if any);
	HITSND string The sound effect if the HIT is successful.
	MISSSND string The sound effect if the HIT fails.
	CODE string This code will be evaled at the beginning of this state.
	LAYER int The "priority" of the graphics. 5: hurt; 10: block; 15: kneeling; 20: normal; 25: attack


	=cut




	# Loads the frame data (x, y, w, h) from the given datafile.
	# The path to the datafile is inserted automatically. The frame data will
	# be shifted by (-PivotX,-PivotY).
	#
	# Returns an array of frame data. The first element in the array is
	# a dummy entry, the second is the first real entry. This is because
	# the first thing in the datafile is a PAL entry.
	#
	# Example: LoadFrames( "ZOLIDATA.DAT.txt" );
	sub LoadFrames ($$$)
	{
	my ($DataName, $PivotX, $PivotY) = @_;
	my (@Frames, $data, $frame, $DatName);

	# Make sure that Whatever.dat also exists.
	$DatName = $DataName;
	$DatName =~ s/\.txt$//;
	- open DATFILE, "../characters/$DatName" \|\| die ("Couldn't open ../characters/$DatName");
	+ open DATFILE, "../data/characters/$DatName" \|\| die ("Couldn't open ../data/characters/$DatName");
	close DATFILE;

	- open DATAFILE, "../characters/$DataName" \|\| die ("Couldn't open ../characters/$DataName");
	+ open DATAFILE, "../data/characters/$DataName" \|\| die ("Couldn't open ../data/characters/$DataName");
	$data = '';
	while ( read DATAFILE, $data, 16384, length($data) )
	{
	}
	close DATAFILE;

	print "$DataName file is ", length($data), " bytes long.\n";

	# Insert a dummy first row for the palette entry
	eval ("\@Frames = ( {}, $data);");
	die $@ if $@;

	foreach $frame (@Frames)
	{
	OffsetFrame( $frame, -$PivotX, -$PivotY );
	}
	print "$DataName loaded, ", scalar @Frames, " frames.\n";

	return @Frames;
	}


	# Creates a frame lookup from a descriptor array.
	# The first parameter is the expected number of frames.
	# The descriptor array should have frame base names in even positions,
	# and lengths at odd. positions. For example:
	# ("start", 6, "stand", 4, ... )
	#
	# The routine will return a lookup which will contain the frame's logical
	# name as a key, and its physical index as a value. The logical names are
	# simply the basename plus a number. The example above would return:
	# ("start1"=>1, "start2"=>2, ..., "start6"=>6, "stand1"=>6, "stand2"=>7, ...)
	sub CreateFrameLookup
	{
	my ($ExpectedCount, @FrameDesc) = @_;

	my ($FrameName, $NumFrames);
	my ($i, $j);
	my (%FrameLookup);

	for ( $i=0; $i<scalar @FrameDesc; $i +=2 )
	{
	$FrameName = $FrameDesc[$i];
	$NumFrames = $FrameDesc[$i+1];

	for ( $j = 1; $j<=$NumFrames; ++$j )
	{
	# print "Frame ", (scalar keys %FrameLookup) + 1, " is now called $FrameName$j\n";
	print "Name redefinition: $FrameName!\n" if defined $FrameLookup{ "$FrameName$j" };
	$FrameLookup{ "$FrameName$j" } = (scalar keys %FrameLookup) + 1;
	}
	}

	if ( $ExpectedCount != scalar keys( %FrameLookup ) )
	{
	die( "Expected number of frames ($ExpectedCount) doesn't equal the actual number of frames: ".
	scalar keys(%FrameLookup) );
	}

	return %FrameLookup;
	}



	# Helper function. Finds the last frame with a given name in a frame
	# lookup structure. Return the index of the last frame (1-based), or
	# 0 if none with the given name were found.
	#
	# Example: If there are 6 "highpunch" frames (highpunch1 to highpunch6),
	# FindLastFrame(\%FrameLookup, "highpunch") returns 6.
	sub FindLastFrame($$) {
	my ($FrameLookup, $FrameName) = @_;
	my ($i) = (1);
	while ( exists ${$FrameLookup}{"$FrameName$i"} ) { $i++; }
	return $i-1;
	}



	sub OffsetPolygon($$$)
	{
	my ($poly, $dx, $dy) = @_;
	my ($i, $n);

	$n = scalar @{$poly};

	for ( $i=0; $i < $n; $i+=2 )
	{
	$poly->[$i] += $dx;
	$poly->[$i+1] += $dy;
	}
	}



	sub MirrorPolygon($)
	{
	my ($poly) = @_;
	my ($i, $n);

	$n = scalar @{$poly};

	for ( $i=0; $i < $n; $i+=2 )
	{
	$poly->[$i] = - $poly->[$i];
	}
	}


	sub GetPolygonCenter($)
	{
	my ($poly) = @_;

	my ($i, $n, $x, $y);

	$n = scalar @{$poly};
	$x = $y = 0;
	for ( $i=0; $i < $n; $i+=2 )
	{
	$x += $poly->[$i];
	$y += $poly->[$i+1];
	}

	return ( $x2/$n, $y2/$n );
	}



	sub OffsetFrame($$$) {
	my ($frame, $dx, $dy) = @_;

	$frame->{'x'} += $dx;
	$frame->{'y'} += $dy;

	OffsetPolygon( $frame->{head}, $dx, $dy ) if defined ($frame->{head});
	OffsetPolygon( $frame->{body}, $dx, $dy ) if defined ($frame->{body});
	OffsetPolygon( $frame->{legs}, $dx, $dy ) if defined ($frame->{legs});
	OffsetPolygon( $frame->{hit}, $dx, $dy ) if defined ($frame->{hit});
	}



	# FindLastState returns the last index of a given state.
	# For example, if Punch4 is the last in Punch, FindLastState("Punch") is 4.
	sub FindLastState($$) {
	my ( $States, $StateName ) = @_;
	my ( $i ) = ( 1 );

	while ( exists ${$States}{ "$StateName $i" } ) { $i++; }
	return $i-1;
	}


	# Translates an abbreviated sequence to a full sequence.
	# "-punch" is every punch frame backwards.
	# "_punch" is every punch frame except the last one backwards.
	# "+punch" is every punch frame forwards.
	sub TranslateSequence($$) {
	my ($FrameLookup, $Sequence) = @_;

	my ($pre, $frame) = $Sequence =~ /^([+-_]{0,1})(\w+)/;
	my ($LastFrame) = (FindLastFrame( $FrameLookup, $frame ) );
	#$LastFrame = (FindLastFrame( $FrameLookup, "$pre$frame" ) ) if $LastFrame == 0;
	#print "Last frame of $frame is $LastFrame.\n";

	return "$frame 1-$LastFrame" if ( $pre eq '+' );
	return "$frame $LastFrame-1" if ( $pre eq '-' );
	return "$frame " . ($LastFrame-1) . "-1" if ( $pre eq '_' );

	$Sequence =~ s/\sn(-{0,1})/ $LastFrame$1/; # Replace n- with last frame
	$Sequence =~ s/-n/-$LastFrame/; # Replace -n with last frame
	return $Sequence;
	}



	sub SetStateData($$$)
	{
	my ($state, $FrameDesc, $suffix) = @_;

	$state->{DEL} = $FrameDesc->{"DEL$suffix"} if defined $FrameDesc->{"DEL$suffix"};
	$state->{HIT} = $FrameDesc->{"HIT$suffix"} if defined $FrameDesc->{"HIT$suffix"};
	$state->{CON} = $FrameDesc->{"CON$suffix"} if defined $FrameDesc->{"CON$suffix"};
	$state->{BLOCK} = $FrameDesc->{"BLOCK$suffix"} if defined $FrameDesc->{"BLOCK$suffix"};
	$state->{NEXTST} = $FrameDesc->{"NEXTST$suffix"} if defined $FrameDesc->{"NEXTST$suffix"};
	$state->{MOVE} = $FrameDesc->{"MOVE$suffix"} if defined $FrameDesc->{"MOVE$suffix"};
	$state->{DELTAX} = $FrameDesc->{"DELTAX$suffix"} if defined $FrameDesc->{"DELTAX$suffix"};
	$state->{PUSHX} = $FrameDesc->{"PUSHX$suffix"} if defined $FrameDesc->{"PUSHX$suffix"};
	$state->{TURN} = $FrameDesc->{"TURN$suffix"} if defined $FrameDesc->{"TURN$suffix"};
	$state->{JUMP} = $FrameDesc->{"JUMP$suffix"} if defined $FrameDesc->{"JUMP$suffix"};
	$state->{SITU} = $FrameDesc->{"SITU$suffix"} if defined $FrameDesc->{"SITU$suffix"};
	$state->{DOODAD} = $FrameDesc->{"DOODAD$suffix"} if defined $FrameDesc->{"DOODAD$suffix"};
	$state->{SOUND} = $FrameDesc->{"SOUND$suffix"} if defined $FrameDesc->{"SOUND$suffix"};
	$state->{CODE} = $FrameDesc->{"CODE$suffix"} if defined $FrameDesc->{"CODE$suffix"};
	}



	# Adds a sequence to the end of a state
	# Sequences are: e.g. "throw 10-14, throw 16, throw 14-10"
	# Each piece of the sequence will have $Delay delay.
	sub AddStates($$$) {
	my ( $States, $Frames, $FrameDesc ) = @_;
	my ( $StateName, $SequenceString, $LastState, $i, $sloop, $s, @Sequences );
	my ( $from, $to, $frame, $state );

	$StateName = $FrameDesc->{'N'};
	$SequenceString = $FrameDesc->{'S'};
	$FrameDesc->{SITU} = 'Stand' unless defined $FrameDesc->{SITU};
	$LastState = FindLastState($States,$StateName)+1;

	@Sequences = split ( /\s,\s/, $SequenceString );
	for ( $sloop = 0; $sloop < scalar @Sequences; ++$sloop )
	{
	$s = TranslateSequence( $Frames, $Sequences[$sloop] );
	#print "Sequence is $s\n";

	if ( $s =~ /^\s(\w+)\s+(\d+)-(\d+)\s$/ )
	{
	# Sequence is '<frame> <from>-<to>'
	$frame = $1;
	$from = $2;
	$to = $3;
	}
	elsif ( $s =~ /^\s(\w+)\s+(\d+)\s$/ )
	{
	# Sequence is '<frame> <number>'
	$frame = $1;
	$from = $to = $2;
	}
	else
	{
	die "Sequence '$s' incorrect.\n";
	}

	$i = $from;
	while (1)
	{
	die "Error: Frame $frame$i doesn't exist.\n"
	unless defined ${$Frames}{"$frame$i"};

	$state = { 'F'=>"$frame$i" };
	SetStateData( $state, $FrameDesc, '' );
	SetStateData( $state, $FrameDesc, $LastState );
	if ( ( $sloop == scalar @Sequences -1 ) and ( $i == $to ) )
	{
	SetStateData( $state, $FrameDesc, 'N' );
	}

	$States->{"$StateName $LastState"} = $state;
	# print "Added state '$StateName $LastState' as frame '$frame$i', delay $Delay\n";

	$LastState++;
	if ( $from < $to )
	{
	$i++;
	last if $i > $to;
	}
	else
	{
	$i--;
	last if $i < $to;
	}
	}

	}
	}


	sub BlockStates($$)
	{
	my ( $frames, $del) = @_;
	my ( $retval, $i );

	# We need to make sure that blocking is the same speed for every character.
	# Typical is 5 frames, +- 1 frame
	$del = int( 25 / $frames ); # 1/1

	$retval = { 'N'=>'Block', 'DEL'=>$del, 'S'=>'+block', };
	for ($i = 1; $i <= $frames; ++$i )
	{
	$retval->{"NEXTST$i"} = "Block " . ($i-1);
	$retval->{"CON$i"} = { 'block'=> "Block " . ($i+1) };
	$retval->{"BLOCK$i"} = 1 if $i*$del > 10;
	}

	$retval->{'NEXTST1'} = 'Stand';
	$retval->{"CON$frames"} = { 'block'=> "Block " . $frames };

	return $retval;
	}


	sub KneelingStates($$$$)
	{
	my ( $frames, $frames2, $del, $con ) = @_;
	my ( $retval, $retval2, $i, $j );

	$retval = { 'N'=>'Kneeling', 'DEL'=> $del, 'S' => '+kneeling', 'SITU'=>'Crouch' };
	for ( $i = 1; $i <= $frames; ++$i )
	{
	$retval->{"NEXTST$i"} = "Kneeling " . ($i-1);
	$retval->{"CON$i"} = { 'down' => "Kneeling " . ($i+1) };
	}
	$retval->{'NEXTST1'} = 'Stand';
	$retval->{"CON$frames"} = { 'down' => "Onknees" };

	$retval2 = { 'N'=>'Onknees', 'DEL'=>$del, 'S' => '+onknees,-onknees', 'SITU'=>'Crouch',
	'NEXTST' => "Kneeling $frames" };
	$frames2 *= 2;
	for ( $i = 1; $i <= $frames2; ++$i )
	{
	$j = ($i % $frames2) + 1;
	$retval2->{"CON$i"} = { %{$con}, 'down'=>"Onknees $j", 'forw'=>"Onknees $j", 'back'=>"Onknees $j" };
	}

	return ($retval, $retval2);
	}


	-sub JumpStates($$)
	+
	+=comment
	+JumpStates is for generating the Jump, JumpFW, JumpBW, JumpFly,
	+JumpStart, JumpKick, JumpPunch states for a state description list.
	+
	+Parameters:
	+$frames hash The frame lookup hash.
	+$con hash Connections during jumping (usually, JumpKick and JumpPunch only)
	+$framenames hash [optional] If the standard frame names (kneeling,
	+ onknees, kneelingkick, kneelingpunch) are not good, this has should
	+ contain replacement names (e.g. 'kneelingkick' => 'sweep')
	+=cut
	+
	+sub JumpStates
	{
	- my ( $frames, $con ) = @_;
	+ my ( $frames, $con, $framenames ) = @_;
	my ( $kneelingframes, $onkneesframes,
	$kickframes, $punchframes ) = (
	FindLastFrame( $frames, 'kneeling' ),
	FindLastFrame( $frames, 'onknees' ),
	FindLastFrame( $frames, 'kneelingkick' ),
	FindLastFrame( $frames, 'kneelingpunch' ) );
	my ( $jumpheight ) = 120;

	my ( $i, $j, $statestotal, $statesdown, $statesknees, $deldown,
	$jump, $jumpfw, $jumpbw, $flying, $flyingsequence, $flyingstart, $jumpkick, $jumppunch );

	# The jump's first part is going down on knees, second part is
	# on knees, third part is getting up.

	if ( $::DELMULTIPLIER )
	{
	$statestotal = $jumpheight * 2 / 3 / $::DELMULTIPLIER; # 1/1
	}
	else
	{
	$statestotal = $jumpheight * 2 / 3;
	}
	$statesdown = $statestotal / 4;

	$deldown = int($statesdown / $kneelingframes + 0.1); # 1/1
	$statesdown = $deldown * $kneelingframes;
	$statesknees = $statestotal - $statesdown * 2;

	$jump = { 'N'=>'Jump', 'DEL'=> $deldown, 'S'=>'kneeling 1-2, kneeling 1',
	- 'JUMPN'=>$jumpheight, NEXTSTN=>'JumpFly', 'SOUND1'=>'slip4.voc', };
	+ 'JUMPN'=>$jumpheight, NEXTSTN=>'JumpFly', 'SOUND1'=>'PLAYER_JUMPS', };
	$jumpfw = { %{$jump}, 'N'=>'JumpFW', 'PUSHX3'=>18*16 };
	$jumpbw = { %{$jump}, 'N'=>'JumpBW', 'PUSHX3'=>-9*16 };

	$flyingsequence = '';
	$flying = {};
	for ( $i = 0; $i < $statesknees / $deldown; ++$i ) #1/1
	{
	$j = $i + $statesdown / $deldown; #1/1
	$flyingsequence .= 'onknees 1,';
	$flying->{"CON$j"} = $con;
	# $flying->{"DEL$j"} = 1;
	}
	$flyingsequence = "+kneeling, $flyingsequence -kneeling";

	$flying = { %{$flying}, 'N'=>'JumpFly', 'DEL'=> $deldown, 'S'=>$flyingsequence,
	'DELN'=>100 };
	$flyingstart = { 'N'=>'JumpStart', 'JUMP2'=>$jumpheight, 'PUSHX2'=>9*16, 'DEL1'=>1,
	'DEL'=> $deldown, 'S'=>"stand 1,$flyingsequence", 'DELN'=>100 };

	print join( ',', %{$flying}), "\n";

	$jumpkick = { 'N'=>'JumpKick', 'HIT'=>'Fall',
	'DEL'=> int( $statestotal * 2 / 3 / ( $kickframes + $kneelingframes*2 + 3 ) ), # 1/1
	'S'=> '+kneelingkick,kneelingkick n, kneelingkick n, kneelingkick n,-kneelingkick,-kneeling',
	'HIT'=>'Fall', 'DELN'=>100 };

	$jumppunch = { 'N'=>'JumpPunch', 'HIT'=>'Highhit',
	'DEL'=> int( $statestotal * 2 / 3 / ( $punchframes + $kneelingframes*2 + 3 ) ), # 1/1
	'S'=> '+kneelingpunch,kneelingpunch n, kneelingpunch n, kneelingpunch n,-kneelingpunch,-kneeling',
	'HIT'=>'Fall', 'DELN'=>100 };

	return ($jump, $jumpfw, $jumpbw, $flying, $flyingstart, $jumpkick, $jumppunch);
	}



	sub WalkingFrames($$$$$)
	{
	my ( $frameLookup, $frameArray, $preFrames, $distance, $con ) = @_;

	my ( $walkFrames, $totalFrames, $seq, $seq2, $distPerFrame,
	$walk, $back, $walkNextst, $backNextst,
	$i, $j, );

	$totalFrames = FindLastFrame( $frameLookup, 'walk' );
	$walkFrames = $totalFrames - $preFrames;

	if ( $preFrames > 0 ) {
	$seq = "+walk, walk $preFrames-1";
	$seq2 = "walk 1-$preFrames, -walk";
	} else {
	$seq = "+walk";
	$seq2 = "-walk";
	}

	$walk = { 'N'=>'Walk', 'S'=>$seq, 'DEL'=>5, 'CON'=>$con };
	$back = { 'N'=>'Back', 'S'=>$seq2, 'DEL'=>5, };

	# Add attributes for the 'pre' states.

	for ( $i=1; $i <= $preFrames; ++$i )
	{
	$j = $i + 1;
	$walk->{"CON$i"} = { %{$con}, 'forw' => "Walk $j" };
	$walk->{"NEXTST$i"} = 'Stand';
	$back->{"CON$i"} = { %{$con}, 'back' => "Back $j" };
	$back->{"NEXTST$i"} = 'Stand';
	}

	# Add attributes for the 'walk' states.

	$walkNextst = $preFrames ? 'Walk ' . ($totalFrames+1) : 'Stand';
	$backNextst = $preFrames ? 'Back ' . ($totalFrames+1) : 'Stand';
	$distPerFrame = $distance / $walkFrames; # 1/1

	print "*** $preFrames $walkFrames $totalFrames $walkNextst $backNextst\n";

	for ( $i=$preFrames+1; $i <= $totalFrames; ++$i )
	{
	$j = ($i == $totalFrames) ? $preFrames+1 : $i+1;
	$walk->{"MOVE$i"} = 4;
	$walk->{"NEXTST$i"} = $walkNextst;
	$walk->{"CON$i"} = { %{$con}, 'forw' => "Walk $j" };
	$back->{"MOVE$i"} = -4;
	$back->{"NEXTST$i"} = $backNextst;
	$back->{"CON$i"} = { %{$con}, 'back' => "Back $j" };

	OffsetFrame( $frameArray->[$frameLookup->{"walk$i"}],
	- ($i-$preFrames-1) * $distPerFrame, 0 );
	}

	return ( $walk, $back );
	}



	sub TravelingStates( $$$$$$ )
	{
	my ( $frameLookup, $frameArray, $states, $frameName, $from, $to ) = @_;

	$from = 1 unless $from;
	unless ( $to )
	{
	$to = FindLastFrame( $frameLookup, $frameName );
	$to += 1 if $frameName eq 'falling';
	}

	my ( $fromIndex, $toIndex, $fromFrame, $toFrame, $fromOffset, $toOffset,
	$deltax, $i, $state, $nextst );

	# 1. Calculate the 'deltax' and 'fromOffset'.

	$fromIndex = $frameLookup->{"$frameName$from"};
	die "couldn't find frame $frameName$from" unless defined $fromIndex;
	$toIndex = $fromIndex - $from + $to;

	$fromFrame = $frameArray-> [ $fromIndex ];
	$toFrame = $frameArray-> [ $toIndex ];

	$fromOffset = $fromFrame->{x} + ($fromFrame->{w} >> 1);
	$toOffset = $toFrame->{x} + ($toFrame->{w} >> 1);
	$deltax = ( $toOffset - $fromOffset ) / ( $to - $from ); #1/1

	# print "Offsets: $fromOffset $toOffset $deltax\n";

	# 2. Offset every relevant frame.
	for ( $i=$fromIndex; $i<=$toIndex; ++$i )
	{
	# print "Offsetting frame $i by ", - $fromOffset - $deltax * ($i-$fromIndex), "\n";
	OffsetFrame( $frameArray->[$i],
	- $fromOffset - $deltax * ($i-$fromIndex), 0 );
	}

	# 3. Apply deltax to every relevant state.
	while ( ($i, $state) = each %{$states} )
	{
	if ( $state->{F} >= $fromIndex and $state->{F} <= $toIndex )
	{
	$nextst = $states->{$state->{NEXTST}};
	if ( defined($nextst) and $nextst->{F} >= $fromIndex and $nextst->{F} <= $toIndex )
	{
	$state->{DELTAX} = $deltax * ($nextst->{F} - $state->{F});
	# print "Fixing state $i : deltax = ", $state->{DELTAX}, "\n";
	}
	}
	}
	}



	sub FixStates($$)
	{
	my ( $frameLookup, $states ) = @_;

	my ( $framename, $st, $lastchar, $key, $value, $nextchar, $nextst );

	while (($key, $value) = each %{$states})
	{
	$framename = $value->{'F'};
	unless ( $framename =~/^\d+$/ )
	{
	# Convert non-numeric frames to their numeric counterparts.
	die "Can't find image $framename in frame $key" unless defined $frameLookup->{ $framename };
	$value->{'F'} = $frameLookup->{ $framename };
	}

	($st,$lastchar) = $key =~ /(\w+)\s+(\d+)/;

	unless ( defined $value->{'NEXTST'} )
	{
	$nextchar = $lastchar + 1;
	$nextst = "$st $nextchar";
	unless ( defined $states->{$nextst} ) {
	# print "Go to Standby after $key\n";
	$nextst = 'Stand';
	}
	$value->{'NEXTST'} = $nextst;
	}

	}
	}


	sub FindShorthands($)
	{
	my ( $states ) = @_;

	my ( $key, $value, $st, $lastchar, %Shorthands );

	while (($key, $value) = each %{$states})
	{
	($st,$lastchar) = $key =~ /(\w+)\s+(\d+)/;
	print "$key has no lastchar" unless defined $lastchar;
	if ( $lastchar == 1 )
	{
	$Shorthands{$st} = $states->{$key};
	}
	}

	return %Shorthands;
	}


	sub CheckStates($$)
	{
	my ( $fightername, $states ) = @_;
	my ( $key,$state, $con );
	my ( $seq,$nextst );

	while (($key, $state) = each %{$states})
	{
	die "Bad connection in fighter $fightername to '$state->{NEXTST} from $key!'" unless exists $states->{ $state->{NEXTST} };
	next unless $state->{CON};
	$con = $state->{CON};

	while (($seq, $nextst) = each %{$con})
	{
	die "Bad connection in fighter $fightername to '$nextst' from $key!" unless exists $states->{$nextst};
	}
	}
	}





	return 1;
	diff --git a/data/script/Fighter.pl b/data/script/Fighter.pl
	index e680ce4..757c699 100644
	--- a/data/script/Fighter.pl
	+++ b/data/script/Fighter.pl
	@@ -1,929 +1,930 @@
	require 'Collision.pl';
	require 'DataHelper.pl';
	require 'Damage.pl';


	package Fighter;



	use strict;

	=comment

	Fighter's members are:

	ID int The ID of the fighter
	STATS hash Reference to the fighter's stats (includes GENDER)
	NAME string The name of the character, e.g. "Ulmar".
	FRAMES array The character's frame description.
	STATES hash The character's state description.
	OK bool Is the fighter good to go?
	TEAMSIZE int The number of fighters left in this figther's team, including this one. 0 when the last one dies.

	NUMBER int Player number (either 0 or 1)
	X int The fighter's current anchor, horizontal coordinate.
	Y int The fighter's current anchor, vertical coordinate.
	ST string The name of the fighter's current state.
	FR int The number of the fighter's current frame (same as STATES->{ST}->{F}).
	DEL int The amount of time before the character moves to the next state.
	NEXTST string The name of the next state after this one (calculated by Advance and Event, user by Update).
	DIR int -1: the character is facing left; 1: if the character is facing right.
	PUSHY int The character's vertical momentum, from jumping/hits.
	PUSHX int The character's horizontal momentum, from hits.
	HP int Hit points, from 100 down to 0.
	IDLE int The amount of game time since the player is ready.
	CHECKEHIT int 1 if the hit needs to be checked soon.
	DELIVERED int 1 if a hit was delivered in this state.
	COMBO int The number of consecutive hits delivered to this fighter.
	COMBOHP int The amount of HP delivered in the last combo.
	OTHER Fighter A reference to the other Fighter
	LANDINGPENALTY int This is added to DEL when the character lands (used to penaltize blocked jumpkicks). Becomes DELPENALTY upon landing.
	DELPENALTY int This is added to DEL in the next state.
	-BOUNDSCHECK bool Should horizontal bounds checking be done for this fighter (for team mode when new fighter enters)
	+BOUNDSCHECK bool Should horizontal bounds checking be done for this fighter (for team mode when new fighter enters)'


	new
	Reset
	Advance
	CheckHit
	IsHitAt
	Event
	Update



	Needs to be subclassed: Reset, NextState

	=cut




	sub new {
	my ($class) = @_;

	my $self = {
	'NUMBER'=> 0,
	'ST' => 'Start',
	'FR' => 0,
	'DEL' => 0,
	'DIR' => 1,
	'PUSHY' => 0,
	'PUSHX' => 0,
	};

	bless $self, $class;
	return $self;
	}


	sub RewindData {
	my ($self) = @_;
	return $self;
	}


	sub Reset {
	my ($self, $fighterenum) = @_;

	die "Insufficient parameters." unless defined $self;
	$fighterenum = $self->{ID} unless defined $fighterenum;

	my ($number, $stats);
	$number = $self->{NUMBER};
	$stats = ::GetFighterStats($fighterenum);

	die "Couldn't load stats of fighter $fighterenum\n" unless defined $stats;

	unless (defined $stats->{STATES})
	{
	print "ERROR: The fighter $fighterenum is not yet usable.\n";
	$self->{OK} = 0;
	return;
	}

	print STDERR "Resetting fighter $number to character $fighterenum\n";

	$self->{ID} = $fighterenum;
	$self->{STATS} = $stats;
	$self->{NAME} = $stats->{NAME};
	$self->{FRAMES} = $stats->{FRAMES};
	$self->{STATES} = $stats->{STATES};
	$self->{X} = (( $number ? 540 : 100 ) << $::GAMEBITS) + $::BgPosition;
	$self->{X} = (( $number ? 620 : 180 ) << $::GAMEBITS) + $::BgPosition if $::WIDE;
	$self->{Y} = $::GROUND2;
	$self->{ST} = 'Start';
	$self->{FR} = $self->GetCurrentState()->{F};
	$self->{DEL} = 0;
	$self->{DIR} = ($number ? -1 : 1);
	$self->{PUSHY} = 0;
	$self->{PUSHX} = 0;
	$self->{HP} = 100;
	$self->{IDLE} = 0;
	$self->{CHECKHIT} = 0;
	$self->{DELIVERED} = 0;
	$self->{COMBO} = 0;
	$self->{COMBOHP}= 0;
	$self->{LANDINGPENALTY} = 0;
	$self->{DELPENALTY} = 0;
	$self->{BOUNDSCHECK} = 1;
	$self->{OK} = 1;

	&{$self->{STATS}->{STARTCODE}}($self);
	}


	=comment
	Returns a "random" number that is deterministic in the sense that it is
	always the same, given the current state of the character and the current
	game time.
	=cut

	sub QuasiRandom($$)
	{
	my ( $self, $randmax ) = @_;

	$randmax = 1 unless $randmax;

	return int( $self->{HP} * 543857
	+ $self->{NUMBER} * 834973
	+ $self->{DEL} * 4358397
	+ $self->{IDLE} * 92385029
	+ $::gametick * 23095839
	+ 5304981 ) % $randmax;
	}


	=comment

	Advance should be called once every game tick. It advances the fighter,
	preparing his variables for drawing him in the next tick. Advance also
	processes the input if it is appropriate to do so in the current state.

	Advance prepares the NEXTST attribute of the player. It does not modify
	the current ST yet, because that may depend on hits, event, etc. Advance
	should be followed by CheckHit and Event calls, and finally Update.

	=cut

	sub Advance {
	my ($self, $in) = @_;

	# print STDERR "$::gametick\t$self->{X},$self->{HP}\t$self->{NUMBER}\t$self->{DEL}\t$self->{IDLE}\n";

	my ($stname, # The name of the current state.
	$st, # The descriptor of the current state.
	$move, # The move associated with the current state.
	$i, $j, # temp var.
	@body ); # collision detection

	$self->{NEXTST} = '';
	$stname = $self->{ST};

	return if ( $stname eq 'Dead' );

	$st = $self->{'STATES'}->{$stname};

	# 1. DECREMENT 'DEL' PROPERTY

	$self->{'DEL'}--;
	if ( $st->{SITU} eq 'Ready' )
	{
	$self->{IDLE} = $self->{IDLE} + 1;
	}
	else
	{
	$self->{IDLE} = 0;
	}

	# 2. UPDATE THE HORIZONTAL POSITION

	# 2.1. 'MOVE' PLAYER IF NECESSARY

	if ( defined $st->{'MOVE'} )
	{
	$move = $st->{'MOVE'}$self->{'DIR'} 6;
	$self->{'X'} += $move;
	}

	# 2.2. 'PUSH' PLAYER IF NECESSARY

	if ( $self->{PUSHX} )
	{
	$i = ($self->{PUSHX}+7) / 8; # 1/1; syntax highlight..
	$self->{X} += $i;
	$self->{PUSHX} -= $i if $self->{PUSHY} == 0;
	}

	# 2.3. MAKE SURE THE TWO FIGHTERS DON'T "WALK" INTO EACH OTHER

	if ( $::BgScrollEnabled and $self->{Y} >= $::GROUND2 )
	{
	my ( $other, $centerX, $centerOtherX, $pushDir );
	$centerX = $self->GetCenterX;
	for ($i=0; $i<$::NUMPLAYERS; ++$i)
	{
	$other = $::Fighters[$i];
	+ next if ( $other->{Y} < $::GROUND2 ) or ( $other->{ST} eq 'Dead' );
	$centerOtherX = $other->GetCenterX;

	- if ( abs($centerX - $centerOtherX) < 60 )
	+ if ( abs($centerX - $centerOtherX) < 60 )
	{
	$pushDir = ($centerX > $centerOtherX) ? 1 : -1;
	$self->{X} += 10 * $pushDir;
	$other->{X} -= 10 * $pushDir;
	}
	}
	}


	# 2.4. HORIZONTAL BOUNDS CHECKING

	if ( $self->{BOUNDSCHECK} )
	{
	$self->{X} = $::BgPosition + $::MOVEMARGIN2
	if $self->{X} < $::BgPosition + $::MOVEMARGIN2;
	$self->{X} = $::BgPosition + $::SCRWIDTH2 - $::MOVEMARGIN2
	if $self->{X} > $::BgPosition + $::SCRWIDTH2 - $::MOVEMARGIN2;
	}

	# 3. FLYING OR FALLING

	if ( $self->{Y} < $::GROUND2 )
	{
	$self->{PUSHY} += 3;
	$self->{Y} += $self->{PUSHY};

	if ($self->{Y} >= $::GROUND2)
	{
	# LANDING

	$self->{DELPENALTY} = $self->{LANDINGPENALTY};
	$self->{LANDINGPENALTY} = 0;
	$self->{BOUNDSCHECK} = 1;

	if ( $st->{SITU} eq 'Falling')
	{
	::AddEarthquake( $self->{PUSHY} / 20 ); # 1/1
	- push @::Sounds, ('splat.wav') if $self->{PUSHY} > 40;
	+ push @::Sounds, ('PLAYER_FALLS') if $self->{PUSHY} > 40;
	# print "PUSHY = ", $self->{PUSHY}, "; ";
	if ( $self->{PUSHY} > 30 )
	{
	# Bouncing after a fall
	$self->{PUSHY} = - $self->{PUSHY} / 2; # 1/1
	$self->{Y} = $::GROUND2 - 1;
	}
	else
	{
	# Getting up after a fall.
	$self->{PUSHY} = 0;
	$self->{Y} = $::GROUND2;
	$self->{DEL} = 0;
	if ( $self->{HP} <= 0 ) {
	$self->{NEXTST} = 'Dead';
	}
	else {
	$self->{NEXTST} = 'Getup';
	}
	}
	return;
	}
	else
	{
	- push @::Sounds, ('thump.wav');
	+ push @::Sounds, ('PLAYER_LANDS');
	$self->{PUSHY} = 0;
	$self->{Y} = $::GROUND2;
	if ( substr($self->{ST},0,4) eq 'Jump' )
	{
	# Landing after a jump
	$self->{DEL} = 0;
	$self->{NEXTST} = 'Stand';
	}
	else
	{
	print "Landed; state: ", $self->{ST}, "\n";
	}
	return;
	}
	}
	}

	return if $self->{'DEL'} > 0;

	# 4. DELAYING OVER. MAKE END-OF-STATE CHANGES.

	# 4.1. 'DELTAX' displacement if so specified

	if ($st->{DELTAX})
	{
	$self->{X} += $st->{DELTAX} * $self->{DIR} * $::GAMEBITS2;
	}

	# 4.2. 'TURN' if so specified

	if ($st->{TURN})
	{
	$self->{DIR} = - $self->{DIR};

	# Swap input keys..
	$i = $in->{Keys}->[2];
	$in->{Keys}->[2] = $in->{Keys}->[3];
	$in->{Keys}->[3] = $i;
	}

	# 5. CALCULATE THE NEXT STATE

	my ($nextst, $con, $input, $mod, $action, $dist);

	$nextst = $st->{NEXTST};
	$con = $st->{CON};
	undef $con if $::ko;

	if ( defined $con )
	{
	$dist = ($self->{OTHER}->{X} - $self->{X}) * $self->{DIR};
	$self->ComboEnds();

	# 5.1. The current state has connections!

	($input,$mod) = $in->GetAction();
	$mod = '' unless defined $mod;
	$action = $input;

	# Try to find the best matching connection.
	for ( $i = length($mod); $i>=0; --$i )
	{
	$action = $input . substr( $mod, 0, $i );
	last if defined $con->{$action};
	}

	if ( defined $con->{$action} )
	{
	# print "dist = $dist. ";
	if ( ($action eq 'hpunch' or $action eq 'lpunch') and ($dist>=0) and ($dist<800) )
	{
	$action = 'hpunchF' if defined $con->{'hpunchF'};
	}
	elsif ( ($action eq 'hkick' or $action eq 'lkick') and ($dist>=0) and ($dist<900) )
	{
	$action = 'lkickF' if defined $con->{'lkickF'};
	}
	$nextst = $con->{$action};
	$in->ActionAccepted;
	if ( $nextst eq 'Back' and $::NUMPLAYERS != 2 ) {
	$nextst = 'Turn';
	}
	}
	}

	$self->{'NEXTST'} = $nextst;
	}



	=comment
	Checks for hits on all other fighters.
	Returns a list of ($self,$fighter,$hit) triplets.
	=cut

	sub CheckHit($)
	{
	my ($self) = @_;

	return () unless $self->{CHECKHIT};
	$self->{CHECKHIT} = 0;

	my ($st, # A reference to the next state.
	$nextst, # The name of the next state.
	@hit, # The hit array
	@hit2,
	$i, $j,
	@retval,
	$other,
	);

	$st = $self->{STATES}->{$self->{ST}};

	return @retval unless $st->{HIT};
	return @retval unless defined $self->{FRAMES}->[$st->{F}]->{hit};

	@hit = @{$self->{FRAMES}->[$st->{F}]->{hit}};
	if ( $self->{DIR}<0 )
	{
	::MirrorPolygon( \@hit );
	}
	::OffsetPolygon( \@hit,
	$self->{X} / $::GAMEBITS2,
	$self->{Y} / $::GAMEBITS2 );

	for ( $j=0; $j<$::NUMPLAYERS; ++$j )
	{
	$other = $::Fighters[$j];
	next if $other == $self;
	@hit2 = @hit;
	$i = $other->IsHitAt( \@hit2 );
	if ( $i ) {
	$self->{DELIVERED} = 1;
	push @retval, ([$self, $other, $i]);
	}
	}

	if ( scalar(@retval) == 0 )
	{
	# Make the 'Woosh' sound - maybe.
	$nextst = $st->{NEXTST};
	print "NEXTST = $nextst";
	$nextst = $self->{STATES}->{$nextst};
	print "NEXTST->HIT = ", $nextst->{HIT}, "\n";
	- push @::Sounds, ('woosh.wav') unless $nextst->{HIT} and defined $self->{FRAMES}->[$nextst->{F}]->{hit};
	+ push @::Sounds, ('ATTACK_MISSES') unless $nextst->{HIT} and defined $self->{FRAMES}->[$nextst->{F}]->{hit};
	}

	return @retval;
	}




	sub IsHitAt
	{
	my ($self, $poly) = @_;

	my ($frame, @a);
	$frame = $self->{FRAMES}->[$self->{FR}];

	::OffsetPolygon( $poly, -$self->{X} / $::GAMEBITS2, -$self->{Y} / $::GAMEBITS2 );
	if ( $self->{DIR}<0 )
	{
	::MirrorPolygon( $poly );
	}

	#print "IsHitAt (", join(',',@{$poly}),")\n (",
	# join(',',@{$frame->{head}}),")\n (",
	# join(',',@{$frame->{body}}),")\n (",
	# join(',',@{$frame->{legs}}),")\n";

	return 1 if ::Collisions( $poly, $frame->{head} );
	return 2 if ::Collisions( $poly, $frame->{body} );
	return 3 if ::Collisions( $poly, $frame->{legs} );
	return 0;
	}



	=comment
	Event($self, $event, $eventpar): Handles the following events:
	'Won', 'Hurt', 'Thread', 'Fun', 'Turn'
	=cut


	sub Event($$$)
	{
	my ($self, $event, $eventpar) = @_;

	my ($st);

	$st = $self->GetCurrentState();

	if ( ($st->{SITU} eq 'Ready' or $st->{SITU} eq 'Stand') and $event eq 'Won' )
	{
	$self->{NEXTST} = 'Won' unless substr($self->{ST}, 0, 3) eq 'Won' ;
	return;
	}

	if ( $st->{SITU} eq 'Ready' and $self->{NEXTST} eq '' )
	{
	$self->{IDLE} = 0;
	if ( $event =~ /Hurt\|Threat\|Fun\|Turn/ )
	{
	if ( $event eq 'Fun' and defined $self->{STATES}->{'Funb'} and $self->QuasiRandom(2)==1 )
	{
	$event = 'Funb';
	}
	$self->{NEXTST} = $event;
	}
	}
	}


	=comment
	Event($self, $event, $eventpar): Handles the following events:
	'Highhit', 'Uppercut', 'Hit', 'Groinhit', 'Leghit', 'Fall'

	Parameters:
	$other Fighter The fighter who hit me.
	$event string The name of the event (any of the above events)
	$eventpar int/string 1: head hit; 2: body hit; 3: leg hit; Maxcombo: I did a max combo (=fall with 0 damage)
	=cut


	sub HitEvent($$$$)
	{
	my ($self, $other, $event, $eventpar) = @_;

	my ($st, $blocked, $damage);

	$st = $self->GetCurrentState();

	# Do events: Highhit, Uppercut, Hit, Groinhit, Leghit, Fall

	$eventpar = '' unless defined $eventpar; # Supress useless warning
	if ( $eventpar eq 'Maxcombo' ) { $damage = 0; }
	else { $damage = ::GetDamage( $other->{NAME}, $other->{ST} ); }
	$blocked = $st->{BLOCK};
	$blocked = 0 if ( $self->IsBackTurnedTo($other) );

	print "Event '$event', '$eventpar'\n";
	print "Blocked.\n" if ( $blocked );

	# Hit point adjustment here.

	$self->{HP} -= $blocked ? $damage >> 3 : $damage;

	# Turn if we must.

	$self->{DIR} = ( $self->{X} > $other->{X} ) ? -1 : 1;

	# Handle the unfortunate event of the player "dying".

	if ( $self->{HP} <= 0 )
	{
	- push @::Sounds, ('bowling.voc');
	+ push @::Sounds, ('PLAYER_KO');
	$self->{NEXTST} = 'Falling';
	$self->{PUSHX} = -20 * 3 * $self->{DIR};
	$self->{PUSHY} = -80;
	$self->{Y} -= 10;
	$self->{COMBO} += 1;
	$self->{COMBOHP} += $damage;
	$self->ComboEnds();
	$::ko = 1 if $self->{TEAMSIZE} <= 1 and $::ActiveTeams <= 2;
	return;
	}

	# Handle blocked attacks.

	if ( $blocked )
	{
	- push @::Sounds, ('thump.wav');
	+ push @::Sounds, ('ATTACK_BLOCKED');
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	$other->{DEL} += 20 * $::DELMULTIPLIER;

	if ( $other->{Y} < $::GROUND2 )
	{
	$other->{PUSHY} = -20 if $other->{PUSHY} > 0;
	$other->{PUSHX} *= 0.2;
	$other->{LANDINGPENALTY} = 30 * $::DELMULTIPLIER;
	}
	# $self->{PUSHX} = - $damage * 5 * $self->{DIR};
	return;
	}

	# Handle the rest of the events.

	if ( $event eq 'Uppercut' )
	{
	- push @::Sounds, ('evil_laughter.voc');
	+ push @::Sounds, ('UPPERCUT_HITS');
	::AddEarthquake( 20 );
	}
	elsif ($event eq 'Groinhit')
	{
	- push @::Sounds, ('woman_screams.voc');
	+ push @::Sounds, ('GROINKICK_HITS');
	}
	else
	{
	- push @::Sounds, ('thump3.voc');
	+ push @::Sounds, ('ATTACK_HITS');
	}

	$self->{COMBO} += 1;
	$self->{COMBOHP} += $damage;
	$damage *= $self->{COMBO}; # Only for the purpose of pushing

	if ( $self->{COMBO} >= $::MAXCOMBO )
	{
	$self->ComboEnds();
	$event = 'Uppercut';
	$other->HitEvent( 'Fall', 'Maxcombo' );
	}

	if ( $st->{SITU} eq 'Crouch' )
	{
	if ( $event eq 'Uppercut' or $event eq 'Fall' )
	{
	$self->{NEXTST} = 'Falling';
	$self->{PUSHX} = -48 * 3 * $self->{DIR};
	$self->{PUSHY} = -100;
	$self->{Y} -= 10;
	}
	else
	{
	if ($eventpar == 1) {
	$self->{NEXTST} = 'KneelingPunched';
	} else {
	$self->{NEXTST} = 'KneelingKicked';
	}
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	# $self->{PUSHX} = - $damage * 20 * $self->{DIR};
	}
	return;
	}

	if ( $st->{SITU} eq 'Falling' )
	{
	$self->{PUSHY} -= 50;
	$self->{PUSHY} = -80 if $self->{PUSHY} > -80;
	$self->{Y} -= 10;
	return;
	}

	if ( $self->{Y} < $::GROUND2 )
	{
	$self->{NEXTST} = 'Falling';
	$self->{PUSHY} -= 50;
	$self->{PUSHX} = -48 * 3 * $self->{DIR};
	return;
	}

	if ( $event eq 'Highhit' )
	{
	my ( $doodadx, $doodady );
	($doodadx, $doodady) = ::GetPolygonCenter( $self->{FRAMES}->[$self->{FR}]->{head} );
	# my ( $doodadx, $doodady ) = @{$self->{FRAMES}->[$self->{FR}]->{head}};
	Doodad::CreateDoodad( $self->{X} + $doodadx * $::GAMEBITS2 * $self->{DIR},
	$self->{Y} + $doodady * $::GAMEBITS2,
	'Tooth',
	- $self->{DIR},
	$self->{NUMBER} );

	$self->{NEXTST} = 'HighPunched';
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	# $self->{PUSHX} = - $damage * 20 * $self->{DIR};
	}
	elsif ( $event eq 'Hit' )
	{
	if ($eventpar == 1) {
	$self->{NEXTST} = 'HighPunched';
	} elsif ($eventpar == 2) {
	$self->{NEXTST} = 'LowPunched';
	} else {
	$self->{NEXTST} = 'Swept';
	}
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	# $self->{PUSHX} = - $damage * 20 * $self->{DIR};
	}
	elsif ( $event eq 'Groinhit' )
	{
	$self->{NEXTST} = 'GroinKicked';
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	# $self->{PUSHX} = - $damage * 20 * $self->{DIR};
	}
	elsif ( $event eq 'Leghit' )
	{
	$self->{NEXTST} = 'Swept';
	$self->HitPush( $other, - $damage * 20 * $self->{DIR} );
	# $self->{PUSHX} = - $damage * 20 * $self->{DIR};
	}
	elsif ( $event eq 'Uppercut' or $event eq 'Fall' )
	{
	$self->{NEXTST} = 'Falling';
	$self->{PUSHX} = -48 * 3 * $self->{DIR};
	$self->{PUSHY} = -100;
	$self->{Y} -= 10;
	}
	else
	{
	die "Unknown event: $event, $eventpar";
	}
	}




	sub GetCurrentState
	{
	my ($self, $statename) = @_;
	my ($stateref);

	die unless defined $self;

	$statename = $self->{ST} unless defined $statename;
	$stateref = $self->{STATES}->{$statename};
	return $stateref;
	}


	sub ComboEnds
	{
	my ($self) = @_;
	my ($combo, $ismaxcombo);
	$combo = $self->{COMBO};
	$ismaxcombo = $combo >= $::MAXCOMBO;

	return unless $combo;

	if ( $self->{COMBO} > 1 )
	{
	my ( $head, $doodad, $x, $y, $combotext );

	$combotext = $ismaxcombo ? ::Translate("MAX COMBO!!!") : sprintf( ::Translate('%d-hit combo!'), $self->{COMBO} );

	$head = $self->{FRAMES}->[$self->{FR}]->{head};
	$x = $self->{X} + $head->[0] * $::GAMEBITS2 * $self->{DIR};
	$y = $self->{Y} + $head->[1] * $::GAMEBITS2;
	$doodad = Doodad::CreateTextDoodad( $x, $y - 30 * $::GAMEBITS2,
	$self->{NUMBER},
	$combotext );
	$doodad->{LIFETIME} = $ismaxcombo ? 120 : 80;
	$doodad->{SPEED} = [-3,-3];

	$doodad = Doodad::CreateTextDoodad( $x, $y - 10 * $::GAMEBITS2,
	$self->{NUMBER},
	sprintf( ::Translate('%d%% damage'), int($self->{COMBOHP}*$::HitPointScale/10) ) );
	$doodad->{LIFETIME} = 80;
	$doodad->{SPEED} = [+3,-3];

	print $self->{COMBO}, "-hit combo for ", $self->{COMBOHP}, " damage.\n";
	- push @::Sounds, ( $ismaxcombo ? 'crashhh.voc' : 'ba_gooock.voc');
	+ push @::Sounds, ( $ismaxcombo ? 'MAX_COMBO' : 'COMBO');
	}

	$self->{COMBO} = 0;
	$self->{COMBOHP} = 0;
	}


	=comment

	Update moves the fighter to his next state, if there is a NEXTST set.
	NEXTST should be calculated before calling this method. No further
	branching or CON checking is done.

	If the next state has JUMP, the character is set aflying.

	=cut

	sub Update
	{
	my ($self) = @_;

	my ($nextst, # The name of the next state
	$st); # The descriptor of the next state.

	# Is there a next state defined?
	$nextst = $self->{'NEXTST'};
	# If there isn't, no updating is necessary.
	return unless $nextst;

	# ADMINISTER END OF THE STATE MACHINE (WON2 OR DEAD2)

	if ( $nextst eq 'Won2' or $nextst eq 'Dead' ) {
	$self->{DELPENALTY} = 1000000; # Something awfully large
	$self->{HP} = -10000 if $nextst eq 'Dead';
	--$::ActiveFighters;
	--$::ActiveTeams if $self->{TEAMSIZE}<=1 or $nextst eq 'Won2';
	}

	# ADMINISTER THE MOVING TO THE NEXT STATE

	$st = $self->GetCurrentState( $nextst );
	$self->{'ST'} = $nextst;
	$self->{'FR'} = $st->{'F'};
	die "ERROR IN STATE $nextst" unless defined $st->{DEL};
	$self->{'DEL'} = $st->{'DEL'} * $::DELMULTIPLIER;

	$self-> {'DEL'} += $self->{'DELPENALTY'};
	$self->{'DELPENALTY'} = 0;

	# HANDLE THE JUMP and PUSH ATTRIBUTE

	if ( defined ($st->{'JUMP'}) )
	{
	$self->{'PUSHY'} = -($st->{'JUMP'});
	$self->{'Y'} += $self->{'PUSHY'};
	}
	if ( defined ($st->{'PUSHX'}) )
	{
	$self->{'PUSHX'} += $st->{'PUSHX'} * $self->{DIR};
	}

	# HANDLE THE HIT ATTRIBUTE

	if ( defined ($st->{HIT}) )
	{
	$self->{CHECKHIT} = 1 unless $self->{DELIVERED};
	}
	else
	{
	$self->{DELIVERED} = 0;
	}

	# HANDLE THE SOUND ATTRIBUTE

	if ( defined $st->{SOUND} )
	{
	push @::Sounds, ($st->{SOUND});
	}

	# HANDLE THE CODE ATTRIBUTE

	if ( defined ($st->{CODE}) )
	{
	eval ($st->{CODE}); print $@ if $@;
	}

	# HANDLE DOODADS

	if ( defined ($st->{DOODAD}) )
	{
	# Create a doodad (probably a shot)
	my ($frame, $hit, $doodad, $doodadname);

	$frame = $self->{FRAMES}->[$self->{FR}];
	$hit = $frame->{hit};
	if ( defined $hit )
	{
	$doodadname = $st->{DOODAD};

	$doodad = Doodad::CreateDoodad(
	$self->{X} + $hit->[0] * $::GAMEBITS2 * $self->{DIR},
	$self->{Y} + $hit->[1] * $::GAMEBITS2,
	$doodadname,
	$self->{DIR},
	$self->{NUMBER} );
	}
	}

	}



	=comment
	Pushes the fighter back due to being hit. If the fighter is cornered,
	the other fighter will be pushed back instead.
	=cut

	sub HitPush($$$)
	{
	my ($self, $other, $pushforce) = @_;
	if ( $self->IsCornered )
	{
	$other->{PUSHX} -= $pushforce;
	}
	else
	{
	$self->{PUSHX} += $pushforce;
	}
	}


	=comment
	Returns the characters 'centerline' in physical coordinates.
	=cut

	sub GetCenterX
	{
	my ($self) = @_;
	my ($body, $x);

	$body = $self->{FRAMES}->[$self->{FR}]->{body};
	$x = $body->[0] + $body->[2] + $body->[4] + $body->[6];
	return $self->{X} / $::GAMEBITS2 + $x / 4 * $self->{DIR};
	}


	=comment
	Is my back turned to my opponent? Returns true if it is.
	=cut

	sub IsBackTurned
	{
	my ($self) = @_;

	return ( ($self->{X} - $self->{OTHER}->{X}) * ($self->{DIR}) > 0 );
	}


	=comment
	Is my back turned to my opponent? Returns true if it is.
	=cut

	sub IsBackTurnedTo($)
	{
	my ($self, $other) = @_;

	return ( ($self->{X} - $other->{X}) * ($self->{DIR}) > 0 );
	}


	=comment
	Returns true if the character is at either end of the arena.
	=cut

	sub IsCornered
	{
	my ($self) = @_;

	return (($self->{X} <= $::MOVEMARGIN2 + 16)
	or ($self->{X} >= $::BGWIDTH2 - $::MOVEMARGIN2 - 16));
	}


	return 1;

File Metadata

Mime Type: text/x-diff
Expires: Fri, Sep 12, 9:26 PM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 42940
Default Alt Text: (65 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions