cassidy/project-meteor-server
1
0 Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
740 Commits 4 Branches 2 Tags
68a2d5f0b923054048750b9dfff339ce6d3792d4
Commit Graph
94 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tahir Akhlaq 517bdc0638 fixed cast interrupt 
- dont allow targeting of mob moving back to spawn
 2017-08-30 00:14:14 +01: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
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
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
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
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
Tahir Akhlaq 7ab40a30f1 stubbed some more functions 2017-07-11 20:49:38 +01: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
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
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
Tahir Akhlaq 2c9ae60bbf corrected mob to use correct substate 
- added global tick
- stubbed some more functions
- added checks for engaged/dead
- todo: everything else
 2017-06-29 19:14:05 +01:00
Tahir Akhlaq b9bfe5e985 cleaned up some of my retard with deltaTime and changed to DateTime for convenience swapping between seconds/milliseconds 2017-06-29 19:14:05 +01:00
Tahir Akhlaq 3bcaa4cc3e added some more ai stubs 
- created mob class
- added pathfind and targetfind helper classes (todo: actually add stuff to them)
- added action queue helper class (todo: add shit to it)
 2017-06-29 19:14:05 +01:00
Tahir Akhlaq 04890660c0 start of ai based on kjLotus's code on dsp 2017-06-29 19:14:04 +01:00
Tahir Akhlaq c70cf022b7 moved vector3 to common 
- changed distance checks to distance squared
- reexported central thanalan navmesh with cell size 0.60, height 0.26, radius 0.5, edge error 1.3, merged region size 30
- todo: main logic loop per zone and move this into proper ai classes
 2017-06-29 19:14:03 +01:00
Tahir Akhlaq 872e56f8f9 navmeshes now super lightweight (<3 u devi) 
- refactored some stuff
- unhardcoded navmesh loading
- included sharpnav license
 2017-06-29 19:14:03 +01:00
Tahir Akhlaq b640c87c69 fixed player position updates i think 2017-06-29 19:14:02 +01:00
Tahir Akhlaq dd552ba69d adjusted roam radius slightly 2017-06-29 19:14:02 +01:00
Tahir Akhlaq e09cb197b3 fixed finding random point retardation 2017-06-29 19:14:02 +01:00
Tahir Akhlaq a62475e81e moved pathing crap out of actor 
- despawn actors on moving too far from spawn
- added clampy stuff (<3 devi)
 2017-06-29 19:14:01 +01:00
Tahir Akhlaq bd97e72774 slightly smaller spawn leash 
- removed try catch block
- todo: despawn actors on moving out of range
 2017-06-29 18:45:43 +01:00
