it works!

ericoporto · Dec 4, 2017 · 269a49d · 269a49d
1 parent 96f6a73
commit 269a49d
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/AGS/DungeonHands/Compiled/DungeonHands.ags b/AGS/DungeonHands/Compiled/DungeonHands.ags
diff --git a/AGS/DungeonHands/Compiled/Windows/DungeonHands.exe b/AGS/DungeonHands/Compiled/Windows/DungeonHands.exe
diff --git a/AGS/DungeonHands/Compiled/Windows/acsetup.cfg b/AGS/DungeonHands/Compiled/Windows/acsetup.cfg
@@ -0,0 +1,17 @@
+[sound]
+digiid=-1
+midiid=-1
+digiwin=-1
+midiwin=-1
+digiindx=0
+midiindx=0
+digiwinindx=0
+midiwinindx=0
+[misc]
+game_width=640
+game_height=360
+gamecolordepth=32
+titletext=Dungeon Hands Setup
+[graphics]
+defaultdriver=D3D9
+driver=D3D9
diff --git a/AGS/DungeonHands/Compiled/Windows/winsetup.exe b/AGS/DungeonHands/Compiled/Windows/winsetup.exe
diff --git a/AGS/DungeonHands/Play.asc b/AGS/DungeonHands/Play.asc
@@ -266,37 +266,55 @@ void CheckValidCards_MC(){
 
   int enemy_rank=0;
   int enemy_color;
+  int temp_color;
 
   i=1;
   while(i<Game.InventoryItemCount+1){
     if(cTable.InventoryQuantity[i]>0){
       if(!Cards_isItemMonster(inventory[i])){
-        enemy_rank+=Card_HC_getCardRank(Cards_HC_ItemToCard(inventory[i]));
-        enemy_color = Card_HC_getCardColor(Cards_HC_ItemToCard(inventory[i]));
+        temp_color = Card_HC_getCardColor(Cards_HC_ItemToCard(inventory[i]));
+        if(temp_color!=CCOLOR_GRAY){
+          enemy_rank+=Card_HC_getCardRank(Cards_HC_ItemToCard(inventory[i]));
+          enemy_color=temp_color;
+        }
       } 
     }
     i++;
   }
 
 
+  if(bool_H_SP2a){
+    enemy_rank++;  
+  }
+  if(bool_H_SP2b){
+    enemy_rank++;  
+  }
+
   //Display("1st turn %d",first_turn_in_round);
 
   i=1;
   while(i<Game.InventoryItemCount+1){
     if(cMonster.InventoryQuantity[i]>0){
       if(Cards_isItemMonster(inventory[i])){
-        if(first_turn_in_round || Card_MC_getCardRank(Cards_MC_ItemToCard(inventory[i])) > enemy_rank || Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) == enemy_color || (Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) == CCOLOR_GRAY && Card_MC_getCardRank(Cards_MC_ItemToCard(inventory[i]))==RANK_SP1)){
+        if((Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) != CCOLOR_GRAY) && (Card_MC_getCardRank(Cards_MC_ItemToCard(inventory[i])) > enemy_rank || Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) == enemy_color)){
           //it's a playable card  
           Cards_SetCardItemEnable(inventory[i]);
-        } else if(Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) == CCOLOR_GRAY && Card_MC_getCardRank(Cards_MC_ItemToCard(inventory[i]))==RANK_SP2){
-          if(first_turn_in_round){
-            //it's a playable card
-            Cards_SetCardItemEnable(inventory[i]);
+        } else if(Card_MC_getCardColor(Cards_MC_ItemToCard(inventory[i])) == CCOLOR_GRAY){
+          if(Card_MC_getCardRank(Cards_MC_ItemToCard(inventory[i]))==RANK_SP2){
+            if(first_turn_in_round){
+              //it's a playable card
+              Cards_SetCardItemEnable(inventory[i]);
+            } else {
+              //it's not a playable card
+              Cards_SetCardItemDisable(inventory[i]);
+            }
+
           } else {
-            //it's not a playable card
-            Cards_SetCardItemDisable(inventory[i]);
-          }
-        } else {
+              Cards_SetCardItemEnable(inventory[i]);            
+          }          
+        } else if(first_turn_in_round){
+          Cards_SetCardItemEnable(inventory[i]);
+        }else {
           //it's not a playable card
           Cards_SetCardItemDisable(inventory[i]);
         }
@@ -395,22 +413,18 @@ void resolve_table(){
 
 
   if(bool_H_SP1a){
-    Display("H_SP1a");
     playerHero_DrawQuick();
   }
   if(bool_H_SP1b){
-    Display("H_SP1b");
     playerHero_DrawQuick();
   }
   if(bool_M_SP1a){
-    Display("M_SP1a");
     playerHero_DrawQuick();
     playerHero_DrawQuick();
     playerMonster_DrawQuick();
     playerMonster_DrawQuick();
   }
   if(bool_M_SP1b){
-    Display("M_SP1b");
     playerHero_DrawQuick();
     playerHero_DrawQuick();
     playerMonster_DrawQuick();