More fun in Zombieland - character loading. #370
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Continued work loading character from ace_shard. Rebased * Added cascade delete to all child tables in ace_shard. * Completed and tested up to skillz loading. Made a few changes on the db side for key consistancy. * TODO items: * Finish up loading - spells, friends, allegiance info, spell comps, spell bars etc. etc....
|
Note for MariaDB Users: I had to upgrade past 10.2.0, to make the SQL work. As @ogmage78 pointed out, version 10.2.1 is now needed. Until 10.2.1: |
|
Just a note - we can removed stored if the upgrade requirement is too heavy a lift. |
Mogwai-TheFurry
suggested changes
Jun 8, 2017
Database/Base/ShardBase.sql
Outdated
| KEY `idx_landblock` (`landblock`), | ||
| KEY `idx_cell` (`cell`), | ||
| CONSTRAINT `fk_position_ao` FOREIGN KEY (`aceObjectId`) REFERENCES `ace_object` (`aceObjectId`) ON DELETE CASCADE | ||
| ) ENGINE=InnoDB AUTO_INCREMENT=43262 DEFAULT CHARSET=utf8; |
There was a problem hiding this comment.
AUTO_INCREMENT=43262 ???
There was a problem hiding this comment.
not sure how that got in there. I will fix
There was a problem hiding this comment.
I found out how that happened and I fixed it but it is a FYI note to anyone doing a schema export - it you have data - and any of your tables use auto_increment - then it takes the highest current pk value in your db as the seed. You either need to export schema from a empty db or remember to fix that. just FYI
| /*!50001 DROP VIEW IF EXISTS `vw_ace_character` */; | ||
| /*!50001 DROP TABLE IF EXISTS `vw_ace_character` */; | ||
|
|
||
| /*!50001 CREATE TABLE `vw_ace_character`( |
There was a problem hiding this comment.
comment shenanigans
There was a problem hiding this comment.
I contacted sqlyog support this is their response:
No, there is not.
"/*!40101 .. */;" will be treated like a comment by the server if server version is <4.0.1. If server version is > 4.0.1 the server ill treat it like an executable statement. It is simply necessary to use such 'version-dependent comments' unless the client is designed for a specific server version only (what SQLyog is not) and script generated is knon to be run only against a specific server version. You can check with 'mysqldump' or any official client by MySQL/Oracle/MariaDB and they do exactly the same.
You may refer MySQL documentation at https://dev.mysql.com/doc/refman/5.7/en/comments.html "If you add a version number after the ! character, the syntax within the comment is executed only if the MySQL version is greater than or equal to the specified version number"
There was a problem hiding this comment.
I understand it is syntactically correct. But it's functionally devastating to have a partial database. IT NEEDS TO ERROR.
| `qY` float , | ||
| `qZ` float | ||
| )*/; | ||
|
|
There was a problem hiding this comment.
is vw_ace_object still a thing? can it be removed? Same for many of the tables below.
Database/Base/ShardBase.sql
Outdated
| JOIN ace_object_properties_iid aopiidacc | ||
| ON ao.aceObjectId = aopiidacc.aceObjectId | ||
| AND aopiidacc.iidPropertyId = 9001 | ||
| /*!50001 CREATE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `vw_ace_character` AS select `ao`.`aceObjectId` AS `guid`,`aopiidacc`.`propertyValue` AS `accountId`,`aops`.`propertyValue` AS `NAME`,`aopb`.`propertyValue` AS `deleted`,`aopbi`.`propertyValue` AS `deleteTime`,`ao`.`weenieClassId` AS `weenieClassId`,`awc`.`weenieClassDescription` AS `weenieClassDescription`,`ao`.`aceObjectDescriptionFlags` AS `aceObjectDescriptionFlags`,`ao`.`physicsDescriptionFlag` AS `physicsDescriptionFlag`,`ao`.`weenieHeaderFlags` AS `weenieHeaderFlags`,`aopi`.`propertyValue` AS `itemType` from ((((((`ace_object` `ao` join `ace_weenie_class` `awc` on((`ao`.`weenieClassId` = `awc`.`weenieClassId`))) join `ace_object_properties_string` `aops` on(((`ao`.`aceObjectId` = `aops`.`aceObjectId`) and (`aops`.`strPropertyId` = 1)))) join `ace_object_properties_bool` `aopb` on(((`ao`.`aceObjectId` = `aopb`.`aceObjectId`) and (`aopb`.`boolPropertyId` = 9001)))) join `ace_object_properties_int` `aopi` on(((`ao`.`aceObjectId` = `aopi`.`aceObjectId`) and (`aopi`.`intPropertyId` = 1)))) join `ace_object_properties_bigint` `aopbi` on(((`ao`.`aceObjectId` = `aopbi`.`aceObjectId`) and (`aopbi`.`bigIntPropertyId` = 9001)))) join `ace_object_properties_iid` `aopiidacc` on(((`ao`.`aceObjectId` = `aopiidacc`.`aceObjectId`) and (`aopiidacc`.`iidPropertyId` = 9001)))) */; |
There was a problem hiding this comment.
it was so pretty before!
There was a problem hiding this comment.
yea - I had hand edited it and it was blowing up everyone for some reason. I can try again - let me know. I hate the way this generates - but the sqlyog guys say that is part of mysql. I think we are swimming upstream on this one....
| @@ -770,6 +773,13 @@ public void SetStringProperty(PropertyString propertyId, string value) | |||
|
|
|||
| public List<AceObjectPropertiesString> StringProperties { get; set; } = new List<AceObjectPropertiesString>(); | |||
|
|
|||
| public List<AceObjectPropertiesAttribute> AceObjectPropertiesAttributes { get; set; } = new List<AceObjectPropertiesAttribute>(); | |||
There was a problem hiding this comment.
If we're going to add these, we need the reconcile them with the CreatureAbility stuff. Please add a TODO comment for it.
Source/ACE.Entity/Position.cs
Outdated
| [DbTable("ace_position")] | ||
| [DbGetList("ace_position", 23, "aceObjectId")] | ||
| public class Position | ||
| public sealed class Position |
There was a problem hiding this comment.
i don't disagree, but why?
There was a problem hiding this comment.
mainly because refactor was barking at me as a suggestion. I forget the exact wording but something like virtual method called in constructor? I can put it back - it seems like a reasonable suggestion to me so I did it.
Source/ACE.Entity/Position.cs
Outdated
| set | ||
| { | ||
| landblockId = value; | ||
| } | ||
| } | ||
|
|
||
| [DbField("aceObjectid", (int)MySqlDbType.UInt32, Update = false, IsCriteria = true)] | ||
| public virtual uint AceObjectId { get; set; } | ||
| public uint AceObjectId { get; set; } |
There was a problem hiding this comment.
I'd prefer this to be nullable, because (logically speaking) a position can exist without a corresponding AceObject. A position is just a set of coordinates - this property is something we have to represent an optional relationship.
There was a problem hiding this comment.
yea - that is an oversight on my part. I know that needs to be nullable. I will fix.
| @@ -172,13 +172,13 @@ public Position(float northSouth, float eastWest) | |||
| uint baseX = (uint)(eastWest + 0x400); | |||
| uint baseY = (uint)(northSouth + 0x400); | |||
|
|
|||
| if (baseX < 0 || baseX >= 0x7F8 || baseY < 0 || baseY >= 0x7F8) | |||
| if (baseX >= 0x7F8 || baseY >= 0x7F8) | |||
| throw new Exception("Bad coordinates"); // TODO: Instead of throwing exception should we set to a default location? | |||
There was a problem hiding this comment.
I'm ok with the throw. It's a legit bug. Throw early and ugly. Quietly swallowing errors allows bugs to become sneaky.
There was a problem hiding this comment.
someone else's comment I think - I removed the checks for less than 0 as it always evaluated to false
Source/ACE.Entity/Position.cs
Outdated
| @@ -22,7 +22,7 @@ public LandblockId LandblockId | |||
| } | |||
|
|
|||
| [DbField("aceObjectid", (int)MySqlDbType.UInt32, Update = false, IsCriteria = true)] | |||
| public uint AceObjectId { get; set; } | |||
| public virtual uint AceObjectId { get; set; } | |||
There was a problem hiding this comment.
virtual doesn't make it nullable. "int?" does.
There was a problem hiding this comment.
I will add that next PR. Sorry missed it.
Mogwai-TheFurry
added a commit
that referenced
this pull request
Jun 16, 2017
* Object overhaul - clean up enums (#337) * Give property enums a static value to aviod positional fubar later on. Cleaned up using. * Cleaning up enums * Fixed Line ending update change log. * Review & Comment only || Object overhaul - POC (#339) * Give property enums a static value to aviod positional fubar later on. Cleaned up using. * Cleaning up enums * Fixed Line ending update change log. * Added new positionType * Started work on implementing object overhaul - want to make sure I am heading in the right direction. * Minor clean up, responded to feedback and fixed a few bugs. Thanks for the second and third set of eyes. * Object Overhaul - ready for review and merge. Still Work in Progress but a good spot. (#341) * Give property enums a static value to aviod positional fubar later on. Cleaned up using. * Cleaning up enums * Fixed Line ending update change log. * Added new positionType * Started work on implementing object overhaul - want to make sure I am heading in the right direction. * Minor clean up, responded to feedback and fixed a few bugs. Thanks for the second and third set of eyes. * Continued work. Please review as these are a LOT of manual changes. Compiles and you can log in. * Continued work. I have all of the items pulling from properties now. Still work to make baseAceObject and AceObject on thing / finish work around workmanship and actually kick the tires and start pulling data. Sorry this is taking so long. * Had time for a few more and cleaned up whitespace. * Good point to check in. All of the property tables are hooked up and loading data. I created the workmanship hackery we discussed. As always comments and suggestions much appreciated. * One quick shot to fix appveyor before bed. * * Continued work on Overhaul * Created mapping cross reference file to faciltate docuatation and cleaning up names - work in progress https://goo.gl/eaaNQb * Created new database schema for world_object - modified mysqlinstall.bat to refect new baseline * created script to ETL old schema to new schema. I have not included it as we will be refactoring the initial data load to use the new * schema according to Ripley. I have the script tested and posted on my dropbox if anyone wants it. I also have a complete data dump that * zips down to a manageable size. * BaseAceObject is now using the new schema * I re-hooked up telepoi to use the new schema. Still to do, convert to constructed statement * Next steps - refactor AceObject and make sure world objects load again. * Once that is complete - start same process using clone of this schema for character as discussed. * renabled more data loading. * Continued work on hooking data back up. Working on moveto debug command - this creates a world object. Not quite there yet. * WIP * Making progress. Test object able to be spwaned from new schema. Still to do, renable constructed statements, clean up and re-enable the other constructed statements. * updated worldbase * * Intital work done for new schema. Rebased and removed update sql files. (#353) * Tested and the auto setting of Physics and Weenie Header Flags looks really solid. Side note, the values we have * in the database for weenieHeaderFlags and PhysicsDescriptionFlag should probably be dropped we don't read them or use them now. * Doors, portals NPC's and signs are all back in the world now. * I would suggest we remearge with the main branch sooner rather than later - we can create another branch to introduce these * changes into the character side. * TODO items: * Creature spawns need to be refactored - I left them commented out. We need to ditch seperate tables that we have now, I think all * creature can use what we have now, plus maybe two additional world tables. Everything else fits into the current schema. * Test Ripley data and update ACE_World. * Refactor portals - I just left the old way in and faked it out with a view. * Once this looks good and stable and we fix any found bugs - we need to clone this over to the character database and start refactoring * That will get us to persisted inventory. * Objects - Game data refactored - issue with character login (#355) * wip * WIP - character login is trying to persist a world object * Still throwing an exception on player login. * Working Code - finished GameData - need to complete PhysicsData and ModelData. Thanks to @Lidefeath for finding my issue. * WIP compiles but has error on run. Data changes have broken something. Will fix tomorrow. * Wip - nothing really working yet. I can log in but item creation is not working. * Objects (#357) * wip * WIP - character login is trying to persist a world object * Still throwing an exception on player login. * Working Code - finished GameData - need to complete PhysicsData and ModelData. Thanks to @Lidefeath for finding my issue. * WIP compiles but has error on run. Data changes have broken something. Will fix tomorrow. * Wip - nothing really working yet. I can log in but item creation is not working. * Best attempt stabbed (#358) * wip 1 * wip 2 * wip 3 * wip 3 * i think thats it for now. good luck! * Read cached characters and launch to char list (#360) * First corrections and commenting out so the start to command line works * The basics for launching to character list is working. * Edit config.json for AppVeyor * Rework Base SQL scripts. (#361) Expect broken execution until views are corrected for ace_shard * Cleaning up error list (#362) Clearing stylecop issues and warnings in Error List * ACE Enum adjustments (#363) * More Enum Adjustments (#364) * More Enum Adjustments * Further Enum Refinement * Changed Enum Value * More Enum and Object Realignment (#365) * Adding Enums to better align with AC standards. GroupTypeChat and AccessLevel will be converted to these. * Object level changes to go with enum resorting * Extend ORM to allow aggregate functions i.e. MAX(column) and (#366) * Extend ORM to allow aggregate functions i.e. MAX(column) and implement GetNextCharacterId * For AppVeyor, thanks @ogmage78 for the sql * Implements IsCharacterNameAvailable and fixes some errors in the chargen code. (#367) * Character Loading (#368) * Cleaned up some whitespace issues. Still understanding the direction. * WIP added enums for PropertyAttribute * Wip got a lot of aceCharacter done - working on position - about 1/2 done. * WIP - Ace Character Loading. * Intital work done for loading character from ace_shard. Rebased and removed update sql files. * Tested up to position loading. Made changes to position, but have not loaded the dictionary yet. * Fixed a few bugs - attribute loading had a few. * TODO items: * Finish up loading positions then see what is left. * Work on saving as OptimShi - has character creation ready to go. * Fixed for rebase and apveyor * Hand wrote view per request and removed unneeded position. * Read character creation values from client_portal.dat (#369) * Read character creation values from client_portal.dat and assign to appropriate Character Properties * Added AceCharacter properties for the character appearance data * More fun in Zombieland - character loading. (#370) * [Og II] * Continued work loading character from ace_shard. Rebased * Added cascade delete to all child tables in ace_shard. * Completed and tested up to skillz loading. Made a few changes on the db side for key consistancy. * TODO items: * Finish up loading - spells, friends, allegiance info, spell comps, spell bars etc. etc.... * Fixed bug in setXXXProperty methods with the add new. Was not setting the AceObjectId * Fixed auto inc and unsealed position class and made aceObjectId virtual again. * SaveObject implemented in ShardDatabase.cs (#371) * First steps of SaveObject * Hopefully I didn't bork anything too hard. * Character creation -- data present on save appears to make its way to the DB. Thanks to Lidefeath for the starter here. * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Cleanup of DbGetListAttribute (#372) * First steps of SaveObject * Hopefully I didn't bork anything too hard. * Character creation -- data present on save appears to make its way to the DB. Thanks to Lidefeath for the starter here. * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Reworked DbGetListAttribute, got rid of hacky code. * Forgot to remove sloppy comments from refactoring. * Create Database.cs * Fix the "You do not own this character" error. (#373) * Refactoring, save/restore progress on object overhaul (#375) * First steps of SaveObject * added todo * Hopefully I didn't bork anything too hard. * Character creation -- data present on save appears to make its way to the DB. Thanks to Lidefeath for the starter here. * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Working on player login. Getting closer. At SendSelf in player.cs * Reworked DbGetListAttribute, got rid of hacky code. * Forgot to remove sloppy comments from refactoring. * Create Database.cs * Continued work on character login. A little closer - we can get into the world now. Please see change log for list of outstanding items. * Can log in, and walk around. Some properties still wrong. Still need to submit several DB level fixes. * Many fixups/bugfixes. Positions now save. Character logs in. Game doesn't crash. Can open multiple sessions. (some) ORM issues fixed Issues: World Objects still don't appear in game. Race found in ShardDatabase (commented) * Minor cleanups. * Object overhaul (#376) * First steps of SaveObject * added todo * Hopefully I didn't bork anything too hard. * Character creation -- data present on save appears to make its way to the DB. Thanks to Lidefeath for the starter here. * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Removed all references to SaveCharacterOptions -- replace with SaveObject(). * Working on player login. Getting closer. At SendSelf in player.cs * Reworked DbGetListAttribute, got rid of hacky code. * Forgot to remove sloppy comments from refactoring. * Create Database.cs * Continued work on character login. A little closer - we can get into the world now. Please see change log for list of outstanding items. * Can log in, and walk around. Some properties still wrong. Still need to submit several DB level fixes. * Many fixups/bugfixes. Positions now save. Character logs in. Game doesn't crash. Can open multiple sessions. (some) ORM issues fixed Issues: World Objects still don't appear in game. Race found in ShardDatabase (commented) * Properly load Data Id instances. Objects now "spawn" in-world, but don't interact properly. * Fixes to worldbase vw_teleport_location, player description, character handler. Player now gets proper stats and can teleportpoi. Vital inital values are off. * Sets options on load. May be bad/broken. Need to seriously think how AceObject/AceCharacter and WorldObject/Player should interact. We don't do that well now. * Fix to attribute2nd, using uint24 instead of uint16 for value (because monster's health can get huuuge). * Position refactor into backend object AceObjectPropertiesPosition and front-end object Position. * * fixed issues with the weenieHeaderFlags setting method, fixed PhysicsDescriptionFlag setting issue as well. * cleaned up and rebased data scripts for WorldBase and ShardBase * Found issue in my data that was ETL to our new schema - had two flag fields Reversed - that is fixed but would be no issue * once we have Ripley's new data export. I have shared out a link to the cleaned up data for use while we finish the new export. * https://www.dropbox.com/s/pohcruvalt9s38h/WorldandShardData.zip?dl=0 * I put in a nasty hack - hard coded weenieClassId on character save - it was being set to 0 and I could not find it. I marked with with a todo. * player.cs line 490 * Create Landblock.cs * Updated changelog * Fear the Walking Dead - More work on our object overhaul - bug fixes and continued work (#377) * Testing - fixed a few null reference check errors. Added in OptimShi player apperance code. * added back code needed for ci * Sending DataId and InstanceId data to character description. * Forgot to update change log * Added Ripley's changes to scheam * Create ShardBase.sql * Create WorldBase.sql * Made requested changes * Lord BucketHead - temp fix. Added start of equipping items and POC code (#378) * * Added getting and setting ContainerID and Wielder into AceObject and surfaced in worldObject * Put in a hack to show how equiped weapons and shields work. We will need to establish a place to store this data. * I put in big TODO to indentify the hack - it is benign and will not impact anything else other than to demo the placement * of the spear in Rand the Game Hunters hand in Holtburg. * Modified SetPhysicsDescriptionFlags so it can be container and weilder aware. * Worked with OptimShi and we put in a fix for Lord BucketHead. * Found and fixed one more bug with hair styles * Update Player.cs removed comment that was out of date. * SQL Scripts Re-based (#379) * SQL Scripts Rebased * More alignment of base DB script. * Final SQL script rebase * Code cleanup and a few bug fixes. (#380) * Code cleanup and a few bug fixes. Working to trello card. Board updated. * Added first part of wield item. * Update to remove class diagram * Update GameActionGetAndWieldItem.cs * Update GameEventWieldItem.cs * Fixed Position Saving. (#381) * Fixed Position Saving. * Fixed other minor character initialization bugs * Cleanup backing AceObject (#382) * Reworked AceObject/Player/WorldObject to better repsect AceObject as a unit backing. * Enough cleanup to commit. Fixed vitals (Attribute2nd) in the process. * Fixed bad rebase errors. Appears to work now. Can confirm vitals (Attribute2nds) initialize well, and can be raised. * Fixed bug with player creation and made a bunch of comments and notes about things I discovered so they would not get lost. (#383)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I am hoping you will give me a pass on what looks like massive changes to ShardBase.sql - I think Ripley is using mysqlworkbench for his export and I am using Sqlyog. The changes are minor and have been tested to work.