[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures |
Date: |
Mon, 25 Jul 2016 18:15:09 +0000 (UTC) |
tag: Release_0-3-1
commit 39a6545300550e1338146f80f9eaa4518b85cc57
Author: adondev <adondev>
Commit: adondev <adondev>
Fixed gate and added Kitchen's furnitures
---
gfx/mapobjects/exteriors/gate-fore.mobj | Bin 2915 -> 2919 bytes
gfx/mapobjects/furnitures/Makefile.am | 3 ++-
gfx/mapobjects/furnitures/kitchen_smoke.mobj | Bin 0 -> 5125 bytes
gfx/mapobjects/furnitures/kitchen_smoke_top.mobj | Bin 0 -> 1228 bytes
gfx/mapobjects/furnitures/oven_flame.mobj | Bin 0 -> 1093 bytes
gfx/mapobjects/walls/Makefile.am | 3 ++-
gfx/mapobjects/walls/gate_back_wall.mobj | Bin 0 -> 1467 bytes
maps/test.map | Bin 2987 -> 3048 bytes
scripts/schedules/mapcharacters/intro.py | 2 +-
scripts/schedules/mapcharacters/keyboard_control.py | 2 +-
10 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gfx/mapobjects/exteriors/gate-fore.mobj
b/gfx/mapobjects/exteriors/gate-fore.mobj
index 186f611..ea8615b 100755
Binary files a/gfx/mapobjects/exteriors/gate-fore.mobj and
b/gfx/mapobjects/exteriors/gate-fore.mobj differ
diff --git a/gfx/mapobjects/furnitures/Makefile.am
b/gfx/mapobjects/furnitures/Makefile.am
index 9568581..e817d2c 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -10,6 +10,7 @@ pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj
clock.mobj cupboard.mobj ove
silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj
\
crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj
dwarf_chest.mobj \
normal-cupboard.mobj chest-wooden.mobj silverhair_rug-1.mobj
silverhair_rug-2.mobj \
- silverhair_rug-3.mobj silverhair_rug-4.mobj stove.mobj
barn_loft_clutter.mobj
+ silverhair_rug-3.mobj silverhair_rug-4.mobj stove.mobj
barn_loft_clutter.mobj \
+ oven_flame.mobj kitchen_smoke.mobj kitchen_smoke_top.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/kitchen_smoke.mobj
b/gfx/mapobjects/furnitures/kitchen_smoke.mobj
new file mode 100644
index 0000000..c2dbe31
Binary files /dev/null and b/gfx/mapobjects/furnitures/kitchen_smoke.mobj differ
diff --git a/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj
b/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj
new file mode 100644
index 0000000..9c98722
Binary files /dev/null and b/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj
differ
diff --git a/gfx/mapobjects/furnitures/oven_flame.mobj
b/gfx/mapobjects/furnitures/oven_flame.mobj
new file mode 100644
index 0000000..28425f0
Binary files /dev/null and b/gfx/mapobjects/furnitures/oven_flame.mobj differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 81a4608..4abd6a4 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -5,6 +5,7 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/walls
pkgdata_DATA = painting1.mobj painting2.mobj painting3.mobj \
window_right.mobj window_left.mobj window_front.mobj \
window_round_front.mobj window_back.mobj barn_back.mobj \
- barn_loft_main.mobj barn_loft_main_top.mobj barn_ground_back_top.mobj
+ barn_loft_main.mobj barn_loft_main_top.mobj \
+ barn_ground_back_top.mobj gate_back_wall.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/gate_back_wall.mobj
b/gfx/mapobjects/walls/gate_back_wall.mobj
new file mode 100644
index 0000000..030edc0
Binary files /dev/null and b/gfx/mapobjects/walls/gate_back_wall.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 3394ae3..e354366 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/schedules/mapcharacters/intro.py
b/scripts/schedules/mapcharacters/intro.py
index 385966e..9915267 100644
--- a/scripts/schedules/mapcharacters/intro.py
+++ b/scripts/schedules/mapcharacters/intro.py
@@ -85,7 +85,7 @@ class intro:
# Update squares walkability
sm = adonthell.gamedata_engine ().get_landmap ().get_submap (0)
- sm.get_square (6, 17).set_walkable_south (1)
+ sm.get_square (6, 17).set_walkable (0)
sm.get_square (7, 17).set_walkable_south (1)
sm.get_square (6, 18).set_walkable_west (0)
sm.get_square (6, 19).set_walkable_west (0)
diff --git a/scripts/schedules/mapcharacters/keyboard_control.py
b/scripts/schedules/mapcharacters/keyboard_control.py
index 9be1a2d..65bd46b 100755
--- a/scripts/schedules/mapcharacters/keyboard_control.py
+++ b/scripts/schedules/mapcharacters/keyboard_control.py
@@ -54,7 +54,7 @@ class keyboard_control:
# Update squares walkability
sm = gamedata_engine ().get_landmap ().get_submap (0)
- sm.get_square (6, 17).set_walkable_south (1)
+ sm.get_square (6, 17).set_walkable (0)
sm.get_square (7, 17).set_walkable_south (1)
sm.get_square (6, 18).set_walkable_west (0)
sm.get_square (6, 19).set_walkable_west (0)
- [adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek and jelom, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek and jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 48053be 090/237: Updated the init script, so you can skip the title sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 547a59d 130/237: FIXED the mess I made ; P, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b1a1e7a 154/237: ADDED extro dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fading code to mapengine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 78eb33a 147/237: UPDATED scripts to make use of the new win_manager features, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 22057de 206/237: ADDED new music, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fb80ca7 128/237: Corrected a problem with the name., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8054ed1 175/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 febb1af 187/237: ADDED in-game music!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 88aa49d 067/237: Fixed Oliver's teleportation bug., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 558cf65 088/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0924f07 144/237: ADDED final part to Bjarn's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c20844e 118/237: UPDATED Erek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e7e6e03 121/237: ADDED script to get all character's to Bjarn's room, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d62b800 105/237: FIXED bug in Talan's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 16bc2fa 181/237: Added Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b2cc71d 135/237: Schregneugneu., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dcb7646 212/237: Continued veranda, Kai Sterker, 2016/07/25