Updated the game now that sdl2 is fixed. Looks like there is no more need to keep some older patches. Lua is needed to build. Bison is not needed, only optional, and some other changes.
I'm new on porting, so I'm doubt about how to properly set egcc to be used, since even that new gcc is installed, the make wasn't using it. I did by setting CC and CXX to egcc and eg++, if there is a better way of doing it please correct.
Index: Makefile =================================================================== RCS file: /cvs/ports/games/stone-soup/Makefile,v retrieving revision 1.23 diff -u -p -u -r1.23 Makefile --- Makefile 4 Dec 2015 20:47:53 -0000 1.23 +++ Makefile 28 Jan 2016 17:04:51 -0000 @@ -7,8 +7,8 @@ COMMENT = dungeon crawl stone soup CATEGORIES = games HOMEPAGE = http://crawl.develz.org/ -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crawl-ref/} -VERSION = 0.15.2 +MASTER_SITES = http://crawl.develz.org/release/ +VERSION = 0.17.1 DISTNAME= stone_soup-${VERSION}-nodeps EXTRACT_SUFX= .tar.xz PKGNAME= stone-soup-${VERSION} @@ -17,9 +17,12 @@ REVISION= 0 WRKDIST = ${WRKDIR}/stone_soup-${VERSION} WRKSRC = ${WRKDIST}/source USE_GMAKE = Yes -CFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" -CXXFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" -MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ +CFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" +CXXFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" +CC = egcc +CXX = eg++ +MAKE_FLAGS = CC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"\ + NO_OPTIMIZE=y \ LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ LUA_LIB=${MODLUA_LIB} \ SQLITE_INCLUDE_DIR=/usr/include \ @@ -27,9 +30,6 @@ MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ INSTALL_UGRP=root:wheel \ prefix=${PREFIX} \ SAVEDIR="~/.crawl" \ - PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" \ - MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \ - NO_YACC=1 \ V=1 MAKE_ENV += MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION} @@ -38,8 +38,8 @@ MODGCC4_LANGS = c++ MODULES = gcc4 lang/lua WANTLIB = c m ${MODLUA_WANTLIB} sqlite3 -BUILD_DEPENDS = devel/bison \ - graphics/pngcrush +BUILD_DEPENDS = graphics/pngcrush \ + lang/lua/5.1 # Almost nethack... PERMIT_PACKAGE_FTP = Yes @@ -52,17 +52,14 @@ FLAVOR ?= WANTLIB += ncursesw pthread z MAKE_FLAGS += USE_UNICODE=y UNICODE_LOCALE=y .else -# This should be automatically set during "gmake -C rltiles..." but isn't... -CFLAGS += -DUSE_TILE -CXXFLAGS += -DUSE_TILE - MAKE_FLAGS += TILES=y \ - YACC=yacc \ - LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread" -WANTLIB += GL GLU SDL SDL_image freetype png pthread z -RUN_DEPENDS = devel/desktop-file-utils -LIB_DEPENDS += devel/sdl \ - devel/sdl-image \ + PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" \ + MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \ + LDFLAGS="-L${LOCALBASE}/lib -lpng -lSDL2 -lSDL2_image" + +WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z +LIB_DEPENDS += devel/sdl2 \ + devel/sdl2-image \ graphics/png .endif @@ -70,7 +67,16 @@ post-install: mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss chmod 755 ${PREFIX}/bin/crawl-ss ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6 - ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs +# install docs manually + @mkdir -p ${PREFIX}/share/doc/crawl/ + @mkdir -p ${PREFIX}/share/doc/crawl/develop/levels + @mkdir -p ${PREFIX}/share/doc/crawl/license + ${INSTALL_DATA} ${WRKDIST}/docs/quickstart.txt ${PREFIX}/share/doc/crawl/quickstart.txt + ${INSTALL_DATA} ${WRKDIST}/docs/*.txt ${PREFIX}/share/doc/crawl/ + ${INSTALL_DATA} ${WRKDIST}/docs/develop/*.txt ${PREFIX}/share/doc/crawl/develop + ${INSTALL_DATA} ${WRKDIST}/docs/develop/levels/*.txt ${PREFIX}/share/doc/crawl/develop/levels + ${INSTALL_DATA} ${WRKDIST}/docs/license/*.txt ${PREFIX}/share/doc/crawl/license + ${INSTALL_DATA} ${WRKDIST}/CREDITS.txt ${PREFIX}/share/doc/crawl/ .if ! ${FLAVOR:Mno_x11} ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications ${INSTALL_DATA} \ Index: distinfo =================================================================== RCS file: /cvs/ports/games/stone-soup/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- distinfo 7 Apr 2015 10:10:28 -0000 1.4 +++ distinfo 28 Jan 2016 17:04:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = 6TqCiAgB+2B5TJwFzLqwPVx+HxBeWWjSzrx2DTh6IeI= -SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684 +SHA256 (stone_soup-0.17.1-nodeps.tar.xz) = YxTqginsWyeAT/F4iYi9EQoWqt62svJmYGRcQ+z8Sd0= +SIZE (stone_soup-0.17.1-nodeps.tar.xz) = 9114224 Index: patches/patch-source_Makefile =================================================================== RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-source_Makefile --- patches/patch-source_Makefile 7 Apr 2015 10:10:28 -0000 1.2 +++ patches/patch-source_Makefile 28 Jan 2016 17:04:51 -0000 @@ -1,34 +1,49 @@ -$OpenBSD: patch-source_Makefile,v 1.2 2015/04/07 10:10:28 stsp Exp $ ---- source/Makefile.orig Thu Aug 28 04:28:56 2014 -+++ source/Makefile Mon Apr 6 15:44:58 2015 -@@ -591,8 +591,8 @@ ifndef BUILD_LUA +$OpenBSD$ +--- source/Makefile.orig Thu Jan 28 00:08:59 2016 ++++ source/Makefile Thu Jan 28 00:11:59 2016 +@@ -640,8 +640,8 @@ ifndef BUILD_LUA BUILD_LUA = yes endif else - ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),) - ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),) -+ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo no),) -+ ifneq ($(shell $(PKGCONFIG) lua-${MODLUA_DEP_VERSION} --exists || echo no),) ++ ifneq ($(shell $(PKGCONFIG) lua51 --exists || echo no),) ++ ifneq ($(shell $(PKGCONFIG) lua51 --exists || echo no),) ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) BUILD_LUA = yes else -@@ -603,16 +603,16 @@ ifndef BUILD_LUA +@@ -652,10 +652,10 @@ ifndef BUILD_LUA endif endif else - LUA_PACKAGE = lua-5.1 -+ LUA_PACKAGE = lua-${MODLUA_DEP_VERSION} ++ LUA_PACKAGE = lua51 endif else - LUA_PACKAGE = lua5.1 -+ LUA_PACKAGE = lua${MODLUA_DEP_VERSION} ++ LUA_PACKAGE = lua51 endif endif endif - ifndef BUILD_LUA - ifndef LUA_PACKAGE -- LUA_PACKAGE = lua5.1 -+ LUA_PACKAGE = lua${MODLUA_DEP_VERSION} - endif - INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /') - CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) +@@ -1417,9 +1417,6 @@ endif + for LANG in $(LANGUAGES); \ + do mkdir -p $(datadir_fp)/dat/descript/$$LANG; \ + done +- mkdir -p $(datadir_fp)/docs/develop +- mkdir -p $(datadir_fp)/docs/develop/levels +- mkdir -p $(datadir_fp)/docs/license + mkdir -p $(datadir_fp)/settings + $(COPY_R) dat/des/* $(datadir_fp)/dat/des/ + $(COPY_R) dat/dlua/* $(datadir_fp)/dat/dlua/ +@@ -1436,11 +1433,6 @@ endif + for LANG in $(LANGUAGES); \ + do $(COPY) dat/descript/$$LANG/*.txt $(datadir_fp)/dat/descript/$$LANG; \ + done +- $(COPY) ../docs/*.txt $(datadir_fp)/docs/ +- $(COPY) ../docs/develop/*.txt $(datadir_fp)/docs/develop/ +- $(COPY) ../docs/develop/levels/*.txt $(datadir_fp)/docs/develop/levels/ +- $(COPY) ../docs/license/*.txt $(datadir_fp)/docs/license/ +- $(COPY) ../CREDITS.txt $(datadir_fp)/docs/ + $(COPY) ../settings/* $(datadir_fp)/settings/ + ifeq ($(GAME),crawl.exe) + sed -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -o -iname '*.des'` Index: patches/patch-source_command_cc =================================================================== RCS file: patches/patch-source_command_cc diff -N patches/patch-source_command_cc --- patches/patch-source_command_cc 7 Apr 2015 10:10:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-source_command_cc,v 1.3 2015/04/07 10:10:28 stsp Exp $ ---- source/command.cc.orig Thu Aug 28 04:29:10 2014 -+++ source/command.cc Mon Apr 6 15:27:57 2015 -@@ -698,7 +698,7 @@ struct help_file - static help_file help_files[] = - { - { "crawl_manual.txt", '*', true }, -- { "../README.txt", '!', false }, -+ { "README.txt", '!', false }, - { "aptitudes.txt", '%', false }, - { "quickstart.txt", '^', false }, - { "macros_guide.txt", '~', false }, Index: patches/patch-source_dat_des_branches_dis_des =================================================================== RCS file: patches/patch-source_dat_des_branches_dis_des diff -N patches/patch-source_dat_des_branches_dis_des --- patches/patch-source_dat_des_branches_dis_des 7 Apr 2015 10:10:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-source_dat_des_branches_dis_des,v 1.1 2015/04/07 10:10:28 stsp Exp $ ---- source/dat/des/branches/dis.des.orig Mon Apr 6 16:05:20 2015 -+++ source/dat/des/branches/dis.des Mon Apr 6 16:05:29 2015 -@@ -209,8 +209,7 @@ KMONS: E = lich - KMONS: F = executioner - KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 skeleton w:15 - KMONS: ? = patrolling iron imp --: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, \ --: human corpse / human skeleton') -+: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, human corpse / human skeleton') - : else - KMONS: 01 = ghost moth - KMONS: 23 = golden dragon Index: patches/patch-source_dat_des_builder_shops_des =================================================================== RCS file: patches/patch-source_dat_des_builder_shops_des diff -N patches/patch-source_dat_des_builder_shops_des --- patches/patch-source_dat_des_builder_shops_des 7 Apr 2015 10:10:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-source_dat_des_builder_shops_des,v 1.1 2015/04/07 10:10:28 stsp Exp $ ---- source/dat/des/builder/shops.des.orig Mon Apr 6 16:15:14 2015 -+++ source/dat/des/builder/shops.des Mon Apr 6 16:16:25 2015 -@@ -387,15 +387,7 @@ SUBST: G : YlG - : local shopname = util.random_from({"type:Blasphemy suffix:Boutique", - : "type:Evil suffix:Emporium", "type:Profane suffix:Products", - : "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"}) --: kfeat("s = general shop " .. shopname .. " ; \ --: potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | \ --: any weapon ego:vampirism w:5 | demon blade w:5 | \ --: demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | \ --: staff of death | \ --: lantern of shadows w:5 | book of necromancy | book of death | \ --: book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | \ --: grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | \ --: bastard sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1") -+: kfeat("s = general shop " .. shopname .. " ; potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | any weapon ego:vampirism w:5 | demon blade w:5 | demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | staff of death | lantern of shadows w:5 | book of necromancy | book of death | book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | bastard sword unrand:sword_of_zonguldrok w:1 | mace unrand:sceptre_of_torment w:1") - KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \ - altar_beogh w:1 / altar_lugonu w:1 - MAP Index: patches/patch-source_dat_des_variable_grated_community_des =================================================================== RCS file: patches/patch-source_dat_des_variable_grated_community_des diff -N patches/patch-source_dat_des_variable_grated_community_des --- patches/patch-source_dat_des_variable_grated_community_des 7 Apr 2015 10:10:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,68 +0,0 @@ -$OpenBSD: patch-source_dat_des_variable_grated_community_des,v 1.1 2015/04/07 10:10:28 stsp Exp $ ---- source/dat/des/variable/grated_community.des.orig Mon Apr 6 16:17:17 2015 -+++ source/dat/des/variable/grated_community.des Mon Apr 6 16:20:14 2015 -@@ -67,11 +67,7 @@ KFEAT: B = food shop name:Jack type:Jerk-a-riffic suf - KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \ - greed:50 ; potion of confusion - : local smithy = string.gsub(crawl.make_name(), " ", "_") --: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " \ --: type:Legendary suffix:Smithy count:10 greed:40 ;\ --: damaged plate armour ego:none | damaged chain mail ego:none |\ --: damaged long sword ego:none | damaged shield ego:none |\ --: damaged large shield ego:none | damaged battleaxe ego:none") -+: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " type:Legendary suffix:Smithy count:10 greed:40 ; damaged plate armour ego:none | damaged chain mail ego:none | damaged long sword ego:none | damaged shield ego:none | damaged large shield ego:none | damaged battleaxe ego:none") - SHUFFLE: QRSTUVX - SUBVAULT: Q : grated_community_mu_home1 - SUBVAULT: R : grated_community_mu_home2 -@@ -168,16 +164,11 @@ MARKER: + = lua:restrict_door() - KFEAT: ~ = closed_door - SUBST: * = *:35 -:1 - KITEM: - = animal skin --: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\ --: elf skeleton / kobold skeleton /\ --: elephant skeleton / sheep skeleton /\ --: manticore skeleton', 'animal skin') -+: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton / elf skeleton / kobold skeleton / elephant skeleton / sheep skeleton / manticore skeleton', 'animal skin') - KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\ - w:5 altar_beogh / w:1 altar_makhleb / w:4 floor - KITEM: $ = q:5 meat ration, giant spiked club, q:2 beef jerky --: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, \ --: q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, \ --: giant spiked club / giant club / nothing") -+: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 nothing, q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, giant spiked club / giant club / nothing") - : local frosty = crawl.random2(6) - : if frosty == 5 then - SUBST: 1 = 2 -@@ -220,10 +211,8 @@ MONS: lich / w:8 ancient lich / w:5 greater mummy - KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 altar_yredelemnul - KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing - KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor --: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment /\ --: nothing, any scroll / nothing") --: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\ --: nothing, any potion / nothing") -+: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment / nothing, any scroll / nothing") -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing") - KITEM: & = book of necromancy / book of death / book of unlife / w:12 nothing - KMONS: P = col:darkgrey plant name:withered name_adjective \ - tile:mons_withered_plant / col:lightgrey plant name:withered \ -@@ -235,8 +224,7 @@ KITEM: " = gold, any potion / nothing, any potion / no - nothing - KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor - KITEM: ? = scroll of recharging / nothing, any scroll / nothing --: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\ --: nothing, any potion / nothing") -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / nothing, any potion / nothing") - KITEM: & = book of wizardry / book of power / book of party tricks /\ - book of alchemy / w:12 nothing - KMONS: P = plant -@@ -248,8 +236,7 @@ KITEM: " = gold, wand of draining / wand of fire / wan - potion of brilliance / nothing - KFEAT: 8 = granite_statue / w:1 floor - KITEM: ? = scroll of immolation / nothing, any scroll / nothing --: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation /\ --: nothing, any potion / nothing") -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation / nothing, any potion / nothing") - KITEM: & = book of fire / book of power / book of ice /\ - book of the tempests / w:12 nothing - KFEAT: P = granite_statue Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/stone-soup/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -r1.5 PLIST --- pkg/PLIST 7 Apr 2015 10:10:28 -0000 1.5 +++ pkg/PLIST 28 Jan 2016 17:04:51 -0000 @@ -1,17 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.5 2015/04/07 10:10:28 stsp Exp $ +@comment $OpenBSD$ @bin bin/crawl-ss @man man/man6/crawl-ss.6 +share/applications/ +share/applications/stone-soup.desktop share/crawl/ share/crawl/dat/ share/crawl/dat/clua/ share/crawl/dat/clua/autofight.lua share/crawl/dat/clua/automagic.lua -share/crawl/dat/clua/gearset.lua share/crawl/dat/clua/kills.lua share/crawl/dat/clua/runrest.lua share/crawl/dat/clua/stash.lua -share/crawl/dat/clua/trapwalk.lua -share/crawl/dat/clua/wield.lua share/crawl/dat/database/ share/crawl/dat/database/FAQ.txt share/crawl/dat/database/el/ @@ -40,6 +39,7 @@ share/crawl/dat/database/wpnnoise.txt share/crawl/dat/defaults/ share/crawl/dat/defaults/autopickup_exceptions.txt share/crawl/dat/defaults/food_colouring.txt +share/crawl/dat/defaults/glyph_colours.txt share/crawl/dat/defaults/menu_colours.txt share/crawl/dat/defaults/messages.txt share/crawl/dat/defaults/misc.txt @@ -94,16 +94,20 @@ share/crawl/dat/des/branches/vaults_room share/crawl/dat/des/branches/vaults_rooms_standard.des share/crawl/dat/des/branches/zot.des share/crawl/dat/des/builder/ +share/crawl/dat/des/builder/alphashops.des share/crawl/dat/des/builder/arena.des share/crawl/dat/des/builder/decor.des share/crawl/dat/des/builder/dummy.des share/crawl/dat/des/builder/food.des share/crawl/dat/des/builder/layout.des share/crawl/dat/des/builder/layout_caves.des +share/crawl/dat/des/builder/layout_cc.des share/crawl/dat/des/builder/layout_cellular.des share/crawl/dat/des/builder/layout_city.des +share/crawl/dat/des/builder/layout_delve.des share/crawl/dat/des/builder/layout_forest.des share/crawl/dat/des/builder/layout_geoelf.des +share/crawl/dat/des/builder/layout_geoelf_castle.des share/crawl/dat/des/builder/layout_grids.des share/crawl/dat/des/builder/layout_halls.des share/crawl/dat/des/builder/layout_loops.des @@ -138,7 +142,6 @@ share/crawl/dat/des/serial/gnoll_camp.de share/crawl/dat/des/serial/ice.des share/crawl/dat/des/serial/magic_research.des share/crawl/dat/des/serial/park.des -share/crawl/dat/des/serial/ponds.des share/crawl/dat/des/serial/serial_guide.txt share/crawl/dat/des/serial/sigils.des share/crawl/dat/des/serial/undead.des @@ -158,7 +161,6 @@ share/crawl/dat/des/test.des share/crawl/dat/des/test/suite-los.des share/crawl/dat/des/test/suite.des share/crawl/dat/des/traps/ -share/crawl/dat/des/traps/beogh_trap.des share/crawl/dat/des/traps/boulders.des share/crawl/dat/des/traps/grate.des share/crawl/dat/des/traps/rats_trap.des @@ -171,7 +173,6 @@ share/crawl/dat/des/tutorial/lesson4.des share/crawl/dat/des/tutorial/lesson5.des share/crawl/dat/des/variable/ share/crawl/dat/des/variable/ambush.des -share/crawl/dat/des/variable/ancient_champions.des share/crawl/dat/des/variable/arcadia.des share/crawl/dat/des/variable/cathedral_bats.des share/crawl/dat/des/variable/compat.des @@ -185,8 +186,6 @@ share/crawl/dat/des/variable/lemuel_cast share/crawl/dat/des/variable/mini.des share/crawl/dat/des/variable/mini_features.des share/crawl/dat/des/variable/mini_monsters.des -share/crawl/dat/des/zotdef/ -share/crawl/dat/des/zotdef/zotdef.des share/crawl/dat/descript/ share/crawl/dat/descript/ability.txt share/crawl/dat/descript/backgrounds.txt @@ -393,7 +392,6 @@ share/crawl/dat/descript/pl/features.txt share/crawl/dat/descript/pl/gods.txt share/crawl/dat/descript/pl/hints.txt share/crawl/dat/descript/pl/items.txt -share/crawl/dat/descript/pl/monsters.txt share/crawl/dat/descript/pl/quotes.txt share/crawl/dat/descript/pl/skills.txt share/crawl/dat/descript/pl/species.txt @@ -523,6 +521,7 @@ share/crawl/dat/dlua/loadmaps.lua share/crawl/dat/dlua/luamark.lua share/crawl/dat/dlua/macro.lua share/crawl/dat/dlua/mapinit.lua +share/crawl/dat/dlua/persist.lua share/crawl/dat/dlua/point.lua share/crawl/dat/dlua/profiler.lua share/crawl/dat/dlua/sanity.lua @@ -540,54 +539,41 @@ share/crawl/dat/dlua/v_rooms.lua share/crawl/dat/dlua/v_shapes.lua share/crawl/dat/dlua/vault.lua share/crawl/dat/dlua/ziggurat.lua -share/crawl/docs/ -@comment share/crawl/docs/034_changes.txt -share/crawl/docs/CREDITS.txt -share/crawl/docs/README.txt -share/crawl/docs/aptitudes.txt -share/crawl/docs/arena.txt -@comment share/crawl/docs/changelog.txt -share/crawl/docs/crawl_manual.txt -@comment share/crawl/docs/develop/ -@comment share/crawl/docs/develop/IRC.txt -@comment share/crawl/docs/develop/android.txt -@comment share/crawl/docs/develop/coding_conventions.txt -@comment share/crawl/docs/develop/gdb_tips.txt -@comment share/crawl/docs/develop/levels/ -@comment share/crawl/docs/develop/levels/advanced.txt -@comment share/crawl/docs/develop/levels/introduction.txt -@comment share/crawl/docs/develop/levels/syntax.txt -@comment share/crawl/docs/develop/levels/triggerables.txt -@comment share/crawl/docs/develop/monster_speech.txt -@comment share/crawl/docs/develop/new_dev_checklist.txt -@comment share/crawl/docs/develop/patch_guide.txt -@comment share/crawl/docs/develop/process.txt -@comment share/crawl/docs/develop/release.txt -@comment share/crawl/docs/develop/save_compatibility.txt -@comment share/crawl/docs/develop/spells.txt -@comment share/crawl/docs/develop/testing.txt -@comment share/crawl/docs/develop/tiles_creation.txt -@comment share/crawl/docs/develop/translation.txt -share/crawl/docs/fight_simulator.txt -@comment share/crawl/docs/key_changes.txt -share/crawl/docs/keybind.txt -@comment share/crawl/docs/license/mt19937.txt -@comment share/crawl/docs/license/ -@comment share/crawl/docs/license/cc0.txt -@comment share/crawl/docs/license/lgpl.txt -@comment share/crawl/docs/license/libpng-LICENSE.txt -@comment share/crawl/docs/license/lualicense.txt -@comment share/crawl/docs/license/pcre_license.txt -@comment share/crawl/docs/license/worley.txt -share/crawl/docs/macros_guide.txt -share/crawl/docs/options_guide.txt -share/crawl/docs/quickstart.txt -@comment share/crawl/docs/ssh_guide.txt -share/crawl/docs/tiles_help.txt +share/crawl/dat/tiles/ +share/crawl/dat/tiles/feat.png +share/crawl/dat/tiles/floor.png +share/crawl/dat/tiles/gui.png +share/crawl/dat/tiles/icons.png +share/crawl/dat/tiles/logo.png +share/crawl/dat/tiles/main.png +share/crawl/dat/tiles/player.png +share/crawl/dat/tiles/stone_soup_icon-32x32.png +share/crawl/dat/tiles/stone_soup_icon-${MODLUA_DEP_VERSION}2x${MODLUA_DEP_VERSION}2.png +share/crawl/dat/tiles/stone_soup_icon-win32.png +share/crawl/dat/tiles/title_baconkid_duvessa_dowan.png +share/crawl/dat/tiles/title_baconkid_gastronok.png +share/crawl/dat/tiles/title_baconkid_mnoleg.png +share/crawl/dat/tiles/title_denzi_dragon.png +share/crawl/dat/tiles/title_denzi_evil_mage.png +share/crawl/dat/tiles/title_denzi_invasion.png +share/crawl/dat/tiles/title_denzi_kitchen_duty.png +share/crawl/dat/tiles/title_denzi_summoner.png +share/crawl/dat/tiles/title_denzi_undead_warrior.png +share/crawl/dat/tiles/title_firemage.png +share/crawl/dat/tiles/title_omndra_zot_demon.png +share/crawl/dat/tiles/title_peileppe_bloax_eye.png +share/crawl/dat/tiles/title_pooryurik_knight.png +share/crawl/dat/tiles/title_psiweapon_kiku.png +share/crawl/dat/tiles/title_psiweapon_roxanne.png +share/crawl/dat/tiles/title_shadyamish_octm.png +share/crawl/dat/tiles/title_white_noise_entering_the_dungeon.png +share/crawl/dat/tiles/title_white_noise_grabbing_the_orb.png +share/crawl/dat/tiles/wall.png share/crawl/settings/ share/crawl/settings/0.12_monster_glyphs.txt share/crawl/settings/0.13_monster_glyphs.txt share/crawl/settings/0.14_monster_glyphs.txt +share/crawl/settings/0.16_monster_glyphs.txt share/crawl/settings/0.9_monster_glyphs.txt share/crawl/settings/034_command_keys.txt share/crawl/settings/034_monster_glyphs.txt @@ -597,7 +583,53 @@ share/crawl/settings/071_monster_glyphs. share/crawl/settings/080_monster_glyphs.txt share/crawl/settings/advanced_optioneering.txt share/crawl/settings/colemak_command_keys.txt +share/crawl/settings/dec_glyphs.txt share/crawl/settings/dvorak_command_keys.txt +share/crawl/settings/ibm_glyphs.txt share/crawl/settings/init.txt share/crawl/settings/no_vi_command_keys.txt -!%%no_x11%% +share/crawl/settings/old_unicode_glyphs.txt +share/crawl/settings/safe_move_shift.txt +share/doc/crawl/ +share/doc/crawl/CREDITS.txt +share/doc/crawl/aptitudes.txt +share/doc/crawl/arena.txt +share/doc/crawl/changelog.txt +share/doc/crawl/crawl_manual.txt +share/doc/crawl/develop/ +share/doc/crawl/develop/IRC.txt +share/doc/crawl/develop/android.txt +share/doc/crawl/develop/coding_conventions.txt +share/doc/crawl/develop/ctags.txt +share/doc/crawl/develop/editor_tips.txt +share/doc/crawl/develop/gdb_tips.txt +share/doc/crawl/develop/levels/ +share/doc/crawl/develop/levels/advanced.txt +share/doc/crawl/develop/levels/introduction.txt +share/doc/crawl/develop/levels/syntax.txt +share/doc/crawl/develop/levels/triggerables.txt +share/doc/crawl/develop/monster_speech.txt +share/doc/crawl/develop/new_dev_checklist.txt +share/doc/crawl/develop/patch_guide.txt +share/doc/crawl/develop/process.txt +share/doc/crawl/develop/save_compatibility.txt +share/doc/crawl/develop/spells.txt +share/doc/crawl/develop/testing.txt +share/doc/crawl/develop/tiles_creation.txt +share/doc/crawl/develop/translation.txt +share/doc/crawl/fight_simulator.txt +share/doc/crawl/keybind.txt +share/doc/crawl/license/ +share/doc/crawl/license/cc0.txt +share/doc/crawl/license/lgpl.txt +share/doc/crawl/license/libpng-LICENSE.txt +share/doc/crawl/license/lualicense.txt +share/doc/crawl/license/pcre_license.txt +share/doc/crawl/license/worley.txt +share/doc/crawl/macros_guide.txt +share/doc/crawl/options_guide.txt +share/doc/crawl/quickstart.txt +share/doc/crawl/ssh_guide.txt +share/doc/crawl/tiles_help.txt +share/pixmaps/ +share/pixmaps/stone-soup.png