Skip to content

Repeatable quests #5

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
DelvalletQuentin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Repeatable quests #5

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
6 changes: 5 additions & 1 deletion src/com/gpl/rpg/atcontentstudio/model/gamedata/Dialogue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ public enum RewardType {
removeSpawnArea,
deactivateSpawnArea,
activateMapChangeArea,
deactivateMapChangeArea
deactivateMapChangeArea,
removeQuestProgress
}
}

Expand Down Expand Up @@ -270,6 +271,9 @@ public void link() {
case skillIncrease:
//Nothing to do (yet ?).
break;
case removeQuestProgress:
reward.reward_obj = proj.getQuest(reward.reward_obj_id);
break;
}
if (reward.reward_obj != null) reward.reward_obj.addBacklink(this);
if (reward.map != null) reward.map.addBacklink(this);
Expand Down
3 changes: 2 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 @@ -53,7 +53,8 @@ public enum RequirementType {
usedItem,
spentGold,
consumedBonemeals,
hasActorCondition
hasActorCondition,
removeQuestProgress
}

@Override
Expand Down
16 changes: 15 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 @@ -372,7 +372,12 @@ public void updateRewardsParamsEditorPane(final JPanel pane, final Dialogue.Rewa
rewardObj = null;
rewardValue = null;
break;

case removeQuestProgress:
rewardMap = null;
rewardObjId = null;
rewardObj = addQuestBox(pane, ((Dialogue)target).getProject(), "Quest: ", (Quest) reward.reward_obj, writable, listener);
rewardValue = addIntegerField(pane, "Step ID: ", reward.reward_value, false, writable, listener);;
break;
}
}
pane.revalidate();
Expand Down Expand Up @@ -637,6 +642,11 @@ public void updateRequirementParamsEditorPane(final JPanel pane, final Requireme
requirementObjId = null;
requirementValue = null;
break;
case removeQuestProgress:
requirementObj = addQuestBox(pane, project, "Quest: ", (Quest) requirement.required_obj, writable, listener);
requirementObjId = null;
requirementValue = addIntegerField(pane, "Quest stage: ", requirement.required_value, false, writable, listener);
break;
}
requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
}
Expand Down Expand Up @@ -765,6 +775,10 @@ public Component getListCellRendererComponent(JList list, Object value, int inde
case spawnAll:
label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
break;
case removeQuestProgress:
label.setText("Remove quest progress "+rewardObjDesc+":"+reward.reward_value);
if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
break;
}
} else {
label.setText("New, undefined reward");
Expand Down