[adonthell-wastesedge-commits] Release_0-3-1 2b67b8c 096/237: Reorganized the schedules structure

[Kai Sterker]

tag: Release_0-3-1
commit 2b67b8c95d29b0850f7d25bb5b7b4862c12cf3f8
Author: adondev <adondev>
Commit: adondev <adondev>

    Reorganized the schedules structure
---
 scripts/.cvsignore                                        |    1 +
 scripts/schedules/Makefile.am                             |    8 ++------
 scripts/schedules/center_player.py                        |    2 --
 scripts/{ => schedules/mapcharacters}/.cvsignore          |    1 +
 scripts/schedules/mapcharacters/Makefile.am               |    7 +++++++
 scripts/schedules/{ => mapcharacters}/alek.py             |    0
 scripts/schedules/{ => mapcharacters}/erek.py             |    0
 scripts/schedules/{ => mapcharacters}/frostbloom.py       |    0
 scripts/schedules/{ => mapcharacters}/janesta.py          |    0
 scripts/schedules/{ => mapcharacters}/jelom.py            |    0
 scripts/schedules/{ => mapcharacters}/keyboard_control.py |    0
 scripts/schedules/{ => mapcharacters}/oliver.py           |    0
 scripts/schedules/{ => mapcharacters}/orloth.py           |    0
 scripts/schedules/{ => mapcharacters}/sarin.py            |    0
 scripts/schedules/{ => mapcharacters}/silverhair.py       |    0
 scripts/schedules/{ => mapcharacters}/talan.py            |    0
 scripts/{ => schedules/mapviews}/.cvsignore               |    1 +
 scripts/schedules/mapviews/Makefile.am                    |    5 +++++
 scripts/schedules/{ => mapviews}/center_character.py      |    2 +-
 scripts/schedules/random_move.py                          |    8 --------
 20 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index 3dda729..551aedb 100755
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+*.pyc
diff --git a/scripts/schedules/Makefile.am b/scripts/schedules/Makefile.am
index 5c21b8d..c3bfa88 100755
--- a/scripts/schedules/Makefile.am
+++ b/scripts/schedules/Makefile.am
@@ -1,7 +1,3 @@
-pkgdatadir = $(gamedatadir)/scripts/schedules
-
-pkgdata_DATA = center_player.py keyboard_control.py orloth.py \
-    sarin.py frostbloom.py silverhair.py oliver.py erek.py talan.py \
-    alek.py jelom.py janesta.py center_character.py
+SUBDIRS = mapcharacters mapviews
 
-EXTRA_DIST = $(pkgdata_DATA)
+pkgdatadir = $(gamedatadir)/scripts/schedules
diff --git a/scripts/schedules/center_player.py 
b/scripts/schedules/center_player.py
deleted file mode 100755
index 9caf386..0000000
--- a/scripts/schedules/center_player.py
+++ /dev/null
@@ -1,2 +0,0 @@
-p=the_player
-myself.center_on(p.submap(),p.posx(),p.posy(),p.offx(),p.offy())
diff --git a/scripts/.cvsignore b/scripts/schedules/mapcharacters/.cvsignore
old mode 100755
new mode 100644
similarity index 77%
copy from scripts/.cvsignore
copy to scripts/schedules/mapcharacters/.cvsignore
index 3dda729..551aedb
--- a/scripts/.cvsignore
+++ b/scripts/schedules/mapcharacters/.cvsignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+*.pyc
diff --git a/scripts/schedules/mapcharacters/Makefile.am 
b/scripts/schedules/mapcharacters/Makefile.am
new file mode 100644
index 0000000..60b9eca
--- /dev/null
+++ b/scripts/schedules/mapcharacters/Makefile.am
@@ -0,0 +1,7 @@
+pkgdatadir = $(gamedatadir)/scripts/schedules/mapcharacters
+
+pkgdata_DATA = alek.py erek.py frostbloom.py janesta.py jelom.py \
+       keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
+       talan.py
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/schedules/alek.py b/scripts/schedules/mapcharacters/alek.py
similarity index 100%
rename from scripts/schedules/alek.py
rename to scripts/schedules/mapcharacters/alek.py
diff --git a/scripts/schedules/erek.py b/scripts/schedules/mapcharacters/erek.py
similarity index 100%
rename from scripts/schedules/erek.py
rename to scripts/schedules/mapcharacters/erek.py
diff --git a/scripts/schedules/frostbloom.py 
b/scripts/schedules/mapcharacters/frostbloom.py
similarity index 100%
rename from scripts/schedules/frostbloom.py
rename to scripts/schedules/mapcharacters/frostbloom.py
diff --git a/scripts/schedules/janesta.py 
b/scripts/schedules/mapcharacters/janesta.py
similarity index 100%
rename from scripts/schedules/janesta.py
rename to scripts/schedules/mapcharacters/janesta.py
diff --git a/scripts/schedules/jelom.py 
b/scripts/schedules/mapcharacters/jelom.py
similarity index 100%
rename from scripts/schedules/jelom.py
rename to scripts/schedules/mapcharacters/jelom.py
diff --git a/scripts/schedules/keyboard_control.py 
b/scripts/schedules/mapcharacters/keyboard_control.py
similarity index 100%
rename from scripts/schedules/keyboard_control.py
rename to scripts/schedules/mapcharacters/keyboard_control.py
diff --git a/scripts/schedules/oliver.py 
b/scripts/schedules/mapcharacters/oliver.py
similarity index 100%
rename from scripts/schedules/oliver.py
rename to scripts/schedules/mapcharacters/oliver.py
diff --git a/scripts/schedules/orloth.py 
b/scripts/schedules/mapcharacters/orloth.py
similarity index 100%
rename from scripts/schedules/orloth.py
rename to scripts/schedules/mapcharacters/orloth.py
diff --git a/scripts/schedules/sarin.py 
b/scripts/schedules/mapcharacters/sarin.py
similarity index 100%
rename from scripts/schedules/sarin.py
rename to scripts/schedules/mapcharacters/sarin.py
diff --git a/scripts/schedules/silverhair.py 
b/scripts/schedules/mapcharacters/silverhair.py
similarity index 100%
rename from scripts/schedules/silverhair.py
rename to scripts/schedules/mapcharacters/silverhair.py
diff --git a/scripts/schedules/talan.py 
b/scripts/schedules/mapcharacters/talan.py
similarity index 100%
rename from scripts/schedules/talan.py
rename to scripts/schedules/mapcharacters/talan.py
diff --git a/scripts/.cvsignore b/scripts/schedules/mapviews/.cvsignore
old mode 100755
new mode 100644
similarity index 77%
copy from scripts/.cvsignore
copy to scripts/schedules/mapviews/.cvsignore
index 3dda729..551aedb
--- a/scripts/.cvsignore
+++ b/scripts/schedules/mapviews/.cvsignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+*.pyc
diff --git a/scripts/schedules/mapviews/Makefile.am 
b/scripts/schedules/mapviews/Makefile.am
new file mode 100644
index 0000000..099d9aa
--- /dev/null
+++ b/scripts/schedules/mapviews/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = $(gamedatadir)/scripts/schedules/mapviews
+
+pkgdata_DATA = center_character.py
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/schedules/center_character.py 
b/scripts/schedules/mapviews/center_character.py
similarity index 93%
rename from scripts/schedules/center_character.py
rename to scripts/schedules/mapviews/center_character.py
index 1d08228..7c9c7ef 100644
--- a/scripts/schedules/center_character.py
+++ b/scripts/schedules/mapviews/center_character.py
@@ -18,7 +18,6 @@ import adonthell
 class center_character:
 
     # Parameters:
-    # mapviewinstance: Python instance of the controlled mapview
     # mapcharinstance: Name of the mapcharacter to follow
     def __init__ (self, mapviewinstance, mapcharname):
         self.myself = mapviewinstance
@@ -28,3 +27,4 @@ class center_character:
         p = self.tofollow
         self.myself.center_on(p.submap(), p.posx(),
                               p.posy(), p.offx(), p.offy())
+        
diff --git a/scripts/schedules/random_move.py b/scripts/schedules/random_move.py
deleted file mode 100755
index ddbd787..0000000
--- a/scripts/schedules/random_move.py
+++ /dev/null
@@ -1,8 +0,0 @@
-move=randint(10,30)
-if move>=10:
-  dir=randint(0,3)
-
-  if dir==0: myself.go_north();
-  if dir==1: myself.go_south();
-  if dir==2: myself.go_west();
-  if dir==3: myself.go_east();