[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor chan
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor changes to the map. |
Date: |
Mon, 25 Jul 2016 18:14:56 +0000 (UTC) |
tag: Release_0-3-1
commit 7a0f9fe68814079681d91c79103a79de0b4fbcb1
Author: adondev <adondev>
Commit: adondev <adondev>
Minor changes to the map.
---
gfx/mapobjects/walls/inside/wall-tr2.mobj | Bin 948 -> 953 bytes
maps/test.map | Bin 1792 -> 1803 bytes
scripts/events/1st_to_2nd.py | 2 +-
scripts/events/1st_to_fellnir.py | 2 +-
scripts/events/1st_to_frostbloom.py | 2 +-
scripts/events/1st_to_player.py | 2 +-
scripts/events/1st_to_silverhair.py | 2 +-
scripts/events/common_to_1st.py | 2 +-
scripts/init.py | 12 ++++++------
scripts/schedules/oliver.py | 2 +-
scripts/schedules/silverhair.py | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gfx/mapobjects/walls/inside/wall-tr2.mobj
b/gfx/mapobjects/walls/inside/wall-tr2.mobj
index 3d0c998..7e14ed5 100755
Binary files a/gfx/mapobjects/walls/inside/wall-tr2.mobj and
b/gfx/mapobjects/walls/inside/wall-tr2.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 955ecb8..8b2900a 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/1st_to_2nd.py b/scripts/events/1st_to_2nd.py
index 71e438d..90f3824 100755
--- a/scripts/events/1st_to_2nd.py
+++ b/scripts/events/1st_to_2nd.py
@@ -6,5 +6,5 @@ mychar = characters [name]
if mychar.submap() == 9:
switch_submap (mychar, 14, 4, 2, STAND_SOUTH)
else:
- switch_submap (mychar, 9, 5, 2, STAND_SOUTH)
+ switch_submap (mychar, 9, 6, 2, STAND_SOUTH)
diff --git a/scripts/events/1st_to_fellnir.py b/scripts/events/1st_to_fellnir.py
index c16c2dc..e5fa4af 100755
--- a/scripts/events/1st_to_fellnir.py
+++ b/scripts/events/1st_to_fellnir.py
@@ -5,5 +5,5 @@ p = characters [name]
if p.submap () == 9:
switch_submap (p, 10, 1, 3, STAND_EAST)
else:
- switch_submap (p, 9, 7, 2, STAND_WEST)
+ switch_submap (p, 9, 8, 2, STAND_WEST)
diff --git a/scripts/events/1st_to_frostbloom.py
b/scripts/events/1st_to_frostbloom.py
index deb209e..756fb8e 100755
--- a/scripts/events/1st_to_frostbloom.py
+++ b/scripts/events/1st_to_frostbloom.py
@@ -3,7 +3,7 @@ from events import switch_submap
p = characters [name]
if p.submap () == 9:
- switch_submap (p, 11, 5, 3, STAND_WEST)
+ switch_submap (p, 11, 4, 3, STAND_WEST)
else:
switch_submap (p, 9, 1, 2, STAND_EAST)
diff --git a/scripts/events/1st_to_player.py b/scripts/events/1st_to_player.py
index bb1e57c..920ec1c 100755
--- a/scripts/events/1st_to_player.py
+++ b/scripts/events/1st_to_player.py
@@ -5,5 +5,5 @@ p = characters [name]
if p.submap () == 9:
switch_submap (p, 12, 5, 2, STAND_SOUTH)
else:
- switch_submap (p, 9, 6, 3, STAND_NORTH)
+ switch_submap (p, 9, 7, 3, STAND_NORTH)
diff --git a/scripts/events/1st_to_silverhair.py
b/scripts/events/1st_to_silverhair.py
index 4359dc7..fcb7738 100755
--- a/scripts/events/1st_to_silverhair.py
+++ b/scripts/events/1st_to_silverhair.py
@@ -3,7 +3,7 @@ from events import switch_submap
p = characters [name]
if p.submap () == 9:
- switch_submap (p, 13, 6, 2, STAND_SOUTH)
+ switch_submap (p, 13, 5, 2, STAND_SOUTH)
else:
switch_submap (p, 9, 1, 6, STAND_NORTH)
diff --git a/scripts/events/common_to_1st.py b/scripts/events/common_to_1st.py
index e2ecd12..4fce225 100755
--- a/scripts/events/common_to_1st.py
+++ b/scripts/events/common_to_1st.py
@@ -4,7 +4,7 @@ mychar = characters [name]
# Common room to 1st floor
if mychar.submap() == 1:
- switch_submap (mychar, 9, 7, 2, STAND_SOUTH)
+ switch_submap (mychar, 9, 8, 2, STAND_SOUTH)
else:
switch_submap (mychar, 1, 12, 2, STAND_SOUTH)
diff --git a/scripts/init.py b/scripts/init.py
index 22c4308..188d2fe 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -345,7 +345,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 9
- ev.x = 8
+ ev.x = 9
ev.y = 2
ev.set_script ("1st_to_fellnir")
lm.add_event (ev)
@@ -369,7 +369,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 11
- ev.x = 6
+ ev.x = 5
ev.y = 3
ev.set_script ("1st_to_frostbloom")
lm.add_event (ev)
@@ -377,7 +377,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 9
- ev.x = 6
+ ev.x = 7
ev.y = 4
ev.set_script ("1st_to_player")
lm.add_event (ev)
@@ -401,7 +401,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 13
- ev.x = 6
+ ev.x = 5
ev.y = 1
ev.set_script ("1st_to_silverhair")
lm.add_event (ev)
@@ -465,7 +465,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 9
- ev.x = 7
+ ev.x = 8
ev.y = 1
ev.set_script ("common_to_1st")
lm.add_event (ev)
@@ -473,7 +473,7 @@ if retval < 5:
ev = enter_event ()
ev.thisown = C
ev.submap = 9
- ev.x = 5
+ ev.x = 6
ev.y = 1
ev.set_script ("1st_to_2nd")
lm.add_event (ev)
diff --git a/scripts/schedules/oliver.py b/scripts/schedules/oliver.py
index 6acdcac..4945532 100755
--- a/scripts/schedules/oliver.py
+++ b/scripts/schedules/oliver.py
@@ -51,7 +51,7 @@ elif myself.get_val ("goto_barn") == 1:
# -- First floor
elif location == 9:
- schedules.simple_goto_xy (myself, 7, 1)
+ schedules.simple_goto_xy (myself, 8, 1)
# -- Common Room
elif location == 1:
diff --git a/scripts/schedules/silverhair.py b/scripts/schedules/silverhair.py
index 15c248f..bab5d3d 100755
--- a/scripts/schedules/silverhair.py
+++ b/scripts/schedules/silverhair.py
@@ -47,7 +47,7 @@ elif todo == 1:
# -- go back to our normal position
else:
delay = randint (100, 200) * 35
- myself.set_goal (4, 5, STAND_SOUTH)
+ myself.set_goal (4, 4, STAND_SOUTH)
myself.set_val ("say_something", say)
myself.set_val ("delay", delay)
- [adonthell-wastesedge-commits] Release_0-3-1 a0e6b2a 045/237: Oops! I kept my test files!, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 a0e6b2a 045/237: Oops! I kept my test files!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 37d1b1d 089/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3ad0ff2 043/237: Some bugfixes and little updates, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d13c53f 052/237: Speed improvements, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9d5c3db 072/237: Continued furniturizing, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a51967 079/237: Continued map., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved transition files to their real place., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 91abdcd 136/237: FIXED Makefile.am (intro.py was missing), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 30316f6 132/237: ADDED initial dialogue with Talan to get into the inn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor changes to the map.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 21f36d0 059/237: Slight fix., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b40a92e 134/237: ADDED Lucia's schedule and furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 64e91d5 033/237: UPDATE to some schedules and dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added characters portraits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0933dbf 063/237: How could I forget them ... ? ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 18d2266 131/237: FIXED installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b028da 127/237: UPDATED intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 290bfde 086/237: ADDED portraits of Talan and Player, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., Kai Sterker, 2016/07/25