Changeset 205

Timestamp:

07/27/07 05:09:26 (1 year ago)

Author:

prairiegames

Message:

merging fixes into trunk for patch 1.25.1

Files:

• trunk/games/minionsofmirth/v1/mud/client/gui/clientcommands.py (modified) (3 diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/friendsWnd.py (modified) (1 diff)
• trunk/games/minionsofmirth/v1/mud/client/gui/helpWnd.py (modified) (3 diffs)
• trunk/games/minionsofmirth/v1/mud/client/gui/playerSettings.py (modified) (3 diffs)
• trunk/games/minionsofmirth/v1/mud/world/character.py (modified) (2 diffs)
• trunk/games/minionsofmirth/v1/mud/world/genesistime.py (modified) (1 diff)

trunk/games/minionsofmirth/v1/mud/client/gui/clientcommands.py

@@ -29 +29 @@
-
-def CmdIgnore(args):
-gui.
+
-    from tomeGui import TOMEGUI
-    nick = ' '.join(args)
@@ -39 +39 @@
-
-def CmdUnignore(args):
-gui.
+
-    from tomeGui import TOMEGUI
-    nick = ' '.join(args)
@@ -49 +49 @@
-
-def CmdIgnored(args):
-gui.
+
-    IGNORED = PLAYERSETTINGS.ignored
-    

trunk/games/minionsofmirth/v1/mud/client/gui/friendsWnd.py

@@ -112 +112 @@
-        return
-    try:
-
+
+
-    except:
-        pass

trunk/games/minionsofmirth/v1/mud/client/gui/helpWnd.py

@@ -11 +11 @@
-<color:FFFF00>OSX Note:<color:BBFFBB> Command click simulates a right click 
-
-<color:FFFF00>Item Linking:<color:BBFFBB> For many areas of the UI, such as inventory window, spell book, skill listing, and effects window:
-<color:FFFFFF>Shift + Left Click <color:BBAAAA><color:BBFFBB> - Open Encyclopedia to appropriate page.
-<color:FFFFFF>Shift + Right Click <color:BBAAAA><color:BBFFBB> - Place link to appropriate page in chat.
-
-<color:FFFFFF>Left + Right Click <color:BBAAAA><color:BBFFBB> - Move Forward
-<color:FFFFFF>Left Click <color:BBAAAA>on npc, monster, or player avatar <color:BBFFBB> - Select
+<color:FFFFFF>Shift + Left Click <color:BBAAAA>on npc, monster, or player avatar <color:BBFFBB> - Inspect
-<color:FFFFFF>Left Click <color:BBAAAA>on quick slot or macro slot <color:BBFFBB> - Activate
-<color:FFFFFF>Left Click <color:BBAAAA>on target health bar with player targeted <color:BBFFBB> - Cycle Targets
@@ -42 +39 @@
-<color:FFFFFF>Double Click <color:BBAAAA>on nonharmful effect icon <color:BBFFBB> - Cancel Effect
-
+<color:FFFF00>Item Linking:<color:BBFFBB> For many areas of the UI, such as inventory window, spell book, skill listing, and effects window:
+
+<color:FFFFFF>Shift + Left Click <color:BBAAAA><color:BBFFBB> - Opens encyclopedia to appropriate page.
+<color:FFFFFF>Shift + Right Click <color:BBAAAA><color:BBFFBB> - Places link in chat.
+
-<font:Arial:16><just:center>
-<color:BBBBFF>Default Keyboard<just:left><font:Arial:13>
@@ -199 +201 @@
-<color:FFFFFF>/friend remove <character name> <color:BBFFBB> - Remove a character from your friend list.
-
+<color:FFFFFF>/map <description> <color:BBFFBB> - Add a map annotation to your 3d map and tracking list at your current location.
+
-<just:center><font:Arial:16>
-<color:BBBBFF>Guild Commands<just:left><font:Arial:13>

trunk/games/minionsofmirth/v1/mud/client/gui/playerSettings.py

@@ -206 +206 @@
-        self.loadIgnored()
-        
+        # Dictionary for window settings. Keys are window names,
+        #  values are tuples of (window object,boolean True if active,flag if resizable).
+        self.windows = {}
-        # Name of current world.
-        self.worldname = ""
@@ -322 +325 @@
-                    cursor.execute("UPDATE world SET singleplayer=? WHERE id=?;",(singleplayer,self.worldID))
-        try:
-
+
+
+
+
-        except:
-            # Use default.
@@ -411 +417 @@
-        charID = cursor.execute("SELECT id FROM character WHERE world_id=? AND realm=? AND name=?;",(self.worldID,self.lastRealm,charname)).fetchone()
-        if charID == None:
-print 'Error: Character to be deleted could not be found!'
+# Nothing to delete, character probably didn't get used yet.
-            return
-        charID = charID[0]

trunk/games/minionsofmirth/v1/mud/world/character.py

@@ -777 +777 @@
-        # Find first slot that isn't used that item can go into.
-        for slot in slots:
-            found = False
-            # Check if an item is already equipped in that slot.
-            for citem in self.items:
-                if citem.slot == slot:
-                    found = True
-                    break
-            # No item equipped in checked slot.
@@ -790 +788 @@
-        unequip = None
-        if useslot == None:
+            # If item that should be equipped has invalid slot, don't attempt to switch.
+            if item.slot == -1 or RPG_SLOT_LOOT_BEGIN <= item.slot < RPG_SLOT_LOOT_END:
+                return
-            unequip = item
-            useslot = slots.pop()

trunk/games/minionsofmirth/v1/mud/world/genesistime.py

@@ -2 +2 @@
-#AUTOMATICALLY GENERATED FILE DO NOT EDIT!
-
-6-25 06:49:02
+7-26 14:38:09