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

Renamed classes to prevent conflicts

Browse source
This commit is contained in:
trhr 2020-05-11 09:27:23 -05:00 • committed by Griatch
parent a96332e9c3
commit 3f05a05a3c
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -433,7 +433,7 @@ north
# #
# Create the weapon rack (the barrel) # Create the weapon rack (the barrel)
# #
@create/drop barrel: tutorial_world.objects.WeaponRack @create/drop barrel: tutorial_world.objects.TutorialWeaponRack
# #
@desc barrel = @desc barrel =
This barrel has the air of leftovers - it contains an assorted This barrel has the air of leftovers - it contains an assorted
@ -1299,7 +1299,7 @@ Tomb of the hero
# The sarcophagus is a "weapon rack" from which you can extract one # The sarcophagus is a "weapon rack" from which you can extract one
# single weapon. # single weapon.
# #
@create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.WeaponRack @create/drop Stone sarcophagus;sarcophagus;stone : tutorial_world.objects.TutorialWeaponRack
# #
@desc stone = @desc stone =
The lid of the coffin is adorned with a stone statue in full size. The lid of the coffin is adorned with a stone statue in full size.

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

@ -14,8 +14,8 @@ TutorialClimbable
Obelisk Obelisk
LightSource LightSource
CrumblingWall CrumblingWall
Weapon TutorialWeapon
WeaponRack TutorialWeaponRack
""" """
@ -790,7 +790,7 @@ class CrumblingWall(TutorialObject, DefaultExit):
# ------------------------------------------------------------- # -------------------------------------------------------------
# #
# Weapon - object type # TutorialWeapon - object type
# #
# A weapon is necessary in order to fight in the tutorial # A weapon is necessary in order to fight in the tutorial
# world. A weapon (which here is assumed to be a bladed # world. A weapon (which here is assumed to be a bladed
@ -929,7 +929,7 @@ class CmdSetWeapon(CmdSet):
self.add(CmdAttack()) self.add(CmdAttack())
class Weapon(TutorialObject): class TutorialWeapon(TutorialObject):
""" """
This defines a bladed weapon. This defines a bladed weapon.
@ -980,7 +980,7 @@ class Weapon(TutorialObject):
WEAPON_PROTOTYPES = { WEAPON_PROTOTYPES = {
"weapon": { "weapon": {
"typeclass": "evennia.contrib.tutorial_world.objects.Weapon", "typeclass": "evennia.contrib.tutorial_world.objects.TutorialWeapon",
"key": "Weapon", "key": "Weapon",
"hit": 0.2, "hit": 0.2,
"parry": 0.2, "parry": 0.2,
@ -1125,7 +1125,7 @@ class CmdSetWeaponRack(CmdSet):
self.add(CmdGetWeapon()) self.add(CmdGetWeapon())
class WeaponRack(TutorialObject): class TutorialWeaponRack(TutorialObject):
""" """
This object represents a weapon store. When people use the This object represents a weapon store. When people use the
"get weapon" command on this rack, it will produce one "get weapon" command on this rack, it will produce one