2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed vinesweeper point exchange ratio bug

Browse source 
Disabled spirit kalphite scroll until bug is fixed
This commit is contained in:
Ceikry 2024-10-11 04:52:08 +00:00 • committed by Ryan
parent 2b460b64f2
commit 393752d77b
2 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Server/src/main/content/global/skill/summoning/familiar/SpiritKalphiteNPC.java
View file

@ -44,30 +44,31 @@ public class SpiritKalphiteNPC extends BurdenBeast {
@Override @Override
protected boolean specialMove(FamiliarSpecial special) { protected boolean specialMove(FamiliarSpecial special) {
if (!isOwnerAttackable()) { return false; ///bodge this for now, until someone fixes this abomination.
return false; // if (!isOwnerAttackable()) {
} // return false;
final List<Entity> entitys = RegionManager.getLocalEntitys(owner, 6); // }
visualize(Animation.create(8517), Graphics.create(1350)); // final List<Entity> entitys = RegionManager.getLocalEntitys(owner, 6);
GameWorld.getPulser().submit(new Pulse(1, owner) { // visualize(Animation.create(8517), Graphics.create(1350));
@Override // GameWorld.getPulser().submit(new Pulse(1, owner) {
public boolean pulse() { // @Override
int count = 0; // public boolean pulse() {
for (Entity entity : entitys) { // int count = 0;
if (count > 5) { // for (Entity entity : entitys) {
return true; // if (count > 5) {
} // return true;
if (!canCombatSpecial(entity)) { // }
continue; // if (!canCombatSpecial(entity)) {
} // continue;
Projectile.magic(SpiritKalphiteNPC.this, entity, 1349, 40, 36, 50, 5).send(); // }
sendFamiliarHit(entity, 20); // Projectile.magic(SpiritKalphiteNPC.this, entity, 1349, 40, 36, 50, 5).send();
count++; // sendFamiliarHit(entity, 20);
} // count++;
return true; // }
} // return true;
}); // }
return false; // });
// return false;
} }
@Override @Override

33
Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt
View file

@ -3,8 +3,21 @@ package content.minigame.vinesweeper
import BlinkinDialogue import BlinkinDialogue
import FarmerDialogue.Companion.FARMER_FLAG_LINES import FarmerDialogue.Companion.FARMER_FLAG_LINES
import WinkinDialogue import WinkinDialogue
import content.minigame.vinesweeper.Vinesweeper.Companion.FARMERS
import content.minigame.vinesweeper.Vinesweeper.Companion.FARMER_CLEAR_RADIUS
import content.minigame.vinesweeper.Vinesweeper.Companion.HOLES
import content.minigame.vinesweeper.Vinesweeper.Companion.NUMBERS
import content.minigame.vinesweeper.Vinesweeper.Companion.RABBITS
import content.minigame.vinesweeper.Vinesweeper.Companion.SEED_LOCS
import content.minigame.vinesweeper.Vinesweeper.Companion.populateSeeds
import content.minigame.vinesweeper.Vinesweeper.Companion.scheduleNPCs
import content.minigame.vinesweeper.Vinesweeper.Companion.sendPoints
import core.api.* import core.api.*
import core.cache.def.impl.ItemDefinition
import core.game.component.Component import core.game.component.Component
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
import core.game.interaction.InterfaceListener
import core.game.interaction.MovementPulse import core.game.interaction.MovementPulse
import core.game.node.entity.Entity import core.game.node.entity.Entity
import core.game.node.entity.combat.DeathTask import core.game.node.entity.combat.DeathTask
@ -18,6 +31,8 @@ import core.game.node.item.Item
import core.game.node.scenery.Scenery import core.game.node.scenery.Scenery
import core.game.node.scenery.SceneryBuilder import core.game.node.scenery.SceneryBuilder
import core.game.system.task.Pulse import core.game.system.task.Pulse
import core.game.world.GameWorld
import core.game.world.GameWorld.ticks
import core.game.world.map.Location import core.game.world.map.Location
import core.game.world.map.RegionManager import core.game.world.map.RegionManager
import core.game.world.map.zone.ZoneBorders import core.game.world.map.zone.ZoneBorders
@ -25,22 +40,8 @@ import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics import core.game.world.update.flag.context.Graphics
import core.plugin.Initializable import core.plugin.Initializable
import core.tools.RandomFunction import core.tools.RandomFunction
import content.minigame.vinesweeper.Vinesweeper.Companion.FARMERS
import content.minigame.vinesweeper.Vinesweeper.Companion.FARMER_CLEAR_RADIUS
import content.minigame.vinesweeper.Vinesweeper.Companion.HOLES
import content.minigame.vinesweeper.Vinesweeper.Companion.NUMBERS
import content.minigame.vinesweeper.Vinesweeper.Companion.RABBITS
import content.minigame.vinesweeper.Vinesweeper.Companion.SEED_LOCS
import content.minigame.vinesweeper.Vinesweeper.Companion.populateSeeds
import content.minigame.vinesweeper.Vinesweeper.Companion.scheduleNPCs
import content.minigame.vinesweeper.Vinesweeper.Companion.sendPoints
import core.cache.def.impl.ItemDefinition
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import core.game.interaction.InterfaceListener
import core.game.world.GameWorld
import core.game.world.GameWorld.ticks
import org.rs09.consts.* import org.rs09.consts.*
import kotlin.math.max
import kotlin.math.min import kotlin.math.min
import org.rs09.consts.Graphics as Gfx import org.rs09.consts.Graphics as Gfx
import org.rs09.consts.Scenery as Sceneries import org.rs09.consts.Scenery as Sceneries
@ -217,7 +218,7 @@ class Vinesweeper : InteractionListener, InterfaceListener, MapArea {
player.packetDispatch.sendInterfaceConfig(686, 60, true) player.packetDispatch.sendInterfaceConfig(686, 60, true)
val level = player.skills.getStaticLevel(Skills.FARMING) val level = player.skills.getStaticLevel(Skills.FARMING)
// TODO: more precise formula // TODO: more precise formula
val points_per_xp = if (level < 40) { 2.0*(40.0 - level.toDouble())/10.0 } else { 1.0 } val points_per_xp = if (level < 40) { max(1.0, 2.0*(40.0 - level.toDouble())/10.0) } else { 1.0 }
val points = player.getAttribute("vinesweeper:points", 0) val points = player.getAttribute("vinesweeper:points", 0)
val xp = points / points_per_xp val xp = points / points_per_xp
player.skills.addExperience(Skills.FARMING, xp) player.skills.addExperience(Skills.FARMING, xp)