Bay 12 Games Forum

Please login or register.

Login with username, password and session length
Advanced search  
Pages: 1 ... 72 73 [74] 75 76 ... 192

Author Topic: Dwarf Therapist (LATEST 0.6.12 5/23/12 see first post)  (Read 871390 times)

Dohon

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.11 2/15/12 see first post)
« Reply #1095 on: February 18, 2012, 12:42:16 pm »

It's the weekend now btw.

Meaning?
I did say I wanted to have a stable release for this weekend. Good news on that front - I found what I think is a pretty solid solution for migration waves. I'm looking at current issues to see what else I can include in this release, then something should be out within the next couple of hours.

I did know your intent, Dwarf Engineer, but I found Weaselcake's comment to be quite demanding. We all know you have  been working hard to get it fixed and updated. His comment felt out of place.

On a different note, cheers for your hard work!
Logged
Quote from: Lolfail0009
Quote from: GuesssWho
Also, why is there a stray hen having a tantrum?
CLUCK CLUCK MOTHERF***ER

heckman

  • Escaped Lunatic
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1096 on: February 18, 2012, 01:02:05 pm »

Thanks for all the amazing work on this application!

I did run into a little difficulty compiling the latest release (0.6.12 source) in linux however. Last version was fine but now I get the following. Anybody got a clue?

Code: [Select]
src/scanner.cpp: In member function ‘void Scanner::find_null_terminated_string()’:
src/scanner.cpp:283:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:283:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
src/scanner.cpp: In member function ‘void Scanner::find_number_or_address()’:
src/scanner.cpp:301:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:301:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
make: *** [bin/release/scanner.o] Error 1

Thanks again DE!
Logged

Crustypeanut

  • Bay Watcher
  • Ph.Dwarf & Practitioner of ‼MEDICINE‼
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1097 on: February 18, 2012, 01:15:17 pm »

Once my world is done Generating for the new version (year 232 of 250.. by the gods I went for a 1.5 hour walk and thats how far it got), I'll do mah best about getting you a working fortress with a vampire.  Or 20 vampires.  ;)

Edit: Oh good, I was able to stop it at 233.. gotta press enter/escape JUST as the year turns.
« Last Edit: February 18, 2012, 01:19:43 pm by Crustypeanut »
Logged
Specialsurprise - a Tale of ‼Medicine‼ and ‼Science‼ !

DwarfEngineer

  • Bay Watcher
  • Grumble Grumble...
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1098 on: February 18, 2012, 01:16:07 pm »

Thanks for all the amazing work on this application!

I did run into a little difficulty compiling the latest release (0.6.12 source) in linux however. Last version was fine but now I get the following. Anybody got a clue?

Code: [Select]
src/scanner.cpp: In member function ‘void Scanner::find_null_terminated_string()’:
src/scanner.cpp:283:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:283:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
src/scanner.cpp: In member function ‘void Scanner::find_number_or_address()’:
src/scanner.cpp:301:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:301:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
make: *** [bin/release/scanner.o] Error 1

