patchFreeciv - Patches: patch #1339, Unit type requirements

 
 
Show feedback again

patch #1339: Unit type requirements

Submitted by:  pepeto <pepeto>
Submitted on:  Sat Oct 17 14:12:36 2009  
 
Category: rulesetsPriority: 1 - Later
Status: NonePrivacy: Public
Assigned to: NoneOpen/Closed: Open
Planned Release: Contains string changes: None

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Thu Jun 26 21:47:13 2014, comment #13:

unit requirements should also replace "obsoleted_by".

Emmet Hikory <persia>
Project Member
Mon May 14 12:10:56 2012, comment #12:

Updated patch trunk rev.21272

Same gmake result...

(file #15739)

J. M. Gorbach <gorb>
Tue Apr 3 08:37:42 2012, comment #11:

Updated patch trunk rev.21114

The patch is different. I don't delete nothing, but I only add new functions: server/ruleset.c, common/unittype.c, common/unittype.h, common/packets.def and client/packhand.c.

gmake result:

(file #15505)

J. M. Gorbach <gorb>
Thu Feb 2 20:02:59 2012, comment #10:

Update new file diff.

I'm at a standstill.

(file #14973)

J. M. Gorbach <gorb>
Tue Jan 10 16:22:46 2012, comment #9:

Fixes common/unittype.h

with

Now remove and rewrite need_improvement, need_government and require_advance.

J. M. Gorbach <gorb>
Mon Jan 9 10:44:37 2012, comment #8:

Fixed client/gui-gtk-2.0/helpdlg.c

Error in compilation:

unittype.h row 232

Any ideas?

N.B. attached clientgui-gtk-2.0helpdlg.diff

(file #14776)

J. M. Gorbach <gorb>
Sat Jan 7 23:16:59 2012, comment #7:

Error with new code.zip. Packtes.def contains many errors. Update new version.

(file #14773)

J. M. Gorbach <gorb>
Sat Jan 7 23:00:22 2012, comment #6:

I found the problem.

common/packets.def lost two strings:

Now I update new Code.zip

(file #14772)

J. M. Gorbach <gorb>
Sat Jan 7 17:09:20 2012, comment #5:

I read in ./generate_packets.py:

Now... probably the problem is in common/packets.def, but I don't find anything. In this file I have edit only 3 rows:

Original

Edit

Generate_packets.py generate packets.def or vice versa?

J. M. Gorbach <gorb>
Sat Jan 7 16:07:42 2012, comment #4:

1. replace in the source code files in data.zip
2. replace in the source code files in code.zip
3. apply file #14713: patch.diff

Try to compile and the result:

Thanks akfaew/dude for the help with compilation

J. M. Gorbach <gorb>
Wed Dec 14 11:20:40 2011, comment #3:

Both patch are for TRUNK.

Now I look for these files:

  • ai/default/advmilitary.c
  • ai/default/aitech.c
  • ai/default/aidiplomat.c
  • ai/default/aiparatrooper.c
  • ai/default/aisettler.c
  • ai/default/aiunit.c
  • client/helpdata.c
  • common/unittype.c

All files contain string ''require_advance'', ''need_improvement'' and ''need_government''.

J. M. Gorbach <gorb>
Tue Dec 13 22:40:59 2011, comment #2:

Update - new patch (untested, maybe bugged and maybe instable)

Remove ''require_advance'' from:

  • client/gui-gtk-2.0/helpdlg.c
  • client/gui-gtk-3.0/helpdlg.c
  • client/gui-sdl/helpdlg.c
  • client/gui-sdl/repodlgs.c
  • client/gui-win32/helpdlg.c
  • client/gui-xaw/helpdlg.c

Problem with client/gui-sdl/diplomat_dialog.c:

I don't know what to do with:

It's only string in all file with ''require_advance''.

(file #14713)

J. M. Gorbach <gorb>
Tue Dec 13 17:24:36 2011, comment #1:

Premise: I'am not a programmer.

That being stated... Patch untested, probably bugged. The size is 677 kb because I'am on Windows and I used WinMerge - awful software -.

Data.zip = cointains all units.ruleset

replace with

Code.zip = contains edited file (packets.def, packhand.c, reqtree.c, ruleset.c and unittype.c)

If it's not clear something.

(file #14710, file #14711, file #14712)

J. M. Gorbach <gorb>
Sat Oct 17 14:12:36 2009, original submission:

Remove the fields of unit types:

  • require_advance
  • need_improvement
  • need_government

Replace them by 'requirement_vector reqs'.

pepeto <pepeto>
Project Member

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #14773:  packets.def added by gorb (48kB - application/octet-stream)
file #14772:  Code.zip added by gorb (82kB - application/zip)
file #14713:  patch.diff added by gorb (13kB - application/octet-stream)
file #14710:  unit_type_requirements.diff added by gorb (678kB - application/octet-stream)
file #14711:  code.zip added by gorb (82kB - application/x-zip-compressed)
file #14712:  data.zip added by gorb (60kB - application/x-zip-compressed)

 

Depends on the following items: None found

Digest:
   bug dependencies, patch dependencies.

 

Carbon-Copy List
  • -unavailable- added by persia (Posted a comment)
  • -unavailable- added by morphles
  • -unavailable- added by jtn (Updated the item)
  • -unavailable- added by gorb (Updated the item)
  • -unavailable- added by dmarks (Updated the item)
  • -unavailable- added by pepeto (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Error: not logged in

     

     

    Follow 15 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun Feb 2 08:22:15 2014morphlesCarbon-Copy-=>Added morphles
    Mon Jun 18 01:15:35 2012jtnPlanned Release2.4.0=>
    Mon May 14 12:10:56 2012gorbAttached File-=>Added trunk-rev21272_requirement_vector.diff, #15739
    Tue Apr 3 08:37:42 2012gorbAttached File-=>Added trunk-rev21114_requirement_vector.diff, #15505
    Thu Feb 2 20:02:58 2012gorbAttached File-=>Added trunk_requirement_vector-02-2012.zip, #14973
    Mon Jan 9 10:44:37 2012gorbAttached File-=>Added clientgui-gtk-2.0helpdlg.diff, #14776
    Sat Jan 7 23:16:59 2012gorbAttached File-=>Added packets.def, #14773
    Sat Jan 7 23:00:22 2012gorbAttached File-=>Added Code.zip, #14772
    Tue Dec 13 22:40:59 2011gorbAttached File-=>Added patch.diff, #14713
    Tue Dec 13 17:24:36 2011gorbAttached File-=>Added unit_type_requirements.diff, #14710
      Attached File-=>Added code.zip, #14711
      Attached File-=>Added data.zip, #14712
    Wed Oct 27 13:54:26 2010pepetoPlanned Release2.3.0=>2.4.0
    Sun Dec 20 09:41:17 2009dmarksPlanned Release=>2.3.0
    Sat Oct 17 14:31:36 2009pepetoDependencies-=>patch #1338 is dependent
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup