[freedoom] 01/02: New upstream version 0.11.2
Fabian Greffrath
fabian at moszumanska.debian.org
Wed Jun 7 19:30:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
fabian pushed a commit to branch master
in repository freedoom.
commit fc5d30214ac8b828973d39ae534320e761c13313
Author: Fabian Greffrath <fabian at debian.org>
Date: Wed Jun 7 21:29:47 2017 +0200
New upstream version 0.11.2
---
CREDITS | 17 ++++++-
Makefile | 4 +-
README.adoc | 50 +++++++--------------
VERSION | 2 +-
buildcfg.txt | 31 +++++++------
dist/Makefile | 2 +-
graphics/.gitignore | 3 +-
graphics/text/.gitignore | 1 +
graphics/text/Makefile | 29 ++++++------
graphics/text/config.py | 4 ++
graphics/text/textgen | 19 +++++---
graphics/titlepic/Makefile | 23 ++++++----
graphics/titlepic/create_caption | 22 +++++----
graphics/{captainw => titlepic}/freedm_title.png | Bin
graphics/{captainw => titlepic}/freedm_title2.png | Bin
.../fdmtitle.gif => titlepic/freedm_titlepic.gif} | Bin
levels/c2m6.wad | Bin 146192 -> 146222 bytes
levels/c3m1.wad | Bin 90793 -> 90793 bytes
levels/c3m4.wad | Bin 263686 -> 263716 bytes
levels/c4m2.wad | Bin 554773 -> 555047 bytes
levels/dm11.wad | Bin 40686 -> 40686 bytes
levels/dm17.wad | Bin 77208 -> 77238 bytes
levels/dm31.wad | Bin 16312 -> 16342 bytes
levels/map02.wad | Bin 140233 -> 140233 bytes
levels/map09.wad | Bin 205586 -> 205586 bytes
levels/map12.wad | Bin 1550368 -> 1550368 bytes
levels/map17.wad | Bin 125141 -> 125543 bytes
lumps/dehacked.lmp | 35 +++++++++++++--
lumps/fdm_deh.lmp | 2 +-
scripts/makepkgs | 10 ++---
sprites/arm1a0.gif | Bin 1197 -> 1164 bytes
sprites/arm1b0.gif | Bin 1202 -> 1181 bytes
32 files changed, 149 insertions(+), 105 deletions(-)
diff --git a/CREDITS b/CREDITS
index 4634ab2..92ad674 100644
--- a/CREDITS
+++ b/CREDITS
@@ -503,7 +503,7 @@ D: levels
S: Archfile
D: levels
-S: sodaholic
+S: Blastfrog
E: soliver486 at gmail.com
D: graphics, sprites, sounds
@@ -516,6 +516,7 @@ S: nivha
D: levels
S: hex11
+E: hex11 at mail.com
D: levels
N: Luiz Henrique Gasparin Jerônimo
@@ -716,7 +717,7 @@ E: bytebytebeats at gmail.com
D: musics
S: KevinHEZ
-N: Kevin Martinez
+N: Kevin Martins
E: kevinmss14 at gmail.com
D: musics
@@ -755,3 +756,15 @@ D: level names
S: Heng
E: heng at deepthought.earth
D: sprites
+
+S: uhbooh
+E: Uhbooh2 at hotmail.com
+D: textures
+
+S: Litrivin
+D: textures
+
+S: jupiter_ex
+N: Matias M. Roldan
+E: ttrgrmmtn at yahoo.com.ar
+D: musics, sounds
diff --git a/Makefile b/Makefile
index 65aade1..5479a05 100644
--- a/Makefile
+++ b/Makefile
@@ -89,8 +89,8 @@ DISTDOCS=COPYING.txt CREDITS.txt README.html
# Due to convoluted reasons, the WADs must directly proceed the game name.
dist: $(OBJS) COPYING.txt CREDITS.txt README.html
- VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
- VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
+ LC_ALL=C VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
+ LC_ALL=C VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
json: $(OBJS)
ifndef JSON
diff --git a/README.adoc b/README.adoc
index f39b8a5..acc272b 100644
--- a/README.adoc
+++ b/README.adoc
@@ -254,38 +254,22 @@ However, pull requests are much appreciated and you may submit them in
any manner you wish, with GitHub's direct pull requests being the
simplest, but by far not the only means.
-Freedoom uses the commit message format commonly seen in distributed
-version control systems, and adopted by high-profile projects such as
-Linux and Git. The first line of a message needs to be a short
-summary, preferably at a 72-character limit. The summary usually
-begins with a short component name followed by a colon, this can be a
-directory name (eg, `musics:`), a resource name (eg, `map17:`), or a
-more generic component (eg, `build system:`). The summary line must
-not bleed into a second line, and should not be the start of a lengthy
-explanation. If the commit needs further explanation (and they often
-do), use extra paragraphs and write in plain English what the commit
-is about. The commit `2014-08-24T22:42:37Z!fraggle at gmail.com` is a
-good example.
-
-Additionally, do not use commit hashes to refer to other commits. Use
-other kinds of pointers, simple ones like “my previous commit” might
-suffice, or use http://esr.ibiblio.org/?p=3872[action stamps], which
-can improve the meaningfulness of commit identifiers if the repository
-history is rewritten (this has happened at least twice!), or if the
-repository is converted to another VCS (this happened once before).
-At the time of writing (July 2015), core Git does not yet have a
-mechanism to output this format, but you may use a
+Freedoom uses the commit message style commonly seen in distributed
+version control systems, adopted by projects such as Linux and Git.
+For an explanation of this style, see
+https://chris.beams.io/posts/git-commit/[How to Write a Git Commit
+Message].
+
+The commit `2017-02-20T01:52:35Z!mikeonthecomputer at gmail.com` is a
+good example of a properly-written commit.
+
+Do not use commit hashes to refer to other commits. Use other kinds
+of pointers, simple ones like “my previous commit” might suffice, or
+use http://esr.ibiblio.org/?p=3872[action stamps], which can improve
+the meaningfulness of commit identifiers if the repository history is
+rewritten (this has happened at least twice!), or if the repository is
+converted to another VCS (this happened once before). At the time of
+writing (February 2017), core Git does not yet have a mechanism to
+output this format, but you may use a
https://gist.github.com/chungy/195f53bfb9253584e596[shell script] and
place it in your `$PATH` to achieve some ease in generating them.
-
-You should commit at each logical step. Do not bundle up many
-unrelated changes into the same commit, and definitely do not write a
-commit message like “changed some stuff.” Best judgment should be
-used for what constitutes a logical step. It may be just a single
-file, or it may be a group of files representing a monster in the
-game. If you are finding yourself needing to repair previous commits'
-blunders in your private repository, try to take advantage of Git's
-ability to rewrite history , don't use `git revert`, just remove (`git
-reset`), amend (`git commit --amend`), or rebase (`git rebase`) as
-necessary. Leave all the interesting and important history bits,
-leave out stupid mistakes like spell check errors if you catch them.
diff --git a/VERSION b/VERSION
index 4f7638f..4b8f7b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.11.1
+v0.11.2
diff --git a/buildcfg.txt b/buildcfg.txt
index 7ad261d..6d2be1c 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -9,7 +9,7 @@
; -DSHAREWARE to build for shareware doom
;
-; sanity checks:
+; sanity checks:
#ifdef FREEDM
#define DOOM2
@@ -569,14 +569,14 @@ D_ULTIMA = D_DM32
#ifdef ULTDOOM
TITLEPIC 0 0 = fd1title
-M_DOOM 24 -18
+M_DOOM 13 -16
#else
#ifdef FREEDM
TITLEPIC 0 0 = fdmtitle
M_DOOM 40 -5 = m_dm
#else
TITLEPIC 0 0 = fd2title
-M_DOOM 24 -18
+M_DOOM 13 -16
#endif
#endif
@@ -766,8 +766,8 @@ M_QUITG 0 0
M_NGAME 0 0
#ifdef FREEDM
M_SKULL1 = m_rokt1 16 -4
-M_SKULL2 = m_rokt2 16 -4
-#else
+M_SKULL2 = m_rokt2 16 -4
+#else
M_SKULL1 0 -1
M_SKULL2 0 -1
#endif
@@ -1533,7 +1533,7 @@ SSWVH4H6 15 62
SSWVH5 18 61
SSWVI0 25 59
SSWVJ0 28 53
-SSWVK0 26 43
+SSWVK0 26 43
SSWVL0 23 22
SSWVM0 21 7
SSWVN0 26 66
@@ -2094,12 +2094,12 @@ SKULC8C2 18 39
SKULC7C3 19 43
SKULC6C4 16 42
SKULC5 20 43
-SKULD1 22 44
+SKULD1 22 44
SKULD8D2 18 39
SKULD7D3 19 43
SKULD6D4 16 42
SKULD5 20 43
-SKULE1 22 44
+SKULE1 22 44
SKULE8E2 18 39
SKULE7E3 19 43
SKULE6E4 16 42
@@ -2229,8 +2229,8 @@ MANFB8B2 27 17
; These are normal items that appear in both Freedoom and FreeDM.
AMMOA0 14 14
-ARM1A0 15 15
-ARM1B0 15 15
+ARM1A0 15 17
+ARM1B0 15 17
ARM2A0 15 18
ARM2B0 15 18
BAL1A0 8 8
@@ -2592,10 +2592,10 @@ BLOOD2
BLOOD3
CEIL1_2
CEIL1_3
-CEIL3_1
-CEIL3_2
+CEIL3_1
+CEIL3_2
CEIL3_4
-CEIL3_5
+CEIL3_5
CEIL3_6
CEIL4_3
CEIL5_1
@@ -2735,8 +2735,8 @@ CRATOP1
CRATOP2
FLAT19
MFLR8_2
-;These are Aquatex flats.
-SWATER1
+;These are Aquatex flats.
+SWATER1
SWATER2
SWATER3
SWATER4
@@ -2816,4 +2816,3 @@ AQF073
AQF074
AQF075
AQF076
-
diff --git a/dist/Makefile b/dist/Makefile
index 08f98ff..acc4e7c 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -3,7 +3,7 @@ man-%: freedoom.adoc
a2x -f manpage $*.adoc
icon-freedm:
- convert -resize 64x64 ../graphics/captainw/freedm_title2.png \
+ convert -resize 64x64 ../graphics/titlepic/freedm_title2.png \
freedm.png
icon-freedoom1:
diff --git a/graphics/.gitignore b/graphics/.gitignore
index a557c2a..dcd3ec2 100644
--- a/graphics/.gitignore
+++ b/graphics/.gitignore
@@ -75,6 +75,8 @@ m_wad.gif
m_wadopt.gif
m_weap.gif
prboom.gif
+t_phase1.gif
+t_phase2.gif
wibp1.gif
wibp2.gif
wibp3.gif
@@ -99,4 +101,3 @@ wiscrt2.gif
wisucks.gif
witime.gif
wivctms.gif
-
diff --git a/graphics/text/.gitignore b/graphics/text/.gitignore
index bc992ee..f569803 100644
--- a/graphics/text/.gitignore
+++ b/graphics/text/.gitignore
@@ -10,6 +10,7 @@ helpoverlay.png
helpttl.gif
prboom.gif
graphics.stamp
+textgen.mk
credit.gif
credtext*.png
freettl.gif
diff --git a/graphics/text/Makefile b/graphics/text/Makefile
index 627f9b0..97d31d4 100644
--- a/graphics/text/Makefile
+++ b/graphics/text/Makefile
@@ -15,7 +15,7 @@ TEXTGEN_GRAPHIC_LUMPS = \
m_mess.gif m_mouse.gif m_multi.gif m_player.gif m_serial.gif \
m_setup.gif m_sound.gif m_stat.gif m_status.gif m_tcpip.gif \
m_versen.gif m_video.gif m_wad.gif m_wadopt.gif m_weap.gif \
- prboom.gif \
+ prboom.gif t_phase1.gif t_phase2.gif \
m_ultra.gif wibp1.gif wibp2.gif wibp3.gif wibp4.gif \
wicolon.gif wienter.gif wif.gif wifrgs.gif wipcnt.gif \
wiminus.gif wimstar.gif wimstt.gif wiostf.gif wiosti.gif \
@@ -52,24 +52,27 @@ TEXTGEN_GRAPHIC_LUMPS = \
TEXTGEN_GRAPHICS = $(TEXTGEN_GRAPHIC_LUMPS) \
helpttl.gif freettl.gif
-all: $(TEXTGEN_GRAPHICS) help.gif credit.gif wikilrs.gif wivctms.gif
+all: graphics.stamp help.gif credit.gif wikilrs.gif wivctms.gif
# textgen creates multiple outputs, which is awkward to express in
# make. Use a witness file (graphics.stamp) as suggested in the
# automake manual: "Handling Tools that Produce Many Outputs"
-$(TEXTGEN_GRAPHICS): graphics.stamp
- @if test -f $@; then :; else \
- rm -f graphics.stamp; \
- $(MAKE) data.stamp; \
- fi
+graphics.stamp: textgen.mk $(TEXTGEN_GRAPHICS)
cp $(TEXTGEN_GRAPHIC_LUMPS) ../
+ @touch $@
-graphics.stamp: config.py fontchars ../../lumps/dehacked.lmp
- @rm -f graphics.tmp
- @touch graphics.tmp
- ./textgen
- @mv graphics.tmp $@
+# Construct a file of Make directives for each text graphic.
+# Each graphic depends on the directives file, so we tell textgen
+# what its name is, as a command line parameter. The directives
+# file depends on textgen's input (config, font, dehacked).
+
+textgen.mk: config.py fontchars ../../lumps/dehacked.lmp
+ ./textgen $@ > $@
+
+# Then, include the file of Make directives constructed above.
+
+include textgen.mk
# Generate transparent image containing text for the HELP screen:
helptext.png: helpttl.gif
@@ -172,7 +175,7 @@ wivctms.gif:
clean:
rm -f $(TEXTGEN_GRAPHICS) helpbg.png help.gif helptext.png \
- helptext2.png graphics.stamp *.pyc credtext.png \
+ helptext2.png graphics.stamp textgen.mk *.pyc credtext.png \
credtext2.png credit.gif dmwilv*.gif wikilrs.gif \
wivctms.gif wikilrs_horiz.png ../credit.gif ../help.gif \
../wikilrs.gif ../wivctms.gif
diff --git a/graphics/text/config.py b/graphics/text/config.py
index fa6870a..8eec788 100644
--- a/graphics/text/config.py
+++ b/graphics/text/config.py
@@ -64,6 +64,10 @@ white_graphics = {
'wibp3': 'P3',
'wibp4': 'P4',
'wicolon': ':',
+
+ # These files are for the title screens of Phase 1 and Phase 2
+ 't_phase1': 'PHASE 1',
+ 't_phase2': 'PHASE 2',
# Note: level names are also included in this dictionary, with
# the data added programatically from the DEHACKED lump, see
diff --git a/graphics/text/textgen b/graphics/text/textgen
index b647a5f..a08dcdf 100755
--- a/graphics/text/textgen
+++ b/graphics/text/textgen
@@ -138,9 +138,11 @@ class Font(object):
return command_line
- def render_text(self, text, output_filename,
+ def get_command(self, text, output_filename,
color=COLOR_WHITE, bgcolor=BACKGROUND_COLOR):
- """Render text to a file with the given background color."""
+ """Get command to render text to a file
+ with the given background color.
+ """
if UPPERCASE_FONT:
text = text.upper()
@@ -152,13 +154,17 @@ class Font(object):
command_line.append(output_filename)
- invoke_command(command_line)
+ return command_line
def generate_graphics(graphics, color=COLOR_WHITE, bgcolor=BACKGROUND_COLOR):
for name, text in sorted(graphics.items()):
print("# %s.gif: '%s'" % (name, text))
- font.render_text(text, '%s.gif' % name,
- color=color, bgcolor=bgcolor)
+ # write a makefile fragment
+ target = '%s.gif' % name
+ cmd = font.get_command(text, target,
+ color=color, bgcolor=bgcolor)
+ print("%s: %s" % (target, " ".join(sys.argv[1:])))
+ print("\t" + " ".join("'%s'" % i for i in cmd))
def generate_kerning_test():
pairs = []
@@ -169,7 +175,8 @@ def generate_kerning_test():
if font.kerning_adjust(char1, char2) != 0:
pairs.append(char1 + char2)
- font.render_text(" ".join(pairs), "kerning.gif")
+ cmd = font.get_command(" ".join(pairs), "kerning.gif")
+ invoke_command(cmd)
font = Font('fontchars', kerning_table=FONT_KERNING_RULES)
diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile
index bb03f6e..d060ebd 100644
--- a/graphics/titlepic/Makefile
+++ b/graphics/titlepic/Makefile
@@ -6,20 +6,27 @@ m_doom.gif: ../m_doom.gif
m_dm.gif: ../m_dm.gif
convert -transparent '#00ffff' ../m_dm.gif m_dm.gif
-fd1title.gif: titlepic.gif m_doom.gif
- ./create_caption titlepic.gif m_doom.gif "Phase 1" $@
+t_phase1.gif: ../t_phase1.gif
+ convert -transparent '#00ffff' ../t_phase1.gif t_phase1.gif
+
+t_phase2.gif: ../t_phase2.gif
+ convert -transparent '#00ffff' ../t_phase2.gif t_phase2.gif
+
+fd1title.gif: titlepic.gif m_doom.gif t_phase1.gif
+ ./create_caption titlepic.gif m_doom.gif t_phase1.gif $@
cp $@ ../
-fd2title.gif: titlepic.gif m_doom.gif
- ./create_caption titlepic.gif m_doom.gif "Phase 2" $@
+fd2title.gif: titlepic.gif m_doom.gif t_phase2.gif
+ ./create_caption titlepic.gif m_doom.gif t_phase2.gif $@
cp $@ ../
-fdmtitle.gif: ../captainw/fdmtitle.gif
- ./create_caption ../captainw/fdmtitle.gif $@
+fdmtitle.gif: freedm_titlepic.gif
+ ./create_caption $< $@
cp $@ ../
clean:
- rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \
- ../fd1title.gif ../fd2title.gif ../fdmtitle.gif
+ rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \
+ ../fd1title.gif ../fd2title.gif ../fdmtitle.gif t_phase1.gif \
+ t_phase2.gif
.PHONY: clean
diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption
index 916bab2..3a45d2d 100755
--- a/graphics/titlepic/create_caption
+++ b/graphics/titlepic/create_caption
@@ -19,24 +19,22 @@ draw_with_footer() {
output_file=$2;
shift; shift
- convert $input_file -fill white -font "$font" +dither \
- -pointsize 11 \
- -gravity southwest \
- -draw "text 5,5 'https://freedoom.github.io/'" \
- -gravity southeast \
- -draw "text 10,5 'Version: $VERSION'" \
- "$@" \
+ convert $input_file -fill orange -font "$font" +dither \
+ -pointsize 11 \
+ -gravity southwest \
+ -draw "text 5,5 '© 2001-2017'" \
+ -gravity southeast \
+ -draw "text 10,5 '$VERSION'" \
+ "$@" \
$output_file
}
if [ $# = 4 ]; then
draw_with_footer "$1" "$4" \
-gravity north \
- -draw "image over -6,2 0,0 '$2'" \
- -pointsize 20 \
- -draw "fill black stroke-width 4 stroke black text -5,160 '$3'" \
- -draw "text -5,160 '$3'"
+ -draw "image over 0,18 0,0 '$2'" \
+ -gravity south \
+ -draw "image over 0,30 0,0 '$3'"
else
draw_with_footer "$1" "$2"
fi
-
diff --git a/graphics/captainw/freedm_title.png b/graphics/titlepic/freedm_title.png
similarity index 100%
rename from graphics/captainw/freedm_title.png
rename to graphics/titlepic/freedm_title.png
diff --git a/graphics/captainw/freedm_title2.png b/graphics/titlepic/freedm_title2.png
similarity index 100%
rename from graphics/captainw/freedm_title2.png
rename to graphics/titlepic/freedm_title2.png
diff --git a/graphics/captainw/fdmtitle.gif b/graphics/titlepic/freedm_titlepic.gif
similarity index 100%
rename from graphics/captainw/fdmtitle.gif
rename to graphics/titlepic/freedm_titlepic.gif
diff --git a/levels/c2m6.wad b/levels/c2m6.wad
index 7c06307..f4394c8 100644
Binary files a/levels/c2m6.wad and b/levels/c2m6.wad differ
diff --git a/levels/c3m1.wad b/levels/c3m1.wad
index 8ee0ec4..3e59e63 100644
Binary files a/levels/c3m1.wad and b/levels/c3m1.wad differ
diff --git a/levels/c3m4.wad b/levels/c3m4.wad
index 83b4c13..8c9fee1 100644
Binary files a/levels/c3m4.wad and b/levels/c3m4.wad differ
diff --git a/levels/c4m2.wad b/levels/c4m2.wad
index 2d9d2fc..73d0eea 100644
Binary files a/levels/c4m2.wad and b/levels/c4m2.wad differ
diff --git a/levels/dm11.wad b/levels/dm11.wad
index 998e6e2..6aa77ff 100644
Binary files a/levels/dm11.wad and b/levels/dm11.wad differ
diff --git a/levels/dm17.wad b/levels/dm17.wad
index 7dfaf69..f5ea066 100644
Binary files a/levels/dm17.wad and b/levels/dm17.wad differ
diff --git a/levels/dm31.wad b/levels/dm31.wad
index da4ae31..c5d3a1a 100644
Binary files a/levels/dm31.wad and b/levels/dm31.wad differ
diff --git a/levels/map02.wad b/levels/map02.wad
index 0f176f0..b73d929 100644
Binary files a/levels/map02.wad and b/levels/map02.wad differ
diff --git a/levels/map09.wad b/levels/map09.wad
index 5cbae35..b8ed688 100644
Binary files a/levels/map09.wad and b/levels/map09.wad differ
diff --git a/levels/map12.wad b/levels/map12.wad
index 452f165..081a99e 100644
Binary files a/levels/map12.wad and b/levels/map12.wad differ
diff --git a/levels/map17.wad b/levels/map17.wad
index 73fa90b..9629f7f 100644
Binary files a/levels/map17.wad and b/levels/map17.wad differ
diff --git a/lumps/dehacked.lmp b/lumps/dehacked.lmp
index 1b21616..ac63307 100644
--- a/lumps/dehacked.lmp
+++ b/lumps/dehacked.lmp
@@ -15,6 +15,33 @@ Patch format = 6
# comment. Comment also indicates when the run was done - ideally
# this should be re-done for every new release. Times are rounded
# to nearest half-minute.
+par 1 1 30 # 00:30 - Voros for v0.12 - 2017/03
+par 1 2 120 # 02:00 - Voros for v0.12 - 2017/03
+par 1 3 150 # 02:30 - Voros for v0.12 - 2017/03
+par 1 4 180 # 03:00 - Voros for v0.12 - 2017/03
+par 1 5 420 # 07:00 - Voros for v0.12 - 2017/03
+par 1 6 390 # 06:30 - Voros for v0.12 - 2017/03
+par 1 7 690 # 11:30 - Voros for v0.12 - 2017/03
+par 1 8 60 # 01:00 - Voros for v0.12 - 2017/03
+par 1 9 30 # 01:30 - Voros for v0.12 - 2017/03
+par 2 1 120 # 02:00 - Voros for v0.12 - 2017/03
+par 2 2 150 # 02:30 - Voros for v0.12 - 2017/03
+par 2 3 180 # 03:00 - Voros for v0.12 - 2017/03
+par 2 4 270 # 04:30 - Voros for v0.12 - 2017/03
+par 2 5 300 # 05:00 - Voros for v0.12 - 2017/03
+par 2 6 150 # 02:30 - Voros for v0.12 - 2017/03
+par 2 7 120 # 02:00 - Voros for v0.12 - 2017/03
+par 2 8 120 # 02:00 - Voros for v0.12 - 2017/03
+par 2 9 360 # 06:00 - Voros for v0.12 - 2017/03
+par 3 1 30 # 00:30 - Voros for v0.12 - 2017/03
+par 3 2 120 # 02:00 - Voros for v0.12 - 2017/03
+par 3 3 240 # 04:00 - Voros for v0.12 - 2017/03
+par 3 4 270 # 04:30 - Voros for v0.12 - 2017/03
+par 3 5 0 # 00:00
+par 3 6 180 # 03:00 - Voros for v0.12 - 2017/03
+par 3 7 300 # 05:00 - Voros for v0.12 - 2017/03
+par 3 8 60 # 01:00 - Voros for v0.12 - 2017/03
+par 3 9 570 # 09:30 - Voros for v0.12 - 2017/03
par 1 30 # 00:30 - Voros for v0.11 - 2017/02
par 2 90 # 01:30 - Voros for v0.11 - 2017/02
par 3 120 # 02:00 - Voros for v0.11 - 2017/02
@@ -111,22 +138,22 @@ HUSTR_E1M4 = C1M4: Supply Depot
HUSTR_E1M5 = C1M5: Main Control
HUSTR_E1M6 = C1M6: Training Facility
HUSTR_E1M7 = C1M7: Transportation Bay
-HUSTR_E1M8 = C1M8: Quarry
+HUSTR_E1M8 = C1M8: Outpost Quarry
HUSTR_E1M9 = C1M9: Armory
HUSTR_E2M1 = C2M1: Ruins
HUSTR_E2M2 = C2M2: Power Plant
HUSTR_E2M3 = C2M3: Archaelogy Site
HUSTR_E2M4 = C2M4: Sample Holding Site
HUSTR_E2M5 = C2M5: Fortress 31
-HUSTR_E2M6 = C2M6: Field Work
+HUSTR_E2M6 = C2M6: Trepidation Site
HUSTR_E2M7 = C2M7: Quarantine Vessel
HUSTR_E2M8 = C2M8: Containment Cell
HUSTR_E2M9 = C2M9: Corruption of Man
HUSTR_E3M1 = C3M1: Land of the Lost
HUSTR_E3M2 = C3M2: Infernal Caverns
-HUSTR_E3M3 = C3M3: Forbidden Tunnels
+HUSTR_E3M3 = C3M3: Derelict Temple
HUSTR_E3M4 = C3M4: Sacrificial Bastion
-HUSTR_E3M5 = C3M5
+HUSTR_E3M5 = C3M5: Oblation Temple
HUSTR_E3M6 = C3M6: Igneous Intrusion
HUSTR_E3M7 = C3M7: No Regrets
HUSTR_E3M8 = C3M8: Ancient Lair
diff --git a/lumps/fdm_deh.lmp b/lumps/fdm_deh.lmp
index 3e0ad6d..bf44fe7 100644
--- a/lumps/fdm_deh.lmp
+++ b/lumps/fdm_deh.lmp
@@ -156,7 +156,7 @@ CC_HERO = savior of humanity
HUSTR_1 = DM01: Tech Test
HUSTR_2 = DM02: Natural Station
HUSTR_3 = DM03: Issues of Claveria
-HUSTR_4 = DM04: Metal
+HUSTR_4 = DM04: Steel
HUSTR_5 = DM05: Xindage Hideout
HUSTR_6 = DM06: Tomb of Ledemir
HUSTR_7 = DM07: Main Stronghold
diff --git a/scripts/makepkgs b/scripts/makepkgs
index f5fcdcf..2d3242a 100755
--- a/scripts/makepkgs
+++ b/scripts/makepkgs
@@ -34,14 +34,14 @@ full_path = path + "/" + base_dir
# Create directory and add files
-run_command("mkdir %s" % full_path)
+run_command("mkdir {}".format(full_path))
for file in FILES:
- run_command("cp %s %s" % (file, full_path))
+ run_command("cp {} {}".format(file, full_path))
orig_dir = os.getcwd()
os.chdir(path)
-run_command("rm -f %s.zip" % base_dir)
-run_command("zip -r %s.zip %s" % (base_dir, base_dir))
-run_command("rm -rf %s" % base_dir)
+run_command("rm -f {}.zip".format(base_dir))
+run_command("zip -X {0}.zip {0} {0}/*".format(base_dir))
+run_command("rm -rf {}".format(base_dir))
os.chdir(orig_dir)
diff --git a/sprites/arm1a0.gif b/sprites/arm1a0.gif
index 6f88a74..0251109 100644
Binary files a/sprites/arm1a0.gif and b/sprites/arm1a0.gif differ
diff --git a/sprites/arm1b0.gif b/sprites/arm1b0.gif
index 919f903..969bc5e 100644
Binary files a/sprites/arm1b0.gif and b/sprites/arm1b0.gif differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freedoom.git
More information about the Pkg-games-commits
mailing list