mbunch_kascope пре 1 година
родитељ
комит
4238779398

+ 8 - 6
Assets/CardEffect/BT16/Black/Publimon_BT16_056.cs

@@ -89,19 +89,21 @@ namespace DCGO.CardEffects.BT16
 
                                     if(securityPermanent.DigivolutionCards.Count >= 1)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(permanent.TopCard));
+
+                                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(securityCard));
 
                                         permanent.ShowingPermanentCard.ShowPermanentData(true);
 
-                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(permanent.TopCard, permanent));
+                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(securityCard, permanent));
 
-                                        if (!permanent.TopCard.IsToken)
+                                        if (!securityCard.IsToken)
                                         {
-                                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(permanent.TopCard, true));
+                                            Player owner = securityCard.Owner;
+                                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(securityCard, true));
 
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(permanent.TopCard.Owner));
+                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(owner));
 
-                                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(permanent.TopCard.Owner).AddSecurity());
+                                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(owner).AddSecurity());
 
                                             permanent.willBeRemoveField = false;
 

+ 2 - 2
Assets/CardEffect/BT17/Blue/Beowolfmon_BT17_026.cs

@@ -133,8 +133,8 @@ namespace DCGO.CardEffects.BT17
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 [Takuya Kanbara].",
-                                "The opponent is selecting 1 [Takuya Kanbara].");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 [Koji Minamoto].",
+                                "The opponent is selecting 1 [Koji Minamoto].");
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

+ 1 - 1
Assets/CardEffect/BT17/Blue/Strabimon_BT17_020.cs

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT17
                             {
                                 new(
                                     canTargetCondition: CanSelectCardCondition,
-                                    message: "Select 1 Digimon card with the [Hybrid]/[Ten Warriors] trait.",
+                                    message: "Select 1 card with the [Hybrid]/[Ten Warriors] trait.",
                                     mode: SelectCardEffect.Mode.AddHand,
                                     maxCount: 1,
                                     selectCardCoroutine: null),

+ 1 - 1
Assets/CardEffect/BT17/Red/TakatoMatsuki_BT17_080.cs

@@ -323,7 +323,7 @@ namespace DCGO.CardEffects.BT17
                                 payCost: false,
                                 reduceCostTuple: null,
                                 fixedCostTuple: null,
-                                ignoreDigivolutionRequirementFixedCost: -1,
+                                ignoreDigivolutionRequirementFixedCost: 0,
                                 isHand: true,
                                 activateClass: activateClass,
                                 successProcess: null,

+ 0 - 1
Assets/CardEffect/BT17/Yellow/Kazuchimon_BT17_040.cs

@@ -285,7 +285,6 @@ namespace DCGO.CardEffects.BT17
                                     return true;
                                 }
                             }
-                            return true;
                         }
                     }
 

+ 1 - 1
Assets/CardEffect/BT17/Yellow/RikaNonaka_BT17_085.cs

@@ -308,7 +308,7 @@ namespace DCGO.CardEffects.BT17
                                 payCost: true,
                                 reduceCostTuple: null,
                                 fixedCostTuple: (fixedCost: 4, fixedCostCardCondition: null),
-                                ignoreDigivolutionRequirementFixedCost: -1,
+                                ignoreDigivolutionRequirementFixedCost: 4,
                                 isHand: true,
                                 activateClass: activateClass,
                                 ignoreLevel: true,

+ 1 - 1
Assets/CardEffect/ST17/Green/HenryWong_ST17_10.cs

@@ -296,7 +296,7 @@ namespace DCGO.CardEffects.ST17
                                 cardCondition: CanSelectCardCondition2,
                                 payCost: true,
                                 reduceCostTuple: null,
-                                fixedCostTuple: null,
+                                fixedCostTuple: (fixedCost: 4, fixedCostCardCondition: null),
                                 ignoreDigivolutionRequirementFixedCost: 4,
                                 isHand: true,
                                 activateClass: activateClass,

+ 0 - 2
Assets/Scripts/PlayerInfo.cs

@@ -35,8 +35,6 @@ public class PlayerInfo : MonoBehaviour
 
         playerName.Trim();
 
-        playerName = DeckData.ValidateDeckName(playerName);
-
         while (playerName.Length > ContinuousController.instance.PlayerNameMaxLength)
         {
             playerName = playerName.Substring(0, playerName.Length - 1);

+ 8 - 7
Assets/Scripts/ProfanityFilter/ProfanityFilter.cs

@@ -220,10 +220,10 @@ namespace ProfanityFilter
             if (toCheckLowerCase.Contains(profanityLowerCase))
             {
                 var startIndex = toCheckLowerCase.IndexOf(profanityLowerCase, StringComparison.Ordinal);
-                var endIndex = startIndex;
+                var endIndex = startIndex + profanityLowerCase.Length;
 
                 // Work backwards in string to get to the start of the word.
-                while (startIndex > 0)
+                /*while (startIndex > 0)
                 {
                     if (toCheck[startIndex - 1] == ' ' || char.IsPunctuation(toCheck[startIndex - 1]))
                     {
@@ -231,10 +231,10 @@ namespace ProfanityFilter
                     }
 
                     startIndex -= 1;
-                }
+                }*/
 
                 // Work forwards to get to the end of the word.
-                while (endIndex < toCheck.Length)
+                /*while (endIndex < toCheck.Length)
                 {
                     if (toCheck[endIndex] == ' ' || char.IsPunctuation(toCheck[endIndex]))
                     {
@@ -242,7 +242,7 @@ namespace ProfanityFilter
                     }
 
                     endIndex += 1;
-                }
+                }*/
 
                 return (startIndex, endIndex, toCheckLowerCase.Substring(startIndex, endIndex - startIndex).ToLower(CultureInfo.InvariantCulture));
             }
@@ -298,11 +298,11 @@ namespace ProfanityFilter
                     do
                     {
                         result = GetCompleteWord(tracker.ToString(), word);
-
+                        
                         if (result != null)
                         {
                             string filtered = result.Value.Item3;
-
+                            
                             if (ignoreNumeric)
                             {
                                 filtered = Regex.Replace(result.Value.Item3, @"[\d-]", string.Empty);
@@ -329,6 +329,7 @@ namespace ProfanityFilter
                 }
                 else
                 {
+                    
                     censored = censored.Replace(word, CreateCensoredString(word, censorCharacter));
                 }
             }

+ 8 - 6
Assets/Scripts/ProfanityFilter/ProfanityList.cs

@@ -1096,17 +1096,19 @@ namespace ProfanityFilter
              "neonazi",
              "nig nog",
              "nigaboo",
-             "nigg",
-             "n1gg",
-             "nigg3r",
-             "nigg4h",
-             "nigga",
-             "niggah",
              "niggas",
+             "n1ggas",
+             "nigg4s",
+             "n1gg4s",
              "niggaz",
+             "n1gg4z",
+             "n1ggaz",
+             "nigg4z",
              "niggle",
              "niglet",
              "nig-nog",
+             "nigg",
+             "n1gg",
              "nimphomania",
              "nimrod",
              "ninny",

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4bcbf9ffec950c04704b52dc185b5d3d02482f324b61bc8e8251ceb0038ce37
+oid sha256:c2ddf92ae718391eef40dec562ce53ef9fe96014a477a170394de7162f12b786
 size 20167