1. We have added a Gift Upgrades feature that allows you to gift an account upgrade to another member, just in time for the holiday season. You can see the gift option when going to the Account Upgrades screen, or on any user profile screen.
    Dismiss Notice

Merge with BULL?

Discussion in 'Civ4 - Better AI' started by jdog5000, Jun 4, 2009.

?

Would you like to see BBAI come with BULL?

  1. Yes, without BULL I might not use BBAI

    18 vote(s)
    23.4%
  2. Yes, without BBAI I might not use BULL

    23 vote(s)
    29.9%
  3. Yeah, but periodic merges would be fine

    21 vote(s)
    27.3%
  4. Whatever, I'm not picky

    7 vote(s)
    9.1%
  5. No! I need BBAI pure

    8 vote(s)
    10.4%
  1. phungus420

    phungus420 Deity

    Joined:
    Mar 1, 2003
    Messages:
    6,296
    Correct me if I'm wrong EF. But I think the point of your suggested system was so that BBAI and BULL could share an SVN, and the devs of the two projects (mainly EF and jdog) could check in updates to a single project as new code was implemented.
     
  2. EmperorFool

    EmperorFool Deity

    Joined:
    Mar 2, 2007
    Messages:
    9,633
    Location:
    Mountain View, California
    In general I agree with this statement, but we have a fairly disjoint set of changes here. Things I change shouldn't affect things jdog changes and vice versa. The downside to frequent merging is frequent merging. ;) As long as decreasing the frequency doesn't increase the testing required, it will work out.

    That's certainly a possibility we could discuss, but I was more suggesting that a general method of designing SDK mods. We already have BAI and the UP being included in other mods, and I suspect the same will happen with BULL. If we all make our changes using #ifdefs, it should be easier for others to maintain merges of several mods and produce multiple versions with the various bits turned on/off as desired.

    Instead of merging BULL and BAI, we could keep them separate, convert them both to use #ifdefs, and then collectively create a single merge that contains a bunch of these community mods all rolled into one SDK. We'd develop our own mods individually for easier testing, but we'd produce multiple versions from the combined SDK. This might be a lot of work, but I think we could streamline the process, combine forces, and save work instead of having each player individually merge their own desired collection.

    Imagine having a monthly release of the giant merged SDK that has updates from whichever mods had their own updates that month. Of course, the more mods that get included, the more built DLL versions need to be compiled. Anyone have access to a compile farm?
     
  3. joncnunn

    joncnunn Senior Java Wizard Moderator

    Joined:
    Mar 17, 2008
    Messages:
    8,621
    Location:
    Missouri
    Yes, all of the hassles of merging involve the same file changing on both branches.
    The headaches occur when the same lines on the same file changed differently.
    The forget about it is when someone has auto reformatted the files / renamed a file / shared public method.
     
  4. jdog5000

    jdog5000 Revolutionary

    Joined:
    Nov 25, 2003
    Messages:
    2,601
    Location:
    California
    Yeah, I caught Alexman's amphibious assault fix, it's in there as well. As well as a few other things I've found which could be in the Official Patch ...
     
  5. TAfirehawk

    TAfirehawk WoC Team Manager

    Joined:
    Aug 25, 2006
    Messages:
    2,326
    Location:
    Florida
    Wow, this is right in line with the "next step" Johny and I have been talking about for the WoC Lite/Core/SDK/Modular/Thingy :)

    I am just getting in to C++/Python where my previous programming is from many years ago in Fortran/Turbo Pascal/BASIC.

    Once I feel more comfortable in the SDK then I hope to have a round-table of modders to get ideas just like yours EF. The power of modularity in Civ4 BtS has yet to be fully realized but is getting very close...even without Firaxis doing much "right".

    The idea of modular loading has been out long enough and I see a number of people using WoC or doing some of their own modular things so it seems like we are close to bringing everybody together to make our modding easier for us and more enjoyable for the players.
     
  6. jdog5000

    jdog5000 Revolutionary

    Joined:
    Nov 25, 2003
    Messages:
    2,601
    Location:
    California
    Well, the poll is looking quite convincing. The demand for a merged version of BUG and BBAI is huge ...

    So, what should we call it? BUBBA? :mischief:
     
  7. EmperorFool

    EmperorFool Deity

    Joined:
    Mar 2, 2007
    Messages:
    9,633
    Location:
    Mountain View, California
    :lol: EIEIO? I've always wanted to think up a name that would work with that acronym.

    Are you going to support 3.17 or move to 3.19 completely? I've already decided to go to 3.19. Most of the reasons people weren't using the UP 0.21 were because it wasn't "official", but now that that argument is toast, I figure what the heck. Dealing with all the merges is going to be enough of a headache; I don't want to add in multiple SDK versions.
     
  8. jdog5000

    jdog5000 Revolutionary

    Joined:
    Nov 25, 2003
    Messages:
    2,601
    Location:
    California
    Yes, I'm going 3.19 ... testing merged version now actually.
     
  9. Elkad

    Elkad Emperor

    Joined:
    Mar 26, 2007
    Messages:
    1,044
    bull+bai+(new)UP+3.19?

    share? (I could care less if beta code eats my game midway thru, I'm a great abandoner of games anyway)
     
  10. jdog5000

    jdog5000 Revolutionary

    Joined:
    Nov 25, 2003
    Messages:
    2,601
    Location:
    California
    Sorry, just BBAI + 3.19 + new UP for now ... will be up soon as its rock stable.
     
  11. ecc

    ecc Warlord

    Joined:
    Dec 17, 2003
    Messages:
    136
    This is great news, I appreciate the work from everyone :)
     
  12. NikNaks

    NikNaks Deity

    Joined:
    Jul 25, 2006
    Messages:
    2,972
    Location:
    England
    Any progress on this?
     
  13. EmperorFool

    EmperorFool Deity

    Joined:
    Mar 2, 2007
    Messages:
    9,633
    Location:
    Mountain View, California
    We'll definitely make some noise when we're ready. :)
     
  14. Jaroth

    Jaroth Warlord

    Joined:
    Feb 6, 2009
    Messages:
    249
    Location:
    USA
    Looking forward to it... :)
     
  15. the1sean

    the1sean Chieftain

    Joined:
    Nov 8, 2007
    Messages:
    60
    whats the ETA?
     
  16. EmperorFool

    EmperorFool Deity

    Joined:
    Mar 2, 2007
    Messages:
    9,633
    Location:
    Mountain View, California
    I have too many things stacked up in front of it that it would be pointless to pick a date. Probably less than a month from now is the best I guess I can make.
     
  17. phungus420

    phungus420 Deity

    Joined:
    Mar 1, 2003
    Messages:
    6,296
    What about the idea of you and jdog sharing an SVN so that new updates check into each other and you guys develop a standardized core? Did this just not work out?
     
  18. EmperorFool

    EmperorFool Deity

    Joined:
    Mar 2, 2007
    Messages:
    9,633
    Location:
    Mountain View, California
    We're going to maintain a shared SVN for BULL + BBAI. As we make updates to our own SVNs, we'll occasionally check in the collected changes to this new SVN.
     
  19. jdog5000

    jdog5000 Revolutionary

    Joined:
    Nov 25, 2003
    Messages:
    2,601
    Location:
    California
    So they're will be both a shared "BULLAI" repository and separate ones for BBAI and BULL alone.
     
  20. dr_AllCOM3

    dr_AllCOM3 Chieftain

    Joined:
    Sep 24, 2008
    Messages:
    46
    I wanted BTAI+BUG+CarterEarth, so I mashed them together. Hardest part was adding a few dummy civs to the scenario to make it work. Nothing is lost, since there were no file collisions. You maybe have to reinstall Blue Marble.

    Extract into your mod folder.

    + Better AI 0.78c with 48 civs
    + BUG (latest nightly, 3.6? whatever)
    + CarterEarth32 scenario, my favourite earth map by far
     

    Attached Files:

Share This Page