Skip to content

factionscoreEquals #13

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.

Sign up for GitHub

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

Open
Chriz76 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

factionscoreEquals #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public enum RequirementType {
consumedBonemeals,
hasActorCondition,
factionScore,
random
random,
factionScoreEquals
}

public enum SkillID {
Expand Down Expand Up @@ -186,6 +187,7 @@ public void link() {
case spentGold:
case timerElapsed:
case factionScore:
case factionScoreEquals:
case random:
break;
}
Expand Down
7 changes: 6 additions & 1 deletion src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,11 @@ public void updateRequirementParamsEditorPane(final JPanel pane, final Requireme
requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener);
break;
case factionScoreEquals:
requirementObj = null;
requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
requirementValue = addIntegerField(pane, "Exact value: ", requirement.required_value, true, writable, listener);
break;
case wear:
requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
requirementObjId = null;
Expand Down Expand Up @@ -1174,7 +1179,7 @@ public static void decorateRequirementJLabel(JLabel label, Requirement req) {
label.setIcon(new ImageIcon(DefaultIcons.getBonemealIcon()));
} else if (req.type == Requirement.RequirementType.timerElapsed) {
label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon()));
} else if (req.type == Requirement.RequirementType.factionScore) {
} else if (req.type == Requirement.RequirementType.factionScore || req.type == Requirement.RequirementType.factionScoreEquals) {
label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon()));
}
if (req.type == null) {
Expand Down
5 changes: 5 additions & 0 deletions src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,11 @@ public void updateRequirementParamsPane(JPanel pane, Requirement requirement, Fi
requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener);
break;
case factionScoreEquals:
requirementObj = null;
requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
requirementValue = addIntegerField(pane, "Exact value: ", requirement.required_value, true, writable, listener);
break;
case wear:
requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
requirementObjId = null;
Expand Down