Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some regressions in the tutorial world.

Browse source
This commit is contained in:
Griatch 2016-10-16 01:07:46 +02:00
parent 1d6873eef4
commit e39e1bdd45
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
evennia/contrib/tutorial_world/build.ev
View file

@ -279,9 +279,7 @@ start
# #
@set sign/readable_text = @set sign/readable_text =
|rWARNING - The bridge is not safe!|n
WARNING - The bridge is not safe!
Below this official warning, someone has carved some sprawling Below this official warning, someone has carved some sprawling
letters into the wood. It reads: "The guardian will not bleed to letters into the wood. It reads: "The guardian will not bleed to
@ -1299,28 +1297,29 @@ Tomb of the hero
@create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.WeaponRack @create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.WeaponRack
# #
@desc stone = @desc stone =
The lid of the coffin is adorned with a stone statue in full size. The weapon held by The lid of the coffin is adorned with a stone statue in full size.
the stone hands looks very realistic ... ( The weapon held by the stone hands looks very realistic ...
The hands of the statue close on what seems to be a real weapon
rather than one in stone. This must be the hero's legendary weapon!
The prize you have been looking for!
(try {wget weapon{n) (try {wget weapon{n)
# #
@set sarcophagus/rack_id = rack_sarcophagus @set sarcophagus/rack_id = rack_sarcophagus
# #
@set sarcophagus/available_weapons = ["ornate_longsword","warhammer","rune axe","thruning","slayer waraxe","ghostblade","hawkblade"] @set sarcophagus/available_weapons = ["ornate longsword","warhammer","rune axe","thruning","slayer waraxe","ghostblade","hawkblade"]
# #
@set sarcophagus/no_more_weapons_msg = @set sarcophagus/no_more_weapons_msg =
The tomb has already granted you all the might it will ever do. The tomb has already granted you all the might it will ever do.
# #
@set sarcophagus/get_weapon_msg = @set sarcophagus/get_weapon_msg =
The hands of the statue close on what seems to be a real weapon Trembling you carefully release the weapon from the stone to test
rather than one in stone. This must be the hero's legendary weapon! its weight. You are finally holding your prize,
The prize you have been looking for!
With trembling hands you release the weapon from the stone and hold
{c%s{n in your hands!
The {c%s{n
in your hands!
{gThis concludes the Evennia tutorial. From here you can either {gThis concludes the Evennia tutorial. From here you can either
continue to explore the castle (hint: this weapon works better continue to explore the castle (hint: this weapon works better
@ -1344,7 +1343,7 @@ Tomb of the hero
# rack_id. This we can use to check if any such weapon is in inventory # rack_id. This we can use to check if any such weapon is in inventory
# before unlocking the exit. # before unlocking the exit.
# #
@lock Exit tutorial = view:holds(rack_sarcophagus) ; traverse:holds(rack_sarcophagus) @lock Exit tutorial = view:tag(rack_sarcophagus, tutorial_world) ; traverse:tag(rack_sarcophagus, tutorial_world)
# #
# to tutorial outro # to tutorial outro
@tel tut#16 @tel tut#16

2
evennia/contrib/tutorial_world/objects.py
View file

@ -978,7 +978,7 @@ WEAPON_PROTOTYPES = {
"damage": 10}, "damage": 10},
"hawkblade": { "hawkblade": {
"prototype": "ghostblade", "prototype": "ghostblade",
"key": "The Hawblade", "key": "The Hawkblade",
"aliases": ["hawk", "blade"], "aliases": ["hawk", "blade"],
"desc": "The weapon of a long-dead heroine and a more civilized age, the hawk-shaped hilt of this blade almost has a life of its own.", "desc": "The weapon of a long-dead heroine and a more civilized age, the hawk-shaped hilt of this blade almost has a life of its own.",
"hit": 0.85, "hit": 0.85,

6
evennia/contrib/tutorial_world/rooms.py
View file

@ -1009,13 +1009,13 @@ class OutroRoom(TutorialRoom):
Do cleanup. Do cleanup.
""" """
if character.has_player: if character.has_player:
if self.db.wracklist:
for wrackid in self.db.wracklist:
character.del_attribute(wrackid)
del character.db.health_max del character.db.health_max
del character.db.health del character.db.health
del character.db.last_climbed del character.db.last_climbed
del character.db.puzzle_clue del character.db.puzzle_clue
del character.db.combat_parry_mode del character.db.combat_parry_mode
del character.db.tutorial_bridge_position del character.db.tutorial_bridge_position
for obj in character.contents:
if obj.typeclass_path.startswith("evennia.contrib.tutorial_world"):
obj.delete()
character.tags.clear(category="tutorial_world") character.tags.clear(category="tutorial_world")