In D4735#201530, @marder wrote:

delete the sele & mace library templates

You need to find out how to delete these files correctly when you create a patch. Every time I try to apply one of your patches with deleted files, the files are always empty and not deleted, I have to do it manually. This is also the reason why the ci in D4713 failed.

#6587
s0600204 wrote:

The issue with the Structure Tree is that r26015 removed default Researcher/TechCostMultiplier values; and whilst r26192 fixed that for the simulation, a fix was not applied to globalscripts which expects there to be values for each possible resource specified within templates.
This is causing other technology costs to be displayed incorrectly within the Structure Tree, such as those of the Mauryan temple and the Gallic forge

rP27009

General

• The fortress should come after the defense_tower

Civ list

athen

• @wraitii has already began something differnt here, see rP25239
• that is why the gymnasium and prytaneion is listed before the wonder

• super_dock should sit next to the wonder (only accessible in phase 3)

• they have one extra building now

• they have one extra building now

#6593

With rP26996 there are two new techs phase_city_pers.json and phase_town_pers.json, both are (wrongly) listed by the checkrefs.py script, see log output below for more clarity.

unused aura.
#6544

I am happy with it, it fixes all the errors from the ticket.

It found all unused files from the current change set and 26899. I also tested if the name of an aura/tech was the same but in a different folder, it found those correctly too. It even found techs where the autoResearch was set to false. 👌

After applying the patch the python script successfully found the unused han_hero_wei_qing_3.json file.

Sorry for not being clearer!

It fixes the first issue in the referenced ticket, the second issue, the selection of units, can still be reproduced after applying the patch.
Will attach a replay with latest GIT version + D4727.

I have to say that I am very disappointed with the decision to proceed with this patch. Detailed comments were simply ignored I will definitely not continue to work on this project if this carries on.

rP26961

• reduce the size of the dialog for the openURL(url) function, it was added with rP15062 and is with 600px unnecessarily long
  • The box showing the link is very useless and can be removed, it is broken anyway for very long links e.g. Multiplayer → Game Lobby → Terms of Service → View online
    • The conformation box for opening URL's has already be removed for Mod selection → Help → Modding Guide/ Visit mod.io
• reduce the button size for the case there is only one button on the dialog box
  • make it adoptive to the text length a little bit, but the button should not stretch across the entire message box window
• Pick a height for the red buttons, just enough to hold two lines of text and the proportions of the message box are aesthetically pleasing, 40px looks good. These confirmation options are not supposed to be very long. The string "Quit and View Summary" from rP25978 should have simply be "Summary".
  • Alternatively

my idea would be a two size solution. One for short words / one lines and one for two lines.

If you have too much time, wrap the function in a loop and see if the probability of each civ is now roughly equal when you draw 1000000 times.

Setup:

• create LongStringLocale for bundled languages (build-archives.sh).

python3 generateDebugTranslation.py --long --languages "ast" "ca" "cs" "de" "el" "en_GB" "es" "eu" "fi" "fr" "gd" "hu" "id" "it" "nl" "pl" "pt_BR" "ru" "sk" "sv" "tr" "uk"

• start

binaries/system/pyrogenesis -conf=locale:long

Impact

rP26969

#6578

rP26950

Apply the patch and compile the game

ok

Check big maps like African Planes or Egypt 3v3

tested Egypt 3v3

Compare performance via F11 (especially gui rendering)

Run entvalidate.py

Apply the patch and compile the game

ok

Follow the steps from #6569

Tested with delenda and with replays from the actual game for openGL & ARB. The problem from the ticket could not be reproduced. The line of sight updates accordingly when moving your units, constructing structures or doing tech vision upgrades. Checking the minimap, testing different shadow options, switching between civilisations and different game speeds could not reveal any problems.

Ternary it shall be.

#6566

#6569

#6560

rP26933

rP26933

discuss the strings that should be displayed

better VICTORIOUS and DEFEATED
see summary tooltip

