[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building n
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files |
Date: |
Mon, 25 Jul 2016 18:15:07 +0000 (UTC) |
tag: Release_0-3-1
commit fa60e799b169ace404c77f0c191937ef8478d545
Author: adondev <adondev>
Commit: adondev <adondev>
Building now creates byte-compiled script files
Fixed a few dialogs
---
scripts/Makefile.am | 12 ++++++++++--
scripts/actions/Makefile.am | 12 ++++++++++--
scripts/dialogues/Makefile.am | 11 +++++++++--
scripts/dialogues/erek_start.py | 6 +++---
scripts/dialogues/frostbloom_start.py | 3 ++-
scripts/dialogues/sarin_start.py | 6 ++++--
scripts/events/Makefile.am | 12 ++++++++++--
scripts/modules/Makefile.am | 12 ++++++++++--
scripts/schedules/mapcharacters/Makefile.am | 15 +++++++++++----
scripts/schedules/mapcharacters/lucia.py | 5 ++++-
scripts/schedules/mapviews/Makefile.am | 12 ++++++++++--
11 files changed, 83 insertions(+), 23 deletions(-)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ccea358..ca3284d 100755
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,6 +2,14 @@ SUBDIRS = dialogues events modules schedules actions
pkgdatadir = $(gamedatadir)/scripts
-pkgdata_DATA = init.py
+pkgdata_DATA = *.pyc
-EXTRA_DIST = $(pkgdata_DATA)
+EXTRA_DIST = init.py
+
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+
+clean:
+ rm *.pyc
diff --git a/scripts/actions/Makefile.am b/scripts/actions/Makefile.am
index 9f00926..735c06a 100755
--- a/scripts/actions/Makefile.am
+++ b/scripts/actions/Makefile.am
@@ -1,5 +1,13 @@
pkgdatadir = $(gamedatadir)/scripts/actions
-pkgdata_DATA = talk.py
+pkgdata_DATA = *.pyc
-EXTRA_DIST = $(pkgdata_DATA)
+EXTRA_DIST = talk.py
+
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+
+clean:
+ rm *.pyc
diff --git a/scripts/dialogues/Makefile.am b/scripts/dialogues/Makefile.am
index 5fae582..0c728c2 100755
--- a/scripts/dialogues/Makefile.am
+++ b/scripts/dialogues/Makefile.am
@@ -1,9 +1,16 @@
pkgdatadir = $(gamedatadir)/scripts/dialogues
-pkgdata_DATA = orloth_start.py lucia_start.py sarin_start.py \
+pkgdata_DATA = *.pyc
+
+EXTRA_DIST = orloth_start.py lucia_start.py sarin_start.py \
janesta_start.py erek_start.py oliver_start.py bjarn_start.py \
frostbloom_start.py talan_start.py alek_start.py jelom_start.py \
tristan_start.py jelom_2nd.py demo_intro_1.py
-EXTRA_DIST = $(pkgdata_DATA)
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+clean:
+ rm *.pyc
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index a00224e..f032c6e 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -2,7 +2,7 @@ import adonthell
class erek_start:
loop = []
- strings = ["Before you stands a young Dwarf, with an open face and no
sign of the traditional beard. His expression shows his intelligence and a
trace of humor as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolsons apprentice. But I seem to not remember you, $fm
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some
questions.", "Well met then, $name. Only I f [...]
+ strings = ["Before you stands a young Dwarf, with an open face and no
sign of the traditional beard. His expression shows his intelligence and a
trace of humor as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolsons apprentice. But I seem to not remember you, $fm
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some
questions.", "Well met then, $name. Only I f [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class erek_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
+ self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
def clear (self):
del self.dialogue
@@ -680,7 +680,7 @@ class erek_start:
self.cont.append (75)
self.player.append (-1)
- def answer242 (self):
+ def answer118 (self):
self.set_npc ("Imoen Silverhair")
self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
self.npc.append (24)
diff --git a/scripts/dialogues/frostbloom_start.py
b/scripts/dialogues/frostbloom_start.py
index 1a5b0f1..086d11d 100755
--- a/scripts/dialogues/frostbloom_start.py
+++ b/scripts/dialogues/frostbloom_start.py
@@ -2,7 +2,7 @@ import adonthell
class frostbloom_start:
loop = []
- strings = ["Hm? What do you want?", "I am a servant of Lady Imoen
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care
what you wish to ask. Now go away. The Yeti of my soul must have silence.",
"You again? I thought I told you to leave me alone.", "But lady, I must ask
you about the theft...", "The theft? You mean your theft of my precious time,
when I could be receiving inspiration? I've lost enought of that already,
thank you. Now be gone, silly servant [...]
+ strings = ["Hm? What do you want?", "I am a servant of Lady Imoen
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care
what you wish to ask. Now go away. The Yeti of my soul must have silence.",
"You again? I thought I told you to leave me alone.", "But lady, I must ask
you about the theft...", "The theft? You mean your theft of my precious time,
when I could be receiving inspiration? I've lost enought of that already,
thank you. Now be gone, silly servant [...]
def set_name (self, new_name):
pass
@@ -78,6 +78,7 @@ class frostbloom_start:
self.npc.append (0)
self.cont.append (-1)
self.the_npc.set_val ("talked_to" , 1)
+ adonthell.gamedata_get_quest("demo").set_val
("know_frostbloom" , 1)
self.player.append (1)
self.cont.append (1)
diff --git a/scripts/dialogues/sarin_start.py b/scripts/dialogues/sarin_start.py
index 93fde1b..60cf97a 100755
--- a/scripts/dialogues/sarin_start.py
+++ b/scripts/dialogues/sarin_start.py
@@ -69,8 +69,10 @@ class sarin_start:
self.cont.append (-1)
self.player.append (7)
self.cont.append (4)
- self.player.append (9)
- self.cont.append (5)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_frostbloom") == 1:
+
+ self.player.append (9)
+ self.cont.append (5)
self.player.append (-1)
def answer9 (self):
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index 3adda6f..88418ce 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -1,6 +1,14 @@
pkgdatadir = $(gamedatadir)/scripts/events
-pkgdata_DATA = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
+pkgdata_DATA = *.pyc
+
+EXTRA_DIST = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
character_speak.py open_inn_door.py
-EXTRA_DIST = $(pkgdata_DATA)
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+
+clean:
+ rm *.pyc
diff --git a/scripts/modules/Makefile.am b/scripts/modules/Makefile.am
index fad24c8..a33f564 100755
--- a/scripts/modules/Makefile.am
+++ b/scripts/modules/Makefile.am
@@ -1,5 +1,13 @@
pkgdatadir = $(gamedatadir)/scripts/modules
-pkgdata_DATA = console.py main_menu.py events.py character_screen.py intro.py
+pkgdata_DATA = *.pyc
-EXTRA_DIST = $(pkgdata_DATA)
+EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py
+
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+
+clean:
+ rm *.pyc
diff --git a/scripts/schedules/mapcharacters/Makefile.am
b/scripts/schedules/mapcharacters/Makefile.am
index 82e7a0c..8f0683e 100644
--- a/scripts/schedules/mapcharacters/Makefile.am
+++ b/scripts/schedules/mapcharacters/Makefile.am
@@ -1,8 +1,15 @@
pkgdatadir = $(gamedatadir)/scripts/schedules/mapcharacters
-pkgdata_DATA = alek.py erek.py frostbloom.py janesta.py jelom.py \
+pkgdata_DATA = *.pyc
+
+EXTRA_DIST = alek.py erek.py frostbloom.py janesta.py jelom.py \
keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
- talan.py tristan.py fellnir.py to_cellar.py lucia.py intro.py \
- bjarn.py
+ talan.py tristan.py fellnir.py to_cellar.py lucia.py intro.py
+
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
-EXTRA_DIST = $(pkgdata_DATA)
+clean:
+ rm *.pyc
diff --git a/scripts/schedules/mapcharacters/lucia.py
b/scripts/schedules/mapcharacters/lucia.py
index dc10fc0..fa92e19 100644
--- a/scripts/schedules/mapcharacters/lucia.py
+++ b/scripts/schedules/mapcharacters/lucia.py
@@ -48,7 +48,10 @@ class lucia:
# -- engage a new movement
elif todo == 1:
- x, y, dir = self.coords[randint(0, 1)]
+ if myself.posx () != 3:
+ x, y, dir = self.coords[0]
+ else:
+ x, y, dir = self.coords[randint(0, 1)]
myself.set_goal (x, y, dir)
myself.set_val ("todo", 2)
diff --git a/scripts/schedules/mapviews/Makefile.am
b/scripts/schedules/mapviews/Makefile.am
index 099d9aa..9850975 100644
--- a/scripts/schedules/mapviews/Makefile.am
+++ b/scripts/schedules/mapviews/Makefile.am
@@ -1,5 +1,13 @@
pkgdatadir = $(gamedatadir)/scripts/schedules/mapviews
-pkgdata_DATA = center_character.py
+pkgdata_DATA = *.pyc
-EXTRA_DIST = $(pkgdata_DATA)
+EXTRA_DIST = center_character.py
+
+all: *.pyc
+
+*.pyc: *.py
+ python -c 'import compileall; compileall.compile_dir (".", 0);'
+
+clean:
+ rm *.pyc
- [adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b770dc8 111/237: ADDED 'name your character' dialog that pops up when starting a new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5f31f05 215/237: Small fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8fca18 186/237: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bfb1042 180/237: IMPROVED chest-owners, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b239465 152/237: CHANGED scripts to new character handling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb644d3 229/237: FIXED Audio should now be in sync with the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4c2c7ff 214/237: Finished entrance for veranda effect., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 148ae8b 012/237: This module has nothing to do here and may crash everything! (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ecf6760 220/237: ADDED Initial Game Data, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 623d0fc 190/237: *** empty log message ***, Kai Sterker, 2016/07/25