From c70b014987a67fedd43336323c1908aa397753a2 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 12:29:39 -0700 Subject: [PATCH 01/13] edited Readme.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd09ab5..88e6e92 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,5 @@ The first player to score 100 or more points wins. From: https://en.wikipedia.org/wiki/Pig_(dice_game) This implementation is a single player game against a computer player. + +This was edited by egerber From 9800827f3aa358c1979ea9069e832c0e8ea8bb0b Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 12:33:07 -0700 Subject: [PATCH 02/13] added class cpu.cpp --- Cpu.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Cpu.cpp diff --git a/Cpu.cpp b/Cpu.cpp new file mode 100644 index 0000000..e69de29 From 75b32b6c8f82fd97ce206d747f18559d9a347f07 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 12:41:45 -0700 Subject: [PATCH 03/13] implementation of the Cpu-class --- Cpu.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Cpu.cpp b/Cpu.cpp index e69de29..231c58b 100644 --- a/Cpu.cpp +++ b/Cpu.cpp @@ -0,0 +1,31 @@ +#include + +Class Cpu +{ + private: + int score; + int score_total; + int turns; + + public: + void roll(void) + { + outcome=rand() % 6 + 1; + if(outcome==1) + { + score=0; + turns++; + } + else + { + score+=outcome; + turns++; + } + + } + void hold(void) + { + score_total+=score; + } + +} From 427ad3c866cf2894d6820cf4ef57ec667016172f Mon Sep 17 00:00:00 2001 From: Thomas Greenman Date: Wed, 9 Sep 2015 12:45:40 -0700 Subject: [PATCH 04/13] Create player class and .cpp --- .player.h.swp | Bin 0 -> 12288 bytes player.cpp | 33 +++++++++++++++++++++++++++++++++ player.h | 17 +++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 .player.h.swp create mode 100644 player.cpp create mode 100644 player.h diff --git a/.player.h.swp b/.player.h.swp new file mode 100644 index 0000000000000000000000000000000000000000..3805f0c7c274bee0e1584910adc912d9f2a4316f GIT binary patch literal 12288 zcmeI&JxT*X6bJAZ(ISQ49$++0EKH&a1pFvOgAo*hn4s0N$!^TRWGC!y6cMAXg|(#@ z@B$vdR=hyGf*!#)`OsjICRN}+@Mm`B%|3=-7qaD4>F`)&6B*($NA&dYU7VUcrKM@2 zu%_#FU<$)W_uN`BlP&EHJK5?UOlH!lWI}%Ig)P^-c4FV7tL13EF z8|x|4AhxnB78i;m^untUfB*y_009U<00Izzz_;}K@)wFU3D^{pOTlIH>iuPTzXcanN$;Ufg r2A&(uvXYfex}l1)gFtjk{FSfcR;A~P!qM(|?!?MdOjbSK``h>d06t`@ literal 0 HcmV?d00001 diff --git a/player.cpp b/player.cpp new file mode 100644 index 0000000..8513873 --- /dev/null +++ b/player.cpp @@ -0,0 +1,33 @@ +using namespace std; +#include "player.h" + +Player::Player() +{ + score = 0; + turn_total = 0; + hold = false; + turns = 0; + did_win = false; +} + +Player::~Player(){} + +void Player::end_turn(int roll) +{ + if(roll == 0) + { + //Hold + score += turn_total; + if(score >= 100) + { + did_win = true; + } + } + else + { + //Rolled a 1 + turn_total = 0; + + } + return; +} diff --git a/player.h b/player.h new file mode 100644 index 0000000..ef1c460 --- /dev/null +++ b/player.h @@ -0,0 +1,17 @@ +#ifndef PLAYER_H +#define PLAYER_H + +class Player +{ + public: + Player(); + ~Player(); + int score; + int turn_total; + bool hold; + int turns; + void end_turn(int roll); + bool did_win; +}; + +#endif From b15c3721b716635bdd8e9047f7659a5c6de52635 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 12:48:53 -0700 Subject: [PATCH 05/13] add boolean value to class --- Cpu.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/Cpu.cpp b/Cpu.cpp index 231c58b..4ca6724 100644 --- a/Cpu.cpp +++ b/Cpu.cpp @@ -1,15 +1,31 @@ #include -Class Cpu +class Cpu { private: int score; int score_total; int turns; - + bool holding; + public: + Cpu() + { + + } + + ~Cpu() + { + + } + int score_total(void) + { + return score_total; + } + void roll(void) { + holding=false; outcome=rand() % 6 + 1; if(outcome==1) { @@ -26,6 +42,7 @@ Class Cpu void hold(void) { score_total+=score; + holding=true; } } From 861d2e37e73017176ad8234c0719a5d18eafbd0c Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 15:16:16 -0700 Subject: [PATCH 06/13] just a test --- .Rhistory | 0 Cpu.cpp~ | 48 ++++ LICENSE | 2 +- LICENSE~ | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + README.md~ | 17 ++ 6 files changed, 742 insertions(+), 1 deletion(-) create mode 100644 .Rhistory create mode 100644 Cpu.cpp~ create mode 100644 LICENSE~ create mode 100644 README.md~ diff --git a/.Rhistory b/.Rhistory new file mode 100644 index 0000000..e69de29 diff --git a/Cpu.cpp~ b/Cpu.cpp~ new file mode 100644 index 0000000..4ca6724 --- /dev/null +++ b/Cpu.cpp~ @@ -0,0 +1,48 @@ +#include + +class Cpu +{ + private: + int score; + int score_total; + int turns; + bool holding; + + public: + Cpu() + { + + } + + ~Cpu() + { + + } + int score_total(void) + { + return score_total; + } + + void roll(void) + { + holding=false; + outcome=rand() % 6 + 1; + if(outcome==1) + { + score=0; + turns++; + } + else + { + score+=outcome; + turns++; + } + + } + void hold(void) + { + score_total+=score; + holding=true; + } + +} diff --git a/LICENSE b/LICENSE index 733c072..0179f4c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE + #GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. diff --git a/LICENSE~ b/LICENSE~ new file mode 100644 index 0000000..733c072 --- /dev/null +++ b/LICENSE~ @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/README.md b/README.md index 88e6e92..889f378 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,4 @@ From: https://en.wikipedia.org/wiki/Pig_(dice_game) This implementation is a single player game against a computer player. This was edited by egerber +and another edit diff --git a/README.md~ b/README.md~ new file mode 100644 index 0000000..88e6e92 --- /dev/null +++ b/README.md~ @@ -0,0 +1,17 @@ +# PigsGame +Pigs dice game + +This is a command-line implementation of Pig. The rules of the game as explaned on Wikipedia are:s + +Each turn, a player repeatedly rolls a die until either a 1 is rolled or the player decides to "hold": + +If the player rolls a 1, they score nothing and it becomes the next player's turn. +If the player rolls any other number, it is added to their turn total and the player's turn continues. +If a player chooses to "hold", their turn total is added to their score, and it becomes the next player's turn. +The first player to score 100 or more points wins. + +From: https://en.wikipedia.org/wiki/Pig_(dice_game) + +This implementation is a single player game against a computer player. + +This was edited by egerber From fe07bbac788bc4bcb0e58bd5e94e122654e9dda3 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 15:18:20 -0700 Subject: [PATCH 07/13] a second test --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 0179f4c..733c072 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - #GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. From 366018fa81701fa5630022a010dd6e83ddc45840 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 17:56:39 -0700 Subject: [PATCH 08/13] a third test --- LICENSE~ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE~ b/LICENSE~ index 733c072..0179f4c 100644 --- a/LICENSE~ +++ b/LICENSE~ @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE + #GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. From dda119e347080a49d5fc71f9a7eb572806e5dcb3 Mon Sep 17 00:00:00 2001 From: egerber Date: Wed, 9 Sep 2015 17:57:54 -0700 Subject: [PATCH 09/13] changed REAMDE in master branch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd09ab5..96f798e 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,5 @@ The first player to score 100 or more points wins. From: https://en.wikipedia.org/wiki/Pig_(dice_game) This implementation is a single player game against a computer player. + +THIS file was edited in master branch From 6c1ddf59016c65ce37101b8f06575ef0b53c5385 Mon Sep 17 00:00:00 2001 From: Bradley Esselman Date: Mon, 14 Sep 2015 11:47:36 -0700 Subject: [PATCH 10/13] Created main.cpp. Initial commit --- game.h | 9 +++++++++ main.cpp | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 game.h create mode 100644 main.cpp diff --git a/game.h b/game.h new file mode 100644 index 0000000..6206f3c --- /dev/null +++ b/game.h @@ -0,0 +1,9 @@ +#ifndef GAME_H +#define GAME_H + +class game +{ + +}; + +#endif diff --git a/main.cpp b/main.cpp new file mode 100644 index 0000000..8153a84 --- /dev/null +++ b/main.cpp @@ -0,0 +1,55 @@ +#include +#include "player.h" + +int main() +{ + Player player1 = new Player(); + Player computer1 = new Player(); + Cpu game = new Cpu(); + char response; + while(!player1.didWin || computer1.didWin) + { + cout << "Player 1's turn./nYour score = " << player1.score; + while(!player1.didWin && !player1.hold) + { + int cur_roll = game.roll(); + cout << "You rolled a " << cur_roll << "\n"; + if(cur_roll == 1) + { + cout << "You rolled a 1 your turn is over.\n"; + player1.endTurn(1); + } + else + { + player1.increaseTurnTotal(cur_roll); + cout << "Your current turn total = " << player1.turn_total; + cout << "To Hold enter 0 else press any key to roll again "; + + cin >> response; + if(response == 0) + { + player1.endTurn(0); + } + } + } + cout << "Computer's turn./nCurrent score = " << player1.score; + while(!computer1.didWin && !computer1.hold) + { + int cur_roll = game.roll(); + cout << "Computer rolled a " << cur_roll << "\n"; + if(cur_roll == 1) + { + cout << "Computer rolled a 1 its turn is over.\n"; + computer1.endTurn(1); + } + else + { + computer1.increaseTurnTotal(cur_roll); + cout << "Computer current turn total = " << computer1.turn_total; + cout << "Computer holds\n"; + computer1.endTurn(0); + } + } + + } +} From 7a907630445f3629c48334bbcd692ebd146487ef Mon Sep 17 00:00:00 2001 From: Bradley Esselman Date: Mon, 14 Sep 2015 11:49:42 -0700 Subject: [PATCH 11/13] Created main.cpp. Initial commit --- game.h | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 game.h diff --git a/game.h b/game.h deleted file mode 100644 index 6206f3c..0000000 --- a/game.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GAME_H -#define GAME_H - -class game -{ - -}; - -#endif From 25893e36496cd75992de26412178177393b39720 Mon Sep 17 00:00:00 2001 From: Thomas Greenman Date: Mon, 14 Sep 2015 12:40:19 -0700 Subject: [PATCH 12/13] Modify player functions --- player.cpp | 11 ++++++++--- player.h | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/player.cpp b/player.cpp index 8513873..307a010 100644 --- a/player.cpp +++ b/player.cpp @@ -6,18 +6,18 @@ Player::Player() score = 0; turn_total = 0; hold = false; - turns = 0; did_win = false; } Player::~Player(){} -void Player::end_turn(int roll) +void Player::endTurn(int roll) { + hold = true; if(roll == 0) { //Hold - score += turn_total; + score = turn_total + score; if(score >= 100) { did_win = true; @@ -30,4 +30,9 @@ void Player::end_turn(int roll) } return; +} +void Player::increaseTurnTotal(int roll) +{ + turn_total = turn_total + roll; + return; } diff --git a/player.h b/player.h index ef1c460..5749997 100644 --- a/player.h +++ b/player.h @@ -9,8 +9,8 @@ class Player int score; int turn_total; bool hold; - int turns; - void end_turn(int roll); + void endTurn(int roll); + void increase_turnTotal(int roll); bool did_win; }; From c7d710ae0c25544220cf2348ac89119a0e916169 Mon Sep 17 00:00:00 2001 From: Bradley Esselman Date: Tue, 15 Sep 2015 16:44:05 -0700 Subject: [PATCH 13/13] Compiled Ran and tested --- .player.h.swp | Bin 12288 -> 0 bytes Cpu.cpp~ | 48 ------------------------------- a.out | Bin 0 -> 14136 bytes main.cpp | 78 ++++++++++++++++++++++++++++++++++---------------- player.cpp | 7 +++-- player.h | 2 +- 6 files changed, 58 insertions(+), 77 deletions(-) delete mode 100644 .player.h.swp delete mode 100644 Cpu.cpp~ create mode 100755 a.out diff --git a/.player.h.swp b/.player.h.swp deleted file mode 100644 index 3805f0c7c274bee0e1584910adc912d9f2a4316f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&JxT*X6bJAZ(ISQ49$++0EKH&a1pFvOgAo*hn4s0N$!^TRWGC!y6cMAXg|(#@ z@B$vdR=hyGf*!#)`OsjICRN}+@Mm`B%|3=-7qaD4>F`)&6B*($NA&dYU7VUcrKM@2 zu%_#FU<$)W_uN`BlP&EHJK5?UOlH!lWI}%Ig)P^-c4FV7tL13EF z8|x|4AhxnB78i;m^untUfB*y_009U<00Izzz_;}K@)wFU3D^{pOTlIH>iuPTzXcanN$;Ufg r2A&(uvXYfex}l1)gFtjk{FSfcR;A~P!qM(|?!?MdOjbSK``h>d06t`@ diff --git a/Cpu.cpp~ b/Cpu.cpp~ deleted file mode 100644 index 4ca6724..0000000 --- a/Cpu.cpp~ +++ /dev/null @@ -1,48 +0,0 @@ -#include - -class Cpu -{ - private: - int score; - int score_total; - int turns; - bool holding; - - public: - Cpu() - { - - } - - ~Cpu() - { - - } - int score_total(void) - { - return score_total; - } - - void roll(void) - { - holding=false; - outcome=rand() % 6 + 1; - if(outcome==1) - { - score=0; - turns++; - } - else - { - score+=outcome; - turns++; - } - - } - void hold(void) - { - score_total+=score; - holding=true; - } - -} diff --git a/a.out b/a.out new file mode 100755 index 0000000000000000000000000000000000000000..9ac7339598a497408014f51b1ede80298754523c GIT binary patch literal 14136 zcmeHOeQ;FQb-%kSfe^3~A2AqXc;GLY=zjK<>;p8>Z`XK+3+ozO(%1doL539bRFDUSL( z_uaGm_Gy)5Jd?l5g?;Cq-}$)b-FM%;@7;Iwe4uHw+vO5m+~SV}aeBEfA?ql_$O_3S ztX9ktx>zojiWxvk@zbS*s8wS+p16zk~Sk_GLQ6{bTfj%yT@ESfwLOm=0Yu;9=j@?xjStW@;5^+rHL`{gru&1(C`5Bp|OP&ugROq~3ao|4z zMt)AN=tK=;LHYRt>ariy{3L~Rz<5lXk??~L(ip4}hOwt7nK063C}kRkFdo}$v_$vB z(q=SO9}lI|(X=oc+qN2!XiC9tTkGS=M6@l`6^~l7;*y=)TFu&6GHrB)($Ni#iI~|? z9oQ?3ovr5ja4bPB_w^aQ(NsE_2*qP&zp=MUN>k~^aI0Be9qtaL3^NsqnE(QT7GUe) zD;72oUMd>uX>2pvs*FHujnUG&9|STp?PylYqHe{NWjq_^;UmG;>~;Mvg`?mjWk`AYGJe| z_QetrT#9t2CrZLFU#@Up$OxIyzL+Uep+p4TNK$nHdqU{gE%o)rdS8{;($rX2Z>;mJ z^F1Q!ckJ-jH5%2v^%lHi2UIp-I9St`8`LA`8RDt##_B<+^{)hTluI1N*y4Gh`TqXd zw8H#cjW?3NYLjP{#AeaVHJ+2Zp<&sBh#!9I87xmF;zMO)uKp611hi%aBqo-3lA2so z6eM}RUubQkSh(=`CtNLUQnXmzUo*j}P$aI|aJ&CiHk{WCGN`iQ)CQMY8*X1$bQ?}> za|zmT`#jZb!_jfMvcra>!*iw6hN~q|%DQd%oSe20y*8ZI6fS)>d@h5a2W+_4hJW6M zSJ?32z`JF^!P5V@LleP6C(Y8)2O$g&oGm+JDNR0d8luVj&f-|HTt|)gZW4}-OrqTP z8u4_A#x6+y+r-nQ89OQYmx=cf|BB?lN<3Ynv15||3h{Jl#*Rq-OT^P989N~PFAz_c zVysv4pCg_gL&iEK|19y;^<&MFPZ3{Eye|2tiKk02Rwel^;;Dvs7)Px86!R+basjHs~x-JCY zoXEiVHBt;7`hj`9BbYsB*}tvq4{RD+qzRFk*AC0k=MYH8xzdY(TpygF>lGZ>G%+6v z=CWJ}3)@c!Jmo=u@k`D}s%F*M$o}A2{dhHu8zq}^<#)nt4Z=9M~ zzWQ|bg6pIUztyL*|8}^}l?~h)4BYzHGi2p&YlWe9g8FszD6E6oGr{c7M(aI@Jlip1 z37*dj)>wkkv2qNR;9y{6aPe?ir7lj;gfKdT+W%=Vdw%rAkKha9b9$K=J44=|K%m*c zrQuaM?Mu)ZY`>JfNCr=W8GaNpVuryC?7!s7tQ_8$Q~yWha+n4!X@{GO;pyGJotv{^F%p*U;XiByfSEpNX zTrV5A<~n$?;?NqL5a|G#br84U*b)Q=U=&?)EZ4*bXwhoBA2kxoE_s={q=C9CaC!Jl zPWyY%8En67olKB|Y!JkDE}u%2D=nWxlQ+0MM)I`dI==I-%(xF1y4{M@=!N}=M=55W(w%C+$` zYLcF~=qghCWIk9)F%OE3r=MFkygsM<9lP#vFyl*y>vGaB+oear$h&3yp~mc48pihn zY08dJGyjgNLM!v=tEghu)SmS3>X0`C-A38{x3Zauf&I5!nFl_*e`0bH_vx||Z?41u zzw)ce$=8l*onn~S6ZCXA`aUr0ZW<<4dV&_Cub_*R$L#(IoY};A>QEXV6X$ig(ovPh zf<A42>Ul*B2h#PD!kwmyo6U|c3*}V>mfr;>QpCI&{KFc*e z+a^CU#W%bS2Cget%_UI4yyAbtpPlqS-k81VZ*R>0*x%N4_`YVZhAHpx+8v;+O{=d| z|0H)GZe8PQCSDA$F@ipy$;+8T%bJS-w5 zuP@MZKDNB*87T3TdfWkUwmfKb@D) zL4V$aTn;uqk3e4j5ac6}@3PywpO6X^UlZg@F^#XV%XeA!)JJj1HOQkRuk%*^nLFTJ z{6$Z|s~s*0cvrnx8uV7ZFeB)#9hkY*tH-^yes7iEyQGAwU8R>x#cEVGl>T?AXgN*~i?_?|9=P2Dw|n4r58Up7+dXi*2X6Pk z|MMQeJ{*;Q@mh2Q59RiPM@(6ql=jA{Fiv~nROVPjXm~TH!h5XOvF%6YPI<%&y86y~ zm*RPEdx_#Fl$_ri=pBN}jbBeDi5_+9L~`GJ-zc$o-jlxIws?MFq+J*)w4q65u|(F70+=8l^*YPbNhH*ljkFpKDI3+ z&v9H+{KXlTf92-)PWU^vv!Tb;b=|G#UPWI}^d&{Vrs#1+&nbFQ(RUQRspt$f?(R_Z zeno2(b;f~@K7XLCYVXP<%#60dSL<81wt8bmvem0CKnP#DzsC%9fto3cc5^L8+YY_L zmq?mXA3hbWHA8z8w< z50QbY^~O!%i{X=?@ZnPyj=RA?mW+hVknlyjjom41BpBTh*fIyF_(B%#3rBlR1L5QI zqx4~fQmIhC<%8=_hhd2JLOroC?2>2#2cK-$YNIQi7QS$@rw4m5&d&T8Jl(f+%k%wF z>(;^L^EUXtl^_m0PcVNEDs-=~eVbbcm(PpPB$q#w1u zTbUJE)a>@Unum0rpdB5~>l4$zaN3va(zmV_oNx1qOSJIYEkR$w&)z<-kJl?K0}jLD ztiI+t(PQ|LJ@>!Bmjzi=fUS=Bx&JIBA^rgsyFKR-wW*J*aaL5+*?-3!_9yX4fXYc_ zf9toje-gU(_G!D1%Igax5&T?Wah5LEiT(gT`q;?pBtK7Zz7k(2(xu`&|DOV*u4a3F z-k7+Xw5RGj?XNmlEmh4TM=X*%vK`YIFt*ztQT9iaJ;%uo*p7MHVu`x*d{r53)#kJ+TY%#US^bU5L-l zy>Araa|F-ph4|cD9%~`)6+90Y;+QFTezgfa$jIS&(*~nA=V2by?U1Z{#C*(e#qb5W z_aVEH2X7lZFBRf=YvK9ECh&+ma(SpW81XC;JU(+_E5z>jefrg&%X^eua-X@F#$~kRNzqWhZL+`+c{p zPwmgcz^Pp^TSqNl{t8tWGOKu9VaX6G#m?)L)L$a#vosZ#JPL6El>D1sT_T$lP6~wc zdpEy_QeI>+|KzV2eh&mLjJF}jxT==;)PAPsi}~3k^{0*p>p5bdigrw#@e*Sw1_a@66=`D>veK!i(hh zzNGXi_rqTP4mibgK*bYP!tVgDwB;MK%?YJ1l)n6i3*nCxzE;fx@*6hr|5AP~t?XnM zlD;kV3m}U@M^S%{sP_rh2r8U;raOUC|M2q<;~~~}jL*+8&WehDc^dqmBtG?id0pX@ zhew6Jxl=hM@u}FI}wjWcNPr9hQ3hkfDRUYYaURBITqq}-n|c5bLPD7)CCylYs+kgNSHI3$fD{TO-S z*g?vKC0`Xo!u6J>?REYpm}I()Mg!)Q46|4C%Cs4)1!HrIe`~-9Y-^y5bJy3PN_!LEFV|1R5#(qY zrVy>{ZMYdLik!o<;G>PKbz2XTYkU%lZQfQg?~-} dnfeQX`~_&B;UoWgK;B#O-uak+hf&z{{{eFyS%&}s literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 8153a84..f79121e 100644 --- a/main.cpp +++ b/main.cpp @@ -1,55 +1,83 @@ #include #include "player.h" +#include +using namespace std; + +int roll() +{ + int outcome; + outcome=rand() % 6 + 1; + return outcome; +} int main() { - Player player1 = new Player(); - Player computer1 = new Player(); - Cpu game = new Cpu(); + Player *player1 = new Player(); + Player *computer1 = new Player(); char response; - while(!player1.didWin || computer1.didWin) + + while(!player1->did_win || computer1->did_win) { - cout << "Player 1's turn./nYour score = " << player1.score; - while(!player1.didWin && !player1.hold) + cout << "\nPlayer 1's turn.\nYour score = " << player1->score; + player1->hold = false; + while(!player1->hold) { - int cur_roll = game.roll(); - cout << "You rolled a " << cur_roll << "\n"; + int cur_roll = roll(); + cout << "\nYou rolled a " << cur_roll << "\n"; if(cur_roll == 1) { - cout << "You rolled a 1 your turn is over.\n"; - player1.endTurn(1); + cout << "Your turn is over.\n"; + player1->endTurn(1); } else { - player1.increaseTurnTotal(cur_roll); - cout << "Your current turn total = " << player1.turn_total; - cout << "To Hold enter 0 else press any key to roll again "; + player1->increaseTurnTotal(cur_roll); + cout << "Your current turn total = " << player1->turn_total; + cout << "\nEnter 0 to hold or any thing else to continue \n"; cin >> response; - if(response == 0) + if(response == '0') { - player1.endTurn(0); + player1->endTurn(0); } } } - cout << "Computer's turn./nCurrent score = " << player1.score; - while(!computer1.didWin && !computer1.hold) + if(player1->did_win) + { + break; + } + cout << "\nComputer's turn.\nCurrent score = " << computer1->score; + computer1->hold = false; + while(!computer1->hold) { - int cur_roll = game.roll(); - cout << "Computer rolled a " << cur_roll << "\n"; + int cur_roll = roll(); + cout << "\nComputer rolled a " << cur_roll << "\n"; if(cur_roll == 1) { - cout << "Computer rolled a 1 its turn is over.\n"; - computer1.endTurn(1); + cout << "Computer's turn is over.\n"; + computer1->endTurn(1); } else { - computer1.increaseTurnTotal(cur_roll); - cout << "Computer current turn total = " << computer1.turn_total; - cout << "Computer holds\n"; - computer1.endTurn(0); + computer1->increaseTurnTotal(cur_roll); + cout << "Computer current turn total = " << computer1->turn_total; + cout << "\nComputer holds\n"; + computer1->endTurn(0); } } + if(computer1->did_win) + { + break; + } } + cout << "Game Over!" << endl; + if(player1->score > computer1->score) + { + cout << "Player 1 wins!" << endl; + } + else + { + cout << "Computer 1 wins!" << endl; + } } diff --git a/player.cpp b/player.cpp index 307a010..7b44aaa 100644 --- a/player.cpp +++ b/player.cpp @@ -17,12 +17,13 @@ void Player::endTurn(int roll) if(roll == 0) { //Hold - score = turn_total + score; + score = turn_total + score; + turn_total = 0; if(score >= 100) { did_win = true; } - } + } else { //Rolled a 1 @@ -35,4 +36,4 @@ void Player::increaseTurnTotal(int roll) { turn_total = turn_total + roll; return; -} +} diff --git a/player.h b/player.h index 5749997..5fbef62 100644 --- a/player.h +++ b/player.h @@ -10,7 +10,7 @@ class Player int turn_total; bool hold; void endTurn(int roll); - void increase_turnTotal(int roll); + void increaseTurnTotal(int roll); bool did_win; };