Community-patch-dll: patch release july 16th

[ilteroi]

with gazebo's continued absence it's time for a patch release ... can somebody link this on the forum?

(see below)

notes:

• replace the DLL in you mods/community patch folder with this one
  
  
  
  • goes on top of the 6/19 release
  
  
  • this patch breaks savegames!
  
  
• i'm including the PDB file. this should be placed next to the DLL.
  
  
  
  • if anybody experiences a crash, please upload the callstack.log file!
  
  
• this is only my stuff, the diplo changes from recursive are not included
  
  
  
  • because they need database changes ...
  
  

changes:

• fixed disappearing air units
• civilians can always stack, combat units can not stack, independent of domain
  
  
  
  • if necessary we can make embarked combat units stronger
  
  
• improved AI tactical behavior
  
  
  
  • at least i hope so, need feedback
  
  
• major performance improvement
• max religion spread distance is now equal to trade distance
  
  
  
  • different for land/water, depending on buildings
  
  
  • on average pressure is higher than before now
  
  
• misc smaller bugfixes

[RecursiveVision]

@ilteroi I posted it on the forum for you: https://forums.civfanatics.com/threads/new-official-version-june-19th-6-19.659579/page-25#post-15838563

[LoneGazebo]

I wonder how the AI will handle the embark rules when they try to do a combined landing assault. @ilteroi you've tested for that?

[ilteroi]

@RecursiveVision 👍
@LoneGazebo : are there any special rules you are alluding to? as far as i know everything works, otherwise i wouldn't have made it public. but then you never know ... welcome back anyway!

[RecursiveVision]

@ilteroi Which branch did you use to create this build? #6813 (a merge error from when Gazebo merged the branches earlier) is preventing EUI leader information from displaying - and a few other things were reverted as well. I fixed the issue for next version, but I can release a build fixing the merge errors in the interim.

Also, debug or release config?

[ilteroi]

it's not pushed yet, can do that when i get home.

also, release build with debug info.

[dailyminerals]

Will that next version be posted here or somewhere else?

[LoneGazebo]

@ilteroi oh just talking about the volume of units that muster during a mixed invasion.

[RecursiveVision]

@dailyminerals Here, and on the forums. Will fix today.

[RecursiveVision]

@ilteroi Fix uploaded and posted on the forums. Savegame compatible with your patch above. https://forums.civfanatics.com/threads/new-official-version-june-19th-6-19.659579/page-26#post-15841668

I included the PDB files in both .zip files below.

(links removed)

Here is the code I used in case of any problems:
https://github.com/RecursiveVision/Community-Patch-DLL/commit/8849f4494b6c6b5de8c6bc0281ee776bc696af9a

Note that this code modifies the build to be compatible with the database files that were installed by Gazebo's 6-19 release executable - NOT the ones that are currently uploaded on the repository - although merging #merge-fix, if you do so, will still work with the repository's database files because it adds new functions without removing any.

Database and build files will all be fixed in my pull request for next version.

[RecursiveVision]

@ilteroi With G's return all my changes and all your pushed changes have been merged into the master branch, so I recreated ole for you if you wanna use it...also considering how many files I modified (including some you modified as well; I merged both of our changes) you may want to be working from the latest code.

[ilteroi]

new build, july 27th

(link removed)

this includes a bunch of tactical ai improvement and might also fix animations for failed interceptions.

(link removed from original comment)

[RecursiveVision]

Hey @ilteroi, unrelated but there's speculation on the forums that your account issues there are due to some kind of secret pact between Firaxis and CivFanatics - which seems ridiculous to me given that VP has five subforums and Gazebo is still there, and I said as much here: https://forums.civfanatics.com/threads/new-official-version-june-19th-6-19.659579/page-33#post-15855635

May help if you explained the issue you're having?

Edit: Posted this in the wrong issue thread by mistake

[azum4roll]

I assume that's not savegame compatible?

[RecursiveVision]

@azum4roll My fix is compatible with ilteroi's, neither of them are compatible with 6-19-2.

[ilteroi]

july 27 is not compatible.

re: civfanatics, i got a warning from google to change my password ... but that somehow didn't work so i'm stuck in limbo. never got any confirmation emails. tried contacting the admins but no answer. ran out of patience, can live without.

[bigcat88]

Does statecraft issue with adding plain count of res present here or it is already fixed?

[yyEdge]

Many thanks for fixing the air interception animation issue!

[RecursiveVision]

@ilteroi I spoke to an admin on the forums and he responded regarding your account:

"I checked ilteroi's account and I see he is from Germany and uses gmx as an email provider. We have long standing issues with gmx blocking our emails as spam. I will reset his password and send him a temporary password via a conversation. The problem is, if he doesn't get it, I may have to relay it through someone else?

I also saw in the admin site a second account named ilteroi_the_second. I will try contacting him via conversation to see if it is indeed him."

If you're unable to access your account properly despite that, let me know and I'll let the admin know.

[bigcat88]

@ilteroi can you fix this pls? ))
Statecraft (POLICY_PHILANTROPY) gives 34 amount of each res...
https://github.com/LoneGazebo/Community-Patch-DLL/issues/6695

