Skip to content

Commit 6714df7

Browse files
committed
feat: start birch park mission and use options properly
1 parent 2e9411d commit 6714df7

3 files changed

Lines changed: 13 additions & 2 deletions

File tree

type.hub/src/main/java/net/swofty/type/hub/npcs/NPCLumberJack.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void onClick(NPCInteractEvent e) {
6161
new NPCOption.Option(
6262
"r_2_1",
6363
NamedTextColor.GREEN,
64+
false,
6465
"Sure",
6566
(p) -> {
6667
setDialogue(p, "option-accept").thenRun(() -> {
@@ -71,6 +72,7 @@ public void onClick(NPCInteractEvent e) {
7172
new NPCOption.Option(
7273
"r_2_2",
7374
NamedTextColor.RED,
75+
false,
7476
"Nah, I'm good",
7577
(p) -> {
7678
setDialogue(player, "option-nah");
@@ -87,7 +89,7 @@ public void onClick(NPCInteractEvent e) {
8789
if (!data.hasCompleted(MissionTalkToLumberjackAgain.class)) {
8890
setDialogue(player, "spoke-again").thenRun(() -> {
8991
new GUIClaimReward(ItemType.PROMISING_AXE, () -> {
90-
92+
data.endMission(MissionTalkToLumberjackAgain.class);
9193
}).open(player);
9294
});
9395
return;

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/lumber/MissionTalkToLumberjackAgain.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.swofty.commons.skyblock.item.ItemType;
44
import net.swofty.type.skyblockgeneric.mission.MissionData;
55
import net.swofty.type.skyblockgeneric.mission.SkyBlockMission;
6+
import net.swofty.type.skyblockgeneric.mission.missions.thepark.MissionTravelToThePark;
67
import net.swofty.type.skyblockgeneric.region.RegionType;
78
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
89

@@ -30,6 +31,7 @@ public Map<String, Object> onStart(SkyBlockPlayer player, MissionData.ActiveMiss
3031
@Override
3132
public void onEnd(SkyBlockPlayer player, Map<String, Object> customData, MissionData.ActiveMission mission) {
3233
player.addAndUpdateItem(ItemType.PROMISING_AXE);
34+
player.getMissionData().startMission(MissionTravelToThePark.class);
3335
}
3436

3537
@Override

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/thepark/MissionTalkToCharlie.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package net.swofty.type.skyblockgeneric.mission.missions.thepark;
22

3+
import net.minestom.server.coordinate.Pos;
4+
import net.swofty.type.skyblockgeneric.mission.LocationAssociatedMission;
35
import net.swofty.type.skyblockgeneric.mission.MissionData;
46
import net.swofty.type.skyblockgeneric.mission.SkyBlockMission;
57
import net.swofty.type.skyblockgeneric.region.RegionType;
@@ -8,7 +10,7 @@
810
import java.util.Map;
911
import java.util.Set;
1012

11-
public class MissionTalkToCharlie extends SkyBlockMission {
13+
public class MissionTalkToCharlie extends SkyBlockMission implements LocationAssociatedMission {
1214

1315
@Override
1416
public String getID() {
@@ -35,4 +37,9 @@ public void onEnd(SkyBlockPlayer player, Map<String, Object> customData, Mission
3537
public Set<RegionType> getValidRegions() {
3638
return Set.of(RegionType.BIRCH_PARK);
3739
}
40+
41+
@Override
42+
public Pos getLocation() {
43+
return new Pos(-277.500, 80.000, -17.500);
44+
}
3845
}

0 commit comments

Comments
 (0)