devolution

Author Topic: Code submission (In SVN .diff format no less)  (Read 8148 times)

0 Members and 1 Guest are viewing this topic.

Offline myrikhan

  • Dev Team
  • *****
  • Posts: 23
Code submission (In SVN .diff format no less)
« on: March 21, 2010, 05:59:22 PM »
Hello All:

I've been hacking away at the WM 255 code over the weekend and have a submission
to make.  It's attached as a 382 KB SVN .diff file. 
Things I did:

- Fixed inventory equip bug (My girls can now wear clothes, a necklace, a ring and shoes all
  at the same time for example)
- Fixed 2 hangs in girl catacomb exploration
    - Damage was being added to health, not subtracted
    - Exit condition of the girl being reduced to 20 or less health hang.  (If she beats all the
      monsters and has > 20 health, the game hanged)
- Fixed a "* -1" in the "does the girl obey?" equation
- Wrote some code to enable the training code in the jobs class
  - Fixed a vector error in the training code and a bug in one of the .h files
- Removed a few redundant messages from the next turn summary screen
- Made many of the messages on the next turn screen more explicit:
  - Security level increase shown
  - Advertising level and cost shown
  - Total number of customers visiting during the day and night shown
  - Girl work and work refusal messages are more specific

A number of things I did were to make the game more fun for me.  (Ie, this part is a matter
of opinion):
- Tripled cleaning rate
- Changed tiredness for 100 constitution to 0 (was 2)
- Girl doesn't go off duty after being attacked
- Advertising 20% more effective in number of customers calculation
- Changed filthiness calculation in number of customers calculation (Tops out at -50 customers)
- Gang recruiting is faster (3 per turn, instead of 2)
- Combat skill now factors into catacomb exploration (It's too easy this way?)
- Cleaned up jobs and made them more consistent in terms of messages and skill increases
  (I know the devs are changing this so I didn't do much here)
- Other stuff I don't remember anymore :)


Myrikhan

Offline DocClox

  • Dev Team
  • *****
  • Posts: 1867
  • Messing Around With Python
Re: Code submission (In SVN .diff format no less)
« Reply #1 on: March 21, 2010, 06:04:42 PM »
Wow. Thanks for that. Unless someone beats me to it, I'll see about applying that patch over the next day or so. It sounds great.

Offline Dagoth

  • Administrator
  • *****
  • Posts: 617
Re: Code submission (In SVN .diff format no less)
« Reply #2 on: March 21, 2010, 11:52:24 PM »
Awesome. Sounds quite substantial.  :)

Offline Mehzerz

  • Hero Member
  • *****
  • Posts: 564
  • Rockin' the after life after party
Re: Code submission (In SVN .diff format no less)
« Reply #3 on: March 22, 2010, 01:22:20 AM »
I'm interested in this "other stuff" It could be anything! 
Starter girls image additions progress:
26 girls, 18 to go

Offline myrikhan

  • Dev Team
  • *****
  • Posts: 23
Re: Code submission (In SVN .diff format no less)
« Reply #4 on: March 22, 2010, 06:38:01 AM »
Wow. Thanks for that. Unless someone beats me to it, I'll see about applying that patch over the next day or so. It sounds great.

Cool, thanks.  Best to test it of course.
I looked through the diff file and came across two things you should be careful about: 
When I was testing I was using an items files supplied by one of the users of this
board.  My testing was also done with more girls than in the default 255 build.
As a result, you probably shouldn't apply these two files:

Data/Items.itemsx
Characters/GirlsAddon1.girlsx

Offline necno

  • Core Developer
  • ******
  • Posts: 385
Re: Code submission (In SVN .diff format no less)
« Reply #5 on: March 22, 2010, 04:56:01 PM »
Excellent work
Click here to donate
After you do so please pm me the email address you used so I can add you to the donation forum.

Working on:
Whoremaster II (Official)
Birthright (Now a commercial rougelike)

Offline FurryFanatic

  • Jr. Member
  • **
  • Posts: 53
Re: Code submission (In SVN .diff format no less)
« Reply #6 on: March 23, 2010, 07:31:24 PM »
Any update on how the .DIFF file went with anyone who applied it to the game? Just curious.  Took a look at the file and liked what I saw.

Offline DocClox

  • Dev Team
  • *****
  • Posts: 1867
  • Messing Around With Python
Re: Code submission (In SVN .diff format no less)
« Reply #7 on: March 23, 2010, 07:58:48 PM »
Didn't get a chance to look at it, I'm afraid. I got as far as opening up the project on my laptop. Then non-computer stuff happened and I never got back to it...

Offline FurryFanatic

  • Jr. Member
  • **
  • Posts: 53
Re: Code submission (In SVN .diff format no less)
« Reply #8 on: March 24, 2010, 08:26:40 PM »
I would love to learn from you guys how to implement the code in the file.  I'm currently at school working on programming and any way I can get practice in on items that I'm interested in working on would be awesome.  WM has so much potential and I would love to get pointers and tips from the people working on it.

Offline DocClox

  • Dev Team
  • *****
  • Posts: 1867
  • Messing Around With Python
Re: Code submission (In SVN .diff format no less)
« Reply #9 on: March 25, 2010, 04:32:02 AM »
Just so no one thinks I've forgotten: I got around to looking at the patch last night: I've created a new branch called "myrikhan" for test purposes, but I couldn't work out how to get the patch to apply. I think it's just a question of fiddling with  the -p level, but I didn't get that far last night. I should have some uninterrupted time this weekend, so if all else fails, I'll get it sorted out then.

I would love to learn from you guys how to implement the code in the file.  I'm currently at school working on programming and any way I can get practice in on items that I'm interested in working on would be awesome.  WM has so much potential and I would love to get pointers and tips from the people working on it.

Well, the best way is probably to pick something that you'd like to see in the game, or a bug that you particularly would like fixed, check out a copy of the source and have a go at it. It's a large codebase, so you're going to have to spend some time poring over the code and learning the layout.

Pick something small. A good choice might be to add a config file value for something you'd like to see tweakable. If you can do that, build it and test it, you'll be off to a good start.

Offline FurryFanatic

  • Jr. Member
  • **
  • Posts: 53
Re: Code submission (In SVN .diff format no less)
« Reply #10 on: March 25, 2010, 10:43:40 PM »
Any particular programs you use especially for this game?

Offline myrikhan

  • Dev Team
  • *****
  • Posts: 23
Re: Code submission (In SVN .diff format no less)
« Reply #11 on: March 25, 2010, 10:49:24 PM »
Hello Everyone:

I've created a second thread where I've uploaded my second, cumulative
DIFF of the bug fixes and changes I've made to the code.

Myrikhan

Offline DocClox

  • Dev Team
  • *****
  • Posts: 1867
  • Messing Around With Python
Re: Code submission (In SVN .diff format no less)
« Reply #12 on: March 26, 2010, 04:24:36 AM »
Any particular programs you use especially for this game?
I'm a Linux type, so I use g++, make, and vi. Most folks though use visual studio. You should be able to build it under Code::Blocks as well. I haven't tried building the game under cygwin or MinGW, but I can't see any reason why it shouldn't work

For graphics, I use Inkscape for vector work and the Gimp for pixel stuff, both of them free software. I know Dagoth uses Photoshop.

Hello Everyone:

I've created a second thread where I've uploaded my second, cumulative
DIFF of the bug fixes and changes I've made to the code.

Myrikhan

Thanks, I'll check it out.