From e39e1bdd45b52507e70e8007c0b2793da2eb93a7 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Oct 2016 01:07:46 +0200 Subject: [PATCH] Fix some regressions in the tutorial world. --- evennia/contrib/tutorial_world/build.ev | 27 +++++++++++------------ evennia/contrib/tutorial_world/objects.py | 2 +- evennia/contrib/tutorial_world/rooms.py | 6 ++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/evennia/contrib/tutorial_world/build.ev b/evennia/contrib/tutorial_world/build.ev index 73abe85848..c4b94ae797 100644 --- a/evennia/contrib/tutorial_world/build.ev +++ b/evennia/contrib/tutorial_world/build.ev @@ -279,9 +279,7 @@ start # @set sign/readable_text = - - WARNING - The bridge is not safe! - + |rWARNING - The bridge is not safe!|n Below this official warning, someone has carved some sprawling 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 # @desc stone = - The lid of the coffin is adorned with a stone statue in full size. The weapon held by - the stone hands looks very realistic ... ( + The lid of the coffin is adorned with a stone statue in full size. +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) # @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 = The tomb has already granted you all the might it will ever do. # @set sarcophagus/get_weapon_msg = - 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! - - With trembling hands you release the weapon from the stone and hold - {c%s{n in your hands! - + Trembling you carefully release the weapon from the stone to test + its weight. You are finally holding your prize, + The {c%s{n + in your hands! {gThis concludes the Evennia tutorial. From here you can either 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 # 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 @tel tut#16 diff --git a/evennia/contrib/tutorial_world/objects.py b/evennia/contrib/tutorial_world/objects.py index 8772b6daaa..54d0c31d00 100644 --- a/evennia/contrib/tutorial_world/objects.py +++ b/evennia/contrib/tutorial_world/objects.py @@ -978,7 +978,7 @@ WEAPON_PROTOTYPES = { "damage": 10}, "hawkblade": { "prototype": "ghostblade", - "key": "The Hawblade", + "key": "The Hawkblade", "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.", "hit": 0.85, diff --git a/evennia/contrib/tutorial_world/rooms.py b/evennia/contrib/tutorial_world/rooms.py index cab0731c5d..26948a81a7 100644 --- a/evennia/contrib/tutorial_world/rooms.py +++ b/evennia/contrib/tutorial_world/rooms.py @@ -1009,13 +1009,13 @@ class OutroRoom(TutorialRoom): Do cleanup. """ 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 del character.db.last_climbed del character.db.puzzle_clue del character.db.combat_parry_mode 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")