The Cactus Game Engine

Annonomus Penguin

15:00

I'm renaming variable still

Duga

[ShearOfDoom/Cactus] ShearOfDoom commented on issue #2: Coding Convention

> Hmm. The only non-pep8 thing I see is extra spaces around =, but that's usually part of my convention, simply because it looks better. I'm not sure what's meant by the class names not being right.

Ethan Bierlein

@AnnonomusPenguin ^^

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #2: Coding Convention

> > Always use cls for the first argument to class methods.

I was saying to make it a part of the readme so we can follow it. Hmm....

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #2: Coding Convention

> Those are two separate thoughts BTW ^^^

[ShearOfDoom/Cactus] ShearOfDoom commented on issue #2: Coding Convention

> Really? Hmm. I would've thought that'd you'd use self, as in referring to the object itself...

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #2: Coding Convention

> I don't know. It also says this:

> Always use self for the first argument to instance methods.

Ethan Bierlein

Hmm. I think that I'm going to just keep using self and close that issue.

Alrighty everyone, we have our style defined. PEP8, with extra spaces around variable declarations allowed.

@AnnonomusPenguin ^^

Annonomus Penguin

@EthanBierlein edit into readme; note about self and extra spaces in readme also

I'm fine with that

Ethan Bierlein

15:09

K, sounds good.

Annonomus Penguin

@Ethan are you going to give us write to GitHub so we can mess with issues? Or are you going to mess with issues alone?

Ethan Bierlein

I'll mess with issues alone. But if you guys happen to find it before I do, and find a solution, I'll fix it with credit to whoever found/fixed it originally. That sound good?

Duga

[ShearOfDoom/Cactus] ShearOfDoom closed issue #2: Coding Convention

[ShearOfDoom/Cactus] ShearOfDoom commented on issue #1: Remove Prototype

> The prototype will be removed.

Annonomus Penguin

@EthanBierlein I meant so we could also mark things as bug/improvement/etc.

Duga

[ShearOfDoom/Cactus] ShearOfDoom closed issue #1: Remove Prototype

Annonomus Penguin

15:15

And self-assign

Maybe when the project grows

Ethan Bierlein

Sure, I guess. I'm assuming write access also means you guys can edit the code too. Right?

Annonomus Penguin

@EthanBierlein yes

Ack, why isn't Python working?

I want to do a test before I do a PR

Ethan Bierlein

Okay, I'm going to add @Quill / @AnnonomusPenguin / @QPaysTaxes as collaborators, but for now, you guys can only mark things as bug/improvement/etc.

What's not working with Python?

Are u using Python3?

@AnnonomusPenguin ^^

Annonomus Penguin

Got it to work

Duga

[ShearOfDoom/Cactus] ShearOfDoom added Annonomus-Penguin

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #3: Improved Readibility to merge Annonomus-Penguin/Cactus/6-7-15-improve-var-names into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] ShearOfDoom added Annonomus-Penguin

Ethan Bierlein

15:25

Whoops. Sorry about that. Misclicked there.

Annonomus Penguin

:D

@Duga @Ethan

It's a lot of code, srry :P

Ethan Bierlein

Wait, what are pull requests?

I'm still somewhat new to Github.

Annonomus Penguin

Right side of the main repository

Under issues

Then, look at the different tabs for commits, files changed, etc.

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to pull request #3: Improved Readibility

Ethan Bierlein

Well, I know where they are, but what is a pull request?

Annonomus Penguin

15:30

@EthanBierlein do you know what a fork is?

Ethan Bierlein

Yeah, it's like someone making their own copy of your repo.

Annonomus Penguin

@EthanBierlein yes, it makes a copy of it at the state of when it's forked

After that, the changes aren't synced automatically

So, what I did is I made a copy (forked it), and changed that copy

Now I want to submit those changes back into the main repository (yours), so I submitted a PR from my fork to the main (yours)

Ethan Bierlein

k. I'll check it out rn.

Annonomus Penguin

So, you can review the changes I made and if you want to, you can "pull" it into the main one. If not, you can reject the changes.

Duga

[ShearOfDoom/Cactus] ShearOfDoom added The-Quill

Ethan Bierlein

15:34

Okay everyone, before you make changes, please fork and create a pull request. All PRs must be reviewed by me.