Music.prototype.DEFAULT_VICTORY_TRACKS = [
	"You_are_Victorious!.ogg"
];

and for defeated YOU HAVE BEEN DEFEATED!

For me it compiles and runs. IDK were the code is used.

Yes, for me too. macOS10.15

This problem can still be seen on the Mainland map with the generic/sahara biome for the Han civic centre.

With the latest update of this patch, I can no longer reproduce the problem described in the ticket.

Check LOS changing by moving unit with enabled/disabled frame limitation with GL and GL ARB

Just some videos, they both look fine.

Apply the patch and compile the game

ok

Check LOS changing by moving unit with enabled/disabled frame limitation with GL and GL ARB

See patch D4681.
This commit makes the problem more visible, but is not the actual cause of the bug.

In D4677#199006, @Stan wrote:

@Langbart can you try to build this on your mac? It seems the tests fail to build.

The stone mine on the Anatolian Plateau looks better with this patch.

It fixes the problem described in the ticket.

#6552

#6553

#6553

#6546

With the default settings, it now looks more elegant and beautiful.

Apply the patch and compile the game

ok

Check that minimap looks like before with GL and GL ARB backends

ok

Check that map revealing looks like before
Check that LOS behaves like before

Yes, but it should be noted as soon as I added smoothlos = "true" to my user.cfg without the patch being applied I would crash for any rendererbackend. After applying the patch I could set smoothlos to "true" and would not crash for both rendererbackends.

Patch applied

Units demo

openGL: https://ttm.sh/bad.43.png
openGL ARB: https://ttm.sh/ba2.01.png

elephant_worker.json could be removed.

Apply the patch and compile the game

Ok

Check that GL minimap looks similar/same to GL ARB

Minimap looks good, but look at the textures on the scenarios/arcadia map. They appear more squared on openGL than on openGL ARB.

In D4659#198186, @marder wrote:

So I think changing everything to that might be the best and if its just for consistency reasons.

D4607

:) no matches found for Han Chinese, only the single word Chinese still shows up in some files e.g. Chinese Fire Ship Alight , should it be called Chinese ... or Han ... / Han Dynasty ... ?

In D4659#198119, @asterix wrote:

I agree, did you try to use grep?

see D4627
"Needs another fix to be tested so trust me bro ™"
ok

Apply the patch and compile the game

ok

Check that text input and multiline text are correctly clipped

I did not encounter any problems.

Apply the patch and compile the game
Run the game

ok

Change something in shaders

Changing binaries/data/mods/public/shaders/glsl/common/debug_fragment.h while the game is running

• from return vec3(alpha);
• to return vec3(1.0, 0.8, 0.0) * (1.0 - alpha);

It would crash without the patch being applied.
With the patch, a crash could no longer be observed and the colour change takes place correctly within the game window.

see D4639

Arcanist wouldn't let me apply the patch, but doing it manually did the trick.
Patch fixes the problem described in the ticket.

a problem with openGL ARB was tracked down to this changeset.
see #6537

Apply the patch and compile the game

Ok

Compare performance for Combat Demo Huge

Before: ~170
After:~85
https://ttm.sh/bkP.jpg

see rP26852

Apply the patch and compile the game

1. Applied the patch with pull0ad.
2. When compiling, I get a myriad of new warnings. It did compile though.
   • Entire build log: https://ttm.sh/b4G.txt

Ok, tested on random/unknown, skirmishes/corinthian_isthmus_2p and skirmishes/forest_battle_4p maps. The issue from the ticket could not be reproduced.

An issues was found tracked down to this changeset. See #6531

see rP26849

In D4631#196937, @Langbart wrote:

Check that game looks like before (with different settings): water, shadows, particles, skies, trees, terrain, ao

(not yet, will upload some images later)

The mentioned performance difference between OpenGL and OpenGL ARB in D4631 is caused by this changeset. See ticket #6525 for more details.

