Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.80] Added new monster 'ink' race and fluid type #3795

Merged
merged 5 commits into from
Dec 14, 2021

Conversation

EPuncker
Copy link
Contributor

Pull Request Prelude

Changes Proposed

Issues addressed:

@EPuncker EPuncker requested review from ranisalt, DSpeichert and nekiro and removed request for ranisalt and DSpeichert November 18, 2021 06:37
src/const.h Outdated
@@ -113,6 +113,7 @@ enum MagicEffectClasses : uint8_t {
CONST_ME_CRITICAL_DAMAGE = 173,
// 174 is empty
CONST_ME_PLUNGING_FISH = 175,
CONST_ME_DRAWINK = 202,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
CONST_ME_DRAWINK = 202,
CONST_ME_DRAW_INK = 202,

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just wanted to follow DRAWBLOOD pattern 😄

@@ -3913,6 +3913,15 @@ void Game::combatGetTypeInfo(CombatType_t combatType, Creature* target, TextColo
color = TEXTCOLOR_ELECTRICPURPLE;
effect = CONST_ME_ENERGYHIT;
break;
case RACE_INK:
color = TEXTCOLOR_BLACK;
effect = CONST_ME_DRAWINK;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
effect = CONST_ME_DRAWINK;
effect = CONST_ME_DRAW_INK;

@omarcopires
Copy link
Contributor

works fine

omarcopires
omarcopires previously approved these changes Dec 2, 2021
DSpeichert
DSpeichert previously approved these changes Dec 14, 2021
@DSpeichert DSpeichert dismissed stale reviews from omarcopires and themself via 0b2cba5 December 14, 2021 23:28
@DSpeichert DSpeichert merged commit d7c8f08 into otland:master Dec 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants