- //
- // Permission to use, copy, modify, and distribute this software for any
- // purpose with or without fee is hereby granted, provided that the above
- // copyright notice and this permission notice appear in all copies.
- //
- // THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- // WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- // MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- // ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- /**
- * Gets the instance value.
- * @return The instance.
- */
- public static EncryptionManager getInstance() {
- return INSTANCE;
- }
-
- /**
- * BCrypt implements OpenBSD-style Blowfish password hashing using
- * the scheme described in "A Future-Adaptable Password Scheme" by
- * Niels Provos and David Mazieres.
- *
- * This password hashing system tries to thwart off-line password
- * cracking using a computationally-intensive hashing algorithm,
- * based on Bruce Schneier's Blowfish cipher. The work factor of
- * the algorithm is parameterised, so it can be increased as
- * computers get faster.
- *
- * Usage is really simple. To hash a password for the first time,
- * call the hashpw method with a random salt, like this:
- *
- *
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
- *
- *
- * To check whether a plaintext password matches one that has been
- * hashed previously, use the checkpw method:
- *
- *
- * if (BCrypt.checkpw(candidate_password, stored_hash))
- * System.out.println("It matches");
- * else
- * System.out.println("It does not match");
- *
- *
- * The gensalt() method takes an optional parameter (log_rounds)
- * that determines the computational complexity of the hashing:
- *
- *
- * String strong_salt = BCrypt.gensalt(10)
- * String stronger_salt = BCrypt.gensalt(12)
- *
- *
- * The amount of work increases exponentially (2**log_rounds), so
- * each increment is twice as much work. The default log_rounds is
- * 10, and the valid range is 4 to 31.
- *
- * @author Damien Miller
- * @version 0.2
- */
- public static class BCrypt {
- // BCrypt parameters
- private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
- private static final int BCRYPT_SALT_LEN = 16;
-
- // Blowfish parameters
- private static final int BLOWFISH_NUM_ROUNDS = 16;
-
- // Initial contents of key schedule
- private static final int P_orig[] = {
- 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
- 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
- 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
- 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
- 0x9216d5d9, 0x8979fb1b
- };
- private static final int S_orig[] = {
- 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
- 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
- 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
- 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
- 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
- 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
- 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
- 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
- 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
- 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
- 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
- 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
- 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
- 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
- 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
- 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
- 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
- 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
- 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
- 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
- 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
- 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
- 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
- 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
- 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
- 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
- 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
- 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
- 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
- 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
- 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
- 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
- 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
- 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
- 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
- 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
- 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
- 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
- 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
- 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
- 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
- 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
- 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
- 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
- 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
- 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
- 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
- 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
- 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
- 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
- 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
- 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
- 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
- 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
- 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
- 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
- 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
- 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
- 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
- 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
- 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
- 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
- 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
- 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
- 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
- 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
- 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
- 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
- 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
- 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
- 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
- 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
- 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
- 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
- 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
- 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
- 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
- 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
- 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
- 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
- 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
- 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
- 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
- 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
- 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
- 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
- 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
- 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
- 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
- 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
- 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
- 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
- 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
- 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
- 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
- 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
- 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
- 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
- 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
- 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
- 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
- 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
- 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
- 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
- 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
- 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
- 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
- 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
- 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
- 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
- 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
- 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
- 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
- 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
- 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
- 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
- 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
- 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
- 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
- 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
- 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
- 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
- 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
- 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
- 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
- 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
- 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
- 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
- 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
- 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
- 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
- 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
- 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
- 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
- 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
- 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
- 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
- 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
- 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
- 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
- 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
- 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
- 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
- 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
- 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
- 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
- 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
- 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
- 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
- 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
- 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
- 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
- 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
- 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
- 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
- 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
- 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
- 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
- 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
- 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
- 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
- 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
- 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
- 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
- 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
- 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
- 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
- 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
- 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
- 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
- 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
- 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
- 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
- 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
- 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
- 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
- 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
- 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
- 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
- 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
- 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
- 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
- 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
- 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
- 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
- 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
- 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
- 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
- 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
- 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
- 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
- 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
- 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
- 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
- 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
- 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
- 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
- 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
- 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
- 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
- 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
- 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
- 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
- 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
- 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
- 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
- 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
- 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
- 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
- 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
- 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
- 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
- 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
- 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
- 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
- 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
- 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
- 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
- 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
- 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
- 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
- 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
- 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
- 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
- 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
- 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
- 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
- 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
- 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
- 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
- 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
- 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
- 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
- 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
- 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
- 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
- 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
- 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
- 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
- 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
- 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
- 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
- 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
- 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
- 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
- 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
- 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
- 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
- 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
- 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
- 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
- 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
- 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
- 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
- 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
- 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
- };
-
- // bcrypt IV: "OrpheanBeholderScryDoubt"
- static private final int bf_crypt_ciphertext[] = {
- 0x4f727068, 0x65616e42, 0x65686f6c,
- 0x64657253, 0x63727944, 0x6f756274
- };
-
- // Table for Base64 encoding
- static private final char base64_code[] = {
- '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
- 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
- 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
- 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
- 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
- '6', '7', '8', '9'
- };
-
- // Table for Base64 decoding
- static private final byte index_64[] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
- -1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- -1, -1, -1, -1, -1, -1, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, -1, -1, -1, -1, -1
- };
-
- // Expanded Blowfish key
- private int P[];
- private int S[];
-
- /**
- * Encode a byte array using bcrypt's slightly-modified base64
- * encoding scheme. Note that this is *not* compatible with
- * the standard MIME-base64 encoding.
- *
- * @param d the byte array to encode
- * @param len the number of bytes to encode
- * @return base64-encoded string
- * @exception IllegalArgumentException if the length is invalid
- */
- private static String encode_base64(byte d[], int len)
- throws IllegalArgumentException {
- int off = 0;
- StringBuffer rs = new StringBuffer();
- int c1, c2;
-
- if (len <= 0 || len > d.length)
- throw new IllegalArgumentException ("Invalid len");
-
- while (off < len) {
- c1 = d[off++] & 0xff;
- rs.append(base64_code[(c1 >> 2) & 0x3f]);
- c1 = (c1 & 0x03) << 4;
- if (off >= len) {
- rs.append(base64_code[c1 & 0x3f]);
- break;
- }
- c2 = d[off++] & 0xff;
- c1 |= (c2 >> 4) & 0x0f;
- rs.append(base64_code[c1 & 0x3f]);
- c1 = (c2 & 0x0f) << 2;
- if (off >= len) {
- rs.append(base64_code[c1 & 0x3f]);
- break;
- }
- c2 = d[off++] & 0xff;
- c1 |= (c2 >> 6) & 0x03;
- rs.append(base64_code[c1 & 0x3f]);
- rs.append(base64_code[c2 & 0x3f]);
- }
- return rs.toString();
- }
-
- /**
- * Look up the 3 bits base64-encoded by the specified character,
- * range-checking againt conversion table
- * @param x the base64-encoded value
- * @return the decoded value of x
- */
- private static byte char64(char x) {
- if ((int)x > index_64.length)
- return -1;
- return index_64[(int)x];
- }
-
- /**
- * Decode a string encoded using bcrypt's base64 scheme to a
- * byte array. Note that this is *not* compatible with
- * the standard MIME-base64 encoding.
- * @param s the string to decode
- * @param maxolen the maximum number of bytes to decode
- * @return an array containing the decoded bytes
- * @throws IllegalArgumentException if maxolen is invalid
- */
- private static byte[] decode_base64(String s, int maxolen)
- throws IllegalArgumentException {
- StringBuffer rs = new StringBuffer();
- int off = 0, slen = s.length(), olen = 0;
- byte ret[];
- byte c1, c2, c3, c4, o;
-
- if (maxolen <= 0)
- throw new IllegalArgumentException ("Invalid maxolen");
-
- while (off < slen - 1 && olen < maxolen) {
- c1 = char64(s.charAt(off++));
- c2 = char64(s.charAt(off++));
- if (c1 == -1 || c2 == -1)
- break;
- o = (byte)(c1 << 2);
- o |= (c2 & 0x30) >> 4;
- rs.append((char)o);
- if (++olen >= maxolen || off >= slen)
- break;
- c3 = char64(s.charAt(off++));
- if (c3 == -1)
- break;
- o = (byte)((c2 & 0x0f) << 4);
- o |= (c3 & 0x3c) >> 2;
- rs.append((char)o);
- if (++olen >= maxolen || off >= slen)
- break;
- c4 = char64(s.charAt(off++));
- o = (byte)((c3 & 0x03) << 6);
- o |= c4;
- rs.append((char)o);
- ++olen;
- }
-
- ret = new byte[olen];
- for (off = 0; off < olen; off++)
- ret[off] = (byte)rs.charAt(off);
- return ret;
- }
-
- /**
- * Blowfish encipher a single 64-bit block encoded as
- * two 32-bit halves
- * @param lr an array containing the two 32-bit half blocks
- * @param off the position in the array of the blocks
- */
- private final void encipher(int lr[], int off) {
- int i, n, l = lr[off], r = lr[off + 1];
-
- l ^= P[0];
- for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
- // Feistel substitution on left word
- n = S[(l >> 24) & 0xff];
- n += S[0x100 | ((l >> 16) & 0xff)];
- n ^= S[0x200 | ((l >> 8) & 0xff)];
- n += S[0x300 | (l & 0xff)];
- r ^= n ^ P[++i];
-
- // Feistel substitution on right word
- n = S[(r >> 24) & 0xff];
- n += S[0x100 | ((r >> 16) & 0xff)];
- n ^= S[0x200 | ((r >> 8) & 0xff)];
- n += S[0x300 | (r & 0xff)];
- l ^= n ^ P[++i];
- }
- lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
- lr[off + 1] = l;
- }
-
- /**
- * Cycically extract a word of key material
- * @param data the string to extract the data from
- * @param offp a "pointer" (as a one-entry array) to the
- * current offset into data
- * @return the next word of material from data
- */
- private static int streamtoword(byte data[], int offp[]) {
- int i;
- int word = 0;
- int off = offp[0];
-
- for (i = 0; i < 4; i++) {
- word = (word << 8) | (data[off] & 0xff);
- off = (off + 1) % data.length;
- }
-
- offp[0] = off;
- return word;
- }
-
- /**
- * Initialise the Blowfish key schedule
- */
- private void init_key() {
- P = (int[])P_orig.clone();
- S = (int[])S_orig.clone();
- }
-
- /**
- * Key the Blowfish cipher
- * @param key an array containing the key
- */
- private void key(byte key[]) {
- int i;
- int koffp[] = { 0 };
- int lr[] = { 0, 0 };
- int plen = P.length, slen = S.length;
-
- for (i = 0; i < plen; i++)
- P[i] = P[i] ^ streamtoword(key, koffp);
-
- for (i = 0; i < plen; i += 2) {
- encipher(lr, 0);
- P[i] = lr[0];
- P[i + 1] = lr[1];
- }
-
- for (i = 0; i < slen; i += 2) {
- encipher(lr, 0);
- S[i] = lr[0];
- S[i + 1] = lr[1];
- }
- }
-
- /**
- * Perform the "enhanced key schedule" step described by
- * Provos and Mazieres in "A Future-Adaptable Password Scheme"
- * http://www.openbsd.org/papers/bcrypt-paper.ps
- * @param data salt information
- * @param key password information
- */
- private void ekskey(byte data[], byte key[]) {
- int i;
- int koffp[] = { 0 }, doffp[] = { 0 };
- int lr[] = { 0, 0 };
- int plen = P.length, slen = S.length;
-
- for (i = 0; i < plen; i++)
- P[i] = P[i] ^ streamtoword(key, koffp);
-
- for (i = 0; i < plen; i += 2) {
- lr[0] ^= streamtoword(data, doffp);
- lr[1] ^= streamtoword(data, doffp);
- encipher(lr, 0);
- P[i] = lr[0];
- P[i + 1] = lr[1];
- }
-
- for (i = 0; i < slen; i += 2) {
- lr[0] ^= streamtoword(data, doffp);
- lr[1] ^= streamtoword(data, doffp);
- encipher(lr, 0);
- S[i] = lr[0];
- S[i + 1] = lr[1];
- }
- }
-
- /**
- * Perform the central password hashing step in the
- * bcrypt scheme
- * @param password the password to hash
- * @param salt the binary salt to hash with the password
- * @param log_rounds the binary logarithm of the number
- * of rounds of hashing to apply
- * @return an array containing the binary hashed password
- */
- private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
- int rounds, i, j;
- int cdata[] = (int[])bf_crypt_ciphertext.clone();
- int clen = cdata.length;
- byte ret[];
-
- if (log_rounds < 4 || log_rounds > 31)
- throw new IllegalArgumentException ("Bad number of rounds");
- rounds = 1 << log_rounds;
- if (salt.length != BCRYPT_SALT_LEN)
- throw new IllegalArgumentException ("Bad salt length");
-
- init_key();
- ekskey(salt, password);
- for (i = 0; i < rounds; i++) {
- key(password);
- key(salt);
- }
-
- for (i = 0; i < 64; i++) {
- for (j = 0; j < (clen >> 1); j++)
- encipher(cdata, j << 1);
- }
-
- ret = new byte[clen * 4];
- for (i = 0, j = 0; i < clen; i++) {
- ret[j++] = (byte)((cdata[i] >> 24) & 0xff);
- ret[j++] = (byte)((cdata[i] >> 16) & 0xff);
- ret[j++] = (byte)((cdata[i] >> 8) & 0xff);
- ret[j++] = (byte)(cdata[i] & 0xff);
- }
- return ret;
- }
-
- /**
- * Hash a password using the OpenBSD bcrypt scheme
- * @param password the password to hash
- * @param salt the salt to hash with (perhaps generated
- * using BCrypt.gensalt)
- * @return the hashed password
- */
- public static String hashpw(String password, String salt) {
- BCrypt B;
- String real_salt;
- byte passwordb[], saltb[], hashed[];
- char minor = (char)0;
- int rounds, off = 0;
- StringBuffer rs = new StringBuffer();
-
- if (salt.charAt(0) != '$' || salt.charAt(1) != '2')
- throw new IllegalArgumentException ("Invalid salt version");
- if (salt.charAt(2) == '$')
- off = 3;
- else {
- minor = salt.charAt(2);
- if (minor != 'a' || salt.charAt(3) != '$')
- throw new IllegalArgumentException ("Invalid salt revision");
- off = 4;
- }
-
- // Extract number of rounds
- if (salt.charAt(off + 2) > '$')
- throw new IllegalArgumentException ("Missing salt rounds");
- rounds = Integer.parseInt(salt.substring(off, off + 2));
-
- real_salt = salt.substring(off + 3, off + 25);
- try {
- passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
- } catch (UnsupportedEncodingException uee) {
- throw new AssertionError("UTF-8 is not supported");
- }
-
- saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
-
- B = new BCrypt();
- hashed = B.crypt_raw(passwordb, saltb, rounds);
-
- rs.append("$2");
- if (minor >= 'a')
- rs.append(minor);
- rs.append("$");
- if (rounds < 10)
- rs.append("0");
- rs.append(Integer.toString(rounds));
- rs.append("$");
- rs.append(encode_base64(saltb, saltb.length));
- rs.append(encode_base64(hashed,
- bf_crypt_ciphertext.length * 4 - 1));
- return rs.toString();
- }
-
- /**
- * Generate a salt for use with the BCrypt.hashpw() method
- * @param log_rounds the log2 of the number of rounds of
- * hashing to apply - the work factor therefore increases as
- * 2**log_rounds.
- * @param random an instance of SecureRandom to use
- * @return an encoded salt value
- */
- public static String gensalt(int log_rounds, SecureRandom random) {
- StringBuffer rs = new StringBuffer();
- byte rnd[] = new byte[BCRYPT_SALT_LEN];
-
- random.nextBytes(rnd);
-
- rs.append("$2a$");
- if (log_rounds < 10)
- rs.append("0");
- rs.append(Integer.toString(log_rounds));
- rs.append("$");
- rs.append(encode_base64(rnd, rnd.length));
- return rs.toString();
- }
-
- /**
- * Generate a salt for use with the BCrypt.hashpw() method
- * @param log_rounds the log2 of the number of rounds of
- * hashing to apply - the work factor therefore increases as
- * 2**log_rounds.
- * @return an encoded salt value
- */
- public static String gensalt(int log_rounds) {
- return gensalt(log_rounds, new SecureRandom());
- }
-
- /**
- * Generate a salt for use with the BCrypt.hashpw() method,
- * selecting a reasonable default for the number of hashing
- * rounds to apply
- * @return an encoded salt value
- */
- public static String gensalt() {
- return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
- }
-
- /**
- * Check that a plaintext password matches a previously hashed
- * one
- * @param plaintext the plaintext password to verify
- * @param hashed the previously-hashed password
- * @return true if the passwords match, false otherwise
- */
- public static boolean checkpw(String plaintext, String hashed) {
- return (hashed.compareTo(hashpw(plaintext, hashed)) == 0);
- }
- }
-
-}
diff --git a/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt b/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt
deleted file mode 100644
index 90c0ce80f..000000000
--- a/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package ms.system.util
-
-import org.json.simple.JSONObject
-import org.json.simple.parser.JSONParser
-import java.io.File
-import java.io.FileReader
-import kotlin.system.exitProcess
-
-/**
- * Class for parsing the server config, I.E default.conf
- * @param path the path to the JSON file to parse.
- * @author Ceikry
- */
-class ManagementConfigParser(path: String) {
- val pathTo = parsePath(path)
- val confFile = File(pathTo)
- val parser = JSONParser()
- var reader: FileReader? = null
- var data: JSONObject? = null
-
- init {
- if(!confFile.canonicalFile.exists()){
- println("Could not find ${confFile.canonicalFile} - Double check your working directory!")
- exitProcess(0)
- } else if(!pathTo.contains(".json")) {
- println("Config file MUST be a JSON file!!")
- println("(Got $pathTo)")
- } else {
- reader = FileReader(pathTo)
- data = parser.parse(reader) as JSONObject
- parseDatabaseInformation()
- parseWorldTechnicalSettings()
- ManagementConstants.SECRET_KEY = data!!["secret_key"].toString()
- }
- }
-
- private fun parseDatabaseInformation(){
- data ?: return
- val dbData = data!!["DatabaseInformation"] as JSONObject
- ManagementConstants.parseDBProp(dbData)
- }
-
- private fun parseWorldTechnicalSettings(){
- data ?: return
- val wtiData = data!!["WorldTechnicalInformation"] as JSONObject
- ManagementConstants.parseWTIProp(wtiData)
- }
-
- /**
- * Parses a path string
- * @author Ceikry
- * @param pathString The string to parse
- * @return a String with the proper file separators for the current OS.
- */
- fun parsePath(pathString: String): String {
- var pathTokens: List? = null
- if(pathString.contains("/"))
- pathTokens = pathString.split("/")
- else if(pathString.contains("\\"))
- pathTokens = pathString.split("\\")
-
- pathTokens ?: return pathString //return the initial pathString if path does not contain file separators.
- var pathProduct = ""
- for(token in pathTokens){
- if(token != "")
- pathProduct += "$token${File.separator}"
- }
-
- return pathProduct
- }
-}
diff --git a/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt b/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt
deleted file mode 100644
index 01d40fb5a..000000000
--- a/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package ms.system.util
-
-import org.json.simple.JSONObject
-
-object ManagementConstants {
-
- //MySQL main database name
- var DATABASE_NAME: String = "global"
-
- //MySQL database username
- var DATABASE_USERNAME: String = "root"
-
- //MySQL database password
- var DATABASE_PASSWORD: String = ""
-
- //MySQL host
- var DATABASE_HOST_ADDRESS: String = "127.0.0.1"
-
- //MySQL port
- var DATABASE_PORT: Int = 3306
-
- //Max amount of worlds supported on the world list
- var MAX_WORLD_AMOUNT: Int = 10
-
- //User world hop delay in seconds
- var WORLD_HOP_DELAY: Long = 20_000L
-
- @JvmStatic
- var SECRET_KEY: String = ""
-
- fun parseDBProp(data: JSONObject) {
- DATABASE_NAME = data["database_name"].toString()
- DATABASE_USERNAME = data["database_username"].toString()
- DATABASE_PASSWORD = data["database_password"].toString()
- DATABASE_HOST_ADDRESS = data["database_host"].toString()
- DATABASE_PORT = data["database_port"].toString().toInt()
- }
-
- fun parseWTIProp(data: JSONObject) {
- MAX_WORLD_AMOUNT = data["world_limit"].toString().toInt()
- WORLD_HOP_DELAY = data["worldhop_delay"].toString().toLong()
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java b/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java
deleted file mode 100644
index e4187f7ee..000000000
--- a/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ms.system.util;
-
-/**
- * Handles generating a player database.
- * @author Emperor
- *
- */
-public final class PlayerDatabaseGen {
-
- /**
- * The main method.
- * @param args The arguments.
- */
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/system/util/StringUtils.java b/Management-Server/src/main/java/ms/system/util/StringUtils.java
deleted file mode 100644
index 2a85aea8f..000000000
--- a/Management-Server/src/main/java/ms/system/util/StringUtils.java
+++ /dev/null
@@ -1,640 +0,0 @@
-package ms.system.util;
-
-import java.text.DecimalFormat;
-
-import ms.net.packet.IoBuffer;
-
-/**
- * The string utils.
- * @author Emperor
- *
- */
-public final class StringUtils {
-
- /**
- * The valid characters to be used in names/messages/...
- */
- private static final char[] VALID_CHARS = {
- '_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
- 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
- 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
- };
- /**
- * The an int array241.
- */
- private final static int[] anIntArray241 = { 215, 203, 83, 158, 104, 101, 93, 84,
- 107, 103, 109, 95, 94, 98, 89, 86, 70, 41, 32, 27, 24, 23, -1, -2,
- 26, -3, -4, 31, 30, -5, -6, -7, 37, 38, 36, -8, -9, -10, 40, -11,
- -12, 55, 48, 46, 47, -13, -14, -15, 52, 51, -16, -17, 54, -18, -19,
- 63, 60, 59, -20, -21, 62, -22, -23, 67, 66, -24, -25, 69, -26, -27,
- 199, 132, 80, 77, 76, -28, -29, 79, -30, -31, 87, 85, -32, -33,
- -34, -35, -36, 197, -37, 91, -38, 134, -39, -40, -41, 97, -42, -43,
- 133, 106, -44, 117, -45, -46, 139, -47, -48, 110, -49, -50, 114,
- 113, -51, -52, 116, -53, -54, 135, 138, 136, 129, 125, 124, -55,
- -56, 130, 128, -57, -58, -59, 183, -60, -61, -62, -63, -64, 148,
- -65, -66, 153, 149, 145, 144, -67, -68, 147, -69, -70, -71, 152,
- 154, -72, -73, -74, 157, 171, -75, -76, 207, 184, 174, 167, 166,
- 165, -77, -78, -79, 172, 170, -80, -81, -82, 178, -83, 177, 182,
- -84, -85, 187, 181, -86, -87, -88, -89, 206, 221, -90, 189, -91,
- 198, 254, 262, 195, 196, -92, -93, -94, -95, -96, 252, 255, 250,
- -97, 211, 209, -98, -99, 212, -100, 213, -101, -102, -103, 224,
- -104, 232, 227, 220, 226, -105, -106, 246, 236, -107, 243, -108,
- -109, 231, 237, 235, -110, -111, 239, 238, -112, -113, -114, -115,
- -116, 241, -117, 244, -118, -119, 248, -120, 249, -121, -122, -123,
- 253, -124, -125, -126, -127, 259, 258, -128, -129, 261, -130, -131,
- 390, 327, 296, 281, 274, 271, 270, -132, -133, 273, -134, -135,
- 278, 277, -136, -137, 280, -138, -139, 289, 286, 285, -140, -141,
- 288, -142, -143, 293, 292, -144, -145, 295, -146, -147, 312, 305,
- 302, 301, -148, -149, 304, -150, -151, 309, 308, -152, -153, 311,
- -154, -155, 320, 317, 316, -156, -157, 319, -158, -159, 324, 323,
- -160, -161, 326, -162, -163, 359, 344, 337, 334, 333, -164, -165,
- 336, -166, -167, 341, 340, -168, -169, 343, -170, -171, 352, 349,
- 348, -172, -173, 351, -174, -175, 356, 355, -176, -177, 358, -178,
- -179, 375, 368, 365, 364, -180, -181, 367, -182, -183, 372, 371,
- -184, -185, 374, -186, -187, 383, 380, 379, -188, -189, 382, -190,
- -191, 387, 386, -192, -193, 389, -194, -195, 454, 423, 408, 401,
- 398, 397, -196, -197, 400, -198, -199, 405, 404, -200, -201, 407,
- -202, -203, 416, 413, 412, -204, -205, 415, -206, -207, 420, 419,
- -208, -209, 422, -210, -211, 439, 432, 429, 428, -212, -213, 431,
- -214, -215, 436, 435, -216, -217, 438, -218, -219, 447, 444, 443,
- -220, -221, 446, -222, -223, 451, 450, -224, -225, 453, -226, -227,
- 486, 471, 464, 461, 460, -228, -229, 463, -230, -231, 468, 467,
- -232, -233, 470, -234, -235, 479, 476, 475, -236, -237, 478, -238,
- -239, 483, 482, -240, -241, 485, -242, -243, 499, 495, 492, 491,
- -244, -245, 494, -246, -247, 497, -248, 502, -249, 506, 503, -250,
- -251, 505, -252, -253, 508, -254, 510, -255, -256, 0 };
-
- /**
- * Constructs a new {@code StringUtils.java} {@code Object}.
- */
- public StringUtils() {
- /**
- * empty.
- */
- }
- /**
- * Method used to get the formatted number as a string from the integer inputed.
- * @param amount the ammount.
- * @return the string value.
- */
- public static String getFormattedNumber(int amount) {
- return new DecimalFormat("#,###,##0").format(amount).toString();
- }
- /**
- * Checks if the string contains an invalid character.
- * @param nameThe string.
- * @return {@code True} if so.
- */
- public static boolean containsInvalidCharacter(String name) {
- for (char c : name.toCharArray()) {
- boolean pass = false;
- for (char vc : VALID_CHARS)
- if (vc == c) {
- pass = true;
- break;
- }
- if (!pass)
- return true;
- }
- return false;
- }
- /**
- * If a word starts with a e i o u h for grammar = a + n.
- * @param word The word.
- * @return If the a should have +n {@code true}.
- */
- public static boolean isPlusN(String word) {
- if (word == null)
- return false;
- String s = word.toLowerCase();
- return s.charAt(0) == 'a' || s.charAt(0) == 'e' || s.charAt(0) == 'i'
- || s.charAt(0) == 'o' || s.charAt(0) == 'u'
- || (s.charAt(0) == 'h' && s.length() > 1 && s.charAt(1) != 'e');
- }
- /**
- * Method used to get the player name as a long.
- * @param s the string.
- * @return the long.
- */
- public static long getPlayerNameLong(String s) {
- long l = 0L;
- for(int i = 0; i < s.length() && i < 12; i++) {
- char c = s.charAt(i);
- l *= 37L;
- if(c >= 'A' && c <= 'Z') l += (1 + c) - 65;
- else if(c >= 'a' && c <= 'z') l += (1 + c) - 97;
- else if(c >= '0' && c <= '9') l += (27 + c) - 48;
- }
- while(l % 37L == 0L && l != 0L) l /= 37L;
- return l;
- }
-
- /**
- * Method used to convert the string to a long.
- * @param s the string.
- * @return the long.
- */
- public static long convertStringToLong(String s) {
- if (s.length() > 20) {
- throw new IllegalArgumentException("String is too long: " + s);
- }
- long out = 0L;
- for (int i = 0; i < s.length(); ++i) {
- long m = reducedMapping(s.codePointAt(i));
- if (m == -1) {
- throw new IllegalArgumentException("Unmapped Character in String: " + s);
- }
- m <<= ((9 - i) * 6) + 4;
- out |= m;
- }
- return out;
- }
-
- /**
- * Formats the string as display name.
- * @param name The string to format.
- * @return The formatted name.
- */
- public static String formatDisplayName(String name) {
- name = name.replaceAll("_", " ");
- name = name.toLowerCase();
- StringBuilder newName = new StringBuilder();
- boolean wasSpace = true;
- for (int i = 0; i < name.length(); i++) {
- if (wasSpace) {
- newName.append(("" + name.charAt(i)).toUpperCase());
- wasSpace = false;
- } else {
- newName.append(name.charAt(i));
- }
- if (name.charAt(i) == ' ') {
- wasSpace = true;
- }
- }
- return newName.toString();
- }
-
- /**
- * Gets the byte for the character.
- * @param c The character.
- * @return The byte.
- */
- private static final byte getByte(char c) {
- byte charByte;
- if (c > 0 && c < '\200' || c >= '\240' && c <= '\377')
- charByte = (byte) c;
- else if (c != '\u20AC') {
- if (c != '\u201A') {
- if (c != '\u0192') {
- if (c == '\u201E')
- charByte = -124;
- else if (c != '\u2026') {
- if (c != '\u2020') {
- if (c == '\u2021')
- charByte = -121;
- else if (c == '\u02C6')
- charByte = -120;
- else if (c == '\u2030')
- charByte = -119;
- else if (c == '\u0160')
- charByte = -118;
- else if (c == '\u2039')
- charByte = -117;
- else if (c == '\u0152')
- charByte = -116;
- else if (c != '\u017D') {
- if (c == '\u2018')
- charByte = -111;
- else if (c != '\u2019') {
- if (c != '\u201C') {
- if (c == '\u201D')
- charByte = -108;
- else if (c != '\u2022') {
- if (c == '\u2013')
- charByte = -106;
- else if (c == '\u2014')
- charByte = -105;
- else if (c == '\u02DC')
- charByte = -104;
- else if (c == '\u2122')
- charByte = -103;
- else if (c != '\u0161') {
- if (c == '\u203A')
- charByte = -101;
- else if (c != '\u0153') {
- if (c == '\u017E')
- charByte = -98;
- else if (c != '\u0178')
- charByte = 63;
- else
- charByte = -97;
- } else
- charByte = -100;
- } else
- charByte = -102;
- } else
- charByte = -107;
- } else
- charByte = -109;
- } else
- charByte = -110;
- } else
- charByte = -114;
- } else
- charByte = -122;
- } else
- charByte = -123;
- } else
- charByte = -125;
- } else
- charByte = -126;
- } else
- charByte = -128;
- return charByte;
- }
- /**
- * Gets the double value of this string
- * @param s The string.
- * @return The double value.
- */
- public static double getDouble(String s) {
- s = s.replaceAll(", ", "").replaceAll(",", "");
- StringBuilder sb = new StringBuilder();
- char c;
- boolean foundStart = false;
- for (int i = 0; i < s.length(); i++) {
- c = s.charAt(i);
- if (Character.isDigit(c) || c == '-' || c == '.') {
- sb.append(c);
- foundStart = true;
- } else if (foundStart)
- break;
- }
- try {
- double amount = Double.parseDouble(sb.toString());
- return amount;
- } catch (NumberFormatException e) {
- return 0.0;
- }
- }
- /**
- * Gets the hash for the string.
- * @param str The string.
- * @return The hash.
- */
- public static final int getNameHash(String str) {
- str = str.toLowerCase();
- int hash = 0;
- for (int index = 0; index < str.length(); index++)
- hash = getByte(str.charAt(index)) + ((hash << 5) - hash);
- return hash;
- }
- /**
- * Gets the string value of this string (all html/... removed).
- * @param s The string.
- * @return The string value.
- */
- public static String getString(String s) {
- return s.replaceAll("\\<.*?>", "").replaceAll(" ", "")
- .replaceAll("Discontinued Item:", "");
- }
- /**
- * Characters used to convert a String to a Long.
- */
- public static char[] validChars = {
- '_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
- 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
- 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2',
- '3', '4', '5', '6', '7', '8', '9'
- };
- private final static int[] anIntArray233 = {
- 0, 1024, 2048, 3072, 4096, 5120,
- 6144, 8192, 9216, 12288, 10240, 11264, 16384, 18432, 17408, 20480,
- 21504, 22528, 23552, 24576, 25600, 26624, 27648, 28672, 29696,
- 30720, 31744, 32768, 33792, 34816, 35840, 36864, 536870912,
- 16777216, 37888, 65536, 38912, 131072, 196608, 33554432, 524288,
- 1048576, 1572864, 262144, 67108864, 4194304, 134217728, 327680,
- 8388608, 2097152, 12582912, 13631488, 14680064, 15728640,
- 100663296, 101187584, 101711872, 101974016, 102760448, 102236160,
- 40960, 393216, 229376, 117440512, 104857600, 109051904, 201326592,
- 205520896, 209715200, 213909504, 106954752, 218103808, 226492416,
- 234881024, 222298112, 224395264, 268435456, 272629760, 276824064,
- 285212672, 289406976, 223346688, 293601280, 301989888, 318767104,
- 297795584, 298844160, 310378496, 102498304, 335544320, 299892736,
- 300941312, 301006848, 300974080, 39936, 301465600, 49152,
- 1073741824, 369098752, 402653184, 1342177280, 1610612736,
- 469762048, 1476395008, -2147483648, -1879048192, 352321536,
- 1543503872, -2013265920, -1610612736, -1342177280, -1073741824,
- -1543503872, 356515840, -1476395008, -805306368, -536870912,
- -268435456, 1577058304, -134217728, 360710144, -67108864,
- 364904448, 51200, 57344, 52224, 301203456, 53248, 54272, 55296,
- 56320, 301072384, 301073408, 301074432, 301075456, 301076480,
- 301077504, 301078528, 301079552, 301080576, 301081600, 301082624,
- 301083648, 301084672, 301085696, 301086720, 301087744, 301088768,
- 301089792, 301090816, 301091840, 301092864, 301093888, 301094912,
- 301095936, 301096960, 301097984, 301099008, 301100032, 301101056,
- 301102080, 301103104, 301104128, 301105152, 301106176, 301107200,
- 301108224, 301109248, 301110272, 301111296, 301112320, 301113344,
- 301114368, 301115392, 301116416, 301117440, 301118464, 301119488,
- 301120512, 301121536, 301122560, 301123584, 301124608, 301125632,
- 301126656, 301127680, 301128704, 301129728, 301130752, 301131776,
- 301132800, 301133824, 301134848, 301135872, 301136896, 301137920,
- 301138944, 301139968, 301140992, 301142016, 301143040, 301144064,
- 301145088, 301146112, 301147136, 301148160, 301149184, 301150208,
- 301151232, 301152256, 301153280, 301154304, 301155328, 301156352,
- 301157376, 301158400, 301159424, 301160448, 301161472, 301162496,
- 301163520, 301164544, 301165568, 301166592, 301167616, 301168640,
- 301169664, 301170688, 301171712, 301172736, 301173760, 301174784,
- 301175808, 301176832, 301177856, 301178880, 301179904, 301180928,
- 301181952, 301182976, 301184000, 301185024, 301186048, 301187072,
- 301188096, 301189120, 301190144, 301191168, 301193216, 301195264,
- 301194240, 301197312, 301198336, 301199360, 301201408, 301202432
- };
- private final static byte[] aByteArray235 = {
- 22, 22, 22, 22, 22, 22, 21, 22, 22,
- 20, 22, 22, 22, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 3, 8, 22, 16, 22, 16, 17, 7, 13, 13, 13,
- 16, 7, 10, 6, 16, 10, 11, 12, 12, 12, 12, 13, 13, 14, 14, 11, 14,
- 19, 15, 17, 8, 11, 9, 10, 10, 10, 10, 11, 10, 9, 7, 12, 11, 10, 10,
- 9, 10, 10, 12, 10, 9, 8, 12, 12, 9, 14, 8, 12, 17, 16, 17, 22, 13,
- 21, 4, 7, 6, 5, 3, 6, 6, 5, 4, 10, 7, 5, 6, 4, 4, 6, 10, 5, 4, 4,
- 5, 7, 6, 10, 6, 10, 22, 19, 22, 14, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 22, 21, 22, 22, 22, 21,
- 22, 22
- };
- /**
- * Encrypt a string for the client.
- */
- public static int encryptPlayerChat(byte[] is, int i_25_, int i_26_, int i_27_, byte[] is_28_) {
- try {
- i_27_ += i_25_;
- int i_29_ = 0;
- int i_30_ = i_26_ << 3;
- for (; i_27_ > i_25_; i_25_++) {
- int i_31_ = 0xff & is_28_[i_25_];
- int i_32_ = anIntArray233[i_31_];
- int i_33_ = aByteArray235[i_31_];
- int i_34_ = i_30_ >> 3;
- int i_35_ = i_30_ & 0x7;
- i_29_ &= (-i_35_ >> 31);
- i_30_ += i_33_;
- int i_36_ = ((-1 + (i_35_ - -i_33_)) >> 3) + i_34_;
- i_35_ += 24;
- is[i_34_] = (byte) (i_29_ = (i_29_ | (i_32_ >>> i_35_)));
- if ((i_36_ ^ 0xffffffff) < (i_34_ ^ 0xffffffff)) {
- i_34_++;
- i_35_ -= 8;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_36_ > i_34_) {
- i_34_++;
- i_35_ -= 8;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_36_ > i_34_) {
- i_35_ -= 8;
- i_34_++;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_34_ < i_36_) {
- i_35_ -= 8;
- i_34_++;
- is[i_34_] = (byte) (i_29_ = i_32_ << -i_35_);
- }
- }
- }
- }
- }
- return -i_26_ + ((7 + i_30_) >> 3);
- } catch (RuntimeException runtimeexception) {
- runtimeexception.printStackTrace();
- }
- return 0;
- }
- /**
- * Gets an integer value from a string.
- * @param s the string.
- * @return The value;
- */
- public static int getValue(String s) {
- s = s.replaceAll(", ", "").replaceAll(",", "");
- StringBuilder sb = new StringBuilder();
- char c;
- boolean foundStart = false;
- for (int i = 0; i < s.length(); i++) {
- c = s.charAt(i);
- if (Character.isDigit(c) || c == '-') {
- sb.append(c);
- foundStart = true;
- } else if (foundStart)
- break;
- }
- try {
- int amount = Integer.parseInt(sb.toString());
- return amount;
- } catch (NumberFormatException e) {
- return 0;
- }
- }
- /**
- * Checks if the account name is valid.
- * @param name The account name.
- * @return {@code True} if the account name is invalid.
- */
- public static boolean invalidAccountName(String name) {
- return name.length() < 2 || name.length() > 12 || name.startsWith("_")|| name.endsWith("_") || name.contains("__") || containsInvalidCharacter(name);
- }
-
- /**
- * Converts a long to a string.
- * @param l The long.
- * @return The string.
- */
- public static String longToString(long l) {
- int i = 0;
- char ac[] = new char[32];
- while (l != 0L) {
- long l1 = l;
- l /= 37L;
- ac[11 - i++] = VALID_CHARS[(int) (l1 - l * 37L)];
- }
- return new String(ac, 12 - i, i);
- }
-
- /**
- * Packs a GJ2-String.
- * @param position The position to start.
- * @param buffer The byte-array.
- * @param str The string.
- * @return The size of the string.
- */
- public static final int packGJString2(int position, byte[] buffer,
- String str) {
- int length = str.length();
- int offset = position;
- for (int index = 0; length > index; index++) {
- int character = str.charAt(index);
- if (character > 127) {
- if (character > 2047) {
- buffer[offset++] = (byte) ((character | 919275) >> 12);
- buffer[offset++] = (byte) (128 | ((character >> 6) & 63));
- buffer[offset++] = (byte) (128 | (character & 63));
- } else {
- buffer[offset++] = (byte) ((character | 12309) >> 6);
- buffer[offset++] = (byte) (128 | (character & 63));
- }
- } else
- buffer[offset++] = (byte) character;
- }
- return offset - position;
- }
- /**
- * Method used to...
- * @param x idk,
- * @return the idk.
- */
- public static long reducedMapping(int x) {
- long out = -1;
- if (x >= 97 && x <= 122)
- out = x - 96;
- else if (x >= 65 && x <= 90)
- out = x - 37;
- else if (x >= 48 && x <= 57)
- out = x - +5;
- else if (x == 32)
- out = 63L;
- return out;
- }
- /**
- * Converts a string to a long.
- * @param s The string.
- * @return The long.
- */
- public static long stringToLong(String s) {
- long l = 0L;
- for (int i = 0; i < s.length() && i < 12; i++) {
- char c = s.charAt(i);
- l *= 37L;
- if (c >= 'A' && c <= 'Z')
- l += (1 + c) - 65;
- else if (c >= 'a' && c <= 'z')
- l += (1 + c) - 97;
- else if (c >= '0' && c <= '9')
- l += (27 + c) - 48;
- }
- while (l % 37L == 0L && l != 0L)
- l /= 37L;
- return l;
- }
- /**
- * Decrypt player chat.
- *
- * @param buffer
- * The buffer
- * @param totalChars
- * The total chars
- * @return The string
- */
- public static String decryptPlayerChat(IoBuffer buffer, int totalChars) {
- try {
- if (totalChars == 0)
- return "";
- int charsDecoded = 0;
- int i_4_ = 0;
- String s = "";
- for (;;) {
- byte i_7_ = (byte) buffer.get();
- if (i_7_ >= 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- int i_8_;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x40) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- if ((0x20 & i_7_) == 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((0x10 & i_7_) ^ 0xffffffff) == -1)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
-
- i_4_ = 0;
- }
- if (((0x8 & i_7_) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- if ((0x4 & i_7_) == 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x2) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x1) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- }
- return s;
- } catch (RuntimeException runtimeexception) {
- runtimeexception.printStackTrace();
- }
- return "";
- }
-}
diff --git a/Management-Server/src/main/java/ms/system/util/TaskExecutor.java b/Management-Server/src/main/java/ms/system/util/TaskExecutor.java
deleted file mode 100644
index e2b3c886b..000000000
--- a/Management-Server/src/main/java/ms/system/util/TaskExecutor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package ms.system.util;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * A class holding methods to execute tasks.
- * @author Emperor
- *
- */
-public final class TaskExecutor {
-
- /**
- * The executor to use.
- */
- private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-
- /**
- * The SQL task executor.
- */
- private static final ScheduledExecutorService SQL_EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-
- /**
- * Constructs a new {@code TaskExecutor} {@code Object}.
- */
- private TaskExecutor() {
- /*
- * empty.
- */
- }
-
- /**
- * Executes an SQL handling task.
- * @param task The task.
- */
- public static void executeSQL(Runnable task) {
- SQL_EXECUTOR.execute(task);
- }
-
- /**
- * Executes the task.
- * @param task The task to execute.
- */
- public static void execute(Runnable task) {
- EXECUTOR.execute(task);
- }
-
- /**
- * Gets the executor.
- * @return The executor.
- */
- public static ScheduledExecutorService getExecutor() {
- return EXECUTOR;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/GameServer.java b/Management-Server/src/main/java/ms/world/GameServer.java
deleted file mode 100644
index fed3069b7..000000000
--- a/Management-Server/src/main/java/ms/world/GameServer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package ms.world;
-
-import ms.net.IoSession;
-import ms.net.packet.WorldPacketRepository;
-import ms.system.mysql.SQLEntryHandler;
-import ms.system.mysql.WorldListSQLHandler;
-import ms.system.util.TaskExecutor;
-import ms.world.info.Response;
-import ms.world.info.WorldInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Represents a game world.
- * @author Emperor
- *
- */
-public final class GameServer {
-
- /**
- * The world info.
- */
- private final WorldInfo info;
-
- /**
- * The I/O session.
- */
- private IoSession session;
-
- /**
- * The players active on the game server.
- */
- private final Map players = new HashMap<>();
-
- /**
- * The scheduled future for the updating task.
- */
- private ScheduledFuture future;
-
- /**
- * constructs a new {@code GameServer} {@code Object}.
- * @param info The world info.
- */
- public GameServer(WorldInfo info) {
- this.info = info;
- }
-
- /**
- * Configures the game server.
- * @param session The I/O session.
- */
- public void configure(IoSession session) {
- this.session = session;
- session.setGameServer(this);
- future = TaskExecutor.getExecutor().scheduleAtFixedRate(() -> {
- SQLEntryHandler.write(new WorldListSQLHandler(GameServer.this));
- if (!isActive()) {
- future.cancel(false);
- future = null;
- }
- }, 0, 10, TimeUnit.SECONDS);
- }
-
- /**
- * Registers a player.
- * @param player The player.
- */
- public void register(PlayerSession player) {
- players.put(player.getUsername(), player);
- player.setWorld(this);
- player.setActive(true);
- player.setWorldId(info.getWorldId());
- player.configure();
- WorldPacketRepository.sendRegistryResponse(this, player, Response.SUCCESSFUL);
- player.getCommunication().sync();
- }
-
- /**
- * Checks if the game server is active.
- * @return {@code True} if so.
- */
- public boolean isActive() {
- return session.isActive();
- }
-
- /**
- * @return the playerAmount
- */
- public int getPlayerAmount() {
- return players.size();
- }
-
- /**
- * @return the info
- */
- public WorldInfo getInfo() {
- return info;
- }
-
- /**
- * @return the session
- */
- public IoSession getSession() {
- return session;
- }
-
- /**
- * @param session the session to set
- */
- public void setSession(IoSession session) {
- this.session = session;
- }
-
- /**
- * Gets the players value.
- * @return The players.
- */
- public Map getPlayers() {
- return players;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/PlayerSession.java b/Management-Server/src/main/java/ms/world/PlayerSession.java
deleted file mode 100644
index 09c4682d5..000000000
--- a/Management-Server/src/main/java/ms/world/PlayerSession.java
+++ /dev/null
@@ -1,475 +0,0 @@
-package ms.world;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import ms.ServerConstants;
-import ms.system.communication.ClanRepository;
-import ms.system.communication.CommunicationInfo;
-import ms.system.mysql.SQLManager;
-import ms.world.info.UIDInfo;
-
-/**
- * Represents a player session.
- * @author Emperor
- *
- */
-public final class PlayerSession {
-
- /**
- * The player's communication info.
- */
- private CommunicationInfo communication = new CommunicationInfo(this);
-
- /**
- * The game server the player is currently in.
- */
- private GameServer world;
-
- /**
- * The current clan.
- */
- private ClanRepository clan;
-
- /**
- * The player's UID info.
- */
- private UIDInfo uid;
-
- /**
- * The username.
- */
- private final String username;
-
- /**
- * The password.
- */
- private String password;
-
- /**
- * The player's rights.
- */
- private int rights;
-
- /**
- * The world id.
- */
- private int worldId;
-
- /**
- * If the player session is active.
- */
- private boolean active;
-
- /**
- * The time stamp of last disconnection.
- */
- private long disconnectionTime = 0L;
-
- /**
- * How long the player is banned for.
- */
- private long banTime;
-
- /**
- * How long the player is muted for.
- */
- private long muteTime;
-
- /**
- * The last world the player logged in.
- */
- private int lastWorld = -1;
-
- /**
- * The chat icon.
- */
- private int chatIcon;
-
- /**
- * Constructs a new {@code PlayerSession} {@code Object}.
- * @param username The username.
- * @param password The password.
- * @param ipAddress The ip address.
- * @param macAddress The mac address.
- * @param computerName The computer name.
- * @param serial The motherboard serial key.
- */
- public PlayerSession(String username, String password, UIDInfo uid) {
- this.username = username;
- this.password = password;
- this.uid = uid;
- }
-
- /**
- * Parses the session's data from the database.
- * @return {@code True} if parsed.
- */
- public boolean parse() {
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return false;
- }
- ResultSet result = null;
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("SELECT * FROM " + "members" + " WHERE " + "" + "username" + "='" + username.toLowerCase() + "' LIMIT 1");
- result = statement.executeQuery();
- if (result == null || !result.next()) {
- SQLManager.close(connection);
- return false;
- }
- rights = result.getInt("rights");
- disconnectionTime = result.getLong("disconnectTime");
- lastWorld = result.getInt("lastWorld");
- banTime = result.getLong("banTime");
- communication.parse(result);
- uid.parse(result);
- SQLManager.close(connection);
- } catch (SQLException ex) {
- ex.printStackTrace();
- SQLManager.close(connection);
- return false;
- } finally {
- SQLManager.close(connection);
- }
- return true;
- }
-
- /**
- * Called when a session is removed.
- */
- public void remove() {
- if (world != null && world.getInfo().getRevision() == 498) {
- return;
- }
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return;
- }
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("UPDATE members SET disconnectTime = ?, lastWorld = ?, contacts = ?, blocked = ?, clanName = ?, currentClan = ?, clanReqs = ?, chatSettings = ?, online= ? WHERE username = ?");
- statement.setLong(1, System.currentTimeMillis());
- statement.setInt(2, worldId);
- communication.save(statement);
- statement.setBoolean(9, false);
- statement.setString(10, username);
- statement.executeUpdate();
- SQLManager.close(connection);
- } catch (SQLException e) {
- e.printStackTrace();
- SQLManager.close(connection);
- } finally {
- SQLManager.close(connection);
- }
- communication.clear();
- }
-
- /**
- * Gets a player session.
- * @param username the username.
- * @return the player session.
- */
- public static PlayerSession get(String username) {
- PlayerSession session = new PlayerSession(username, "", new UIDInfo());
- if (!session.parse()) {
- return null;
- }
- return session;
- }
-
- /**
- * Configures the player session.
- */
- public void configure() {
- ClanRepository clan = ClanRepository.getClans().get(username);
- if (clan != null) {
- clan.setOwner(this);
- }
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return;
- }
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("UPDATE members SET online = ?, lastWorld = ?, lastLogin = ? WHERE username = ?");
- statement.setBoolean(1, true);
- statement.setInt(2, worldId);
- statement.setLong(3, System.currentTimeMillis());
- statement.setString(4, username);
- statement.execute();
- SQLManager.close(connection);
- } catch (SQLException e) {
- e.printStackTrace();
- SQLManager.close(connection);
- } finally {
- SQLManager.close(connection);
- }
- }
-
- /**
- * Checks if the player has just moved worlds.
- * @return {@code True} if so.
- */
- public boolean hasMovedWorld() {
- if (rights == 2) {
- return false;
- }
- return System.currentTimeMillis() - disconnectionTime < ServerConstants.WORLD_SWITCH_DELAY;
- }
-
- /**
- * Gets the username value.
- * @return The username.
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * Gets the password value.
- * @return The password.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Gets the chat icon.
- * @return The chat icon.
- */
- public int getChatIcon() {
- return chatIcon;
- }
-
- /**
- * Gets the ipAddress value.
- * @return The ipAddress.
- */
- public String getIpAddress() {
- return uid.getIp();
- }
-
- /**
- * Gets the macAddress value.
- * @return The macAddress.
- */
- public String getMacAddress() {
- return uid.getMac();
- }
-
- /**
- * Gets the computerName value.
- * @return The computerName.
- */
- public String getComputerName() {
- return uid.getCompName();
- }
-
- /**
- * Gets the worldId value.
- * @return The worldId.
- */
- public int getWorldId() {
- return worldId;
- }
-
- /**
- * Sets the worldId value.
- * @param worldId The worldId to set.
- */
- public void setWorldId(int worldId) {
- this.worldId = worldId;
- }
-
- /**
- * Gets the active value.
- * @return The active.
- */
- public boolean isActive() {
- return active;
- }
-
- /**
- * Sets the active value.
- * @param active The active to set.
- */
- public void setActive(boolean active) {
- this.active = active;
- }
-
- /**
- * Gets the serialKey value.
- * @return The serialKey.
- */
- public String getSerialKey() {
- return uid.getSerial();
- }
-
- /**
- * Gets the rights value.
- * @return The rights.
- */
- public int getRights() {
- return rights;
- }
-
- /**
- * Sets the rights value.
- * @param rights The rights to set.
- */
- public void setRights(int rights) {
- this.rights = rights;
- }
-
- /**
- * If the player is banned.
- * @return {@code true} if so.
- */
- public boolean isBanned() {
- return banTime > System.currentTimeMillis();
- }
-
- /**
- * Gets the banTime value.
- * @return The banTime.
- */
- public long getBanTime() {
- return banTime;
- }
-
- /**
- * Gets the muteTime.
- * @return the muteTime.
- */
- public long getMuteTime() {
- return muteTime;
- }
-
-
- /**
- * Sets the muteTime.
- * @param muteTime the muteTime to set
- */
- public void setMuteTime(long muteTime) {
- this.muteTime = muteTime;
- }
-
-
- /**
- * Gets the disconnectionTime value.
- * @return The disconnectionTime.
- */
- public long getDisconnectionTime() {
- return disconnectionTime;
- }
-
- /**
- * Gets the lastWorld value.
- * @return The lastWorld.
- */
- public int getLastWorld() {
- return lastWorld;
- }
-
- /**
- * Sets the lastWorld value.
- * @param lastWorld The lastWorld to set.
- */
- public void setLastWorld(int lastWorld) {
- this.lastWorld = lastWorld;
- }
-
- /**
- * Gets the communication value.
- * @return The communication.
- */
- public CommunicationInfo getCommunication() {
- return communication;
- }
-
- /**
- * Sets the communication value.
- * @param communication The communication to set.
- */
- public void setCommunication(CommunicationInfo communication) {
- this.communication = communication;
- }
-
- /**
- * Gets the world value.
- * @return The world.
- */
- public GameServer getWorld() {
- return world;
- }
-
- /**
- * Sets the world value.
- * @param world The world to set.
- */
- public void setWorld(GameServer world) {
- this.world = world;
- }
-
- /**
- * Gets the clan value.
- * @return The clan.
- */
- public ClanRepository getClan() {
- return clan;
- }
-
- /**
- * Sets the clan value.
- * @param clan The clan to set.
- */
- public void setClan(ClanRepository clan) {
- this.clan = clan;
- }
-
- /**
- * Sets the chat icon.
- * @param chatIcon
- */
- public void setChatIcon(int chatIcon) {
- this.chatIcon = chatIcon;
- }
-
- /**
- * Gets the uid.
- * @return the uid.
- */
- public UIDInfo getUid() {
- return uid;
- }
-
- /**
- * Sets the uid.
- * @param uid the uid to set
- */
- public void setUid(UIDInfo uid) {
- this.uid = uid;
- }
-
- /**
- * Sets the disconnect time.
- * @param time the time.
- */
- public void setDisconnectTime(long time) {
- this.disconnectionTime = time;
- }
-
- public boolean equalsSession(PlayerSession o){
- return username.equals(o.username);
- }
-
- @Override
- public String toString() {
- return "player [name=" + username + ", pass=" + password + ", ip=" + uid.getIp() + ", mac=" + uid.getMac() + ", comp=" + uid.getCompName() + ", msk=" + uid.getSerial() + "]";
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/WorldDatabase.java b/Management-Server/src/main/java/ms/world/WorldDatabase.java
deleted file mode 100644
index e23e17f17..000000000
--- a/Management-Server/src/main/java/ms/world/WorldDatabase.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package ms.world;
-
-import java.nio.ByteBuffer;
-
-import ms.ServerConstants;
-import ms.net.IoSession;
-import ms.net.packet.IoBuffer;
-import ms.world.info.CountryFlag;
-import ms.world.info.WorldInfo;
-import ms09.MSLogger;
-
-/**
- * Holds all the world servers.
- * @author Emperor
- *
- */
-public class WorldDatabase {
-
- /**
- * The game servers.
- */
- private static final GameServer[] DATABASE = new GameServer[ServerConstants.WORLD_LIMIT];
-
- /**
- * The update time stamp.
- */
- private static long updateStamp = System.currentTimeMillis();
-
- /**
- * Used to prevent {@code WorldDatabase} from getting instantiated.
- */
- private WorldDatabase() {
- /*
- * empty.
- */
- }
-
- /**
- * Gets the packet to update the world list in the lobby.
- * @param player The player.
- * @param worldConfiguration If the configuration should be added.
- * @param worldStatus If the status should be added.
- * @return The {@code OutgoingPacket} to write.
- */
- public static void sendUpdate(IoSession session, int updateStamp) {
- ByteBuffer buf = ByteBuffer.allocate(1024);
- buf.put((byte) 0);
- buf.putShort((short) 0);
- buf.put((byte) 1);
- IoBuffer buffer = new IoBuffer();
- if (updateStamp == (int) WorldDatabase.updateStamp) {
- buf.put((byte) 0);
- } else {
- buf.put((byte) 1); // Indicates an update occured.
- putWorldListinfo(buffer);
- }
- putPlayerInfo(buffer);
- if (buffer.toByteBuffer().position() > 0) {
- buf.put((ByteBuffer) buffer.toByteBuffer().flip());
- }
- buf.putShort(1, (short) (buf.position() - 3));
- session.queue((ByteBuffer) buf.flip());
- }
-
- /**
- * Adds the world status on the packet.
- * @param buffer The current packet.
- */
- private static void putPlayerInfo(IoBuffer buffer) {
- for (GameServer server : DATABASE) {
- if (server != null) {
- WorldInfo w = server.getInfo();
- buffer.putSmart(w.getWorldId());
- buffer.putShort(server.isActive() ? server.getPlayerAmount() : -1);
- }
- }
- }
-
- /**
- * Sets the countries for each world.
- * @param buffer The current packet.
- */
- private static void putCountryInfo(IoBuffer buffer) {
- for (CountryFlag country : CountryFlag.values()) {
- buffer.putSmart(country.getId());
- buffer.putJagString(capitalize(country.name().toLowerCase()));
- }
- }
-
- /**
- * Converts a string to a capitalized string
- * @param name
- * @return
- */
- private static String capitalize(String name) {
- if (name == null || name.length() == 0) {
- return name;
- } else {
- char[] chars = name.toCharArray();
- chars[0] = Character.toUpperCase(chars[0]);
- return new String(chars);
- }
- }
-
- /**
- * Adds the world configuration on the packet.
- * @param buffer The current packet.
- */
- private static void putWorldListinfo(IoBuffer buffer) {
- buffer.putSmart(CountryFlag.values().length);
- putCountryInfo(buffer);
- buffer.putSmart(0);
- buffer.putSmart(DATABASE.length);
- buffer.putSmart(getRegisteredAmount());
- for (GameServer server : DATABASE) {
- if (server != null) {
- WorldInfo w = server.getInfo();
- buffer.putSmart(w.getWorldId());
- buffer.put(w.getCountry().ordinal());
- buffer.putInt(w.getSettings());
- buffer.putJagString(w.getActivity());
- buffer.putJagString(w.getAddress());
- }
- }
- buffer.putInt((int) updateStamp);
- }
-
- /**
- * Gets the amount of worlds registered.
- * @return The amount of worlds registered.
- */
- public static int getRegisteredAmount() {
- int count = 0;
- for (GameServer server : DATABASE) {
- if (server != null) {
- count++;
- }
- }
- return count;
- }
-
- /**
- * Registers a game server.
- * @param info The game world info.
- */
- public static GameServer register(WorldInfo info) {
- GameServer server = DATABASE[info.getWorldId()];
- if (server != null && server.getSession().isActive() && !server.getSession().getAddress().equals(info.getAddress())) {
- throw new IllegalStateException("World " + info.getWorldId() + " is already registered!");
- }
- flagUpdate();
- MSLogger.logInfo("Registered world - [id=" + info.getWorldId() + ", ip=" + info.getAddress() + ", country=" + info.getCountry().name().toLowerCase() + ", revision=" + info.getRevision() + "]!");
- return DATABASE[info.getWorldId()] = new GameServer(info);
- }
-
- public static void unRegister(GameServer server){
- int index = -1;
- for(int i = 0; i < DATABASE.length; i++){
- GameServer s = DATABASE[i];
- if(s == server){
- index = i;
- break;
- }
- }
- if(index != -1){
- DATABASE[index] = null;
- WorldInfo info = server.getInfo();
- MSLogger.logInfo("Unregistered world - [id=" + info.getWorldId() + ", ip=" + info.getAddress() + ", country=" + info.getCountry().name().toLowerCase() + ", revision=" + info.getRevision() + "]!");
- }
- }
-
- /**
- * Gets the world id of the player.
- * @param username The username of the player.
- * @return The world id.
- */
- public static int getWorldId(String username) {
- return getWorldId(getPlayer(username));
- }
-
- /**
- * Gets the world id of the player.
- * @param player The player.
- * @return The world id.
- */
- public static int getWorldId(PlayerSession player) {
- if (player == null || !player.isActive()) {
- return 0;
- }
- return player.getWorldId();
- }
-
- /**
- * Checks if the game world is active.
- * @param worldId The world id.
- * @return {@code True} if so.
- */
- public static boolean isActive(int worldId) {
- GameServer server = get(worldId);
- return server != null && server.isActive();
- }
-
- /**
- * Checks if the player session for the given name is active.
- * @param username The player's username.
- * @return {@code True} if so.
- */
- public static boolean isActivePlayer(String username) {
- PlayerSession session = getPlayer(username);
- return session != null && session.isActive();
- }
-
- /**
- * Gets the player session for the given name.
- * @param username The player's username.
- * @return The player session.
- */
- public static PlayerSession getPlayer(String username) {
- return getPlayer(username, false);
- }
-
- /**
- * Gets the player session for the given name.
- * @param username The player's username.
- * @param load If we load the users data.
- * @return The player session.
- */
- public static PlayerSession getPlayer(String username, boolean load) {
- for (GameServer server : DATABASE) {
- if (server != null && server.isActive()) {
- PlayerSession player = server.getPlayers().get(username);
- if (player != null) {
- return player;
- }
- }
- }
- if (load) {
- return PlayerSession.get(username);
- }
- return null;
- }
-
- /**
- * Gets the game server for the given world id.
- * @param worldId The world id.
- * @return The game server.
- */
- public static GameServer get(int worldId) {
- return DATABASE[worldId];
- }
-
- /**
- * Gets all the game servers.
- * @return The list of game servers.
- */
- public static GameServer[] getWorlds() {
- return DATABASE;
- }
-
- /**
- * Gets the updateStamp.
- * @return the updateStamp
- */
- public static long getUpdateStamp() {
- return updateStamp;
- }
-
- /**
- * Sets the updateStamp.
- * @param updateStamp the updateStamp to set.
- */
- public static void flagUpdate() {
- WorldDatabase.updateStamp = System.currentTimeMillis();
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/CountryFlag.java b/Management-Server/src/main/java/ms/world/info/CountryFlag.java
deleted file mode 100644
index f59a31a26..000000000
--- a/Management-Server/src/main/java/ms/world/info/CountryFlag.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package ms.world.info;
-
-/**
- * The country flags.
- * @author Emperor
- *
- */
-public enum CountryFlag {
-
- /**
- * Belgium
- */
- BELGIUM(22),
-
- /**
- * Canada.
- */
- CANADA(38),
-
- /**
- * The united kingdom.
- */
- UNITED_KINGDOM(77),
-
- /**
- * Netherlands
- */
- NETHERLANDS(161),
-
- /**
- * Sweden
- */
- SWEDEN(191),
-
- /**
- * Finland
- */
- FINLAND(69),
-
- /**
- * Australia.
- */
- AUSTRALIA(16),
-
- /**
- * America (USA)
- */
- UNITED_STATES_OF_AMERICA(225),
-
- /**
- * Norway
- */
- NORWAY(162),
-
- /**
- * Ireland
- */
- IRELAND(101),
-
- /**
- * DENMARK
- */
- DENMARK(58),
-
- /**
- * Brazil
- */
- BRAZIL(31),
-
- /**
- * Mexico
- */
- MEXICO(152),
-
- ;
-
- /**
- * The flag id.
- */
- private final int id;
-
- /**
- * Constructs a new {@code CountryFlag} {@code Object}.
- * @param id The flag id.
- */
- private CountryFlag(int id) {
- this.id = id;
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/Response.java b/Management-Server/src/main/java/ms/world/info/Response.java
deleted file mode 100644
index 7d8ae0c73..000000000
--- a/Management-Server/src/main/java/ms/world/info/Response.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package ms.world.info;
-
-/**
- * Holds the response codes during the attempt to login.
- * @author Emperor
- */
-public enum Response {
-
- /**
- * An unexpected server response occurred.
- */
- UNEXPECTED_RESPONSE(0),
-
- /**
- * Could not display advertisement video, logging in in x seconds.
- */
- COULD_NOT_DISPLAY_AD(1),
-
- /**
- * A successful login.
- */
- SUCCESSFUL(2),
-
- /**
- * Invalid username or password has been entered.
- */
- INVALID_CREDENTIALS(3),
-
- /**
- * This account is banned.
- */
- ACCOUNT_DISABLED(4),
-
- /**
- * This account is already logged in.
- */
- ALREADY_ONLINE(5),
-
- /**
- * We have updated and client needs to be reloaded.
- */
- UPDATED(6),
-
- /**
- * The world is full.
- */
- FULL_WORLD(7),
-
- /**
- * Login server is offline.
- */
- LOGIN_SERVER_OFFLINE(8),
-
- /**
- * The login limit has been exceeded.
- */
- LOGIN_LIMIT_EXCEEDED(9),
-
- /**
- * The session key was invalid.
- */
- BAD_SESSION_ID(10),
-
- /**
- * The password is too weak, and should be improved.
- */
- WEAK_PASSWORD(11),
-
- /**
- * When trying to connect to a members world while being f2p.
- */
- MEMBERS_WORLD(12),
-
- /**
- * Could not login.
- */
- COULD_NOT_LOGIN(13),
-
- /**
- * The server is currently updating.
- */
- UPDATING(14),
-
- /**
- * Too many incorrect login attempts from your address.
- */
- TOO_MANY_INCORRECT_LOGINS(16),
-
- /**
- * When logging on a free world while standing in members area.
- */
- STANDING_IN_MEMBER(17),
-
- /**
- * This account is locked as it might have been stolen.
- */
- LOCKED(18),
-
- /**
- * Closed beta going on.
- */
- CLOSED_BETA(19),
-
- /**
- * The login server connected to is invalid.
- */
- INVALID_LOGIN_SERVER(20),
-
- /**
- * Moving from another world...
- */
- MOVING_WORLD(21),
-
- /**
- * When the player's saved file exists, but is unable to be loaded.
- */
- ERROR_LOADING_PROFILE(24),
-
- /**
- * This computer address is disabled as it was used to break our rules.
- */
- BANNED(26);
-
- /**
- * The buffer.
- */
- private final int opcode;
-
- /**
- * Constructs a new {@code Response} {@code Object}.
- * @param opcode The login response opcode.
- */
- Response(int opcode) {
- this.opcode = opcode;
- }
-
- /**
- * Gets the opcode.
- * @return The opcode.
- */
- public int opcode() {
- return opcode;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/UIDInfo.java b/Management-Server/src/main/java/ms/world/info/UIDInfo.java
deleted file mode 100644
index 3bcf2d9d6..000000000
--- a/Management-Server/src/main/java/ms/world/info/UIDInfo.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package ms.world.info;
-
-import java.nio.ByteBuffer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.StringTokenizer;
-
-import ms.system.util.ByteBufferUtils;
-
-/**
- * The unique info of a player.
- * @author Vexia
- *
- */
-public class UIDInfo {
-
- /**
- * The ip address.
- */
- private String ip;
-
- /**
- * The computer name.
- */
- private String compName;
-
- /**
- * The mac-address.
- */
- private String mac;
-
- /**
- * The motherboard serial of the user.
- */
- private String serial;
-
-
- /**
- * Constructs a new {@code UIDInfo} {@code Object}
- */
- public UIDInfo() {
- /*
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code UIDInfo} {@code Object}
- * @param ip the ip.
- * @param compName the computer name.
- * @param mac the mac.
- * @param serial the serial.
- */
- public UIDInfo(String ip, String compName, String mac, String serial) {
- this.ip = ip;
- this.compName = compName;
- this.mac = mac;
- this.serial = serial;
- }
-
- /**
- * Parses the data from a prepared statement.
- * @param set The result set
- * @throws SQLException The exception if thrown.
- */
- public void parse(ResultSet set) throws SQLException {
- setIp(parseFormat(set.getString("ip")));
- setCompName(parseFormat(set.getString("computerName")));
- setMac(parseFormat(set.getString("mac")));
- setSerial(parseFormat(set.getString("serial")));
- }
-
- /**
- * Saves the UID data on the buffer.
- * @param buffer The buffer.
- */
- public void save(ByteBuffer buffer) {
- save(buffer, ip, 1);
- save(buffer, compName, 2);
- save(buffer, mac, 3);
- save(buffer, serial, 4);
- buffer.put((byte) 0);
- }
-
- /**
- * Parses the UID data from the buffer.
- * @param buffer The buffer.
- */
- public void parse(ByteBuffer buffer) {
- int opcode;
- while ((opcode = buffer.get()) != 0) {
- switch (opcode) {
- case 1:
- ip = ByteBufferUtils.getString(buffer);
- break;
- case 2:
- compName = ByteBufferUtils.getString(buffer);
- break;
- case 3:
- mac = ByteBufferUtils.getString(buffer);
- break;
- case 4:
- serial = ByteBufferUtils.getString(buffer);
- break;
- default:
- break;
- }
- }
- }
-
- /**
- * Parses a string with a certain format.
- * @param string the string.
- * @return the string.
- */
- private String parseFormat(String string) {
- if (string == null || string.equals("")) {
- return null;
- }
- StringTokenizer token = new StringTokenizer(string, "|");
- String s = "";
- int t = token.countTokens();
- for (int i = 0; i < t; i++) {
- s = token.nextToken();
- }
- return s;
- }
-
- /**
- * Saves a string value to the buffer.
- * @param buffer the buffer.
- * @param value the value.
- * @param opcode the opcode.
- */
- private void save(ByteBuffer buffer, String value, int opcode) {
- if (value == null) {
- return;
- }
- ByteBufferUtils.putString(value, buffer.put((byte) opcode));
- }
-
- /**
- * Converts a to string in format mode for an admin or mod.
- * @param admin the admin.
- * @return the string.
- */
- public String toString(boolean admin) {
- String format = toString();
- if (!admin) {//formats for non-admins
- String[] tokens = format.split("serial=");
- format = format.replace("serial=", "uid=").replace(tokens[tokens.length - 1], "*****");
- }
- return format;
- }
-
- /**
- * Gets the compName.
- * @return the compName
- */
- public String getCompName() {
- return compName;
- }
-
- /**
- * Gets the ip.
- * @return the ip
- */
- public String getIp() {
- return ip;
- }
-
- /**
- * Gets the mac.
- * @return the mac
- */
- public String getMac() {
- return mac;
- }
-
- /**
- * Gets the serial.
- * @return the serial
- */
- public String getSerial() {
- return serial;
- }
-
- /**
- * Sets the ip.
- * @param ip the ip to set.
- */
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- /**
- * Sets the compName.
- * @param compName the compName to set.
- */
- public void setCompName(String compName) {
- this.compName = compName;
- }
-
- /**
- * Sets the mac.
- * @param mac the mac to set.
- */
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- /**
- * Sets the serial.
- * @param serial the serial to set.
- */
- public void setSerial(String serial) {
- this.serial = serial;
- }
-
- @Override
- public String toString() {
- return "[ip=" + ip + ", compName=" + compName + ", mac=" + mac + ", serial=" + serial + "]";
- }
-}
diff --git a/Management-Server/src/main/java/ms/world/info/WorldInfo.java b/Management-Server/src/main/java/ms/world/info/WorldInfo.java
deleted file mode 100644
index 74c4d743d..000000000
--- a/Management-Server/src/main/java/ms/world/info/WorldInfo.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package ms.world.info;
-
-/**
- * Holds the info of a world server.
- * @author Emperor
- *
- */
-public final class WorldInfo {
-
- /**
- * The world id.
- */
- private final int worldId;
-
- /**
- * The IP-address.
- */
- private final String address;
-
- /**
- * The revision of the world.
- */
- private final int revision;
-
- /**
- * The country this world is located in.
- */
- private final CountryFlag country;
-
- /**
- * The world activity.
- */
- private final String activity;
-
- /**
- * If the world is members only.
- */
- private final boolean members;
-
- /**
- * If the world is a PvP world.
- */
- private final boolean pvp;
-
- /**
- * If the world is a quick chat only world.
- */
- private final boolean quickChat;
-
- /**
- * If the world has lootshare option enabled.
- */
- private final boolean lootshare;
-
- /**
- * Constructs a new {@code WorldInfo} {@code Object}.
- * @param id The world id.
- * @param address The address.
- * @param country The country flag.
- * @param members If the world is members only.
- */
- public WorldInfo(int id, String address, int revision, CountryFlag country, String activity, boolean members, boolean pvp, boolean quickChat, boolean lootshare) {
- this.worldId = id;
- this.address = address;
- this.revision = revision;
- this.country = country;
- this.activity = activity;
- this.members = members;
- this.pvp = pvp;
- this.quickChat = quickChat;
- this.lootshare = lootshare;
- }
-
- /**
- * Gets the settings hash.
- * @return The settings hash.
- */
- public int getSettings() {
- int settings = 0;
- if (members) {
- settings |= 0x1;
- }
- if (quickChat) {
- settings |= 0x2;
- }
- if (pvp) {
- settings |= 0x4;
- }
- if (lootshare) {
- settings |= 0x8;
- }
- return settings;
- }
-
- /**
- * @return the worldId
- */
- public int getWorldId() {
- return worldId;
- }
-
- /**
- * @return the address
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * @return the country
- */
- public CountryFlag getCountry() {
- return country;
- }
-
- /**
- * Gets the members value.
- * @return The members.
- */
- public boolean isMembers() {
- return members;
- }
-
- /**
- * Gets the activity value.
- * @return The activity.
- */
- public String getActivity() {
- return activity;
- }
-
- /**
- * Gets the pvp value.
- * @return The pvp.
- */
- public boolean isPvp() {
- return pvp;
- }
-
- /**
- * Gets the quickChat value.
- * @return The quickChat.
- */
- public boolean isQuickChat() {
- return quickChat;
- }
-
- /**
- * Gets the lootshare value.
- * @return The lootshare.
- */
- public boolean isLootshare() {
- return lootshare;
- }
-
- /**
- * Gets the revision.
- * @return the revision.
- */
- public int getRevision() {
- return revision;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/kotlin/ms09/MSLogger.kt b/Management-Server/src/main/kotlin/ms09/MSLogger.kt
deleted file mode 100644
index 5bd7a7b7f..000000000
--- a/Management-Server/src/main/kotlin/ms09/MSLogger.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package ms09
-
-import com.github.ajalt.mordant.rendering.TextColors
-import com.github.ajalt.mordant.terminal.Terminal
-import java.io.BufferedWriter
-import java.io.Writer
-import java.text.SimpleDateFormat
-import java.util.*
-
-object MSLogger {
- val t = Terminal()
- var tradeLog: Writer? = null
- var tradeLogWriter: BufferedWriter? = null
-
-
- fun getTime(): String{
- val formatter = SimpleDateFormat("HH:mm:ss")
- return "[" + formatter.format(Date(System.currentTimeMillis())) +"]"
- }
-
- @JvmStatic
- fun logInfo(vararg messages: String){
- for(m in messages){
- if(m.isNotBlank()) t.println("${getTime()}: [INFO] $m")
- }
- }
-
- @JvmStatic
- fun logErr(message: String){
- if(message.isNotBlank()) t.println("${getTime()}: ${TextColors.brightRed("[ ERR] $message")}")
- }
-
- @JvmStatic
- fun logWarn(message: String){
- if(message.isNotBlank()) t.println("${getTime()}: ${TextColors.yellow("[WARN] $message")}")
- }
-}
\ No newline at end of file
diff --git a/Proto/Management.proto b/Proto/Management.proto
new file mode 100644
index 000000000..6697fd0e4
--- /dev/null
+++ b/Proto/Management.proto
@@ -0,0 +1,110 @@
+syntax = "proto2";
+
+package management;
+
+option java_multiple_files = true;
+option java_package = "proto.management";
+option java_outer_classname = "ManagementProtos";
+
+message PlayerStatusUpdate {
+ required string username = 1;
+ required int32 world = 2;
+ required bool notifyFriendsOnly = 3;
+}
+
+message ClanMessage {
+ required string sender = 1;
+ required string clanName = 2;
+ required string message = 3;
+ required int32 rank = 4;
+}
+
+message PrivateMessage {
+ required string sender = 1;
+ required string receiver = 2;
+ required string message = 3;
+ required int32 rank = 4;
+}
+
+message RequestContactInfo {
+ required string username = 1;
+ required int32 world = 2;
+}
+
+message SendContactInfo {
+ message Contact {
+ required string username = 1;
+ optional int32 world = 2;
+ optional int32 rank = 3;
+ }
+
+ required string username = 1;
+ repeated Contact contacts = 2;
+ repeated string blocked = 3;
+}
+
+message FriendUpdate {
+ enum Type {
+ ADD = 0;
+ REMOVE = 1;
+ }
+
+ required Type type = 1;
+ required string username = 2;
+ required string friend = 3;
+}
+
+message BlockedUpdate {
+ enum Type {
+ ADD = 0;
+ REMOVE = 1;
+ }
+
+ required Type type = 1;
+ required string username = 2;
+ required string friend = 3;
+}
+
+message RequestClanInfo {
+ required int32 world = 1;
+ required string clanOwner = 2;
+}
+
+message SendClanInfo {
+ message ClanMember {
+ required string username = 1;
+ required int32 world = 2;
+ required int32 rank = 3;
+ }
+
+ required string clanOwner = 1;
+ required bool hasInfo = 2;
+ optional string clanName = 3;
+ optional int32 joinRequirement = 4;
+ optional int32 kickRequirement = 5;
+ optional int32 messageRequirement = 6;
+ optional int32 lootRequirement = 7;
+ repeated ClanMember members = 8;
+}
+
+message JoinClanRequest {
+ required string username = 1;
+ required string clanName = 2;
+}
+
+message LeaveClanRequest {
+ required string username = 1;
+ required string clanName = 2;
+}
+
+message ClanJoinNotification {
+ required string username = 1;
+ required string clanName = 2;
+ required int32 world = 3;
+}
+
+message ClanLeaveNotification {
+ required string username = 1;
+ required string clanName = 2;
+ required int32 world = 3;
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index f81ac910a..caf98bfe5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
-
+
An open source MMORPG emulation server
@@ -17,8 +17,6 @@
· Report Bug
NOTE: Bug reports and support are only accepted by/offered to players of our live hosted server. We will not provide support to those running their own copies.
-
-
## Table of Contents
@@ -27,9 +25,8 @@
* [Our Core Values](#our-core-values)
* [Contributing](#contributing)
* [Setup for Content Developers](#content-developers-setting-up-the-project)
- * [Github Setup](#github-setup)
+ * [GitLab Setup](#gitlab-setup)
* [Prerequisites](#prerequisites)
- * [Prereq Installation](#prereq-installation)
* [Project Setup](#project-setup)
* [Running the project](#running-the-project)
* [License](#license)
@@ -38,7 +35,7 @@
## Live Server Information
-Did you know that the 2009Scape Development Team hosts the main branch of this repo that you can connect to and play? Come join a growing community of people that love to grind out skills, quest, and hangout together. A download link for the launcher can be found here. Connecting to the live server is also one of the easiest ways to identify bugs/typos/missing features. Identifying these issues help developers, whether already on the project, or are even brand new to the project, fix bugs and issues in an expedited rate.
+Did you know that the 2009Scape Development Team hosts the main branch of this repo that you can connect to and play? Come join a growing community of people that love to grind out skills, quest, and hangout together. A download link for the launcher can be found [here](https://2009scape.org). Connecting to the live server is also one of the easiest ways to identify bugs/typos/missing features. Identifying these issues help developers, whether already on the project, or are even brand new to the project, fix bugs and issues in an expedited rate.
## History of this Codebase
@@ -48,177 +45,108 @@ This project was started out of love for the 530 revision. A small group of deve
## Our Core Values
-In the current climate of RSPS in general, we believe it's important to wear our core values on our sleeves and defend them with everything we have! Below are what we hold as our core, most important values:
+In the current climate of RuneScape Private Servers in general, we believe it's important to wear our core values on our sleeves and defend them with everything we have! Below are what we hold as our core, most important values:
-* **We do NOT believe in profiting off RSPS.** To many of us here at the 2009scape team, what we care about most is preserving the wonderful work of the Gower brothers in the most true-to-spirit manner possible. We do NOT do this to make a profit, and in fact **we outright refuse donations.** This is a labor of love and passion for everyone involved, a love for real RS2! This is perhaps the single most central value we have. If you want to "donate" to us, do so with your time and your dedication. That is what we desire most.
+* **We do NOT believe in profiting off an RSPS.** To many of us here at the 2009Scape team, what we care about most is preserving the wonderful work of the Gower brothers in the most true-to-spirit manner possible. We do NOT do this to make a profit, and in fact **we outright refuse donations.** This is a labor of love and passion for everyone involved, a love for real RS2! This is perhaps the single most central value we have. If you want to "donate" to us, do so with your time and your dedication. That is what we desire most.
* **Authenticity is central to the work**. As a remake, one of the most important things to us is being true to the Gower spirit. What the Gowers brought to us in our childhood is what we are driven to preserve for the remainder of the world.
-* **Open Source Is Crucial**. We believe open source remakes to be crucial to preserving what we loved in our childhood, and we believe for-profit and/or closed-source servers are destined to flounder out and fail.
+* **Open Source is crucial to the project**. We believe open source remakes to be crucial to preserving what we loved in our childhood, and we believe for-profit and/or closed-source servers are destined to flounder out and fail.
-* **Be Welcoming**. One of our most important goals is to provide a community of friendly and caring people that get along and love to enjoy the game with eachother. For this reason, we do tend to be very strict when it comes to toxicity. We care about quality a whole lot more than quantity!
+* **Be welcoming**. One of our most important goals is to provide a community of friendly and caring people that get along and love to enjoy the game with eachother. For this reason, we do tend to be very strict when it comes to toxicity. We care about quality a whole lot more than quantity!
## Contributing
-Note: All merge requests MUST be made using the defaut MR template you can select from the dropdown when creating a new merge request. Merge requests that do not use this template will not be accepted.
-More information on Kotlin can be found here.
+**Note: All merge requests MUST be made using the defaut MR template. Merge requests that do not use this template will not be accepted.**
+
+**Note: All new contributions MUST be made in Kotlin unless you are updating or fixing a bug in legacy code. More information on Kotlin can be found [here](https://kotlinlang.org/).**
There are many ways everyone can contribute! From the most seasoned programmers to those who do not have the most remote clue how code works! Below are some things that can always use some love from the community.
-* **Wiki Editors**: Did you know we have a wiki? Well it's always in need of people to fill it out and stay on top of it. Editing the wiki is one of the easiest ways you can contribute to 2009scape! If you're an active player and have the will, there's so much you could be helping out with over at the wiki. Click here to go to the wiki.
+* **Content Testers**: I'm putting this one up top because of its importance. We, the contributors and developers, aren't perfect. Sometimes, we make mistakes. This is where you come in - If you want a sneak peek at upcoming content, have a knack for breaking things, or just want to contribute to the project without making code changes, you can become a tester! If you are interested in becoming a tester, reach out in the testing channel of the discord. [Why become a tester?](#why-become-a-tester)
-* **JSON editors**: Did you know that the vast majority of our drop tables, stats, examines, item info, npc info, etc is all stored in a very easy-to-modify format called JSON? This is something almost anyone can help with, especially with the tool made by Ceikry to make it simple and streamlined. If you want to know what can be done to help here, get in touch in the development channel in the discord! **JSON editors are always in need and always appreciated!!**.
+* **Wiki Editors**: Did you know we have a wiki? Well it's always in need of people to fill it out and stay on top of it. Editing the wiki is one of the easiest ways you can contribute to 2009Scape! If you're an active player and have the will, there's so much you could be helping out with over at the wiki. [Click here to go to the wiki](https://cdn.2009scape.org/wiki/doku.php?id=start).
-* **Auditors**: As a remake, authenticity is central to our core values! We could always use someone to go through the game and create large lists of simple tasks that can be done to bring us closer to the authentic 2009 game! The preferred way to do this is one-area-at-a-time. If you want to see an example of some audits we've done in the past, take a look here.
+* **JSON editors**: We could always use more JSON editors! Please note that JSON editing **must** be done using the [Thanos Tool](https://gitlab.com/2009scape/tools/rs09-thanos-tool/-/jobs/5153567519/artifacts/file/build/libs/zaros.jar). **This does not run on modern Java** and requires **Java 11** to run (using the usual 'java -jar zaros.jar').
-* **Content Developers**: As a remake, we have massive amounts of content that need to be implemented or corrected. If you know how to program or are willing to learn, this is where you could be extremely helpful! We need everything from quests to dialogue to minigames to skills that still need to be corrected or implemented, and this is perhaps one of the most valuable ways someone could help out the project! If you are interested in developing content, reach out in the development channel of the Discord.
+* **Authenticity Auditors**: As a remake, authenticity is central to our core values! We could always use someone to go through the game and create large lists of simple tasks that can be done to bring us closer to the authentic 2009 game! The preferred way to do this is one-area-at-a-time. If you want to see an example of some audits we've done in the past, take a look [here](https://gitlab.com/2009scape/2009scape/-/issues/46).
+
+
+* **Code Contributors**: As a remake, we have massive amounts of content that need to be implemented or corrected. If you know how to program or are willing to learn, this is where you could be extremely helpful! We need everything from quests, to dialogue, to mini-games, to skills that still need to be corrected or implemented. This is perhaps one of the most valuable ways someone could help out the project! If you are interested in developing content, reach out in the development channel of the Discord.
## Content Developers: Setting Up the Project.
-### Gitlab Setup
+### GitLab Setup
+**Note: This allows you to commit changes to the main repo (with approval)! Also, always stay up to date with the most recent updates by pulling into your copy when 2009Scape updates!**
-Note: This allows you to commit changes to the main repo (with approval)! Also, always stay up to date with the most recent updates by pulling into your copy when 2009Scape updates!
+1. Create a GitLab account if you haven't done so already.
-1. Create a gitlab account if you haven't done so already
+2. Follow our Git Basics guide [over on the wiki.](https://gitlab.com/2009scape/2009scape/-/wikis/git-basics)
-3. Click "Fork" in the top right hand side of our gitlab page.
-
-**If at anytime you have an issue with gitlab please refer to the** Gitlab help center.
-
-### Git LFS Setup
-
-To obtain large binary files for the repo such as the cache, make sure you have git lfs installed: https://git-lfs.github.com/
-
-After setting up git lfs, you may need to run `git lfs pull` in the root of the cloned repo to download essential binaries.
+**If at anytime you have an issue with GitLab please refer to the [GitLab help center](https://gitlab.com/help).**
### Prerequisites
-* Java SE Development Kit Version 11/OpenJDK 11 (preferred)
-* Xampp
-## Prereq Installation
+These are mandatory. If you don't install **all** of these programs **in order** prior to
+the project's setup, things won't work. At all.
-Windows
-
-
+*For Windows users* - Turn developer mode on first in Windows developer settings.
-1. Install JDK version 11
- * Scroll down until you see Windows x86 and Windows x64
- * If you are running a 64bit verison of Windows (standard), select Windows x64
- * Accept the terms and conditions, after reading them of course, and login to oracle
- * Download and install like any normal application
-
-2. Install Xampp
- * Click on "Xampp for Windows"
- * Download
- * Install as Administrator
-
-
-MacOS
-
-
+* [JDK 11](https://adoptium.net) or the Java SE Development Kit Version 11
+* [IntelliJ IDEA Community](https://www.jetbrains.com/idea/download/)
-1. Install JDK version 11
- * Scroll down until you see macOS x64
- * select macOS x64
- * Accept the terms and conditions, after reading them of course, and login to oracle
- * Download and install like any normal mac application
-
-2. Install Xampp
- * Click on "Xampp for OS X"
- * Download
- * Install as Administrator
-
-
-Linux
-
-
-
-1. Install JDK version 11 through Oracle or through command line
- * Debian, Ubuntu, etc.
- ```sh
- sudo apt install openjdk-11-jdk
- ```
- * Fedora, Oracle Linux, Red Hat Enterprise Linux, etc.
- ```sh
- su -c "yum install java-11-openjdk"
- ```
-
-2. Install Xampp OR Set up DB server of your choice.
- * Click install "XAMPP for Linux"
- * Install like any normal Linux program
-
+### SSH setup
+1. [Set up a key if you don't have one (ed25519)](https://docs.gitlab.com/ee/user/ssh.html#generate-an-ssh-key-pair)
+2. [Add your public key to your gitlab account](https://docs.gitlab.com/ee/user/ssh.html#add-an-ssh-key-to-your-gitlab-account)
+3. [Verify you can connect to git@gitlab.com](https://docs.gitlab.com/ee/user/ssh.html#verify-that-you-can-connect)
### Project Setup
-- Open Xampp (Skip if you roll your own database and know what you're doing.)
- * On Windows make sure you run Xampp as administrator
- * On the left-hand side make sure you tick the two "Service" boxes for Apache and MySQL
- * For both Apache and MySQL click "Start" under Actions
- * After doing that navigate to the PHP My Admin LOCAL SITE
- * Once opened, on the left-hand side click the three "disks" that say "New"
- * In the "Database name" bar type: global
- * Press the "Create" button
- * A three disk "global" should appear on the left hand side
- * Click it and on the top bar select "Import"
- * Under **FILE TO IMPORT** click "Browse...."
- * Navigate to your 2009Scape project folder
- * Go to Server/db_exports/ and import global.sql
- * It may take a moment to import, when It is done importing Xampp is all set up!
-
-### Running the project
-***Note: If you choose not to use the provided run scripts, you *must* run `mvn clean` before it will build correctly.***
+1. If you haven't already, make sure to follow our [Git Basics](https://gitlab.com/2009scape/2009scape/-/wikis/git-basics) guide.
+2. Run `git lfs pull` in the 2009scape folder you cloned as part of that guide. This only has to be done once, ever.
+3. Follow our [IntelliJ IDEA Setup Guide](https://gitlab.com/2009scape/2009scape/-/wikis/Setup-for-IntelliJ-IDEA-IDE)
-####Linux / OSX
-1. Make sure your database of choice is running (see above)
-2. Start the Management Server with run-ms.sh
-3. Start the game server with run-server.sh
+### Running the project
+
+1. If you followed the IntelliJ setup guide, which you probably should have, just use the provided run configuration.
+***Note: If you choose not to use the provided run scripts or IntelliJ, you *must* run `mvn clean` before it will build correctly.***
+
+#### Linux / OSX
+
+Start the game server with the included run script. Use `./run -h` for more info.
#### Windows
-1. Make sure your database is running (see above)
-2. Start the Management Server with run-ms.bat
-3. Start the game server with run-server.bat
-### IDE Integration: IntelliJ IDEA (Recommended)
-1. Click the "Project" tab on the left hand side.
-2. In the top left where the "Project" drop down is, click Project Files
-3. Expand the Management-Server folder
-4. Right click pom.xml and click "Add Maven Project"
-5. Expand the Server folder
-6. Right click pom.xml and click "Add Maven Project"
-7. Restart IntelliJ
-8. You should now have ready-made run configurations in the top right: [Windows] Run MS, [Windows] Run Server, [Linux] Run MS, [Linux] Run Server
-
-### IDE Integration: Eclipse
-Note: This section could use improvement. If you have a better way to integrate the project with eclipse, feel free to open an MR!
-1. Make sure you have the [Eclipse Maven Plugin](https://stackoverflow.com/a/25993960/1971003) installed.
-2. In Eclipse, click File -> Import
-3. Type Maven in the search box
-4. Under "Select an Import Source," select "Existing Maven Project."
-5. Next
-6. Click browse, and select the Management-Server folder.
-7. Repeat steps 2-6 for the Server folder.
-
-### IDE Integration: Netbeans
-Note: This section could use improvement. If you have a better way to integrate the project with netbeans, feel free to open an MR!
-
-1. Select File -> Open Project
-2. Select the Management-Server folder to open the MS project.
-3. Select the Server folder to open the Server project.
+Start the game server with `run-server.bat`
### License
-We use the AGPL 3.0 license, which can be found here. Please read and understand the license. Failure to follow the guidelines outlined in the license will result in legal action. If you know or hear of anyone breaking this license, please send a report, with proof, to Red Bracket#8151, ceikry#2724, or woahscam#8535 on discord or email woahscam@hotmail.com. **We WILL NOT change the license to fit your needs.**
+We use the AGPL 3.0 license, which can be found [here](https://www.gnu.org/licenses/agpl-3.0.en.html). Please be sure to read and understand the license. Failure to follow the guidelines outlined in the license will result in legal action. If you know or hear of anyone breaking this license, please send a report, with proof, to Red Bracket#8151, ceikry#2724, or woahscam#8535 on discord or email woahscam@hotmail.com. **We WILL NOT change the license to fit your needs.**
### Contact
-Reminder: There is no official support for setting up your own server. Do not ping/dm developers about setting up your server. Community support is available in the discord server.
+**Reminder: There is no official support for setting up your own server. Do not ping/dm developers, or ask in support channels about setting up your server. Support for the live server and 2009Scape single-player is available on the [2009Scape forums](https://forum.2009scape.org/).**
[license-shield]: https://img.shields.io/badge/license-AGPL--3.0-informational
[license-url]: https://www.gnu.org/licenses/agpl-3.0.en.html
+
+### Why become a tester?
+
+Before content hits Live, it has to be tested. We can, but do not want to do this alone, and would love the help! But don't worry, there is something in it for you. Credits! Keep in mind that credits will only be awarded to people who thoroughly test the content and provide detailed reports on them. Like votes or HoF you must claim them in the #claim-to-fame channel on discord or matrix.
+
+* If you test smaller things like bug fixes there is a 2 credit reward.
+* If you test full quests or minigames you will be rewarded 5 credits.
+* If you find a bug in the content you are testing that hasn't already been found you will earn an extra credit.
+
+These credits can be spent in the 2009Scape Reward Shop. It's important to be clear that credits are gained by contributions to the project. We cannot and will not accept donations (of any kind), especially not in exchange for in-game credits or perks.
+
+Testers are not the only people who can gain credits - other ways of earning credits can be found on [the 2009Scape website](https://2009scape.org/site/game_guide/credits.html).
+
+Please be patient! The Credit system is not fully complete yet, so it will take a long time for credits to be awarded.
\ No newline at end of file
diff --git a/Server/.gitignore b/Server/.gitignore
index f22e9f978..a9a29cad7 100644
--- a/Server/.gitignore
+++ b/Server/.gitignore
@@ -2,6 +2,7 @@ bin/**
out/**
data/logs/**
data/profile/**
+data/playerstats/**
.idea/**
/bin
.DS_Store**
diff --git a/Server/.run/Run Server.run.xml b/Server/.run/Run Server.run.xml
index ea794964d..102891e4b 100644
--- a/Server/.run/Run Server.run.xml
+++ b/Server/.run/Run Server.run.xml
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/Server/.run/[Windows] Run Server.run.xml b/Server/.run/[Windows] Run Server.run.xml
deleted file mode 100644
index fde052599..000000000
--- a/Server/.run/[Windows] Run Server.run.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Server/data/CELEDT.xml b/Server/data/CELEDT.xml
deleted file mode 100644
index 965f4bbfd..000000000
--- a/Server/data/CELEDT.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
- - {
+ val items = ArrayList(guaranteedItems)
+ var effectiveWeight = totalWeight
+ val p = if (receiver is Player) receiver else null
+ if (p != null && shouldRemoveNothings(p))
+ effectiveWeight -= nothingWeight
+
+ if (this.size == 1) {
+ items.add(get(0))
+ } else if (!this.isEmpty()) {
+ var rngWeight = RandomFunction.randomDouble(effectiveWeight)
+ for (item in this.shuffled()) {
+ if (item.id == Items.DWARF_REMAINS_0) continue
+ rngWeight -= item.weight
+ if (rngWeight <= 0) {
+ items.add(item)
+ break
+ }
+ }
+ }
+ return convertWeightedItems(items, receiver)
+ }
+
+ private val nothingWeight: Double
+ get() {
+ var sum = 0.0
+ for (i in this) {
+ if (i.id == Items.DWARF_REMAINS_0)
+ sum += i.weight
+ }
+ return sum
+ }
+ }
+
+ /**
+ * Initialize needed objects for xml reading/writing
+ */
+ var factory = DocumentBuilderFactory.newInstance()
+ var builder: DocumentBuilder? = null
+
+ init {
+ try {
+ builder = factory.newDocumentBuilder()
+ } catch (e: ParserConfigurationException) {
+ e.printStackTrace()
+ }
+ }
+
+ /**
+ * Parses the xml file for the RDT.
+ * @param file the .xml file containing the RDT.
+ */
+ fun parse(file: String?) {
+ try {
+ val doc = builder!!.parse(file)
+ val itemNodes = doc.getElementsByTagName("item")
+ for (i in 0 until itemNodes.length) {
+ val itemNode = itemNodes.item(i)
+ if (itemNode.nodeType == Node.ELEMENT_NODE) {
+ val item = itemNode as Element
+ val itemId = item.getAttribute("id").toInt()
+ val minAmt = item.getAttribute("minAmt").toInt()
+ val maxAmt = item.getAttribute("maxAmt").toInt()
+ val weight = item.getAttribute("weight").toInt()
+ TABLE.add(WeightedItem(itemId, minAmt, maxAmt, weight.toDouble(), false))
+ }
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
+ fun retrieve(receiver: Entity?): Item? {
+ return TABLE.roll(receiver).getOrNull(0)
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/data/tables/RareSeedDropTable.java b/Server/src/main/content/data/tables/RareSeedDropTable.java
new file mode 100644
index 000000000..0b892270d
--- /dev/null
+++ b/Server/src/main/content/data/tables/RareSeedDropTable.java
@@ -0,0 +1,96 @@
+package content.data.tables;
+
+import core.api.StartupListener;
+import core.game.node.item.Item;
+import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
+import core.tools.RandomFunction;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import core.ServerConstants;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static core.api.ContentAPIKt.log;
+
+/**
+ * Handles the rare seed drop table.
+ * @author Von Hresvelg
+ */
+public final class RareSeedDropTable implements StartupListener {
+
+ /**
+ * The item id of the item representing the rare seed drop table slot in a drop
+ * table.
+ */
+ public static final int SLOT_ITEM_ID = 14428;
+
+ /**
+ * The rare seed drop table.
+ */
+ private static final List TABLE = new ArrayList<>(20);
+
+
+ /**
+ * Initialize needed objects for xml reading/writing
+ */
+ static DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ static DocumentBuilder builder;
+
+ static {
+ try {
+ builder = factory.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public RareSeedDropTable() throws ParserConfigurationException {}
+
+ @Override
+ public void startup() {
+ if(ServerConstants.RSDT_DATA_PATH != null && !new File(ServerConstants.RSDT_DATA_PATH).exists()){
+ log(this.getClass(), Log.ERR, "Can't locate RSDT file at " + ServerConstants.RSDT_DATA_PATH);
+ return;
+ }
+ parse(ServerConstants.RSDT_DATA_PATH);
+ log(this.getClass(), Log.FINE, "Initialized Rare Seed Drop Table from " + ServerConstants.RSDT_DATA_PATH);
+ }
+
+ /**
+ * Parses the xml file for the rare seed drop table.
+ * @param file the .xml file containing the rare seed drop table.
+ */
+ public static void parse(String file){
+ try {
+ Document doc = builder.parse(file);
+
+ NodeList itemNodes = doc.getElementsByTagName("item");
+ for(int i = 0; i < itemNodes.getLength(); i++){
+ Node itemNode = itemNodes.item(i);
+ if(itemNode.getNodeType() == Node.ELEMENT_NODE){
+ Element item = (Element) itemNode;
+ int itemId = Integer.parseInt(item.getAttribute("id"));
+ int minAmt = Integer.parseInt(item.getAttribute("minAmt"));
+ int maxAmt = Integer.parseInt(item.getAttribute("maxAmt"));
+ int weight = Integer.parseInt(item.getAttribute("weight"));
+
+ TABLE.add(new WeightedChanceItem(itemId,minAmt,maxAmt,weight));
+ }
+ }
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ public static Item retrieve(){
+ return RandomFunction.rollWeightedChanceTable(TABLE);
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/data/tables/UncommonSeedDropTable.java b/Server/src/main/content/data/tables/UncommonSeedDropTable.java
new file mode 100644
index 000000000..1c76ca555
--- /dev/null
+++ b/Server/src/main/content/data/tables/UncommonSeedDropTable.java
@@ -0,0 +1,96 @@
+package content.data.tables;
+
+import core.api.StartupListener;
+import core.game.node.item.Item;
+import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
+import core.tools.RandomFunction;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import core.ServerConstants;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static core.api.ContentAPIKt.log;
+
+/**
+ * Handles the uncommon seed drop table.
+ * @author Von Hresvelg
+ */
+public final class UncommonSeedDropTable implements StartupListener {
+
+ /**
+ * The item id of the item representing the uncommon seed drop table slot in a drop
+ * table.
+ */
+ public static final int SLOT_ITEM_ID = 14422;
+
+ /**
+ * The uncommon seed drop table.
+ */
+ private static final List TABLE = new ArrayList<>(20);
+
+
+ /**
+ * Initialize needed objects for xml reading/writing
+ */
+ static DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ static DocumentBuilder builder;
+
+ static {
+ try {
+ builder = factory.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public UncommonSeedDropTable() throws ParserConfigurationException {}
+
+ @Override
+ public void startup() {
+ if(ServerConstants.USDT_DATA_PATH != null && !new File(ServerConstants.USDT_DATA_PATH).exists()){
+ log(this.getClass(), Log.ERR, "Can't locate USDT file at " + ServerConstants.USDT_DATA_PATH);
+ return;
+ }
+ parse(ServerConstants.USDT_DATA_PATH);
+ log(this.getClass(), Log.FINE, "Initialized Uncommon Seed Drop Table from " + ServerConstants.USDT_DATA_PATH);
+ }
+
+ /**
+ * Parses the xml file for the uncommon seed drop table.
+ * @param file the .xml file containing the uncommon seed drop table.
+ */
+ public static void parse(String file){
+ try {
+ Document doc = builder.parse(file);
+
+ NodeList itemNodes = doc.getElementsByTagName("item");
+ for(int i = 0; i < itemNodes.getLength(); i++){
+ Node itemNode = itemNodes.item(i);
+ if(itemNode.getNodeType() == Node.ELEMENT_NODE){
+ Element item = (Element) itemNode;
+ int itemId = Integer.parseInt(item.getAttribute("id"));
+ int minAmt = Integer.parseInt(item.getAttribute("minAmt"));
+ int maxAmt = Integer.parseInt(item.getAttribute("maxAmt"));
+ int weight = Integer.parseInt(item.getAttribute("weight"));
+
+ TABLE.add(new WeightedChanceItem(itemId,minAmt,maxAmt,weight));
+ }
+ }
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ public static Item retrieve(){
+ return RandomFunction.rollWeightedChanceTable(TABLE);
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt b/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
new file mode 100644
index 000000000..e1e2cd6c8
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
@@ -0,0 +1,229 @@
+package content.global.activity.cchallange
+
+import content.global.activity.cchallange.npc.EarthWarriorChampionNPC.Companion.spawnEarthWarriorChampion
+import content.global.activity.cchallange.npc.GhoulChampionNPC.Companion.spawnGhoulChampion
+import content.global.activity.cchallange.npc.GiantChampionNPC.Companion.spawnGiantChampion
+import content.global.activity.cchallange.npc.GoblinChampionNPC.Companion.spawnGoblinChampion
+import content.global.activity.cchallange.npc.HobgoblinChampionNPC.Companion.spawnHobgoblinChampion
+import content.global.activity.cchallange.npc.ImpChampionNPC.Companion.spawnImpChampion
+import content.global.activity.cchallange.npc.JogreChampionNPC.Companion.spawnJogreChampion
+import content.global.activity.cchallange.npc.LesserDemonChampionNPC.Companion.spawnLesserDemonChampion
+import content.global.activity.cchallange.npc.SkeletonChampionNPC.Companion.spawnSkeletonChampion
+import content.global.activity.cchallange.npc.ZombieChampionNPC.Companion.spawnZombieChampion
+import core.api.*
+import core.game.global.action.DoorActionHandler
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.game.system.task.Pulse
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+
+/**
+ * Represents the Champion challenge.
+ */
+
+class ChampionChallengeListener : InteractionListener, MapArea {
+
+ val EARTH_WARRIOR_SCROLL = Items.CHAMPION_SCROLL_6798
+ val GHOUL_SCROLL = Items.CHAMPION_SCROLL_6799
+ val GIANT_SCROLL = Items.CHAMPION_SCROLL_6800
+ val GOBLIN_SCROLL = Items.CHAMPION_SCROLL_6801
+ val HOBGOBLIN_SCROLL = Items.CHAMPION_SCROLL_6802
+ val IMP_SCROLL = Items.CHAMPION_SCROLL_6803
+ val JOGRE_SCROLL = Items.CHAMPION_SCROLL_6804
+ val LESSER_DEMON_SCROLL = Items.CHAMPION_SCROLL_6805
+ val SKELETON_SCROLL = Items.CHAMPION_SCROLL_6806
+ val ZOMBIE_SCROLL = Items.CHAMPION_SCROLL_6807
+
+ val MESSAGE_SCROLL = 222
+
+ private val IMP_SCROLL_TEXT = arrayOf(
+ "How about picking on someone your own size? I'll",
+ "see you at the Champion's Guild.",
+ "",
+ "Champion of Imps"
+ )
+
+ private val GOBLIN_SCROLL_TEXT = arrayOf(
+ "Fight me if you think you can human, I'll wait",
+ "for you in the Champion's Guild.",
+ "",
+ "Champion of Goblins"
+ )
+
+ private val SKELETON_SCROLL_TEXT = arrayOf(
+ "I'll be waiting at the Champions' Guild to",
+ "collect your bones.",
+ "",
+ "Champion of Skeletons"
+ )
+
+ private val ZOMBIE_SCROLL_TEXT = arrayOf(
+ "You come to Champions' Guild, you fight me,",
+ "I squish you, I get brains!",
+ "",
+ "Champion of Zombies"
+ )
+
+ private val GIANT_SCROLL_TEXT = arrayOf(
+ "Get yourself to the Champions' Guild, if you",
+ "dare to face me puny human.",
+ "",
+ "Champion of Giants"
+ )
+
+ private val HOBGOBLIN_SCROLL_TEXT = arrayOf(
+ "You won't defeat me, though you're welcome to",
+ "try at the Champions' Guild.",
+ "",
+ "Champion of Hobgoblins"
+ )
+
+ private val GHOUL_SCROLL_TEXT = arrayOf(
+ "Come and duel me at the Champions' Guild, I'll",
+ "make sure nothing goes to waste.",
+ "",
+ "Champion of Ghouls"
+ )
+
+ private val EARTH_WARRIOR_TEXT = arrayOf(
+ "I challenge you to a duel, come to the arena beneath",
+ "the Champion's Guild and fight me if you dare.",
+ "",
+ "Champion of Earth Warriors"
+ )
+
+ private val JOGRE_SCROLL_TEXT = arrayOf(
+ "You think you can defeat me? Come to the",
+ "Champion's Guild and prove it!",
+ "",
+ "Champion of Jogres"
+ )
+
+ private val LESSER_DEMON_SCROLL_TEXT = arrayOf(
+ "Come to the Champion's Guild so I can banish",
+ "you mortal!",
+ "",
+ "Champion of Lesser Demons"
+ )
+
+ private val PORTCULLIS = Scenery.PORTCULLIS_10553
+ private val CHAMPION_STATUE_CLOSED = Scenery.CHAMPION_STATUE_10556
+ private val CHAMPION_STATUE_OPEN = Scenery.CHAMPION_STATUE_10557
+ private val TRAPDOOR_CLOSED = Scenery.TRAPDOOR_10558
+ private val TRAPDOOR_OPEN = Scenery.TRAPDOOR_10559
+ private val LARXUS = NPCs.LARXUS_3050
+
+ private val ARENA_ZONE = 12696
+
+ override fun defineListeners() {
+ // Champion's Guild Basement Ladder to Main Floor
+ addClimbDest(Location(3190, 9758, 0), Location(3190, 3356, 0))
+ // Champion Statue Ladder to Arena
+ addClimbDest(Location(3184, 9758, 0), Location(3182, 9758, 0))
+ // Arena Ladder to Champion's Guild Basement
+ addClimbDest(Location(3183, 9758, 0), Location(3185, 9758, 0))
+
+ on(LARXUS, IntType.NPC, "talk-to") { player, _ ->
+ openDialogue(player, LarxusDialogue(false))
+ return@on true
+ }
+
+ on(ChampionScrollsDropHandler.SCROLLS, IntType.ITEM, "read") { player, node ->
+ updateAndReadScroll(player, node.asItem())
+ return@on true
+ }
+
+ onUseWith(IntType.NPC, ChampionScrollsDropHandler.SCROLLS, NPCs.LARXUS_3050) { player, _, _ ->
+ openDialogue(player, LarxusDialogue(true))
+ return@onUseWith true
+ }
+
+ on(TRAPDOOR_CLOSED, IntType.SCENERY, "open") { _, node ->
+ replaceScenery(node.asScenery(), TRAPDOOR_OPEN, 100, node.location)
+ return@on true
+ }
+
+ on(TRAPDOOR_OPEN, IntType.SCENERY, "close") { _, node ->
+ replaceScenery(node.asScenery(), TRAPDOOR_CLOSED, -1, node.location)
+ return@on true
+ }
+
+ on(CHAMPION_STATUE_CLOSED, IntType.SCENERY, "open") { _, node ->
+ replaceScenery(node.asScenery(), CHAMPION_STATUE_OPEN, 100, node.location)
+ return@on true
+ }
+
+ on(PORTCULLIS, IntType.SCENERY, "open") { player, node ->
+ if (player.getAttribute("championsarena:start", false) == false) {
+ sendNPCDialogue(player, NPCs.LARXUS_3050, "You need to arrange a challenge with me before you enter the arena.")
+ } else {
+ lock(player, 3)
+ submitWorldPulse(object : Pulse() {
+ var counter = 0
+ override fun pulse(): Boolean {
+ when (counter++) {
+ 1 -> {
+ player.familiarManager.dismiss()
+ }
+ 2 -> DoorActionHandler.handleDoor(player, node.asScenery())
+ 3 -> when{
+ removeItem(player, IMP_SCROLL) -> spawnImpChampion(player)
+ removeItem(player, GOBLIN_SCROLL) -> spawnGoblinChampion(player)
+ removeItem(player, SKELETON_SCROLL) -> spawnSkeletonChampion(player)
+ removeItem(player, ZOMBIE_SCROLL) -> spawnZombieChampion(player)
+ removeItem(player, GIANT_SCROLL) -> spawnGiantChampion(player)
+ removeItem(player, HOBGOBLIN_SCROLL) -> spawnHobgoblinChampion(player)
+ removeItem(player, GHOUL_SCROLL) -> spawnGhoulChampion(player)
+ removeItem(player, EARTH_WARRIOR_SCROLL) -> {
+ spawnEarthWarriorChampion(player)
+ player.prayer.reset()
+ }
+ removeItem(player, JOGRE_SCROLL) -> spawnJogreChampion(player)
+ removeItem(player, LESSER_DEMON_SCROLL) -> spawnLesserDemonChampion(player)
+ }
+ }
+ return false
+ }
+ })
+ }
+ return@on true
+ }
+ }
+
+ private fun updateAndReadScroll(player: Player, item: Item) {
+ val id = item.id
+ openInterface(player, MESSAGE_SCROLL).also {
+ when (id) {
+ IMP_SCROLL -> setInterfaceText(player, IMP_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ GOBLIN_SCROLL -> setInterfaceText(player, GOBLIN_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ SKELETON_SCROLL -> setInterfaceText(player, SKELETON_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ ZOMBIE_SCROLL -> setInterfaceText(player, ZOMBIE_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ GIANT_SCROLL -> setInterfaceText(player, GIANT_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ HOBGOBLIN_SCROLL -> setInterfaceText(player, HOBGOBLIN_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ GHOUL_SCROLL -> setInterfaceText(player, GHOUL_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ EARTH_WARRIOR_SCROLL -> setInterfaceText(player, EARTH_WARRIOR_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ JOGRE_SCROLL -> setInterfaceText(player, JOGRE_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ LESSER_DEMON_SCROLL -> setInterfaceText(player, LESSER_DEMON_SCROLL_TEXT.joinToString("
"), MESSAGE_SCROLL, 4)
+ }
+ }
+ }
+
+ override fun defineAreaBorders(): Array {
+ return arrayOf(getRegionBorders(ARENA_ZONE))
+ }
+
+ override fun getRestrictions(): Array {
+ return arrayOf(
+ ZoneRestriction.CANNON,
+ ZoneRestriction.FIRES,
+ ZoneRestriction.RANDOM_EVENTS
+ )
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/ChampionScrollsDropHandler.kt b/Server/src/main/content/global/activity/cchallange/ChampionScrollsDropHandler.kt
new file mode 100644
index 000000000..02b3b2b0e
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/ChampionScrollsDropHandler.kt
@@ -0,0 +1,279 @@
+package content.global.activity.cchallange
+
+import core.api.sendMessage
+import core.api.sendNews
+import core.game.event.NPCKillEvent
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.item.GroundItemManager
+import core.game.node.item.Item
+import core.tools.*
+import core.game.world.GameWorld
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Handles the drop for champion challenge.
+ * @authors Phil, Skelsoft, Ceikry
+ */
+
+class ChampionScrollsDropHandler : ChampionScrollsEventHookBase() {
+ companion object {
+
+ private val IMPS = intArrayOf(
+ NPCs.IMP_708, NPCs.IMP_709, NPCs.IMP_1531, NPCs.IMP_6211
+ )
+
+ private val GOBLINS = intArrayOf(
+ NPCs.GOBLIN_100, NPCs.GOBLIN_101, NPCs.GOBLIN_102, NPCs.GOBLIN_444, NPCs.GOBLIN_445,
+
+ NPCs.GOBLIN_1769, NPCs.GOBLIN_1770, NPCs.GOBLIN_1771, NPCs.GOBLIN_1772, NPCs.GOBLIN_1773,
+ NPCs.GOBLIN_1774, NPCs.GOBLIN_1775, NPCs.GOBLIN_1776, NPCs.GOBLIN_2274, NPCs.GOBLIN_2275,
+ NPCs.GOBLIN_2276, NPCs.GOBLIN_2277, NPCs.GOBLIN_2278, NPCs.GOBLIN_2279, NPCs.GOBLIN_2280,
+ NPCs.GOBLIN_2281, NPCs.GOBLIN_2678, NPCs.GOBLIN_2679, NPCs.GOBLIN_2680, NPCs.GOBLIN_2681,
+ NPCs.GOBLIN_3264, NPCs.GOBLIN_3265, NPCs.GOBLIN_3266, NPCs.GOBLIN_3267, NPCs.GOBLIN_3726,
+ NPCs.GOBLIN_4261, NPCs.GOBLIN_4262, NPCs.GOBLIN_4263, NPCs.GOBLIN_4264, NPCs.GOBLIN_4265,
+ NPCs.GOBLIN_4266, NPCs.GOBLIN_4267, NPCs.GOBLIN_4268, NPCs.GOBLIN_4269, NPCs.GOBLIN_4270,
+ NPCs.GOBLIN_4271, NPCs.GOBLIN_4272, NPCs.GOBLIN_4273, NPCs.GOBLIN_4274, NPCs.GOBLIN_4275,
+ NPCs.GOBLIN_4276, NPCs.GOBLIN_4407, NPCs.GOBLIN_4408, NPCs.GOBLIN_4409, NPCs.GOBLIN_4410,
+ NPCs.GOBLIN_4411, NPCs.GOBLIN_4412, NPCs.GOBLIN_4479, NPCs.GOBLIN_4480, NPCs.GOBLIN_4481,
+ NPCs.GOBLIN_4482, NPCs.GOBLIN_4483, NPCs.GOBLIN_4484, NPCs.GOBLIN_4485, NPCs.GOBLIN_4486,
+ NPCs.GOBLIN_4487, NPCs.GOBLIN_4488, NPCs.GOBLIN_4489, NPCs.GOBLIN_4490, NPCs.GOBLIN_4491,
+ NPCs.GOBLIN_4492, NPCs.GOBLIN_4499, NPCs.GOBLIN_4633, NPCs.GOBLIN_4634, NPCs.GOBLIN_4635,
+ NPCs.GOBLIN_4636, NPCs.GOBLIN_4637, NPCs.GOBLIN_5855, NPCs.GOBLIN_5856, NPCs.GOBLIN_6125,
+ NPCs.GOBLIN_6126, NPCs.GOBLIN_6132, NPCs.GOBLIN_6133, NPCs.GOBLIN_6279, NPCs.GOBLIN_6280,
+ NPCs.GOBLIN_6281, NPCs.GOBLIN_6282, NPCs.GOBLIN_6283, NPCs.GOBLIN_6284, NPCs.GOBLIN_6402,
+ NPCs.GOBLIN_6403, NPCs.GOBLIN_6404, NPCs.GOBLIN_6405, NPCs.GOBLIN_6406, NPCs.GOBLIN_6407,
+ NPCs.GOBLIN_6408, NPCs.GOBLIN_6409, NPCs.GOBLIN_6410, NPCs.GOBLIN_6411, NPCs.GOBLIN_6412,
+ NPCs.GOBLIN_6413, NPCs.GOBLIN_6414, NPCs.GOBLIN_6415, NPCs.GOBLIN_6416, NPCs.GOBLIN_6417,
+ NPCs.GOBLIN_6418, NPCs.GOBLIN_6419, NPCs.GOBLIN_6420, NPCs.GOBLIN_6421, NPCs.GOBLIN_6422,
+ NPCs.GOBLIN_6423, NPCs.GOBLIN_6424, NPCs.GOBLIN_6425, NPCs.GOBLIN_6426, NPCs.GOBLIN_6427,
+ NPCs.GOBLIN_6428, NPCs.GOBLIN_6429, NPCs.GOBLIN_6430, NPCs.GOBLIN_6431, NPCs.GOBLIN_6432,
+ NPCs.GOBLIN_6433, NPCs.GOBLIN_6434, NPCs.GOBLIN_6435, NPCs.GOBLIN_6436, NPCs.GOBLIN_6437,
+ NPCs.GOBLIN_6438, NPCs.GOBLIN_6439, NPCs.GOBLIN_6440, NPCs.GOBLIN_6441, NPCs.GOBLIN_6442,
+ NPCs.GOBLIN_6443, NPCs.GOBLIN_6444, NPCs.GOBLIN_6445, NPCs.GOBLIN_6446, NPCs.GOBLIN_6447,
+ NPCs.GOBLIN_6448, NPCs.GOBLIN_6449, NPCs.GOBLIN_6450, NPCs.GOBLIN_6451, NPCs.GOBLIN_6452,
+ NPCs.GOBLIN_6453, NPCs.GOBLIN_6454, NPCs.GOBLIN_6455, NPCs.GOBLIN_6456, NPCs.GOBLIN_6457,
+ NPCs.GOBLIN_6458, NPCs.GOBLIN_6459, NPCs.GOBLIN_6460, NPCs.GOBLIN_6461, NPCs.GOBLIN_6462,
+ NPCs.GOBLIN_6463, NPCs.GOBLIN_6464, NPCs.GOBLIN_6465, NPCs.GOBLIN_6466, NPCs.GOBLIN_6467,
+ NPCs.GOBLIN_6490, NPCs.GOBLIN_6491, NPCs.GOBLIN_6492, NPCs.GOBLIN_6493, NPCs.GOBLIN_6494,
+ NPCs.GOBLIN_6495, NPCs.GOBLIN_7964, NPCs.GOBLIN_7965,
+
+ NPCs.CAVE_GOBLIN_1822, NPCs.CAVE_GOBLIN_1823, NPCs.CAVE_GOBLIN_1824, NPCs.CAVE_GOBLIN_1825,
+ NPCs.CAVE_GOBLIN_5752, NPCs.CAVE_GOBLIN_5753, NPCs.CAVE_GOBLIN_5754, NPCs.CAVE_GOBLIN_5755,
+ NPCs.CAVE_GOBLIN_5756, NPCs.CAVE_GOBLIN_5757, NPCs.CAVE_GOBLIN_5758, NPCs.CAVE_GOBLIN_5759,
+ NPCs.CAVE_GOBLIN_5760, NPCs.CAVE_GOBLIN_5761, NPCs.CAVE_GOBLIN_5762, NPCs.CAVE_GOBLIN_5763,
+ NPCs.CAVE_GOBLIN_5764, NPCs.CAVE_GOBLIN_5765, NPCs.CAVE_GOBLIN_5766, NPCs.CAVE_GOBLIN_5767,
+ NPCs.CAVE_GOBLIN_5768, NPCs.CAVE_GOBLIN_5769, NPCs.CAVE_GOBLIN_5783, NPCs.CAVE_GOBLIN_5785,
+ NPCs.CAVE_GOBLIN_5873, NPCs.CAVE_GOBLIN_5874, NPCs.CAVE_GOBLIN_5875, NPCs.CAVE_GOBLIN_5876,
+ NPCs.CAVE_GOBLIN_5877, NPCs.CAVE_GOBLIN_5878, NPCs.CAVE_GOBLIN_8451,
+
+ NPCs.CAVE_GOBLIN_GUARD_2073, NPCs.CAVE_GOBLIN_GUARD_2074,
+
+ NPCs.GOBLIN_GUARD_489, NPCs.GOBLIN_GUARD_6496, NPCs.GOBLIN_GUARD_6497,
+ NPCs.SERGEANT_GRIMSPIKE_6265,
+ NPCs.SERGEANT_STEELWILL_6263,
+ NPCs.SERGEANT_STRONGSTACK_6261
+ )
+
+ private val SKELETONS = intArrayOf(
+ NPCs.SKELETON_90, NPCs.SKELETON_91, NPCs.SKELETON_92, NPCs.SKELETON_93,
+
+ NPCs.SKELETON_459,
+
+ NPCs.SKELETON_1471, NPCs.SKELETON_2036, NPCs.SKELETON_2037, NPCs.SKELETON_2715,
+ NPCs.SKELETON_3151, NPCs.SKELETON_3152, NPCs.SKELETON_3291, NPCs.SKELETON_3581,
+ NPCs.SKELETON_4384, NPCs.SKELETON_4385, NPCs.SKELETON_4386, NPCs.SKELETON_5332,
+ NPCs.SKELETON_5333, NPCs.SKELETON_5334, NPCs.SKELETON_5335, NPCs.SKELETON_5336,
+ NPCs.SKELETON_5337, NPCs.SKELETON_5338, NPCs.SKELETON_5339, NPCs.SKELETON_5340,
+ NPCs.SKELETON_5341, NPCs.SKELETON_5365, NPCs.SKELETON_5366, NPCs.SKELETON_5367,
+ NPCs.SKELETON_5368, NPCs.SKELETON_5381, NPCs.SKELETON_5385, NPCs.SKELETON_5386,
+ NPCs.SKELETON_5387, NPCs.SKELETON_5388, NPCs.SKELETON_5389, NPCs.SKELETON_5390,
+ NPCs.SKELETON_5391, NPCs.SKELETON_5392, NPCs.SKELETON_5411, NPCs.SKELETON_5412,
+ NPCs.SKELETON_5422, NPCs.SKELETON_5423, NPCs.SKELETON_6091, NPCs.SKELETON_6092,
+ NPCs.SKELETON_6093, NPCs.SKELETON_6764, NPCs.SKELETON_6765, NPCs.SKELETON_6766,
+ NPCs.SKELETON_6767, NPCs.SKELETON_6768, NPCs.SKELETON_7774, NPCs.SKELETON_7775,
+ NPCs.SKELETON_7776, NPCs.SKELETON_7777, NPCs.SKELETON_7778, NPCs.SKELETON_7779,
+ NPCs.SKELETON_7788, NPCs.SKELETON_7815, NPCs.GIANT_SKELETON_1973,
+
+ NPCs.GIANT_SKELETON_5359, NPCs.GIANT_SKELETON_5384, NPCs.SKELETON_HELLHOUND_1575,
+
+ NPCs.SKELETON_MAGE_94, NPCs.SKELETON_MAGE_2717, NPCs.SKELETON_MAGE_3844,
+
+ NPCs.SKELETON_MAGE_3850, NPCs.SKELETON_MAGE_3851,
+
+ NPCs.SKELETON_HERO_6103, NPCs.SKELETON_BRUTE_6104, NPCs.SKELETON_WARLORD_6105,
+
+ NPCs.SKELETON_HEAVY_6106, NPCs.SKELETON_THUG_6107,
+ NPCs.NAZASTAROOL_508,
+
+ NPCs.UNDEAD_ONE_5353, NPCs.UNDEAD_ONE_5354, NPCs.UNDEAD_ONE_5355,
+ NPCs.UNDEAD_ONE_5356, NPCs.UNDEAD_ONE_5357, NPCs.UNDEAD_ONE_5358,
+ )
+
+ private val ZOMBIES = intArrayOf(
+ NPCs.ZOMBIE_73, NPCs.ZOMBIE_74, NPCs.ZOMBIE_75, NPCs.ZOMBIE_76, NPCs.ZOMBIE_419,
+ NPCs.ZOMBIE_420, NPCs.ZOMBIE_421, NPCs.ZOMBIE_422, NPCs.ZOMBIE_423, NPCs.ZOMBIE_424,
+
+ NPCs.ZOMBIE_1826, NPCs.ZOMBIE_2714, NPCs.ZOMBIE_2863, NPCs.ZOMBIE_2866, NPCs.ZOMBIE_2869,
+ NPCs.ZOMBIE_2878, NPCs.ZOMBIE_3622, NPCs.ZOMBIE_3623, NPCs.ZOMBIE_4392, NPCs.ZOMBIE_4393,
+ NPCs.ZOMBIE_4394, NPCs.ZOMBIE_5293, NPCs.ZOMBIE_5294, NPCs.ZOMBIE_5295, NPCs.ZOMBIE_5296,
+ NPCs.ZOMBIE_5297, NPCs.ZOMBIE_5298, NPCs.ZOMBIE_5299, NPCs.ZOMBIE_5300, NPCs.ZOMBIE_5301,
+ NPCs.ZOMBIE_5302, NPCs.ZOMBIE_5303, NPCs.ZOMBIE_5304, NPCs.ZOMBIE_5305, NPCs.ZOMBIE_5306,
+ NPCs.ZOMBIE_5307, NPCs.ZOMBIE_5308, NPCs.ZOMBIE_5309, NPCs.ZOMBIE_5310, NPCs.ZOMBIE_5311,
+ NPCs.ZOMBIE_5312, NPCs.ZOMBIE_5313, NPCs.ZOMBIE_5314, NPCs.ZOMBIE_5315, NPCs.ZOMBIE_5316,
+ NPCs.ZOMBIE_5317, NPCs.ZOMBIE_5318, NPCs.ZOMBIE_5319, NPCs.ZOMBIE_5320, NPCs.ZOMBIE_5321,
+ NPCs.ZOMBIE_5322, NPCs.ZOMBIE_5323, NPCs.ZOMBIE_5324, NPCs.ZOMBIE_5325, NPCs.ZOMBIE_5326,
+ NPCs.ZOMBIE_5327, NPCs.ZOMBIE_5328, NPCs.ZOMBIE_5329, NPCs.ZOMBIE_5330, NPCs.ZOMBIE_5331,
+ NPCs.ZOMBIE_5375, NPCs.ZOMBIE_5376, NPCs.ZOMBIE_5377, NPCs.ZOMBIE_5378, NPCs.ZOMBIE_5379,
+ NPCs.ZOMBIE_5380, NPCs.ZOMBIE_5393, NPCs.ZOMBIE_5394, NPCs.ZOMBIE_5395, NPCs.ZOMBIE_5396,
+ NPCs.ZOMBIE_5397, NPCs.ZOMBIE_5398, NPCs.ZOMBIE_5399, NPCs.ZOMBIE_5400, NPCs.ZOMBIE_5401,
+ NPCs.ZOMBIE_5402, NPCs.ZOMBIE_5403, NPCs.ZOMBIE_5404, NPCs.ZOMBIE_5405, NPCs.ZOMBIE_5406,
+ NPCs.ZOMBIE_5407, NPCs.ZOMBIE_5408, NPCs.ZOMBIE_5409, NPCs.ZOMBIE_5410, NPCs.ZOMBIE_6099,
+ NPCs.ZOMBIE_6100, NPCs.ZOMBIE_6131, NPCs.ZOMBIE_7789, NPCs.ZOMBIE_7790, NPCs.ZOMBIE_7791,
+ NPCs.ZOMBIE_7792, NPCs.ZOMBIE_7817, NPCs.ZOMBIE_7818, NPCs.ZOMBIE_7819, NPCs.ZOMBIE_7820,
+ NPCs.ZOMBIE_8142, NPCs.ZOMBIE_8143, NPCs.ZOMBIE_8144, NPCs.ZOMBIE_8145,
+
+ NPCs.ZOMBIE_PIRATE_2837, NPCs.ZOMBIE_PIRATE_2838, NPCs.ZOMBIE_PIRATE_2839,
+ NPCs.ZOMBIE_PIRATE_2840, NPCs.ZOMBIE_PIRATE_2841, NPCs.ZOMBIE_PIRATE_2842,
+ NPCs.ZOMBIE_PIRATE_5629, NPCs.ZOMBIE_PIRATE_5630, NPCs.ZOMBIE_PIRATE_5631,
+ NPCs.ZOMBIE_PIRATE_5632, NPCs.ZOMBIE_PIRATE_5633, NPCs.ZOMBIE_PIRATE_5634,
+ NPCs.ZOMBIE_PIRATE_5635, NPCs.ZOMBIE_PIRATE_5636, NPCs.ZOMBIE_PIRATE_5637,
+ NPCs.ZOMBIE_PIRATE_5638, NPCs.ZOMBIE_PIRATE_5639, NPCs.ZOMBIE_PIRATE_5640,
+ NPCs.ZOMBIE_PIRATE_5641, NPCs.ZOMBIE_PIRATE_5642, NPCs.ZOMBIE_PIRATE_5643,
+ NPCs.ZOMBIE_PIRATE_5644, NPCs.ZOMBIE_PIRATE_5645, NPCs.ZOMBIE_PIRATE_5646,
+ NPCs.ZOMBIE_PIRATE_5647, NPCs.ZOMBIE_PIRATE_5648, NPCs.ZOMBIE_PIRATE_5649,
+ NPCs.ZOMBIE_PIRATE_5650, NPCs.ZOMBIE_PIRATE_5651, NPCs.ZOMBIE_PIRATE_5652,
+ NPCs.ZOMBIE_PIRATE_5653, NPCs.ZOMBIE_PIRATE_5654, NPCs.ZOMBIE_PIRATE_5655,
+ NPCs.ZOMBIE_PIRATE_5656, NPCs.ZOMBIE_PIRATE_5657, NPCs.ZOMBIE_PIRATE_5658,
+ NPCs.ZOMBIE_PIRATE_5659, NPCs.ZOMBIE_PIRATE_5660, NPCs.ZOMBIE_PIRATE_5661,
+ NPCs.ZOMBIE_PIRATE_5662, NPCs.ZOMBIE_PIRATE_5663, NPCs.ZOMBIE_PIRATE_5664,
+ NPCs.ZOMBIE_PIRATE_5665,
+
+ NPCs.ZOMBIE_SWAB_2843, NPCs.ZOMBIE_SWAB_2845,
+ NPCs.ZOMBIE_SWAB_2846, NPCs.ZOMBIE_SWAB_2847,
+ NPCs.ZOMBIE_SWAB_2848,
+ NPCs.NAZASTAROOL_507,
+
+ NPCs.SLASH_BASH_2060, NPCs.SOREBONES_5627, NPCs.SOREBONES_5628,
+
+ NPCs.UNDEAD_LUMBERJACK_1524,
+
+ NPCs.UNDEAD_ONE_502, NPCs.UNDEAD_ONE_503, NPCs.UNDEAD_ONE_504, NPCs.UNDEAD_ONE_505,
+
+ NPCs.ZOGRE_2044, NPCs.ZOGRE_2045, NPCs.ZOGRE_2046, NPCs.ZOGRE_2047, NPCs.ZOGRE_2048,
+ NPCs.ZOGRE_2049, NPCs.ZOGRE_2051, NPCs.ZOGRE_2052, NPCs.ZOGRE_2053, NPCs.ZOGRE_2054,
+ NPCs.ZOGRE_2055,
+ NPCs.UNDEAD_LUMBERJACK_1524, NPCs.UNDEAD_LUMBERJACK_1525, NPCs.UNDEAD_LUMBERJACK_5678,
+ NPCs.UNDEAD_LUMBERJACK_5679, NPCs.UNDEAD_LUMBERJACK_5680, NPCs.UNDEAD_LUMBERJACK_5681,
+ NPCs.UNDEAD_LUMBERJACK_5682, NPCs.UNDEAD_LUMBERJACK_5683, NPCs.UNDEAD_LUMBERJACK_5684,
+ NPCs.UNDEAD_LUMBERJACK_5685, NPCs.UNDEAD_LUMBERJACK_5686, NPCs.UNDEAD_LUMBERJACK_5687,
+ NPCs.UNDEAD_LUMBERJACK_5688, NPCs.UNDEAD_LUMBERJACK_5689, NPCs.UNDEAD_LUMBERJACK_5690,
+ NPCs.UNDEAD_LUMBERJACK_5691, NPCs.UNDEAD_LUMBERJACK_5692, NPCs.UNDEAD_LUMBERJACK_5693,
+ NPCs.UNDEAD_LUMBERJACK_5694, NPCs.UNDEAD_LUMBERJACK_5695, NPCs.UNDEAD_LUMBERJACK_5696,
+ NPCs.UNDEAD_LUMBERJACK_5697, NPCs.UNDEAD_LUMBERJACK_5698, NPCs.UNDEAD_LUMBERJACK_5699,
+ NPCs.UNDEAD_LUMBERJACK_5700, NPCs.UNDEAD_LUMBERJACK_5701, NPCs.UNDEAD_LUMBERJACK_5702,
+ NPCs.UNDEAD_LUMBERJACK_5703, NPCs.UNDEAD_LUMBERJACK_5704, NPCs.UNDEAD_LUMBERJACK_5705,
+ NPCs.UNDEAD_LUMBERJACK_5706, NPCs.UNDEAD_LUMBERJACK_5707, NPCs.UNDEAD_LUMBERJACK_5708,
+ NPCs.UNDEAD_LUMBERJACK_5709, NPCs.UNDEAD_LUMBERJACK_5710, NPCs.UNDEAD_LUMBERJACK_5711,
+ NPCs.UNDEAD_LUMBERJACK_5712, NPCs.UNDEAD_LUMBERJACK_5713, NPCs.UNDEAD_LUMBERJACK_5714,
+ NPCs.UNDEAD_LUMBERJACK_5715, NPCs.UNDEAD_LUMBERJACK_5716, NPCs.UNDEAD_LUMBERJACK_5717,
+ NPCs.UNDEAD_LUMBERJACK_5718, NPCs.UNDEAD_LUMBERJACK_5719, NPCs.UNDEAD_LUMBERJACK_5720,
+ NPCs.UNDEAD_LUMBERJACK_5721, NPCs.UNDEAD_LUMBERJACK_5722, NPCs.UNDEAD_LUMBERJACK_5723,
+ NPCs.UNDEAD_LUMBERJACK_5724, NPCs.UNDEAD_LUMBERJACK_5725, NPCs.UNDEAD_LUMBERJACK_5726,
+ NPCs.UNDEAD_LUMBERJACK_5727, NPCs.UNDEAD_LUMBERJACK_5728, NPCs.UNDEAD_LUMBERJACK_5729,
+ NPCs.UNDEAD_LUMBERJACK_5730, NPCs.UNDEAD_LUMBERJACK_5731, NPCs.UNDEAD_LUMBERJACK_5732,
+ NPCs.UNDEAD_LUMBERJACK_5733, NPCs.UNDEAD_LUMBERJACK_5734, NPCs.UNDEAD_LUMBERJACK_5735,
+ NPCs.UNDEAD_LUMBERJACK_5736, NPCs.UNDEAD_LUMBERJACK_5737, NPCs.UNDEAD_LUMBERJACK_5738,
+ NPCs.UNDEAD_LUMBERJACK_5739, NPCs.UNDEAD_LUMBERJACK_5740, NPCs.UNDEAD_LUMBERJACK_5741,
+ NPCs.UNDEAD_LUMBERJACK_5742, NPCs.UNDEAD_LUMBERJACK_5743, NPCs.UNDEAD_LUMBERJACK_5744,
+ NPCs.UNDEAD_LUMBERJACK_5745, NPCs.UNDEAD_LUMBERJACK_5746, NPCs.UNDEAD_LUMBERJACK_5747,
+ )
+
+ private val GIANTS = intArrayOf(
+ NPCs.HILL_GIANT_117, NPCs.HILL_GIANT_4689, NPCs.HILL_GIANT_4690, NPCs.HILL_GIANT_4691,
+ NPCs.HILL_GIANT_4692, NPCs.HILL_GIANT_4693,
+
+ NPCs.FIRE_GIANT_110, NPCs.FIRE_GIANT_1582, NPCs.FIRE_GIANT_1583, NPCs.FIRE_GIANT_1584,
+ NPCs.FIRE_GIANT_1585, NPCs.FIRE_GIANT_1586, NPCs.FIRE_GIANT_7003, NPCs.FIRE_GIANT_7004,
+
+ NPCs.MOSS_GIANT_112, NPCs.MOSS_GIANT_1587, NPCs.MOSS_GIANT_1588, NPCs.MOSS_GIANT_1681,
+ NPCs.MOSS_GIANT_4534, NPCs.MOSS_GIANT_4688, NPCs.MOSS_GIANT_4706,
+
+ NPCs.ICE_GIANT_111, NPCs.ICE_GIANT_3072, NPCs.ICE_GIANT_4685, NPCs.ICE_GIANT_4686,
+ NPCs.ICE_GIANT_4687,
+ NPCs.BLACK_KNIGHT_TITAN_221,
+
+ NPCs.CYCLOPS_116, NPCs.CYCLOPS_4291, NPCs.CYCLOPS_4292, NPCs.CYCLOPS_6078,
+ NPCs.CYCLOPS_6079, NPCs.CYCLOPS_6080, NPCs.CYCLOPS_6081, NPCs.CYCLOPS_6082,
+ NPCs.CYCLOPS_6083, NPCs.CYCLOPS_6269, NPCs.CYCLOPS_6270,
+ )
+
+ private val HOBGOBLINS = intArrayOf(
+ NPCs.HOBGOBLIN_122, NPCs.HOBGOBLIN_123, NPCs.HOBGOBLIN_2685, NPCs.HOBGOBLIN_2686,
+ NPCs.HOBGOBLIN_2687, NPCs.HOBGOBLIN_2688, NPCs.HOBGOBLIN_3583, NPCs.HOBGOBLIN_4898,
+ NPCs.HOBGOBLIN_6275,
+ )
+
+ private val GHOUL = NPCs.GHOUL_1218
+ private val EARTH_WARRIOR = NPCs.EARTH_WARRIOR_124
+
+ private val JOGRES = intArrayOf(NPCs.JOGRE_113, NPCs.JOGRE_6268)
+
+ private val LESSER_DEMONS = intArrayOf(
+ NPCs.LESSER_DEMON_82, NPCs.LESSER_DEMON_4694, NPCs.LESSER_DEMON_4695,
+ NPCs.LESSER_DEMON_4696, NPCs.LESSER_DEMON_4697, NPCs.LESSER_DEMON_6101,
+ )
+
+ private val ZAKLN = NPCs.ZAKLN_GRITCH_6206
+
+ val SCROLLS = intArrayOf(
+ Items.CHAMPION_SCROLL_6803, Items.CHAMPION_SCROLL_6801, Items.CHAMPION_SCROLL_6806,
+ Items.CHAMPION_SCROLL_6807, Items.CHAMPION_SCROLL_6800, Items.CHAMPION_SCROLL_6802,
+ Items.CHAMPION_SCROLL_6799, Items.CHAMPION_SCROLL_6798, Items.CHAMPION_SCROLL_6804,
+ Items.CHAMPION_SCROLL_6805
+ )
+
+ val idMap = HashMap()
+
+ init {
+ for (id in IMPS)
+ idMap[id] = 0
+ for (id in GOBLINS)
+ idMap[id] = 1
+ for (id in SKELETONS)
+ idMap[id] = 2
+ for (id in ZOMBIES)
+ idMap[id] = 3
+ for (id in GIANTS)
+ idMap[id] = 4
+ for (id in HOBGOBLINS)
+ idMap[id] = 5
+ for (id in JOGRES)
+ idMap[id] = 8
+ for (id in LESSER_DEMONS)
+ idMap[id] = 9
+
+ idMap[GHOUL] = 6
+ idMap[EARTH_WARRIOR] = 7
+ }
+ }
+
+ override fun onNpcKilled(player: Player, event: NPCKillEvent) {
+ if (player.isArtificial) return
+ if (player.questRepository.points >= 32) {
+ val scrollType = idMap[event.npc.id] ?: return
+ rollForScroll (player, scrollType, event.npc)
+ }
+ }
+
+ private fun rollForScroll(player: Player, scroll: Int, npc: NPC) {
+ val scrollID = SCROLLS[scroll]
+ val roll = RandomFunction.roll(if (GameWorld.settings!!.isDevMode) 5 else 5000)
+ if (roll) {
+ GroundItemManager.create(Item(scrollID), npc.location, player)
+ sendMessage(player, colorize("%RA Champion's scroll falls to the ground as you slay your opponent."))
+ }
+ }
+
+}
diff --git a/Server/src/main/content/global/activity/cchallange/ChampionScrollsEventHookBase.kt b/Server/src/main/content/global/activity/cchallange/ChampionScrollsEventHookBase.kt
new file mode 100644
index 000000000..12f8260c9
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/ChampionScrollsEventHookBase.kt
@@ -0,0 +1,39 @@
+package content.global.activity.cchallange
+
+import core.api.LoginListener
+import core.game.event.Event
+import core.game.event.EventHook
+import core.game.event.NPCKillEvent
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+
+/**
+ * Manages the champion scrolls drop.
+ * @authors Phil, Skelsoft.
+ */
+
+abstract class ChampionScrollsEventHookBase : LoginListener {
+
+ protected companion object {
+ private fun forEligibleEntityDo(entity: Entity, event: T, handler: (Player, T) -> Unit) {
+ if (entity !is Player) return
+ if (entity.isArtificial) return
+ handler(entity, event)
+ }
+ }
+
+ class EventHandler(
+ private val owner: ChampionScrollsEventHookBase,
+ private val handler: (Player, T) -> Unit) : EventHook {
+ override fun process(entity: Entity, event: T) {
+ forEligibleEntityDo(entity, event, handler)
+ }
+ }
+
+ final override fun login(player: Player) {
+ player.hook(core.api.Event.NPCKilled, EventHandler(this, ::onNpcKilled))
+ }
+
+ protected open fun onNpcKilled(player: Player, event: NPCKillEvent) {}
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/LarxusDialogue.kt b/Server/src/main/content/global/activity/cchallange/LarxusDialogue.kt
new file mode 100644
index 000000000..6ec919bd7
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/LarxusDialogue.kt
@@ -0,0 +1,72 @@
+package content.global.activity.cchallange
+
+import core.api.*
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.npc.NPC
+import core.plugin.Initializable
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the dialogue plugin used for the larxus npc.
+ * @author 'Vexia
+ * @version 1.1
+ */
+
+@Initializable
+class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ val scrolls = intArrayOf(Items.CHAMPION_SCROLL_6798, Items.CHAMPION_SCROLL_6799, Items.CHAMPION_SCROLL_6800, Items.CHAMPION_SCROLL_6801, Items.CHAMPION_SCROLL_6802, Items.CHAMPION_SCROLL_6803, Items.CHAMPION_SCROLL_6804, Items.CHAMPION_SCROLL_6805, Items.CHAMPION_SCROLL_6806, Items.CHAMPION_SCROLL_6807,)
+ npc = NPC(NPCs.LARXUS_3050)
+ if (ChallengeStart) {
+ when (stage) {
+ 0 -> {
+ face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1)
+ for (i in scrolls)when{
+ inInventory(player!!,Items.CHAMPION_SCROLL_6798) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use prayer's. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6799) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only weapons. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6800) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only melee combat skill. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6801) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only magic skill. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6802) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use melee combat skills. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6803) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use weapons with special attack. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6804) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use ranged skill. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6805) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only equipment. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6806) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only ranged skill. Do you still want to proceed?").also { stage = 1 }
+ inInventory(player!!,Items.CHAMPION_SCROLL_6807) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use magic skill. Do you still want to proceed?").also { stage = 1 }
+ else -> {
+ sendMessage(player!!, "Nothing interesting happens.").also { stage = END_DIALOGUE } }
+ }
+ }
+ 1 -> options("Yes, let me at him!", "No, thanks I'll pass.").also { stage = 2 }
+ 2 -> when (buttonID) {
+ 1 -> playerl("Yes, let me at him!").also { stage = 3 }
+ 2 -> playerl("No, thanks I'll pass.").also { stage = END_DIALOGUE }
+ }
+ 3 -> npcl("Your challenger is ready, please go down through the trapdoor when you're ready.").also { stage = 4 }
+ 4 -> {
+ end()
+ setAttribute(player!!, "championsarena:start", true)
+ }
+ }
+ } else {
+ when (stage) {
+ START_DIALOGUE -> {
+ face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1)
+ npcl(FacialExpression.NEUTRAL, "Is there something I can help you with?").also { stage = 1 }
+ }
+ 1 -> options("I was given a challenge, what now?", "What is this place?", "Nothing thanks.").also { stage = 2 }
+ 2 -> when (buttonID) {
+ 1 -> playerl("I was given a challenge, what now?").also { stage = 3 }
+ 2 -> playerl("What is this place?").also { stage = 4 }
+ 3 -> playerl("Nothing thanks.").also { stage = END_DIALOGUE }
+ }
+ 3 -> npcl("Well pass it here and we'll get you started.").also { stage = END_DIALOGUE }
+ 4 -> npcl("This is the champions' arena, the champions of various, races use it to duel those they deem worthy of the, honour.").also { stage = END_DIALOGUE }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/EarthWarriorChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/EarthWarriorChampionNPC.kt
new file mode 100644
index 000000000..ea868cc2e
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/EarthWarriorChampionNPC.kt
@@ -0,0 +1,114 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Earth warrior champion NPC for Champions challenge.
+ */
+
+@Initializable
+class EarthWarriorChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return EarthWarriorChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.EARTH_WARRIOR_CHAMPION_3057)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnEarthWarriorChampion(player: Player) {
+ val champion = EarthWarriorChampionNPC(NPCs.EARTH_WARRIOR_CHAMPION_3057)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ val prayerItems = intArrayOf(
+ Items.PRAYER_POTION1_143, Items.PRAYER_POTION1_144,
+ Items.PRAYER_POTION2_141, Items.PRAYER_POTION2_142,
+ Items.PRAYER_POTION3_139, Items.PRAYER_POTION3_140,
+ Items.PRAYER_POTION4_2434, Items.PRAYER_POTION4_2435,
+
+ Items.SUPER_RESTORE1_3030, Items.SUPER_RESTORE1_3031,
+ Items.SUPER_RESTORE2_3028, Items.SUPER_RESTORE2_3029,
+ Items.SUPER_RESTORE3_3026, Items.SUPER_RESTORE3_3027,
+ Items.SUPER_RESTORE4_3024, Items.SUPER_RESTORE4_3025,
+
+ Items.PRAYER_CAPE_9759, Items.PRAYER_CAPET_9760,
+ Items.PRAYER_HOOD_9761, Items.PRAYER_CAPE_10643,
+
+ Items.PRAYER_POTION4_14209, Items.PRAYER_POTION4_14210,
+ Items.PRAYER_POTION3_14211, Items.PRAYER_POTION3_14212,
+ Items.PRAYER_POTION2_14213, Items.PRAYER_POTION2_14214,
+ Items.PRAYER_POTION1_14215, Items.PRAYER_POTION1_14216,
+
+ Items.FALADOR_SHIELD_1_14577, Items.FALADOR_SHIELD_2_14578,
+ Items.FALADOR_SHIELD_3_14579,
+
+ Items.PRAYER_MIX1_11467, Items.PRAYER_MIX1_11468,
+ Items.PRAYER_MIX2_11465, Items.PRAYER_MIX2_11466,
+
+ Items.SUP_RESTORE_MIX1_11495, Items.SUP_RESTORE_MIX1_11496,
+ Items.SUP_RESTORE_MIX2_11493, Items.SUP_RESTORE_MIX2_11494,
+ )
+ if (player.inventory.containsAtLeastOneItem(prayerItems) || player.equipment.containsAtLeastOneItem(
+ prayerItems
+ )
+ ) {
+ sendNPCDialogue(player, NPCs.LARXUS_3050, "For this fight you're not allowed to use prayers!")
+ teleport(player, Location.create(3182, 9758, 0)) // Behind Doors.
+ } else {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ }
+ return true
+ }
+ })
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Earth Warrior Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6798, 260, 63, 3)
+ setInterfaceText(killer, "432 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "432 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1452, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 432.0)
+ rewardXP(killer, Skills.SLAYER, 432.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/GhoulChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/GhoulChampionNPC.kt
new file mode 100644
index 000000000..a6421a842
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/GhoulChampionNPC.kt
@@ -0,0 +1,105 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.container.impl.EquipmentContainer
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.node.item.Item
+import core.game.system.config.ItemConfigParser
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Ghoul champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GhoulChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return GhoulChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GHOUL_CHAMPION_3059)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnGhoulChampion(player: Player) {
+ val champion = GhoulChampionNPC(NPCs.GHOUL_CHAMPION_3059)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ val i: Item = player.equipment[EquipmentContainer.SLOT_WEAPON].id.asItem()
+ if (i.definition.getConfiguration(ItemConfigParser.TWO_HANDED, false) == true && state.style == CombatStyle.MELEE) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (state.style == CombatStyle.MAGIC) {
+ sendMessage(player, "You can use only weapons in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Ghoul Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6799, 260, 63, 3)
+ setInterfaceText(killer, "400 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "400 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1453, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 400.0)
+ rewardXP(killer, Skills.SLAYER, 400.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/GiantChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/GiantChampionNPC.kt
new file mode 100644
index 000000000..3309be77b
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/GiantChampionNPC.kt
@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Giant champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GiantChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return GiantChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GIANT_CHAMPION_3058)
+
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnGiantChampion(player: Player) {
+ val champion = GiantChampionNPC(NPCs.GIANT_CHAMPION_3058)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.MELEE) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (state.style == CombatStyle.RANGE || state.style == CombatStyle.MAGIC) {
+ sendMessage(player, "You can use only melee in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Giant Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6800, 260, 63, 3)
+ setInterfaceText(killer, "280 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "280 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1454, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 280.0)
+ rewardXP(killer, Skills.SLAYER, 280.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/GoblinChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/GoblinChampionNPC.kt
new file mode 100644
index 000000000..861287813
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/GoblinChampionNPC.kt
@@ -0,0 +1,101 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Goblin champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GoblinChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return GoblinChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GOBLIN_CHAMPION_3060)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnGoblinChampion(player: Player) {
+ val champion = GoblinChampionNPC(NPCs.GOBLIN_CHAMPION_3060)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.MAGIC) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
+ sendMessage(player, "You can use only spells in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Goblin Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6801, 260, 63, 3)
+ setInterfaceText(killer, "128 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "128 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1455, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 128.0)
+ rewardXP(killer, Skills.SLAYER, 128.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/HobgoblinChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/HobgoblinChampionNPC.kt
new file mode 100644
index 000000000..01d0ffa89
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/HobgoblinChampionNPC.kt
@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Hobgoblin champion NPC for Champions challenge.
+ */
+
+@Initializable
+class HobgoblinChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return HobgoblinChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.HOBGOBLIN_CHAMPION_3061)
+ }
+
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnHobgoblinChampion(player: Player) {
+ val champion = HobgoblinChampionNPC(NPCs.HOBGOBLIN_CHAMPION_3061)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.RANGE) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+
+ if (state.style == CombatStyle.MELEE) {
+ sendMessage(player, "You cannot use melee in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Hobgoblin Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6802, 260, 63, 3)
+ setInterfaceText(killer, "232 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "232 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1456, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 232.0)
+ rewardXP(killer, Skills.SLAYER, 232.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/ImpChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/ImpChampionNPC.kt
new file mode 100644
index 000000000..4a81fc066
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/ImpChampionNPC.kt
@@ -0,0 +1,104 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.WeaponInterface
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Imp champion NPC for Champions challenge.
+ */
+
+@Initializable
+class ImpChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return ImpChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.IMP_CHAMPION_3062)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnImpChampion(player: Player) {
+ val champion = ImpChampionNPC(NPCs.IMP_CHAMPION_3062)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ val w = player.getExtension(WeaponInterface::class.java)
+ if (state.style == CombatStyle.MELEE || state.style == CombatStyle.MAGIC || state.style == CombatStyle.RANGE) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (w.weaponInterface.interfaceId == 10) {
+ sendMessage(player, "You cannot use special attack in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Imp Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6803, 260, 63, 3)
+ setInterfaceText(killer, "160 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "160 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1457, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 160.0)
+ rewardXP(killer, Skills.SLAYER, 160.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/JogreChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/JogreChampionNPC.kt
new file mode 100644
index 000000000..ad6889e7b
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/JogreChampionNPC.kt
@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.Weapon
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Jogre champion NPC for Champions challenge.
+ */
+
+@Initializable
+class JogreChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return JogreChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.JOGRE_CHAMPION_3063)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnJogreChampion(player: Player) {
+ val champion = JogreChampionNPC(NPCs.JOGRE_CHAMPION_3063)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.MELEE) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (state.weapon.type == Weapon.WeaponType.DEGRADING || state.style == CombatStyle.RANGE) {
+ sendMessage(player, "You cannot use ranged weapons.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Jogre Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6804, 260, 63, 3)
+ setInterfaceText(killer, "480 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "480 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1458, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 480.0)
+ rewardXP(killer, Skills.SLAYER, 480.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/LesserDemonChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/LesserDemonChampionNPC.kt
new file mode 100644
index 000000000..e62f73bf2
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/LesserDemonChampionNPC.kt
@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.container.impl.EquipmentContainer
+import core.game.global.action.EquipHandler
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Lesser demon champion NPC for Champions challenge.
+ */
+
+@Initializable
+class LesserDemonChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return LesserDemonChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.LESSER_DEMON_CHAMPION_3064)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnLesserDemonChampion(player: Player) {
+ val champion = LesserDemonChampionNPC(NPCs.LESSER_DEMON_CHAMPION_3064)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (!player.equipment[3].hasItemPlugin()) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ } else {
+ EquipHandler.unequip(player, EquipmentContainer.SLOT_WEAPON, id)
+ sendMessage(player, "You cannot use weapons in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Lesser Demon Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6805, 260, 63, 3)
+ setInterfaceText(killer, "592 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "592 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1459, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 592.0)
+ rewardXP(killer, Skills.SLAYER, 592.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/SkeletonChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/SkeletonChampionNPC.kt
new file mode 100644
index 000000000..40a33a420
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/SkeletonChampionNPC.kt
@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.Weapon
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Skeleton champion NPC for Champions challenge.
+ */
+
+@Initializable
+class SkeletonChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return SkeletonChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SKELETON_CHAMPION_3065)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnSkeletonChampion(player: Player) {
+ val champion = SkeletonChampionNPC(NPCs.SKELETON_CHAMPION_3065)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ animate(champion, 259, true)
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.RANGE && state.weapon.type == Weapon.WeaponType.DEGRADING && state.weapon.type == Weapon.WeaponType.DOUBLE_SHOT) {
+ state.neutralizeHits()
+ state.estimatedHit = state.maximumHit
+ }
+ if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.MELEE) {
+ sendMessage(player, "You can use only ranged weapons in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Skeleton Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6806, 260, 63, 3)
+ setInterfaceText(killer, "232 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "232 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1460, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 232.0)
+ rewardXP(killer, Skills.SLAYER, 232.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/cchallange/npc/ZombieChampionNPC.kt b/Server/src/main/content/global/activity/cchallange/npc/ZombieChampionNPC.kt
new file mode 100644
index 000000000..0be9eeb3d
--- /dev/null
+++ b/Server/src/main/content/global/activity/cchallange/npc/ZombieChampionNPC.kt
@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Zombie champion NPC for Champions challenge.
+ */
+
+@Initializable
+class ZombieChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+ var clearTime = 0
+ override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+ return ZombieChampionNPC(id, location)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.ZOMBIES_CHAMPION_3066)
+ }
+
+ override fun handleTickActions() {
+ super.handleTickActions()
+ if (clearTime++ > 288) poofClear(this)
+ }
+
+ companion object {
+ fun spawnZombieChampion(player: Player) {
+ val champion = ZombieChampionNPC(NPCs.ZOMBIES_CHAMPION_3066)
+ champion.location = location(3170, 9758, 0)
+ champion.isWalks = true
+ champion.isAggressive = true
+ champion.isActive = false
+
+ if (champion.asNpc() != null && champion.isActive) {
+ champion.properties.teleportLocation = champion.properties.spawnLocation
+ }
+
+ champion.isActive = true
+ GameWorld.Pulser.submit(object : Pulse(0, champion) {
+ override fun pulse(): Boolean {
+ champion.init()
+ registerHintIcon(player, champion)
+ champion.attack(player)
+ return true
+ }
+ })
+ }
+ }
+
+ override fun checkImpact(state: BattleState) {
+ super.checkImpact(state)
+ val player = state.attacker
+ if (player is Player) {
+ if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
+ state.estimatedHit = state.maximumHit
+ state.neutralizeHits()
+ }
+ if (state.style == CombatStyle.MAGIC) {
+ sendMessage(player, "You cannot use spells in this challenge.")
+ if (state.estimatedHit > -1) {
+ state.estimatedHit = 0
+ return
+ }
+ if (state.secondaryHit > -1) {
+ state.secondaryHit = 0
+ return
+ }
+ }
+ }
+ }
+
+ override fun finalizeDeath(killer: Entity?) {
+ if (killer is Player) {
+ lock(killer, 2)
+ runTask(killer, 1) {
+ openInterface(killer, 63)
+ setInterfaceText(killer, "Well done, you defeated the Zombie Champion!", 63, 2)
+ killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6807, 260, 63, 3)
+ setInterfaceText(killer, "240 Slayer Xp", 63, 6)
+ setInterfaceText(killer, "240 Hitpoint Xp", 63, 7)
+ }
+ setVarbit(killer, 1461, 1, true)
+ rewardXP(killer, Skills.HITPOINTS, 240.0)
+ rewardXP(killer, Skills.SLAYER, 240.0)
+ removeAttribute("championsarena:start")
+ clearHintIcon(killer)
+ }
+ clear()
+ super.finalizeDeath(killer)
+ }
+}
diff --git a/Server/src/main/content/global/activity/jobs/CheckJobDialogueFile.kt b/Server/src/main/content/global/activity/jobs/CheckJobDialogueFile.kt
new file mode 100644
index 000000000..fc3a2e58a
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/CheckJobDialogueFile.kt
@@ -0,0 +1,174 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.addItem
+import core.api.amountInInventory
+import core.api.hasAnItem
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.IfTopic
+import core.game.dialogue.Topic
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * The dialogue file to handle a player asking about work with the employer that assigned them
+ * their current job.
+ */
+class CheckJobDialogueFile : DialogueFile() {
+ companion object {
+ const val TURN_IN_ITEMS_1 = 1
+ const val TURN_IN_ITEMS_2 = 2
+ const val TURN_IN_ITEMS_3 = 3
+ const val TURN_IN_ITEMS_4 = 4
+ const val TURN_IN_ITEMS_5 = 5
+ const val REMIND_JOB = 101
+ const val GET_TASK_LIST = 201
+ const val GET_NEW_JOB_1 = 301
+ const val GET_NEW_JOB_2 = 302
+ const val GET_NEW_JOB_3 = 303
+ const val GET_NEW_JOB_4 = 304
+ const val GET_NEW_JOB_5 = 305
+ const val GET_NEW_JOB_NONE = 306
+ const val GET_NEW_JOB_REACHED_LIMIT = 307
+ }
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ val playerJobManager: JobManager = JobManager.getInstance(player!!)
+ val job = playerJobManager.job ?: return
+ val originalAmount = playerJobManager.jobOriginalAmount
+
+ when (stage) {
+ START_DIALOGUE -> showTopics(
+ IfTopic(
+ FacialExpression.HAPPY,
+ "I have the items you wanted.",
+ TURN_IN_ITEMS_1,
+ (job.type == JobType.PRODUCTION && amountInInventory(player!!, (job as ProductionJobs).itemId) > 0)
+ ), Topic(
+ FacialExpression.HALF_ASKING, "Can you remind me what job you gave me?", REMIND_JOB
+ ), Topic(
+ FacialExpression.HALF_ASKING, "Can I have a task list to remind me of my job?", GET_TASK_LIST
+ ), Topic(
+ FacialExpression.HALF_GUILTY, "I'd like a new job please.", GET_NEW_JOB_1
+ )
+ )
+
+ TURN_IN_ITEMS_1 -> {
+ job as ProductionJobs
+ val itemName = Item(job.itemId).name.lowercase()
+ val itemNamePluralized = if (playerJobManager.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+ npcl("Splendid! Now, I needed $originalAmount $itemNamePluralized.")
+ stage = TURN_IN_ITEMS_2
+ }
+
+ TURN_IN_ITEMS_2 -> {
+ if (playerJobManager.jobAmount == originalAmount) {
+ npcl("So far, you haven't brought me any, so I'm waiting for ${playerJobManager.jobAmount}.")
+ } else {
+ npcl("So far, you have brought me ${originalAmount - playerJobManager.jobAmount}, so I'm waiting for ${playerJobManager.jobAmount}.")
+ }
+ stage = TURN_IN_ITEMS_3
+ }
+
+ TURN_IN_ITEMS_3 -> {
+ if (amountInInventory(player!!, (job as ProductionJobs).itemId) >= playerJobManager.jobAmount) {
+ npcl("I can see that you have plenty, would you like to hand some over to complete your job?")
+ } else {
+ npcl("I can see that you have some, would you like to hand them over?")
+ }
+ stage = TURN_IN_ITEMS_4
+ }
+
+ TURN_IN_ITEMS_4 -> showTopics(
+ Topic("Yes, I'll give you what I have.", TURN_IN_ITEMS_5, skipPlayer = true),
+ Topic("No, I'll keep hold of it for now.", END_DIALOGUE, skipPlayer = true)
+ )
+
+ TURN_IN_ITEMS_5 -> {
+ playerJobManager.turnInItems()
+
+ if (playerJobManager.jobAmount == 0) {
+ playerJobManager.rewardPlayer()
+ npcl("There you go, thanks for your help. You're quite a skilled worker!")
+ } else {
+ npcl("Thanks for your help. Come back when you've got more!")
+ }
+ stage = END_DIALOGUE
+ }
+
+ REMIND_JOB -> {
+ when (job.type) {
+ JobType.PRODUCTION -> {
+ job as ProductionJobs
+ val itemName = Item(job.itemId).name.lowercase()
+ val itemNamePluralized =
+ if (playerJobManager.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+ npcl("You still need to gather ${playerJobManager.jobAmount} more $itemNamePluralized.")
+ }
+
+ JobType.BONE_BURYING -> {
+ job as BoneBuryingJobs
+ val boneName = Item(job.boneIds.first()).name.lowercase()
+ val boneNamePluralized =
+ if (playerJobManager.jobAmount > 1) StringUtils.plusS(boneName) else boneName
+ npcl("You still need to bury ${playerJobManager.jobAmount} more $boneNamePluralized in the ${job.buryArea.title}.")
+ }
+
+ JobType.COMBAT -> {
+ job as CombatJobs
+ val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+ val monsterNamePluralized =
+ if (playerJobManager.jobAmount > 1) StringUtils.plusS(monsterName) else monsterName
+ npcl("You still need to kill ${playerJobManager.jobAmount} more $monsterNamePluralized.")
+ }
+ }
+ stage = END_DIALOGUE
+ }
+
+ GET_TASK_LIST -> {
+ if (hasAnItem(player!!, Items.TASK_LIST_13464).exists()) {
+ npcl("You already have one of those!")
+ } else {
+ when (addItem(player!!, Items.TASK_LIST_13464)) {
+ true -> npcl("Here you go then.")
+ false -> dialogue("You don't have enough space in your inventory.")
+ }
+ }
+
+ stage = END_DIALOGUE
+ }
+
+ GET_NEW_JOB_1 -> npcl("Let me see if I've got any work for you.").also {
+ if (playerJobManager.hasReachedJobLimit()) {
+ stage = GET_NEW_JOB_REACHED_LIMIT
+ } else {
+ playerJobManager.generate(npc!!)
+ stage = if (playerJobManager.hasJob()) GET_NEW_JOB_2 else GET_NEW_JOB_NONE
+ }
+ }
+
+ GET_NEW_JOB_2 -> npcl(playerJobManager.getAssignmentMessage()).also { stage = GET_NEW_JOB_3 }
+ // Historically, the player would also have the option to ask for an easier task
+ GET_NEW_JOB_3 -> playerl("Okay, off I go!").also { stage = GET_NEW_JOB_4 }
+ GET_NEW_JOB_4 -> npcl("There, I've updated your task list to show your new job. Best of luck!").also {
+ stage = GET_NEW_JOB_5
+ }
+
+ GET_NEW_JOB_5 -> playerl("Thanks.").also { stage = END_DIALOGUE }
+ GET_NEW_JOB_NONE -> npcl("I'm sorry, I don't currently have any jobs that you're qualified for.").also {
+ stage = END_DIALOGUE
+ }
+
+ GET_NEW_JOB_REACHED_LIMIT -> npcl("You've hit your limit for the day. Come back tomorrow!").also {
+ stage = END_DIALOGUE
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/Job.kt b/Server/src/main/content/global/activity/jobs/Job.kt
new file mode 100644
index 000000000..f4558328c
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/Job.kt
@@ -0,0 +1,23 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.Employers
+import core.tools.RandomFunction
+
+/**
+ * The interface for a job that a player can be assigned.
+ *
+ * TODO: Once player data is stored in a database with support for migrations, implement a per-player field to store
+ * the player's current employer, so that multiple employers can assign the same job, but the player will only be
+ * able to turn the job into the employer that assigned it to them.
+ */
+interface Job {
+ val type: JobType
+ val lower: Int
+ val upper: Int
+
+ val employer: Employers
+
+ fun getAmount(): Int {
+ return RandomFunction.random(lower, upper + 1)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/JobManager.kt b/Server/src/main/content/global/activity/jobs/JobManager.kt
new file mode 100644
index 000000000..001aeae6f
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/JobManager.kt
@@ -0,0 +1,215 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.ServerStore
+import core.ServerStore.Companion.getInt
+import core.api.*
+import core.game.event.BoneBuryEvent
+import core.game.event.EventHook
+import core.game.event.JobAssignmentEvent
+import core.game.event.NPCKillEvent
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.tools.StringUtils
+import org.json.simple.JSONObject
+import org.rs09.consts.Items
+import java.lang.Integer.min
+
+/**
+ * Manages the player's job data & progression.
+ *
+ * @source https://runescape.wiki/w/Jobs?oldid=831782
+ */
+class JobManager(val player: Player? = null) : LoginListener, PersistPlayer {
+ var job: Job? = null
+ var jobAmount: Int = 0
+ var jobOriginalAmount: Int = 0
+
+ private fun hasLevelRequirement(job: ProductionJobs): Boolean {
+ if (player == null) return false
+ if (player.isArtificial) return false
+
+ return getStatLevel(player, job.skill) >= job.lvlReq
+ }
+
+ fun hasJob(): Boolean = this.job != null
+
+ // Historically the job limit would be 6 jobs per hour of play-time, using 3 per day for balance purposes
+ fun hasReachedJobLimit(): Boolean = player?.let { getStoreFile().getInt(it.username.lowercase()) >= 3 } ?: false
+
+ fun generate(npc: NPC) {
+ if (player == null) return
+ if (player.isArtificial) return
+
+ val instance = getInstance(player)
+
+ // Create a list of jobs that the player can do and are given by the NPC being interacted with
+ val potentialJobs: List = (
+ ProductionJobs.values().filter { hasLevelRequirement(it) }
+ + BoneBuryingJobs.values()
+ + CombatJobs.values()
+ )
+ .filter { job -> job.employer.npcId == npc.id }
+
+ val job = potentialJobs.randomOrNull() ?: return
+
+ instance.job = job
+ this.jobAmount = job.getAmount()
+ this.jobOriginalAmount = instance.jobAmount
+
+ player.dispatch(JobAssignmentEvent(job.type, npc))
+ getStoreFile()[player.username.lowercase()] = getStoreFile().getInt(player.username.lowercase()) + 1
+ }
+
+ fun getAssignmentMessage(): String? {
+ if (player == null) return null
+ if (player.isArtificial) return null
+
+ val instance = getInstance(player)
+ val job = instance.job ?: return null
+
+ return when (job.type) {
+ JobType.PRODUCTION -> {
+ job as ProductionJobs
+ val itemName = Item(job.itemId).name.lowercase()
+ val itemNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+ "Okay, your job is to bring me ${this.jobAmount} $itemNamePluralized."
+ }
+
+ JobType.BONE_BURYING -> {
+ job as BoneBuryingJobs
+ val boneName = Item(job.boneIds.first()).name.lowercase()
+ val boneNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(boneName) else boneName
+ "Okay, your job is to bury ${this.jobAmount} $boneNamePluralized in the ${job.buryArea.title}."
+ }
+
+ JobType.COMBAT -> {
+ job as CombatJobs
+ val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+ val monsterNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(monsterName) else monsterName
+ "Okay, your job is to kill ${this.jobAmount} $monsterNamePluralized."
+ }
+ }
+ }
+
+ /**
+ * TODO: Allow players to turn-in noted items (authentic to 2009)
+ */
+ fun turnInItems() {
+ if (player == null) return
+ if (player.isArtificial) return
+
+ val instance = getInstance(player)
+ val job = instance.job ?: return
+ if (job.type != JobType.PRODUCTION) return
+
+ val itemId = (job as ProductionJobs).itemId
+ val amountHeld = amountInInventory(player, itemId)
+ val amountToTurnIn = min(amountHeld, instance.jobAmount)
+ removeItem(player, Item(itemId, amountToTurnIn))
+ instance.jobAmount -= amountToTurnIn
+ }
+
+ fun rewardPlayer() {
+ if (player == null) return
+ if (player.isArtificial) return
+
+ val instance = getInstance(player)
+
+ addItemOrDrop(player, Items.COINS_995, 250 * instance.jobOriginalAmount)
+
+ instance.job = null
+ instance.jobAmount = -1
+ instance.jobOriginalAmount = -1
+ }
+
+ override fun login(player: Player) {
+ if (player.isArtificial) return
+
+ val jobManager = JobManager(player)
+ setAttribute(player, "job-manager", jobManager)
+
+ player.hook(Event.BoneBuried, object : EventHook {
+ override fun process(entity: Entity, event: BoneBuryEvent) {
+ if (entity !is Player) return
+ if (entity.isArtificial) return
+
+ val instance = getInstance(entity)
+
+ if (!instance.hasJob()) return
+ if (instance.job?.type != JobType.BONE_BURYING) return
+ if (instance.jobAmount == 0) return
+
+ val job = (instance.job as BoneBuryingJobs)
+ if (inBorders(entity, job.buryArea.zoneBorder) && event.boneId in job.boneIds) {
+ instance.jobAmount--
+ }
+ }
+ })
+ player.hook(Event.NPCKilled, object : EventHook {
+ override fun process(entity: Entity, event: NPCKillEvent) {
+ if (entity !is Player) return
+ if (entity.isArtificial) return
+
+ val instance = getInstance(entity)
+
+ if (!instance.hasJob()) return
+ if (instance.job?.type != JobType.COMBAT) return
+ if (instance.jobAmount == 0) return
+
+ val job = (instance.job as CombatJobs)
+ if (event.npc.id in job.monsterIds) {
+ instance.jobAmount--
+ }
+ }
+ })
+ }
+
+ // TODO: Implement proper saving of job data to JSONObject once player save migration is possible
+ override fun savePlayer(player: Player, save: JSONObject) {
+ val instance = getInstance(player)
+ val jobId: Int = instance.job?.let {
+ when (it.type) {
+ JobType.PRODUCTION -> ProductionJobs.values().indexOf(it)
+ JobType.COMBAT -> CombatJobs.values().indexOf(it)
+ JobType.BONE_BURYING -> BoneBuryingJobs.values().indexOf(it)
+ }
+ } ?: -1
+
+ setAttribute(player, "/save:jobs:id", jobId)
+ setAttribute(player, "/save:jobs:type", instance.job?.type?.ordinal ?: -1)
+ setAttribute(player, "/save:jobs:amount", instance.jobAmount)
+ setAttribute(player, "/save:jobs:original_amount", instance.jobOriginalAmount)
+ }
+
+ // TODO: Implement proper loading of job data from JSONObject once player save migration is possible
+ override fun parsePlayer(player: Player, data: JSONObject) {
+ val instance = getInstance(player)
+ val jobId = getAttribute(player, "jobs:id", -1)
+ val jobType = getAttribute(player, "jobs:type", -1)
+
+ instance.job = when (JobType.values().getOrNull(jobType)) {
+ JobType.PRODUCTION -> ProductionJobs.values().getOrNull(jobId)
+ JobType.COMBAT -> CombatJobs.values().getOrNull(jobId)
+ JobType.BONE_BURYING -> BoneBuryingJobs.values().getOrNull(jobId)
+ else -> null
+ }
+ instance.jobAmount = getAttribute(player, "jobs:amount", -1)
+ instance.jobOriginalAmount = getAttribute(player, "jobs:original_amount", -1)
+ }
+
+ companion object {
+ @JvmStatic
+ fun getInstance(player: Player): JobManager {
+ return player.getAttribute("job-manager", JobManager(player))
+ }
+
+ fun getStoreFile(): JSONObject {
+ return ServerStore.getArchive("daily-jobs-tracking")
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/JobType.kt b/Server/src/main/content/global/activity/jobs/JobType.kt
new file mode 100644
index 000000000..c34a67811
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/JobType.kt
@@ -0,0 +1,13 @@
+package content.global.activity.jobs
+
+/**
+ * An enum of the different types of jobs that a player can be assigned.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class JobType {
+ PRODUCTION,
+ COMBAT,
+ BONE_BURYING
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/StartJobDialogueFile.kt b/Server/src/main/content/global/activity/jobs/StartJobDialogueFile.kt
new file mode 100644
index 000000000..b431663e7
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/StartJobDialogueFile.kt
@@ -0,0 +1,139 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.addItem
+import core.api.hasAnItem
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.Topic
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * The dialogue file to handle a player asking about work with any employer which they aren't currently working for.
+ */
+class StartJobDialogueFile : DialogueFile() {
+ companion object {
+ const val GET_TASK_LIST_1 = 1
+ const val GET_TASK_LIST_2 = 2
+ const val GET_TASK_LIST_YES = 3
+ const val GET_JOB_1 = 101
+ const val GET_JOB_2 = 102
+ const val GET_JOB_3 = 103
+ const val GET_JOB_4 = 104
+ const val GET_JOB_5 = 105
+ const val GET_JOB_NONE = 201
+ const val GET_JOB_EMPLOYED_1 = 301
+ const val GET_JOB_EMPLOYED_2 = 302
+ const val GET_JOB_LIMIT_REACHED = 401
+ }
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ val playerJobManager: JobManager = JobManager.getInstance(player!!)
+
+ when (stage) {
+ START_DIALOGUE -> playerl(FacialExpression.ASKING, "Do you have any jobs for me?").also {
+ stage = if (hasAnItem(player!!, Items.TASK_LIST_13464).exists()) {
+ if (playerJobManager.hasJob()) {
+ GET_JOB_EMPLOYED_1
+ } else {
+ GET_JOB_1
+ }
+ } else {
+ GET_TASK_LIST_1
+ }
+ }
+
+ GET_TASK_LIST_1 -> npcl("Well, first of all, I can see that you don't have a task list to remind you about your current job. Would you like a task list now?").also {
+ stage = GET_TASK_LIST_2
+ }
+
+ GET_TASK_LIST_2 -> showTopics(
+ Topic("Yes, please.", GET_TASK_LIST_YES),
+ Topic("No, thanks.", if (playerJobManager.hasJob()) GET_JOB_EMPLOYED_1 else GET_JOB_1)
+ )
+
+ GET_TASK_LIST_YES -> {
+ when (addItem(player!!, Items.TASK_LIST_13464)) {
+ true -> npcl("Here you go then.").also {
+ stage = if (playerJobManager.hasJob()) GET_JOB_EMPLOYED_1 else GET_JOB_1
+ }
+
+ false -> dialogue("You don't have enough space in your inventory.").also { stage = END_DIALOGUE }
+ }
+ }
+
+ GET_JOB_1 -> npcl("Let me see if I've got any work for you.").also {
+ if (playerJobManager.hasReachedJobLimit()) {
+ stage = GET_JOB_LIMIT_REACHED
+ } else {
+ playerJobManager.generate(npc!!)
+ stage = if (playerJobManager.hasJob()) GET_JOB_2 else GET_JOB_NONE
+ }
+ }
+
+ GET_JOB_2 -> npcl(playerJobManager.getAssignmentMessage()).also { stage = GET_JOB_3 }
+ // Historically, the player would also have the option to ask for an easier task
+ GET_JOB_3 -> playerl("Okay, off I go!").also { stage = GET_JOB_4 }
+ GET_JOB_4 -> npcl("There, I've updated your task list to show your new job. Best of luck!").also {
+ stage = GET_JOB_5
+ }
+
+ GET_JOB_5 -> playerl("Thanks.").also { stage = END_DIALOGUE }
+ GET_JOB_EMPLOYED_1 -> {
+ val job = playerJobManager.job ?: return
+ val employerName = NPC(job.employer.npcId).name
+ val amount = playerJobManager.jobAmount
+ val originalAmount = playerJobManager.jobOriginalAmount
+
+ if (amount == 0) {
+ npcl("Hang about. Aren't you working for $employerName? It looks like you've complete their job, return to them for your reward.")
+ stage = END_DIALOGUE
+ } else {
+ when (job.type) {
+ JobType.PRODUCTION -> {
+ job as ProductionJobs
+ val itemName = Item(job.itemId).name.lowercase()
+ val itemNamePluralized = if (originalAmount > 1) StringUtils.plusS(itemName) else itemName
+ npcl("Hang about. Aren't you working for $employerName? You were asked for $originalAmount $itemNamePluralized and still have $amount more to go.")
+ }
+
+ JobType.BONE_BURYING -> {
+ job as BoneBuryingJobs
+ val boneName = Item(job.boneIds.first()).name.lowercase()
+ val boneNamePluralized = if (originalAmount > 1) StringUtils.plusS(boneName) else boneName
+ npcl("Hang about. Aren't you working for $employerName? You were asked to bury $originalAmount $boneNamePluralized in the ${job.buryArea.title} and still have $amount more to go.")
+ }
+
+ JobType.COMBAT -> {
+ job as CombatJobs
+ val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+ val monsterNamePluralized = if (originalAmount > 1) StringUtils.plusS(monsterName) else monsterName
+ npcl("Hang about. Aren't you working for $employerName? You were asked to kill $originalAmount $monsterNamePluralized and still have $amount more to go.")
+ }
+ }
+ stage = GET_JOB_EMPLOYED_2
+ }
+ }
+
+ GET_JOB_EMPLOYED_2 -> showTopics(
+ Topic("Oh yes. I better go and finish their job first.", END_DIALOGUE),
+ Topic("I'd like a new job instead, please.", GET_JOB_1)
+ )
+
+ GET_JOB_NONE -> npcl("I'm sorry, I don't currently have any jobs that you're qualified for.").also {
+ stage = END_DIALOGUE
+ }
+
+ GET_JOB_LIMIT_REACHED -> npcl("You've hit your limit for the day. Come back tomorrow!").also {
+ stage = END_DIALOGUE
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/TaskListReadListener.kt b/Server/src/main/content/global/activity/jobs/TaskListReadListener.kt
new file mode 100644
index 000000000..2e3c06d7b
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/TaskListReadListener.kt
@@ -0,0 +1,70 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.sendDialogue
+import core.api.sendItemDialogue
+import core.api.sendNPCDialogue
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * Handles the read option of the Task List item.
+ */
+class TaskListReadListener : InteractionListener {
+ override fun defineListeners() {
+ on(Items.TASK_LIST_13464, ITEM, "read") { player, _ ->
+ val playerJobManager: JobManager = JobManager.getInstance(player)
+ val job = playerJobManager.job
+ val amount = playerJobManager.jobAmount
+
+ if (job == null) {
+ sendDialogue(player, "I have not been assigned a job!")
+ return@on false
+ }
+
+ if(amount == 0) {
+ sendDialogue(
+ player, "I have completed my job. I should return to ${NPC(job.employer.npcId).name} for my reward."
+ )
+ return@on true
+ }
+
+ when (job.type) {
+ JobType.PRODUCTION -> {
+ job as ProductionJobs
+ val itemName = Item(job.itemId).name.lowercase()
+ val itemNamePluralized = if (amount > 1) StringUtils.plusS(itemName) else itemName
+ sendItemDialogue(
+ player, job.itemId, "My job is to gather $amount more $itemNamePluralized."
+ )
+ }
+
+ JobType.BONE_BURYING -> {
+ job as BoneBuryingJobs
+ val boneName = Item(job.boneIds.first()).name.lowercase()
+ val boneNamePluralized = if (amount > 1) StringUtils.plusS(boneName) else boneName
+ sendItemDialogue(
+ player,
+ job.boneIds.first(),
+ "My job is to bury $amount more $boneNamePluralized in the ${job.buryArea.title}."
+ )
+ }
+
+ JobType.COMBAT -> {
+ job as CombatJobs
+ val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+ val monsterNamePluralized = if (amount > 1) StringUtils.plusS(monsterName) else monsterName
+ sendNPCDialogue(
+ player, job.monsterIds.first(), "My job is to kill $amount more $monsterNamePluralized."
+ )
+ }
+ }
+ return@on true
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/WorkForInteractionListener.kt b/Server/src/main/content/global/activity/jobs/WorkForInteractionListener.kt
new file mode 100644
index 000000000..8d09d7dfd
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/WorkForInteractionListener.kt
@@ -0,0 +1,45 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.Employers
+import core.api.openDialogue
+import core.api.sendNPCDialogue
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
+
+/**
+ * Handles the work-for actions for the NPCs
+ * @author Ceikry
+ * @author vddCore
+ */
+class WorkForInteractionListener : InteractionListener {
+ override fun defineListeners() {
+ on(
+ Employers.values().map { employer -> employer.npcId }.toIntArray(),
+ IntType.NPC,
+ "work-for"
+ ) { player, node ->
+ val playerJobManager = JobManager.getInstance(player)
+ val job = playerJobManager.job
+
+ // Check if the player is talking to the NPC that gave them their job
+ if (job != null && job.employer.npcId == node.id) {
+ if (playerJobManager.jobAmount == 0) {
+ playerJobManager.rewardPlayer()
+ sendNPCDialogue(
+ player,
+ job.employer.npcId,
+ "There you go, thanks for your help. You're quite a skilled worker!"
+ )
+ } else {
+ openDialogue(player, CheckJobDialogueFile(), node as NPC)
+ }
+
+ return@on true
+ }
+
+ openDialogue(player, StartJobDialogueFile(), node as NPC)
+ return@on true
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/impl/BoneBuryingJobs.kt b/Server/src/main/content/global/activity/jobs/impl/BoneBuryingJobs.kt
new file mode 100644
index 000000000..fad0448e0
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/impl/BoneBuryingJobs.kt
@@ -0,0 +1,30 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import core.game.world.map.zone.ZoneBorders
+import org.rs09.consts.Items
+
+/**
+ * An enum of the possible bone-burying jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class BoneBuryingJobs(val buryArea: BuryArea, val boneIds: List, override val employer: Employers) : Job {
+ BURY_DRAYNOR(BuryArea.DRAYNOR_WHEAT_FIELD, Bones.BONES, Employers.PRAYER_TUTOR),
+ BURY_LUMBRIDGE_GRAVEYARD(BuryArea.LUMBRIDGE_GRAVEYARD, Bones.BONES, Employers.PRAYER_TUTOR);
+
+ override val type = JobType.BONE_BURYING
+ override val lower = 22
+ override val upper = 26
+
+ enum class BuryArea(val zoneBorder: ZoneBorders, val title: String) {
+ DRAYNOR_WHEAT_FIELD(ZoneBorders(3107, 3265, 3132, 3293), "wheat field east of Draynor Village"),
+ LUMBRIDGE_GRAVEYARD(ZoneBorders(3238, 3191, 3252, 3204), "Lumbridge Graveyard");
+ }
+
+ object Bones {
+ val BONES = listOf(Items.BONES_526, Items.BONES_2530)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/impl/CombatJobs.kt b/Server/src/main/content/global/activity/jobs/impl/CombatJobs.kt
new file mode 100644
index 000000000..cfe444f51
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/impl/CombatJobs.kt
@@ -0,0 +1,209 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import org.rs09.consts.NPCs
+
+/**
+ * An enum of the possible combat jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class CombatJobs(val monsterIds: List, override val employer: Employers) : Job {
+ CHICKENS(Monsters.CHICKENS, Employers.RANGED_TUTOR),
+ COWS(Monsters.COWS, Employers.MAGIC_TUTOR),
+ GIANT_SPIDERS(Monsters.GIANT_SPIDERS, Employers.MAGIC_TUTOR),
+ SCORPIONS(Monsters.SCORPIONS, Employers.MELEE_TUTOR),
+ GOBLINS(Monsters.GOBLINS, Employers.MELEE_TUTOR);
+
+ override val type = JobType.COMBAT
+ override val lower = 22
+ override val upper = 28
+
+ object Monsters {
+ val GIANT_SPIDERS = listOf(NPCs.GIANT_SPIDER_59, NPCs.GIANT_SPIDER_60)
+ val SCORPIONS = listOf(NPCs.SCORPION_107, NPCs.SCORPION_1477, NPCs.SCORPION_4402, NPCs.SCORPION_4403)
+ val GOBLINS = listOf(
+ NPCs.GOBLIN_100,
+ NPCs.GOBLIN_101,
+ NPCs.GOBLIN_102,
+ NPCs.GOBLIN_1769,
+ NPCs.GOBLIN_1770,
+ NPCs.GOBLIN_1771,
+ NPCs.GOBLIN_1772,
+ NPCs.GOBLIN_1773,
+ NPCs.GOBLIN_1774,
+ NPCs.GOBLIN_1775,
+ NPCs.GOBLIN_1776,
+ NPCs.GOBLIN_2274,
+ NPCs.GOBLIN_2275,
+ NPCs.GOBLIN_2276,
+ NPCs.GOBLIN_2277,
+ NPCs.GOBLIN_2278,
+ NPCs.GOBLIN_2279,
+ NPCs.GOBLIN_2280,
+ NPCs.GOBLIN_2281,
+ NPCs.GOBLIN_2678,
+ NPCs.GOBLIN_2679,
+ NPCs.GOBLIN_2680,
+ NPCs.GOBLIN_2681,
+ NPCs.GOBLIN_3264,
+ NPCs.GOBLIN_3265,
+ NPCs.GOBLIN_3266,
+ NPCs.GOBLIN_3267,
+ NPCs.GOBLIN_3726,
+ NPCs.GOBLIN_4261,
+ NPCs.GOBLIN_4262,
+ NPCs.GOBLIN_4263,
+ NPCs.GOBLIN_4264,
+ NPCs.GOBLIN_4265,
+ NPCs.GOBLIN_4266,
+ NPCs.GOBLIN_4267,
+ NPCs.GOBLIN_4268,
+ NPCs.GOBLIN_4269,
+ NPCs.GOBLIN_4270,
+ NPCs.GOBLIN_4271,
+ NPCs.GOBLIN_4272,
+ NPCs.GOBLIN_4273,
+ NPCs.GOBLIN_4274,
+ NPCs.GOBLIN_4275,
+ NPCs.GOBLIN_4276,
+ NPCs.GOBLIN_4407,
+ NPCs.GOBLIN_4408,
+ NPCs.GOBLIN_4409,
+ NPCs.GOBLIN_4410,
+ NPCs.GOBLIN_4411,
+ NPCs.GOBLIN_4412,
+ NPCs.GOBLIN_444,
+ NPCs.GOBLIN_445,
+ NPCs.GOBLIN_4479,
+ NPCs.GOBLIN_4480,
+ NPCs.GOBLIN_4481,
+ NPCs.GOBLIN_4482,
+ NPCs.GOBLIN_4483,
+ NPCs.GOBLIN_4484,
+ NPCs.GOBLIN_4485,
+ NPCs.GOBLIN_4486,
+ NPCs.GOBLIN_4487,
+ NPCs.GOBLIN_4488,
+ NPCs.GOBLIN_4489,
+ NPCs.GOBLIN_4490,
+ NPCs.GOBLIN_4491,
+ NPCs.GOBLIN_4492,
+ NPCs.GOBLIN_4499,
+ NPCs.GOBLIN_4633,
+ NPCs.GOBLIN_4634,
+ NPCs.GOBLIN_4635,
+ NPCs.GOBLIN_4636,
+ NPCs.GOBLIN_4637,
+ NPCs.GOBLIN_5855,
+ NPCs.GOBLIN_5856,
+ NPCs.GOBLIN_6125,
+ NPCs.GOBLIN_6126,
+ NPCs.GOBLIN_6132,
+ NPCs.GOBLIN_6133,
+ NPCs.GOBLIN_6279,
+ NPCs.GOBLIN_6280,
+ NPCs.GOBLIN_6281,
+ NPCs.GOBLIN_6282,
+ NPCs.GOBLIN_6283,
+ NPCs.GOBLIN_6284,
+ NPCs.GOBLIN_6402,
+ NPCs.GOBLIN_6403,
+ NPCs.GOBLIN_6404,
+ NPCs.GOBLIN_6405,
+ NPCs.GOBLIN_6406,
+ NPCs.GOBLIN_6407,
+ NPCs.GOBLIN_6408,
+ NPCs.GOBLIN_6409,
+ NPCs.GOBLIN_6410,
+ NPCs.GOBLIN_6411,
+ NPCs.GOBLIN_6412,
+ NPCs.GOBLIN_6413,
+ NPCs.GOBLIN_6414,
+ NPCs.GOBLIN_6415,
+ NPCs.GOBLIN_6416,
+ NPCs.GOBLIN_6417,
+ NPCs.GOBLIN_6418,
+ NPCs.GOBLIN_6419,
+ NPCs.GOBLIN_6420,
+ NPCs.GOBLIN_6421,
+ NPCs.GOBLIN_6422,
+ NPCs.GOBLIN_6423,
+ NPCs.GOBLIN_6424,
+ NPCs.GOBLIN_6425,
+ NPCs.GOBLIN_6426,
+ NPCs.GOBLIN_6427,
+ NPCs.GOBLIN_6428,
+ NPCs.GOBLIN_6429,
+ NPCs.GOBLIN_6430,
+ NPCs.GOBLIN_6431,
+ NPCs.GOBLIN_6432,
+ NPCs.GOBLIN_6433,
+ NPCs.GOBLIN_6434,
+ NPCs.GOBLIN_6435,
+ NPCs.GOBLIN_6436,
+ NPCs.GOBLIN_6437,
+ NPCs.GOBLIN_6438,
+ NPCs.GOBLIN_6439,
+ NPCs.GOBLIN_6440,
+ NPCs.GOBLIN_6441,
+ NPCs.GOBLIN_6442,
+ NPCs.GOBLIN_6443,
+ NPCs.GOBLIN_6444,
+ NPCs.GOBLIN_6445,
+ NPCs.GOBLIN_6446,
+ NPCs.GOBLIN_6447,
+ NPCs.GOBLIN_6448,
+ NPCs.GOBLIN_6449,
+ NPCs.GOBLIN_6450,
+ NPCs.GOBLIN_6451,
+ NPCs.GOBLIN_6452,
+ NPCs.GOBLIN_6453,
+ NPCs.GOBLIN_6454,
+ NPCs.GOBLIN_6455,
+ NPCs.GOBLIN_6456,
+ NPCs.GOBLIN_6457,
+ NPCs.GOBLIN_6458,
+ NPCs.GOBLIN_6459,
+ NPCs.GOBLIN_6460,
+ NPCs.GOBLIN_6461,
+ NPCs.GOBLIN_6462,
+ NPCs.GOBLIN_6463,
+ NPCs.GOBLIN_6464,
+ NPCs.GOBLIN_6465,
+ NPCs.GOBLIN_6466,
+ NPCs.GOBLIN_6467,
+ NPCs.GOBLIN_6490,
+ NPCs.GOBLIN_6491,
+ NPCs.GOBLIN_6492,
+ NPCs.GOBLIN_6493,
+ NPCs.GOBLIN_6494,
+ NPCs.GOBLIN_6495,
+ NPCs.GOBLIN_7964,
+ NPCs.GOBLIN_7965
+ )
+ val COWS = listOf(
+ NPCs.COW_81,
+ NPCs.COW_397,
+ NPCs.COW_955,
+ NPCs.COW_1767,
+ NPCs.COW_3309,
+ NPCs.COW_CALF_1766,
+ NPCs.COW_CALF_1768,
+ NPCs.COW_CALF_2310
+ )
+ val CHICKENS = listOf(
+ NPCs.CHICKEN_1017,
+ NPCs.CHICKEN_1401,
+ NPCs.CHICKEN_1402,
+ NPCs.CHICKEN_2313,
+ NPCs.CHICKEN_2314,
+ NPCs.CHICKEN_2315,
+ NPCs.CHICKEN_288,
+ NPCs.CHICKEN_41,
+ NPCs.CHICKEN_951,
+ )
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/impl/Employers.kt b/Server/src/main/content/global/activity/jobs/impl/Employers.kt
new file mode 100644
index 000000000..2d1fc165c
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/impl/Employers.kt
@@ -0,0 +1,24 @@
+package content.global.activity.jobs.impl
+
+import org.rs09.consts.NPCs
+
+/**
+ * An enum of NPCs that can assign the player a job.
+ *
+ * TODO: Add the rest of the era-correct employers
+ */
+enum class Employers(val npcId: Int) {
+ WOODCUTTING_TUTOR(NPCs.WOODCUTTING_TUTOR_4906),
+ MAGIC_TUTOR(NPCs.MAGIC_TUTOR_4707),
+ MELEE_TUTOR(NPCs.MELEE_TUTOR_705),
+ RANGED_TUTOR(NPCs.RANGED_TUTOR_1861),
+ COOKING_TUTOR(NPCs.COOKING_TUTOR_4899),
+ CRAFTING_TUTOR(NPCs.CRAFTING_TUTOR_4900),
+ FISHING_TUTOR(NPCs.FISHING_TUTOR_4901),
+ MINING_TUTOR(NPCs.MINING_TUTOR_4902),
+ SMELTING_TUTOR(NPCs.SMELTING_TUTOR_4904),
+ PRAYER_TUTOR(NPCs.PRAYER_TUTOR_4903),
+ HANS(NPCs.HANS_0),
+ GILLIE_GROATS(NPCs.GILLIE_GROATS_3807),
+ AGGIE(NPCs.AGGIE_922);
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/jobs/impl/ProductionJobs.kt b/Server/src/main/content/global/activity/jobs/impl/ProductionJobs.kt
new file mode 100644
index 000000000..04bdd5467
--- /dev/null
+++ b/Server/src/main/content/global/activity/jobs/impl/ProductionJobs.kt
@@ -0,0 +1,80 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import core.game.node.entity.skill.Skills
+
+/**
+ * An enum of the possible production jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class ProductionJobs(
+ override val lower: Int,
+ override val upper: Int,
+ val lvlReq: Int,
+ val itemId: Int,
+ val skill: Int,
+ override val employer: Employers
+) : Job {
+ LOG(20, 28, 1, 1511, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+ COWHIDES(20, 28, 1, 1739, 0, Employers.HANS),
+ OAK(22, 28, 15, 1521, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+ WATER_RUNE(20, 28, 5, 555, Skills.RUNECRAFTING, Employers.HANS),
+ EARTH_RUNE(20, 28, 9, 557, Skills.RUNECRAFTING, Employers.AGGIE),
+ FIRE_RUNE(20, 28, 14, 554, Skills.RUNECRAFTING, Employers.AGGIE),
+ AIR_RUNE(20, 28, 1, 556, Skills.RUNECRAFTING, Employers.HANS),
+ RUNE_ESS(20, 28, 1, 1436, Skills.MINING, Employers.MINING_TUTOR),
+ BALL_OF_WOOL(20, 28, 1, 1759, Skills.CRAFTING, Employers.GILLIE_GROATS),
+ LEATHER_GLOVE(20, 28, 1, 1059, Skills.CRAFTING, Employers.GILLIE_GROATS),
+ WILLOW(22, 28, 30, 1519, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+ LEATHER_BOOT(24, 24, 1, 1061, Skills.CRAFTING, Employers.HANS),
+ BRONZE_DAGGER(24, 24, 1, 1205, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_HELMS(22, 22, 1, 1139, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_FULL_HELM(10, 10, 7, 1155, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_CHAINBODY(10, 10, 11, 1103, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_2H(10, 10, 14, 1307, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_SCIM(10, 10, 5, 1321, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_PLATEBODY(9, 10, 18, 1117, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_PLATELEGS(9, 10, 16, 1075, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_PLATESKIRTS(9, 10, 16, 1087, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ BRONZE_WARHAMMER(9, 9, 9, 1337, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ IRON_DAGGER(13, 13, 15, 1203, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ IRON_CHAINBODY(10, 10, 26, 1101, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ IRON_2H(9, 9, 29, 1309, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ STEEL_BATTLEAXE(9, 9, 40, 1365, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ STEEL_SCIMITAR(9, 9, 35, 1325, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ STEEL_PLATEBODY(9, 10, 48, 1119, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ STEEL_WARHAMMER(9, 10, 39, 1339, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ LEATHER_CHAPS(22, 28, 18, 1095, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+ LEATHER_BODY(22, 28, 14, 1129, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+ LEATHER_COWL(22, 28, 9, 1167, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+ LEATHER_COIF(22, 28, 38, 1169, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+ RAW_SHRIMP(22, 28, 1, 317, Skills.FISHING, Employers.FISHING_TUTOR),
+ COOKED_SHRIMP(22, 28, 1, 315, Skills.COOKING, Employers.COOKING_TUTOR),
+ RAW_CRAYFISH(22, 28, 1, 13435, Skills.FISHING, Employers.FISHING_TUTOR),
+ COOKED_CRAYFISH(22, 28, 1, 13433, Skills.COOKING, Employers.COOKING_TUTOR),
+ RAW_TROUT(22, 28, 20, 335, Skills.FISHING, Employers.FISHING_TUTOR),
+ COOKED_TROUT(22, 28, 15, 333, Skills.COOKING, Employers.COOKING_TUTOR),
+ RAW_SALMON(22, 28, 30, 331, Skills.FISHING, Employers.FISHING_TUTOR),
+ COOKED_SALMON(22, 28, 25, 329, Skills.COOKING, Employers.COOKING_TUTOR),
+ CAKE(12, 16, 40, 1891, Skills.COOKING, Employers.GILLIE_GROATS),
+ MEAT_PIE(12, 16, 20, 2327, Skills.COOKING, Employers.COOKING_TUTOR),
+ PLAIN_PIZZA(12, 16, 35, 2289, Skills.COOKING, Employers.COOKING_TUTOR),
+ MEAT_PIZZA(12, 16, 45, 2293, Skills.COOKING, Employers.COOKING_TUTOR),
+ ANCHOVY_PIZZA(12, 16, 55, 2297, Skills.COOKING, Employers.COOKING_TUTOR),
+ REDBERRY_PIE(12, 16, 10, 2325, Skills.COOKING, Employers.GILLIE_GROATS),
+ COPPER_ORE(22, 28, 1, 436, Skills.MINING, Employers.MINING_TUTOR),
+ TIN_ORE(23, 26, 1, 438, Skills.MINING, Employers.MINING_TUTOR),
+ IRON_ORE(24, 24, 15, 440, Skills.MINING, Employers.MINING_TUTOR),
+ SILVER_ORE(22, 28, 20, 442, Skills.MINING, Employers.PRAYER_TUTOR),
+ COAL(22, 26, 30, 453, Skills.MINING, Employers.MINING_TUTOR),
+ GOLD_ORE(22, 24, 40, 444, Skills.MINING, Employers.MINING_TUTOR),
+ BRONZE_BAR(10, 12, 1, 2349, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ IRON_BAR(22, 28, 15, 2351, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ STEEL_BAR(22, 28, 30, 2353, Skills.SMITHING, Employers.SMELTING_TUTOR),
+ ASHES(26, 26, 1, 592, 0, Employers.AGGIE);
+
+ override val type = JobType.PRODUCTION
+}
\ No newline at end of file
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt b/Server/src/main/content/global/activity/penguinhns/LarryHandler.kt
similarity index 86%
rename from Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt
rename to Server/src/main/content/global/activity/penguinhns/LarryHandler.kt
index e9d72ae14..4a4b3ba90 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt
+++ b/Server/src/main/content/global/activity/penguinhns/LarryHandler.kt
@@ -1,21 +1,18 @@
-package rs09.game.content.global.worldevents.penguinhns
+package content.global.activity.penguinhns
-import api.*
+import core.api.*
import core.game.component.Component
-import core.game.content.dialogue.DialoguePlugin
-import core.game.content.dialogue.FacialExpression
import core.game.node.entity.player.Player
import core.game.node.item.Item
import core.game.system.task.Pulse
-import rs09.game.world.GameWorld
-import rs09.tools.END_DIALOGUE
+import core.tools.END_DIALOGUE
-class LarryHandler(player: Player? = null) : DialoguePlugin(player){
+class LarryHandler(player: Player? = null) : core.game.dialogue.DialoguePlugin(player){
override fun open(vararg args: Any?): Boolean {
options("Can I have a spy notebook?","Can I have a hint?","I'd like to turn in my points.").also { stage = 0; return true }
}
- override fun newInstance(player: Player?): DialoguePlugin {
+ override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
return LarryHandler(player)
}
@@ -43,7 +40,7 @@ class LarryHandler(player: Player? = null) : DialoguePlugin(player){
11 -> {
val hint = Penguin.values()[PenguinManager.penguins.random()].hint
- npcl(FacialExpression.FRIENDLY, "One is $hint")
+ npcl(core.game.dialogue.FacialExpression.FRIENDLY, "One is $hint")
stage = END_DIALOGUE
}
@@ -77,7 +74,7 @@ class LarryHandler(player: Player? = null) : DialoguePlugin(player){
}
val level = getStatLevel(player, skill)
- System.out.println("Level: $level")
+
val expGained = points?.toDouble()?.times((level * 25))
System.out.print("exp: $expGained")
player.skills.addExperience(skill,expGained!!)
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt b/Server/src/main/content/global/activity/penguinhns/NotebookHandler.kt
similarity index 91%
rename from Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt
rename to Server/src/main/content/global/activity/penguinhns/NotebookHandler.kt
index 40424ea68..15462eefe 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt
+++ b/Server/src/main/content/global/activity/penguinhns/NotebookHandler.kt
@@ -1,4 +1,4 @@
-package rs09.game.content.global.worldevents.penguinhns
+package content.global.activity.penguinhns
import core.cache.def.impl.ItemDefinition
import core.game.interaction.OptionHandler
diff --git a/Server/src/main/content/global/activity/penguinhns/PenguinHNSEvent.kt b/Server/src/main/content/global/activity/penguinhns/PenguinHNSEvent.kt
new file mode 100644
index 000000000..39bc2419b
--- /dev/null
+++ b/Server/src/main/content/global/activity/penguinhns/PenguinHNSEvent.kt
@@ -0,0 +1,26 @@
+package content.global.activity.penguinhns
+
+import core.ServerStore
+import core.api.StartupListener
+import core.api.log
+import core.plugin.ClassScanner
+import core.tools.Log
+import org.json.simple.JSONObject
+
+class PenguinHNSEvent : StartupListener {
+ val manager = PenguinManager()
+
+ override fun startup() {
+ manager.rebuildVars()
+ ClassScanner.definePlugins(LarryHandler(), NotebookHandler())
+ log(this::class.java, Log.FINE, "Penguin HNS initialized.")
+ }
+
+ companion object {
+ @JvmStatic
+ fun getStoreFile() : JSONObject {
+ return ServerStore.getArchive("weekly-penguinhns")
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt b/Server/src/main/content/global/activity/penguinhns/PenguinManager.kt
similarity index 85%
rename from Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt
rename to Server/src/main/content/global/activity/penguinhns/PenguinManager.kt
index 713f11901..c284214a7 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt
+++ b/Server/src/main/content/global/activity/penguinhns/PenguinManager.kt
@@ -1,12 +1,14 @@
-package rs09.game.content.global.worldevents.penguinhns
+package content.global.activity.penguinhns
import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
-import rs09.game.system.SystemLogger
+import core.tools.SystemLogger
import core.game.world.map.Location
import org.json.simple.JSONArray
import org.json.simple.JSONObject
-import rs09.ServerStore.Companion.toJSONArray
+import core.ServerStore.Companion.toJSONArray
+import core.api.log
+import core.tools.Log
import java.util.*
class PenguinManager{
@@ -31,7 +33,7 @@ class PenguinManager{
private fun updateStoreFile(){
val jsonTags = JSONArray()
tagMapping.filter { it.value.isNotEmpty() }.forEach { (ordinal,taggers) ->
- SystemLogger.logInfo("$ordinal - ${taggers.first()}")
+ log(this::class.java, Log.FINE, "$ordinal - ${taggers.first()}")
val tag = JSONObject()
tag["ordinal"] = ordinal
tag["taggers"] = taggers
@@ -43,12 +45,14 @@ class PenguinManager{
}
fun rebuildVars() {
- if(PenguinHNSEvent.getStoreFile().isEmpty()) {
+ if(!PenguinHNSEvent.getStoreFile().containsKey("spawned-penguins")) {
penguins = spawner.spawnPenguins(10)
PenguinHNSEvent.getStoreFile()["spawned-penguins"] = penguins.toJSONArray()
+ tagMapping.clear()
for (p in penguins) {
tagMapping.put(p, JSONArray())
}
+ updateStoreFile()
} else {
val spawnedOrdinals = (PenguinHNSEvent.getStoreFile()["spawned-penguins"] as JSONArray).map { it.toString().toInt() }
spawner.spawnPenguins(spawnedOrdinals)
@@ -62,8 +66,4 @@ class PenguinManager{
penguins = spawnedOrdinals.toMutableList()
}
}
-
- fun log(message: String){
- SystemLogger.logInfo("[Penguins] $message")
- }
}
\ No newline at end of file
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt b/Server/src/main/content/global/activity/penguinhns/PenguinSpawner.kt
similarity index 94%
rename from Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt
rename to Server/src/main/content/global/activity/penguinhns/PenguinSpawner.kt
index ebcfec2a1..d19b9a82a 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt
+++ b/Server/src/main/content/global/activity/penguinhns/PenguinSpawner.kt
@@ -1,9 +1,9 @@
-package rs09.game.content.global.worldevents.penguinhns
+package content.global.activity.penguinhns
import core.game.node.entity.npc.NPC
import core.game.world.map.Location
import org.rs09.consts.NPCs
-import rs09.game.content.global.worldevents.WorldEvents
+import core.game.worldevents.WorldEvents
class PenguinSpawner {
@@ -16,7 +16,7 @@ class PenguinSpawner {
availableOrdinals.remove(peng.ordinal)
spawnedOrdinals.add(peng.ordinal)
NPC(peng.id,peng.location)
- .also {PenguinManager.npcs.add(it);it.isNeverWalks = true; it.isWalks = false}.init()
+ .also { PenguinManager.npcs.add(it);it.isNeverWalks = true; it.isWalks = false}.init()
counter++
}
return spawnedOrdinals
diff --git a/Server/src/main/content/global/activity/penguinhns/PenguinSpyingHandler.kt b/Server/src/main/content/global/activity/penguinhns/PenguinSpyingHandler.kt
new file mode 100644
index 000000000..386220027
--- /dev/null
+++ b/Server/src/main/content/global/activity/penguinhns/PenguinSpyingHandler.kt
@@ -0,0 +1,53 @@
+package content.global.activity.penguinhns
+
+import core.api.*
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.update.flag.context.Animation
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+
+class PenguinSpyingHandler : InteractionListener {
+
+ override fun defineListeners() {
+ on(PENGUINS, IntType.NPC, "spy-on"){ player, node ->
+ val npc = node.asNpc()
+ if(PenguinManager.hasTagged(player, npc.location)){
+ player.sendMessage("You've already tagged this penguin.")
+ } else {
+ GameWorld.submit(SpyPulse(player, npc))
+ playJingle(player, 345)
+ }
+ return@on true
+ }
+ }
+
+ val PENGUINS = intArrayOf(8104,8105,8107,8108,8109,8110)
+
+ class SpyPulse(val player: Player, val npc: NPC) : Pulse() {
+ var stage = 0
+ val curPoints = player.getAttribute("phns:points",0)
+
+ val ANIMATION = Animation(10355)
+
+ override fun pulse(): Boolean {
+ when(stage++){
+ 0 -> player.lock().also { player.animator.animate(ANIMATION) }
+ 1 -> player.sendMessage("You manage to spy on the penguin.").also {
+ player.setAttribute("/save:phns:points",curPoints + 1)
+ PenguinManager.registerTag(player, npc.location)
+ player.unlock()
+ }
+ 2 -> return true
+ }
+ return false
+ }
+
+ override fun stop() {
+ super.stop()
+ player.unlock()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
new file mode 100644
index 000000000..9432ea009
--- /dev/null
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
@@ -0,0 +1,234 @@
+package content.global.activity.shootingstar
+
+import core.game.node.scenery.Scenery
+import core.game.node.scenery.SceneryBuilder
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.ServerStore.Companion.getBoolean
+import core.ServerStore.Companion.getInt
+import core.ServerStore.Companion.getString
+
+import content.global.bots.ShootingStarBot
+import core.game.world.repository.Repository
+import core.tools.RandomFunction
+
+/**
+ * Represents a shooting star object (Only ever initialized once) (ideally)
+ * @author Ceikry
+ */
+class ShootingStar(var level: ShootingStarType = ShootingStarType.values().random()) {
+ val crash_locations = mapOf(
+ "East of Dark Wizards' Tower" to Location.create(2925, 3339, 0), // East of Dark Wizards' Tower
+ "Crafting Guild" to Location.create(2940, 3280, 0), // Crafting Guild Mine
+ "Falador East Bank" to Location.create(3030, 3349, 0), // Falador East Bank
+ "Rimmington mining site" to Location.create(2974, 3240, 0), // Rimmington Mine 2974, 3240, 0)
+ "Karamja northwestern mining site" to Location.create(2737, 3223, 0), // Karamja northwestern mining site/Brimhaven gold rocks
+ "Brimhaven mining site" to Location.create(2743, 3143, 0), // Brimhaven mining site
+ "South Crandor mining site" to Location.create(2822, 3239, 0), // South Crandor mining site (requires Dragon Slayer)
+ "Karamja mining site" to Location.create(2854, 3032, 0), // Karamja mining site
+ "Shilo Village mining site" to Location.create(2826, 2997, 0), // Shilo Village mining site/Gem rocks (requires Shilo Village prereqs)
+ "Relleka mining site" to Location.create(2682, 3700, 0), // Rellekka mining site
+ "Jatizso mine" to Location.create(2393, 3815, 0), //Jatiszo mining site (requires Fremennik Isles prereqs)
+ "Lunar Isle mine" to Location.create(2140, 3939, 0), // Lunar Isle mine (requires Lunar Diplomacy prereqs)
+ "Miscellania coal mine" to Location.create(2529, 3887, 0), // Miscellania coal mine (requires The Fremennik Trials)
+ //"Neitiznot runite mine" to Location.create(2376, 3835, 0), // Near the Neitiznot runite mine (requires Fremennik Isles prereqs) currently inaccessible as bridge does not work
+ "Ardougne mining site" to Location.create(2600, 3232, 0), // Ardougne mining site (Monastery)
+ "Ardougne eastern mine" to Location.create(2706, 3334, 0), // Ardougne mining site (Legends Guild)
+ "Kandarin Coal trucks" to Location.create(2589, 3485, 0), // Kandarin Coal trucks
+ "Yanille Bank" to Location.create(2603, 3087, 0), // Yanille Bank (Wizards' Guild)
+ "Port Khazard mine" to Location.create(2626, 3140, 0), // Mining spot north-east of Yanille / Port Khazard mine
+ "Al Kharid bank" to Location.create(3276, 3176, 0), // Al Kharid bank
+ "Al Kharid mining site" to Location.create(3296, 3297, 0), // Al Kharid mine (Scorpion mine)
+ "Duel Arena bank chest" to Location.create(3342, 3267, 0), // Duel Arena bank chest
+ "Kharidian Desert clay mine" to Location.create(3426, 3159, 0), // Desert clay mine / Ruins of Uzer mine
+ "Nardah mining site" to Location.create(3320, 2872, 0), // Kharidian Desert gold mine / Vulture mine
+ "Nardah bank" to Location.create(3434, 2888, 0), // Nardah bank
+ "Granite and sandstone quarry" to Location.create(3170, 2913, 0), // Granite and sandstone quarry / Quarry on map
+ "South-east Varrock mine" to Location.create(3292, 3353, 0), // South-east Varrock mine
+ "South-west Varrock mine" to Location.create(3176, 3362, 0), // South-west Varrock mine / Champion's Guild mine
+ "Varrock east bank" to Location.create(3259, 3407, 0), // Varrock east bank / Rune shop
+ "Lumbridge Swamp south-east mine" to Location.create(3227, 3150, 0), // Lumbridge Swamp south-east mine
+ //"Burgh de Rott bank" to Location.create(3500, 3219, 0), // Burgh de Rott bank (requires quest to enter)
+ "Canifis Bank" to Location.create(3504, 3487, 0), // Canifis bank
+ "Mos Le'Harmless bank" to Location.create(3687, 2969, 0), // Mos Le'Harmless bank (requires quest to enter but is currently accessible for Slayer)
+ "Gnome stronghold Bank" to Location.create(2460, 3432, 0), // Gnome stronghold bank
+ "Lletya bank" to Location.create(2329, 3163, 0), // Lletya bank (requires MEP1 prereqs)
+ "Piscatoris mining site" to Location.create(2336, 3636, 0), // Piscatoris mining site
+ "North Edgeville mining site" to Location.create(3101, 3569, 0), // Wilderness Steel mine / Zamorak mage mine
+ "Southern wilderness mine" to Location.create(3025, 3591, 0), // Wilderness skeleton mine
+ "Wilderness Volcano bank" to Location.create(3188, 3695, 0), // Wilderness Volcano bank
+ "Wilderness hobgoblin mine" to Location.create(3020, 3809, 0), // Wilderness hobgoblin mine
+ "Pirates' Hideout mine" to Location.create(3059, 3940, 0), // Pirates' Hideout mine
+ "Lava Maze mining site" to Location.create(3062, 3885, 0), // Wilderness rune mine
+ "Mage Arena bank" to Location.create(3093, 3962, 0) // Mage Arena bank
+ )
+ val starSprite = NPC(8091)
+ var location = "Canifis Bank"
+ var maxDust = level.totalStardust
+ var dustLeft = level.totalStardust
+ var starObject = Scenery(level.objectId, crash_locations.get(location))
+ var isDiscovered = false
+ var ticks = 0
+ var isSpawned = false
+ var spriteSpawned = false
+ var firstStar = true
+ var selfBots = ArrayList()
+ var activePlayers = HashSet()
+
+ /**
+ * Degrades a ShootingStar (or removes the starObject and spawns a Star Sprite if it's the last star)
+ */
+ fun degrade() {
+ if(level.ordinal == 0) {
+ spawnSprite()
+ return
+ }
+ level = getNextType()
+ maxDust = level.totalStardust
+ dustLeft = level.totalStardust
+ ShootingStarPlugin.getStoreFile()["level"] = level.ordinal
+ ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
+
+ val newStar = Scenery(level.objectId, starObject.location)
+ SceneryBuilder.replace(starObject, newStar)
+ starObject = newStar
+ }
+
+ private fun getNextType(): ShootingStarType {
+ return ShootingStarType.values()[level.ordinal - 1]
+ }
+
+ /**
+ * Fires the shooting star (spawns a new one). Only used when spawning new shooting stars, not for downgrading existing ones.
+ */
+ fun fire() {
+ SceneryBuilder.remove(starObject)
+ clearSprite()
+ SceneryBuilder.add(starObject)
+ if(!isSpawned) {
+ (0..2).forEach {
+ selfBots.add(ShootingStarBot.new())
+ }
+ }
+ if (level.ordinal + 1 > 5) {
+ selfBots.filter { it.isIdle() }.forEach { it.activate(true) }
+ }
+ isSpawned = true
+ Repository.sendNews("A shooting star level ${level.ordinal + 1} just crashed near ${location}!")
+ ShootingStarPlugin.getStoreFile()["level"] = level.ordinal
+ ShootingStarPlugin.getStoreFile()["location"] = location
+ ShootingStarPlugin.getStoreFile()["isDiscovered"] = isDiscovered
+ ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
+ }
+
+ /**
+ * Rebuilds some of the variables with new information.
+ */
+ fun rebuildVars(){
+ // Defaults
+ var levelOrd = RandomFunction.random(9)
+ level = ShootingStarType.values()[levelOrd]
+ location = crash_locations.entries.random().key
+ isDiscovered = false
+ dustLeft = level.totalStardust
+ ticks = 0
+ spriteSpawned = false
+
+ if (firstStar && ShootingStarPlugin.getStoreFile().isNotEmpty()) {
+ // Replace default with stored values, if any
+ levelOrd = ShootingStarPlugin.getStoreFile().getInt("level", levelOrd)
+ level = ShootingStarType.values()[levelOrd]
+ location = ShootingStarPlugin.getStoreFile().getString("location", location)
+ isDiscovered = ShootingStarPlugin.getStoreFile().getBoolean("isDiscovered", false)
+ dustLeft = ShootingStarPlugin.getStoreFile().getInt("dustLeft", dustLeft)
+ ticks = ShootingStarPlugin.getStoreFile().getInt("ticks", ticks)
+ spriteSpawned = ShootingStarPlugin.getStoreFile().getBoolean("spriteSpawned", false)
+ }
+
+ maxDust = level.totalStardust
+ starObject = Scenery(level.objectId, crash_locations.get(location))
+ }
+
+ fun spawnSprite() {
+ selfBots.filter { it.isMining() }.forEach { it.sleep() }
+ SceneryBuilder.remove(starObject)
+ isSpawned = false
+ starSprite.location = starObject.location
+ starSprite.init()
+ spriteSpawned = true
+ ShootingStarPlugin.getStoreFile()["spriteSpawned"] = spriteSpawned
+ }
+
+ fun clearSprite() {
+ starSprite.clear()
+ spriteSpawned = false
+ ShootingStarPlugin.getStoreFile()["spriteSpawned"] = spriteSpawned
+ }
+
+ /**
+ * Decrement the amount of dust left in the current star and degrade it if the amount left is 0 or less.
+ */
+ fun decDust() {
+ if(--dustLeft <= 0) degrade()
+ ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
+ }
+
+ /**
+ * Proxy method for starting to mine a shooting star
+ */
+ fun mine(player: Player) {
+ player.pulseManager.run(ShootingStarMiningPulse(player, starObject, this))
+ }
+
+ /**
+ * Prospecting shooting stars.
+ */
+ fun prospect(player: Player) {
+ player.dialogueInterpreter.sendDialogue("This is a size " + (level.ordinal + 1) + " star. A Mining level of at least " + miningLevel + " is", "required to mine this layer. There is $dustLeft stardust remaining", "until the next layer.")
+ }
+
+ /**
+ * Notifies the star when a player begins mining it
+ */
+ fun notifyNewPlayer(player: Player) {
+ if(activePlayers.size < 3){
+ val leavingBot = selfBots.firstOrNull { it.isMining() }
+ leavingBot?.sleep()
+ }
+ activePlayers.add(player)
+ }
+
+ /**
+ * Notifies the star when a player stops mining it
+ */
+ fun notifyPlayerLeave(player: Player) {
+ activePlayers.remove(player)
+ if (activePlayers.size < 3){
+ val newBot = selfBots.firstOrNull() { it.isIdle() }
+ newBot?.activate(true)
+ }
+ }
+
+ /**
+ * Gets the mining level required based on the star's current level ordinal.
+ */
+ val miningLevel: Int
+ get() = (level.ordinal + 1) * 10
+}
+
+/**
+ * Various levels of shooting stars
+ * @author Ceikry
+ */
+enum class ShootingStarType(val objectId: Int, val exp: Int, val totalStardust: Int,val rate: Double) {
+ LEVEL_1(38668, 14, 1200, 0.05),
+ LEVEL_2(38667, 25, 700, 0.1),
+ LEVEL_3(38666, 29, 439, 0.3),
+ LEVEL_4(38665, 32, 250, 0.4),
+ LEVEL_5(38664, 47, 175, 0.5),
+ LEVEL_6(38663, 71, 80, 0.70),
+ LEVEL_7(38662, 114, 40, 0.80),
+ LEVEL_8(38661, 145, 25, 0.85),
+ LEVEL_9(38660, 210, 15, 0.95);
+}
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
similarity index 92%
rename from Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt
rename to Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
index 1d49f14a4..5f5ee3649 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
@@ -1,17 +1,17 @@
-package rs09.game.content.global.worldevents.shootingstar
+package content.global.activity.shootingstar
-import api.*
+import core.api.*
import core.game.node.scenery.Scenery
import core.game.node.entity.player.Player
import core.game.node.entity.skill.SkillPulse
import core.game.node.entity.skill.Skills
-import core.game.node.entity.skill.gather.SkillingTool
+import content.data.skill.SkillingTool
import core.game.node.item.Item
import core.tools.RandomFunction
import org.rs09.consts.Items
-import rs09.game.world.GameWorld
-import rs09.game.world.repository.Repository
-import rs09.tools.stringtools.colorize
+import core.game.world.GameWorld
+import core.game.world.repository.Repository
+import core.tools.colorize
/**
* The pulse used to handle mining shooting stars.
@@ -48,9 +48,10 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
val bonusXp = 75 * player.skills.getStaticLevel(Skills.MINING)
player.incrementAttribute("/save:shooting-star:bonus-xp", bonusXp)
Repository.sendNews(player.username + " is the discoverer of the crashed star near " + star.location + "!")
- player.sendMessage("You have ${player.skills.experienceMutiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
+ player.sendMessage("You have ${player.skills.experienceMultiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
ShootingStarPlugin.submitScoreBoard(player)
star.isDiscovered = true
+ ShootingStarPlugin.getStoreFile()["isDiscovered"] = star.isDiscovered
return player.skills.getLevel(Skills.MINING) >= star.miningLevel
}
@@ -83,14 +84,13 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
if (GameWorld.settings?.isDevMode == true) {
star.dustLeft = 1
}
- star.decDust()
val bonusXp = player.getAttribute("shooting-star:bonus-xp", 0).toDouble()
var xp = star.level.exp.toDouble()
if(bonusXp > 0) {
val delta = Math.min(bonusXp, xp)
player.incrementAttribute("/save:shooting-star:bonus-xp", (-delta).toInt())
- xp += delta;
+ xp += delta
if(player.getAttribute("shooting-star:bonus-xp", 0) <= 0) {
player.sendMessage("You have obtained all of your bonus xp from the star.")
}
@@ -103,6 +103,8 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
if(!inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && !inBank(player, Items.ANCIENT_BLUEPRINT_14651)){
rollBlueprint(player)
}
+
+ star.decDust()
return false
}
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
new file mode 100644
index 000000000..1e993e1bb
--- /dev/null
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
@@ -0,0 +1,190 @@
+package content.global.activity.shootingstar
+
+import core.api.*
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager
+import core.game.node.entity.skill.Skills
+import org.json.simple.JSONObject
+import org.rs09.consts.Items
+import org.rs09.consts.Scenery
+import core.ServerStore
+import core.ServerStore.Companion.getBoolean
+import core.game.dialogue.DialogueFile
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+import core.game.system.command.Privilege
+import core.game.world.GameWorld
+import core.tools.Log
+import core.tools.secondsToTicks
+import content.data.Quests
+
+class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Commands, StartupListener {
+ override fun login(player: Player) {
+ if(star.isSpawned && !star.spriteSpawned)
+ sendMessage(player, "News: A shooting star (Level ${star.level.ordinal + 1}) has just crashed near the ${star.location}!")
+ }
+
+ override fun tick() {
+ ++star.ticks
+
+ // Check if the current star sprite should expire
+ val maxDelay = tickDelay + (tickDelay / 3)
+ if(star.ticks > maxDelay && star.spriteSpawned){
+ star.clearSprite()
+ }
+
+ if (star.firstStar && !star.isSpawned && !star.spriteSpawned) {
+ // Apparently, the server has only just booted
+ star.rebuildVars()
+ if (star.spriteSpawned) {
+ star.spawnSprite()
+ } else {
+ star.fire()
+ }
+ star.firstStar = false
+ }
+
+ // Check if it's time to fire a new one
+ if (star.ticks >= tickDelay && !star.spriteSpawned) {
+ star.rebuildVars()
+ star.fire()
+ }
+
+ getStoreFile()["ticks"] = star.ticks
+ }
+
+ override fun defineListeners() {
+ on(Scenery.SHOOTING_STAR_NOTICEBOARD_38669, IntType.SCENERY, "read") { player, _ ->
+ var index = 0
+ scoreboardEntries.forEach { entry ->
+ val timeElapsed = secondsToTicks(GameWorld.ticks - entry.time) / 60
+ setInterfaceText(player, "$timeElapsed minutes ago", scoreboardIface, index + 6)
+ setInterfaceText(player, entry.player, scoreboardIface, index + 11)
+ ++index
+ }
+ openInterface(player, scoreboardIface)
+ return@on true
+ }
+
+ on(SHOOTING_STARS, IntType.SCENERY, "mine"){ player, _ ->
+ star.mine(player)
+ return@on true
+ }
+
+ on(SHOOTING_STARS, IntType.SCENERY, "prospect"){ player, _ ->
+ star.prospect(player)
+ return@on true
+ }
+
+ on(RING, IntType.ITEM, "rub", "operate"){ player, node ->
+ if(getRingStoreFile().getBoolean(player.username.toLowerCase())){
+ sendDialogue(player, "The ring is still recharging.")
+ return@on true
+ }
+
+ class RingDialogue(val star: ShootingStar) : DialogueFile() {
+ val shouldWarn = when (star.location) {
+ "North Edgeville mining site",
+ "Southern wilderness mine",
+ "Wilderness hobgoblin mine",
+ "Pirates' Hideout mine",
+ "Lava Maze mining site",
+ "Mage Arena bank" -> true
+ else -> false
+ }
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ fun teleportToStar(player: Player) {
+ val condition: (p: Player) -> Boolean = when (star.location.toLowerCase()) {
+ "canifis bank" -> {p -> requireQuest(p, Quests.PRIEST_IN_PERIL, "to access this.")}
+ //"burgh de rott bank" -> {p -> hasRequirement(p, Quests.IN_AID_OF_THE_MYREQUE)} //disabled: crash
+ "crafting guild" -> {p -> hasLevelStat(p, Skills.CRAFTING, 40)}
+ "lletya bank" -> {p -> hasRequirement(p, Quests.MOURNINGS_END_PART_I)}
+ "jatizso mine" -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)}
+ "south crandor mining site" -> {p -> hasRequirement(p, Quests.DRAGON_SLAYER)}
+ "shilo village mining site" -> {p -> hasRequirement(p, Quests.SHILO_VILLAGE)}
+ "mos le'harmless bank" -> {p -> hasRequirement(p, Quests.CABIN_FEVER)} //needs to be updated to check for completion when the quest releases; https://runescape.wiki/w/Mos_Le%27Harmless?oldid=913025
+ "lunar isle mine" -> {p -> hasRequirement(p, Quests.LUNAR_DIPLOMACY)}
+ "miscellania coal mine" -> {p -> requireQuest(p, Quests.THE_FREMENNIK_TRIALS, "to access this.")}
+ //"neitiznot runite mine" -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)} //disabled: currently not reachable
+ else -> {_ -> true}
+ }
+ if (!condition.invoke(player)) {
+ sendDialogue(player,"Magical forces prevent your teleportation.")
+ } else if (teleport(player, star.crash_locations[star.location]!!.transform(0, -1, 0), TeleportManager.TeleportType.MINIGAME)) {
+ getRingStoreFile()[player.username.toLowerCase()] = true
+ }
+ }
+ when (stage) {
+ 0 -> dialogue(if (star.spriteSpawned) "The star sprite has already been freed." else "The star sprite is still trapped.").also { if (shouldWarn) stage++ else stage += 2 }
+ 1 -> dialogue("WARNING: The star is located in the wilderness.").also { stage++ }
+ 2 -> player.dialogueInterpreter.sendOptions("Teleport to the star?", "Yes", "No").also { stage++ }
+ 3 -> when (buttonID) {
+ 1 -> end().also { teleportToStar(player) }
+ 2 -> end()
+ }
+ }
+ }
+ }
+
+ openDialogue(player, RingDialogue(star))
+ return@on true
+ }
+ }
+
+ override fun defineCommands() {
+ define("tostar", Privilege.ADMIN) { player, _ ->
+ teleport(player, star.starObject.location.transform(1,1,0))
+ }
+
+ define("submit", Privilege.ADMIN) { _, _ ->
+ star.rebuildVars()
+ star.fire()
+ }
+
+ define("resetsprite", Privilege.ADMIN) { player, _ ->
+ player.savedData.globalData.starSpriteDelay = 0L
+ }
+ }
+
+ override fun startup() {
+ log(this::class.java, Log.FINE, "Shooting Stars initialized.")
+ }
+
+ private data class ScoreboardEntry(val player: String, val time: Int)
+
+ companion object {
+ private val star = ShootingStar()
+ private val tickDelay = if(GameWorld.settings?.isDevMode == true) 200 else 25000
+ private val scoreboardEntries = ArrayList()
+ private val scoreboardIface = 787
+ val SHOOTING_STARS = ShootingStarType.values().map(ShootingStarType::objectId).toIntArray()
+ val STAR_DUST = Items.STARDUST_13727
+ val RING = Items.RING_OF_THE_STAR_SPRITE_14652
+
+
+ @JvmStatic fun submitScoreBoard(player: Player)
+ {
+ if(scoreboardEntries.size == 5)
+ scoreboardEntries.removeAt(0)
+ scoreboardEntries.add(ScoreboardEntry(player.username, GameWorld.ticks))
+ }
+
+ @JvmStatic fun getStar(): ShootingStar
+ {
+ return star
+ }
+
+ @JvmStatic fun getStoreFile() : JSONObject {
+ return ServerStore.getArchive("shooting-star")
+ }
+
+ @JvmStatic fun getRingStoreFile() : JSONObject {
+ return ServerStore.getArchive("daily-star-ring")
+ }
+
+ fun getStarDust(player: Player): Int {
+ return player.inventory.getAmount(STAR_DUST) + player.bank.getAmount(STAR_DUST)
+ }
+ }
+}
diff --git a/Server/src/main/content/global/activity/shootingstar/StarBonus.kt b/Server/src/main/content/global/activity/shootingstar/StarBonus.kt
new file mode 100644
index 000000000..d0c764e7d
--- /dev/null
+++ b/Server/src/main/content/global/activity/shootingstar/StarBonus.kt
@@ -0,0 +1,28 @@
+package content.global.activity.shootingstar
+
+import core.api.*
+import core.game.system.timer.*
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import org.json.simple.*
+
+class StarBonus : PersistTimer (1, "shootingstar:bonus") {
+ var ticksLeft = 1500
+
+ override fun save (root: JSONObject, entity: Entity) {
+ root["ticksLeft"] = ticksLeft.toString()
+ }
+
+ override fun parse (root: JSONObject, entity: Entity) {
+ ticksLeft = root["ticksLeft"].toString().toInt()
+ }
+
+ override fun run (entity: Entity) : Boolean {
+ if (entity is Player && ticksLeft == 500) {
+ entity.sendMessage("You have 5 minutes of your mining bonus left")
+ } else if (entity is Player && ticksLeft == 0) {
+ entity.sendMessage("Your mining bonus has run out!")
+ }
+ return ticksLeft-- > 0
+ }
+}
diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java b/Server/src/main/content/global/activity/shootingstar/StarChartPlugin.java
similarity index 95%
rename from Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java
rename to Server/src/main/content/global/activity/shootingstar/StarChartPlugin.java
index a6bd21964..9ab977822 100644
--- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java
+++ b/Server/src/main/content/global/activity/shootingstar/StarChartPlugin.java
@@ -1,4 +1,4 @@
-package core.game.content.global.worldevents.shootingstar;
+package content.global.activity.shootingstar;
import core.cache.def.impl.SceneryDefinition;
import core.game.component.Component;
@@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.player.Player;
import core.plugin.Plugin;
-import rs09.plugin.ClassScanner;
+import core.plugin.ClassScanner;
import core.plugin.PluginManifest;
@PluginManifest(name="ShootingStars")
diff --git a/Server/src/main/content/global/activity/shootingstar/StarSpriteDialogue.kt b/Server/src/main/content/global/activity/shootingstar/StarSpriteDialogue.kt
new file mode 100644
index 000000000..7eebc668e
--- /dev/null
+++ b/Server/src/main/content/global/activity/shootingstar/StarSpriteDialogue.kt
@@ -0,0 +1,283 @@
+package content.global.activity.shootingstar
+
+import core.api.Container
+import core.api.*
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.plugin.Initializable
+import core.tools.RandomFunction
+import org.json.simple.JSONObject
+import org.rs09.consts.Items
+import core.ServerStore
+import core.ServerStore.Companion.getBoolean
+import core.tools.END_DIALOGUE
+import core.tools.secondsToTicks
+import core.tools.colorize
+import java.util.concurrent.TimeUnit
+
+/**
+ * Dialogue for the star sprite.
+ */
+@Initializable
+class StarSpriteDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin(player) {
+
+ /**
+ * The cosmic rune item id.
+ */
+ val COSMIC_RUNE = 564
+
+ /**
+ * The astral rune item id.
+ */
+ val ASTRAL_RUNE = 9075
+
+ /**
+ * The gold ore item id.
+ */
+ val GOLD_ORE = 445
+
+ /**
+ * The coins id.
+ */
+ val COINS = 995
+
+ /**
+ * The amplifier amount.
+ */
+ val AMPLIFIER = 1.0
+
+
+ /**
+ * Constructs the star sprite dialogue.
+ */
+ fun StarSpriteDialogue() {
+ /*
+ * empty.
+ */
+ }
+
+ override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin? {
+ return StarSpriteDialogue(player)
+ }
+
+ override fun open(vararg args: Any): Boolean {
+ npc = args[0] as NPC
+ if (inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && !getAttribute(player, "star-ring:bp-shown", false)) {
+ npcl(core.game.dialogue.FacialExpression.NEUTRAL, "I see you got ahold of a blueprint of those silly old rings we used to make.")
+ stage = 1000
+ } else if (inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && getAttribute(player, "star-ring:bp-shown", false)) {
+ playerl(core.game.dialogue.FacialExpression.HALF_ASKING, "So about those rings...")
+ stage = 2000
+ } else if (getStoreFile().getBoolean(player.username.toLowerCase()) || !player.getInventory().contains(ShootingStarPlugin.STAR_DUST, 1)) {
+ npc("Hello, strange creature.")
+ stage = 0
+ } else {
+ npc("Thank you for helping me out of here.")
+ stage = 50
+ }
+ return true
+ }
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ when (stage) {
+ 0 -> {
+ npc("I'm a star sprite! I was in my star in the sky, when it", "lost control and crashed into the ground. With half my", "star sticking into the ground, I became stuck.", "Fortunately, I was mined out by the kind creatures of")
+ stage++
+ }
+ 1 -> {
+ npc("your race.")
+ stage++
+ }
+ 2 -> {
+ options("What's a star sprite?", "What are you going to do without your star?", "I thought stars were huge balls of burning gas.", "Well, I'm glad you're okay.")
+ stage++
+ }
+ 3 -> when (buttonId) {
+ 1 -> {
+ player("What's a star sprite?")
+ stage = 10
+ }
+ 2 -> {
+ player("What are you going to do without your star?")
+ stage = 20
+ }
+ 3 -> {
+ player("I thought stars were huge balls of burning gas.")
+ stage = 30
+ }
+ 4 -> {
+ player("Well, I'm glad you're okay.")
+ stage = 40
+ }
+ }
+ 10 -> {
+ npc("We're what makes the stars in the sky shine. I made", "this star shine when it was in the sky.")
+ stage++
+ }
+ 11 -> {
+ options("What are you going to do without your star?", "I thought stars were huge balls of burning gas.", "Well, I'm glad you're okay.")
+ stage++
+ }
+ 12 -> when (buttonId) {
+ 1 -> {
+ player("What are you going to do without your star?")
+ stage = 20
+ }
+ 2 -> {
+ player("I thought stars were huge balls of burning gas.")
+ stage = 30
+ }
+ 3 -> {
+ player("Well, I'm glad you're okay.")
+ stage = 40
+ }
+ }
+ 20 -> {
+ npc("Don't worry about me. I'm sure I'll find some good", "rocks around here and get back up into the sky in no", "time.")
+ stage++
+ }
+ 21 -> {
+ options("What's a star sprite?", "I thought stars were huge balls of burning gas.", "Well, I'm glad you're okay.")
+ stage++
+ }
+ 22 -> when (buttonId) {
+ 1 -> {
+ player("What's a star sprite?")
+ stage = 10
+ }
+ 2 -> {
+ player("I thought stars were huge balls of burning gas.")
+ stage = 30
+ }
+ 3 -> {
+ player("Well, I'm glad you're okay.")
+ stage = 40
+ }
+ }
+ 30 -> {
+ npc("Most of them are, but a lot of shooting stars on this", "plane of the multiverse are rocks with star sprites in", "them.")
+ stage++
+ }
+ 31 -> {
+ options("What's a star sprite?", "What are you going to do without your star?", "Well, I'm glad you're okay.")
+ stage++
+ }
+ 32 -> when (buttonId) {
+ 1 -> {
+ player("What's a star sprite?")
+ stage = 10
+ }
+ 2 -> {
+ player("What are you going to do without your star?")
+ stage = 20
+ }
+ 3 -> {
+ player("Well, I'm glad you're okay.")
+ stage = 40
+ }
+ }
+ 40 -> {
+ npc("Thank you.")
+ stage++
+ }
+ 41 -> end()
+ 50 -> {
+ val wearingRing = inEquipment(player, Items.RING_OF_THE_STAR_SPRITE_14652)
+ val dust = if (player.getInventory().getAmount(ShootingStarPlugin.STAR_DUST) > 200) 200 else player.getInventory().getAmount(ShootingStarPlugin.STAR_DUST)
+ if (player.getInventory().remove(Item(ShootingStarPlugin.STAR_DUST, dust))) {
+ val cosmicRunes = (Math.ceil(0.76 * dust) * AMPLIFIER).toInt()
+ val astralRunes = (Math.ceil(0.26 * dust) * AMPLIFIER).toInt()
+ val goldOre = (Math.ceil(0.1 * dust) * AMPLIFIER).toInt()
+ val coins = (Math.ceil(250.0 * dust) * AMPLIFIER).toInt() // limits the amount of gp per turn-in to 90k, same as 2009 rs, and minimum from all stardust from a level 1 star works out to 50k, same as rs in 2009
+ player.getInventory().add(Item(COSMIC_RUNE, cosmicRunes), player)
+ player.getInventory().add(Item(ASTRAL_RUNE, astralRunes), player)
+ player.getInventory().add(Item(GOLD_ORE, goldOre), player)
+ player.getInventory().add(Item(COINS, coins), player)
+ npc("I have rewarded you by making it so you can mine", "extra ore for the next 15 minutes. Also, have $cosmicRunes", "cosmic runes, $astralRunes astral runes, $goldOre gold ore and $coins", "coins.")
+
+ getStoreFile()[player.username.toLowerCase()] = true //flag daily as completed
+
+ val timer = getOrStartTimer (player)
+ timer.ticksLeft = 1500
+
+ if(wearingRing){
+ val item = intArrayOf(Items.COSMIC_RUNE_564, Items.ASTRAL_RUNE_9075, Items.GOLD_ORE_445, Items.COINS_995).random()
+ val amount = when(item){
+ Items.COSMIC_RUNE_564 -> cosmicRunes
+ Items.ASTRAL_RUNE_9075 -> astralRunes
+ Items.GOLD_ORE_445 -> goldOre
+ Items.COINS_995 -> coins
+ else -> 0
+ }
+ rollForRingBonus(player, item, amount)
+ }
+ }
+
+ if(!inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && !inBank(player, Items.ANCIENT_BLUEPRINT_14651) && RandomFunction.roll(500)){
+ addItemOrDrop(player, Items.ANCIENT_BLUEPRINT_14651, 1)
+ sendMessage(player, colorize("%RThe Star Sprite dropped what looks like some ancient piece of paper and you pick it up."))
+ sendNews("${player.username} found an Ancient Blueprint while mining a shooting star!")
+ }
+ stage = 52
+ }
+ 52 -> end()
+
+ //Inauthentic ring-based dialogue
+ 1000 -> playerl(core.game.dialogue.FacialExpression.ASKING, "Oh, you mean this?").also { stage++ }
+ 1001 -> player.dialogueInterpreter.sendItemMessage(Items.ANCIENT_BLUEPRINT_14651, "You show the blueprint to the Star Sprite.").also { stage++ }
+ 1002 -> npcl(core.game.dialogue.FacialExpression.ASKING, "Yeah, that's the one, alright!").also { stage++ }
+ 1003 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "I'll tell you what.. if you can get ahold of the resources needed to make one, I'm sure me or one of my kin would craft it for you.").also { stage++ }
+ 1004 -> playerl(core.game.dialogue.FacialExpression.ASKING, "You'd just do that for me? For free?").also { stage++ }
+ 1005 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "I don't see why not. We used to make these for fun and hand them out to adventurers all the time.").also { stage++ }
+ 1006 -> playerl(core.game.dialogue.FacialExpression.ASKING, "Well, thanks! So.. what do we need to make one?").also { stage++ }
+ 1007 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "Looking at the blueprint here...").also { stage++ }
+ 1008 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "Yes, it seems we need a ring mould, a silver bar, a cut dragonstone and 200 stardust. Oh, and make sure to bring this blueprint with you.").also { stage++ }
+ 1009 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Thanks, I'll get right on it!").also { stage++ }
+ 1010 -> playerl(core.game.dialogue.FacialExpression.ASKING, "So just to make sure I've got it right, I need a ring mould, a silver bar, a cut dragonstone and 200 stardust, as well as this blueprint?").also { stage++ }
+ 1011 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "Yeah, you've got it, human. Any of my kin should be able to do this for you.").also { stage++; setAttribute(player, "/save:star-ring:bp-shown", true) }
+ 1012 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Thanks!").also { stage = END_DIALOGUE }
+
+ 2000 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "Yes, did you bring the components to make it, human?").also { stage++ }
+ 2001 -> if(inInventory(player, Items.DRAGONSTONE_1615,1) && inInventory(player, Items.RING_MOULD_1592, 1) && inInventory(player, Items.STARDUST_13727, 200) && inInventory(player, Items.SILVER_BAR_2355, 1)){
+ playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Yes, I have them right here, friend.").also { stage++ }
+ } else {
+ playerl(core.game.dialogue.FacialExpression.HALF_GUILTY, "I'm afraid not, what did I need again?").also { stage = 2100 }
+ }
+ 2002 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "Excellent, give me just a moment here...").also { stage++ }
+ 2003 -> sendDialogue("You watch as the Star Sprite casts some strange spell.").also { stage++ }
+ 2004 -> if(removeItem(player, Items.SILVER_BAR_2355, Container.INVENTORY) && removeItem(player, Items.DRAGONSTONE_1615, Container.INVENTORY) && removeItem(player, Item(Items.STARDUST_13727, 200), Container.INVENTORY)){
+ addItem(player, Items.RING_OF_THE_STAR_SPRITE_14652)
+ player.dialogueInterpreter.sendItemMessage(Items.RING_OF_THE_STAR_SPRITE_14652, "The Star Sprite hands you a strange ring.").also { stage++ }
+ } else end()
+ 2005 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "There you go, I hope you enjoy it!").also { stage++ }
+ 2006 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Thank you!").also { stage = END_DIALOGUE }
+
+ 2100 -> npcl(core.game.dialogue.FacialExpression.NEUTRAL, "A ring mould, a cut dragonstone, a silver bar and 200 stardust.").also { stage = END_DIALOGUE }
+ }
+ return true
+ }
+
+ override fun getIds(): IntArray? {
+ return intArrayOf(8091)
+ }
+
+ fun rollForRingBonus(player: Player, bonusId: Int, bonusBaseAmt: Int){
+ if(RandomFunction.roll(3)){
+ var bonus = getOrStartTimer (player)
+ bonus.ticksLeft += 500
+ sendMessage(player, colorize("%RYour ring shines dimly as if imbued with energy."))
+ } else if(RandomFunction.roll(5)){
+ addItem(player, bonusId, bonusBaseAmt)
+ sendMessage(player, colorize("%RYour ring shines brightly as if surging with energy and then fades out."))
+ } else if(RandomFunction.roll(25)){
+ getStoreFile()[player.username.toLowerCase()] = false //flag daily as uncompleted
+ sendMessage(player, colorize("%RYour ring vibrates briefly as if surging with power, and then stops."))
+ }
+ }
+
+ fun getStoreFile(): JSONObject{
+ return ServerStore.getArchive("daily-shooting-star")
+ }
+
+}
diff --git a/Server/src/main/content/global/activity/ttrail/ClueLevel.java b/Server/src/main/content/global/activity/ttrail/ClueLevel.java
new file mode 100644
index 000000000..91a9ef0d4
--- /dev/null
+++ b/Server/src/main/content/global/activity/ttrail/ClueLevel.java
@@ -0,0 +1,197 @@
+package content.global.activity.ttrail;
+
+import core.game.component.Component;
+import core.game.container.access.InterfaceContainer;
+import core.game.node.entity.player.Player;
+import core.game.node.item.Item;
+import org.rs09.consts.Items;
+import core.game.world.GameWorld;
+import core.tools.RandomFunction;
+
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import core.api.IfaceSettingsBuilder;
+
+import core.game.system.config.ClueRewardParser;
+
+import static core.api.ContentAPIKt.addItemOrDrop;
+
+/**
+ * A clue scroll level.
+ */
+public enum ClueLevel {
+ EASY(Items.CASKET_2714, 1, 5),
+ MEDIUM(Items.CASKET_2717, 1, 6),
+ HARD(Items.CASKET_2720, 1, 8),
+ UNKNOWN(0, 0, 0)
+ ;
+
+ public int casketId, minSteps, maxSteps;
+
+ private ClueLevel(int casketId, int minSteps, int maxSteps) {
+ this.casketId = casketId;
+ this.minSteps = minSteps;
+ this.maxSteps = maxSteps;
+ }
+
+ private static ClueLevel getLevelForCasket(Item casket) {
+ switch (casket.getId()) {
+ case Items.CASKET_2714:
+ return ClueLevel.EASY;
+ case Items.CASKET_2717:
+ return ClueLevel.MEDIUM;
+ case Items.CASKET_2720:
+ return ClueLevel.HARD;
+ }
+
+ return ClueLevel.UNKNOWN;
+ }
+
+ public static void open(Player player, Item casket) {
+ if (casket == null || !player.getInventory().containsItem(casket)) {
+ return;
+ }
+
+ TreasureTrailManager playerTrails = TreasureTrailManager.getInstance(player);
+
+ boolean trailCompleted = playerTrails.isCompleted();
+ boolean isDevMode = GameWorld.getSettings().isDevMode();
+
+ ClueLevel clueLevel = getLevelForCasket(casket);
+
+ if (trailCompleted || isDevMode) {
+ List- rewards = rollLoot(player, clueLevel);
+
+ player.getInterfaceManager().open(new Component(364));
+
+ if (player.getInventory().remove(casket)) {
+ long rewardValue = 0L;
+
+ for (Item reward : rewards) {
+ addItemOrDrop(player, reward.getId(), reward.getAmount());
+ rewardValue += reward.getValue();
+ }
+
+ playerTrails.incrementClues(clueLevel);
+ playerTrails.clearTrail();
+
+ player.sendMessage("Well done, you've completed the Treasure Trail!");
+ player.sendMessage(
+ getChatColor(clueLevel)
+ + "You have completed "
+ + playerTrails.getCompletedClues(clueLevel)
+ + " "
+ + clueLevel.getName().toLowerCase()
+ + " clues."
+ );
+
+ player.sendMessage(
+ "Your clue is worth approximately "
+ + NumberFormat.getInstance().format(rewardValue)
+ + " coins!"
+ );
+
+ int clueIfaceSettings = new IfaceSettingsBuilder().enableAllOptions().build();
+ player.getPacketDispatch().sendIfaceSettings(clueIfaceSettings, 4, 364, 0, 6);
+ InterfaceContainer.generateItems(
+ player,
+ rewards.toArray(new Item[] {}),
+ new String[] {""},
+ 364, 4, 3, 3
+ );
+ }
+ return;
+ }
+
+ Item newClue = ClueScrollPlugin.getClue(clueLevel);
+
+ if (casket != null && player.getInventory().remove(casket, casket.getSlot(), true)) {
+ player.getInventory().replace(newClue, casket.getSlot());
+ } else {
+ player.getInventory().add(newClue);
+ }
+
+ playerTrails.setClueId(newClue.getId());
+ player.getDialogueInterpreter().sendItemMessage(newClue, "You've found another clue!");
+ }
+
+ public static List
- rollLoot(Player player, ClueLevel level) {
+ ArrayList
- loot = new ArrayList();
+ int itemCount = RandomFunction.random(1,6);
+
+ if (level == ClueLevel.HARD) {
+ itemCount = Math.max(itemCount, RandomFunction.random(4,6));
+ }
+
+ for (; itemCount > 0; itemCount--) {
+ switch (level) {
+ case EASY:
+ loot.addAll(ClueRewardParser.getEasyTable().roll(player));
+ break;
+ case MEDIUM:
+ loot.addAll(ClueRewardParser.getMedTable().roll(player));
+ break;
+ case HARD:
+ loot.addAll(ClueRewardParser.getHardTable().roll(player));
+ break;
+ }
+ }
+
+ if (level == ClueLevel.HARD && RandomFunction.random(100) == 50) {
+ loot.addAll(ClueRewardParser.getRareTable().roll(player));
+ }
+
+ return loot;
+ }
+
+ /**
+ * Gets the Chat color to send on completed clues.
+ * @param level The clue level.
+ * @return the chat color.
+ */
+ public static String getChatColor(ClueLevel level) {
+ if (level == ClueLevel.HARD) {
+ return "";
+ }
+ if (level == ClueLevel.MEDIUM) {
+ return "";
+ }
+ return "";
+ }
+ /**
+ * Gets the maximum length.
+ *
+ * @return the length.
+ */
+ public int getMaximumLength() {
+ return maxSteps;
+ }
+
+ /**
+ * Gets the minimum length.
+ *
+ * @return the length.
+ */
+ public int getMinimumLength() {
+ return minSteps;
+ }
+
+ /**
+ * Gets the bcasket.
+ *
+ * @return the casket
+ */
+ public Item getCasket() {
+ return new Item(casketId);
+ }
+
+ /**
+ * Gets the name of the clue level.
+ * @return the name.
+ */
+ public String getName() {
+ return toString();
+ }
+}
diff --git a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java b/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
similarity index 89%
rename from Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java
rename to Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
index b256be061..c049c6dab 100644
--- a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java
+++ b/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
@@ -1,9 +1,10 @@
-package core.game.content.ttrail;
+package content.global.activity.ttrail;
import core.game.component.Component;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
-import rs09.game.system.SystemLogger;
+import core.tools.Log;
+import core.tools.SystemLogger;
import core.game.world.map.zone.MapZone;
import core.game.world.map.zone.ZoneBorders;
import core.game.world.map.zone.ZoneBuilder;
@@ -15,6 +16,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static core.api.ContentAPIKt.log;
+
/**
* Represents a clue scroll plugin.
* @author Vexia
@@ -78,7 +81,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin