Add item type: Molotov by Shaedil · Pull Request #131 · tagniam/Turn

Shaedil · 2020-10-21T19:18:30Z

Solves #128.

Merge pull request #3 from tagniam/master

Merge pull request #4 from tagniam/master

* Every player starts with 1 molotov in inventory * It costs 75 coins to buy 1 molotov in the store * It can be gambled for * It is documented in the game instructions

add: Comments about molotov item implementation

src/Game.cpp

src/Player.cpp

tagniam · 2020-10-23T23:29:20Z

Left some comments in the diff, also when I play the game, the extra damage messages go too fast, I think there should be a pause after each. Looks good so far though!

weaponstrength was updated to weaponsharpness

tagniam · 2020-10-25T21:08:44Z

Looks like the build failed?

tagniam · 2020-10-28T00:26:38Z

Any updates @Shaedil?

Shaedil · 2020-10-28T00:52:35Z

So sorry, I've been busy with my classes. I've been working on it since two days ago, I believe I have the fix for this. I just can't believe how silly the mistake was. I'll be pushing the final changes by the end of the day.

tagniam · 2020-10-28T01:08:43Z

No worries! Just making sure I have time to merge this before the end of October, if you wanted it to count for Hacktoberfest. Good luck with your classes :)

tagniam

Left some more comments, but basically we'd like to avoid adding any code to the main game loop if possible. LMK if you have any questions about that.

tagniam · 2020-10-29T01:00:25Z

src/Game.cpp

+        // Player turn is over, enemy's status effect damage is calculated
+        if (0 < _Player->extradamageturns && _Player->extradamageturns <= 2 && damagePlayer != -1) {
+            _Player->extradamageturns--;
+            _Enemy->TakeDamage(extradamagePlayer);
+            _Player->ReturnDialog(extradamagePlayer, " damage points from burn dealt");
+        }
+        // Check if enemy has had molotov thrown at him before or now
+        if (damagePlayer == -3) {
+            damagePlayer = Common::RandomInt(30, 40);
+            _Enemy->TakeDamage(damagePlayer);
+            _Player->ReturnDialog(damagePlayer, " regular damage points dealt");
+            _Player->extradamageturns = 2;
+            _Player->ReturnDialog(_Player->extradamageturns, " turns of extra burn damage");
+        }


There is still molotov logic in the game loop, we'd like to avoid that, I think this can be done wholly in the Player/Enemy classes. Let me know if you have any questions about that.

I can reduce this to just one function call, if that is what you mean by "done wholly in the Player/Enemy classes". Otherwise, would you rather the molotov damage be added onto the main damage i.e. damagePlayer?

Ideally there shouldn't be any extra function calls or code in the main game loop. So yeah, I think the molotov damage should be added onto the main damage, then the dialog messages can be printed in the Player class' UseMolotov, similar to UseBomb, BowAndArrow, etc. Keeping track of extradamageturns should also be in the Player class.

With that approach, you don't need to modify anything in the Enemy class. So really it should be done wholly in the Player class, if I'm not mistaken.

tagniam · 2020-10-29T01:00:57Z

src/Game.cpp

+        int extradamagePlayer = _Player->ReturnExtraMolotovDamage();
        // Player's turn to attack Enemy or choose other action.
-        if (damagePlayer != SKIP_TURN) {
+        if (damagePlayer != SKIP_TURN && damagePlayer != -3) {


Avoid using magic numbers like -3, you should define constants e.g. like SKIP_TURN so it's easier to read :)

tagniam · 2020-10-29T01:01:14Z

src/Game.cpp

+            // Reset remaining molotov damage, and prevent it from overlapping into the next battle.
+            _Player->extradamageturns = 3;


See comment above

tagniam · 2020-10-29T01:01:48Z

src/Player.cpp

        bombs += amount;
        break;
+    case ITEMTYPE::MOLOTOV:
+        ++molotovs;


This should be molotovs += amount

Shaedil and others added 5 commits October 16, 2020 14:49

chore: update repo

06a4de2

Merge pull request #3 from tagniam/master

chore: update repo

3342678

Merge pull request #4 from tagniam/master

feat: Add new item type molotov

e950f05

* Every player starts with 1 molotov in inventory * It costs 75 coins to buy 1 molotov in the store * It can be gambled for * It is documented in the game instructions

chore: update local branch

ae3328f

feat: Molotovs can be sold in the game store

848fbac

add: Comments about molotov item implementation

tagniam reviewed Oct 23, 2020

View reviewed changes

src/Game.cpp Outdated Show resolved Hide resolved

tagniam reviewed Oct 23, 2020

View reviewed changes

src/Player.cpp Outdated Show resolved Hide resolved

Shaedil and others added 3 commits October 25, 2020 13:04

fix: Move logic from Game.cpp to Player.cpp

6f0d22e

fix: Resolve conflicts in Player.h and Player.cpp

a617ab5

weaponstrength was updated to weaponsharpness

Merge branch 'master' into master

11c91c6

fix: Define ReturnDialog() properly in Game.cpp

490d966

tagniam requested changes Oct 29, 2020

View reviewed changes

		// Reset remaining molotov damage, and prevent it from overlapping into the next battle.
		_Player->extradamageturns = 3;

Conversation

Shaedil commented Oct 21, 2020

Uh oh!

Uh oh!

Uh oh!

tagniam commented Oct 23, 2020

Uh oh!

tagniam commented Oct 25, 2020

Uh oh!

tagniam commented Oct 28, 2020

Uh oh!

Shaedil commented Oct 28, 2020

Uh oh!

tagniam commented Oct 28, 2020

Uh oh!

tagniam left a comment

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 29, 2020

Choose a reason for hiding this comment

Uh oh!

Shaedil Oct 29, 2020

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 30, 2020

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 29, 2020

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 29, 2020

Choose a reason for hiding this comment

Uh oh!

tagniam Oct 29, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tagniam Oct 30, 2020 •

edited

Loading