Merge pull request #139 from kharidiron/master

Bug fixes, yay.

PLEASE DOUBLE CHECK YOUR CONFIG.JSON!!! 
Many configuration elements have changed.

Author: kamilion

config/config.json.default

@@ -1,4 +1,5 @@
 {
+    "backup_db": "backups/backups.db",
     "bind_address": "",
     "bind_port": 21025,
     "chat_prefix": "#",
@@ -16,6 +17,7 @@
         "admin_messenger",
         "afk_plugin",
         "announcer_plugin",
+        "backups_plugin",
         "bookmarks_plugin",
         "brutus_whisper",
         "chat_logger",
@@ -30,6 +32,7 @@
         "players_plugin",
         "plugin_manager_plugin",
         "poi_plugin",
+        "teleport_plugin",
         "udp_forwarder",
         "uptime_plugin"
     ],
@@ -48,7 +51,7 @@
             "max_claims": 5,
             "unclaimable_planets": []
         },
-        "irc": {
+        "irc_plugin": {
             "bot_nickname": "StarryPyBot",
             "channel": "##test",
             "color": "^#e39313;",

packets/packet_types.py

@@ -167,10 +167,9 @@ def _decode(self, obj, context):
                     Byte("world_id"),
                     Switch("world_type", lambda ctx: ctx["world_id"],
                            {
-                               1: star_string("unique_world_name"),
-                               2: LazyBound("next", lambda: warp_world_celestial),
-                               3: LazyBound("next", lambda: warp_world_player),
-                               4: LazyBound("next", lambda: warp_world_mission)
+                               1: LazyBound("next", lambda: warp_world_celestial),
+                               2: LazyBound("next", lambda: warp_world_player),
+                               3: LazyBound("next", lambda: warp_world_mission)
                            },
                            default = Pass
                            )
@@ -204,7 +203,10 @@ def _decode(self, obj, context):
 
 warp_world_mission = Struct("mission_world",
                             star_string("mission_world_name"),
-                            HexAdapter(Field("instance", 16))
+                            Byte("check"),
+                            If(lambda ctx: ctx["check"] == 1,
+                               HexAdapter(Field("instance", 16))
+                               )
                             )
 
 

plugins.disable/warpy_plugin/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 from base_plugin import SimpleCommandPlugin
 from utility_functions import path, extract_name, verify_path
-from plugins.core.player_manager import permissions, UserLevels
+from plugins.core.player_manager_plugin import permissions, UserLevels
 from .database import DatabaseManager
 
 import datetime
@@ -16,9 +16,8 @@ class BackupsPlugin(SimpleCommandPlugin):
     StarryPy Planet Backup System
     """
     name = "backups_plugin"
-    depends = ["command_dispatcher", "player_manager"]
+    depends = ['command_plugin', 'player_manager_plugin']
     commands = ["backup"]
-    auto_activate = True
 
     def __init__(self):
         self._prep_path('./backups')
@@ -34,7 +33,7 @@ def __init__(self):
 
     def activate(self):
         super(BackupsPlugin, self).activate()
-        self.player_manager = self.plugins['player_manager'].player_manager
+        self.player_manager = self.plugins['player_manager_plugin'].player_manager
         self.db = DatabaseManager("./backups/backups.db")
 
     @permissions(UserLevels.REGISTERED)

plugins/backups_plugin/backups_plugin.py

@@ -1,7 +1,8 @@
 # -*- coding: UTF-8 -*-
 from base_plugin import SimpleCommandPlugin
 from utility_functions import build_packet, move_ship_to_coords, extract_name
-from plugins.core.player_manager import permissions, UserLevels
+from plugins.core.player_manager_plugin import permissions, UserLevels
+
 
 from packets import Packets, WarpAliasType, WarpWorldType, WarpActionType, player_warp, player_warp_touniqueworld_write, player_warp_toplayerworld_write, player_warp_toplayer_write, player_warp_toalias_write, fly_ship, fly_ship_write
 
@@ -11,9 +12,8 @@ class TeleportPlugin(SimpleCommandPlugin):
     Rapid transport via teleportation.
     """
     name = "teleport_plugin"
-    depends = ['command_dispatcher', 'player_manager']
+    depends = ['command_plugin', 'player_manager_plugin']
     commands = ["teleport", "tp"]
-    auto_activate = True
 
     def __init__(self):
         self.subcommands = {'help': self.teleport_help,
@@ -26,11 +26,11 @@ def __init__(self):
 
     def activate(self):
         super(TeleportPlugin, self).activate()
-        self.player_manager = self.plugins['player_manager'].player_manager
+        self.player_manager = self.plugins['player_manager_plugin'].player_manager
 
     @permissions(UserLevels.REGISTERED)
     def teleport(self, data):
-        """Player teleportation system. By default, this system will telepor a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, home, outpost, ^gray;bookmark, poi"""
+        """Player teleportation system. By default, this system will telepor a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, home, ^gray;outpost, bookmark, poi"""
         self.logger.vdebug('Teleport command called')
         if not data:
             self.protocol.send_chat_message(self.teleport.__doc__)
@@ -44,12 +44,12 @@ def teleport(self, data):
 
     @permissions(UserLevels.REGISTERED)
     def tp(self, data):
-        """Player teleportation system. By default, this system will teleport a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, bookmark, poi"""
+        """Player teleportation system. By default, this system will teleport a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, home"""
         self.teleport(data)
 
     @permissions(UserLevels.REGISTERED)
     def teleport_help(self, data):
-        """Player teleportation system. By default, this system will teleport a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, bookmark, poi"""
+        """Player teleportation system. By default, this system will teleport a player to another player. Use subcommands to modify this behavior. Available subcommands are:\n^cyan;player, ship, home"""
         self.protocol.send_chat_message(self.teleport.__doc__)
         return
 
@@ -178,25 +178,27 @@ def teleport_to_own_ship(self, data):
     def teleport_to_outpost(self, data):
         """Teleports a player to the outpost. If no source player is provided, we assume you mean yourself.\nSyntax: /teleport outpost [source player]"""
         usage = 'Syntax: /teleport outpost [source player]'
-        if not data:
-            source = self.protocol.player.name
-        else:
-            source, rest = extract_name(data)
-            if not self._validate_player(source):
-                self.protocol.send_chat_message(usage)
-                return
-        source = source.lower()
-
-        source_player = self.player_manager.get_logged_in_by_name(source)
-        if source_player is None:
-            self.logger.debug("Error: Player %s is not logged in.", source)
-            self.protocol.send_chat_message("Error: Player %s is not logged in." % (source, ))
-            return
-
-        source_protocol = self.factory.protocols[source_player.protocol]
-        teleport_packet = build_packet(Packets.PLAYER_WARP, player_warp_touniqueworld_write(destination='outpost'))
-
-        source_protocol.client_protocol.transport.write(teleport_packet)
+        #if not data:
+        #    source = self.protocol.player.name
+        #else:
+        #    source, rest = extract_name(data)
+        #    if not self._validate_player(source):
+        #        self.protocol.send_chat_message(usage)
+        #        return
+        #source = source.lower()
+
+        #source_player = self.player_manager.get_logged_in_by_name(source)
+        #if source_player is None:
+        #    self.logger.debug("Error: Player %s is not logged in.", source)
+        #    self.protocol.send_chat_message("Error: Player %s is not logged in." % (source, ))
+        #    return
+
+        #source_protocol = self.factory.protocols[source_player.protocol]
+        #teleport_packet = build_packet(Packets.PLAYER_WARP, player_warp_touniqueworld_write(destination='outpost'))
+
+        #source_protocol.client_protocol.transport.write(teleport_packet)
+        self.protocol.send_chat_message('This is not yet implemented.')
+        return
 
     @permissions(UserLevels.REGISTERED)
     def teleport_to_bookmark(self, data):