Tahir Akhlaq 4ad37f1011 fixed LookAt and IsFacing (<3 u devi) 2017-06-29 18:45:42 +01:00
Tahir Akhlaq d72a2af641 initial navmesh stuff 2017-06-29 18:45:39 +01:00
Tahir Akhlaq 4e8ce558a7 Merged in takhlaq/ffxiv-classic-server/develop (pull request #44) 
fixed some races
 2017-06-06 16:42:14 +00:00
Tahir Akhlaq 72099e92bb fixed some races 2017-06-06 02:11:45 +01:00
Tahir Akhlaq 6dd8bdda0c Merged in takhlaq/ffxiv-classic-server/null (pull request #38) 
added db launch args and improved import time on gamedata_actor_class.sql
 2017-03-27 16:57:02 +00:00
Tahir Akhlaq a2a30003e0 added db launch args and improved import time on gamedata_actor_class.sql 2017-03-25 04:36:19 +00:00
Tahir Akhlaq ca44400048 cleaned up some spacing 2016-12-05 14:36:40 +00:00
Tahir Akhlaq a2d4879cdd Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ezpz 
# Conflicts:
#	sql/characters.sql
 2016-12-05 14:29:19 +00:00
Tahir Akhlaq 4a320d7096 added launch args for ip/port and default config loading 
- fixed char create issues by adding default values to fields (todo: fix actual query)
- added post build command to copy scripts folder to bin
 2016-12-05 14:26:20 +00:00
Tahir Akhlaq 92be59d020 fixed linux build and import script 2016-08-27 03:50:02 +01:00
Tahir Akhlaq 8665c1a226 improved import times on a few tables 2016-08-14 15:49:32 +01:00
Tahir Akhlaq 2233f48719 note to self: read both files before merging 2016-08-03 16:54:23 +01:00
Tahir Akhlaq 065fe05795 fixed import script, improved db import times, fixed logging and warp command (should be 5000% legit now) 
- improved import times for gamedata tables (there's prolly other innodb tables too, i didnt check though)
- fixed issue where player wouldnt be readded to zone on warping if destination wasnt valid
- corrected typo in warp command lua description
- added logger for lua cause i forgot to last time
 2016-07-27 17:23:52 +01:00
Tahir Akhlaq 59f3cfa2f1 derped with some debug logging (thought i pushed this earlier) 2016-07-17 11:34:37 +01:00
Tahir Akhlaq 8839e75557 missed some left over files 2016-06-24 22:14:17 +01:00
Tahir Akhlaq 5fc0e0eeca Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands 
# Conflicts:
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	data/scripts/global.lua
 2016-06-24 22:13:17 +01:00
Tahir Akhlaq 30b0d4a97d implemented sendpacket and speed commands 
- fixed data race on logging in
- todo: implement reloadzones, reloaditems, property, property2
 2016-06-24 20:52:30 +01:00
Tahir Akhlaq bb02f94d38 changed date formatting for logging 2016-06-22 02:31:05 +01:00
Tahir Akhlaq 0aac675b30 cleaned up previous commit 2016-06-21 21:47:07 +01:00
Tahir Akhlaq 37d91480f9 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands 
# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
#	FFXIVClassic Lobby Server/Program.cs
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/Program.cs
#	FFXIVClassic Map Server/actors/Actor.cs
 2016-06-18 05:59:42 +01:00
Tahir Akhlaq 1ad2b5d7d0 more work on commands 
- moved script object to wrapper class to catch and log exceptions
- added loggers for basepacket/subpacket (todo: colour and use them in NLog.config)
- finished up most commands (todo: !property and !property2)
- todo: create and use mysql wrapper class to log exceptions
 2016-06-18 05:42:14 +01:00
Tahir Akhlaq 57b9d5ab99 start of work moving commands to lua 2016-06-17 02:44:57 +01:00
Tahir Akhlaq ac01224769 fixed derps causing client/server crashes 2016-06-16 03:49:58 +01:00
Tahir Akhlaq 1159c75ab8 moved stray console.writeline to use main logger 2016-06-15 19:15:24 +01:00
Tahir Akhlaq c413006a91 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing 
# Conflicts:
#	data/scripts/base/chara/npc/object/TaskBoard.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua
#	data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua
#	data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua
 2016-06-15 04:41:15 +01:00
Tahir Akhlaq 2b81660dce accidentally mass replaced "target", fixed now 2016-06-15 04:27:25 +01:00
Tahir Akhlaq 884a26dc52 fixed method casing in lua 2016-06-15 03:41:23 +01:00
Tahir Akhlaq ba13d5798d derp 2016-06-15 00:08:05 +01:00
Tahir Akhlaq b633126568 fixed import script 2016-06-15 00:04:15 +01:00
Tahir Akhlaq 335a59204c Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing 
# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
 2016-06-14 22:54:02 +01:00
Tahir Akhlaq 24f55139dd mass replaced all methods to pascal case 2016-06-14 21:29:10 +01:00
Tahir Akhlaq ed0a0a58f7 added nlog logging (todo: custom logger for packets) 2016-06-14 19:06:55 +01:00
Tahir Akhlaq c5516511b0 cleaned up logging, added log_level param to enable/disable types of logging 2016-06-14 03:00:57 +01:00
Tahir Akhlaq c23f9c7ca9 PROJECT: added common library to make common files actually common 
- renamed sln to FFXIVClassic.sln
- threaded logging
- todo: print packets using Log.Packet
 2016-06-12 20:12:59 +01:00
Tahir Akhlaq 8b93abe86e servers now log (almost) everything to file 
- regex'd in mysqlexception logging
- servers can now specify server_port, log_path, log_file
- added scripts to import/export all tables (exporting will export a handful of garbage table names, open and check for structure before deleting)
- fixed packet logging (thanks deviltti)
 2016-06-09 19:48:06 +01:00
Tahir Akhlaq d486650143 fixed character create errors 
import individual tables instead of one large sql file
 2016-06-07 22:58:17 +01:00