bisecting leads me to this changeset for ticket #6524

Apply the patch and compile the game

It worked for the most part with arc patch D4631, but I had to create source/ps/containers/Span.h manually.
It did compile.

Check that game looks like before (with different settings): water, shadows, particles, skies, trees, terrain, ao

(not yet, will upload some images later)

Compare performance

• system_info.txt is here #5969
• I created a map with 5 players (me+4AI's) on a normal sized Ratumacos map. Entered the cheat code gift from the gods and have 91 horses run around the edge of the map..

Procedure (Visual Replay):

1. add profiler2.autoenable = true to user.cfg file
2. run the following command 0ad/binaries/system/pyrogenesis -mod=public -replay-visual=PATH
3. open profiler2.html in browser (but only when the loading screen disappears and the actual replay starts)
4. replay begins, choose paria and click Follow Player
5. replay ends, click Save Live Report to file
6. save profiler2.jsonp from the log folder and rename it accordingly
7. perform this for default settings with OpenGL and OpenGL ARB with/without applying the patch.

In D4623#196589, @sotirangelo wrote:

The time elapsed should display properly now.

Yes, it is fixed. I did not find any other issues when testing the patch. Seems to work as planned. Good job.

In rP26269#57641, @wraitii wrote:

Hello, thank you for taking the time to create a patch.
I noticed the following:

• Start a normal game e.g. Random/Guadalquivir River and press Shift+F5
• end the game, return to the Main menu and open Load game.
• The Played time is always 00:00

In rP26269#57636, @Stan wrote:

Does it work if you replace the ENSURE by an if ?

In rP26269#57626, @Stan wrote:

Can you be more specific about that issue ? Are we running into that Ensure ? And if so why ?

While working on #6513, we stumbled over this issue.

[01:42:34] Langbart could we do it like  wraitii  and make an if statement ?
[01:42:36] Langbart https://code.wildfiregames.com/D4459#change-tcKZz2mtyCmK
[01:44:26] elexis ehm
[01:45:21] elexis that was before bbs commit
[01:45:53] elexis if that texture manager commit is not reverted, then you possibly might not only may but have to add that if statement
...
[01:58:54] Langbart I am at rP26583 and the -autostart-nonvisual is running correctly.
[02:01:04] elexis did you test with a random map or skirmish/sceario?
[02:01:28] Langbart binaries/system/pyrogenesis -conf=mod.enabledmods:"public" -autostart="scenarios/arcadia" -autostart-nonvisual
[02:02:30] elexis this line
[02:02:30] elexis     ENSURE(CTerrainTextureManager::IsInitialised()); // we need this for the terrain properties (even when graphics are disabled)
[02:02:30] elexis totally looks like 26269 should have changed that
[02:03:59] elexis oh
[02:04:06] elexis try a random map
[02:04:13] elexis I tried the units demo map in that replay
[02:04:36] elexis that wasnt a random map actually, hm
[02:04:46] elexis a skirmish map that places the entities from a JS simulation script
[02:05:21] elexis so the question now is why does our code run CXMLReader::ReadTerrain but at rP26583 it doesnt
[02:08:53] elexis grep -R 'Terrain' -l | grep xml | sort
[02:09:00] elexis shows that only few maps have this element
[02:09:10] elexis units_demo.xml one of them
[02:09:22] elexis arcadia not
[02:09:41] elexis so try units_demo if you can
...
[02:11:55] Langbart arcadia works
[02:11:58] Langbart units dem does not
[02:12:05] Langbart i am at rP26583
[02:12:15] elexis so you can raise a concern there on that particular line
[02:12:23] Langbart do u want the lldb ?
[02:12:34] elexis it will be the same
[02:12:39] elexis the error is clear now
[02:12:48] elexis wraitii removed some lines but not all

Line 561 in MapReader.cpp

update adding if (text)

In rP26815#57590, @vladislavbelov wrote:

Fixed in rP26833.