Skip to content

Commit

Permalink
Added WWI Command
Browse files Browse the repository at this point in the history
Finally fixed a crash issue under MySQL where a DB action after a certain amount of inactivity time results in a crash

Fixed SCommands events from not unbinding when being unloaded

Alterations to the help command for command categorization

Various Alterations to server.py and models.py

Various Database system alterations and fixes

General Document Changes
  • Loading branch information
Ragora committed Oct 9, 2014
1 parent e17aab8 commit 7090bdc
Show file tree
Hide file tree
Showing 138 changed files with 4,429 additions and 20,243 deletions.
17 changes: 9 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
*.pyc
*.py~
*.cfg~
*.txt~
*.rst~
doc/build/doctrees
application/game/fuzzball
application/game/construction
*.pyc
*.py~
*.cfg~
*.txt~
*.rst~
doc/build
application/game/fuzzball
application/game/construction
application/game/scmsa
21 changes: 21 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Robert MacGregor

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
2 changes: 1 addition & 1 deletion application/config/exit_message.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

You fall asleep in the current area.
8 changes: 7 additions & 1 deletion application/config/permissions.cfg
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
# Global permissions file for ScalyMUCK.
# Global permissions file for ScalyMUCK.
# You should add values based on the documentation given by your modification.

# These override settings determine whether or not admins, super admins and owners can override certain kinds of permission locks. IE: Can an admin override the ownership check when editing an item?
AllowAdminOverride=Yes
AllowSuperAdminOverride=Yes
AllowOwnerOverride=Yes
97 changes: 50 additions & 47 deletions application/config/settings_server.cfg
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
# Configuration file for ScalyMUCK Server

# All you'd ever really need to adjust is this server port. Make sure it's some number above 1024 as on Linux systems, 1024 and below does not work as a
# valid port number.
ServerPort=2000
ServerAddress=0.0.0.0

# The type of database to use.
# Available: mysql, postgresql, sqlite (locally stored)
DatabaseType=sqlite
# Database File Name -or- IP Address. It is a file location when using SQLite but is an IP address when using PostgreSQL/MySQL
# When using MySQL, this is in relation to ~/.scalyMUCK/ and you should just write it there.
TargetDatabase=database.db
# If using MySQL or PostGreSQL, you must specify a username to connect with.
DatabaseUser=Korthos
# Same as above except with a password.
DatabasePassword=FrozenFish
# Again, just with a database name now.
DatabaseName=SomeDatabase

# This is used when hashing passwords to be stored in the database, it basically tells the software how many times the hashing algorithm should be applied
# before storing the password. With that being said, the higher the value the more computations that must occur and therefore should be adjusted accordingly
# for your specific server. This is used to prevent timing attacks.
WorkFactor=10

# Whether or not a connection log should be kept. Pretty useless really except it lists out IP addresses that have been in/out and who they signed in as.
LogConnections=Yes
# Whether or not to log mod data
LogMods=Yes
# Whether or not to log generic server events
LogServer=Yes
# Clear the logs when the server is started?
ClearLogsOnStart=Yes

# List of mods to load. Separate each specific mod with semicolons ... THESE ARE CASE SENSITIVE.
LoadedMods=scommands

I_DONT_KNOW_HOW_TO_SECURITY_LET_ME_RUN_AS_ROOT=No

# Text configuration for the core server
AuthLowArgC=You did not specify all of the required arguments.
AuthInvalidCombination=You have specified an invalid username/password combination.
AuthConnected=%s has connected.
AuthReplaceConnection=Your connection has been replaced.
AuthConnectionReplaced=You boot off an old connection.
AuthReplaceConnectionGlobal=%s replaced their connection.
AuthConnectSuggestion=You must use the "connect" command:\nconnect <username> <password>
# Configuration file for ScalyMUCK Server

# All you'd ever really need to adjust is this server port. Make sure it's some number above 1024 as on Linux systems, 1024 and below does not work as a
# valid port number.
ServerPort=2000
ServerAddress=0.0.0.0

# The type of database to use.
# Available: mysql, postgresql, sqlite (locally stored)
DatabaseType=sqlite
# Database File Name -or- IP Address. It is a file location when using SQLite but is an IP address when using PostgreSQL/MySQL
# When using SQLite, this is in relation to ~/.scalyMUCK/ and you should just write it there.
TargetDatabase=database.db
# If using MySQL or PostGreSQL, you must specify a username to connect with.
DatabaseUser=Korthos
# Same as above except with a password.
DatabasePassword=FrozenFish
# Again, just with a database name now.
DatabaseName=SomeDatabase

# This is used when hashing passwords to be stored in the database, it basically tells the software how many times the hashing algorithm should be applied
# before storing the password. With that being said, the higher the value the more computations that must occur and therefore should be adjusted accordingly
# for your specific server. This is used to prevent timing attacks.
WorkFactor=10

# Whether or not a connection log should be kept. Pretty useless really except it lists out IP addresses that have been in/out and who they signed in as.
LogConnections=Yes
# Whether or not to log mod data
LogMods=Yes
# Whether or not to log generic server events
LogServer=Yes
# Clear the logs when the server is started?
ClearLogsOnStart=Yes

# List of mods to load. Separate each specific mod with semicolons ... THESE ARE CASE SENSITIVE.
LoadedMods=scommands

# For server devs only.
# Debug=Yes

I_DONT_KNOW_HOW_TO_SECURITY_LET_ME_RUN_AS_ROOT=No

# Text configuration for the core server
AuthLowArgC=You did not specify all of the required arguments.
AuthInvalidCombination=You have specified an invalid username/password combination.
AuthConnected=%s has connected.
AuthReplaceConnection=Your connection has been replaced.
AuthConnectionReplaced=You boot off an old connection.
AuthReplaceConnectionGlobal=%s replaced their connection.
AuthConnectSuggestion=You must use the "connect" command:\nconnect <username> <password>
GameClientDisconnect=%s has disconnected.
12 changes: 6 additions & 6 deletions application/config/welcome_message.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
============================================================
Welcome! You're on a MUCK server running ScalyMUCK
Copyright (c) 2013 Robert MacGregor
You may connect using the 'connect' command:
connect <username> <password>
============================================================
============================================================
Welcome! You're on a MUCK server running ScalyMUCK
Copyright (c) 2014 Robert MacGregor
You may connect using the 'connect' command:
connect <username> <password>
============================================================
Loading

0 comments on commit 7090bdc

Please sign in to comment.