cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
844 Commits 4 Branches 2 Tags 22 MiB
1e4a1cf263
Commit Graph

578 Commits

Author SHA1 Message Date
Tahir Akhlaq
ba8184db89 attempt to add tutorial fight 
- added tempvars which are reset on spawning/zoning
 2017-09-16 02:50:32 +01:00
Tahir Akhlaq
da621dfc0e added pool/spawn/genus mod loading 
- moved ai helper classes to own folder
 2017-09-12 01:24:02 +01:00
Tahir Akhlaq
ce5030acd1 added mob name colour update 
- added mobmods (need to be loaded from db)
- added Zone.GetBattleNpcById
- added missing IsValidTarget check in AttackState
 2017-09-10 03:44:12 +01:00
Filip Maj
a309e651da Fixed issues Jorge found. 2017-09-09 16:30:29 -04:00
Filip Maj
b092d447cc Retainer name was not set. 2017-09-09 14:28:02 -04:00
Filip Maj
64006d2351 Added retainer inventory code. Renamed CURRENCY inv type to CURRENCY_CRYSTALS so I don't forget. 2017-09-09 14:11:35 -04:00
Filip Maj
52c707d66e More cleanup. 2017-09-09 12:42:00 -04:00
Filip Maj
9174801fdb Moved all DB update code into it's own method. 2017-09-09 12:37:24 -04:00
Filip Maj
8755ca4f33 Fixed a bunch of SQL errors. Added checks for quality so a remove command didn't take out items regardless of quality. Fixed errors. 2017-09-09 12:21:37 -04:00
Filip Maj
a14e36fadc Bad old SQL line was adding exponentially increasing duplicates. 2017-09-09 11:33:23 -04:00
Filip Maj
bc95c139de Implement DB updates for player. Cleaned up DB calls. No longer track slot, it's ordered by index id (no concept of slots anyway in client). 2017-09-09 11:25:58 -04:00
Filip Maj
76f073d85f Got retainer meeting group working and cleaned up retainer instancing. Added a RemoveItemAtSlot with quantity. 2017-09-09 10:54:40 -04:00
yogurt
9077c60b96 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #4) 
Minor changes to fix equipability bugs
 2017-09-08 14:22:41 +00:00
Tahir Akhlaq
645a1fb4fb fixed mob loading from db 
- todo: see todos in code (all 169 of them)
 2017-09-07 22:02:02 +01:00
Tahir Akhlaq
7c30b95c4b added some breakpoints to try figure out why mobs arent spawning 
- fixed spawn table
 2017-09-06 00:28:49 +01:00
Tahir Akhlaq
2bfaf376ef moved battlenpc loading to db (still doesnt load for some reason) 2017-09-05 23:32:57 +01:00
Tahir Akhlaq
68a2d5f0b9 stubbed item use state (needs to actually look up the item and get its reuse stuff) 
- added tables to load mobs from (probably dont import besides server_battlenpc_genus.sql)
- added field to server_battle_commands for commands usable by both monsters and players (probably arent any really)
 2017-09-05 21:03:38 +01:00
Filip Maj
5bec522c8e Fixed bugs in the new inventory code. 2017-09-05 15:35:33 -04:00
Filip Maj
81d82cd7a8 Rewrote the inventory code, splitting the packet updates from the list updates. 2017-09-05 14:44:06 -04:00
Filip Maj
f437b36f5a Started implementing retainers. Added a instanced retainer spawn. Documented retainer scripts. 2017-09-05 12:37:23 -04:00
Filip Maj
b5054debea Added first set of item search packets. 2017-09-03 17:02:08 -04:00
yogurt
50b4f517f2 Fix FindFirstCommandSlotById to be able to find empty slots again 2017-09-03 11:18:35 -05:00
Tahir Akhlaq
4978813c27 fixed death/despawning kinda (need to figure out why hp wont tick down after respawning) 2017-09-03 01:01:19 +01:00
Tahir Akhlaq
c5cc7c2f00 fixed auto attack messing up cast anim 
- fixed auto attack anim for mobs (<3 u ion)
- added hotbar timer updates (<3 u azia)
- fixed actor block bug
- cleaned up substate retardation
- fixed some targetfind issues
- added despawn state
- added messages for in progress commands
- added fields for aoe target, range, battleAnimation to server_battle_commands table
 2017-08-31 06:01:26 +01:00
