mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-09 16:45:44 -07:00
Beaver, void spinner, macow, magpie, spirit terrorbird, ibis, war tortoise, bunyip, fruit bat, unicorn stallion and pack yak familiars will no longer attack back if the player is attacked
This commit is contained in:
MatthewGould123
Ryan
parent
7d662d8ab0
commit
d22d3c6439
3 changed files with 147 additions and 126 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -16,6 +16,7 @@ Server/data/eco/grandexchange.db
|
|||
Server/data/serverstore/
|
||||
Server/data/global_kill_stats.json
|
||||
Server/ge_test.db
|
||||
Server/latestdump.txt
|
||||
Management-Server/managementprops/
|
||||
Server/worldprops/
|
||||
|
||||
|
|
|
|||
|
|
@ -14,398 +14,398 @@ public enum SummoningPouch {
|
|||
/**
|
||||
* Represents a spirit wolf pouch.
|
||||
*/
|
||||
SPIRIT_WOLF_POUCH(0, 12047, 1, 4.8, 6829, 0.1, 1, new Item(12158), new Item(12155), new Item(2859), new Item(12183, 7)),
|
||||
SPIRIT_WOLF_POUCH(0, 12047, 1, 4.8, 6829, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2859), new Item(12183, 7)),
|
||||
|
||||
/**
|
||||
* Represents a dreadfowl pouch.
|
||||
*/
|
||||
DREADFOWL_POUCH(1, 12043, 4, 9.3, 6825, 0.1, 1, new Item(12158), new Item(12155), new Item(2138), new Item(12183, 8)),
|
||||
DREADFOWL_POUCH(1, 12043, 4, 9.3, 6825, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2138), new Item(12183, 8)),
|
||||
|
||||
/**
|
||||
* Represents a spirit spider pouch.
|
||||
*/
|
||||
SPIRIT_SPIDER_POUCH(2, 12059, 10, 12.6, 6841, 0.2, 2, new Item(12158), new Item(12155), new Item(6291), new Item(12183, 8)),
|
||||
SPIRIT_SPIDER_POUCH(2, 12059, 10, 12.6, 6841, 0.2, 2, false, new Item(12158), new Item(12155), new Item(6291), new Item(12183, 8)),
|
||||
|
||||
/**
|
||||
* Represents a thorny snail pouch.
|
||||
*/
|
||||
THORNY_SNAIL_POUCH(3, 12019, 13, 12.6, 6806, 0.2, 2, new Item(12158), new Item(12155), new Item(3363), new Item(12183, 9)),
|
||||
THORNY_SNAIL_POUCH(3, 12019, 13, 12.6, 6806, 0.2, 2, false, new Item(12158), new Item(12155), new Item(3363), new Item(12183, 9)),
|
||||
|
||||
/**
|
||||
* Represents a granite crab pouch.
|
||||
*/
|
||||
GRANITE_CRAB_POUCH(4, 12009, 16, 31.6, 6796, 0.2, 2, new Item(12158), new Item(12155), new Item(440), new Item(12183, 7)),
|
||||
GRANITE_CRAB_POUCH(4, 12009, 16, 31.6, 6796, 0.2, 2, false, new Item(12158), new Item(12155), new Item(440), new Item(12183, 7)),
|
||||
|
||||
/**
|
||||
* Represents a spirit mosquito pouch.
|
||||
*/
|
||||
SPIRIT_MOSQUITO_POUCH(5, 12778, 17, 46.5, 7331, 0.5, 2, new Item(12158), new Item(12155), new Item(6319), new Item(12183, 1)),
|
||||
SPIRIT_MOSQUITO_POUCH(5, 12778, 17, 46.5, 7331, 0.5, 2, false, new Item(12158), new Item(12155), new Item(6319), new Item(12183, 1)),
|
||||
|
||||
/**
|
||||
* Represents a desrrt wyrm pouch.
|
||||
*/
|
||||
DESERT_WYRM_POUCH(6, 12049, 18, 31.2, 6831, 0.4, 1, new Item(12159), new Item(12155), new Item(1783), new Item(12183, 45)),
|
||||
DESERT_WYRM_POUCH(6, 12049, 18, 31.2, 6831, 0.4, 1, false, new Item(12159), new Item(12155), new Item(1783), new Item(12183, 45)),
|
||||
|
||||
/**
|
||||
* Represents a spirit scorpion pouch.
|
||||
*/
|
||||
SPIRIT_SCORPION_POUCH(7, 12055, 19, 83.2, 6837, 0.9, 2, new Item(12160), new Item(12155), new Item(3095), new Item(12183, 57)),
|
||||
SPIRIT_SCORPION_POUCH(7, 12055, 19, 83.2, 6837, 0.9, 2, false, new Item(12160), new Item(12155), new Item(3095), new Item(12183, 57)),
|
||||
|
||||
/**
|
||||
* Represents a spirit tz-kih pouch.
|
||||
*/
|
||||
SPIRIT_TZ_KIH_POUCH(8, 12808, 22, 96.8, 7361, 1.1, 3, new Item(12160), new Item(12168), new Item(12155), new Item(12183, 64)),
|
||||
SPIRIT_TZ_KIH_POUCH(8, 12808, 22, 96.8, 7361, 1.1, 3, false, new Item(12160), new Item(12168), new Item(12155), new Item(12183, 64)),
|
||||
|
||||
/**
|
||||
* Represents an albino rat pouch.
|
||||
*/
|
||||
ALBINO_RAT_POUCH(9, 12067, 23, 202.4, 6847, 2.3, 1, new Item(12163), new Item(12155), new Item(2134), new Item(12183, 75)),
|
||||
ALBINO_RAT_POUCH(9, 12067, 23, 202.4, 6847, 2.3, 1, false, new Item(12163), new Item(12155), new Item(2134), new Item(12183, 75)),
|
||||
|
||||
/**
|
||||
* Represents a spirit kalphite pouch.
|
||||
*/
|
||||
SPIRIT_KALPHITE_POUCH(10, 12063, 25, 220, 6994, 2.5, 3, new Item(12163), new Item(12155), new Item(3138), new Item(12183, 51)),
|
||||
SPIRIT_KALPHITE_POUCH(10, 12063, 25, 220, 6994, 2.5, 3,false, new Item(12163), new Item(12155), new Item(3138), new Item(12183, 51)),
|
||||
|
||||
/**
|
||||
* Represents a compost mound pouch.
|
||||
*/
|
||||
COMPOST_MOUND_POUCH(11, 12091, 28, 49.8, 6871, 0.6, 6, new Item(12159), new Item(12155), new Item(6032), new Item(12183, 47)),
|
||||
COMPOST_MOUND_POUCH(11, 12091, 28, 49.8, 6871, 0.6, 6, false, new Item(12159), new Item(12155), new Item(6032), new Item(12183, 47)),
|
||||
|
||||
/**
|
||||
* Represents a giant chinchompa pouch.
|
||||
*/
|
||||
GIANT_CHINCHOMPA_POUCH(12, 12800, 29, 255.2, 7353, 2.9, 1, new Item(12163), new Item(12155), new Item(10033), new Item(12183, 84)),
|
||||
GIANT_CHINCHOMPA_POUCH(12, 12800, 29, 255.2, 7353, 2.9, 1, false, new Item(12163), new Item(12155), new Item(10033), new Item(12183, 84)),
|
||||
|
||||
/**
|
||||
* Represents a vampire bat pouch.
|
||||
*/
|
||||
VAMPIRE_BAT_POUCH(13, 12053, 31, 136, 6835, 1.5, 4, new Item(12160), new Item(12155), new Item(3325), new Item(12183, 81)),
|
||||
VAMPIRE_BAT_POUCH(13, 12053, 31, 136, 6835, 1.5, 4, false, new Item(12160), new Item(12155), new Item(3325), new Item(12183, 81)),
|
||||
|
||||
/**
|
||||
* Represents a honey badger pouch.
|
||||
*/
|
||||
HONEY_BADGER_POUCH(14, 12065, 32, 140.8, 6845, 1.6, 4, new Item(12160), new Item(12155), new Item(12156), new Item(12183, 84)),
|
||||
HONEY_BADGER_POUCH(14, 12065, 32, 140.8, 6845, 1.6, 4, false, new Item(12160), new Item(12155), new Item(12156), new Item(12183, 84)),
|
||||
|
||||
/**
|
||||
* Represents a beaver pouch.
|
||||
*/
|
||||
BEAVER_POUCH(15, 12021, 33, 57.6, 6808, 0.7, 4, new Item(12159), new Item(12155), new Item(1519), new Item(12183, 72)),
|
||||
BEAVER_POUCH(15, 12021, 33, 57.6, 6808, 0.7, 4, true, new Item(12159), new Item(12155), new Item(1519), new Item(12183, 72)),
|
||||
|
||||
/**
|
||||
* Represents a void ravager pouch.
|
||||
*/
|
||||
VOID_RAVAGER_POUCH(16, 12818, 34, 59.6, 7370, 0.7, 4, new Item(12159), new Item(12164), new Item(12155), new Item(12183, 74)),
|
||||
VOID_RAVAGER_POUCH(16, 12818, 34, 59.6, 7370, 0.7, 4, false, new Item(12159), new Item(12164), new Item(12155), new Item(12183, 74)),
|
||||
|
||||
/**
|
||||
* Represents a void spinner pouch.
|
||||
*/
|
||||
VOID_SPINNER_POUCH(17, 12780, 34, 59.6, 7333, 0.7, 4, new Item(12163), new Item(12166), new Item(12155), new Item(12183, 74)),
|
||||
VOID_SPINNER_POUCH(17, 12780, 34, 59.6, 7333, 0.7, 4, true, new Item(12163), new Item(12166), new Item(12155), new Item(12183, 74)),
|
||||
|
||||
/**
|
||||
* Represents a void torcher pouch.
|
||||
*/
|
||||
VOID_TORCHER_POUCH(18, 12798, 34, 59.6, 7351, 0.7, 4, new Item(12163), new Item(12167), new Item(12155), new Item(12183, 74)),
|
||||
VOID_TORCHER_POUCH(18, 12798, 34, 59.6, 7351, 0.7, 4, false, new Item(12163), new Item(12167), new Item(12155), new Item(12183, 74)),
|
||||
|
||||
/**
|
||||
* Represents a void shifter pouch.
|
||||
*/
|
||||
VOID_SHIFTER_POUCH(19, 12814, 34, 59.6, 7367, 0.7, 4, new Item(12163), new Item(12165), new Item(12155), new Item(12183, 74)),
|
||||
VOID_SHIFTER_POUCH(19, 12814, 34, 59.6, 7367, 0.7, 4, false, new Item(12163), new Item(12165), new Item(12155), new Item(12183, 74)),
|
||||
|
||||
/**
|
||||
* Represents a bronze minotaur pouch.
|
||||
*/
|
||||
BRONZE_MINOTAUR_POUCH(64, 12073, 36, 316.8, 6853, 3.6, 3, new Item(12163), new Item(12155), new Item(2349), new Item(12183, 102)),
|
||||
BRONZE_MINOTAUR_POUCH(64, 12073, 36, 316.8, 6853, 3.6, 3, false, new Item(12163), new Item(12155), new Item(2349), new Item(12183, 102)),
|
||||
|
||||
/**
|
||||
* Represents an iron minotaur pouch.
|
||||
*/
|
||||
IRON_MINOTAUR_POUCH(65, 12075, 46, 404.8, 6855, 4.6, 9, new Item(12163), new Item(12155), new Item(2351), new Item(12183, 125)),
|
||||
IRON_MINOTAUR_POUCH(65, 12075, 46, 404.8, 6855, 4.6, 9, false, new Item(12163), new Item(12155), new Item(2351), new Item(12183, 125)),
|
||||
|
||||
/**
|
||||
* Represents a steel minotaur pouch.
|
||||
*/
|
||||
STEEL_MINOTAUR_POUCH(66, 12077, 56, 492.8, 6857, 5.6, 9, new Item(12163), new Item(12155), new Item(2353), new Item(12183, 141)),
|
||||
STEEL_MINOTAUR_POUCH(66, 12077, 56, 492.8, 6857, 5.6, 9, false, new Item(12163), new Item(12155), new Item(2353), new Item(12183, 141)),
|
||||
|
||||
/**
|
||||
* Represents a mithril minotaur pouch.
|
||||
*/
|
||||
MITHRIL_MINOTAUR_POUCH(67, 12079, 66, 580.8, 6859, 6.6, 9, new Item(12163), new Item(12155), new Item(2359), new Item(12183, 152)),
|
||||
MITHRIL_MINOTAUR_POUCH(67, 12079, 66, 580.8, 6859, 6.6, 9,false, new Item(12163), new Item(12155), new Item(2359), new Item(12183, 152)),
|
||||
|
||||
/**
|
||||
* Represents an adamant minotaur pouch.
|
||||
*/
|
||||
ADAMANT_MINOTAUR_POUCH(68, 12081, 76, 668.8, 6861, 7.6, 9, new Item(12163), new Item(12155), new Item(2361), new Item(12183, 144)),
|
||||
ADAMANT_MINOTAUR_POUCH(68, 12081, 76, 668.8, 6861, 7.6, 9, false, new Item(12163), new Item(12155), new Item(2361), new Item(12183, 144)),
|
||||
|
||||
/**
|
||||
* Represents a rune minotaur pouch.
|
||||
*/
|
||||
RUNE_MINOTAUR_POUCH(69, 12083, 86, 756.8, 6863, 8.6, 9, new Item(12163), new Item(12155), new Item(2363), new Item(12183, 1)),
|
||||
RUNE_MINOTAUR_POUCH(69, 12083, 86, 756.8, 6863, 8.6, 9, false, new Item(12163), new Item(12155), new Item(2363), new Item(12183, 1)),
|
||||
|
||||
/**
|
||||
* Represents a bull ant pouch.
|
||||
*/
|
||||
BULL_ANT_POUCH(20, 12087, 40, 52.8, 6867, 0.6, 5, new Item(12158), new Item(12155), new Item(6010), new Item(12183, 11)),
|
||||
BULL_ANT_POUCH(20, 12087, 40, 52.8, 6867, 0.6, 5, false, new Item(12158), new Item(12155), new Item(6010), new Item(12183, 11)),
|
||||
|
||||
/**
|
||||
* Represents a macaw pouch.
|
||||
*/
|
||||
MACAW_POUCH(21, 12071, 41, 72.4, 6851, 0.8, 5, new Item(12159), new Item(12155), new Item(249), new Item(12183, 78)),
|
||||
MACAW_POUCH(21, 12071, 41, 72.4, 6851, 0.8, 5, true, new Item(12159), new Item(12155), new Item(249), new Item(12183, 78)),
|
||||
|
||||
/**
|
||||
* Represents an evil turnip pouch.
|
||||
*/
|
||||
EVIL_TURNIP_POUCH(22, 12051, 42, 184.8, 6833, 2.1, 5, new Item(12160), new Item(12155), new Item(12153), new Item(12183, 104)),
|
||||
EVIL_TURNIP_POUCH(22, 12051, 42, 184.8, 6833, 2.1, 5, false, new Item(12160), new Item(12155), new Item(12153), new Item(12183, 104)),
|
||||
|
||||
/**
|
||||
* Represents a spirit cockatrice pouch.
|
||||
*/
|
||||
SPIRIT_COCKATRICE_POUCH(23, 12095, 43, 75.2, 6875, 0.9, 5, new Item(12159), new Item(12155), new Item(12109), new Item(12183, 88)),
|
||||
SPIRIT_COCKATRICE_POUCH(23, 12095, 43, 75.2, 6875, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12109), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a spirit guthatrice pouch.
|
||||
*/
|
||||
SPIRIT_GUTHATRICE_POUCH(24, 12097, 43, 75.2, 6877, 0.9, 5, new Item(12159), new Item(12155), new Item(12111), new Item(12183, 88)),
|
||||
SPIRIT_GUTHATRICE_POUCH(24, 12097, 43, 75.2, 6877, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12111), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a spirit saratrice pouch.
|
||||
*/
|
||||
SPIRIT_SARATRICE_POUCH(25, 12099, 43, 75.2, 6879, 0.9, 5, new Item(12159), new Item(12155), new Item(12113), new Item(12183, 88)),
|
||||
SPIRIT_SARATRICE_POUCH(25, 12099, 43, 75.2, 6879, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12113), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a spirit zamatrice pouch.
|
||||
*/
|
||||
SPIRIT_ZAMATRICE_POUCH(26, 12101, 43, 75.2, 6881, 0.9, 5, new Item(12159), new Item(12155), new Item(12115), new Item(12183, 88)),
|
||||
SPIRIT_ZAMATRICE_POUCH(26, 12101, 43, 75.2, 6881, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12115), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a spirit pengatrice pouch.
|
||||
*/
|
||||
SPIRIT_PENGATRICE_POUCH(27, 12103, 43, 75.2, 6883, 0.9, 5, new Item(12159), new Item(12155), new Item(12117), new Item(12183, 88)),
|
||||
SPIRIT_PENGATRICE_POUCH(27, 12103, 43, 75.2, 6883, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12117), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a coraxatrice pouch.
|
||||
*/
|
||||
SPIRIT_CORAXATRICE_POUCH(28, 12105, 43, 75.2, 6885, 0.9, 5, new Item(12159), new Item(12155), new Item(12119), new Item(12183, 88)),
|
||||
SPIRIT_CORAXATRICE_POUCH(28, 12105, 43, 75.2, 6885, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12119), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a vulatrice pouch.
|
||||
*/
|
||||
SPIRIT_VULATRICE(29, 12107, 43, 75.2, 6887, 0.9, 5, new Item(12159), new Item(12155), new Item(12121), new Item(12183, 88)),
|
||||
SPIRIT_VULATRICE(29, 12107, 43, 75.2, 6887, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12121), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a pyrelord pouch.
|
||||
*/
|
||||
PYRELORD_POUCH(30, 12816, 46, 202.4, 7377, 2.3, 5, new Item(12160), new Item(12155), new Item(590), new Item(12183, 111)),
|
||||
PYRELORD_POUCH(30, 12816, 46, 202.4, 7377, 2.3, 5, false, new Item(12160), new Item(12155), new Item(590), new Item(12183, 111)),
|
||||
|
||||
/**
|
||||
* Represents a magpie pouch.
|
||||
*/
|
||||
MAGPIE_POUCH(31, 12041, 47, 83.2, 6824, 0.9, 5, new Item(12159), new Item(12155), new Item(1635), new Item(12183, 88)),
|
||||
MAGPIE_POUCH(31, 12041, 47, 83.2, 6824, 0.9, 5, true, new Item(12159), new Item(12155), new Item(1635), new Item(12183, 88)),
|
||||
|
||||
/**
|
||||
* Represents a bloated leech pouch.
|
||||
*/
|
||||
BLOATED_LEECH_POUCH(32, 12061, 49, 215.2, 6843, 2.4, 5, new Item(12160), new Item(12155), new Item(2132), new Item(12183, 117)),
|
||||
BLOATED_LEECH_POUCH(32, 12061, 49, 215.2, 6843, 2.4, 5, false, new Item(12160), new Item(12155), new Item(2132), new Item(12183, 117)),
|
||||
|
||||
/**
|
||||
* Represents a spirit terrorbird pouch.
|
||||
*/
|
||||
SPIRIT_TERRORBIRD_POUCH(33, 12007, 52, 68.4, 6794, 0.8, 6, new Item(12158), new Item(12155), new Item(9978), new Item(12183, 12)),
|
||||
SPIRIT_TERRORBIRD_POUCH(33, 12007, 52, 68.4, 6794, 0.8, 6, true, new Item(12158), new Item(12155), new Item(9978), new Item(12183, 12)),
|
||||
|
||||
/**
|
||||
* Represents an abyssal parasite pouch.
|
||||
*/
|
||||
ABYSSAL_PARASITE_POUCH(34, true,12035, 54, 94.8, 6818, 1.1, 6, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 106)),
|
||||
ABYSSAL_PARASITE_POUCH(34, true,12035, 54, 94.8, 6818, 1.1, 6, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 106)),
|
||||
|
||||
/**
|
||||
* Represents a spirit jelly pouch.
|
||||
*/
|
||||
SPIRIT_JELLY_POUCH(35, 12027, 55, 484, 6992, 5.5, 6, new Item(12163), new Item(12155), new Item(1937), new Item(12183, 151)),
|
||||
SPIRIT_JELLY_POUCH(35, 12027, 55, 484, 6992, 5.5, 6, false, new Item(12163), new Item(12155), new Item(1937), new Item(12183, 151)),
|
||||
|
||||
/**
|
||||
* Represents an ibis pouch.
|
||||
*/
|
||||
IBIS_POUCH(36, 12531, 56, 98.8, 6991, 1.1, 6, new Item(12159), new Item(12155), new Item(311), new Item(12183, 109)),
|
||||
IBIS_POUCH(36, 12531, 56, 98.8, 6991, 1.1, 6, true, new Item(12159), new Item(12155), new Item(311), new Item(12183, 109)),
|
||||
|
||||
/**
|
||||
* Represents a spirit kyatt pouch.
|
||||
*/
|
||||
SPIRIT_KYATT_POUCH(37, 12812, 57, 501.6, 7365, 5.7, 6, new Item(12163), new Item(12155), new Item(10103), new Item(12183, 153)),
|
||||
SPIRIT_KYATT_POUCH(37, 12812, 57, 501.6, 7365, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10103), new Item(12183, 153)),
|
||||
|
||||
/**
|
||||
* Represents a spirit larupia pouch.
|
||||
*/
|
||||
SPIRIT_LARUPIA_POUCH(38, 12784, 57, 501.6, 7337, 5.7, 6, new Item(12163), new Item(12155), new Item(10095), new Item(12183, 155)),
|
||||
SPIRIT_LARUPIA_POUCH(38, 12784, 57, 501.6, 7337, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10095), new Item(12183, 155)),
|
||||
|
||||
/**
|
||||
* Represents a spirit graahk pouch.
|
||||
*/
|
||||
SPIRIT_GRAAHK_POUCH(39, 12810, 57, 501.6, 7363, 5.7, 6, new Item(12163), new Item(12155), new Item(10099), new Item(12183, 154)),
|
||||
SPIRIT_GRAAHK_POUCH(39, 12810, 57, 501.6, 7363, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10099), new Item(12183, 154)),
|
||||
|
||||
/**
|
||||
* Represents a karamthulhu overlord pouch.
|
||||
*/
|
||||
KARAMTHULHU_POUCH(40, 12023, 58, 510.4, 6809, 5.8, 6, new Item(12163), new Item(12155), new Item(6667), new Item(12183, 144)),
|
||||
KARAMTHULHU_POUCH(40, 12023, 58, 510.4, 6809, 5.8, 6, false, new Item(12163), new Item(12155), new Item(6667), new Item(12183, 144)),
|
||||
|
||||
/**
|
||||
* Represents a smoke devil pouch.
|
||||
*/
|
||||
SMOKE_DEVIL_POUCH(41, 12085, 61, 268, 6865, 3, 7, new Item(12160), new Item(12155), new Item(9736), new Item(12183, 141)),
|
||||
SMOKE_DEVIL_POUCH(41, 12085, 61, 268, 6865, 3, 7, false, new Item(12160), new Item(12155), new Item(9736), new Item(12183, 141)),
|
||||
|
||||
/**
|
||||
* Represents an abyssal lurker pouch.
|
||||
*/
|
||||
ABYSSAL_LUKRER(42, true,12037, 62, 109.6, 6820, 1.9, 9, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 119)),
|
||||
ABYSSAL_LUKRER(42, true,12037, 62, 109.6, 6820, 1.9, 9, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 119)),
|
||||
|
||||
/**
|
||||
* Represents a spirit cobra pouch.
|
||||
*/
|
||||
SPIRIT_COBRA_POUCH(43, 12015, 63, 276.8, 6802, 3.1, 6, new Item(12160), new Item(12155), new Item(6287), new Item(12183, 116)),
|
||||
SPIRIT_COBRA_POUCH(43, 12015, 63, 276.8, 6802, 3.1, 6, false, new Item(12160), new Item(12155), new Item(6287), new Item(12183, 116)),
|
||||
|
||||
/**
|
||||
* Represents a stranger plant pouch.
|
||||
*/
|
||||
STRANGER_PLANT_POUCH(44, 12045, 64, 281.6, 6827, 3.2, 6, new Item(12160), new Item(12155), new Item(8431), new Item(12183, 128)),
|
||||
STRANGER_PLANT_POUCH(44, 12045, 64, 281.6, 6827, 3.2, 6, false, new Item(12160), new Item(12155), new Item(8431), new Item(12183, 128)),
|
||||
|
||||
/**
|
||||
* Represents a barker toad pouch.
|
||||
*/
|
||||
BARKER_TOAD_POUCH(45, 12123, 66, 87, 6889, 1, 7, new Item(12158), new Item(12155), new Item(2150), new Item(12183, 11)),
|
||||
BARKER_TOAD_POUCH(45, 12123, 66, 87, 6889, 1, 7, false, new Item(12158), new Item(12155), new Item(2150), new Item(12183, 11)),
|
||||
|
||||
/**
|
||||
* Represents a war tortoise pouch.
|
||||
*/
|
||||
WAR_TORTOISE_POUCH(46, 12031, 67, 58.6, 6815, 0.7, 7, new Item(12158), new Item(12155), new Item(7939), new Item(12183, 1)),
|
||||
WAR_TORTOISE_POUCH(46, 12031, 67, 58.6, 6815, 0.7, 7, true, new Item(12158), new Item(12155), new Item(7939), new Item(12183, 1)),
|
||||
|
||||
/**
|
||||
* Represents a bunyip pouch.
|
||||
*/
|
||||
BUNYIP_POUCH(47, 12029, 68, 119.2, 6813, 1.4, 7, new Item(12159), new Item(12155), new Item(383), new Item(12183, 110)),
|
||||
BUNYIP_POUCH(47, 12029, 68, 119.2, 6813, 1.4, 7, true, new Item(12159), new Item(12155), new Item(383), new Item(12183, 110)),
|
||||
|
||||
/**
|
||||
* Represents a fruit bat pouch.
|
||||
*/
|
||||
FRUIT_BAT_POUCH(48, 12033, 69, 121.2, 6817, 1.4, 8, new Item(12159), new Item(12155), new Item(1963), new Item(12183, 130)),
|
||||
FRUIT_BAT_POUCH(48, 12033, 69, 121.2, 6817, 1.4, 8, true, new Item(12159), new Item(12155), new Item(1963), new Item(12183, 130)),
|
||||
|
||||
/**
|
||||
* Represents a ravenous locust pouch.
|
||||
*/
|
||||
RAVENOUS_LOCUST_POUCH(49, 12820, 70, 132, 7372, 1.5, 4, new Item(12160), new Item(12155), new Item(1933), new Item(12183, 79)),
|
||||
RAVENOUS_LOCUST_POUCH(49, 12820, 70, 132, 7372, 1.5, 4, false, new Item(12160), new Item(12155), new Item(1933), new Item(12183, 79)),
|
||||
|
||||
/**
|
||||
* Represents an arctic bear pouch.
|
||||
*/
|
||||
ARCTIC_BEAR_POUCH(50, 12057, 71, 93.2, 6839, 1.1, 8, new Item(12158), new Item(12155), new Item(10117), new Item(12183, 14)),
|
||||
ARCTIC_BEAR_POUCH(50, 12057, 71, 93.2, 6839, 1.1, 8, false, new Item(12158), new Item(12155), new Item(10117), new Item(12183, 14)),
|
||||
|
||||
/**
|
||||
* Represents a Phoenix
|
||||
*/
|
||||
PHOENIX_POUCH(50, 14623, 72, 93.2, 8575, 1.1, 8, new Item(12160, 1), new Item(12183, 165), new Item(12155, 1), new Item(14616, 1)),
|
||||
PHOENIX_POUCH(50, 14623, 72, 93.2, 8575, 1.1, 8, false, new Item(12160, 1), new Item(12183, 165), new Item(12155, 1), new Item(14616, 1)),
|
||||
|
||||
/**
|
||||
* Represents an obsidian golem pouch.
|
||||
*/
|
||||
OBSIDIAN_GOLEM_POUCH(51, 12792, 73, 642.4, 7345, 7.3, 8, new Item(12163), new Item(12155), new Item(12168), new Item(12183, 195)),
|
||||
OBSIDIAN_GOLEM_POUCH(51, 12792, 73, 642.4, 7345, 7.3, 8, false, new Item(12163), new Item(12155), new Item(12168), new Item(12183, 195)),
|
||||
|
||||
/**
|
||||
* Represents a granite lobster pouch.
|
||||
*/
|
||||
GRANITE_LOBSTER_POUCH(52, 12069, 74, 325.6, 6849, 3.7, 8, new Item(12160), new Item(12155), new Item(6979), new Item(12183, 166)),
|
||||
GRANITE_LOBSTER_POUCH(52, 12069, 74, 325.6, 6849, 3.7, 8, false, new Item(12160), new Item(12155), new Item(6979), new Item(12183, 166)),
|
||||
|
||||
/**
|
||||
* Represents a praying mantis pouch.
|
||||
*/
|
||||
PRAYING_MANTIS_POUCH(53, 12011, 75, 329.6, 6798, 3.6, 8, new Item(12160), new Item(12155), new Item(2460), new Item(12183, 168)),
|
||||
PRAYING_MANTIS_POUCH(53, 12011, 75, 329.6, 6798, 3.6, 8, false, new Item(12160), new Item(12155), new Item(2460), new Item(12183, 168)),
|
||||
|
||||
/**
|
||||
* Represents a forge regent pouch.
|
||||
*/
|
||||
FORGE_REGENT_BEAST(54, 12782, 76, 134, 7335, 1.5, 9, new Item(12159), new Item(12155), new Item(10020), new Item(12183, 141)),
|
||||
FORGE_REGENT_BEAST(54, 12782, 76, 134, 7335, 1.5, 9, false, new Item(12159), new Item(12155), new Item(10020), new Item(12183, 141)),
|
||||
|
||||
/**
|
||||
* Represents a talon beast pouch.
|
||||
*/
|
||||
TALON_BEAST_POUCH(55, 12794, 77, 1015.2, 7347, 3.8, 9, new Item(12160), new Item(12155), new Item(12162), new Item(12183, 174)),
|
||||
TALON_BEAST_POUCH(55, 12794, 77, 1015.2, 7347, 3.8, 9, false, new Item(12160), new Item(12155), new Item(12162), new Item(12183, 174)),
|
||||
|
||||
/**
|
||||
* Represents a giant ent pouch.
|
||||
*/
|
||||
GIANT_ENT_POUCH(56, 12013, 78, 136.8, 6800, 1.6, 8, new Item(12159), new Item(5933), new Item(12155), new Item(12183, 124)),
|
||||
GIANT_ENT_POUCH(56, 12013, 78, 136.8, 6800, 1.6, 8, false, new Item(12159), new Item(5933), new Item(12155), new Item(12183, 124)),
|
||||
|
||||
/**
|
||||
* Represents a hydra pouch.
|
||||
*/
|
||||
HYDRA_POUCH(60, 12025, 80, 140.8, 6811, 1.6, 9, new Item(12159), new Item(571), new Item(12183, 128)),
|
||||
HYDRA_POUCH(60, 12025, 80, 140.8, 6811, 1.6, 9, false, new Item(12159), new Item(571), new Item(12183, 128)),
|
||||
|
||||
/**
|
||||
* Represents a spirit dagannoth pouch.
|
||||
*/
|
||||
SPIRIT_DAGANNOTH_POUCH(61, 12017, 83, 364.8, 6804, 4.1, 9, new Item(12160), new Item(6155), new Item(12183, 1)),
|
||||
SPIRIT_DAGANNOTH_POUCH(61, 12017, 83, 364.8, 6804, 4.1, 9, false, new Item(12160), new Item(6155), new Item(12183, 1)),
|
||||
|
||||
/**
|
||||
* Represents a unicorn stallion pouch.
|
||||
*/
|
||||
UNICORN_STALLION_POUCH(70, 12039, 88, 154.4, 6822, 1.8, 9, new Item(12159), new Item(237), new Item(12183, 203)),
|
||||
UNICORN_STALLION_POUCH(70, 12039, 88, 154.4, 6822, 1.8, 9, true, new Item(12159), new Item(237), new Item(12183, 203)),
|
||||
|
||||
/**
|
||||
* Represents a wolpertinger pouch.
|
||||
*/
|
||||
WOLPERTINGER_POUCH(72, 12089, 92, 404.8, 6869, 4.5, 10, new Item(12160), new Item(2859), new Item(3226), new Item(12183, 203)),
|
||||
WOLPERTINGER_POUCH(72, 12089, 92, 404.8, 6869, 4.5, 10, false, new Item(12160), new Item(2859), new Item(3226), new Item(12183, 203)),
|
||||
|
||||
/**
|
||||
* Represents a pack yak pouch.
|
||||
*/
|
||||
PACK_YAK_POUCH(75, 12093, 96, 422.4, 6873, 4.8, 10, new Item(12160), new Item(10818), new Item(12183, 211)),
|
||||
PACK_YAK_POUCH(75, 12093, 96, 422.4, 6873, 4.8, 10, true, new Item(12160), new Item(10818), new Item(12183, 211)),
|
||||
|
||||
/**
|
||||
* Represents a fire titan pouch.
|
||||
*/
|
||||
FIRE_TITAN_POUCH(57, 12802, 79, 695.2, 7355, 7.9, 9, new Item(12163), new Item(1442), new Item(12155), new Item(12183, 198)),
|
||||
FIRE_TITAN_POUCH(57, 12802, 79, 695.2, 7355, 7.9, 9, false, new Item(12163), new Item(1442), new Item(12155), new Item(12183, 198)),
|
||||
|
||||
/**
|
||||
* Represents a moss titan pouch.
|
||||
*/
|
||||
MOSS_TITAN_POUCH(58, 12804, 79, 695.2, 7357, 7.9, 9, new Item(12163), new Item(1440), new Item(12155), new Item(12183, 198)),
|
||||
MOSS_TITAN_POUCH(58, 12804, 79, 695.2, 7357, 7.9, 9, false, new Item(12163), new Item(1440), new Item(12155), new Item(12183, 198)),
|
||||
|
||||
/**
|
||||
* Represents an ice titan pouch.
|
||||
*/
|
||||
ICE_TITAN_POUCH(59, 12806, 79, 695.2, 7359, 7.9, 9, new Item(12163), new Item(1438), new Item(1444), new Item(12155), new Item(12183, 198)),
|
||||
ICE_TITAN_POUCH(59, 12806, 79, 695.2, 7359, 7.9, 9, false, new Item(12163), new Item(1438), new Item(1444), new Item(12155), new Item(12183, 198)),
|
||||
|
||||
/**
|
||||
* Represents a lava titan pouch.
|
||||
*/
|
||||
LAVA_TITAN_POUCH(62, 12788, 83, 730.4, 7341, 8.3, 9, new Item(12163), new Item(12168), new Item(12155), new Item(12183, 219)),
|
||||
LAVA_TITAN_POUCH(62, 12788, 83, 730.4, 7341, 8.3, 9, false, new Item(12163), new Item(12168), new Item(12155), new Item(12183, 219)),
|
||||
|
||||
/**
|
||||
* Represents a swamp titan pouch.
|
||||
*/
|
||||
SWAMP_TITAN_POUCH(63, 12776, 85, 373.6, 7329, 4.2, 9, new Item(12160), new Item(10149), new Item(12155), new Item(12183, 150)),
|
||||
SWAMP_TITAN_POUCH(63, 12776, 85, 373.6, 7329, 4.2, 9, false, new Item(12160), new Item(10149), new Item(12155), new Item(12183, 150)),
|
||||
|
||||
/**
|
||||
* Represents a geyser titan pouch.
|
||||
*/
|
||||
GEYSER_TITAN_POUCH(71, 12786, 89, 783.2, 7339, 8.9, 9, new Item(12163), new Item(1444), new Item(12155), new Item(12183, 222)),
|
||||
GEYSER_TITAN_POUCH(71, 12786, 89, 783.2, 7339, 8.9, 9, false, new Item(12163), new Item(1444), new Item(12155), new Item(12183, 222)),
|
||||
|
||||
/**
|
||||
* Represents an abyssal titan pouch.
|
||||
*/
|
||||
ABYSSAL_TITAN_POUCH(73, true,12796, 93, 163.2, 7349, 1.9, 10, new Item(12159), new Item(12161), new Item(12155), new Item(12183, 113)),
|
||||
ABYSSAL_TITAN_POUCH(73, true,12796, 93, 163.2, 7349, 1.9, 10, false, new Item(12159), new Item(12161), new Item(12155), new Item(12183, 113)),
|
||||
|
||||
/**
|
||||
* Represents an iron titan pouch.
|
||||
*/
|
||||
IRON_TITAN_POUCH(74, 12822, 95, 417.6, 7375, 4.7, 10, new Item(12160), new Item(1115), new Item(12155), new Item(12183, 198)),
|
||||
IRON_TITAN_POUCH(74, 12822, 95, 417.6, 7375, 4.7, 10, false, new Item(12160), new Item(1115), new Item(12155), new Item(12183, 198)),
|
||||
|
||||
/**
|
||||
* Represents a steel titan pouch.
|
||||
*/
|
||||
STEEL_TITAN_POUCH(76, 12790, 99, 435.2, 7343, 4.9, 10, new Item(12160), new Item(1119), new Item(12155), new Item(12183, 178)),
|
||||
STEEL_TITAN_POUCH(76, 12790, 99, 435.2, 7343, 4.9, 10, false, new Item(12160), new Item(1119), new Item(12155), new Item(12183, 178)),
|
||||
|
||||
SACRED_CLAY_POUCH_1(-1, 14422, 1, 0, 8240, 0, 1, new Item(14182)),
|
||||
SACRED_CLAY_POUCH_2(-1, 14424, 20, 0, 8242, 0, 3, new Item(14184)),
|
||||
SACRED_CLAY_POUCH_3(-1, 14426, 40, 0, 8244, 0, 5, new Item(14186)),
|
||||
SACRED_CLAY_POUCH_4(-1, 14428, 60, 0, 8246, 0, 7, new Item(14188)),
|
||||
SACRED_CLAY_POUCH_5(-1, 14430, 80, 0, 8248, 0, 9, new Item(14190));
|
||||
SACRED_CLAY_POUCH_1(-1, 14422, 1, 0, 8240, 0, 1, false, new Item(14182)),
|
||||
SACRED_CLAY_POUCH_2(-1, 14424, 20, 0, 8242, 0, 3, false, new Item(14184)),
|
||||
SACRED_CLAY_POUCH_3(-1, 14426, 40, 0, 8244, 0, 5, false, new Item(14186)),
|
||||
SACRED_CLAY_POUCH_4(-1, 14428, 60, 0, 8246, 0, 7, false, new Item(14188)),
|
||||
SACRED_CLAY_POUCH_5(-1, 14430, 80, 0, 8248, 0, 9, false, new Item(14190));
|
||||
|
||||
/**
|
||||
* The mapping.
|
||||
|
|
@ -466,6 +466,11 @@ public enum SummoningPouch {
|
|||
*/
|
||||
private final int summonCost;
|
||||
|
||||
/**
|
||||
* Is the familiar peaceful
|
||||
*/
|
||||
private final boolean peaceful;
|
||||
|
||||
/**
|
||||
* The items required to create this pouch.
|
||||
*/
|
||||
|
|
@ -481,9 +486,10 @@ public enum SummoningPouch {
|
|||
* @param npcId The familiar's NPC id.
|
||||
* @param summonExperience The experience gained when summoning.
|
||||
* @param summonCost The amount of summoning points to drain when summoned.
|
||||
* @param peaceful Determines whether the familiar is peaceful and should attack.
|
||||
* @param items The items required to create this pouch.
|
||||
*/
|
||||
private SummoningPouch(int slot, int pouchId, int levelRequired, double createExperience, int npcId, double summonExperience, int summonCost, Item... items) {
|
||||
private SummoningPouch(int slot, int pouchId, int levelRequired, double createExperience, int npcId, double summonExperience, int summonCost, boolean peaceful, Item... items) {
|
||||
this.slot = slot;
|
||||
this.pouchId = pouchId;
|
||||
this.levelRequired = levelRequired;
|
||||
|
|
@ -491,11 +497,12 @@ public enum SummoningPouch {
|
|||
this.npcId = npcId;
|
||||
this.summonExperience = summonExperience;
|
||||
this.summonCost = summonCost;
|
||||
this.peaceful = peaceful;
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
private SummoningPouch(int slot, boolean abyssal, int pouchId, int levelRequired, double createExperience, int npcId, double summonExperience, int summonCost, Item... items) {
|
||||
this(slot, pouchId, levelRequired, createExperience, npcId, summonExperience, summonCost, items);
|
||||
private SummoningPouch(int slot, boolean abyssal, int pouchId, int levelRequired, double createExperience, int npcId, double summonExperience, int summonCost, boolean peaceful, Item... items) {
|
||||
this(slot, pouchId, levelRequired, createExperience, npcId, summonExperience, summonCost, peaceful, items);
|
||||
this.abyssal = abyssal;
|
||||
}
|
||||
/**
|
||||
|
|
@ -556,6 +563,11 @@ public enum SummoningPouch {
|
|||
return summonCost;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether the familiar is peaceful
|
||||
*/
|
||||
public boolean getPeaceful() { return peaceful; }
|
||||
|
||||
/**
|
||||
* @return the items
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import rs09.game.node.entity.combat.CombatPulse;
|
|||
import rs09.game.node.entity.combat.CombatSwingHandler;
|
||||
import rs09.game.system.SystemLogger;
|
||||
import rs09.game.world.GameWorld;
|
||||
import core.game.node.entity.skill.summoning.SummoningPouch;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -87,6 +88,8 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
*/
|
||||
private final int specialCost;
|
||||
|
||||
private final SummoningPouch pouch;
|
||||
|
||||
/**
|
||||
* The combat reward.
|
||||
*/
|
||||
|
|
@ -112,7 +115,7 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
*/
|
||||
private final int attackStyle;
|
||||
|
||||
private boolean firstCall = true;
|
||||
private boolean firstCall = true;
|
||||
|
||||
/**
|
||||
* Constructs a new {@code Familiar} {@code Object}.
|
||||
|
|
@ -129,6 +132,7 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
this.maximumTicks = ticks;
|
||||
this.ticks = ticks;
|
||||
this.pouchId = pouchId;
|
||||
this.pouch = SummoningPouch.get(pouchId);
|
||||
this.specialCost = specialCost;
|
||||
this.combatFamiliar = NPCDefinition.forId(getOriginalId() + 1).getName().equals(getName());
|
||||
this.attackStyle = attackStyle;
|
||||
|
|
@ -184,20 +188,20 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
}
|
||||
sendTimeRemaining();
|
||||
switch (ticks) {
|
||||
case 100:
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>You have 1 minute before your familiar vanishes.");
|
||||
break;
|
||||
case 50:
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>You have 30 seconds before your familiar vanishes.");
|
||||
break;
|
||||
case 0:
|
||||
if (isBurdenBeast() && !((BurdenBeast) this).getContainer().isEmpty()) {
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>Your familiar has dropped all the items it was holding.");
|
||||
} else {
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>Your familiar has vanished.");
|
||||
}
|
||||
dismiss();
|
||||
return;
|
||||
case 100:
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>You have 1 minute before your familiar vanishes.");
|
||||
break;
|
||||
case 50:
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>You have 30 seconds before your familiar vanishes.");
|
||||
break;
|
||||
case 0:
|
||||
if (isBurdenBeast() && !((BurdenBeast) this).getContainer().isEmpty()) {
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>Your familiar has dropped all the items it was holding.");
|
||||
} else {
|
||||
owner.getPacketDispatch().sendMessage("<col=ff0000>Your familiar has vanished.");
|
||||
}
|
||||
dismiss();
|
||||
return;
|
||||
}
|
||||
CombatPulse combat = owner.getProperties().getCombatPulse();
|
||||
if (!isInvisible() && !getProperties().getCombatPulse().isAttacking() && (combat.isAttacking() || owner.inCombat())) {
|
||||
|
|
@ -205,7 +209,7 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
if (victim == null) {
|
||||
victim = owner.getAttribute("combat-attacker");
|
||||
}
|
||||
if (combat.getVictim() != this && victim != null && !victim.isInvisible() && getProperties().isMultiZone() && owner.getProperties().isMultiZone() && isCombatFamiliar() && !isBurdenBeast()) {
|
||||
if (combat.getVictim() != this && victim != null && !victim.isInvisible() && getProperties().isMultiZone() && owner.getProperties().isMultiZone() && isCombatFamiliar() && !isBurdenBeast() && !isPeacefulFamiliar()) {
|
||||
getProperties().getCombatPulse().attack(victim);
|
||||
}
|
||||
}
|
||||
|
|
@ -222,9 +226,9 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
@Override
|
||||
public boolean isAttackable(Entity entity, CombatStyle style, boolean message) {
|
||||
if (entity == owner) {
|
||||
if(message) {
|
||||
owner.getPacketDispatch().sendMessage("You can't just betray your own familiar like that!");
|
||||
}
|
||||
if(message) {
|
||||
owner.getPacketDispatch().sendMessage("You can't just betray your own familiar like that!");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (entity instanceof Player) {
|
||||
|
|
@ -234,29 +238,29 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
}
|
||||
if (!getProperties().isMultiZone()) {
|
||||
if (entity instanceof Player && !((Player) entity).getProperties().isMultiZone()) {
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("You have to be in multicombat to attack a player's familiar.");
|
||||
}
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("You have to be in multicombat to attack a player's familiar.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (entity instanceof Player) {
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("This familiar is not in the a multicombat zone.");
|
||||
}
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("This familiar is not in the a multicombat zone.");
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (entity instanceof Player) {
|
||||
if (!((Player) entity).getSkullManager().isWilderness()) {
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("You have to be in the wilderness to attack a player's familiar.");
|
||||
}
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("You have to be in the wilderness to attack a player's familiar.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (!owner.getSkullManager().isWilderness()) {
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("This familiar's owner is not in the wilderness.");
|
||||
}
|
||||
if(message) {
|
||||
((Player) entity).getPacketDispatch().sendMessage("This familiar's owner is not in the wilderness.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -321,20 +325,20 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
}
|
||||
}
|
||||
|
||||
public void refreshTimer() {
|
||||
ticks = maximumTicks;
|
||||
}
|
||||
public void refreshTimer() {
|
||||
ticks = maximumTicks;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the time remaining.
|
||||
*/
|
||||
private void sendTimeRemaining() {
|
||||
int minutes = ticks / 100;
|
||||
int centiminutes = ticks % 100;
|
||||
owner.varpManager.get(1176)
|
||||
.setVarbit(7, minutes)
|
||||
.setVarbit(6, centiminutes > 49 ? 1 : 0)
|
||||
.send(owner);
|
||||
int centiminutes = ticks % 100;
|
||||
owner.varpManager.get(1176)
|
||||
.setVarbit(7, minutes)
|
||||
.setVarbit(6, centiminutes > 49 ? 1 : 0)
|
||||
.send(owner);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -365,7 +369,7 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
if (specialMove(special)) {
|
||||
setAttribute("special-delay", GameWorld.getTicks() + 3);
|
||||
owner.getInventory().remove(new Item(scroll.getItemId()));
|
||||
owner.getAudioManager().send(4161);
|
||||
owner.getAudioManager().send(4161);
|
||||
visualizeSpecialMove();
|
||||
updateSpecialPoints(specialCost);
|
||||
owner.getSkills().addExperience(Skills.SUMMONING, scroll.getExperience(), true);
|
||||
|
|
@ -691,6 +695,10 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
|
|||
return false;
|
||||
}
|
||||
|
||||
public boolean isPeacefulFamiliar() {
|
||||
return pouch.getPeaceful();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the NPC ids.
|
||||
* @return The npc ids.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue