Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Fix merge conlfict

Browse source
This commit is contained in:
dginovker 2020-03-28 23:27:57 -04:00
commit 9a6c2d6c86
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/server.sql
View file

@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: 127.0.0.1
-- Generation Time: Mar 29, 2020 at 12:18 AM
-- Generation Time: Mar 29, 2020 at 12:21 AM
-- Server version: 10.4.11-MariaDB
-- PHP Version: 7.4.2
@ -882,7 +882,7 @@ INSERT INTO `ground_spawns` (`item_id`, `loc_data`) VALUES
(983, '{1,3131,9862,0,7209050}'),
(995, '{3,3195,9834,0,11141270}-{4,3195,9820,0,11141270}-{66,3191,9821,0,11141270}-{56,3190,9819,0,11141270}-{26,3188,9819,0,11141270}-{26,3188,9820,0,11141270}-{35,3189,9819,0,11141270}-{384,3224,3830,0,6553650}-{384,3220,3824,0,6553650}-{2,3106,3547,0,13107300}-{1,3104,3558,0,13107300}-{1,3106,3534,0,13107300}-{2,3101,3564,0,13107300}-{4,3103,3579,0,13107300}-{2,3234,3560,0,13107300}'),
(1005, '{1,3014,3227,0,3276830}-{1,3009,3204,0,3276830}'),
(1059, '{1,3242,3385,1,7209050}-{1,3097,3486,0,7864410}'),
(1059, '{1,3242,3385,1,7209050}-{1,3097,3486,0,7864410}-{1,3148,3177,0,5898270}'),
(1061, '{1,3244,3386,1,13762750}-{1,3208,9620,0,13762750}-{1,3210,9615,0,13762750}-{1,3111,3159,0,13762750}-{1,3112,3155,0,7864420}-{1,3302,3190,0,5898270}'),
(1119, '{1,3084,3859,0,6553660}'),
(1137, '{1,3242,3688,0,13107350}'),

4
Server/src/plugin/dialogue/CandleSellerPlugin.java
View file

@ -136,7 +136,7 @@ public final class CandleSellerPlugin extends DialoguePlugin {
stage = 231;
break;
case 231:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Firstly you can make a simple candle lantern out of", "glass. It's just like a candle, bu thte flame isn't exposed,", "so it's safer.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Firstly you can make a simple candle lantern out of", "glass. It's just like a candle, but the flame isn't exposed,", "so it's safer.");
stage = 232;
break;
case 232:
@ -144,7 +144,7 @@ public final class CandleSellerPlugin extends DialoguePlugin {
stage = 233;
break;
case 233:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Finally there's a ullseye lantern. You'll need to", "make a frame out of steel and add a glass lens.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Finally there's a Bullseye lantern. You'll need to", "make a frame out of steel and add a glass lens.");
stage = 234;
break;
case 234:

6
Server/src/plugin/interaction/object/ShootingStarPlugin.java
View file

@ -9,10 +9,8 @@ import org.crandor.game.content.skill.Skills;
import org.crandor.game.content.skill.free.gather.SkillingTool;
import org.crandor.game.interaction.OptionHandler;
import org.crandor.game.node.Node;
import org.crandor.game.node.entity.impl.PulseManager;
import org.crandor.game.node.entity.npc.NPC;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.entity.state.StatePulse;
import org.crandor.game.node.entity.state.impl.DoubleOrePulse;
import org.crandor.game.node.item.Item;
import org.crandor.game.node.object.GameObject;
@ -23,11 +21,11 @@ import org.crandor.game.system.task.Pulse;
import org.crandor.game.world.GameWorld;
import org.crandor.game.world.map.Location;
import org.crandor.game.world.repository.Repository;
import org.crandor.plugin.InitializablePlugin;
import org.crandor.plugin.Plugin;
import org.crandor.plugin.PluginManager;
import org.crandor.plugin.PluginManifest;
import org.crandor.plugin.PluginType;
import org.crandor.plugin.InitializablePlugin;
import org.crandor.tools.RandomFunction;
/**
@ -46,7 +44,7 @@ public class ShootingStarPlugin extends OptionHandler {
{"Crafting Guild", Location.create(2940, 3280, 0)},
{"Falador East Bank", Location.create(3030, 3349, 0)},
{"Rimmington mining site", Location.create(2975, 3237, 0)},
{"Falador mining site", Location.create(2975, 3240, 0)},
{"Rimmington mine", Location.create(2975, 3240, 0)},
{"Karamja mining site", Location.create(2737, 3223, 0)},
{"Brimhaven mining site", Location.create(2743, 3143, 0)},
{"South Crandor mining site", Location.create(2822, 3239, 0)},

26
Server/src/plugin/interaction/object/WantedPoster.java Normal file
View file

@ -0,0 +1,26 @@
package plugin.interaction.object;
import org.crandor.cache.def.impl.ObjectDefinition;
import org.crandor.game.interaction.OptionHandler;
import org.crandor.game.node.Node;
import org.crandor.game.node.entity.player.Player;
import org.crandor.plugin.InitializablePlugin;
import org.crandor.plugin.Plugin;
@InitializablePlugin
public class WantedPoster extends OptionHandler {
@Override
public Plugin<Object> newInstance(Object arg) throws Throwable {
ObjectDefinition.forId(40992).getConfigurations().put("option:look-at", this);
return this;
}
@Override
public boolean handle(Player player, Node node, String option) {
//Can do fun stuff related to a player being wanted or something.
player.getDialogueInterpreter().sendPlainMessage(false, "Looks like a generic wanted poster.");
return true;
}
}