diff options
| -rw-r--r-- | functions.php | 9 | ||||
| -rw-r--r-- | index.php | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/functions.php b/functions.php index 5adf4fa..d083593 100644 --- a/functions.php +++ b/functions.php @@ -157,11 +157,12 @@ function compare_cards($a,$b,$game) if( $b/2 - (int)($b/2) != 0.5) $b--; - /* some special cases */ + /* check for schweinchen and ten of hearts*/ switch($game) { case "normal": case "silent": + case "trump": if($RULES["schweinchen"]=="both" && $GAME["schweinchen"]) { if($a == 19 || $a == 20 ) @@ -176,13 +177,17 @@ function compare_cards($a,$b,$game) if($b == 19 || $b == 20 ) return 0; }; - case "trump": case "heart": case "spade": case "club": + /* check for ten of hearts rule */ if($RULES["dullen"]=="secondwins") if($a==1 && $b==1) /* both 10 of hearts */ return 0; /* second one wins.*/ + case "trumpless": + case "jack": + case "queen": + /* no special cases here */ } /* normal case */ @@ -1381,8 +1381,12 @@ else if(myisset("me")) $playid = DB_play_card($trickid,$handcardid,$sequence); - /* check for schweinchen */ - if($GAME["schweinchen"] && ($card == 19 || $card == 20) ) + /* check special output for schweinchen in case: + * schweinchen is in the rules, a fox has been played and the gametype is correct + */ + if( $GAME["schweinchen"] && + ($card == 19 || $card == 20) && + ($gametype == "normal" || $gametype == "silent"|| $gametype=="trump")) { $GAME["schweinchen"]++; // count how many have been played including this one if($GAME["schweinchen"]==3 && $RULES["schweinchen"]=="second" ) |