[ilteroi]

@RecursiveVision : thanks for facilitating. i can create a new account with another email address if necessary.

@bigcat88 : i assume it's fixed already but not in my branch. and i'm afraid of merging because then i would need to do a full release, which i can't.

[RecursiveVision]

@ilteroi To fix it you just need to comment out the three lines in CvPlayer.cpp that call getResourceFromCSAlliances. Which actually isn't fixed in master due to an oversight, so if you fix it in your branch, that'd work.

Re: Your account - no problem. The admin I contacted was leif erikson, so if you create a new account with a compatible email domain and contact that admin, they said they'll help you solve the issue.

https://forums.civfanatics.com/members/leif-erikson.26891/

[CppMaster]

I'm playing July 27th build and I get this error when hovering over leaders:

Is that a quick bug to fix?

[RecursiveVision]

@ilteroi I see you didn't base your new code on the merge fix branch. :)

[ilteroi]

my bad ... can you tell me the id of the commit i should merge against? and which works without database changes?

edit: also i need more info on this getResourceFromCSAlliances() thing. which three lines? there are many to choose from.

[azum4roll]

edit: also i need more info on this getResourceFromCSAlliances() thing. which three lines? there are many to choose from.

The last 3 occurrences I bet.

[RecursiveVision]

@ilteroi https://github.com/RecursiveVision/Community-Patch-DLL/commit/8849f4494b6c6b5de8c6bc0281ee776bc696af9a

This works without database changes.

[RecursiveVision]

For the getResourceFromCSAlliances thing, compare the diplomacy branch to master and check the CvPlayer.cpp changes - that should fix it.

[RecursiveVision]

https://github.com/LoneGazebo/Community-Patch-DLL/compare/diplomacy

[LoneGazebo]

Once you guys have your merge commits sorted out, let me know and I'll make a master merge and merge my meager changes in.

[RecursiveVision]

@LoneGazebo I would make another combined pull request but I'm on vacation with no computer access.

Master branch currently contains all of my changes - and all of ilteroi's changes up to "performance improvement for tactsim".

So to correctly merge everything, you'd need to:

• Merge the changes from ilteroi's commits on July 21 onwards in the drk branch

• Recomment out the 3 lines from CvPlayer.cpp (getResourceFromCSAlliances, described just above - since that's the only fix that wasn't merged properly)

• Add in your own changes

[RecursiveVision]

Since an automatic merge will not work....let me see what I can do via my phone.

Also you can ignore the diplomacy branch - I haven't tested my memory rework yet, as I explained in #6833.

[RecursiveVision]

Okay, so ilteroi has made changes to the following files since my merge (in pushed commits).

These files were not changed by me, so you can just replace the master branch version of the files with the drk version with no issues:
CvAIOperation.cpp
CvAStar.cpp
CvMilitaryAI.h
CvPlot.cpp
CvPlot.h
CvReligionClasses.cpp
CvTacticalAI.cpp
CvTacticalAI.h
CvTradeClasses.h
CvUnit.h
CvUnitCombat.cpp
CvLuaPlot.cpp

These files were also changed by me, so merging them could cause merge errors:
CvCity.cpp
CvHomelandAI.cpp
CvMilitaryAI.cpp
CvPlayerAI.cpp
CvTradeClasses.cpp
CvUnit.cpp
CvLuaPlayer.cpp

For these seven files, I would use WinMerge or (probably easier) just paste in the changes that were made after "performance improvement for tactsim" manually, since there seems to be problems with the automatic merge.

[ilteroi]

honestly i think we should do a little git tutorial, this is hell right now. but i was at least able to merge cleanly.

@LoneGazebo : what's your timeframe for a proper release?

we still have those crashes to sort out ... did you make any progress on them? unfortunately my callstack gambit didn't work out so well. maybe we can recruit somebody who experiences crashes to run it in windbg or the visual studio debugger.

[RecursiveVision]

If there's a better method for merging I'd be happy to learn that - merging everything manually took hours.

While we're on the subject of useful tutorials, it'd be pretty cool if we had comprehensive tutorials on how to install the IDE, build the DLL, fix build errors, use the debugger, and analyze crash reports. If this were easily accessible knowledge we could have more contributors to the project. I've learned how to do the first three but am still unclear on the other two.

[LoneGazebo]

@ilteroi just recovering from a head-cold; tomorrow is my birthday, so I'm taking the day off. Maybe this weekend?

[ilteroi]

well there are a million visual studio tutorials on the net ... for debugging, this shows the basics: https://docs.microsoft.com/en-us/visualstudio/debugger/debugger-feature-tour?view=vs-2019 . one specialty is that since we only build the gamecore DLL, i typically start the game manually and then use "attach to process" when the game is running.

analyzing crash dumps is hard. callstacks can be corrupted or misleading, you need the right symbols, etc. but take a look at #6459.

@LoneGazebo : no rush, i'll just do another patch release.

[RecursiveVision]

@LoneGazebo Happy birthday! 😄

[azum4roll]

I'd help if Visual Studio doesn't take 5 minutes to load on my laptop and take a huge chunk out of my 8GB RAM.