Merge pull request #233 from DecentralCardGame/232-packs-give-the-sam…

…e-cards-when-opened-on-the-same-block fix(#232): Fixed boosterpack opening seeding
DecentralCardGame · Jun 10, 2024 · 6d95871 · 6d95871
2 parents 0df2f9d + 91bb56e
commit 6d95871
Showing 1 changed file with 57 additions and 58 deletions.
diff --git a/x/cardchain/keeper/msg_server_open_booster_pack.go b/x/cardchain/keeper/msg_server_open_booster_pack.go
@@ -1,74 +1,73 @@
 package keeper
 
 import (
-	"context"
-	"math/rand"
-	"slices"
+    "context"
+    "math/rand"
+    "slices"
 
-	sdkerrors "cosmossdk.io/errors"
-	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
+    sdkerrors "cosmossdk.io/errors"
+    "github.com/DecentralCardGame/Cardchain/x/cardchain/types"
+    sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func (k msgServer) OpenBoosterPack(goCtx context.Context, msg *types.MsgOpenBoosterPack) (*types.MsgOpenBoosterPackResponse, error) {
-	ctx := sdk.UnwrapSDKContext(goCtx)
+    ctx := sdk.UnwrapSDKContext(goCtx)
 
-	rand.Seed(ctx.BlockTime().Unix())
+    creator, err := k.GetUserFromString(ctx, msg.Creator)
+    if err != nil {
+        return nil, sdkerrors.Wrap(types.ErrUserDoesNotExist, err.Error())
+    }
 
-	creator, err := k.GetUserFromString(ctx, msg.Creator)
-	if err != nil {
-		return nil, sdkerrors.Wrap(types.ErrUserDoesNotExist, err.Error())
-	}
+    if uint64(len(creator.BoosterPacks)) <= msg.BoosterPackId {
+        return nil, sdkerrors.Wrapf(
+            types.ErrBoosterPack,
+            "BoosterPackId %d is not in list length %d",
+            msg.BoosterPackId,
+            len(creator.BoosterPacks),
+        )
+    }
+    rand.Seed(ctx.BlockTime().Unix() + int64(len(creator.BoosterPacks)))
 
-	if uint64(len(creator.BoosterPacks)) <= msg.BoosterPackId {
-		return nil, sdkerrors.Wrapf(
-			types.ErrBoosterPack,
-			"BoosterPackId %d is not in list length %d",
-			msg.BoosterPackId,
-			len(creator.BoosterPacks),
-		)
-	}
+    var (
+        cardsList     []uint64
+        cleanedRatios [3]uint64
+    )
+    pack := creator.BoosterPacks[msg.BoosterPackId]
+    set := k.Sets.Get(ctx, pack.SetId)
 
-	var (
-		cardsList     []uint64
-		cleanedRatios [3]uint64
-	)
-	pack := creator.BoosterPacks[msg.BoosterPackId]
-	set := k.Sets.Get(ctx, pack.SetId)
+    for idx, ratio := range pack.DropRatiosPerPack {
+        if len(set.Rarities[idx+2].R) == 0 {
+            cleanedRatios[idx] = 0
+        } else {
+            cleanedRatios[idx] = ratio
+        }
+    }
 
-	for idx, ratio := range pack.DropRatiosPerPack {
-		if len(set.Rarities[idx+2].R) == 0 {
-			cleanedRatios[idx] = 0
-		} else {
-			cleanedRatios[idx] = ratio
-		}
-	}
+    for idx, num := range pack.RaritiesPerPack {
+        for i := 0; i < int(num); i++ {
+            if idx != 2 {
+                cardsList = append(cardsList, set.Rarities[idx].R[rand.Intn(len(set.Rarities[idx].R))])
+            } else {
+                res := uint64(rand.Intn(int(cleanedRatios[0] + cleanedRatios[1] + cleanedRatios[2])))
+                j := 4
+                if res < cleanedRatios[0] {
+                    j = 2
+                } else if res < cleanedRatios[0]+cleanedRatios[1] {
+                    j = 3
+                }
+                cardsList = append(cardsList, set.Rarities[j].R[rand.Intn(len(set.Rarities[j].R))])
+            }
+        }
+    }
 
-	for idx, num := range pack.RaritiesPerPack {
-		for i := 0; i < int(num); i++ {
-			if idx != 2 {
-				cardsList = append(cardsList, set.Rarities[idx].R[rand.Intn(len(set.Rarities[idx].R))])
-			} else {
-				res := uint64(rand.Intn(int(cleanedRatios[0] + cleanedRatios[1] + cleanedRatios[2])))
-				j := 4
-				if res < cleanedRatios[0] {
-					j = 2
-				} else if res < cleanedRatios[0]+cleanedRatios[1] {
-					j = 3
-				}
-				cardsList = append(cardsList, set.Rarities[j].R[rand.Intn(len(set.Rarities[j].R))])
-			}
-		}
-	}
+    creator.Cards = append(creator.Cards, cardsList...)
+    creator.BoosterPacks = slices.Delete(
+        creator.BoosterPacks,
+        int(msg.BoosterPackId),
+        int(msg.BoosterPackId+1),
+    )
 
-	creator.Cards = append(creator.Cards, cardsList...)
-	creator.BoosterPacks = slices.Delete(
-		creator.BoosterPacks,
-		int(msg.BoosterPackId),
-		int(msg.BoosterPackId+1),
-	)
+    k.SetUserFromUser(ctx, creator)
 
-	k.SetUserFromUser(ctx, creator)
-
-	return &types.MsgOpenBoosterPackResponse{CardIds: cardsList}, nil
+    return &types.MsgOpenBoosterPackResponse{CardIds: cardsList}, nil
 }