Oreon training #9
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add buildings gym and classroom for this training.
Add tooltip functionality for Oreons.
Remove unused imports and variables.
mkienenb
suggested changes
Jun 9, 2018
| @@ -0,0 +1,50 @@ | |||
| /* | |||
| * Copyright 2017 MovingBlocks | |||
| @@ -0,0 +1,102 @@ | |||
| /* | |||
| * Copyright 2017 MovingBlocks | |||
| @@ -96,6 +96,20 @@ private void changeOreonAttributes(Actor oreon, TaskComponent taskComponent) { | |||
| oreonAttributeComponent.hunger = 0; | |||
| break; | |||
|
|
|||
| case AssignedTaskType.Train_Strength: | |||
| oreonAttributeComponent.strength += 10; | |||
| oreonAttributeComponent.strength = oreonAttributeComponent.strength > oreonAttributeComponent.maxStrength | |||
There was a problem hiding this comment.
Assigning the same value doesn't make sense. Just use an if ( str > max) { str = max; } statement.
|
|
||
| case AssignedTaskType.Train_Intelligence: | ||
| oreonAttributeComponent.intelligence += 10; | ||
| oreonAttributeComponent.intelligence = oreonAttributeComponent.intelligence > oreonAttributeComponent.maxIntelligence |
There was a problem hiding this comment.
Same as above. use an if statement instead.
| @@ -0,0 +1,58 @@ | |||
| /* | |||
| * Copyright 2017 MovingBlocks | |||
| @ReceiveEvent(components = OreonAttributeComponent.class) | ||
| public void addAttributesToTooltip(GetItemTooltip event, EntityRef entity, OreonAttributeComponent oreonAttributeComponent) { | ||
| event.getTooltipLines().add(new TooltipLine("Level : " + oreonAttributeComponent.currentLevel)); | ||
| event.getTooltipLines().add(new TooltipLine("Health : " + oreonAttributeComponent.health + " / " + oreonAttributeComponent.maxStrength )); |
There was a problem hiding this comment.
Shouldn't this be maxHealth, not maxStr?
| @@ -0,0 +1,24 @@ | |||
| /* | |||
| * Copyright 2017 MovingBlocks | |||
| private long maxDelay = 10; | ||
|
|
||
| public float sendNotification(String message, EntityRef notificationMessageEntity, float lastNotification) { | ||
| if (time.getGameTime() - lastNotification > maxDelay || lastNotification == 0) { |
There was a problem hiding this comment.
You should check for lastNotification == 0 first, then the subtraction > max check.
Cervator
approved these changes
Jun 9, 2018
|
Tweaks applied - merged! :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IntelligenceandStrengthattributes.GymandClassroomfor this training. Each time the Oreon visits one of these buildings its corresponding attribute is increased by 10.DelayedNotificationSystemso that the player is not notified of a missing building every time the Oreon's BT is run.Outstanding before merge: