Mercurial > wow > emfor1

changeset 13:77d2c7423ed5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libs in .pkgmeta , whitespaces unified and guild changeable with /script CensusPlus_MYGUILD="Any Guild";
author EmFor
date Sun, 14 Aug 2011 15:45:33 +0200
parents 9ca9973996c8
children a170ccb0e602
files .pkgmeta CensusPlus.lua CensusPlus.toc
diffstat 3 files changed, 66 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/.pkgmeta	Sun Aug 14 12:17:18 2011 +0200
+++ b/.pkgmeta	Sun Aug 14 15:45:33 2011 +0200
@@ -1,5 +1,14 @@
 package-as: CensusPlus
 
-ignore:
- - .pkgmeta
- - .docmeta
+enable-nolib-creation: no
+
+externals:
+ libs/LibStub:
+  url: svn://svn.wowace.com/wow/libstub/mainline/trunk
+  tag: latest
+ libs/CallbackHandler-1.0:
+  url: svn://svn.wowace.com/wow/callbackhandler/mainline/trunk/CallbackHandler-1.0
+  tag: latest
+ libs/LibWho:
+  url: svn://svn.wowace.com/wow/wholib/mainline/trunk
+  tag: latest
--- a/CensusPlus.lua	Sun Aug 14 12:17:18 2011 +0200
+++ b/CensusPlus.lua	Sun Aug 14 15:45:33 2011 +0200
@@ -41,26 +41,27 @@
 
 
 ----------------------------------------------------------------------------------
+--rm
+-- guild to search (Extra button 'Take guild')
+--local CensusPlus_MYGUILD = "The Last Journey";
+--local CensusPlus_MYGUILD = "Worgengrauen";
+CensusPlus_MYGUILD = "Flieht Ihr Narren";
+---------------------------------------------------------------------------------
 --
 -- Constants
---rm
--- Special guild to search
---local CensusPlus_MYGUILD = "The Last Journey";
-local CensusPlus_MYGUILD = "Worgengrauen";
----------------------------------------------------------------------------------
-local CensusPlus_VERSION = "5.0.2"; 			-- version
+local CensusPlus_VERSION = "5.0.2";    -- version
 local CensusPlus_MAXBARHEIGHT = 128;   -- Length of blue bars
-local CensusPlus_NUMGUILDBUTTONS = 10;   -- How many guild buttons are on the UI?
-local MAX_CHARACTER_LEVEL = 85;     -- Maximum level a PC can attain
+local CensusPlus_NUMGUILDBUTTONS = 10; -- How many guild buttons are on the UI?
+local MAX_CHARACTER_LEVEL = 85;        -- Maximum level a PC can attain
 --rm
 local MAX_LEVEL_DISPLAY = 255;     -- Maximum level a PC can attain
-local MAX_WHO_RESULTS = 49;      -- Maximum number of who results the server will return
+local MAX_WHO_RESULTS = 49;        -- Maximum number of who results the server will return
 CensusPlus_GUILDBUTTONSIZEY = 16;
-local CensusPlus_UPDATEDELAY = 5;    -- Delay time between /who messages
+local CensusPlus_UPDATEDELAY = 5;  -- Delay time between /who messages
 local CP_MAX_TIMES = 50;
 
-local g_ServerPrefix = "";      --  US VERSION!!
---local g_ServerPrefix = "EU-";     --  EU VERSION!!
+local g_ServerPrefix = "";         --  formerly only US VERSION
+--local g_ServerPrefix = "EU-";    --  EU VERSION  automatically
 
 local wholib
 ----------------------------------------------------------------------------------
@@ -205,8 +206,8 @@
 g_RaceClassList[CENSUSPlus_UNDEAD]  = 27;
 g_RaceClassList[CENSUSPlus_DRAENEI]  = 28;
 g_RaceClassList[CENSUSPlus_BLOODELF] = 29;
