Permalink
Browse files

another confusing merge

  • Loading branch information...
rspeer committed Oct 15, 2011
2 parents b0f7cc3 + 8449dab commit f8f7ee250618d37dacbcda1b479bb6cf4340b896
Showing with 79 additions and 22 deletions.
  1. +1 −0 .gitignore
  2. +1 −12 cards.coffee
  3. +2 −0 docs/basicAI.html
  4. +66 −3 docs/cards.html
  5. +3 −6 docs/gameState.html
  6. +6 −1 docs/playWeb.html
View
@@ -4,6 +4,7 @@
cards.js
gameState.js
heuristics.js
+grapher.js
geronimoo
.idea
web/grapher.js
View
@@ -382,7 +382,7 @@ makeCard 'Nobles', c.Estate, {
{actions: 2},
{cards: 3}
])
- applyBenefit(state, benefit)
+ applyBenefit(state, benefit)
}
makeCard 'Vineyard', c.Estate, {
@@ -1624,17 +1624,6 @@ makeCard 'Tournament', action, {
state.current.drawCards(1)
}
-makeCard 'Torturer', action, {
- cost: 5
- cards: +3
- playEffect: (state) ->
- state.attackOpponents (opp) ->
- if opp.ai.choose('torturer', state, ['curse', 'discard']) == 'curse'
- state.gainCard(opp, c.Curse, 'hand')
- else
- state.requireDiscard(opp, 2)
-}
-
makeCard "Trade Route", action, {
cost: 3
buys: 1
View
@@ -197,6 +197,7 @@
<span class="s2">&quot;Library&quot;</span> <span class="k">if</span> <span class="nx">my</span><span class="p">.</span><span class="nx">hand</span><span class="p">.</span><span class="nx">length</span> <span class="o">&lt;=</span> <span class="mi">3</span>
<span class="s2">&quot;Expand&quot;</span>
<span class="s2">&quot;Remodel&quot;</span>
+ <span class="s2">&quot;Jester&quot;</span>
<span class="s2">&quot;Militia&quot;</span>
<span class="s2">&quot;Cutpurse&quot;</span>
<span class="s2">&quot;Bridge&quot;</span>
@@ -244,6 +245,7 @@
<span class="s2">&quot;Workshop&quot;</span>
<span class="s2">&quot;Smugglers&quot;</span> <span class="k">if</span> <span class="nx">state</span><span class="p">.</span><span class="nx">smugglerChoices</span><span class="p">().</span><span class="nx">length</span> <span class="o">&gt;</span> <span class="mi">1</span>
<span class="s2">&quot;Coppersmith&quot;</span>
+ <span class="s2">&quot;Saboteur&quot;</span>
<span class="s2">&quot;Library&quot;</span> <span class="k">if</span> <span class="nx">my</span><span class="p">.</span><span class="nx">hand</span><span class="p">.</span><span class="nx">length</span> <span class="o">&lt;=</span> <span class="mi">7</span></pre></div> </td> </tr> <tr id="section-29"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-29">&#182;</a> </div> <p>Eighth priority: cards that have become useless. Maybe they'll decrease
the cost of Peddler, trigger Conspirator, or something.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="s2">&quot;Treasure Map&quot;</span> <span class="k">if</span> <span class="nx">my</span><span class="p">.</span><span class="nx">countInDeck</span><span class="p">(</span><span class="s2">&quot;Gold&quot;</span><span class="p">)</span> <span class="o">&gt;=</span> <span class="mi">4</span> <span class="o">and</span> <span class="nx">state</span><span class="p">.</span><span class="nx">current</span><span class="p">.</span><span class="nx">countInDeck</span><span class="p">(</span><span class="s2">&quot;Treasure Map&quot;</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span>
<span class="s2">&quot;Shanty Town&quot;</span>
Oops, something went wrong.

0 comments on commit f8f7ee2

Please sign in to comment.