[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some rooms to the map (Alex) |
Date: |
Mon, 25 Jul 2016 18:14:54 +0000 (UTC) |
tag: Release_0-3-1
commit 065306de34a2bbd1946d4bca8b89b7176fd12912
Author: adondev <adondev>
Commit: adondev <adondev>
Added some rooms to the map (Alex)
---
configure.in | 1 +
gfx/mapobjects/floorings/Makefile.am | 3 ++-
gfx/mapobjects/floorings/bath-floor1a.mobj | Bin 0 -> 1112 bytes
gfx/mapobjects/floorings/bath-floor1b.mobj | Bin 0 -> 1116 bytes
gfx/mapobjects/floorings/bath-floor2a.mobj | Bin 0 -> 1153 bytes
gfx/mapobjects/floorings/bath-floor2b.mobj | Bin 0 -> 1157 bytes
gfx/mapobjects/furnitures/Makefile.am | 3 ++-
gfx/mapobjects/furnitures/bathtub.mobj | Bin 0 -> 2103 bytes
gfx/mapobjects/furnitures/oven.mobj | Bin 1732 -> 1725
bytes
gfx/mapobjects/furnitures/water-bucket.mobj | Bin 0 -> 591 bytes
gfx/mapobjects/icons/arrows/green-left.mobj | Bin 229 -> 228 bytes
gfx/mapobjects/icons/arrows/green-right.mobj | Bin 231 -> 230 bytes
gfx/mapobjects/icons/arrows/red-left.mobj | Bin 229 -> 229 bytes
gfx/mapobjects/icons/arrows/red-right.mobj | Bin 230 -> 229 bytes
gfx/mapobjects/walls/cellar/Makefile.am | 10 ++++++++++
gfx/mapobjects/walls/cellar/cellar-bl-lb.mobj | Bin 0 -> 2380 bytes
gfx/mapobjects/walls/cellar/cellar-bl-rf.mobj | Bin 0 -> 2656 bytes
gfx/mapobjects/walls/cellar/cellar-br-ib.mobj | Bin 0 -> 2349 bytes
gfx/mapobjects/walls/cellar/cellar-br-if.mobj | Bin 0 -> 2379 bytes
gfx/mapobjects/walls/cellar/cellar-br-lf.mobj | Bin 0 -> 2732 bytes
gfx/mapobjects/walls/cellar/cellar-br-rb.mobj | Bin 0 -> 2340 bytes
gfx/mapobjects/walls/cellar/cellar-column-b.mobj | Bin 0 -> 3712 bytes
gfx/mapobjects/walls/cellar/cellar-column-f.mobj | Bin 0 -> 3707 bytes
gfx/mapobjects/walls/cellar/cellar-doorframe-b-top.mobj | Bin 0 -> 982 bytes
gfx/mapobjects/walls/cellar/cellar-doorframe-b.mobj | Bin 0 -> 2139 bytes
gfx/mapobjects/walls/cellar/cellar-doorframe-f.mobj | Bin 0 -> 2025 bytes
gfx/mapobjects/walls/cellar/cellar-h-b.mobj | Bin 0 -> 2260 bytes
gfx/mapobjects/walls/cellar/cellar-h-f.mobj | Bin 0 -> 2255 bytes
gfx/mapobjects/walls/cellar/cellar-tl-lf.mobj | Bin 0 -> 2103 bytes
gfx/mapobjects/walls/cellar/cellar-tl-rb.mobj | Bin 0 -> 2431 bytes
gfx/mapobjects/walls/cellar/cellar-tr-ib.mobj | Bin 0 -> 2128 bytes
gfx/mapobjects/walls/cellar/cellar-tr-if.mobj | Bin 0 -> 2082 bytes
gfx/mapobjects/walls/cellar/cellar-tr-lb.mobj | Bin 0 -> 2487 bytes
gfx/mapobjects/walls/cellar/cellar-tr-rf.mobj | Bin 0 -> 2076 bytes
gfx/mapobjects/walls/cellar/cellar-v-l.mobj | Bin 0 -> 189 bytes
gfx/mapobjects/walls/cellar/cellar-v-r.mobj | Bin 0 -> 191 bytes
maps/test.map | Bin 871 -> 1204
bytes
scripts/schedules/keyboard_control.py | 15 +++++++++++++++
38 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 9bf0ade..3b335d4 100755
--- a/configure.in
+++ b/configure.in
@@ -37,6 +37,7 @@ gfx/mapobjects/houses/Makefile
gfx/mapobjects/icons/arrows/Makefile
gfx/mapobjects/icons/Makefile
gfx/mapobjects/terrains/Makefile
+gfx/mapobjects/walls/cellar/Makefile
gfx/mapobjects/walls/inside/Makefile
gfx/mapobjects/walls/stone/Makefile
gfx/mapobjects/walls/Makefile
diff --git a/gfx/mapobjects/floorings/Makefile.am
b/gfx/mapobjects/floorings/Makefile.am
index f7d2564..5ea2ec8 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -1,5 +1,6 @@
pkgdatadir = $(gamedatadir)/gfx/mapobjects/floorings
-pkgdata_DATA = woodenplanks.mobj
+pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj bath-floor2a.mobj \
+ bath-floor1b.mobj bath-floor1a.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/floorings/bath-floor1a.mobj
b/gfx/mapobjects/floorings/bath-floor1a.mobj
new file mode 100755
index 0000000..a038741
Binary files /dev/null and b/gfx/mapobjects/floorings/bath-floor1a.mobj differ
diff --git a/gfx/mapobjects/floorings/bath-floor1b.mobj
b/gfx/mapobjects/floorings/bath-floor1b.mobj
new file mode 100755
index 0000000..7e5c2eb
Binary files /dev/null and b/gfx/mapobjects/floorings/bath-floor1b.mobj differ
diff --git a/gfx/mapobjects/floorings/bath-floor2a.mobj
b/gfx/mapobjects/floorings/bath-floor2a.mobj
new file mode 100755
index 0000000..61112d5
Binary files /dev/null and b/gfx/mapobjects/floorings/bath-floor2a.mobj differ
diff --git a/gfx/mapobjects/floorings/bath-floor2b.mobj
b/gfx/mapobjects/floorings/bath-floor2b.mobj
new file mode 100755
index 0000000..d641917
Binary files /dev/null and b/gfx/mapobjects/floorings/bath-floor2b.mobj differ
diff --git a/gfx/mapobjects/furnitures/Makefile.am
b/gfx/mapobjects/furnitures/Makefile.am
index 068fe74..6459965 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -1,6 +1,7 @@
pkgdatadir = $(gamedatadir)/gfx/mapobjects/furnitures
pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj clock.mobj cupboard.mobj
oven.mobj \
- round-table.mobj shelves_wooden_books.mobj shelves_wooden_filled.mobj
+ round-table.mobj shelves_wooden_books.mobj shelves_wooden_filled.mobj \
+ water-bucket.mobj bathtub.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/bathtub.mobj
b/gfx/mapobjects/furnitures/bathtub.mobj
new file mode 100755
index 0000000..cc25566
Binary files /dev/null and b/gfx/mapobjects/furnitures/bathtub.mobj differ
diff --git a/gfx/mapobjects/furnitures/oven.mobj
b/gfx/mapobjects/furnitures/oven.mobj
index 56e28cc..a41c823 100755
Binary files a/gfx/mapobjects/furnitures/oven.mobj and
b/gfx/mapobjects/furnitures/oven.mobj differ
diff --git a/gfx/mapobjects/furnitures/water-bucket.mobj
b/gfx/mapobjects/furnitures/water-bucket.mobj
new file mode 100755
index 0000000..b278f4b
Binary files /dev/null and b/gfx/mapobjects/furnitures/water-bucket.mobj differ
diff --git a/gfx/mapobjects/icons/arrows/green-left.mobj
b/gfx/mapobjects/icons/arrows/green-left.mobj
index 781807f..4dc5a31 100755
Binary files a/gfx/mapobjects/icons/arrows/green-left.mobj and
b/gfx/mapobjects/icons/arrows/green-left.mobj differ
diff --git a/gfx/mapobjects/icons/arrows/green-right.mobj
b/gfx/mapobjects/icons/arrows/green-right.mobj
index 5549a2f..53e2231 100755
Binary files a/gfx/mapobjects/icons/arrows/green-right.mobj and
b/gfx/mapobjects/icons/arrows/green-right.mobj differ
diff --git a/gfx/mapobjects/icons/arrows/red-left.mobj
b/gfx/mapobjects/icons/arrows/red-left.mobj
index 12e8f10..35100f3 100755
Binary files a/gfx/mapobjects/icons/arrows/red-left.mobj and
b/gfx/mapobjects/icons/arrows/red-left.mobj differ
diff --git a/gfx/mapobjects/icons/arrows/red-right.mobj
b/gfx/mapobjects/icons/arrows/red-right.mobj
index 536aeb0..bb01ce6 100755
Binary files a/gfx/mapobjects/icons/arrows/red-right.mobj and
b/gfx/mapobjects/icons/arrows/red-right.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/Makefile.am
b/gfx/mapobjects/walls/cellar/Makefile.am
new file mode 100755
index 0000000..27f3135
--- /dev/null
+++ b/gfx/mapobjects/walls/cellar/Makefile.am
@@ -0,0 +1,10 @@
+pkgdatadir = $(gamedatadir)/gfx/mapobjects/walls/cellar
+
+pkgdata_DATA = cellar-bl-lb.mobj cellar-bl-rf.mobj cellar-br-ib.mobj
cellar-br-if.mobj \
+ cellar-br-lf.mobj cellar-br-rb.mobj cellar-column-b.mobj
cellar-column-f.mobj \
+ cellar-doorframe-b.mobj cellar-doorframe-b-top.mobj
cellar-doorframe-f.mobj \
+ cellar-h-b.mobj cellar-h-f.mobj cellar-tl-lf.mobj cellar-tl-rb.mobj \
+ cellar-tr-ib.mobj cellar-tr-if.mobj cellar-tr-lb.mobj cellar-tr-rf.mobj
\
+ cellar-v-l.mobj cellar-v-r.mobj
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/cellar/cellar-bl-lb.mobj
b/gfx/mapobjects/walls/cellar/cellar-bl-lb.mobj
new file mode 100755
index 0000000..372aeb3
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-bl-lb.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-bl-rf.mobj
b/gfx/mapobjects/walls/cellar/cellar-bl-rf.mobj
new file mode 100755
index 0000000..f109c61
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-bl-rf.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-br-ib.mobj
b/gfx/mapobjects/walls/cellar/cellar-br-ib.mobj
new file mode 100755
index 0000000..0ba3eeb
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-br-ib.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-br-if.mobj
b/gfx/mapobjects/walls/cellar/cellar-br-if.mobj
new file mode 100755
index 0000000..a666ee0
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-br-if.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj
b/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj
new file mode 100755
index 0000000..201a136
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-br-lf.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-br-rb.mobj
b/gfx/mapobjects/walls/cellar/cellar-br-rb.mobj
new file mode 100755
index 0000000..ec44bd6
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-br-rb.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-column-b.mobj
b/gfx/mapobjects/walls/cellar/cellar-column-b.mobj
new file mode 100755
index 0000000..7ecb0df
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-column-b.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-column-f.mobj
b/gfx/mapobjects/walls/cellar/cellar-column-f.mobj
new file mode 100755
index 0000000..b6f5eac
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-column-f.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-doorframe-b-top.mobj
b/gfx/mapobjects/walls/cellar/cellar-doorframe-b-top.mobj
new file mode 100755
index 0000000..df963af
Binary files /dev/null and
b/gfx/mapobjects/walls/cellar/cellar-doorframe-b-top.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-doorframe-b.mobj
b/gfx/mapobjects/walls/cellar/cellar-doorframe-b.mobj
new file mode 100755
index 0000000..f638c02
Binary files /dev/null and
b/gfx/mapobjects/walls/cellar/cellar-doorframe-b.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-doorframe-f.mobj
b/gfx/mapobjects/walls/cellar/cellar-doorframe-f.mobj
new file mode 100755
index 0000000..d909ce0
Binary files /dev/null and
b/gfx/mapobjects/walls/cellar/cellar-doorframe-f.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-h-b.mobj
b/gfx/mapobjects/walls/cellar/cellar-h-b.mobj
new file mode 100755
index 0000000..af77ad8
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-h-b.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-h-f.mobj
b/gfx/mapobjects/walls/cellar/cellar-h-f.mobj
new file mode 100755
index 0000000..b59244a
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-h-f.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tl-lf.mobj
b/gfx/mapobjects/walls/cellar/cellar-tl-lf.mobj
new file mode 100755
index 0000000..0311e35
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tl-lf.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tl-rb.mobj
b/gfx/mapobjects/walls/cellar/cellar-tl-rb.mobj
new file mode 100755
index 0000000..129a818
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tl-rb.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tr-ib.mobj
b/gfx/mapobjects/walls/cellar/cellar-tr-ib.mobj
new file mode 100755
index 0000000..e4534b6
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tr-ib.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tr-if.mobj
b/gfx/mapobjects/walls/cellar/cellar-tr-if.mobj
new file mode 100755
index 0000000..92e61fe
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tr-if.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tr-lb.mobj
b/gfx/mapobjects/walls/cellar/cellar-tr-lb.mobj
new file mode 100755
index 0000000..af002b2
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tr-lb.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-tr-rf.mobj
b/gfx/mapobjects/walls/cellar/cellar-tr-rf.mobj
new file mode 100755
index 0000000..1578541
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-tr-rf.mobj
differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-v-l.mobj
b/gfx/mapobjects/walls/cellar/cellar-v-l.mobj
new file mode 100755
index 0000000..964edc7
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-v-l.mobj differ
diff --git a/gfx/mapobjects/walls/cellar/cellar-v-r.mobj
b/gfx/mapobjects/walls/cellar/cellar-v-r.mobj
new file mode 100755
index 0000000..aa5be7b
Binary files /dev/null and b/gfx/mapobjects/walls/cellar/cellar-v-r.mobj differ
diff --git a/maps/test.map b/maps/test.map
index b508bd6..a4c7776 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/schedules/keyboard_control.py
b/scripts/schedules/keyboard_control.py
index 372998a..813be85 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -47,6 +47,21 @@ elif input_is_pushed (SDLK_RIGHT): myself.go_east ()
elif input_is_pushed (SDLK_LEFT): myself.go_west ()
+# Special tip! :)
+elif input_has_been_pushed (SDLK_KP_PLUS):
+ if myself.submap () < map_engine.get_landmap ().nbr_of_submaps () - 1:
+ myself.jump_to (myself.submap () + 1, 5, 3)
+ else:
+ myself.jump_to (0, 7, 18)
+
+elif input_has_been_pushed (SDLK_KP_MINUS):
+ if myself.submap () > 1:
+ myself.jump_to (myself.submap () - 1, 5, 3)
+ elif myself.submap () == 1:
+ myself.jump_to (0, 7, 18)
+ else:
+ myself.jump_to (map_engine.get_landmap ().nbr_of_submaps () - 1, 5, 3)
+
# -- shortcut to the load screen
elif input_has_been_pushed (SDLK_l):
# myself.set_schedule_active (0)
- [adonthell-wastesedge-commits] Release_0-3-1 3621f37 020/237: Fixed a few things with main_menu, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 3621f37 020/237: Fixed a few things with main_menu, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dc98f7b 022/237: Oups! Forgot the cellar walls., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure now checks installation directory from adonthell binary., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dd672f0 023/237: Forgot this one! ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9f82186 026/237: main_menu return value no more overridden! (sorry) (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 944b13c 025/237: Oops! Put the bad character.data and quest.data!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f6f7dec 016/237: Added the guards house (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 908f59b 029/237: Added orloth's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2486015 027/237: Some stairs added, better map initialisation scheme., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some rooms to the map (Alex),
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 9112207 034/237: Fixed Lucia's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0e77bb6 032/237: ADDED dialogues of Oliver and Bjarn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 46ff573 008/237: Oooops forgot these ones..., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9997e40 031/237: Implemented schedules of Silverhair, Frostbloom and Trailfollower, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eedeab6 040/237: FIXED jerky movement during the first second after the game starts up, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 66f584b 036/237: Implemented 'Open Bjarn's Door' puzzle, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 1dac4d8 019/237: Those are the most recent versions of those dialogues - the ones on the ftp are a lot older, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8b0c1e0 042/237: Slight fix to Alek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d2a86c9 030/237: Added some more characters and dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 de03633 047/237: Commited my own files again! :/, Kai Sterker, 2016/07/25