Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Flora, Leveled Items, Weapons, Item locations #20

Merged
merged 6 commits into from
Sep 27, 2020

Conversation

Wully616
Copy link
Contributor

@Wully616 Wully616 commented Jun 4, 2020

No description provided.

@Wully616 Wully616 changed the title Added Flora, Leveled Items, Weapons Added Flora, Leveled Items, Weapons, Item locations Jun 4, 2020
@FWDekker FWDekker self-assigned this Jun 4, 2020
@FWDekker FWDekker added the dump-request Request to dump new data label Jun 4, 2020
@FWDekker
Copy link
Owner

FWDekker commented Jun 4, 2020

Thank you for the PR, Wully! I'll take a look at it later today.

@FWDekker
Copy link
Owner

FWDekker commented Jun 4, 2020

I like the flora, lvli, and weapons exports; they're very useful. I'm not sure if the locations export is necessary because I think that map76 provides a much better way of accessing that data. What do you think?

@Wully616
Copy link
Contributor Author

Wully616 commented Jun 4, 2020

Does map76 provide a rest api or something to get the location data? I can only see that they just have the locations on a map
I'm creating a 3D pointcloud map and need the location data to basically do the same thing as map76 but in 3D - https://gfycat.com/honorablewellgroomedbabirusa

I can update the PR and move the location extraction into their own files, so they are separate from the flora, lvli and weapon exports?

@FWDekker
Copy link
Owner

FWDekker commented Jun 5, 2020

Ah I see. In that case these exports would be very useful. Once you complete that 3d map, please let me know, it sounds really cool!

As for the files, yes, I would appreciate it if you could separate the location code to its own file. A single file for all five types should be fine; I just think it's nice to keep the code separated. Then you could also move the associated functions that are currently in the core to that file.

Any idea how large the location files will be if you export all records?

@Wully616
Copy link
Contributor Author

Wully616 commented Jun 5, 2020

Ok, I will move them to a seperate file along with functions for it.

The location files are a bit bigger than the normal data, but not huge

ARMORLOC:	823 KB
FLORALOC:	10,642 KB
LVLILOC:	19,272 KB
MISCLOC:	15,821 KB
WEAPLOC:	139 KB

@FWDekker
Copy link
Owner

FWDekker commented Jun 5, 2020

Thanks!

Those sizes look fine. I was worried that we might have to split them up like with the ID files, but these aren't much bigger than some of the others. 👍

@FWDekker
Copy link
Owner

FWDekker commented Jun 9, 2020

Have you been able to separate the location code into a separate file? Is there anything I can help with?

@Wully616
Copy link
Contributor Author

I've not had time to work on it recently, i'll close the PR for now until I sort it. Shouldn't be any trouble with it

@Wully616 Wully616 closed this Jun 11, 2020
@FWDekker
Copy link
Owner

I have some time to work on this, so I'll see what I can do to implement these features.

@FWDekker FWDekker reopened this Sep 27, 2020
# Conflicts:
#	Edit scripts/ExportAll.fo76pas
#	Edit scripts/ExportFlatList.pas
Now serialised as JSON objects. Also fix some tiny documentation errors and such.
@FWDekker FWDekker merged commit 5541c2b into FWDekker:master Sep 27, 2020
@FWDekker
Copy link
Owner

Awesome! The logic of your code is mostly untouched; most changes were renaming and shuffling bits of code. I've also added a few extra fields here and there. Either way, thanks very much for this PR! I've added you to the credits section of the README :)

@Wully616
Copy link
Contributor Author

Nice one! Apologies I never got round to it. Well done for taking it forward!

@FWDekker
Copy link
Owner

v2.4.0 has been released and now include the dumps from this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dump-request Request to dump new data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants