Rename CardManager to CardsManager

campaign/record_card.xml

@@ -46,18 +46,18 @@
 			local bPeek = false;
 			function onInit()
 				local node = getDatabaseNode();
-				DB.addHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+				DB.addHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 
 				onFacingChanged();
 			end
 
 			function onClose()
 				local node = getDatabaseNode();
-				DB.removeHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+				DB.removeHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 			end
 
 			function onFacingChanged()
-				local bFaceUp = CardManager.isCardFaceUp(getDatabaseNode()) or bPeek;
+				local bFaceUp = CardsManager.isCardFaceUp(getDatabaseNode()) or bPeek;
 				image.setVisible(bFaceUp);
 				image.setEnabled(bFaceUp);
 				back.setVisible(not bFaceUp);

campaign/record_char.xml

@@ -3,7 +3,7 @@
 	<windowclass name="charsheet" merge="join">
 		<script>
 			function onDrop(x, y, draginfo)
-				local bHandled = CardManager.onDropCard(draginfo, getDatabaseNode());
+				local bHandled = CardsManager.onDropCard(draginfo, getDatabaseNode());
 
 				if not bHandled then
 					if super and super.onDrop then

common/deck_templates.xml

@@ -71,7 +71,7 @@
 					if DB.getValue(vCard, "deckid", "") == "" then
 						return;
 					end
-					setPrototype(CardManager.getCardBack(vCard));
+					setPrototype(CardsManager.getCardBack(vCard));
 				end
 			</script>
 			<anchored>

common/scripts/discardOnCardDrop.lua

@@ -16,10 +16,10 @@ function onDropCardOnDelete(vCard)
 	-- Either we're the host and the card is in the gm hand
 	-- Or we're a client and whose identity matches the card source
 	if Session.IsHost then
-		CardManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), "gm", {});
+		CardsManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), "gm", {});
 		return true;
-	elseif sIdentity == CardManager.getCardSource(vCard) then
-		CardManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), sIdentity, {});
+	elseif sIdentity == CardsManager.getCardSource(vCard) then
+		CardsManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), sIdentity, {});
 		return true;
 	end
 end

common/scripts/onCardDrag.lua

@@ -6,6 +6,6 @@ function onDragStart(button, x, y, draginfo)
 		end
 	end
 
-	CardManager.onDragCard(window.getDatabaseNode(), draginfo);
+	CardsManager.onDragCard(window.getDatabaseNode(), draginfo);
 	return true;
 end

common/scripts/standardCardRadialOptions.lua

@@ -7,10 +7,10 @@ function onInit()
 
 	registerMenuItem(Interface.getString("card_menu_play_face_up"), "play_faceup", 1);
 	registerMenuItem(Interface.getString("card_menu_play_face_down"), "play_facedown", 5)
-	if not CardManager.isCardInDeck(card) then
+	if not CardsManager.isCardInDeck(card) then
 		registerMenuItem(Interface.getString("card_menu_reshuffle"), "reshuffle_card", 6)
 	end
-	if not CardManager.isCardDiscarded(card) then
+	if not CardsManager.isCardDiscarded(card) then
 		registerMenuItem(Interface.getString("card_menu_discard_card"), "discard_card", 7);
 	end
 
@@ -35,12 +35,12 @@ function onCardFlipped()
 	end
 
 	local vCard = window.getDatabaseNode();
-	if not CardManager.isCardInHand(vCard) then
+	if not CardsManager.isCardInHand(vCard) then
 		return;
 	end
 
 	local text;
-	if CardManager.isCardFaceUp(vCard) then	
+	if CardsManager.isCardFaceUp(vCard) then	
 		text = Interface.getString("card_menu_flip_facedown");
 	else
 		text = Interface.getString("card_menu_flip_faceup");
@@ -57,14 +57,14 @@ function onMenuSelection(selection)
 	elseif selection == 2 then
 		DesktopManager.peekCard(window.getDatabaseNode());
 	elseif selection == 3 then
-		CardManager.flipCardFacing(window.getDatabaseNode(), {})
+		CardsManager.flipCardFacing(window.getDatabaseNode(), {})
 	elseif selection == 5 then
 		playCard(true);
 	elseif selection == 6 then
-		CardManager.putCardBackInDeck(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), {});
+		CardsManager.putCardBackInDeck(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), {});
 	elseif selection == 7 then
 		-- We pass in nil for sIdentity because discardCard gets the user identity for us
-		CardManager.discardCard(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), nil, {});
+		CardsManager.discardCard(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), nil, {});
 	end
 end
 
@@ -74,8 +74,8 @@ end
 
 function playCard(bFacedown)
 	local vCard = window.getDatabaseNode();
-	local vDeck = CardManager.getDeckNodeFromCard(vCard);
+	local vDeck = CardsManager.getDeckNodeFromCard(vCard);
 
 	local bDiscard = DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_HAND) == "yes"
-	CardManager.playCard(vCard, bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
+	CardsManager.playCard(vCard, bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
 end

ct/scripts/ct_onCardDrop.lua

@@ -1,3 +1,3 @@
 function onDrop(x, y, draginfo)
-	return CardManager.onDropCard(draginfo, getDatabaseNode());
+	return CardsManager.onDropCard(draginfo, getDatabaseNode());
 end

deckbox/deckbox.xml

@@ -99,7 +99,7 @@
 			<leftClickOpensCardList name="button_view_deck">
 				<script>
 					function onDrop(x, y, draginfo)
-						CardManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
+						CardsManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
 					end
 				</script>
 				<anchored to="back" height="36" width="36">
@@ -248,7 +248,7 @@
 					function onButtonPress()
 						local node = window.getDatabaseNode();
 						for sIdentity in pairs(DB.getChildren("charsheet")) do
-							CardManager.discardCardsInHandFromDeck(node, sIdentity, {});
+							CardsManager.discardCardsInHandFromDeck(node, sIdentity, {});
 						end
 					end
 				</script>
@@ -260,9 +260,9 @@
 					function onButtonPress()
 						local node = window.getDatabaseNode();
 						for sIdentity in pairs(DB.getChildren("charsheet")) do
-							CardManager.discardCardsInHandFromDeck(node, sIdentity, {});
+							CardsManager.discardCardsInHandFromDeck(node, sIdentity, {});
 						end
-						CardManager.discardCardsInHandFromDeck(node, "gm", {});
+						CardsManager.discardCardsInHandFromDeck(node, "gm", {});
 					end
 				</script>
 				<state textres="deckbox_button_discard_all_hands" />

deckbox/scripts/character_cardcount.lua

@@ -11,7 +11,7 @@ function onClose()
 end
 
 function getHandPath()
-	return CardManager.getHandPath(window.getDatabaseNode().getName());
+	return CardsManager.getHandPath(window.getDatabaseNode().getName());
 end
 
 function getDeckIdCardPath()
@@ -31,7 +31,7 @@ function getIdentity()
 end
 
 function onHandUpdated()
-	local nCur = CardManager.getNumberOfCardsFromDeckInHand(getDeckNode(), getIdentity())
+	local nCur = CardsManager.getNumberOfCardsFromDeckInHand(getDeckNode(), getIdentity())
 
 	if nCur == 1 then
 		setValue(Interface.getString("deckbox_format_character_cardcount_one"));

deckbox/scripts/deckback.lua

@@ -40,13 +40,13 @@ end
 function onDragStart(button, x, y, draginfo)
 	local node = window.getDatabaseNode();
 	if Session.IsHost then
-		CardManager.onDragFromDeck(window.getDatabaseNode(), draginfo);
+		CardsManager.onDragFromDeck(window.getDatabaseNode(), draginfo);
 		return true;
 	end
 end
 
 function onDrop(x, y, draginfo)
-	CardManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
+	CardsManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
 end
 
 function onDoubleClick(x, y)
@@ -58,7 +58,7 @@ function playCard(bFacedown)
 	local bDiscard = DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_DECK) == "yes"
 	local aCards = DeckManager.getRandomCardsInDeck(vDeck, 1);
 	if aCards and aCards[1] then
-		CardManager.playCard(aCards[1], bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
+		CardsManager.playCard(aCards[1], bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
 	end
 end
 

deckbox/scripts/portrait_deckbox.lua

@@ -19,13 +19,13 @@ function onMenuSelection(selection)
 	elseif selection == 4 then
 		DesktopManager.promptCardAmount(onCardAmountSelected)
 	elseif selection == 7 then
-		CardManager.discardCardsInHandFromDeck(getDeckNode(), getIdentity(), {});
+		CardsManager.discardCardsInHandFromDeck(getDeckNode(), getIdentity(), {});
 	elseif selection == 8 then
-		CardManager.discardRandomCardFromDeck(getDeckNode(), getIdentity(), DeckedOutUtilities.getFacedownHotkey(), {})
+		CardsManager.discardRandomCardFromDeck(getDeckNode(), getIdentity(), DeckedOutUtilities.getFacedownHotkey(), {})
 	elseif selection == 6 then
-		CardManager.putCardsFromDeckInHandBackIntoDeck(getDeckNode(), getIdentity());
+		CardsManager.putCardsFromDeckInHandBackIntoDeck(getDeckNode(), getIdentity());
 	elseif selection == 2 then
-		DesktopManager.openCardList(CardManager.getHandNode(getIdentity()));
+		DesktopManager.openCardList(CardsManager.getHandNode(getIdentity()));
 	end
 end
 
@@ -67,5 +67,5 @@ function onDragStart(button, x, y, draginfo)
 end
 
 function onDrop(x, y, draginfo)
-	CardManager.onDropCard(draginfo, window.getDatabaseNode());
+	CardsManager.onDropCard(draginfo, window.getDatabaseNode());
 end

desktop/scripts/desktop_card.lua

@@ -4,18 +4,18 @@ function onInit()
 	-- highlight.setEnabled(false);
 
 	local node = getDatabaseNode();
-	DB.addHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+	DB.addHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 
 	onFacingChanged();
 end
 
 function onClose()
 	local node = getDatabaseNode();
-	DB.removeHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+	DB.removeHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 end
 
 function onFacingChanged(nodeUpdated)
-	local bFaceUp = CardManager.isCardFaceUp(getDatabaseNode());
+	local bFaceUp = CardsManager.isCardFaceUp(getDatabaseNode());
 	image.setVisible(bFaceUp);
 	image.setEnabled(bFaceUp);
 	cardback.setVisible(not bFaceUp);

desktop/scripts/desktop_hand.lua

@@ -5,10 +5,10 @@ function onInit()
 	self.onSizeChanged = onSizeChanged;
 
 	if Session.IsHost then
-		DB.addHandler(CardManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
-		DB.addHandler(CardManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
+		DB.addHandler(CardsManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
+		DB.addHandler(CardsManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
 
-		updateHand(CardManager.getHandNode("gm"));
+		updateHand(CardsManager.getHandNode("gm"));
 	end
 
 	-- registerMenuItem(Interface.getString("hand_menu_play_random"), "customdice", 4);
@@ -20,8 +20,8 @@ end
 
 function onClose()
 	if Session.IsHost then
-		DB.removeHandler(CardManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
-		DB.removeHandler(CardManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
+		DB.removeHandler(CardsManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
+		DB.removeHandler(CardsManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
 	else
 		clearPlayerCardHandler(User.getCurrentIdentity());
 	end
@@ -31,13 +31,13 @@ function onMenuSelection(selection, subselection)
 	if selection == 8 and subselection == 7 then
 		local sIdentity = self.getIdentity()
 		if sIdentity then
-			CardManager.discardRandomCard(sIdentity, DeckedOutUtilities.getFacedownHotkey(), {})
+			CardsManager.discardRandomCard(sIdentity, DeckedOutUtilities.getFacedownHotkey(), {})
 		end
 	elseif selection == 8 and subselection == 8 then
 		local sIdentity = self.getIdentity()
 		if sIdentity then
 			-- Pass in empty list for tEventTrace since this is guaranteed to be the first place we have an event chain
-			CardManager.discardHand(sIdentity, {});
+			CardsManager.discardHand(sIdentity, {});
 		end
 	end
 end
@@ -53,7 +53,7 @@ function onIdentityStateChange(sIdentity, sUsername, sStateName, vState)
 	if sStateName == "current" then
 		if vState then
 			addPlayerCardHandler(sIdentity);
-			updateHand(CardManager.getHandNode(sIdentity))
+			updateHand(CardsManager.getHandNode(sIdentity))
 
 			-- If we just activated a character and that character
 			-- has cards in their hand, auto-open up the hand window
@@ -74,7 +74,7 @@ function onDrop(x, y, draginfo)
 
 	-- Maybe players should be able to do this? An option toggle the
 	if frame.isVisible() then
-		CardManager.onDropCard(draginfo, hand.getDatabaseNode());
+		CardsManager.onDropCard(draginfo, hand.getDatabaseNode());
 	end
 end
 
@@ -103,16 +103,16 @@ end
 
 function addPlayerCardHandler(sIdentity)
 	if not sCurrentIdentity then
-		DB.addHandler(CardManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
-		DB.addHandler(CardManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
+		DB.addHandler(CardsManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
+		DB.addHandler(CardsManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
 		sCurrentIdentity = sIdentity;
 	end
 end
 
 function clearPlayerCardHandler(sIdentity)
 	if sCurrentIdentity then
-		DB.removeHandler(CardManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
-		DB.removeHandler(CardManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
+		DB.removeHandler(CardsManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
+		DB.removeHandler(CardsManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
 		sCurrentIdentity = nil;
 	end
 end

extension.xml

@@ -38,7 +38,7 @@
 		<script name="DeckedOutMessages" file="scripts/decked_out_messages.lua" />
 		<script name="DeckedOutUtilities" file="scripts/decked_out_utilities.lua" />
 
-		<script name="CardManager" file="scripts/manager_card.lua" />
+		<script name="CardsManager" file="scripts/manager_cards.lua" />
 		<script name="DeckManager" file="scripts/manager_deck.lua" />
 		<script name="CardStorage" file="scripts/manager_storage.lua" />
 		<script name="DesktopManagerDO" file="scripts/manager_desktop_do.lua" />

scripts/decked_out.lua

@@ -27,7 +27,7 @@ function onInit()
 		});
 
 		-- Create the GM hand node if it doesn't exist
-		local node = DB.createNode(CardManager.GM_HAND_PATH);
+		local node = DB.createNode(CardsManager.GM_HAND_PATH);
 		node.setPublic(true);
 	end