Filip Maj
4c7928da78 Fixed screwed up cast animation. 2017-08-29 22:27:32 -04:00
Tahir Akhlaq
517bdc0638 fixed cast interrupt 
- dont allow targeting of mob moving back to spawn
 2017-08-30 00:14:14 +01:00
yogurt
c3fd8f917e Added UnequipAbility function, made EquipAbility work with zero indexed hotbar database, added new checks to EquipAbilityCommand.lua 2017-08-29 09:00:09 -05:00
Filip Maj
91afda04ca Added interrupt animation. 2017-08-29 00:52:57 -04:00
Filip Maj
e60da4f7b4 Wasn't actually sending packets. Changed casting animation back and moved castbar removal to cleanup. 2017-08-29 00:38:07 -04:00
Filip Maj
67485eafc0 Fixed infinite loop with DoBattleAction. Added some casting logic. 2017-08-29 00:33:23 -04:00
Filip Maj
d81832f256 Cleaned up hotbar database stuff (slot starts at 0 now!) and fixed a few bugs in the state system. 2017-08-28 23:21:21 -04:00
Filip Maj
7ad40f625a Refactored Demo's battle action code and cleaned things up. 2017-08-28 21:45:01 -04:00
Filip Maj
71d5bbc9ff Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-08-28 20:26:27 -04:00
Filip Maj
37b8203dae Rewrote the BattleActionPacket classes to standardize them. Added a method in Character.cs to fire off BattleActions. 2017-08-28 20:26:21 -04:00
Tahir Akhlaq
f4016e1a12 renamed tables for consistency 
- added magic.lua (todo: enumerate modifiers and stuff)
- moved aggro handling to session position update
- some cleanup
 2017-08-29 01:15:12 +01:00
Tahir Akhlaq
6c74222b68 renamed ability to battlecommand 
- moved spells to scripts/commands/
- added aoe range field to battle_commands.sql
- changed AttackState to use character's onAttack
 2017-08-28 05:20:00 +01:00
Filip Maj
e5a9658b5a Added Parley code to experiment with. 2017-08-26 16:59:15 -04:00
Tahir Akhlaq
6f5a480cbd Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai 
# Conflicts:
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
 2017-08-26 20:17:16 +01:00
Filip Maj
ce2d22d984 Added sellprice assignment to ItemData.cs. Forgot it! 2017-08-26 14:24:39 -04:00
Filip Maj
52da0a671f Updated method names of "RemoveItem" as Lua hates overloads. 2017-08-26 14:21:54 -04:00
Filip Maj
afe79e6c5f Set version number to v0.1. 2017-08-26 14:00:40 -04:00
Joseph Mikel Keller
d757ad39fc Merged in dude22072/ffxiv-classic-server-1/develop (pull request #47) 
Fixed the "pretty borders" inconsistency.

Approved-by: Tahir Akhlaq <xdemolish@hotmail.com>
 2017-08-26 17:59:14 +00:00
Filip Maj
74ce5a2fe1 Merge branch 'master' into develop 
# Conflicts:
#	FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/PacketProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaPlayer.cs
#	data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua
#	data/scripts/commands/gm/speed.lua
#	data/scripts/commands/gm/warp.lua
#	data/scripts/global.lua
#	data/scripts/player.lua
#	data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua
#	sql/server_zones_spawnlocations.sql
 2017-08-26 13:53:23 -04:00
Tahir Akhlaq
922f3ccd1e Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai 
# Conflicts:
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
 2017-08-26 18:04:31 +01:00
Tahir Akhlaq
c070f5b80e added ion's and showmo's enums 
- added nullable DateTime param to UnixTimeStampUTC
 2017-08-26 17:46:45 +01:00
Filip Maj
ff93dc41ef Added casting bar functions. 2017-08-26 12:33:37 -04:00
Filip Maj
546908acde Some fixes and missing scripts. 2017-08-26 10:23:13 -04:00
Tahir Akhlaq
1ae15df64c add ion's fix for BattleActionX10Packet crashing client 
- add blizzara spell lua
 2017-08-26 06:47:07 +01:00
Tahir Akhlaq
9024f3fad6 cleaned up magicstate and weaponskillstate 
- todo: fix IsFacing
- added thunder spell (todo: figure out why battleactionx10 crashes client on sending shit)
 2017-08-26 04:08:26 +01:00
Tahir Akhlaq
452f1cc8c0 fixed some paths in project 2017-08-25 05:12:10 +01:00
Tahir Akhlaq
11bbb023d9 abilities now use correct animation id (<3 azia) 
- did stuff with magicstate/attackstate
- fixed status effect tick
- added regen status (todo: actually populate the table and use that name instead of enum's)
- added baseStats to char (todo: add bonuses and stuff on top of those, set charaWork values to the calculated ones + bonus)
 2017-08-25 03:52:43 +01:00
Tahir Akhlaq
88abd59ec3 fixed auto attacking self/npcs 2017-08-24 16:36:56 +01:00
Tahir Akhlaq
5e2487c8cc missed a file from previous commit 2017-08-24 05:36:12 +01:00
Tahir Akhlaq
9bb298b2f3 added modifier class 
- added auto attack animation (<3 showmoltti)
- added thing to send battle packet from lua
 2017-08-24 05:12:30 +01:00
Tahir Akhlaq
cbbfa4ed95 fixed mobs not pathing 
- fixed roaming (todo: should probably move to attackstate too or something)
 2017-08-23 19:31:03 +01:00
Tahir Akhlaq
54af893570 add some more locks, fixed typo in AddHP, add missing ability 2017-08-23 03:22:17 +01:00
yogurt
35f9251056 Split update hotbar function into seperate command and recast functions, fixed recast packet spam, recast timers now reset when commands are added to the hotbar and when changing classes, and are now saved in the databse correctly and sent on login. Merged demo's changes. 2017-08-22 14:50:53 -05:00
Tahir Akhlaq
86bf0eec81 filled out abilities table (todo: range needs correcting) 
- changed target find stuff to use windower's (need to check it actually works..)
 2017-08-22 19:57:52 +01:00
Tahir Akhlaq
ebd295bfa4 add abilities table 2017-08-21 03:37:35 +01:00
Tahir Akhlaq
a89fc64555 fix crash in gm command thing, commit stupid shit i havent figured out yet 2017-08-21 00:40:41 +01:00
Tahir Akhlaq
1856cc0634 (badly) ported dsp's pathfind code 
- added distance for vectors
- todo: why does it go retard
 2017-08-16 17:25:32 +01:00
Tahir Akhlaq
68657e1edc stubbed some more states 
- stubbed some ability stuff
- moved packet things to loop instead of session only
- added mob roaming and aggro
- todo: fix target find/detection/pathfinding speed/line of sight/line aoe length etc
- todo: see "// todo:" in code
 2017-08-02 23:09:04 +01:00
Tahir Akhlaq
c7b87c0d89 effect timers now display (<3 ion) 
- added source/target to effects
- todo: send battle packet crap
 2017-07-27 22:19:20 +01:00
Tahir Akhlaq
8bebba64b3 fixed some timers 
- status icons now display (<3 u ion)
- todo: populate status tables, figure out why effect wont tick down for me
 2017-07-27 03:58:42 +01:00
Tahir Akhlaq
ddad27a5f9 fixed high cpu usage caused by spawning stupid amounts of script objects each tick 2017-07-18 04:54:05 +01:00
Tahir Akhlaq
53207a9ff0 added status effect saving 
- added some of the packets to add/remove effects (todo: battle packet too)
 2017-07-18 00:55:03 +01:00
Tahir Akhlaq
d9d185d7e6 added status effect loading 
- todo: populate table (and test this doesnt break everything ever), send charawork and message packets
 2017-07-15 22:11:22 +01:00
Tahir Akhlaq
13af16ec0e Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai 
shitty line ending conflicts
# Conflicts:
#	FFXIVClassic Map Server/lua/LuaEngine.cs
 2017-07-12 18:48:44 +01:00
Tahir Akhlaq
f4687942af stubbed some more stuff, forgot to pass args to function 2017-07-12 18:46:39 +01:00
Tahir Akhlaq
7c08420206 Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai 2017-07-11 20:52:43 +01:00
yogurt
3734f22fc2 Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #1) 
equip ability functions
 2017-07-11 19:52:04 +00:00
Tahir Akhlaq
7ab40a30f1 stubbed some more functions 2017-07-11 20:49:38 +01:00
yogurt
4032258e76 More merge fixes! 2017-07-11 11:52:54 -05:00
yogurt
4dee26e136 Fixing more merge errors. I'm bad at this 2017-07-11 09:50:54 -05:00
yogurt
86a2e4aff3 Fixing merge error 2017-07-11 09:45:11 -05:00
yogurt
b2e86d282a Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-07-11 09:40:10 -05:00
yogurt
efdec5e472 Add equip ability functions 
Fix EquipAbility SQL query
 2017-07-11 09:08:50 -05:00
Tahir Akhlaq
84d5eee1fc cleaned targetfind some 
- added character allegiance types
 2017-07-11 01:54:15 +01:00
Tahir Akhlaq
59fab08230 added some more targetfind stuff to handle pets (needs testing) 2017-07-10 23:52:31 +01:00
Tahir Akhlaq
1637bba167 added target finding within box (thanks kjLotus!) 
- added function to return position as Vector3 to Actor (todo: maybe we should just use the class instead of 3 separate floats?)
- added function to return all actors in Area
- actually added documentation to TargetFind stuff (kill me pls)
- todo: actually test this..
 2017-07-10 02:31:37 +01:00
Filip Maj
69f7fb5e47 Ported over all the opening directors and improved the director code a bit more. Also implemented content instances for Grid/Uld. 2017-07-09 18:38:01 -04:00
Filip Maj
24c46c0480 Fixed issue where any actor < -1000 Z position would appear anyways. 2017-07-09 12:58:22 -04:00
Filip Maj
77d6cb2e43 Fixed up how "special" items work (ie: PUG and ARC weapons). No more glitches hopefully. 2017-07-09 11:39:17 -04:00
Tahir Akhlaq
4ed8f3e5e2 added a bit of targetfind stuff 2017-07-09 00:27:15 +01:00
Tahir Akhlaq
c55c0b327d forgot to fix this on conflict resolving 2017-07-08 04:53:06 +01:00
Tahir Akhlaq
4695193aa0 Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai 
# Conflicts:
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
 2017-07-08 04:10:36 +01:00
Tahir Akhlaq
247b5ca709 missed some files from previous commit 2017-07-08 00:20:55 +01:00
Tahir Akhlaq
d895357182 renamed mob stuff to battlenpc 
- stubbed spawn/die/despawn functions
 2017-07-07 22:08:48 +01:00
dude22072
5a5c0a3a5f Fixed the "pretty borders" inconsistency. 2017-07-06 22:30:03 -05:00
Filip Maj
caf254fd95 More old test code removed. 2017-07-06 22:11:14 -04:00
Filip Maj
151756329c Removed oooold test code. 2017-07-06 22:10:19 -04:00
Filip Maj
a77a90578f Merge branch 'packet_actortarget_rewrite' into guildleve 
# Conflicts:
#	FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs
 2017-07-06 22:02:14 -04:00
Filip Maj
5dff4cbdd3 Fixed bug with Broadcast Packet. Was adding player to the instance list while it shouldn't have been, and designed BroadcastPacket assuming so. Cleaned it all up and fixed, so now emote work after warp. Fixed Chocobo packets so correct appearance will show when player is spawned while riding gobbue. 2017-07-06 21:59:12 -04:00
Tahir Akhlaq
cc1929a9fb moved getpath crap to pathfinding (or should i keep it in actor?) 
- stubbed some more crap
 2017-07-02 20:01:24 +01:00
Tahir Akhlaq
100f3ae156 fixed an issue causing client to crash 2017-07-01 02:52:05 +01:00
Tahir Akhlaq
e56238a10c fixed crash on updating controller for npcs 
- fixed updating player movement
 2017-06-30 04:30:36 +01:00
Tahir Akhlaq
62055eff04 stubbed some more functions from kj's ai stuff 
- fixed some typos
- cleaned some debug code
 2017-06-29 21:54:30 +01:00
Tahir Akhlaq
6b023ceb3c added a status effect container 
- added status effect container to mobs and player objects (maybe should add to all Characters?)
- todo: handle gain/tick/lose in lua, send packets, everything else
 2017-06-29 19:14:07 +01:00
Tahir Akhlaq
637f7f3d95 added status effect class 
- todo: load info into effects
- todo: create a container, call onGain/onLose/onTick for effects etc
 2017-06-29 19:14:06 +01:00
Tahir Akhlaq
c162fb0eab added super basic hate container class which doesnt actually do anything yet 2017-06-29 19:14:06 +01:00