-g_RaceClassList[CENSUSPlus_WORGEN]		= 32;
-g_RaceClassList[CENSUSPlus_GOBLIN]		= 31;
+g_RaceClassList[CENSUSPlus_WORGEN]  = 32;
+g_RaceClassList[CENSUSPlus_GOBLIN]  = 31;
 
 
 g_TimeDatabase[CENSUSPlus_DRUID]  = 0;
@@ -457,29 +458,29 @@
 local function GetRaceClasses(race)
  local ret = {};
  if (race == CENSUSPlus_ORC) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_SHAMAN, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_SHAMAN, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_TAUREN) then
-		ret = {CENSUSPlus_PALADIN, CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_SHAMAN, CENSUSPlus_PRIEST, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_PALADIN, CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_SHAMAN, CENSUSPlus_PRIEST, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_TROLL) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_SHAMAN, CENSUSPlus_MAGE, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_SHAMAN, CENSUSPlus_MAGE, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_UNDEAD) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_DWARF) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_PALADIN, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_SHAMAN, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_PALADIN, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_SHAMAN, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_GNOME) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_ROGUE, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_HUMAN) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_PALADIN, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_PALADIN, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_NIGHTELF) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_DRUID, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_BLOODELF) then
-		ret = {CENSUSPlus_WARRIOR, CENSUSPlus_PALADIN, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
+  ret = {CENSUSPlus_WARRIOR, CENSUSPlus_PALADIN, CENSUSPlus_HUNTER, CENSUSPlus_ROGUE, CENSUSPlus_PRIEST, CENSUSPlus_MAGE, CENSUSPlus_WARLOCK, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_DRAENEI) then
   ret = {CENSUSPlus_WARRIOR, CENSUSPlus_PALADIN, CENSUSPlus_HUNTER, CENSUSPlus_PRIEST, CENSUSPlus_SHAMAN, CENSUSPlus_MAGE, CENSUSPlus_DEATHKNIGHT};
  elseif (race == CENSUSPlus_WORGEN) then
-		ret = {CENSUSPlus_DEATHKNIGHT, CENSUSPlus_DRUID, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_ROGUE, CENSUSPlus_WARLOCK, CENSUSPlus_WARRIOR};
+  ret = {CENSUSPlus_DEATHKNIGHT, CENSUSPlus_DRUID, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_ROGUE, CENSUSPlus_WARLOCK, CENSUSPlus_WARRIOR};
  elseif (race == CENSUSPlus_GOBLIN) then
-		ret = {CENSUSPlus_DEATHKNIGHT, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_ROGUE, CENSUSPlus_SHAMAN, CENSUSPlus_WARLOCK, CENSUSPlus_WARRIOR};
+  ret = {CENSUSPlus_DEATHKNIGHT, CENSUSPlus_HUNTER, CENSUSPlus_MAGE, CENSUSPlus_PRIEST, CENSUSPlus_ROGUE, CENSUSPlus_SHAMAN, CENSUSPlus_WARLOCK, CENSUSPlus_WARRIOR};
  end
  return ret;
 end
@@ -653,7 +654,6 @@
  --
  local updateFrame = CreateFrame("Frame");
  updateFrame:SetScript("OnUpdate", CensusPlus_OnUpdate);
- CensusPlusTakeGuildButton:SetText( CENSUSPlus_TAKEGUILD.." \""..CensusPlus_MYGUILD.."\"" );
 end
 
 function CensusPlus_FriendsFrame_OnEvent(self, event, ...)
@@ -2834,6 +2834,9 @@
   return;
  end
 
+ --rm
+ CensusPlusTakeGuildButton:SetText( CENSUSPlus_TAKEGUILD.." \""..CensusPlus_MYGUILD.."\"" );
+ 
  CensusPlusFactionName:SetText(format(CENSUSPlus_FACTION, factionGroup));
 
  if( CensusPlus_Database["Info"]["Locale"] ~= nil ) then
@@ -2957,7 +2960,7 @@
  for i = 1, numRaces, 1 do
   local race = thisFactionRaces[i];
   local buttonName = "CensusPlusRaceBar"..i;
-		
+
   local button = getglobal(buttonName);
   local thisCount = g_RaceCount[i];
   if ((thisCount ~= nil) and (thisCount > 0) and (maxCount > 0)) then
@@ -2969,8 +2972,8 @@
    button:Hide();
   end
   local normalTextureName="Interface\\AddOns\\CensusPlus\\Skin\\CensusPlus_"..g_RaceClassList[race];
-		
-		
+
+
   local legendName = "CensusPlusRaceLegend"..i;
   local legend = getglobal(legendName);
   legend:SetNormalTexture(normalTextureName);
@@ -3100,7 +3103,6 @@
   CensusPlus_PlayerListOnShow();
  end
 
-
  debugprofilestop();
 
 end
@@ -3178,7 +3180,7 @@
 --
 ---------------------------------------------------------------------------------
 function CensusPlus_OnLoadLevel( self )
-	self:RegisterForClicks("LeftButtonUp","RightButtonUp");
+ self:RegisterForClicks("LeftButtonUp","RightButtonUp");
 end
 
 ----------------------------------------------------------------------------------
@@ -3225,12 +3227,12 @@
 function CensusPlus_OnEnterClass( self )
  local factionGroup = UnitFactionGroup("player");
  local thisFactionClasses = CensusPlus_GetFactionClasses(factionGroup);
-	local id = self:GetID();
+ local id = self:GetID();
  local className = thisFactionClasses[id];
  local count = g_ClassCount[id];
  if (count ~= nil) then
      local percent = floor((count / g_TotalCount) * 100);
-	    GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
+     GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
      GameTooltip:SetText(className.."\n"..count.."\n"..percent.."%", 1.0, 1.0, 1.0);
      GameTooltip:Show();
  end
@@ -3245,7 +3247,7 @@
  local id = this:GetID();
  local count = g_LevelCount[id];
  if (count ~= nil) then
-		local percent = floor((count / g_TotalCount) * 100);
+  local percent = floor((count / g_TotalCount) * 100);
   GameTooltip:SetOwner(this, "ANCHOR_RIGHT");
   GameTooltip:SetText("Level "..id.."\n"..count.."\n"..percent.."%", 1.0, 1.0, 1.0);
   GameTooltip:Show();
@@ -4025,27 +4027,27 @@
  end
 end
 function CensusPlus_Options_OnMouseUp(self,...)
-		CensusPlus_Msg('Mouse up');
-	if ( self.isMoving ) then
-		self:StopMovingOrSizing();
-		self.isMoving = false;
-	end
+  CensusPlus_Msg('Mouse up');
+ if ( self.isMoving ) then
+  self:StopMovingOrSizing();
+  self.isMoving = false;
+ end
 end
 function CensusPlus_Options_OnMouseDown(self,arg1,arg2,arg3,...)
-		if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
-			self:StartMoving();
-			self.isMoving = true;
-		end
+  if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
+   self:StartMoving();
+   self.isMoving = true;
+  end
 end
 function CensusPlus_Mini_OnMouseDown( self, arg1 )
-                if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
-                    self:StartMoving();
-                    self.isMoving = true;
-                end
+ if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
+  self:StartMoving();
+  self.isMoving = true;
+ end
 end
 function CensusPlus_Census_OnMouseDown( self, arg1 )
-                if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
-                    self:StartMoving();
-                    self.isMoving = true;
-                end
+ if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
+  self:StartMoving();
+  self.isMoving = true;
+ end
 end
\ No newline at end of file
--- a/CensusPlus.toc	Sun Aug 14 12:17:18 2011 +0200
+++ b/CensusPlus.toc	Sun Aug 14 15:45:33 2011 +0200
@@ -12,7 +12,7 @@
 
 #@no-lib-strip@
 libs\LibStub\LibStub.lua
-libs\CallbackHandler-1.0\CallbackHandler-1.0.lua
+libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
 libs\LibWho-2.0\LibWho-2.0.lua
 #@end-no-lib-strip@