diff --git a/dat/dungeon.lua b/dat/dungeon.lua index 24bd27dbf..ff9e9130a 100644 --- a/dat/dungeon.lua +++ b/dat/dungeon.lua @@ -317,13 +317,17 @@ dungeon = { }, { name = "The Tutorial", - base = 1, + base = 2, flags = { "mazelike", "unconnected" }, levels = { { name = "tut-1", base = 1, }, + { + name = "tut-2", + base = 2, + }, } }, } diff --git a/dat/tut-1.lua b/dat/tut-1.lua index 7718a5f65..c284b9f49 100644 --- a/dat/tut-1.lua +++ b/dat/tut-1.lua @@ -11,12 +11,12 @@ des.map([[ ||.|.|.......|......|-.|....|.F.....|.|.......|.....|.....................| ||.|.|.......|......||.|-.-----------.-.......|-S----.....................| |-+-S---------..---.||........................|...|.......................| -|......| |.-------------------.......|...|.......................| -|......| ###### |.........| |..S.......|...|.......................| -|----.-| -+- # |.....---.|######+..|.......S...|.......................| -|----+----.----+---.|.--|.|.|# ------------...|.......................| -|........|.|......|.|...F...|# ........|.....+...|.......................| -|.P......-S|......|------.---# .........|.....|...|.......................| +|......| |.-------------------.......|...|....--S----............| +|......| ###### |.........| |..S.......|...|....|.....|............| +|----.-| -+- # |.....---.|######+..|.......S...|....|.....|............| +|----+----.----+---.|.--|.|.|# ------------...|....|.....|............| +|........|.|......|.|...F...|# ........|.....+...|....|.....|............| +|.P......-S|......|------.---# .........|.....|...|....-------............| |..........|......+.|...|.|.S# ..--S-----.....|LLL|.......................| |.W......---......|.|.|.|.|.|# ..|......|.....|LLL|.......................| |....Z.L.S.F......|.|.|.|.---# |......+.....|...|.......................| @@ -237,9 +237,14 @@ des.door({ coord = { 50,16 }, state = "closed" }); -- -des.engraving({ coord = { 55,9 }, type = "burn", text = "UNDER CONSTRUCTION", degrade = false }); +des.engraving({ coord = { 58,9 }, type = "burn", text = "Use '" .. nh.eckey("down") .. "' to go down the stairs", degrade = false }); +des.stair({ dir = "down", coord = { 58,10 } }); -des.trap({ type = "magic portal", coord = { 60,9 }, seen = true }); +-- + +des.engraving({ coord = { 65,3 }, type = "burn", text = "UNDER CONSTRUCTION", degrade = false }); + +des.trap({ type = "magic portal", coord = { 66,2 }, seen = true }); ---------------- diff --git a/dat/tut-2.lua b/dat/tut-2.lua new file mode 100644 index 000000000..bea2f0698 --- /dev/null +++ b/dat/tut-2.lua @@ -0,0 +1,27 @@ + +des.level_init({ style = "solidfill", fg = " " }); +des.level_flags("mazelevel", "noflip", + "nomongen", "nodeathdrops", "noautosearch"); + +des.map([[ +-------------- +|............| +|............| +|............| +|............| +|............| +|............| +-------------- +]]); + + +des.region(selection.area(01,01, 73, 16), "lit"); + +des.stair({ dir = "up", coord = { 2,2 } }); + +des.engraving({ coord = { 1,1 }, type = "burn", text = "Use '" .. nh.eckey("up") .. "' to go up the stairs", degrade = false }); + + +des.trap({ type = "magic portal", coord = { 11,5 }, seen = true }); + +des.non_diggable(); diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index 33846e005..6a90fa9c8 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -1388,6 +1388,7 @@ "$(NH_DAT_DIR)/tower2.lua", "$(NH_DAT_DIR)/tower3.lua", "$(NH_DAT_DIR)/tut-1.lua", + "$(NH_DAT_DIR)/tut-2.lua", "$(NH_DAT_DIR)/Val-fila.lua", "$(NH_DAT_DIR)/Val-filb.lua", "$(NH_DAT_DIR)/Val-goal.lua", diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index ea5f90f1f..c2de9f5dd 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -443,7 +443,7 @@ LUALIST = air Arc-fila Arc-filb Arc-goal Arc-loca Arc-strt \ Tou-strt tower1 tower2 tower3 Val-fila Val-filb \ Val-goal Val-loca Val-strt valley water Wiz-fila \ Wiz-filb Wiz-goal Wiz-loca Wiz-strt wizard1 wizard2 \ - wizard3 tut-1 + wizard3 tut-1 tut-2 LUAFILES = $(addprefix $(DAT)/, $(addsuffix .lua, $(LUALIST))) diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index b8758ce19..537437122 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -523,7 +523,7 @@ LUA_FILES = $(DAT)\air.lua $(DAT)\Arc-fila.lua $(DAT)\Arc-filb.lua \ $(DAT)\valley.lua $(DAT)\water.lua $(DAT)\Wiz-fila.lua \ $(DAT)\Wiz-filb.lua $(DAT)\Wiz-goal.lua $(DAT)\Wiz-loca.lua \ $(DAT)\Wiz-strt.lua $(DAT)\wizard1.lua $(DAT)\wizard2.lua \ - $(DAT)\wizard3.lua $(DAT)\tut-1.lua + $(DAT)\wizard3.lua $(DAT)\tut-1.lua $(DAT)\tut-2.lua # # Utility Objects. # diff --git a/sys/windows/vs/files.props b/sys/windows/vs/files.props index c9aa1a0f8..9dd50ca4c 100644 --- a/sys/windows/vs/files.props +++ b/sys/windows/vs/files.props @@ -128,6 +128,7 @@ +