Fix cards in more situations #96

Canonelis · 2021-12-13T20:28:08Z

These additions help keep the codenames game from breaking and help with transferring host in between games/when rewinding.

-in onObjectEnterContainer only delete the container if a codenames card was put in it -use isDestroyed() object property for a cleaner way to see if this has been run already(it returns true if the object is about to be but is not yet destroyed) -created dealCardsDelayed() function which can be called many times per second, but will only run dealCards() once 1.5s have passed without any further calls to dealCardsDelayed() -created onObjectDestroy() which re-deals cards if a game is being played and a codenames card is deleted and no other cards have been deleted in the past 1.5 seconds

"tag" has been replaced with "type" and contains the same data

-Wherever we set the position I set the rotation as well(except for when picking up pre-rotated cards) -Wherever we pick up or drop cards, I set the angular velocity to 0

remove unused "rotateclues" function

-to prevent onObjectDestroy from being called due to the script deleting something, use the onPlayerAction function to detect deletions -move onPlayerPickup voting mechanism to onPlayerAction so that the card doesn't move slightly whenever someone votes -when transferring host after a game has ended, the current cards become blank and need to be deleted based on their face image URL when dealing out cards

clue tiles are very distinct, so delete them based on their properties when starting a new game. since the list of clue tiles isn't saved when the game is reloaded, this guarantees they are removed upon reset

do not allow picking up word cards at all

Canonelis · 2021-12-15T00:12:12Z

src/Global.-1.ttslua

@@ -730,11 +730,31 @@ function encodeClue(color, clue)
  end
 end

-function onObjectEnterContainer(deck, card)


This function intercepts all objects that enter any container and deletes the container, so I made it more discriminatory.

Canonelis · 2021-12-15T02:33:45Z

src/Global.-1.ttslua

+function isCodenamesCard(obj)
+  if obj.type == "Card" then
+    vals = obj.getCustomObject()
+    if vals.face != nil and string.find(vals.face,"codenames")then


Here I made a function that should work for future implementations. If the object is of type "Card" and the face image URL contains "codenames" then it is probably a codenames card. Agents don't have a type of "Card" and currently no other game elements have a card type in your implementation.
The getCustomObject() function never seems to return "nil" and returns an empty array if there are no elements.

Canonelis · 2021-12-15T02:37:13Z

src/Global.-1.ttslua

+  -- if the displaced object is a codenames card then delete the container and refresh the cards
+  if isCodenamesCard(object) then
+    -- Check whether container is being destroyed so we only do this once for multiple deposited objects
+    if not container.isDestroyed() then


The .isDestroyed() is perfect for this situation. It returns true if .destruct() was called on it even if the object hasn't had any frames to be removed from the game yet.

Canonelis · 2021-12-15T02:38:37Z

src/Global.-1.ttslua

+end
+
+function onObjectDestroy(obj)
+  -- if there is an ongoing game and a card is deleted then refresh the cards


Don't review this function too closely. I replace onObjectDestroy(obj) with a section inside onPlayerAction() in a later commit. But the idea is to redeal cards if one of them is deleted.

Canonelis · 2021-12-15T02:52:38Z

src/Global.-1.ttslua

@@ -997,6 +1017,14 @@ function setupGame()
  gameState.firstTurn = true
 end

+dealCards_WaitId = nil
+function dealCardsDelayed()


This is the nicest way I've found to let the script spam calls to an expensive function, but only have the function be called once everything has settled down(1.5 seconds after the last request to call the function). The only problems with this kind of set-up is if the function triggers itself, or the game is so laggy that 1.5 seconds is not enough time for the calls to the function to stop.

Canonelis · 2021-12-15T02:55:51Z

src/Global.-1.ttslua

@@ -742,13 +742,6 @@ function onObjectEnterContainer(container, object)
  end
 end

-function onObjectDestroy(obj)
-  -- if there is an ongoing game and a card is deleted then refresh the cards


I decided to remove this function as it gets called every time the script destroys an object. We only really care about when a player deletes a card so I put this in "onPlayerAction".

Canonelis · 2021-12-15T02:59:47Z

src/Global.-1.ttslua

@@ -1019,6 +1012,12 @@ end

 -- Deals the cards on the board
 function dealCards()
+  -- check all objects to delete unused codenames cards


Codenames keeps track of card guid's but this doesn't get saved or loaded when a rewind or host change happens. So let's just delete all codename cards that aren't in the tracked card guid list.(I do a similar thing for clue tiles later on when starting a new game)

Canonelis · 2021-12-15T03:01:48Z

