Fix merge conflicts
This commit is contained in:
commit
2cb3273d0a
1 changed files with 37 additions and 36 deletions
|
|
@ -132,15 +132,16 @@ These all use whatever setting you pass to them and works well for testing code
|
||||||
- `EvenniaTest` - this sets up a full object environment for your test. All the created entities
|
- `EvenniaTest` - this sets up a full object environment for your test. All the created entities
|
||||||
can be accesses as properties on the class:
|
can be accesses as properties on the class:
|
||||||
- `.account` - A fake [Account](evennia.accounts.accounts.DefaultAccount) named "TestAccount".
|
- `.account` - A fake [Account](evennia.accounts.accounts.DefaultAccount) named "TestAccount".
|
||||||
- `.account2` - Another account named "TestAccount2"
|
- `.account2` - Another [Account](evennia.accounts.accounts.DefaultAccount) named "TestAccount2".
|
||||||
- `.char1` - A [Character](evennia.objects.objects.DefaultCharacter) linked to `.account`, named `Char`.
|
- `.char1` - A [Character](evennia.objects.objects.DefaultCharacter) linked to `.account`, named `Char`.
|
||||||
This has 'Developer' permissions but is not a superuser.
|
This has 'Developer' permissions but is not a superuser.
|
||||||
- `.char2` - Another character linked to `account`, named `Char2`. This has base permissions (player).
|
- `.char2` - Another [Character](evennia.objects.objects.DefaultCharacter) linked to `account2`, named `Char2`.
|
||||||
|
This has base permissions (player).
|
||||||
- `.obj1` - A regular [Object](evennia.objects.objects.DefaultObject) named "Obj".
|
- `.obj1` - A regular [Object](evennia.objects.objects.DefaultObject) named "Obj".
|
||||||
- `.obj2` - Another object named "Obj2".
|
- `.obj2` - Another [Object](evennia.objects.objects.DefaultObject) named "Obj2".
|
||||||
- `.room1` - A [Room](evennia.objects.objects.DefaultRoom) named "Room". Both characters and both
|
- `.room1` - A [Room](evennia.objects.objects.DefaultRoom) named "Room". Both characters and both
|
||||||
objects are located inside this room. It has a description of "room_desc".
|
objects are located inside this room. It has a description of "room_desc".
|
||||||
- `.room2` - Another room named "Room2". It is empty and has no set description.
|
- `.room2` - Another [Room](evennia.objects.objects.DefaultRoom) named "Room2". It is empty and has no set description.
|
||||||
- `.exit` - An exit named "out" that leads from `.room1` to `.room2`.
|
- `.exit` - An exit named "out" that leads from `.room1` to `.room2`.
|
||||||
- `.script` - A [Script](evennia.scripts.scripts.DefaultScript) named "Script". It's an inert script
|
- `.script` - A [Script](evennia.scripts.scripts.DefaultScript) named "Script". It's an inert script
|
||||||
without a timing component.
|
without a timing component.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue