Skip to content

Pull Request for default_room, default_item on Openworld/default#631

Merged
dwahme merged 75 commits intodevfrom
openworld/default
May 26, 2020
Merged

Pull Request for default_room, default_item on Openworld/default#631
dwahme merged 75 commits intodevfrom
openworld/default

Conversation

@carolinaecalderon
Copy link
Copy Markdown
Contributor

@carolinaecalderon carolinaecalderon commented May 24, 2020

For this pull request, I'm introducing the (at least mostly) finalized default_room and default_items modules. These modules do not contain any additional structs, but instead create hash tables to organize the 20+ "default" items and 10+ "default" rooms. In this case, default means that the item or room is assigned fixed description strings and even fixed subset of allowed items (for rooms). The hash tables will provide added flexibility for future expansion of Chiventure.

For more information, refer to my issue for Sprint 3: #540.

(A quick note about the number of commits this pull request has listed: I have a weird set-up on my home laptop and the CSIL server that I ssh into. I don't like coding on Vim if I can avoid it, so it's much easier for me to write/heavily edit my code on my home server. However, I can't test on my home server. Instead, I have to go back and forth between my home server, committing my changes, testing on CSIL, committing even smaller bug fixes, and returning back to my home server to keep writing my code. It's not the smoothest process, hence why I have a larger than normal amount of commits, but I prefer my home coding environment.)

bryan22lee and others added 30 commits May 18, 2020 17:51
…endencies on the root directory CMakeLists so we can run tests. I will branch from here and make tests for autogenerate before attempting a PR
…cts.c to be available to conduct the test and make more tests. Wait for either the PR of gen_structs to go through or specifically request source code access
Some functions were included. Here, I'm treating NPC characters similarly to items. Later on, I think it would be good to use  the sample conversations the NPC team has already created within their sandbox.
Copy link
Copy Markdown
Contributor Author

@carolinaecalderon carolinaecalderon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the description for default_rooms like Nicole wanted.

Copy link
Copy Markdown
Contributor

@navila-luna navila-luna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments look more concise!

Copy link
Copy Markdown
Contributor

@dwahme dwahme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done, we're pretty close. Mostly stylistic changes for chiventure conventions

Also, @navila-luna's npc files are in here. PR #639 seems to be where those should be added, so you should remove them from this PR

@carolinaecalderon
Copy link
Copy Markdown
Contributor Author

I'm not sure why the build on Travis is failing if I'm able to compile on the CSIL machines. My suspicion is that the copy_item_to_hash is returning NULL somewhere, but, again, not sure because the tests that I'm able to build all pass.

@navila-luna
Copy link
Copy Markdown
Contributor

navila-luna commented May 26, 2020 via email

Copy link
Copy Markdown
Contributor

@dwahme dwahme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some tiny changes to polish up before we're good to go. For some reason git doesn't want to recognize the diff nicely for gen_structs.*, but I've checked them by hand and there's no significant changes between the two

Copy link
Copy Markdown
Contributor

@dwahme dwahme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dwahme dwahme merged commit 0cce7fa into dev May 26, 2020
@carolinaecalderon carolinaecalderon deleted the openworld/default branch May 26, 2020 19:14
@dwahme
Copy link
Copy Markdown
Contributor

dwahme commented Jun 15, 2020

Issue Score: ✔️+

Comments:
Great job! Here are a few things you may want to improve in future issues:

When an issue is done, you should include a final comment summarizing what was done, and why the issue is being closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

x/rpg-openworld RPG feature random world/room generation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants