Skip to content

K
kotlin-e004-poker
Commit ba41aa43 by Yannine Alvarez
Options

corrección de valor de retorno, agregar return poker.

parent 2afdb75a
Showing with 30 additions and 22 deletions
Poker/.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="Unificar en una función para retornar valores en el poker"> <list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Poker/Card.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Poker/Carta.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/Carta.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Poker/Poker.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Poker/PokerKt$isStraight$$inlined$sortedBy$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Poker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Poker.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Poker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Poker.kt" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -92,38 +87,46 @@ ...@@ -92,38 +87,46 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1587329427974</updated> <updated>1587329427974</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="corrección de valor de retorno.">
<created>1587333258876</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1587333258876</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Unificar en una función para retornar valores en el poker" /> <MESSAGE value="Unificar en una función para retornar valores en el poker" />
<option name="LAST_COMMIT_MESSAGE" value="Unificar en una función para retornar valores en el poker" /> <MESSAGE value="corrección de valor de retorno." />
<option name="LAST_COMMIT_MESSAGE" value="corrección de valor de retorno." />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog" timestamp="1586915044775"> <state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog" timestamp="1586915044775">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1366.728@0.0.1366.728" timestamp="1586915044775" /> <state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1366.728@0.0.1366.728" timestamp="1586915044775" />
<state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587333206624"> <state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587333255252">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587333206624" /> <state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587333255252" />
<state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1587333192829"> <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1587333947392">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1587333192829" /> <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
<state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1587333192828"> <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1587333947392">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" /> <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
<state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1587333192828"> <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1587333947392">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" /> <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
<state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1587333192828"> <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1587333947392">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" /> <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
<state width="1322" height="217" key="GridCell.Tab.1.bottom" timestamp="1587331383807"> <state width="1322" height="217" key="GridCell.Tab.1.bottom" timestamp="1587331383807">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
...@@ -140,10 +143,10 @@ ...@@ -140,10 +143,10 @@
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state width="1322" height="217" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1587331383807" /> <state width="1322" height="217" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1587331383807" />
<state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587329488713"> <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587333273924">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
<state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587329488713" /> <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587333273924" />
<state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1586975782483"> <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1586975782483">
<screen x="0" y="0" width="1366" height="728" /> <screen x="0" y="0" width="1366" height="728" />
</state> </state>
...@@ -168,7 +171,7 @@ ...@@ -168,7 +171,7 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line"> <line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/src/Poker.kt</url> <url>file://$PROJECT_DIR$/src/Poker.kt</url>
<line>65</line> <line>70</line>
<option name="timeStamp" value="12" /> <option name="timeStamp" value="12" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
......
Poker/src/Poker.kt
...@@ -44,7 +44,12 @@ fun jugada(mano: String): String { ...@@ -44,7 +44,12 @@ fun jugada(mano: String): String {
return "DOS PARES" return "DOS PARES"
} }
4 -> return "UN PAR" 4 -> {
return "UN PAR"
}
5 -> {
return "POKER"
}
else -> { else -> {
val color = esColor(cartas) val color = esColor(cartas)
val escalera = esEscalera(cartas) //corregir val escalera = esEscalera(cartas) //corregir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment