Sora Bug Fixes

Fixed Security based DP checking and trait checking.

.idea/.idea.DCGO2/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/.idea.DCGO2/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/.idea.DCGO2/.idea/workspace.xml

@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="2a604e7d-e63d-47d6-bb9b-f1a732f88899" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DCGO2/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DCGO2/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Red/Sora_Takenouchi_BT15_082.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Red/Sora_Takenouchi_BT15_082.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -20,29 +21,29 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "settings.editor.selected.configurable": "preferences.fileTypes",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.fileTypes&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "rider.external.source.directories": [
-      "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache",
-      "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache",
-      "C:\\Users\\wwm0n\\AppData\\Local\\Symbols\\src"
+  &quot;keyToStringList&quot;: {
+    &quot;rider.external.source.directories&quot;: [
+      &quot;C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache&quot;,
+      &quot;C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache&quot;,
+      &quot;C:\\Users\\wwm0n\\AppData\\Local\\Symbols\\src&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
     <configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="$USER_HOME$/Desktop/DCGO_Test_Black/Game\DCGO.exe" />
+      <option name="EXE_PATH" value="$USER_HOME$/Desktop/DCGO_Test_LM01/Game\DCGO.exe" />
       <option name="PROGRAM_PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="C:\Users\wwm0n\Desktop\DCGO_Test_Black\Game" />
       <option name="PASS_PARENT_ENVS" value="1" />
@@ -95,6 +96,7 @@
       <option name="presentableId" value="Default" />
       <updated>1712693666168</updated>
       <workItem from="1712693666604" duration="9048000" />
+      <workItem from="1712884503542" duration="3569000" />
     </task>
     <servers />
   </component>

Assets/CardEffect/BT15/Red/Sora_Takenouchi_BT15_082.cs

@@ -36,7 +36,7 @@ public class Sora_Takenouchi_BT15_082 : CEntity_Effect
 
             bool CanUseCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card) && card.Owner.isYou)
+                if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
                     return true;
                 }
@@ -56,36 +56,35 @@ public class Sora_Takenouchi_BT15_082 : CEntity_Effect
             
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                int subAmount = card.Owner.SecurityCards.Count * 2000;
-                int cardDP = 13000;
-                
-                if (cardSource.CardDP <= cardDP - subAmount)
+                int subAmount = card.Owner.Enemy.SecurityCards.Count * 2000;
+                int cardDP = 13000 - subAmount;
+                Debug.Log(cardDP);
+                if (cardSource.CardDP <= cardDP && cardSource.CardColors.Contains(CardColor.Red) && cardSource.Owner == card.Owner)
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false,
                             cardEffect: activateClass))
                     {
-                        if (cardSource.CardTraits.Contains("Avian"))
+                        if (cardSource.ContainsTraits("Avian"))
                         {
                             return true;
                         }
-                        if (cardSource.CardTraits.Contains("Bird"))
+                        if (cardSource.ContainsTraits("Bird"))
                         {
                             return true;
                         }
-                        if (cardSource.CardTraits.Contains("Beast"))
+                        if (cardSource.ContainsTraits("Beast"))
                         {
                             return true;
                         }
-                        if (cardSource.CardTraits.Contains("Animal"))
+                        if (cardSource.ContainsTraits("Animal"))
                         {
                             return true;
                         }
-                        if (cardSource.CardTraits.Contains("Sovereign"))
+                        if (cardSource.ContainsTraits("Sovereign"))
                         {
                             return true;
                         }
-
-                        if (cardSource.CardTraits.Contains("Sea Animal"))
+                        if (cardSource.ContainsTraits("Sea Animal"))
                         {
                             return false;
                         }
@@ -171,13 +170,7 @@ public class Sora_Takenouchi_BT15_082 : CEntity_Effect
                 }
             }
         }
-
-        if (timing == EffectTiming.OnPermamemtReturnedToHand)
-        {
-            ActivateClass activateClass = new ActivateClass();
-
-            
-        }
+        
         
         if(timing == EffectTiming.SecuritySkill)
         {