Further cleanup/removal of unused/unneeded files
This commit is contained in:
ceikry
@@ -14,6 +14,7 @@
|
|||||||
/Server/build/kotlin/
|
/Server/build/kotlin/
|
||||||
/Server/build/generated/
|
/Server/build/generated/
|
||||||
/Server/data/eco/bot_offers.json
|
/Server/data/eco/bot_offers.json
|
||||||
|
Server/data/cache/
|
||||||
/File-Server/build/
|
/File-Server/build/
|
||||||
/File-Server/build/classes/
|
/File-Server/build/classes/
|
||||||
/File-Server/build/tmp/
|
/File-Server/build/tmp/
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
@dialogue npc:5512
|
|
||||||
npc("Hello visitor, how are you?")
|
|
||||||
player("Better than expected. Its a lot...nicer...here than I was", "expecting. Everyone seems pretty happy.")
|
|
||||||
npc("Of course, the Burgher is strong and wise, and looks", "after us well")
|
|
||||||
player("I think some of those Jatizso citizens have got", "the wrong idea about this place.")
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
@dialogue npc:571
|
|
||||||
|
|
||||||
npc("Good day, monsieur. Would you like ze nice", "freshly-baked bread? Or perhaps a nice piece of cake?")
|
|
||||||
option("Let's see what you have.", "No, thank you.")
|
|
||||||
@option1 {
|
|
||||||
openshop(571)
|
|
||||||
}
|
|
||||||
@option2 {
|
|
||||||
player("No, thank you.")
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
@dialogue npc:1926, 1925, 1927, 1928, 1929, 1930, 1931
|
|
||||||
npc("Get out of this village.", "You are not welcome here.");
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
@dialogue npc:1917
|
|
||||||
player("Hello.")
|
|
||||||
npc("Stuff for sale.", "You buying?")
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("Yes", "No")
|
|
||||||
@option1{
|
|
||||||
openshop(1917)
|
|
||||||
}
|
|
||||||
@option2{
|
|
||||||
npc("No?", "'Bye then.")
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
@dialogue npc:4439,4438
|
|
||||||
npc("Welcome to the land of extreme donators.");
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
@dialogue npc:5505
|
|
||||||
|
|
||||||
|
|
||||||
npc("Congratulations, Champion Larlim Far-strider. Thank you", "for defeating the Troll King.")
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
@dialogue npc:1706
|
|
||||||
npc("All visitors to Port Phasmatys must pay a toll charge of", "2 Ectotokens.")
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("I don't have that many Ectotokens.", "Where can I get Ecototokens?")
|
|
||||||
@option 1 {
|
|
||||||
player("I don't have that many Ectotokens.")
|
|
||||||
npc("In that case, you need to go to the Temple and earn", "some. Talk to the disciples - they will tell you how.")
|
|
||||||
}
|
|
||||||
@option 2 {
|
|
||||||
player("Where can I get my Ectotokens?")
|
|
||||||
npc("You need to go to the Temple and earn some.", "Talk to the disciples - they will tell you how.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
@dialogue type:"ghosty dialogue":
|
|
||||||
npc("Woooo wooo wooooo woooo")
|
|
||||||
plainmessage("You cannot understand the ghost.")
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@dialogue npc:2138
|
|
||||||
npc(FacialExpression.OLD_NORMAL, "Hello I am a gnome traveller visiting Keldagrim in search", "of <u>low-level</u> skilling supplies.", "I'll offer you an increased buying price,", "higher than any other merchants here can match.");
|
|
||||||
npc(FacialExpression.OLD_NORMAL, "If you happen to have any, <b>use them on me and I will", "give you a reasonable amount of gold coins.");
|
|
||||||
player("What items, specifically, do you buy?");
|
|
||||||
npc(FacialExpression.OLD_NORMAL, "Logs, Oak logs, Willow logs, Clay, Copper ore, Tin ore,", "Iron ore, Shrimps, Sardines, Anchovies, Trout,", "Guam leaves, Tarromin leaves, Harralander leaves", "Bronze bars, Iron bars, and Arrow shafts...");
|
|
||||||
npc(FacialExpression.OLD_NORMAL, "... are some of the items I am looking for.", "When it comes to fish, I will pay more if it's cooked.", "I also accept clean or grimy herbs.", "I am also accepting items in regular or bank note form.");
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@dialogue npc:5511
|
|
||||||
|
|
||||||
|
|
||||||
npc("Ah, isn't it a lovely day?")
|
|
||||||
player("It's not bad. What puts you in such a good mood?")
|
|
||||||
npc("Oh, I just love my job. The smell of the sea breeze, the", "smell of the arctic pine sap, the smell of the yaks. I find it", All so bracing.")
|
|
||||||
player("Bracing? Hmmm. I think I might have chosen a different word.")
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
@dialogue npc:607
|
|
||||||
npc("Haha welcome to my obstacle course. Have fun, but", "remember this isn't a child's playground. People have", "died here.");
|
|
||||||
npc("The best way to train, is to go round the course in a", "clockwise direction.")
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
@dialogue npc:566
|
|
||||||
npc("Selling ruby rings! The best deals on rings in over", "twenty four hundred planes of existence!")
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("I'm interested in these deals.", "No thanks, just browsing.")
|
|
||||||
@option 1 {
|
|
||||||
player("I'm interested in these deals.")
|
|
||||||
npc("Aha! A connoisseur! Check out these beauties!")
|
|
||||||
openshop(566)
|
|
||||||
}
|
|
||||||
@option 2 {
|
|
||||||
player("No thanks, just browsing.")
|
|
||||||
npc("Fair enough.")
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
@dialogue npc:4298
|
|
||||||
npc("'Ello there.");
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("Tell me about this room.", "Tell me how to balance kegs.", "May I claim my tokens please?", "Bye!");
|
|
||||||
@option1 {
|
|
||||||
player("Tell me about this room?");
|
|
||||||
npc("Well... s'like thish...");
|
|
||||||
npc("Thish here'sh a shtore room right?");
|
|
||||||
player("A store room you mean?");
|
|
||||||
npc("That'sh what I said! *HIC* A shtore room..... Now", "technic'ly shpeaking, I should be outshide guarding it...");
|
|
||||||
player("But you just nipped in to have a quick drink?");
|
|
||||||
npc("Yep... and to practish.");
|
|
||||||
player("Practish? I mean.. practise what?");
|
|
||||||
npc("Keg balancin. I'm the besht.");
|
|
||||||
>options
|
|
||||||
}
|
|
||||||
@option2 {
|
|
||||||
player("Tell me how to balance kegs?");
|
|
||||||
npc("Yer very very shtrange. But.... you pick the keg up,", "and balance it on yer head, then you pick another keg", "up and put that on top. S'really very eashy.");
|
|
||||||
player("Eashy?");
|
|
||||||
npc("Yesh. Eashy.");
|
|
||||||
pause(2)
|
|
||||||
npc("But you couldn't ever balansh ash many ash meee!");
|
|
||||||
player("That sounds like a challenge, I'll show you!");
|
|
||||||
>options
|
|
||||||
}
|
|
||||||
@option3 {
|
|
||||||
player("May I claim my tokens please?");
|
|
||||||
npc("Well... err.. ish not offishal or anyfin... but I got the", "ledger of tokensh 'ere. I'll jus' err.. write it in!");
|
|
||||||
player("Won't they know?");
|
|
||||||
npc("Nah... hic.... I'm a wizsh at copyin' signaturesh. Jus'", "ashk an offishal mem'er of shtaff like Shloane fer yer", "tokensh.");
|
|
||||||
plainmessage("The rather drunk Jimmy scribbles the tokens you've earned from", "Keg Balancing in the Ledger so that you can claim them from an", "official member of training staff.");
|
|
||||||
}
|
|
||||||
@option4 {
|
|
||||||
player("Bye!");
|
|
||||||
npc("Shure you wouldn't like an ickle drinkie fore yer go?");
|
|
||||||
player("No thanks, got things to do, people to see, tokens to", "earn...");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
@dialogue npc:5509
|
|
||||||
|
|
||||||
npc("Hello there. Would you like to see the good I have", "for sale?")
|
|
||||||
>options
|
|
||||||
options: {
|
|
||||||
option("Yes please, Jofridr", "No thank you, Jofridr", "Why do you have so much wool in your store?)
|
|
||||||
@option1 {
|
|
||||||
player("Yes please, Jofridr.")
|
|
||||||
openshop(5509)
|
|
||||||
}
|
|
||||||
|
|
||||||
@option2 {
|
|
||||||
player("No thank you, Jofridr")
|
|
||||||
npc("Fair thee well.")
|
|
||||||
}
|
|
||||||
@option3 {
|
|
||||||
player("Why do you have so much wool in", "your store?")
|
|
||||||
npc("Ah, I have contacts on the mainland. I have a", "sailor friend who brings me crates of", "wool on a regular basis.")
|
|
||||||
player("What do you trade for it?")
|
|
||||||
npc("Rope of course! What else can we sell? Fish", "would go off before it got so far south.")
|
|
||||||
player("Where does all this rope go?")
|
|
||||||
npc("Err, I don't remember the name of the place", "very well. Dreinna? Drennor? Something like that.")
|
|
||||||
player("That's very interesting. Thanks Jofridr.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
@dialogue npc:564
|
|
||||||
npc("Dragon swords! Here, Dragon swords! Straight from", "Frenaskrae!")
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("Yes please.", "No thanks, I'm just browsing.")
|
|
||||||
@option 1 {
|
|
||||||
player("Yes please!")
|
|
||||||
openshop(564)
|
|
||||||
}
|
|
||||||
@option 2 {
|
|
||||||
player("No thanks, I'm just browsing.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@dialogue npc:5518
|
|
||||||
|
|
||||||
|
|
||||||
npc("Ho, Larlim Far-strider! The brave warrior returns!")
|
|
||||||
player("It was a hard-fought battle, but we Fremennik prevailed!")
|
|
||||||
npc("I expect we'll be hearing songs about the 'slayer of the", "Troll king' for many years to come")
|
|
||||||
player("It would be an honour to be remembered in such a way!", "Thanks.")
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
@dialogue npc:5513
|
|
||||||
|
|
||||||
npc("Hello, visitor!")
|
|
||||||
player("Hello. What are you up to?")
|
|
||||||
npc("Ah, I was about to collect some yak's milk to make", "yak cheese.")
|
|
||||||
player("Eughr! Though I am curious. Can I try some?")
|
|
||||||
npc("Sorry, no. The last outlander who ate my cheese", "was ill for a month")
|
|
||||||
player("So why don't you get ill as well?")
|
|
||||||
npc("Well, we eat yak milk products every day, from", "when we're born. So I suppose we're used to it. Anyways I", "should stop yakking - Haha - and get on with my work")
|
|
||||||
player("I'm glad to see that puns are common", "everywhere in Keldagrim; even here")
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
@dialogue npc:2935
|
|
||||||
npc("Leave me be.")
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
@dialogue npc:3892,3893,3894,3895,3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,3910,3911
|
|
||||||
|
|
||||||
npc("Thanks for coming!")
|
|
||||||
player("It's not like I had a lot of choice you know!")
|
|
||||||
npc("I'm sorry for abducting you like that, but I really need", "your help >playername<.")
|
|
||||||
player("What's the problem then?")
|
|
||||||
>event_info
|
|
||||||
|
|
||||||
event_info:{
|
|
||||||
npc("It's my evil twin sister! She's been galavanting around", "Keldagrim commiting crimes and now I'm getting the", "blame!")
|
|
||||||
player("Well what's all this got to do with me then?")
|
|
||||||
npc("I'm glad you asked!")
|
|
||||||
npc("Through that door is a room with a cage and a control", "panel that operates a giant mechanical claw.")
|
|
||||||
npc("I lured my sister into the room so I could imprison her", "in the cage by using the claw. The problem is my sister", "managed to herd some innocent civilians in there with", "her.")
|
|
||||||
player("So what do you need me to do?")
|
|
||||||
npc("I need you to go next door and use the claw to catch", "my sister.")
|
|
||||||
npc("Once she's in prison, she won't be causing me anymore", "bother!")
|
|
||||||
player("Sounds easy enough to me.")
|
|
||||||
npc("Fabulous! Now take a good long look at me because the", "door will be locked behind you. My twin looks exactly", "like me, even her clothes!")
|
|
||||||
npc("One more thing to make your life difficult; the magic", "powering the claw is running low so you'll only have", "two attempts to catch her.")
|
|
||||||
player("I'll do my best then!")
|
|
||||||
npc("By the way, would you like me to run through the", "controls for you, or do you think you'll manage?")
|
|
||||||
setattribute("/save:ame:evil_twin_info", true);
|
|
||||||
option("Yes please.", "No thanks.")
|
|
||||||
@option1{
|
|
||||||
player("Yes please. I mean, it's always best to be prepared,", "right?")
|
|
||||||
npc("Ok, when you turn the machine on you'll see the", "glowing mark on the floor where the claw is currently", "aiming, and you'll see a lever and button on the right", "hand side of your screen.")
|
|
||||||
npc("To move the claw's current location, click on the", "direction you want it to move in, as indicated on the", "right hand panel.")
|
|
||||||
npc("You'll know which way the claw will go as the lever will", "point that way to show you.")
|
|
||||||
npc("When you see someone on top of the glowing mark,", "then hit the button on the right hand panel, as this will", "send the claw down to pick them up.")
|
|
||||||
npc("Do be careful and make sure that there is someone on", "the mark, and not just walking past it.")
|
|
||||||
npc("Oh, and make sure the person is my sister, so you", "don't end up catching a random civilian.")
|
|
||||||
npc("Does that help?")
|
|
||||||
player("Yes, that covers everything. Thanks!")
|
|
||||||
npc("Good luck!")
|
|
||||||
}
|
|
||||||
@option2{
|
|
||||||
player("No thanks, I should be able to work it out.")
|
|
||||||
npc("Good luck!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
@dialogue npc:5510
|
|
||||||
|
|
||||||
|
|
||||||
npc("Good day to you.")
|
|
||||||
player("Hello. What are you up to?")
|
|
||||||
npc("Ah, Today is surstromming day! The herring I buried", "six months ago is ready to be dug up.")
|
|
||||||
player("Eughr! What are you going to do with it?")
|
|
||||||
npc("Eat it, of course! It will be fermented just-right by now.")
|
|
||||||
player("Fermented? You eat rotten fish?")
|
|
||||||
npc("Hmmm, tasty. I'm guessing you don't want to", "come round and try it?")
|
|
||||||
player("You guess correctly.")
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
@dialogue npc:1288
|
|
||||||
npc("Hey! Outerlander! That is my house! Who do you", "think you are to just barge into my home without", "asking?")
|
|
||||||
player("Um... My name is @name.")
|
|
||||||
npc("It was a rhetorical question, outerlander. Now get lost.", "I do not appreciate intruders in my home.")
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@dialogue npc:5031
|
|
||||||
player("Hi")
|
|
||||||
npc("Shhh. Don't talk to me.")
|
|
||||||
player("What? Why?")
|
|
||||||
npc("If I'm seen slacking off by talking to you, I'll be in", "deep trouble!")
|
|
||||||
player("Oh... Sorry.")
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
@dialogue npc:5032
|
|
||||||
player("Hi there.")
|
|
||||||
npc("Don't suppose you've seen a battleaxe around here?")
|
|
||||||
player("A battleaxe? Nope, afraid not.")
|
|
||||||
npc("The captain is going to kill me if he finds out I've lost", "my weapon.")
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
@dialogue npc:5033
|
|
||||||
player("Hello. So you're just a private?")
|
|
||||||
npc("Show some respect! It's more than you'll achieve.")
|
|
||||||
player("I beg to differ. I'm in perfect shape!")
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
@dialogue npc:1694
|
|
||||||
player("It's nice to see another human face around here.")
|
|
||||||
npc("Leave me be, peasant - I am relaxing.")
|
|
||||||
player("Well, that's nice!")
|
|
||||||
npc("Do you know who I am?")
|
|
||||||
player("I'm sorry, I haven't had the privilege.")
|
|
||||||
npc("I, peasant, am Robin, Master Bowman. I am very", "famous you know.")
|
|
||||||
player("Oh, Robin, Master Bowman, I see.")
|
|
||||||
npc("So have you heard of me?")
|
|
||||||
player("No.")
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
@dialogue npc:3123
|
|
||||||
player("Hello, Simon.")
|
|
||||||
npc("G'day, @name.")
|
|
||||||
player("How's it going?")
|
|
||||||
$hasitem(6970, 1) {
|
|
||||||
npc("Not bad, mate, not bad at all. Got any artefacts for", "me?")
|
|
||||||
>sellOptions
|
|
||||||
}
|
|
||||||
npc("I've been contracted to retrieve artefacts from the top", "of this magnificent pyramid.")
|
|
||||||
player("So, why are you down here and not up there then?")
|
|
||||||
npc("Well, it's me back - an old injury I picked up in", "Sophanem has come back to haunt me. I was working", "for the Museum of Varrock, and the gold I had been", "given wasn't enough to pay for the carpet rides, let")
|
|
||||||
npc("alone any decent equipment. But that was a long time", "ago... I can't even lift a chisel right now. There's no", "way I can climb all the way up there.")
|
|
||||||
player("How on earth did you get down the cliff face, then?")
|
|
||||||
npc("That's what set off the injury. I was fine before I", "scrabbed down the pesky slope. I think it will be a while", "before I can climb back up again; I must be getting", "old.")
|
|
||||||
npc("Hang on a second... You look like you're pretty agile", "and up for a challenge. How about you retrieve it for", "me?")
|
|
||||||
npc("I'll tell you what, I'll give you 1000 coins for every", "artefact you get for me.")
|
|
||||||
player("I'll see what I can do.")
|
|
||||||
npc("Good on ya, mate!")
|
|
||||||
|
|
||||||
sellOptions: {
|
|
||||||
option("Sell it.", "Keep it.")
|
|
||||||
@option1{
|
|
||||||
player("I have one here I'll sell you.")
|
|
||||||
$removeitem(6970, 1) {
|
|
||||||
additem(995, 1000)
|
|
||||||
itemmessage(6970, "You hand over the artefact(s) and Simon hands you 1000 coins.")
|
|
||||||
npc("Ripper! Thanks a bundle mate! Thanks to you I can", "fulfill me contract. You're a true blue! The boss will be", "pleased.")
|
|
||||||
player("Glad I was able to help... but who is your boss? I", "thought you worked for the museum?")
|
|
||||||
npc("Mind your own bizzo, mate. But if you get any more,", "you know where I am!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@option2{
|
|
||||||
player("I have one, but I want to keep it for now.")
|
|
||||||
npc("Careful, mate, people come looking for a thing like", "that!")
|
|
||||||
player("Thanks for the advice, but I'll hang onto it for now.")
|
|
||||||
npc("Bye, cobber.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
@dialogue npc:5520
|
|
||||||
|
|
||||||
|
|
||||||
npc("Shh. Go away. I'm not allowed to talk to you.")
|
|
||||||
player("Fine, Whatever...")
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@dialogue npc:6841, 6842
|
|
||||||
npc("Where are we going?")
|
|
||||||
player("I've not decided yet.")
|
|
||||||
npc("Fine, don't tell me...")
|
|
||||||
player("Oh, okay, well we are going...")
|
|
||||||
npc("Don't want to know now.")
|
|
||||||
player("Siiiigh...spiders.")
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
message("Roar")
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@dialogue npc:5506
|
|
||||||
|
|
||||||
npc("Thank you for leading the Burgher's militia against the", "Troll King.")
|
|
||||||
npc("Now that the trolls are leaderless I have repaired the", "bridge to the central isle for you as best I can.")
|
|
||||||
player("Thanks Thakkrad. Does that mean I have access to the", "runite ores on that island?")
|
|
||||||
npc("Yes, You should be able to mine runite there if you wish.")
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@dialogue npc:5519
|
|
||||||
|
|
||||||
|
|
||||||
npc("Ho, Larlim Far-strider! The brave warrior returns!")
|
|
||||||
player("It was a hard-fought battle, but we Fremennik prevailed!")
|
|
||||||
npc("I expect we'll be hearing songs about the 'slayer of the", "Troll king' for many years to come")
|
|
||||||
player("It would be an honour to be remembered in such a way!", "Thanks.")
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
@dialogue npc:739
|
|
||||||
npc("What can I get you?")
|
|
||||||
player("What's on the menu?")
|
|
||||||
npc("Dragon Bitter and Greenman's Ale, oh and some cheap", "beer.")
|
|
||||||
>options
|
|
||||||
|
|
||||||
options: {
|
|
||||||
option("I'll give it a miss I think", "I'll try the Dragon Bitter.", "Can I have some Greenman's Ale?", "One cheap beer please!")
|
|
||||||
@option1 {
|
|
||||||
|
|
||||||
}
|
|
||||||
@option2 {
|
|
||||||
|
|
||||||
}
|
|
||||||
@option3 {
|
|
||||||
|
|
||||||
}
|
|
||||||
@option4 {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buy:(id, cost) {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@dialogue npc:3321, 3307
|
|
||||||
player("What happened to the old man who used to be the", "doorman?")
|
|
||||||
npc("You mean my father? He went into retirement, I've", "taken over the family business instead.")
|
|
||||||
player("Your father! But you don't look anything like him!")
|
|
||||||
npc("No, fortunately for me I inherited my good looks from", "my mother.")
|
|
||||||
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
@echo off
|
|
||||||
|
|
||||||
mkdir Single-Player
|
|
||||||
|
|
||||||
echo Building Client...
|
|
||||||
cd Client
|
|
||||||
call gradle jar
|
|
||||||
cd ..
|
|
||||||
copy /Y "Client\build\libs\client-1.0.0.jar" "Single-Player\client.jar"
|
|
||||||
echo.
|
|
||||||
|
|
||||||
echo Building Management-Server...
|
|
||||||
cd Management-Server
|
|
||||||
call gradle jar
|
|
||||||
cd ..
|
|
||||||
copy /Y "Management-Server\build\libs\managementserver-1.0.0.jar" "Single-Player\ms.jar"
|
|
||||||
echo.
|
|
||||||
|
|
||||||
echo Building Server...
|
|
||||||
cd Server
|
|
||||||
call gradle jar
|
|
||||||
cd ..
|
|
||||||
copy /Y "Server\build\libs\server-1.0.0.jar" "Single-Player\server.jar"
|
|
||||||
echo.
|
|
||||||
|
|
||||||
echo Copying server data...
|
|
||||||
del /S /Q "Single-Player/data"
|
|
||||||
xcopy /E /I /Y "Server\data" "Single-Player\data"
|
|
||||||
xcopy /E /I /Y "Server\db_exports\*.sql" "Single-Player\data"
|
|
||||||
del /S /Q "Single-Player/worldprops"
|
|
||||||
xcopy /E /I /Y "Server\worldprops" "Single-Player\worldprops"
|
|
||||||
: Set Debug/Dev mode to false on single player server config
|
|
||||||
powershell -Command "(gc Single-Player\worldprops\default.json) -replace '\"debug\": true', '\"debug\": false' -replace '\"dev\": true', '\"dev\": false' | Out-File -Encoding Default Single-Player\worldprops\default.json"
|
|
||||||
|
|
||||||
: Replace Live server addresses with localhost
|
|
||||||
powershell -Command "(gc Client\config.json) -replace 'play.2009scape.org', 'localhost' | Out-File -Encoding Default Single-Player\config.json"
|
|
||||||
echo.
|
|
||||||
|
|
||||||
echo Done!
|
|
||||||
pause
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
echo "Make sure you have built the server before running this command."
|
|
||||||
if [ $# -eq 0 ]; then
|
|
||||||
echo "Usage: $0 [--build] type"
|
|
||||||
echo "Example: $0 ms"
|
|
||||||
echo "Example: $0 server Server/worldprops/default.json"
|
|
||||||
echo "Example: $0 client"
|
|
||||||
echo "Example: $0 --build server Server/worldprops/default.json"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
readIndex=1
|
|
||||||
propsFile="$1"
|
|
||||||
doBuild=false
|
|
||||||
function run_server {
|
|
||||||
Server/bin/Server "$1"
|
|
||||||
}
|
|
||||||
run_ms(){
|
|
||||||
exec "Management-Server/bin/Management-Server"
|
|
||||||
}
|
|
||||||
run_client(){
|
|
||||||
exec "Client/bin/Client"
|
|
||||||
}
|
|
||||||
if [ "$1" = "--build" ]; then
|
|
||||||
readIndex="$((readIndex + 1))"
|
|
||||||
doBuild=true
|
|
||||||
if [ $# -lt 2 ]; then
|
|
||||||
echo "You must supply a type."
|
|
||||||
echo "If you just want to build without running, use build.sh"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
type="${!readIndex}"
|
|
||||||
if [ $doBuild = true ]; then
|
|
||||||
./build.sh "$type"
|
|
||||||
fi
|
|
||||||
if [ "$type" = "server" ]; then
|
|
||||||
readIndex="$((readIndex + 1))"
|
|
||||||
propsFile="${!readIndex}"
|
|
||||||
echo $propsFile
|
|
||||||
run_server "$propsFile"
|
|
||||||
elif [ "$type" = "ms" ]; then
|
|
||||||
run_ms
|
|
||||||
elif [ "$type" = "client" ]; then
|
|
||||||
run_client
|
|
||||||
fi
|
|
||||||
-1326
File diff suppressed because it is too large
Load Diff
@@ -1,217 +0,0 @@
|
|||||||
package core
|
|
||||||
|
|
||||||
import core.game.system.SystemShutdownHook
|
|
||||||
import core.game.system.mysql.SQLManager
|
|
||||||
import core.game.world.map.Location
|
|
||||||
import core.tools.mysql.Database
|
|
||||||
import core.tools.secondsToTicks
|
|
||||||
import org.json.simple.JSONObject
|
|
||||||
import java.io.File
|
|
||||||
import java.math.BigInteger
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A class holding various variables for the server.
|
|
||||||
* @author Ceikry
|
|
||||||
*/
|
|
||||||
class ServerConstants {
|
|
||||||
companion object {
|
|
||||||
@JvmField
|
|
||||||
var SHUTDOWN_HOOK: Thread = Thread(SystemShutdownHook())
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var DATA_PATH: String? = null
|
|
||||||
|
|
||||||
//path to the cache
|
|
||||||
@JvmField
|
|
||||||
var CACHE_PATH: String? = null
|
|
||||||
|
|
||||||
//path for the server store (obsolete, but kept for the sake of system sanity.)
|
|
||||||
@JvmField
|
|
||||||
var STORE_PATH: String? = null
|
|
||||||
|
|
||||||
//path for player saves
|
|
||||||
@JvmField
|
|
||||||
var PLAYER_SAVE_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var PLAYER_ATTRIBUTE_PATH = "ish";
|
|
||||||
|
|
||||||
//path to the various config files, such as npc_spawns.json
|
|
||||||
var CONFIG_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var GRAND_EXCHANGE_DATA_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var RDT_DATA_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var OBJECT_PARSER_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var SCRIPTS_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var DIALOGUE_SCRIPTS_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var LOGS_PATH: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var BOT_DATA_PATH: String? = null
|
|
||||||
|
|
||||||
//the max number of players.
|
|
||||||
@JvmField
|
|
||||||
var MAX_PLAYERS = 0
|
|
||||||
|
|
||||||
//the max number of NPCs
|
|
||||||
@JvmField
|
|
||||||
var MAX_NPCS = 0
|
|
||||||
|
|
||||||
//the location where new players are placed on login.
|
|
||||||
@JvmField
|
|
||||||
var START_LOCATION: Location? = null
|
|
||||||
|
|
||||||
//Location for all home teleports/respawn location
|
|
||||||
@JvmField
|
|
||||||
var HOME_LOCATION: Location? = null
|
|
||||||
|
|
||||||
//the name for the database
|
|
||||||
@JvmField
|
|
||||||
var DATABASE_NAME: String? = null
|
|
||||||
|
|
||||||
//username for the database
|
|
||||||
@JvmField
|
|
||||||
var DATABASE_USER: String? = null
|
|
||||||
|
|
||||||
//password for the database
|
|
||||||
@JvmField
|
|
||||||
var DATABASE_PASS: String? = null
|
|
||||||
|
|
||||||
//address for the database
|
|
||||||
@JvmField
|
|
||||||
var DATABASE_ADDRESS: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var DATABASE_PORT: String? = null
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var WRITE_LOGS: Boolean = false
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var BANK_SIZE: Int = 496
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var GE_AUTOSAVE_FREQUENCY = secondsToTicks(3600) //1 hour
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var GE_AUTOSTOCK_ENABLED = false
|
|
||||||
|
|
||||||
//location names for the ::to command.
|
|
||||||
val TELEPORT_DESTINATIONS = arrayOf(
|
|
||||||
arrayOf(Location.create(2974, 4383, 2), "corp", "corporal", "corporeal"),
|
|
||||||
arrayOf(Location.create(2659, 2649, 0), "pc", "pest control", "pest"),
|
|
||||||
arrayOf(Location.create(3293, 3184, 0), "al kharid", "alkharid", "kharid"),
|
|
||||||
arrayOf(Location.create(3222, 3217, 0), "lumbridge", "lumby"),
|
|
||||||
arrayOf(Location.create(3110, 3168, 0), "wizard tower", "wizards tower", "tower", "wizards"),
|
|
||||||
arrayOf(Location.create(3083, 3249, 0), "draynor", "draynor village"),
|
|
||||||
arrayOf(Location.create(3019, 3244, 0), "port sarim", "sarim"),
|
|
||||||
arrayOf(Location.create(2956, 3209, 0), "rimmington"),
|
|
||||||
arrayOf(Location.create(2965, 3380, 0), "fally", "falador"),
|
|
||||||
arrayOf(Location.create(2895, 3436, 0), "taverley"),
|
|
||||||
arrayOf(Location.create(3080, 3423, 0), "barbarian village", "barb"),
|
|
||||||
arrayOf(Location.create(3213, 3428, 0), "varrock"),
|
|
||||||
arrayOf(Location.create(3164, 3485, 0), "grand exchange", "ge"),
|
|
||||||
arrayOf(Location.create(2917, 3175, 0), "karamja"),
|
|
||||||
arrayOf(Location.create(2450, 5165, 0), "tzhaar"),
|
|
||||||
arrayOf(Location.create(2795, 3177, 0), "brimhaven"),
|
|
||||||
arrayOf(Location.create(2849, 2961, 0), "shilo village", "shilo"),
|
|
||||||
arrayOf(Location.create(2605, 3093, 0), "yanille"),
|
|
||||||
arrayOf(Location.create(2663, 3305, 0), "ardougne", "ardy"),
|
|
||||||
arrayOf(Location.create(2450, 3422, 0), "gnome stronghold", "gnome"),
|
|
||||||
arrayOf(Location.create(2730, 3485, 0), "camelot", "cammy", "seers"),
|
|
||||||
arrayOf(Location.create(2805, 3435, 0), "catherby"),
|
|
||||||
arrayOf(Location.create(2659, 3657, 0), "rellekka"),
|
|
||||||
arrayOf(Location.create(2890, 3676, 0), "trollheim"),
|
|
||||||
arrayOf(Location.create(2914, 3746, 0), "godwars", "gwd", "god wars"),
|
|
||||||
arrayOf(Location.create(3180, 3684, 0), "bounty hunter", "bh"),
|
|
||||||
arrayOf(Location.create(3272, 3687, 0), "clan wars", "clw"),
|
|
||||||
arrayOf(Location.create(3090, 3957, 0), "mage arena", "mage", "magearena", "arena"),
|
|
||||||
arrayOf(Location.create(3069, 10257, 0), "king black dragon", "kbd"),
|
|
||||||
arrayOf(Location.create(3359, 3416, 0), "digsite"),
|
|
||||||
arrayOf(Location.create(3488, 3489, 0), "canifis"),
|
|
||||||
arrayOf(Location.create(3428, 3526, 0), "slayer tower", "slayer"),
|
|
||||||
arrayOf(Location.create(3502, 9483, 2), "kalphite queen", "kq", "kalphite hive", "kalphite"),
|
|
||||||
arrayOf(Location.create(3233, 2913, 0), "pyramid"),
|
|
||||||
arrayOf(Location.create(3419, 2917, 0), "nardah"),
|
|
||||||
arrayOf(Location.create(3482, 3090, 0), "uzer"),
|
|
||||||
arrayOf(Location.create(3358, 2970, 0), "pollnivneach", "poln"),
|
|
||||||
arrayOf(Location.create(3305, 2788, 0), "sophanem"),
|
|
||||||
arrayOf(Location.create(2898, 3544, 0), "burthorpe", "burthorp"),
|
|
||||||
arrayOf(Location.create(3088, 3491, 0), "edge", "edgeville"),
|
|
||||||
arrayOf(Location.create(3169, 3034, 0), "bedabin"),
|
|
||||||
arrayOf(Location.create(3565, 3289, 0), "barrows"),
|
|
||||||
arrayOf(Location.create(3016, 3513, 0), "bkf", "black knights fortress"),
|
|
||||||
arrayOf(Location.create(3052, 3481, 0), "monastery")
|
|
||||||
)
|
|
||||||
|
|
||||||
@JvmField
|
|
||||||
var DATABASE: Database? = null
|
|
||||||
|
|
||||||
//if SQL is enabled
|
|
||||||
@JvmField
|
|
||||||
var MYSQL = true
|
|
||||||
|
|
||||||
//the server name
|
|
||||||
@JvmField
|
|
||||||
var SERVER_NAME: String = ""
|
|
||||||
|
|
||||||
//The RSA_KEY for the server.
|
|
||||||
@JvmField
|
|
||||||
var EXPONENT = BigInteger("109343860332353211924482133180092752644123222251570035818592399718899543340247882615012834369709881454157761178411602406231525266135486523035643931381979724348736863559735931163013508521663192459153115214061347330689961869574877386212674606945486858607548180282077056338048348202722564364196572081666257569141")
|
|
||||||
|
|
||||||
//The MODULUS for the server.
|
|
||||||
@JvmField
|
|
||||||
var MODULUS = BigInteger("96982303379631821170939875058071478695026608406924780574168393250855797534862289546229721580153879336741968220328805101128831071152160922518190059946555203865621183480223212969502122536662721687753974815205744569357388338433981424032996046420057284324856368815997832596174397728134370577184183004453899764051")
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parses a JSONObject and retrieves the values for all settings in this file.
|
|
||||||
* @author Ceikry
|
|
||||||
* @param data : The JSONObject to parse.
|
|
||||||
*/
|
|
||||||
fun parse(data: JSONObject) {
|
|
||||||
MAX_PLAYERS = data["max_players"].toString().toInt()
|
|
||||||
MAX_NPCS = data["max_npcs"].toString().toInt()
|
|
||||||
|
|
||||||
START_LOCATION = JSONUtils.parseLocation(data["new_player_location"].toString())
|
|
||||||
HOME_LOCATION = JSONUtils.parseLocation(data["home_location"].toString())
|
|
||||||
|
|
||||||
DATA_PATH = JSONUtils.parsePath(data["data_path"].toString())
|
|
||||||
CACHE_PATH = JSONUtils.parsePath(data["cache_path"].toString())
|
|
||||||
STORE_PATH = JSONUtils.parsePath(data["store_path"].toString())
|
|
||||||
PLAYER_SAVE_PATH = JSONUtils.parsePath(data["save_path"].toString())
|
|
||||||
CONFIG_PATH = JSONUtils.parsePath(data["configs_path"].toString())
|
|
||||||
PLAYER_ATTRIBUTE_PATH = PLAYER_SAVE_PATH + "attributes" + File.separator
|
|
||||||
GRAND_EXCHANGE_DATA_PATH = JSONUtils.parsePath(data["grand_exchange_data_path"].toString())
|
|
||||||
BOT_DATA_PATH = JSONUtils.parsePath(data["bot_data_path"].toString())
|
|
||||||
RDT_DATA_PATH = JSONUtils.parsePath(data["rare_drop_table_path"].toString())
|
|
||||||
OBJECT_PARSER_PATH = JSONUtils.parsePath(data["object_parser_path"].toString())
|
|
||||||
SCRIPTS_PATH = JSONUtils.parsePath(data["scripts_path"].toString())
|
|
||||||
DIALOGUE_SCRIPTS_PATH = JSONUtils.parsePath(data["dialogue_scripts_path"].toString())
|
|
||||||
if(data.containsKey("logs_path")){
|
|
||||||
LOGS_PATH = data["logs_path"].toString()
|
|
||||||
}
|
|
||||||
if(data.containsKey("writeLogs")){
|
|
||||||
WRITE_LOGS = data["writeLogs"] as Boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
DATABASE_NAME = data["database_name"].toString()
|
|
||||||
DATABASE_USER = data["database_username"].toString()
|
|
||||||
DATABASE_PASS = data["database_password"].toString()
|
|
||||||
DATABASE_ADDRESS = data["database_address"].toString()
|
|
||||||
DATABASE_PORT = data["database_port"].toString()
|
|
||||||
|
|
||||||
DATABASE = Database(DATABASE_ADDRESS, DATABASE_NAME, DATABASE_USER, DATABASE_PASS)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user