Annonomus Penguin

@EthanBierlein that's how GitHub works :P

Ethan Bierlein

Oh, wait, so even if u guys are collabs, you can't directly commit to master?

Annonomus Penguin

@EthanBierlein we can, but it's just bad practice

We should all do code reviews before check-in (including with your code)

Ethan Bierlein

Alrighty, so let's keep that comment perma-pinned.

Duga

[ShearOfDoom/Cactus] ShearOfDoom added newbiedoodle

Annonomus Penguin

15:38

@Ethan edited that pinned message so it fits in the sidebar. Feel free to revert

Sorry, should've asked you first :/

Ethan Bierlein

Actually, that's better. More concise too! :)

Annonomus Penguin

I know ;)

Ethan Bierlein

Hey, I gotta leave for about an hour. I'll check in later. See y'all later.

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #4: Removed prototype to merge Annonomus-Penguin/Cactus/6-7-15-remvoe-prototype into ShearOfDoom/Cactus/master

Annonomus Penguin

@QPaysTaxes I noticed it a second after I published D:

OH well

@QPaysTaxes grab a fork, start poking things, fix things

:D

@QPaysTaxes I'm making all of them rn

and fixing them myself

Duga

15:42

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to pull request #4: Removed prototype

Annonomus Penguin

@QPaysTaxes okay

@QPaysTaxes glares at @Ethan

I didn't create issues for some of them, though

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin reopened issue #2: Coding Convention

[ShearOfDoom/Cactus] Annonomus-Penguin reopened issue #1: Remove Prototype

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #1: Remove Prototype

> Fixed in PR github.com/ShearOfDoom/Cactus/pull/4

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #5: Event handler

> I think the best way to make this flexible is to add an event handler (like JavaScript's `onLoad` type thing).

To do this, we need to:

- Remove any redundant copies of variables (lazy eval, extra functions will help us maintain readability)
- Add an event handler system

To do this:

Have user pass a dictionary of `string: function`, where `string` is something like `onEnterRoom` and `function` with the `MainGame` is the only argument (so they can modify the game). We will need to

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #5: Event handler

Annonomus Penguin

@QPaysTaxes what?

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin assigned Annonomus-Penguin to issue #5: Event handler

Annonomus Penguin

Cool!

Duga

15:52

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #6: Game map validator

> We need to make sure that the links between the rooms are valid.

We should validate the user's input in `MainGame.__init__()`.

[ShearOfDoom/Cactus] Annonomus-Penguin added label bug to issue #6: Game map validator

Annonomus Penguin

@QPaysTaxes this looks like a good issue for you to fix ^^^

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #6: Game map validator

Annonomus Penguin

@QPaysTaxes you want it, then?

Duga

[ShearOfDoom/Cactus] newbiedoodle opened issue #7: Use functions rather than Strings for enter and exit events

> This lets rooms be dynamic -- for example, you could enter a room, knock a torch down, and the room catches on fire. If you try to enter the room again, it could deduct (for example) four health and tell you:

```
HOLY CRAP YOU'RE ON FIRE AAGAHGASKGHASG
```

Annonomus Penguin

@QPaysTaxes what's your GH username?

newbiedoodle?

Duga

15:53

[ShearOfDoom/Cactus] newbiedoodle added label enhancement to issue #7: Use functions rather than Strings for enter and exit events

Annonomus Penguin

Ok, yeah it is

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin assigned newbiedoodle to issue #6: Game map validator

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #7: Use functions rather than Strings for enter and exit events

> Look at #5

We could have an `onRoomEnter` event, possibly?

[ShearOfDoom/Cactus] newbiedoodle commented on issue #7: Use functions rather than Strings for enter and exit events

> ...Dammit, you posted an issue about it before I could.

[ShearOfDoom/Cactus] newbiedoodle added label invalid to issue #7: Use functions rather than Strings for enter and exit events

Annonomus Penguin

@Ethan can you please handle pull requests? It's a good idea to handle these before much other code is written, especially when we're working on two files.

Duga

[ShearOfDoom/Cactus] newbiedoodle added label wontfix to issue #7: Use functions rather than Strings for enter and exit events

[ShearOfDoom/Cactus] newbiedoodle closed issue #7: Use functions rather than Strings for enter and exit events

[ShearOfDoom/Cactus] Annonomus-Penguin added label duplicate to issue #7: Use functions rather than Strings for enter and exit events

[ShearOfDoom/Cactus] Annonomus-Penguin removed label invalid from issue #7: Use functions rather than Strings for enter and exit events

[ShearOfDoom/Cactus] Annonomus-Penguin removed label wontfix from issue #7: Use functions rather than Strings for enter and exit events

Annonomus Penguin

@QPaysTaxes what do you want to add?

Duga

15:58

[ShearOfDoom/Cactus] newbiedoodle forked us into newbiedoodle/Cactus

Annonomus Penguin

@QPaysTaxes (scared)

I don't think it's very easy

@QPaysTaxes there

:D

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #8: License

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #8: License

> We should all accept the same licence before proceeding.

I suggest the MIT. Is that ok?

Ethan Bierlein

I think you guys got the message, but can you not merge pull requests unless I've had a chance to look at them first? Thanks! I'll add a comment on the pull request saying something like "checked", which means it's then okay to merge.

Annonomus Penguin

@EthanBierlein no one has merged

What are you talking about?

Also: don't comment "checked." Pull it yourself

There's a big green button to help you :P

Ethan Bierlein

16:15

Alrighty.

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin assigned ShearOfDoom to issue #8: License

Annonomus Penguin

@EthanBierlein do you have time now?

Ethan Bierlein

Oh, and I grant you ~~dictator~~ powers to add a license. But just this once. I gotta right about now.

Annonomus Penguin

@EthanBierlein MIT okay?

?

@QPaysTaxes have you edited anything yet?

We still need @Ethan to decide on a license and do a PR

I have a major PR that he should accept before you do anything

@QPaysTaxes everything :P

> Showing 3 changed files with 39 additions and 47 deletions

Mostly renaming variables, etc.

Trying to make it more readable

@QPaysTaxes I want him to finish the existing PRs first

@QPaysTaxes yes but I don't want to force two things on him at the same time

I guess I could

True :P

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin synchronized pull request #3: Improved Readibility

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #9: Add MIT license to merge Annonomus-Penguin/Cactus/6-7-15-license into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to pull request #9: Add MIT license

Annonomus Penguin

16:33

@QPaysTaxes do you think that he trusts you enough to do a PR? I mean, we can always roll back

I wouldn't normally ask you to do this but we're both wasting our time here

@QPaysTaxes ummm

let me think

I mean he can always revert, right?

What do you think?

Yes. And unstable releases are meant to be... unstable

:D

I've thought about that

@QPaysTaxes it makes sense why he wants to merge himself, but it's kinda annoying when we can't get anything done

errr... right

The only thing that annoys me is the license thing

He needs to approve that and we shouldn't do much dev until that's done

@QPaysTaxes so not MIT?

Does that force attribution?

It says that you must include the license later

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

They don't have to do it by the same license

Just mention they use us in the about page

So, no go for you?

@QPaysTaxes well, since it's Python they would have to share the source anyway ;)

@QPaysTaxes I guess my point is that it hinders the ability of people to use it in applications that are commercial

having a "MADE WITH CACTUS" label would deter many people

IDK. What license do you want? Besides a share-alike

SA isn't for code

@QPaysTaxes but we also have a very small portion of code. The time it takes us is to make it adaptable. Someone could build their own, specialized version in like a hour

@QPaysTaxes I like MIT because it's open, unrestricted (much), and it's short

@QPaysTaxes CC claims that it isn't for code

I just don't want a 10 page license

So, suggest a license

@QPaysTaxes for text, not for code alone

The code is part of the textual works

Errr. Yes.

It isn't designed for code alone

It's designed for photos and books, which may or may not contain text

>We recommend against using Creative Commons licenses for software. Instead, we strongly encourage you to use one of the very good software licenses which are already available. We recommend considering licenses made available by the Free Software Foundation or listed as “open source” by the Open Source Initiative.
>
>Unlike software-specific licenses, CC licenses do not contain specific terms about the distribution of source code, which is often important to ensuring the free reuse and modifiability of software. Many software licenses also address patent rights, which are important to soft…

Apache license, maybe?

apache.org/licenses/LICENSE-2.0

Still a bit long

Nevermind not what I wanted

> The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by [US] and its contributors", in the same place and form as other third-party acknowledgments. Alternately, this acknowledgment may appear in the software itself, in the same form and location as other such third-party acknowledgments.

@QPaysTaxes that? ^^^

Add that?

@QPaysTaxes xfree86.org/legal/licenses.html

Duga

17:03

[ShearOfDoom/Cactus] Annonomus-Penguin synchronized pull request #9: Add MIT license

Annonomus Penguin

I see :P

@Ethan please merge the PRs after reviewing them

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #10: Include "help" to list all commands

> Boolean enable

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #10: Include "help" to list all commands

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #11: Include "about" command

> Have them add text, license information.

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #11: Include "about" command

[ShearOfDoom/Cactus] ShearOfDoom merged pull request #9: Add MIT license from Annonomus-Penguin/Cactus/6-7-15-license into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 26ce2a69 to master: Add MIT license

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 34b66068 to master: Improved License

[ShearOfDoom/Cactus] ShearOfDoom pushed commit 6921572e to master

Merge pull request #9 from Annonomus-Penguin/6-7-15-license

Add MIT license

Annonomus Penguin

Ack. So much stuff!

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin commented on pull request #9: Add MIT license

> Thanks @ShearOfDoom

Make sure that everyone approves this modified MIT license before pulling for legal reasons (remember I'm not a lawyer :P)

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #12: blankline_between_content bool

> From

```text
You have reached a blank room.
>> eat taco
Yum.
You are now in the dining hall.
```

```text
You have reached a blank room.

>> eat taco

Yum.

You are now in the dining hall.
```

Might also want an option for just around the prompt.

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #12: blankline_between_content bool

Quill

Well, I was out four hours and that many messages wow

Annonomus Penguin

17:12

@Quill haha

Quill

@QPaysTaxes, I'm glad you like your reddit title, feel free to change it at any time

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin closed issue #8: License

[ShearOfDoom/Cactus] Annonomus-Penguin commented on issue #8: License

> Fixed in github.com/ShearOfDoom/Cactus/pull/9

[ShearOfDoom/Cactus] newbiedoodle commented on pull request #9: Add MIT license

> Looks good to me, though strictly speaking I don't think the software was developed by The Cactus Project, so the working could be improved.

[ShearOfDoom/Cactus] Annonomus-Penguin commented on pull request #9: Add MIT license

> Errr.... what do you want?

It might be too late with different versions of licenses

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #13: Split license into multiple lines for readability

[ShearOfDoom/Cactus] Annonomus-Penguin assigned Annonomus-Penguin to issue #13: Split license into multiple lines for readability

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #13: Split license into multiple lines for readability

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #14: #ShearOfDoom/15: splits license into different lines to merge Annonomus-Penguin/Cactus/6-7-15-split-license-into-lines into...

ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] newbiedoodle commented on pull request #9: Add MIT license

> Eh, just being pedantic. It looks fine.

[ShearOfDoom/Cactus] Annonomus-Penguin commented on pull request #9: Add MIT license

> TBH we all know it's going deep in some about page that takes 15651651564 steps to get to :smirk:

[ShearOfDoom/Cactus] Annonomus-Penguin opened issue #15: Add license into GH Pages

[ShearOfDoom/Cactus] Annonomus-Penguin added label enhancement to issue #15: Add license into GH Pages

[ShearOfDoom/Cactus] Annonomus-Penguin assigned Annonomus-Penguin to issue #15: Add license into GH Pages

[ShearOfDoom/Cactus] Annonomus-Penguin commented on pull request #14: #ShearOfDoom/13: splits license into different lines

> Issue #13 BTW

[ShearOfDoom/Cactus] Annonomus-Penguin merged pull request #14: #ShearOfDoom/13: splits license into different lines from Annonomus-Penguin/Cactus/6-7-15-split-license-into-lines into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 92b9f9f8 to master: #ShearOfDoom/15: splits license into different lines

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit d37ae192 to master

Merge pull request #14 from Annonomus-Penguin/6-7-15-split-license-into-lines

#ShearOfDoom/13: splits license into different lines

[ShearOfDoom/Cactus] Annonomus-Penguin closed issue #13: Split license into multiple lines for readability

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #16: Adds license to pages to merge Annonomus-Penguin/Cactus/6-7-15-add-license-to-pages into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] newbiedoodle commented on pull request #9: Add MIT license

> Fair point, fair point. Either way, I'm good with it.

[ShearOfDoom/Cactus] Annonomus-Penguin closed issue #15: Add license into GH Pages

[ShearOfDoom/Cactus] Annonomus-Penguin commented on pull request #16: Adds license to pages

> Wrong target :P

[ShearOfDoom/Cactus] Annonomus-Penguin rejected pull request #16: Adds license to pages

[ShearOfDoom/Cactus] Annonomus-Penguin created pull request #17: Fixes #15 to merge Annonomus-Penguin/Cactus/6-7-15-add-license-to-pages into ShearOfDoom/Cactus/gh-pages

[ShearOfDoom/Cactus] Annonomus-Penguin merged pull request #17: Fixes #15 from Annonomus-Penguin/Cactus/6-7-15-add-license-to-pages into ShearOfDoom/Cactus/gh-pages

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit bddc0490 to gh-pages: Fixes #ShearOfDoom/15

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 57cd9794 to gh-pages

Merge pull request #17 from Annonomus-Penguin/6-7-15-add-license-to-pages

Fixes #15

Annonomus Penguin

17:32

I'm not doing much here, It's just the licenses ^^^ XD

It's 2 issues, 3 PRs

Yes

If you want to, you can pull from the branch that includes those updates

And make edits on those?

Nah. Do we want a dev branch now?

Can you review the changes I made?

github.com/Annonomus-Penguin/Cactus/commit/…

Could you imagine a lawsuit involving GitHub code? That'd take so long to explain everything :P

> Well, the defendant submitted a pull request that would pull from d37ae192a4b9bc165a856431f3ad1949f4868647 into bee7814a98b34620e8cf0606a6f3d120344c8c36. However, Mr. Smith denied the merge, stating that they needed to do a rebase. Then, the defendant downloaded the entire repository as a .zip and uploaded it to his own repository without any attribution, as required by the license. Please note that it was not a fork; it was done using the standard packages installed in Ubuntu.

[This joke didn't make sense, so I removed it]

Ack.

Oh well.

Tired penguin.

@QPaysTaxes So did you look at the PR?

I want to create a dev branch and pull but not sure if Ethan will be here soon

I'm wasting time here

Duga

[ShearOfDoom/Cactus] Annonomus-Penguin closed issue #2: Coding Convention

[ShearOfDoom/Cactus] Annonomus-Penguin assigned Annonomus-Penguin to issue #1: Remove Prototype

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 014e587c to master: Improved Readibility

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit d8bcfccd to master: Tabs → spaces

[ShearOfDoom/Cactus] ShearOfDoom merged pull request #3: Improved Readibility from Annonomus-Penguin/Cactus/6-7-15-improve-var-names into ShearOfDoom/Cactus/master

Annonomus Penguin

WE HAVE PULL

Duga

17:47

[ShearOfDoom/Cactus] ShearOfDoom pushed commit 43464ed6 to master

Merge pull request #3 from Annonomus-Penguin/6-7-15-improve-var-names

Improved Readibility

[ShearOfDoom/Cactus] ShearOfDoom merged pull request #4: Removed prototype from Annonomus-Penguin/Cactus/6-7-15-remvoe-prototype into ShearOfDoom/Cactus/master

[ShearOfDoom/Cactus] Annonomus-Penguin pushed commit 7b4c0468 to master: Removed prototype

[ShearOfDoom/Cactus] ShearOfDoom pushed commit b4f55efb to master

Merge pull request #4 from Annonomus-Penguin/6-7-15-remvoe-prototype

Removed prototype

[ShearOfDoom/Cactus] Annonomus-Penguin closed issue #1: Remove Prototype

Annonomus Penguin

@QPaysTaxes we now can work!

Quill

Can I have the skinny on the conversations I missed? (pls)

Annonomus Penguin

@Quill not much besides talking about the code

90% of it is logs from GitHub

We decided on a license (approved by Ethan)

Umm... made some readability edits.

Not much else :P

Quill

Nice, (thanks)

Annonomus Penguin

No problem

Transcript for