-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Shooting Star Distractions and Diversion (#458)
* Add Crashed star objects to objects.yml * Add xp value & mining chance to stardust in item.yml * Add various locations for Crashed Stars in StarLocationData class * Add star_sprite to npcs yml. * Add examine text to crashed_star objects in objects yml. * Add Prospecting crashed stars that will display progress to the next layer. * Add rewards when the star is completed, converting stardust to coins, astral runes, cosmic runes and gold ore. inline with runescape * Add dialog to star sprite after star completion * Add check to mining to make sure that a player doesn't exceed 200 stardust in inventory and bank (a player will still gain experience) * Add shooting_star_shadow to npcs yml * Change some star `collect_for_next_layer` values, forgot to change them from testing * Add Star shadow moving to crashing tile before star spawning (missing crashing animation) * Add check to `mining.kts` if the player is the first to mine the star they will be granted `(miningLevel * 75)` inline with runescape. * Add Fall in star object to `objects.yml` * Add replacing falling star object with crashed star object * Add player animation when moved due to being under a crashing star * Change code formatting Intelij plugin formats code that doesn't follow Voids code format * Add "step_back_startled" animation to `animation.yml` * Add various sounds for `Star Falling`, `Star despawning`, `Star changing tier`, `Star Sprite spawning` * Fix force movement --------- Co-authored-by: GregHib <[email protected]>
- Loading branch information
1 parent
8e9d403
commit 074840b
Showing
11 changed files
with
383 additions
and
19 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
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
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
190 changes: 190 additions & 0 deletions
190
game/src/main/kotlin/world/gregs/voidps/world/activity/dnd/shootingstar/ShootingStar.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,190 @@ | ||
| package world.gregs.voidps.world.activity.dnd.shootingstar | ||
|
|
||
| import com.github.michaelbull.logging.InlineLogger | ||
| import world.gregs.voidps.engine.client.message | ||
| import world.gregs.voidps.engine.client.ui.chat.plural | ||
| import world.gregs.voidps.engine.client.variable.start | ||
| import world.gregs.voidps.engine.data.definition.data.Rock | ||
| import world.gregs.voidps.engine.entity.World | ||
| import world.gregs.voidps.engine.entity.character.forceWalk | ||
| import world.gregs.voidps.engine.entity.character.mode.interact.Interact | ||
| import world.gregs.voidps.engine.entity.character.move.walkTo | ||
| import world.gregs.voidps.engine.entity.character.npc.NPC | ||
| import world.gregs.voidps.engine.entity.character.npc.NPCs | ||
| import world.gregs.voidps.engine.entity.character.npc.npcOperate | ||
| import world.gregs.voidps.engine.entity.character.player.Player | ||
| import world.gregs.voidps.engine.entity.character.player.Players | ||
| import world.gregs.voidps.engine.entity.character.player.chat.ChatType | ||
| import world.gregs.voidps.engine.entity.character.player.skill.Skill | ||
| import world.gregs.voidps.engine.entity.character.setAnimation | ||
| import world.gregs.voidps.engine.entity.obj.* | ||
| import world.gregs.voidps.engine.entity.objectDespawn | ||
| import world.gregs.voidps.engine.entity.worldSpawn | ||
| import world.gregs.voidps.engine.inject | ||
| import world.gregs.voidps.engine.inv.add | ||
| import world.gregs.voidps.engine.inv.inventory | ||
| import world.gregs.voidps.engine.inv.remove | ||
| import world.gregs.voidps.engine.map.collision.blocked | ||
| import world.gregs.voidps.engine.queue.softQueue | ||
| import world.gregs.voidps.engine.timer.timerStart | ||
| import world.gregs.voidps.engine.timer.toTicks | ||
| import world.gregs.voidps.type.Direction | ||
| import world.gregs.voidps.type.Tile | ||
| import world.gregs.voidps.type.random | ||
| import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.currentActiveObject | ||
| import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.currentStarTile | ||
| import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.startEvent | ||
| import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.totalCollected | ||
| import world.gregs.voidps.world.interact.dialogue.Cheerful | ||
| import world.gregs.voidps.world.interact.dialogue.Sad | ||
| import world.gregs.voidps.world.interact.dialogue.type.npc | ||
| import world.gregs.voidps.world.interact.entity.combat.hit.damage | ||
| import world.gregs.voidps.world.interact.entity.sound.areaSound | ||
| import java.util.concurrent.TimeUnit | ||
| import kotlin.math.roundToInt | ||
|
|
||
| val objects: GameObjects by inject() | ||
| val npcs: NPCs by inject() | ||
| val players: Players by inject() | ||
| val logger = InlineLogger() | ||
|
|
||
| worldSpawn { eventUpdate() } | ||
|
|
||
| fun eventUpdate() { | ||
| World.queue("shooting_star_event_timer", startEvent) { | ||
| if (currentStarTile != Tile.EMPTY) { | ||
| cleanseEvent(true) | ||
| logger.info { "There was already an active star, deleted it and started a new event" } | ||
| } | ||
| startCrashedStarEvent() | ||
| eventUpdate() | ||
| } | ||
| } | ||
|
|
||
| fun startCrashedStarEvent() { | ||
| val location = StarLocationData.entries.random() | ||
| currentStarTile = location.tile | ||
| val tier = random.nextInt(1, 9) | ||
| logger.info { "Crashed star event has started at: $location (${currentStarTile.x}, ${currentStarTile.y}) tier ${tier}." } | ||
| val shootingStarShadow: NPC? = npcs.add("shooting_star_shadow", Tile(currentStarTile.x, currentStarTile.y + 6), Direction.NONE) | ||
| shootingStarShadow?.walkTo(currentStarTile, noCollision = true, noRun = true) | ||
| areaSound("star_meteor_falling", currentStarTile, radius = 15, delay = 20) | ||
| World.queue("awaiting_shadow_walk", 6) { | ||
| val shootingStarObjectFalling: GameObject = objects.add("crashed_star_falling_object", currentStarTile) | ||
| val under = mutableListOf<Player>() | ||
| for (tile in currentStarTile.toCuboid(2, 2)) { | ||
| for (player in players[tile]) { | ||
| under.add(player) | ||
| } | ||
| } | ||
| for (player in under) { | ||
| player.damage(random.nextInt(10, 50)) | ||
| val direction = Direction.all.first { !player.blocked(it) } | ||
| player.forceWalk(direction.delta, 1, direction = direction.inverse()) | ||
| player.setAnimation("step_back_startled") | ||
| } | ||
| World.queue("falling_star_object_removal", 1) { | ||
| currentActiveObject = shootingStarObjectFalling.replace("crashed_star_tier_${tier}") | ||
| npcs.remove(shootingStarShadow) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun cleanseEvent(forceStopped: Boolean) { | ||
| currentActiveObject?.let { current -> objects[currentStarTile, current.id] }?.remove() | ||
| if (!forceStopped) { | ||
| areaSound("star_sprite_appear", currentStarTile, radius = 10) | ||
| val starSprite = npcs.add("star_sprite", currentStarTile, Direction.NONE, 0) | ||
| World.queue("start_sprite_despawn_timer", TimeUnit.MINUTES.toTicks(10)) { | ||
| npcs.remove(starSprite) | ||
| } | ||
| } | ||
| totalCollected = 0 | ||
| currentStarTile = Tile.EMPTY | ||
| currentActiveObject = null | ||
| ShootingStarHandler.earlyBird = false | ||
| } | ||
|
|
||
| fun getLayerPercentage(totalCollected: Int, totalNeeded: Int): String { | ||
| val remaining = totalNeeded - totalCollected | ||
| val percentageRemaining = (remaining.toDouble() / totalNeeded.toDouble()) * 100 | ||
| return String.format("%.2f", percentageRemaining) | ||
| } | ||
|
|
||
| fun calculateRewards(stardust: Int): Map<String, Int> { | ||
| val coinsPerStardust = 50002.0 / 200 | ||
| val astralRunesPerStardust = 52.0 / 200 | ||
| val cosmicRunesPerStardust = 152.0 / 200 | ||
| val goldOresPerStardust = 20.0 / 200 | ||
|
|
||
| val coins = (coinsPerStardust * stardust).toInt() | ||
| val astralRunes = (astralRunesPerStardust * stardust).roundToInt() | ||
| val cosmicRunes = (cosmicRunesPerStardust * stardust).roundToInt() | ||
| val goldOres = (goldOresPerStardust * stardust).roundToInt() | ||
|
|
||
| return mapOf( | ||
| "coins" to coins, | ||
| "astral_rune" to astralRunes, | ||
| "cosmic_rune" to cosmicRunes, | ||
| "gold_ore_noted" to goldOres | ||
| ) | ||
| } | ||
|
|
||
| objectDespawn("shooting_star_tier_1") { | ||
| areaSound("star_meteor_despawn", it.tile, radius = 15) | ||
| cleanseEvent(false) | ||
| } | ||
|
|
||
| timerStart("mining") { player -> | ||
| val target = (player.mode as? Interact)?.target as GameObject | ||
| val isStar = target.id.startsWith("crashed_star") | ||
| if (isStar) { | ||
| val isEarlyBird = ShootingStarHandler.isEarlyBird() | ||
| if (isEarlyBird) { | ||
| player.message("Congratulations!, You were the first person to find this star!") | ||
| val xpToAdd: Double = player.levels.get(Skill.Mining) * 75.0 | ||
| player.experience.add(Skill.Mining, xpToAdd) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| objectApproach("Prospect", "crashed_star_tier_#") { | ||
| if (player.queue.contains("prospect")) { | ||
| return@objectApproach | ||
| } | ||
| val starPayout = target.def["collect_for_next_layer", -1] | ||
| player.message("You examine the crashed star...") | ||
| player.start("movement_delay", 4) | ||
| player.softQueue("prospect", 4) { | ||
| val star = def.getOrNull<Rock>("mining")?.ores?.firstOrNull() | ||
| if (star == null) { | ||
| player.message("Star has been mined...") | ||
| } else if (starPayout != -1) { | ||
| val percentageCollected = getLayerPercentage(totalCollected, starPayout) | ||
| player.message("There is $percentageCollected% left of this layer.") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| npcOperate("Talk-to", "star_sprite") { | ||
| npc<Cheerful>("Thank you for helping me out of here") | ||
| val starDustCount = player.inventory.count("stardust") | ||
| if (player.inventory.isFull()) { | ||
| player.message("Inventory full. To make more room, sell, drop or bank something.", ChatType.Game) | ||
| } else if (starDustCount == 0) { | ||
| npc<Sad>("You don't seem to have any stardust that I can exchange for a reward") | ||
| } else if (starDustCount > 0) { | ||
| val rewards = calculateRewards(starDustCount) | ||
| player.inventory.remove("stardust", starDustCount) | ||
| val messageBuilder = StringBuilder("Also, ") | ||
| rewards.entries.forEachIndexed { index, (reward, amount) -> | ||
| player.inventory.add(reward, amount) | ||
| if (index == 0) { | ||
| messageBuilder.append("have $amount $reward") | ||
| } else { | ||
| messageBuilder.append(", $amount ${reward.replace("_", " ").replace("noted", "").plural(amount)}") | ||
| } | ||
| } | ||
| npc<Cheerful>("I have rewarded you by making it so you can mine extra ore for the next 15 minutes, ${messageBuilder}.") | ||
| } | ||
| } |
Oops, something went wrong.