Thanks again DE!
I checked in the fix. (I'm just now getting a linux VM up and running again)
Logged
Current Dwarf Therapist Maintainer - Tips

kionmaru

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1099 on: February 18, 2012, 01:18:49 pm »

Thanks for all the amazing work on this application!

I did run into a little difficulty compiling the latest release (0.6.12 source) in linux however. Last version was fine but now I get the following. Anybody got a clue?

Code: [Select]
src/scanner.cpp: In member function ‘void Scanner::find_null_terminated_string()’:
src/scanner.cpp:283:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:283:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
src/scanner.cpp: In member function ‘void Scanner::find_number_or_address()’:
src/scanner.cpp:301:62: error: no matching function for call to ‘qMin(uint, long unsigned int)’
src/scanner.cpp:301:62: note: candidate is:
/usr/include/QtCore/qglobal.h:1194:18: note: template<class T> const T& qMin(const T&, const T&)
make: *** [bin/release/scanner.o] Error 1

Thanks again DE!

Yeah, per comment on issue #380 it should be size_t not uint, and I agree. I GOT NINJA'D BY DWARFENGINEER! He's already checked in a fix. LOL. Here's a diff if you want it, otherwise wait for his next release I suppose :P

Here's a diff patch you can apply:

Code: [Select]
diff -r 2a186e1e26f6 src/scanner.cpp
--- a/src/scanner.cpp   Sat Feb 18 10:14:49 2012 -0600
+++ b/src/scanner.cpp   Sat Feb 18 12:19:10 2012 -0600
@@ -280,7 +280,7 @@
     QByteArray text = ui->le_null_terminated_string->text().toLocal8Bit();
 
     get_brute_force_address_range(params.start_addr, params.end_addr);
-    params.size = qMin((uint)text.size(), sizeof(params.data));
+    params.size = qMin((size_t)text.size(), sizeof(params.data));
     memcpy(params.data, text.data(), params.size);
 
     QByteArray needle((const char *)&params, sizeof(params));
@@ -298,7 +298,7 @@
     QByteArray text = encode(ui->le_find_address->text().
                                toUInt(&ok, ui->rb_hex->isChecked() ? 16 : 10));
     get_brute_force_address_range(params.start_addr, params.end_addr);
-    params.size = qMin((uint)text.size(), sizeof(params.data));
+    params.size = qMin((size_t)text.size(), sizeof(params.data));
     memcpy(params.data, text.data(), params.size);
 
     QByteArray needle((const char *)&params, sizeof(params));

Also, 0.6.12 doesn't include linux memory ini's for 0.34.01 or 0.34.02, so here they are:

0.34.01 ini file:
Code: [Select]
[info]
checksum=0xa42a074a
version_name=v0.34.01
complete=true

[addresses]
translation_vector=0x095c7bf8
language_vector=0x095c7be0
creature_vector=0x095868ac
dwarf_race_index=0x0956e240
squad_vector=0x095c47b4

[offsets]
word_table=0x001C

[word_offsets]
base=0x0000
noun_singular=0x0004
noun_plural=0x0008
adjective=0x000C
verb=0x0014
present_simple_verb=0x0018
past_simple_verb=0x001C
past_participle_verb=0x0020
present_participle_verb=0x0024

[dwarf_offsets]
first_name=0x0000
nick_name=0x0004
last_name=0x0008
custom_profession=0x003c
profession=0x0040
race=0x0044
flags1=0x008C
flags2=0x0090
sex=0x00A6
id=0x00A8
recheck_equipment=0x0148
current_job=0x0274
states=0x0
souls=0x05e8
labors=0x0604
happiness=0x0694
squad_ref_id=0x06f8

[soul_details]
skills=0x01D4
traits=0x01EC

[job_details]
id=0x0008
on_break_flag=0x0011
sub_job_id=0x0040

[squad_offsets]
id=0x0000
name=0x000C
members=0x0044

[valid_flags_1]
size=1
1\name=Not from around these parts
1\value=0x80000000

[valid_flags_2]
size=1
1\name=Dead. Deceased. An Undwarf!
1\value=0x02000000

[invalid_flags_1]
size=7
1\name=a zombie
1\value=0x00001000
2\name=a skeleton
2\value=0x00002000
3\name=a merchant or diplomat
3\value=0x00000040
4\name=outpost liason
4\value=0x00000800
5\name=an invader or hostile
5\value=0x00020000
6\name=an invader or hostile
6\value=0x00080000
7\name=an invader or hostile
7\value=0x000C0000

[invalid_flags_2]
size=2
1\name="dead, Jim."
1\value=0x00000080
2\name=from the Underworld. SPOOKY!
2\value=0x00040000

And the ini file for 0.34.02 version:
Code: [Select]
[info]
checksum=0xf4fc8347
version_name=v0.34.02
complete=true

[addresses]
translation_vector=0x095ca018
language_vector=0x095ca000
creature_vector=0x09588ccc
dwarf_race_index=0x09570660
squad_vector=0x095c6bd4

[offsets]
word_table=0x001C

[word_offsets]
base=0x0000
noun_singular=0x0004
noun_plural=0x0008
adjective=0x000C
verb=0x0014
present_simple_verb=0x0018
past_simple_verb=0x001C
past_participle_verb=0x0020
present_participle_verb=0x0024

[dwarf_offsets]
first_name=0x0000
nick_name=0x0004
last_name=0x0008
custom_profession=0x003c
profession=0x0040
race=0x0044
flags1=0x008C
flags2=0x0090
sex=0x00A6
id=0x00A8
recheck_equipment=0x0148
current_job=0x0274
states=0x0
souls=0x05e8
labors=0x0604
happiness=0x0694
squad_ref_id=0x06f8

[soul_details]
skills=0x01D4
traits=0x01EC

[job_details]
id=0x0008
on_break_flag=0x0011
sub_job_id=0x0040

[squad_offsets]
id=0x0000
name=0x000C
members=0x0044

[valid_flags_1]
size=1
1\name=Not from around these parts
1\value=0x80000000

[valid_flags_2]
size=1
1\name=Dead. Deceased. An Undwarf!
1\value=0x02000000

[invalid_flags_1]
size=7
1\name=a zombie
1\value=0x00001000
2\name=a skeleton
2\value=0x00002000
3\name=a merchant or diplomat
3\value=0x00000040
4\name=outpost liason
4\value=0x00000800
5\name=an invader or hostile
5\value=0x00020000
6\name=an invader or hostile
6\value=0x00080000
7\name=an invader or hostile
7\value=0x000C0000

[invalid_flags_2]
size=2
1\name="dead, Jim."
1\value=0x00000080
2\name=from the Underworld. SPOOKY!
2\value=0x00040000


Save the appropriate ini file (You really should be running df 0.34.02, so I'm going to use that) as /path/to/dwarftherapist/etc/memory_layouts/linux/v0.34.01.ini, apply the diff (or make the indicated edits to scanner.cpp yourself) and finish compiling it, and you should have a linux dt that has the unofficial support for linux DF 0.34.02.

HTH!
« Last Edit: February 18, 2012, 01:21:20 pm by kionmaru »
Logged

DwarfEngineer

  • Bay Watcher
  • Grumble Grumble...
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1100 on: February 18, 2012, 01:25:19 pm »

<snip>

Thanks, I saw you update the issue and figured I'd get the change checked in. I'll try to work on some 'official' linux support at some point this weekend / week, but for now I need a break.
Logged
Current Dwarf Therapist Maintainer - Tips

kionmaru

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1101 on: February 18, 2012, 01:37:20 pm »

DE, I absolutely understand how you feel. Mad crunch time equals exhausted neurons. You are more then welcome. And thank you for an excellent program :)

Also, thanks to Darmarius and Dyn for doing really good work with offsets for 0.34.01 - I'd probably still be trying to figure out how to find the souls offset.


Logged

ubermonkey

  • Escaped Lunatic
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1102 on: February 18, 2012, 01:38:48 pm »

Everyone might already be aware of this, but apparently the vampire nicknames actually do show up in DT, it's just that they're attached to the Vampire's "true" name. I was looking for "Edim Stelidnish" and found him in DT as "VAMPIRE2 Fathdellith..." So apparently vampires store their disguise names somewhere else.

I have a save with 4 "tagged" (nicknamed & stored in a burrow) vampires, but it's from .01 so I'm not sure how helpful that would be.

*Edit to say: DE (plus everyone here who's helped finding memory offsets), thanks for the amazingly quick updates to DT.
« Last Edit: February 18, 2012, 01:48:09 pm by ubermonkey »
Logged

Darmarius

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1103 on: February 18, 2012, 02:12:44 pm »

The turn_count offset for linux is 0x052b; should be the same for both version (I haven't tested on 0.34.02)

A small caveat to this: I still have all my original dwarves, but not all have the same turn count: I've got one unconscious/stunned dwarf which turn count is 45 "ticks" below the others. He just was injured by a mis-organized cave-in. He hasn't waken up yet and I don't have the time right now to set my hospital to test whether its value will update when he wakes up, but it's something you should look into, I think.

Thanks for the release DE!
Logged

DwarfEngineer

  • Bay Watcher
  • Grumble Grumble...
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1104 on: February 18, 2012, 03:18:24 pm »

The turn_count offset for linux is 0x052b; should be the same for both version (I haven't tested on 0.34.02)

A small caveat to this: I still have all my original dwarves, but not all have the same turn count: I've got one unconscious/stunned dwarf which turn count is 45 "ticks" below the others. He just was injured by a mis-organized cave-in. He hasn't waken up yet and I don't have the time right now to set my hospital to test whether its value will update when he wakes up, but it's something you should look into, I think.

Thanks for the release DE!
There's quite a bit of fudge-factor when figuring the migration wave based on turn count. I'm going off my previous calculations of 1200 ticks per day, 28 days per month. Right now I'm grouping turn counts within a month of each other, but that could be upped to about 2.5 months or so if it needs correcting. So in reality a dwarf can fall behind by about 33600 ticks before he'll get bumped out of the wave.
Logged
Current Dwarf Therapist Maintainer - Tips

Zanielyene

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1105 on: February 18, 2012, 03:38:36 pm »

if ya'll are still adding features, I would kill for an option to turn off the "cannot talk to dwarf fortress" prompt that comes up when the connection to the game is lost.

I tend to run therapist and DF from a batch file so it's kinda annoying to click "okay" to the prompt each time i start the game.
Logged

Captain Mayhem

  • Bay Watcher
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1106 on: February 18, 2012, 04:08:11 pm »

if ya'll are still adding features, I would kill for an option to turn off the "cannot talk to dwarf fortress" prompt that comes up when the connection to the game is lost.

I tend to run therapist and DF from a batch file so it's kinda annoying to click "okay" to the prompt each time i start the game.
You already have that option, though :)
1: Open up DT
2: Go to "File" and "Options"
3: Uncheck "Load Dwarves on Startup"
Et voila.
Logged

TheReverendTholomewPlague

  • Escaped Lunatic
  • Gaming. Modding. Eating. :D
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1107 on: February 18, 2012, 04:41:42 pm »

if ya'll are still adding features, I would kill for an option to turn off the "cannot talk to dwarf fortress" prompt that comes up when the connection to the game is lost.

I tend to run therapist and DF from a batch file so it's kinda annoying to click "okay" to the prompt each time i start the game.

Ahem: http://dffd.wimbli.com/file.php?id=5247

Shameless self promotion, but also a better option than a batch file. Customisable, too :)

ChudDwarf

  • Escaped Lunatic
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1108 on: February 18, 2012, 09:34:38 pm »

I'm sure others have noticed this as well, though I haven't seen mention of it in this thread yet that I can recall; DT seems to consistently disagree with DF on how many dwarves there actually are. It seems to get out of sync after the third or so wave of immigrants, maybe in the 40 dwarves range or so, and will often be off by 6 or 8.

Sometimes it will get back into sync, and then diverge again. I haven't gone through the rolls one at a time to see who is the discrepancy, but it's fairly reproducible for me.

In 34.01, DT tended to think there were more dwarves than DT knew about; in 34.02 it's the other way around (based on a sample size of one game each, so that may well be just chance).

Thanks for all your work!
Logged

Buttery_Mess

  • Bay Watcher
  • 11x11
    • View Profile
Re: Dwarf Therapist (LATEST 0.6.12 2/18/12 see first post)
« Reply #1109 on: February 18, 2012, 09:48:06 pm »

@ChudDwarf

Dwarf therapist shows all dwarves in the migration wave before they show up on the map. It's one of the many things we love about it.
Logged
But .... It's so small!
It's not the size of the pick that counts... it's the size of the man with the pick.
Quote from: Toady One
Naturally, we'd like to make life miserable for everybody, randomly, but that'll take some doing.
Pages: 1 ... 72 73 [74] 75 76 ... 192