Commit Graph

2345 Commits

Author SHA1 Message Date
FatBoy 1be669aa66 Merge branch 'bugfix-runesandbooties' into new-booty-system
# Conflicts:
#	src/engine/objects/MobBase.java
2023-04-06 20:08:29 -05:00
FatBoy 95352e778d place holder 2023-04-06 20:07:24 -05:00
MagicBot 88bf38b858 Mobbase updated with new booty and fsm fields. 2023-04-06 20:58:13 -04:00
FatBoy 16fb40e104 Merge remote-tracking branch 'origin/magicbox1.5' into new-booty-system 2023-04-06 19:41:19 -05:00
MagicBot d0279599f6 BootySets expanded to handle rune booty. 2023-04-06 18:08:01 -04:00
FatBoy bfb6b0f5eb ./info now shows building information not just region 2023-04-06 09:44:34 -05:00
FatBoy 3f8d772f8f treb troubleshooting 2023-04-05 20:29:34 -05:00
FatBoy 07e993b0ba NPC and mob regions for real this time 2023-04-05 20:06:28 -05:00
FatBoy 1169f44041 NPC and mob regions 2023-04-05 20:04:04 -05:00
MagicBot 563fe8684a Workaround for mob region issue. 2023-04-05 20:20:23 -04:00
MagicBot a85391e5a4 Workaround for mob region issue. 2023-04-05 19:49:20 -04:00
MagicBot fc6f400e09 Corner trebs go into slot 1. 2023-04-05 18:32:03 -04:00
MagicBot 55fc6a68e1 Corner trebs go into slot 1. 2023-04-05 18:06:50 -04:00
MagicBot e1811c7bfc Corner trebs go into slot 1. 2023-04-05 17:41:11 -04:00
MagicBot bccbb1d8b7 Mobs are not hirelings but minions in this context. 2023-04-05 17:06:08 -04:00
MagicBot 2b214f8934 Bugfix in string output. 2023-04-04 18:14:54 -04:00
MagicBot 6a5f0596e0 Unused variable removed. 2023-04-04 18:11:07 -04:00
MagicBot 8f87bc5ca0 Bugfix in info dealing with mob flags on npcs. 2023-04-04 18:06:32 -04:00
MagicBot a0e63cde8f Bugfix in info dealing with mob flags on npcs. 2023-04-04 17:52:26 -04:00
MagicBot 94e3a594ec Mobbases can have empty mobflag values. 2023-04-04 17:38:52 -04:00
MagicBot bbf0709643 Mobbases can have empty mobflag values. 2023-04-04 17:30:56 -04:00
MagicBot 4492a93df4 Clarity in naming. 2023-04-04 16:26:47 -04:00
MagicBot 65e7566d0f More slotting work. 2023-04-04 15:36:56 -04:00
MagicBot 1c496b3c98 More slotting work. 2023-04-04 15:13:18 -04:00
MagicBot ee115a473d Exclude not include noId npc's. 2023-04-04 14:57:07 -04:00
MagicBot 5a4559d7b2 ContractID for captain is 850 not 650. 2023-04-04 14:47:23 -04:00
MagicBot 3b69c8c267 Tower captains don't use slot 1. 2023-04-04 14:41:01 -04:00
MagicBot 14c4443f20 loadID is needed; different mob. 2023-04-04 13:56:34 -04:00
MagicBot a01a342fd8 Affirmatively check hireling entry instead of relying upon loadID =0 which was a side effect. 2023-04-04 13:48:56 -04:00
MagicBot 1cb103c156 Slots are slots; blueprint logic not needed on back-end. 2023-04-04 11:08:07 -04:00
MagicBot 84bae3141c Slots are slots; blueprint logic not needed on back-end. 2023-04-04 10:48:17 -04:00
MagicBot 307f52866d Merge remote-tracking branch 'origin/bugfix-runesandbooties' into magicbox1.5 2023-04-04 10:33:18 -04:00
MagicBot 7ef338be1d Bugfix in slotting blueprint buildings 2023-04-04 10:31:59 -04:00
MagicBot 385b89e6ba Two layered continent support. 2023-04-03 15:56:36 -04:00
MagicBot 41a53d1205 Merge remote-tracking branch 'origin/bugfix-runesandbooties' into magicbox1.5 2023-04-03 12:30:49 -04:00
MagicBot a85bbde9d2 Mobbase runes no longer needed. 2023-04-03 06:27:29 -04:00
FatBoy 13d83c0003 NPC guards no longer attack players 2023-04-02 15:51:39 -05:00
MagicBot f21e51f74a Optimized imports (getting close to release) 2023-03-31 10:08:44 -04:00
MagicBot 045840ec54 Last vestige of FidalityID garbage and raw cache files removed. 2023-03-31 10:05:13 -04:00
MagicBot 4e1455be7f Hunt for more fidality insanity. 2023-03-31 10:01:59 -04:00
MagicBot 3881c2b1d0 Relevant methods made static and moved into NPCManager 2023-03-31 09:59:49 -04:00
MagicBot bbdbead1ff Fidaltiy garbage removed from NPC class. 2023-03-31 09:17:15 -04:00
MagicBot 24b6820a1b Fidaltiy garbage removed from NPC class. 2023-03-31 09:15:52 -04:00
MagicBot 2b307daeb2 MobileBooty system integrated. 2023-03-31 09:09:57 -04:00
MagicBot fb15ee912b Clarity fix in instance variable ordering. 2023-03-31 08:01:14 -04:00
MagicBot 3b7c516975 Merge remote-tracking branch 'origin/post-wipe-merge' into bugfix-runesandbooties 2023-03-30 20:56:42 -04:00
FatBoy 33603958b1 fixed hotzone drop tables never being used 2023-03-30 19:44:44 -05:00
MagicBot f669be18b3 Unused MobRaceType enum removed. 2023-03-30 11:51:59 -04:00
MagicBot dcae131b67 Removed Fidality garbage. Fixed mobs in buildings. 2023-03-30 11:07:57 -04:00
MagicBot f5d5dce791 Revert "Fidality borking mobs in buildings unborked."
This reverts commit 2befa063ef.
2023-03-30 10:34:15 -04:00