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

Provision to reward player on quest completion #14

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/main/java/org/terasology/tasks/DefaultQuest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package org.terasology.tasks;

import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.inventory.StartingInventoryComponent;

import java.util.List;

/**
*
Expand All @@ -26,12 +29,14 @@ public class DefaultQuest implements Quest {
private final String description;
private final TaskGraph tasks;
private final EntityRef entity;
private final List<StartingInventoryComponent.InventoryItem> reward;

public DefaultQuest(EntityRef entity, String shortName, String description, TaskGraph tasks) {
public DefaultQuest(EntityRef entity, String shortName, String description, TaskGraph tasks, List<StartingInventoryComponent.InventoryItem> reward) {
this.entity = entity;
this.shortName = shortName;
this.description = description;
this.tasks = tasks;
this.reward = reward;
}

@Override
Expand All @@ -54,6 +59,11 @@ public TaskGraph getTaskGraph() {
return tasks;
}

@Override
public List<StartingInventoryComponent.InventoryItem> getReward() {
return reward;
}

/**
* The quest fails if any task failed. Otherwise, the quest is active if any task is active. Otherwise,
* the quest has completed successfully.
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/terasology/tasks/Quest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package org.terasology.tasks;

import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.inventory.StartingInventoryComponent;

import java.util.List;

public interface Quest {

Expand All @@ -42,4 +45,10 @@ public interface Quest {
* @return the target entity for this quest
*/
EntityRef getEntity();

/**
*
* @return the reward attached to this quest
*/
List<StartingInventoryComponent.InventoryItem> getReward();
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
package org.terasology.tasks.components;

import org.terasology.entitySystem.Component;
import org.terasology.logic.inventory.StartingInventoryComponent;
import org.terasology.tasks.TaskGraph;

import java.util.List;

public class QuestComponent implements Component {
public String shortName;
public String description;
public TaskGraph tasks;
public List<StartingInventoryComponent.InventoryItem> reward;
}
32 changes: 23 additions & 9 deletions src/main/java/org/terasology/tasks/systems/QuestSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@

package org.terasology.tasks.systems;

import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Collections2;
import com.google.common.collect.ListMultimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.entitySystem.entity.EntityRef;
Expand All @@ -29,6 +27,9 @@
import org.terasology.entitySystem.systems.RegisterMode;
import org.terasology.entitySystem.systems.RegisterSystem;
import org.terasology.logic.common.ActivateEvent;
import org.terasology.logic.inventory.ItemCommands;
import org.terasology.logic.inventory.StartingInventoryComponent;
import org.terasology.registry.In;
import org.terasology.registry.Share;
import org.terasology.tasks.DefaultQuest;
import org.terasology.tasks.Quest;
Expand All @@ -41,9 +42,10 @@
import org.terasology.tasks.events.StartTaskEvent;
import org.terasology.tasks.events.TaskCompletedEvent;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Collections2;
import com.google.common.collect.ListMultimap;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;

/**
* This controls the main logic of the quest, and defines what to do with a "quest card"
Expand All @@ -54,6 +56,9 @@ public class QuestSystem extends BaseComponentSystem {

private static final Logger logger = LoggerFactory.getLogger(QuestSystem.class);

@In
private ItemCommands commands;

private final ListMultimap<EntityRef, Quest> quests = ArrayListMultimap.create();
private final Collection<Quest> activeQuestView = Collections2.filter(quests.values(),
quest -> quest.getStatus() == Status.ACTIVE);
Expand All @@ -70,7 +75,7 @@ public void onActivate(ActivateEvent event, EntityRef questItem) {
if (!beforeQuestEvent.isConsumed()) {
TaskGraph taskGraph = questComp.tasks;

DefaultQuest quest = new DefaultQuest(entity, questComp.shortName, questComp.description, taskGraph);
DefaultQuest quest = new DefaultQuest(entity, questComp.shortName, questComp.description, taskGraph, questComp.reward);
quests.put(entity, quest);

for (Task task : taskGraph) {
Expand Down Expand Up @@ -100,6 +105,15 @@ public void onTaskComplete(TaskCompletedEvent event, EntityRef entity) {
}
}

@ReceiveEvent
public void reward(QuestCompleteEvent event, EntityRef entity) {
Quest quest = event.getQuest();
List<StartingInventoryComponent.InventoryItem> rewards = quest.getReward();
for (StartingInventoryComponent.InventoryItem item : rewards) {
commands.give(entity, item.uri, item.quantity, null);
}
}

/**
* @return an unmodifiable map of all known quests.
*/
Expand Down