2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2026-08-21 18:35:11 -06:00
Code Issues Projects Releases Packages Wiki Activity

EggHopper / EggCannon Naming.

Browse source
This commit is contained in:
Tooze 2026-05-16 21:30:51 -04:00
parent cc5d74a557
commit ab3c9fcc4d
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Server/src/main/content/minigame/barbassault/arena/BarbassaultGameArea.kt
View file

@ -4,10 +4,10 @@ import content.minigame.barbassault.BarbRole
import content.minigame.barbassault.BarbassaultTut
import content.minigame.barbassault.arena.BaHornSystem.HornHelper.getHealerHorn
import content.minigame.barbassault.arena.BarbassaultSession.AttackerStyle
import content.minigame.barbassault.arena.scenery.EggHopper
import content.minigame.barbassault.arena.scenery.EggHopper.Companion.loadEggHopper
import content.minigame.barbassault.arena.scenery.EggHopper.Companion.loadHopperEggs
import content.minigame.barbassault.arena.scenery.EggHopper.Companion.showEggHopperCount
import content.minigame.barbassault.arena.scenery.EggCannon
import content.minigame.barbassault.arena.scenery.EggCannon.Companion.loadEggHopper
import content.minigame.barbassault.arena.scenery.EggCannon.Companion.loadHopperEggs
import content.minigame.barbassault.arena.scenery.EggCannon.Companion.showEggHopperCount
import content.minigame.barbassault.baSession
import content.minigame.barbassault.getBarbLevels
import content.minigame.barbassault.isBAHealer
@ -102,7 +102,7 @@ class BarbassaultGameArea : InteractionListener, MapArea {
override fun defineListeners() {
//Wrong food message "That's the wrong type of poisoned food to use! Penalty!"
on(Scenery.EGG_LAUNCHER_20133, IntType.SCENERY, "Shoot") { player, node ->
EggHopper.openTurretIface(player)
EggCannon.openTurretIface(player)
return@on true
}
on(Scenery.EGG_HOPPER_20264, IntType.SCENERY, "Load","Look-in") { player, node ->
@ -115,7 +115,7 @@ class BarbassaultGameArea : InteractionListener, MapArea {
player.faceLocation(location(loc.x,loc.y+1,0))
return@on true
}
onUseWith(IntType.SCENERY, EggHopper.ALL_EGGS,Scenery.EGG_HOPPER_20264){ player, used, with ->
onUseWith(IntType.SCENERY, EggCannon.ALL_EGGS,Scenery.EGG_HOPPER_20264){ player, used, with ->
val loc = player.location
player.faceLocation(location(loc.x,loc.y+1,0))
loadHopperEggs(player,used.id )

4
Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt
View file

@ -3,7 +3,7 @@ package content.minigame.barbassault.arena
import content.minigame.barbassault.ALL_BARBASS_ITEMS
import content.minigame.barbassault.BarbRole
import content.minigame.barbassault.BarbassaultActivity
import content.minigame.barbassault.arena.scenery.EggHopper
import content.minigame.barbassault.arena.scenery.EggCannon
import content.minigame.barbassault.arena.scenery.GloryHorn
import content.minigame.barbassault.baSession
import content.minigame.barbassault.getBarbLevels
@ -46,7 +46,7 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi
var state: BarbassaultState = BarbassaultState.PARTY_CREATION
val sessionNpcs = mutableListOf<NPC>()
val BAgroundItems = mutableListOf<GroundItem>()
val eggHopper = EggHopper.EggHopper()
val eggHopper = EggCannon.EggHopper()
var eggCannonNpcWest: NPC? = null
var eggCannonNpcEast: NPC? = null
val scoreManager = BarbScoreManager()

2
Server/src/main/content/minigame/barbassault/arena/Npcs/EggCannon.kt → Server/src/main/content/minigame/barbassault/arena/Npcs/EggCannonNPC.kt
View file

@ -9,7 +9,7 @@ import core.game.world.update.flag.context.Graphics
import org.rs09.consts.NPCs
class EggCannon : NPCBehavior(NPCs.EGG_LAUNCHER_5026) {
class EggCannonNPC : NPCBehavior(NPCs.EGG_LAUNCHER_5026) {
override fun onCreation (self: NPC) {
self.isWalks = false
self.isNeverWalks = true

9
Server/src/main/content/minigame/barbassault/arena/scenery/EggHopper.kt
View file

@ -30,9 +30,8 @@ import org.rs09.consts.NPCs
// half -> EGG_HOPPER_20265
// full -> EGG_HOPPER_20266
//varbit 3268
//todo fix naming of hopper/cannon
@Initializable
class EggHopper : ComponentPlugin() {
class EggCannon : ComponentPlugin() {
//Easter Egg "Blinky Switch"
private val currentSequence = mutableListOf<Int>()
@ -250,14 +249,14 @@ class EggHopper : ComponentPlugin() {
}
enum class EggType(val consume: EggHopper.EggHopper.() -> Boolean, val action: String, val projectileGFX: Int, val getAmount: EggHopper.EggHopper.() -> Int) {
enum class EggType(val consume: EggCannon.EggHopper.() -> Boolean, val action: String, val projectileGFX: Int, val getAmount: EggCannon.EggHopper.() -> Int) {
GREEN({ consumeGreen() }, "poison",GREEN_EGG_PROJECTILE_977, { green }),
RED({ consumeRed() }, "explosive", RED_EGG_PROJECTILE_978, { red }),
BLUE({ consumeBlue() }, "stun", Blue_EGG_PROJECTILE_978, { blue }),
YELLOW({consumeYellow()},"Omega",YELLOW_EGG_PROJECTILE_980, { yellow });
fun tryConsume(hopper: EggHopper.EggHopper): Boolean = hopper.consume()
fun getCount(hopper: EggHopper.EggHopper) = hopper.getAmount()
fun tryConsume(hopper: EggCannon.EggHopper): Boolean = hopper.consume()
fun getCount(hopper: EggCannon.EggHopper) = hopper.getAmount()
}
data class EggColors(val GREEN: Int, val RED: Int, val BLUE: Int)
object EggTurret {