diff --git a/Server/src/main/content/minigame/barbassault/BarbassBlackBoard.kt b/Server/src/main/content/minigame/barbassault/BarbassBlackBoard.kt index de7a09272..fad979e56 100644 --- a/Server/src/main/content/minigame/barbassault/BarbassBlackBoard.kt +++ b/Server/src/main/content/minigame/barbassault/BarbassBlackBoard.kt @@ -54,12 +54,12 @@ class BarbassBlackBoard { 4 -> "Lure range 10" else -> " - Mastered - " } - - BarbRole.COLLECTOR -> when (level) { //is this the right info for 2009? - 1 -> "Bag holds 4 eggs" - 2 -> "Bag holds 6 eggs" - 3 -> "Bag holds 7 eggs" - 4 -> "Bag holds 8 eggs" + //https://youtu.be/wb1InggbaZc?t=57 + BarbRole.COLLECTOR -> when (level) { + 1 -> "Egg convert success 20%" + 2 -> "Egg convert success 40%" + 3 -> "Egg convert success 60%" + 4 -> "Egg convert success 80%" else -> " - Mastered - " } diff --git a/Server/src/main/content/minigame/barbassault/BarbassaultListeners.kt b/Server/src/main/content/minigame/barbassault/BarbassaultListeners.kt index a7a63fda7..6d8bdd8dc 100644 --- a/Server/src/main/content/minigame/barbassault/BarbassaultListeners.kt +++ b/Server/src/main/content/minigame/barbassault/BarbassaultListeners.kt @@ -25,7 +25,6 @@ class BarbassaultListeners : InteractionListener { on(Scenery.LADDER_20226, IntType.SCENERY, "Climb-down") { player, _ -> // if (GameWorld.settings?.enable_barbassault != true) return@on false //todo players are allowed to wear capes in to the lobby, But not the Wave Rooms - //todo No summonings in lobby if (joinError(player)) return@on true val loc = Location(2593 , 5261 ) ClimbActionHandler.climb(player, ClimbActionHandler.CLIMB_DOWN, loc) @@ -49,8 +48,6 @@ class BarbassaultListeners : InteractionListener { } on(NPCs.COMMANDER_CONNAD_5029, IntType.NPC, "Get-rewards") { player, _ -> - //todo remove this varbit? I think I was testing. - setVarbit(player, 3256, 200) player.interfaceManager.open(Component(Components.BARBASSAULT_REWARD_SHOP_491)) return@on true } @@ -81,6 +78,7 @@ class BarbassaultListeners : InteractionListener { Items.SOUL_RUNE_566, Items.NATURE_RUNE_561 //todo extend not allowed items list. + //no Logs //add food //add ammo //summoning pouches @@ -91,7 +89,7 @@ class BarbassaultListeners : InteractionListener { if (item != null) { if (item.id in forbiddenRunes) { //todo find source for this message - return "You cannot take your own runes, ammunition, or potions into the game." + return "The barbarians do not allow outside food or runes." } } } @@ -100,7 +98,7 @@ class BarbassaultListeners : InteractionListener { private fun familiarCheck(player: Player): String? { if(player.familiarManager.hasFamiliar()) { //todo find correct message - return "You cannot take your follower into the game." + return "The barbarians do not allow followers." } return null } diff --git a/Server/src/main/content/minigame/barbassault/arena/BarbassaultGameArea.kt b/Server/src/main/content/minigame/barbassault/arena/BarbassaultGameArea.kt index 49fff3566..491b04079 100644 --- a/Server/src/main/content/minigame/barbassault/arena/BarbassaultGameArea.kt +++ b/Server/src/main/content/minigame/barbassault/arena/BarbassaultGameArea.kt @@ -323,7 +323,7 @@ fun exitMiniGame(player: Player) { // removeAll(player, barbassItems) // region.clean - //todo should probably make sure familiars can't smuggle items out + //todo should probably make sure familiars can't smuggle items out even if they are "not" allowed to be summoned //(player.familiarManager.familiar as? BurdenBeast)?.container?.removeAll(barbassItems)//just in case someone smuggles a pet in. //award points, set Tp location to next wave //or lost game Send back to wave room diff --git a/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt b/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt index 091a34714..beee22fb2 100644 --- a/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt +++ b/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt @@ -284,7 +284,7 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi var player = entity as Player //exitMiniGame(player) removeTimer(player, "teleblock") - zone.cleanItems(player,ALL_BARBASS_ITEMS)//region.remove(player) + zone.cleanItems(player,ALL_BARBASS_ITEMS) clearLogoutListener(player, "ba-logout") player.fullRestore() diff --git a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt index 327a32f02..20ae5cba1 100644 --- a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt +++ b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt @@ -1,6 +1,7 @@ package content.minigame.barbassault.arena.scenery import content.minigame.barbassault.arena.BaHornSystem +import content.minigame.barbassault.getBarbLevels import core.api.EquipmentSlot import core.api.addItem import core.api.getItemFromEquipment @@ -100,8 +101,7 @@ class ItemMachine: InteractionListener { } //Collector// on(Scenery.COLLECTOR_CONVERTER_21250, IntType.SCENERY, "Convert") { player, _ -> - val bagLevel = BaHornSystem.HornHelper.getCollectorBag(player) - //todo get players collector level instead of bag level. + val collectorLevel = player.getBarbLevels().col if (!hasCape(player, COLLECTOR_ICON)) return@on true //Items.RED_EGG_10532 diff --git a/Server/src/main/content/minigame/barbassault/lobby/BarbassQuickWaveActivity.kt b/Server/src/main/content/minigame/barbassault/lobby/BarbassQuickWaveActivity.kt index f19ed15fa..203440376 100644 --- a/Server/src/main/content/minigame/barbassault/lobby/BarbassQuickWaveActivity.kt +++ b/Server/src/main/content/minigame/barbassault/lobby/BarbassQuickWaveActivity.kt @@ -78,7 +78,7 @@ open class BarbassQuickWaveActivity : ActivityPlugin("BarbassQuickWave",false, f } return true } - + //todo Make Game Start Faster once a team is created. private fun createQuickTeam(players: List) { // if(player == null) {removeQuickQue(player);return} var teamLeader: Player? = null @@ -173,7 +173,7 @@ open class BarbassQuickWaveActivity : ActivityPlugin("BarbassQuickWave",false, f if (role == null) waitingAnyCount++ else waitingRoleCounts[role] = waitingRoleCounts.getValue(role) + 1 - //todo find authentic message for Quick Start Wave BarbAssault + //todo find authentic message for Quick Start Wave BarbAssault, If there even is one. val roleText = role?.name ?: "ANY" sendMessage(player, "You've joined the queue as ${roleText.lowercase().replaceFirstChar { it.uppercase() }}.") refreshQuickWaveOverlay() diff --git a/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt b/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt index 072cb0abb..833b77bf7 100644 --- a/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt +++ b/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt @@ -91,6 +91,7 @@ class BarbassaultLobby : InteractionListener, MapArea { val team = session?.team if (team == null) { + //todo remove or correct message leader.sendMessage("No active session found.") return@onUseWithPlayer false } @@ -163,8 +164,7 @@ class BarbassaultLobby : InteractionListener, MapArea { return@on true } on(Scenery.DOOR_20209, IntType.SCENERY, "Pass") { player, node -> - //todo find authentic message no capes - // if (capeCheck(player)) { sendMessage(player,"Your not allowed to wear capes."); return@on true } + if (capeCheck(player)) { return@on false } //todo Not allowed to enter QuickStart with Scroll if (!QUICK_START.insideBorder(player.location)){ player.setAttribute("/save:barbass:wave", 1) diff --git a/Server/src/main/content/minigame/barbassault/lobby/CurrentTeamInterface.kt b/Server/src/main/content/minigame/barbassault/lobby/CurrentTeamInterface.kt index ad77c5e32..65d029fa5 100644 --- a/Server/src/main/content/minigame/barbassault/lobby/CurrentTeamInterface.kt +++ b/Server/src/main/content/minigame/barbassault/lobby/CurrentTeamInterface.kt @@ -16,6 +16,7 @@ import core.plugin.Plugin import org.rs09.consts.Items @Initializable +//not used delete this plugin latter class CurrentTeamInterface : ComponentPlugin() { override fun newInstance(arg: Any?): Plugin { ComponentDefinition.forId(CurrentTeam.ID).plugin = this