-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* druidic ritual quest * added gudrun hug to gunnars ground quest * Add suits of armour to taverley dungeon * Fix forced positioning when entering through double doors * Convert Al Kharid tollgate to use Doors --------- Co-authored-by: GregHib <[email protected]>
- Loading branch information
Showing
14 changed files
with
620 additions
and
61 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1799,3 +1799,4 @@ wolves_attack: 6559 | |
| wolves_death: 6558 | ||
| run_replenish: 9988 | ||
| play_organ: 3675 | ||
| gudrun_hugging: 14733 | ||
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
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
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
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
38 changes: 38 additions & 0 deletions
38
game/src/main/kotlin/world/gregs/voidps/world/activity/quest/DruidicRitual.kts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package world.gregs.voidps.world.activity.quest | ||
|
|
||
| import world.gregs.voidps.engine.client.ui.interfaceSlot | ||
|
|
||
| interfaceSlot(component = "journals", id = "quest_journals", itemSlot = 33) { | ||
| val lines = when (player.quest("druidic_ritual")) { | ||
| "completed" -> listOf( | ||
| "<str>I told Kaqemeex I would help them prepare their ceremony", | ||
| "<str>The ceremony required various meats being placed in the", | ||
| "<str>Cauldron of Thunder. I did this and gave them to Sanfew.", | ||
| "<str>Kaqemeex then tought me the basics of the skill Herblore.", | ||
| "", | ||
| "<red>QUEST COMPLETE!", | ||
| "" | ||
| ) | ||
| "started" -> listOf( | ||
| "<str>I told Kaqemeex I would help them prepare their ceremony", | ||
| "<navy>I should speak to <maroon>Sanfew <navy>in the village to the <maroon>South" | ||
| ) | ||
| "cauldron" -> listOf( | ||
| "<str>I told Kaqemeex I would help them prepare their ceremony", | ||
| "", | ||
| "<maroon>Sanfew <navy>told me for the ritual they would need me to place", | ||
| "<maroon>raw bear meat<navy>, <maroon>raw chicken<navy>, <maroon>raw rat meat <navy>and <maroon>raw beef <navy>in", | ||
| "<navy>the <maroon>Cauldron of Thunder <navy>in the <maroon>dungeon South <navy>of <maroon>Taverley" | ||
| ) | ||
| "kaqemeex" -> listOf( | ||
| "<str>I told Kaqemeex I would help them prepare their ceremony", | ||
| "<str>The ceremony required various meats being placed in the", | ||
| "<str>Cauldron of Thunder. I did this and gave them to Sanfew.", | ||
| "<navy>I should speak to <maroon>Kaqemeex <navy>again and claim my <maroon>reward" | ||
| ) | ||
| else -> listOf( | ||
| "<navy>I can start this quest by talking to <maroon>Kaqemeex <navy>at the<maroon> Taverley Stone Circle." | ||
| ) | ||
| } | ||
| player.sendQuestJournal("Druidic Ritual", lines) | ||
| } |
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
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
104 changes: 104 additions & 0 deletions
104
game/src/main/kotlin/world/gregs/voidps/world/map/ManAndWoman.kts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package world.gregs.voidps.world.map | ||
|
|
||
| import world.gregs.voidps.engine.entity.character.mode.interact.Interact | ||
| import world.gregs.voidps.engine.entity.character.npc.npcOperate | ||
| import world.gregs.voidps.engine.entity.character.player.PlayerOption | ||
| import world.gregs.voidps.engine.entity.item.floor.FloorItems | ||
| import world.gregs.voidps.engine.inject | ||
| import world.gregs.voidps.engine.inv.add | ||
| import world.gregs.voidps.engine.inv.inventory | ||
| import world.gregs.voidps.type.random | ||
| import world.gregs.voidps.world.interact.dialogue.* | ||
| import world.gregs.voidps.world.interact.dialogue.type.choice | ||
| import world.gregs.voidps.world.interact.dialogue.type.npc | ||
| import world.gregs.voidps.world.interact.dialogue.type.player | ||
|
|
||
| val floorItems: FloorItems by inject() | ||
|
|
||
| npcOperate("Talk-to", "man", "woman") { | ||
| player<Happy>("Hello, how's it going?") | ||
| when (random.nextInt(0, 23)) { | ||
| 0 -> { | ||
| npc<Neutral>("Not too bad, but I'm a little worried about the increase of goblins these days.") | ||
| player<Happy>("Don't worry, I'll kill them.") | ||
| } | ||
| 1 -> { | ||
| npc<Neutral>("How can I help you?") | ||
| choice { | ||
| option<Neutral>("Do you wish to trade?") { | ||
| npc<Neutral>("No, I have nothing I wish to get rid of. If you want to do some trading, there are plenty of shops and market stalls around though.") | ||
| } | ||
| option<Happy>("I'm in search of a quest.") { | ||
| npc<Neutral>("I'm sorry I can't help you there.") | ||
| } | ||
| option<Neutral>("I'm in search of enemies to kill.") { | ||
| npc<Neutral>("I've heard there are many fearsome creatures that dwell under the ground...") | ||
| } | ||
| } | ||
| } | ||
| 2 -> npc<Angry>("Get out of my way, I'm in a hurry!") | ||
| 3 -> { | ||
| npc<Happy>("I'm fine, how are you?") | ||
| player<Happy>("Very well thank you.") | ||
| } | ||
| 4 -> npc<Happy>("Hello there! Nice weather we've been having.") | ||
| 5 -> npc<Happy>("I'm very well thank you.") | ||
| 6 -> { | ||
| npc<Uncertain>("Who are you?") | ||
| player<Happy>("I'm a bold adventurer.") | ||
| npc<Happy>("Ah, a very noble profession.") | ||
| } | ||
| 7 -> npc<Uncertain>("Do I know you? I'm in a hurry!") | ||
| 8 -> npc<Neutral>("I think we need a new king. The one we've got isn't very good.") | ||
| 9 -> npc<Happy>("Not too bad thanks.") | ||
| 10 -> { | ||
| npc<Angry>("Are you asking for a fight?") | ||
| target.mode = Interact(target, player, PlayerOption(target, player, "Attack")) | ||
| } | ||
| 11 -> npc<Neutral>("I'm busy right now.") | ||
| 12 -> npc<Happy>("Hello.") | ||
| 13 -> npc<Angry>("None of your business.") | ||
| 14 -> { | ||
| player<Neutral>("Do you wish to trade?") | ||
| npc<Neutral>("No, I have nothing I wish to get rid of. If you want to do some trading, there are plenty of shops and market stalls around though.") | ||
| } | ||
| 15 -> { | ||
| player<Happy>("I'm in search of a quest.") | ||
| npc<Neutral>("I'm sorry I can't help you there.") | ||
| } | ||
| 16 -> { | ||
| player<Neutral>("I'm in search of enemies to kill.") | ||
| npc<Neutral>("I've heard there are many fearsome creatures that dwell under the ground...") | ||
| } | ||
| 17 -> npc<Uncertain>("No I don't have any spare change.") | ||
| 18 -> npc<Neutral>("I'm a little worried - I've heard there's lots of people going about, killing citizens at random.") | ||
| 19 -> npc<Angry>("No, I don't want to buy anything!") | ||
| 20 -> npc<Neutral>("That is classified information.") | ||
| 21 -> { | ||
| npc<Happy>("Have this flyer...") | ||
| if (player.inventory.isFull()) { | ||
| floorItems.add(player.tile, "flier", disappearTicks = 300, owner = player) | ||
| } else { | ||
| player.inventory.add("flier") | ||
| } | ||
| } | ||
| 22 -> npc<Happy>("Yo, wassup!") | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
Oops, something went wrong.