src/Global.-1.ttslua

-      end
-    end
-  elseif agents[object.guid] ~= nil then
-    -- Prevent picking up of agent tiles from anyone but red or blue


This section isn't ever used since a pickup action on an agent by a non-codemaster is stopped by a return of "false" inside onPlayerAction() when this happens.

Canonelis · 2021-12-15T03:02:59Z

src/Global.-1.ttslua

-function onObjectPickUp(color, object)
-  -- Clues
-  if object.type == "Card" and not object.spawning then
-    for i = 1, 25, 1 do


I moved this section into onPlayerAction() so that it can add a vote without ever attempting to pick up the card for a frame.

Canonelis · 2021-12-15T03:06:13Z

src/Global.-1.ttslua

@@ -1471,6 +1444,17 @@ function onPlayerAction(player, action, objects)
  if not processAction then
    return
  end
+
+  if action == Player.Action.Delete then


This is where I moved the onObjectDestroy() function so that it doesn't run when the script deletes a card.

Canonelis · 2021-12-15T03:10:53Z

src/Global.-1.ttslua

@@ -1504,6 +1488,17 @@ function onPlayerAction(player, action, objects)
    elseif settings.cardTilting and gameState.status == 1 and not gameState.canVote then
      errorMessage = "[a020f0]» [da1918]ERROR: [ffffff]You can't vote until you've been given a clue! [a020f0]«"
    end
+    if #objects == 1 and objects[1].type == "Card" and not objects[1].spawning then


Here is where I moved the onObjectPickUp() function so that I can use "return false" when a vote is cast.
I edit this in a later commit to entirely disallow picking up cards.(the only downside I see is that if the game physics somehow puts the card somewhere else, it can't easily be put back)

Canonelis · 2021-12-15T03:12:16Z

src/Global.-1.ttslua

@@ -731,6 +731,16 @@ function isCodenamesCard(obj)
  return false
 end

+function isCodenamesClue(obj)


This is a very discriminatory function to identify clue tiles.

Canonelis · 2021-12-15T03:13:12Z

src/Global.-1.ttslua

-      if clueTile then
-        clueTile.destruct()
-      end
+  for _, obj in pairs(getObjects()) do


Codenames keeps track of clue tile guid's but this doesn't get saved or loaded when a rewind or host change happens. So let's just delete all clue tiles when a new game starts. In my experience with puzzles with 5000 pieces, this is still very fast to run.

Canonelis · 2021-12-15T03:19:22Z

src/Global.-1.ttslua

        dealCardsDelayed()
-        break
+        obj.destruct()


Here I take over what gets deleted in a player action. Deleting agents currently requires the game to be reloaded, so I prevent that outright. Deleting cards causes them to be redealt. And then it deletes everything else the player wanted to delete.

Canonelis · 2021-12-15T03:22:48Z

src/Global.-1.ttslua

@@ -1513,6 +1513,16 @@ function onPlayerAction(player, action, objects)
        end
      end
    end
+    local hasCards = false


for any pickup action, it will prevent the pickup from happening if it contains any word cards, similar to before. As a nicety, it removes the cards from the player's selection so that the player can try and pick up the items again without being blocked.

Change detection of clue

add longer delay for deck respawning

Canonelis added 7 commits December 13, 2021 08:58

update code for deprecated tags property

e4cfa70

"tag" has been replaced with "type" and contains the same data

when force-dropping objects make them more still

d123b66

-Wherever we set the position I set the rotation as well(except for when picking up pre-rotated cards) -Wherever we pick up or drop cards, I set the angular velocity to 0

remove unused "rotateclues" function

1afe699

remove unused "rotateclues" function

clean up all clue tiles when resetting game

d052236

clue tiles are very distinct, so delete them based on their properties when starting a new game. since the list of clue tiles isn't saved when the game is reloaded, this guarantees they are removed upon reset

do not allow picking up word cards at all

aae2ba8

do not allow picking up word cards at all

Canonelis commented Dec 15, 2021

View reviewed changes

Canonelis added 2 commits January 25, 2022 15:11

Change detection of clue

d8d5cc3

Change detection of clue

add longer delay for deck respawning

aba0370

add longer delay for deck respawning

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cards in more situations #96

Fix cards in more situations #96

Canonelis commented Dec 13, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021

Canonelis Dec 15, 2021 •

edited

Loading

Fix cards in more situations #96

Are you sure you want to change the base?

Fix cards in more situations #96

Conversation

Canonelis commented Dec 13, 2021

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021 •

edited

Loading

Canonelis Dec 15, 2021 •

edited

Loading