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

Committin a 'working' checkpoint before I break more stuff.

Browse source
This commit is contained in:
Greg Taylor 2008-06-15 19:06:31 +00:00
parent ccf078b5c8
commit d3808c1ea2
18 changed files with 494 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

9
commands/comsys.py
View file

@ -1,16 +1,15 @@
"""
Comsys command module. Pretty much every comsys command should go here for
now.
"""
import time
from django.conf import settings
import functions_general
import functions_db
import functions_comsys
import defines_global
import ansi
"""
Comsys command module. Pretty much every comsys command should go here for
now.
"""
def cmd_addcom(cdat):
"""

22
commands/general.py
View file

@ -8,8 +8,8 @@ from django.conf import settings
from apps.config.models import ConfigValue
from apps.helpsys.models import HelpEntry
from apps.objects.models import Object
import functions_general
import functions_db
import defines_global
import session_mgr
import ansi
@ -110,7 +110,7 @@ def cmd_look(cdat):
if len(args) == 0:
target_obj = pobject.get_location()
else:
target_obj = functions_db.standard_plr_objsearch(session, ' '.join(args))
target_obj = Object.objects.standard_plr_objsearch(session, ' '.join(args))
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -139,7 +139,7 @@ def cmd_get(cdat):
session.msg("Get what?")
return
else:
target_obj = functions_db.standard_plr_objsearch(session, ' '.join(args), search_contents=False)
target_obj = Object.objects.standard_plr_objsearch(session, ' '.join(args), search_contents=False)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -178,7 +178,7 @@ def cmd_drop(cdat):
session.msg("Drop what?")
return
else:
target_obj = functions_db.standard_plr_objsearch(session, ' '.join(args), search_location=False)
target_obj = Object.objects.standard_plr_objsearch(session, ' '.join(args), search_location=False)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -224,7 +224,7 @@ def cmd_examine(cdat):
else:
searchstr = ' '.join(args)
target_obj = functions_db.standard_plr_objsearch(session, searchstr)
target_obj = Object.objects.standard_plr_objsearch(session, searchstr)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -302,9 +302,9 @@ def cmd_page(cdat):
last_paged_dbref_list = [
x.strip() for x in last_paged_dbrefs.split(',')]
for dbref in last_paged_dbref_list:
if not functions_db.is_dbref(dbref):
if not Object.objects.is_dbref(dbref):
raise ValueError
last_paged_object = functions_db.dbref_search(dbref)
last_paged_object = Object.objects.dbref_search(dbref)
if last_paged_object is not None:
last_paged_objects.append(last_paged_object)
except ValueError:
@ -332,7 +332,7 @@ def cmd_page(cdat):
targets = dict([(target, 1) for target in last_paged_objects])
else:
# First try to match the entire target string against a single player
full_target_match = functions_db.player_name_search(
full_target_match = Object.objects.player_name_search(
parsed_command['original_targets'])
if full_target_match is not None:
targets[full_target_match] = 1
@ -341,9 +341,9 @@ def cmd_page(cdat):
# it to the targets list
for target in parsed_command['targets']:
# If the target is a dbref, behave appropriately
if functions_db.is_dbref(target):
if Object.objects.is_dbref(target):
session.msg("Is dbref.")
matched_object = functions_db.dbref_search(target,
matched_object = Object.objects.dbref_search(target,
limit_types=[defines_global.OTYPE_PLAYER])
if matched_object is not None:
targets[matched_object] = 1
@ -353,7 +353,7 @@ def cmd_page(cdat):
target))
else:
# Not a dbref, so must be a username, treat it as such
matched_object = functions_db.player_name_search(
matched_object = Object.objects.player_name_search(
target)
if matched_object is not None:
targets[matched_object] = 1

4
commands/info.py
View file

@ -11,7 +11,7 @@ if not functions_general.host_os_is('nt'):
# Don't import the resource module if the host OS is Windows.
import resource
import functions_db
from apps.objects.models import Object
import scheduler
import defines_global
@ -99,7 +99,7 @@ def cmd_stats(cdat):
4012 objects = 144 rooms, 212 exits, 613 things, 1878 players. (1165 garbage)
"""
session = cdat['session']
stats_dict = functions_db.object_totals()
stats_dict = Object.objects.object_totals()
session.msg("%d objects = %d rooms, %d exits, %d things, %d players. (%d garbage)" % (stats_dict["objects"],
stats_dict["rooms"],
stats_dict["exits"],

56
commands/objmanip.py
View file

@ -1,6 +1,10 @@
"""
These commands typically are to do with building or modifying Objects.
"""
from apps.objects.models import Object
import src.flags
import ansi
import session_mgr
import functions_db
def cmd_teleport(cdat):
"""
@ -23,12 +27,12 @@ def cmd_teleport(cdat):
# a direct teleport, @tel <destination>.
if len(eq_args) > 1:
# Equal sign teleport.
victim = functions_db.standard_plr_objsearch(session, eq_args[0])
victim = Object.objects.standard_plr_objsearch(session, eq_args[0])
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not victim:
return
destination = functions_db.standard_plr_objsearch(session, eq_args[1])
destination = Object.objects.standard_plr_objsearch(session, eq_args[1])
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not destination:
return
@ -53,7 +57,7 @@ def cmd_teleport(cdat):
else:
# Direct teleport (no equal sign)
target_obj = functions_db.standard_plr_objsearch(session, search_str)
target_obj = Object.objects.standard_plr_objsearch(session, search_str)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -71,7 +75,7 @@ def cmd_stats(cdat):
4012 objects = 144 rooms, 212 exits, 613 things, 1878 players. (1165 garbage)
"""
session = cdat['session']
stats_dict = functions_db.object_totals()
stats_dict = Object.objects.object_totals()
session.msg("%d objects = %d rooms, %d exits, %d things, %d players. (%d garbage)" % (stats_dict["objects"],
stats_dict["rooms"],
stats_dict["exits"],
@ -98,13 +102,13 @@ def cmd_alias(cdat):
session.msg("Alias missing.")
return
target = functions_db.standard_plr_objsearch(session, eq_args[0])
target = Object.objects.standard_plr_objsearch(session, eq_args[0])
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target:
session.msg("Alias whom?")
return
duplicates = functions_db.alias_search(pobject, eq_args[1])
duplicates = Object.objects.player_alias_search(pobject, eq_args[1])
if duplicates:
session.msg("Alias '%s' already exists." % (eq_args[1],))
@ -145,7 +149,7 @@ def cmd_wipe(cdat):
else:
searchstr = ' '.join(args)
target_obj = functions_db.standard_plr_objsearch(session, searchstr)
target_obj = Object.objects.standard_plr_objsearch(session, searchstr)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -189,7 +193,7 @@ def cmd_set(cdat):
session.msg("Set what?")
return
victim = functions_db.standard_plr_objsearch(session, eq_args[0])
victim = Object.objects.standard_plr_objsearch(session, eq_args[0])
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not victim:
return
@ -207,7 +211,7 @@ def cmd_set(cdat):
attrib_value = eq_args[1][splicenum:]
# In global_defines.py, see NOSET_ATTRIBS for protected attribute names.
if not functions_db.is_modifiable_attrib(attrib_name) and not pobject.is_superuser():
if not src.flags.is_modifiable_attrib(attrib_name) and not pobject.is_superuser():
session.msg("You can't modify that attribute.")
return
@ -229,14 +233,14 @@ def cmd_set(cdat):
if flag[0] == '!':
# We're un-setting the flag.
flag = flag[1:]
if not functions_db.is_modifiable_flag(flag):
if not src.flags.is_modifiable_flag(flag):
session.msg("You can't set/unset the flag - %s." % (flag,))
else:
session.msg('%s - %s cleared.' % (victim.get_name(), flag.upper(),))
victim.set_flag(flag, False)
else:
# We're setting the flag.
if not functions_db.is_modifiable_flag(flag):
if not src.flags.is_modifiable_flag(flag):
session.msg("You can't set/unset the flag - %s." % (flag,))
else:
session.msg('%s - %s set.' % (victim.get_name(), flag.upper(),))
@ -256,7 +260,7 @@ def cmd_find(cdat):
session.msg("No search pattern given.")
return
results = functions_db.global_object_name_search(searchstring)
results = Object.objects.global_object_name_search(searchstring)
if len(results) > 0:
session.msg("Name matches for: %s" % (searchstring,))
@ -281,7 +285,7 @@ def cmd_create(cdat):
else:
# Create and set the object up.
odat = {"name": thingname, "type": 3, "location": pobject, "owner": pobject}
new_object = functions_db.create_object(odat)
new_object = Object.objects.create_object(odat)
session.msg("You create a new thing: %s" % (new_object,))
@ -291,7 +295,7 @@ def cmd_nextfree(cdat):
"""
session = cdat['session']
nextfree = functions_db.get_nextfree_dbnum()
nextfree = Object.objects.get_nextfree_dbnum()
session.msg("Next free object number: #%s" % (nextfree,))
def cmd_open(cdat):
@ -325,7 +329,7 @@ def cmd_open(cdat):
if len(eq_args) > 1:
# Opening an exit to another location via @open <Name>=<Dbref>[,<Name>].
comma_split = eq_args[1].split(',')
destination = functions_db.standard_plr_objsearch(session, comma_split[0])
destination = Object.objects.standard_plr_objsearch(session, comma_split[0])
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not destination:
return
@ -335,20 +339,20 @@ def cmd_open(cdat):
return
odat = {"name": exit_name, "type": 4, "location": pobject.get_location(), "owner": pobject, "home":destination}
new_object = functions_db.create_object(odat)
new_object = Object.objects.create_object(odat)
session.msg("You open the an exit - %s to %s" % (new_object.get_name(),destination.get_name()))
if len(comma_split) > 1:
second_exit_name = ','.join(comma_split[1:])
odat = {"name": second_exit_name, "type": 4, "location": destination, "owner": pobject, "home": pobject.get_location()}
new_object = functions_db.create_object(odat)
new_object = Object.objects.create_object(odat)
session.msg("You open the an exit - %s to %s" % (new_object.get_name(),pobject.get_location().get_name()))
else:
# Create an un-linked exit.
odat = {"name": exit_name, "type": 4, "location": pobject.get_location(), "owner": pobject, "home":None}
new_object = functions_db.create_object(odat)
new_object = Object.objects.create_object(odat)
session.msg("You open an unlinked exit - %s" % (new_object,))
@ -377,7 +381,7 @@ def cmd_link(cdat):
return
if len(eq_args) > 1:
target_obj = functions_db.standard_plr_objsearch(session, target_name)
target_obj = Object.objects.standard_plr_objsearch(session, target_name)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -392,7 +396,7 @@ def cmd_link(cdat):
session.msg("You have unlinked %s." % (target_obj,))
return
destination = functions_db.standard_plr_objsearch(session, dest_name)
destination = Object.objects.standard_plr_objsearch(session, dest_name)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not destination:
return
@ -417,7 +421,7 @@ def cmd_unlink(cdat):
session.msg("Unlink what?")
return
else:
target_obj = functions_db.standard_plr_objsearch(session, ' '.join(args))
target_obj = Object.objects.standard_plr_objsearch(session, ' '.join(args))
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -443,7 +447,7 @@ def cmd_dig(cdat):
else:
# Create and set the object up.
odat = {"name": roomname, "type": 2, "location": None, "owner": pobject}
new_object = functions_db.create_object(odat)
new_object = Object.objects.create_object(odat)
session.msg("You create a new room: %s" % (new_object,))
@ -462,7 +466,7 @@ def cmd_name(cdat):
elif len(eq_args) < 2:
session.msg("What would you like to name that object?")
else:
target_obj = functions_db.standard_plr_objsearch(session, searchstring)
target_obj = Object.objects.standard_plr_objsearch(session, searchstring)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -489,7 +493,7 @@ def cmd_description(cdat):
elif len(eq_args) < 2:
session.msg("How would you like to describe that object?")
else:
target_obj = functions_db.standard_plr_objsearch(session, searchstring)
target_obj = Object.objects.standard_plr_objsearch(session, searchstring)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return
@ -519,7 +523,7 @@ def cmd_destroy(cdat):
session.msg("Destroy what?")
return
else:
target_obj = functions_db.standard_plr_objsearch(session, ' '.join(args))
target_obj = Object.objects.standard_plr_objsearch(session, ' '.join(args))
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return

6
commands/privileged.py
View file

@ -1,6 +1,6 @@
from apps.objects.models import Object
import defines_global
import functions_general
import functions_db
import ansi
"""
@ -52,7 +52,7 @@ def cmd_boot(cdat):
break
else:
# Grab the objects that match
objs = functions_db.global_object_name_search(searchstring)
objs = Objects.object.global_object_name_search(searchstring)
if len(objs) < 1:
session.msg("Who would you like to boot?")
@ -98,7 +98,7 @@ def cmd_newpassword(cdat):
session.msg("You must supply a new password.")
return
target_obj = functions_db.standard_plr_objsearch(session, searchstring)
target_obj = Objects.object.standard_plr_objsearch(session, searchstring)
# Use standard_plr_objsearch to handle duplicate/nonexistant results.
if not target_obj:
return

17
commands/unloggedin.py
View file

@ -1,12 +1,11 @@
from django.contrib.auth.models import User
from apps.objects.models import Attribute, Object
import functions_db
import functions_general
import defines_global
"""
Commands that are available from the connect screen.
"""
from django.contrib.auth.models import User
from apps.objects.models import Attribute, Object
import functions_general
import defines_global
def cmd_connect(cdat):
"""
@ -24,7 +23,7 @@ def cmd_connect(cdat):
password = cdat['uinput']['splitted'][2]
# Match an email address to an account.
email_matches = functions_db.get_user_from_email(uemail)
email_matches = Object.objects.get_user_from_email(uemail)
autherror = "Specified email does not match any accounts!"
# No username match
@ -71,7 +70,7 @@ def cmd_create(cdat):
# Search for a user object with the specified username.
account = User.objects.filter(username=uname)
# Match an email address to an account.
email_matches = functions_db.get_user_from_email(email)
email_matches = Object.objects.get_user_from_email(email)
# Look for any objects with an 'Alias' attribute that matches
# the requested username
alias_matches = Object.objects.filter(attribute__attr_name__exact="ALIAS",
@ -85,7 +84,7 @@ def cmd_create(cdat):
elif len(password) < 3:
session.msg("Your password must be 3 characters or longer.")
else:
functions_db.create_user(cdat, uname, email, password)
Object.objects.create_user(cdat, uname, email, password)
def cmd_quit(cdat):
"""