Improvements to the Lua map generator #993

CelticMinstrel · 2017-04-21T08:28:19Z

No description provided.

CelticMinstrel · 2017-04-22T19:11:38Z

Anyone have any idea why the latest commit doesn't work? There's two problems with it:

If I use map:set_tile like the comment says it should, I get an assertion error saying that the map's width is broken (there are more or fewer terrains in some row than the map width).
With the current implementation, the road is patchy and disconnected.

gfgtdf · 2017-08-07T11:41:22Z

@CelticMinstrel you have changed the milestone to 1.14.1 but since it has changes that add new syntaxes/features this cannot be done during a stable release. We could eigher make it before 1.14 or at 1.15 .

EDIT: since we already have some conability breaking changes in 1.13 with cave map generators i'd really prefer doiing this in 1.13 . If it's just the last commit that doesn't work we coudl alos merge the other commits already and postpone that one for 1.15

CelticMinstrel · 2017-08-07T14:46:42Z

@gfgtdf – Ultimately I wanted to have a multiplayer cave map which basically shows off the new cave generator features, and I believe the road cost thing is basically needed for that. I think the patchy and disconnected aspect of the road is probably something about order of operations (as if the road is being added correctly, but then something else is overwriting it later).

EDIT: Oh, the problem with using set_tile might be that it doesn't verify that the location is on the map.

CelticMinstrel · 2017-08-14T22:14:29Z

Okay... there are still some things I want to do (mainly adding user config option on the cave map), but I think this could be mergeable at this point.

The road algorithm does seem like it could use some improvement, mind you - the road I'm getting is pretty patchy. Tweaks to the scenario WML for the cave map would also be welcome (maybe @sigurdfdragon would have some ideas on improving it?).

sigurdfdragon · 2017-08-15T04:59:14Z

I may be able to take a look at this on Thursday.

sigurdfdragon · 2017-08-18T02:17:18Z

@CelticMinstrel The things that may fix the patchiness are:

There isn't a [road_cost] entry for all types of terrain that might be encounter. At least Sm (muddy swamp) and Rb^Fetd are listed as clear terrains in the generator, and there's no road cost them. Try adding those and looking for others. The gist is to make sure there is a [road_cost] tag for anything the generator may encounter from point A to B.

Also Ur^Ii & Ur need to have an entry at the bottom of the list of converting into themselves with a cost of 2

Try more standard road costs for various terrains (ie, 10, 20, 25, 30 etc) Use 50 as the highest. Use 2 as the lowest amount. I don't know why / don't remember why mainline doesn't use 1 for MIN_ROAD_COST macros, but there's probably a reason.

CelticMinstrel · 2017-08-20T02:39:32Z

Thanks for the tips. I'll try applying these suggestions, probably tomorrow.

CelticMinstrel · 2017-08-26T23:36:48Z

Those tips seem to have worked, thanks! I think this can now be merged; I do still want to extend it to allow up to 9 players (or at least 8; 9 might be a bit hard), and to allow some configuration of parameters, but aside from that it all seems to be fully-functional, and the map it generates doesn't seem to be too terribly boring either. At most it could use maybe a few tweaks, maybe making the lake bigger, adding a river, or something like that.

CelticMinstrel · 2017-08-27T01:51:25Z

...okay, I spoke a little too soon. There's this weird bug whereby the map (sometimes?) doesn't generate until you click "Regenerate". That is, at first you see nothing and it says the map is 0x0. Click "Regenerate", and it all works.

gfgtdf · 2017-08-27T11:14:38Z

please make the return value of the lua user_config optional.

CelticMinstrel · 2017-08-27T14:10:31Z

Okay, so basically all working now, I guess. There's still some room for improvement, mind you; if you make the lake large enough, you'll get villages dotted through it, for example. I also got twice as many castles as players, for some reason.

CelticMinstrel · 2017-08-28T01:34:01Z

In other words, unless @sigurdfdragon or others want to suggest some tweaks, this can be merged whenever.

sigurdfdragon · 2017-08-28T17:57:22Z

I'll be able to take another look at this on Wednesday.

gfgtdf · 2017-08-30T19:25:35Z

just to be sure, this doesn't change behaviour of the 2 mainline scneraios where the cave random map generator is used, right?

CelticMinstrel · 2017-08-31T00:00:10Z

It shouldn't, since it's only adding additional capabilities to the generator and using them in a brand-new MP scenario. Still, it wouldn't hurt to check, just to be sure...

(That said, I'd argue that we should consider using some of these new capabilities in the two mainline scenarios. With these upgrades it could be possible to get rid of all those SCATTER_EMBELLISHMENTS macro calls in the HTTT scenario, for example. However, that's outside of the scope of this PR.)

sigurdfdragon · 2017-08-31T02:26:29Z

I found the following bugs:

The number of villages produced on HttT 17 & SoF 4 is consistently lower than on current master. (ie, around 6-7 on SoF 4, whereas on master approx 15-35) The villages that are produced are at the bottom of the map, and the count thins out when you go up. This is most obvious on HttT 17
The double keeps seem to only start occurring when the settings box is opened, regardless of wether or not anything is changed. Once it happens, it's sticks, until the create game screen has been exited and re-enterted.
<illegal tile in map (2 Ko) '2 Ko'> (or similar) occurs occasionally on regenerating. The smaller the map & higher number of player seems to make it more likely to occur? My guess is that it might be trying to put a keep on top of an existing keep? (fixing double keep probably fixes this)
'Roads between castles' checkbox does not appear to work, as there are still roads when the checkbox is removed.
Not sure if it is intentional or not, but the roads generated look to be a width of 3, whereas roads on the default map generator are typically a width of 1 hex.

Lake villages - A way of dealing with them could be to add a prestart event to convert villages surrounded by water into merfolk villages.

CelticMinstrel · 2017-08-31T02:50:00Z

The roads were intentionally wide, with width=2... not sure why they're 3 wide though when I'm asking for 2 wide. I'll look into these issues, maybe this weekend or early next week.

Vultraz · 2017-09-06T08:02:55Z

Do you still have issues with the settings dialog?

sigurdfdragon · 2017-09-06T22:18:59Z

I should be able to check the settings issue post 86f0262

by the end of the week

@virtualghetto

…, or relative to the map center Special credit to @virtualghetto for spotting an off-by-one error and a rounding error in the first draft of this commit.

(Also fixed a missing undef in the sample MP cave map)

(Who knows, maybe some language has its own standard way of displaying ratios!)

…settings

(This is the same API that World Conquest uses for its map generation.)

Every place it's called already passes a default-constructed config, so this won't affect any existing code. The removed assert is pointless when it'll be cleared by the call, and the two places that called that function also passed a default-constructed config already, so it was doing nothing.

… ground

- Detect obvious cases of inheritance loops - Don't try to keep track of tags with a super tag that exist within a conditional tag - When searching for a tag path, don't append the leaf to the full path

CelticMinstrel · 2023-08-01T02:42:14Z

Updated todo list (copied from #993 (comment) and deleted completed tasks):

Villages dotting the lake should be converted to water villages
Various issues, including in HttT
- Village distribution issue
- Occasional "illegal tile (2 Ko)"?
- Roads are too wide
Bridges issue
wesnoth.unit_types and wesnoth.terrain_types are now available in map generation scripts #5838

CelticMinstrel force-pushed the lua_mapgen_stuff branch from 9b623f9 to 829e700 Compare April 22, 2017 19:09

Vultraz added this to the 1.13.8 milestone Apr 27, 2017

CelticMinstrel modified the milestones: 1.13.9, 1.13.8 May 12, 2017

CelticMinstrel removed this from the 1.13.9 milestone Jun 13, 2017

CelticMinstrel added this to the 1.14.1 milestone Jun 25, 2017

CelticMinstrel modified the milestones: 1.13.9, 1.14.1 Aug 14, 2017

CelticMinstrel force-pushed the lua_mapgen_stuff branch from 829e700 to 171b3e0 Compare August 14, 2017 22:12

CelticMinstrel force-pushed the lua_mapgen_stuff branch from 171b3e0 to 8867c39 Compare August 26, 2017 23:33

CelticMinstrel changed the title ~~[WIP] Improvements to the Lua map generator~~ Improvements to the Lua map generator Aug 27, 2017

CelticMinstrel added 10 commits July 21, 2022 00:09

Add a little more variety to the cave map (trees, swamp)

e48fd52

Fix road patchiness, missing keeps, and boring tunnels

2b550f8

Allow specifying chamber locations relative to any map edge or corner…

f413147

…, or relative to the map center Special credit to @virtualghetto for spotting an off-by-one error and a rounding error in the first draft of this commit.

Allow mapgen user_config functions to mutate the [generator] config

e4c24be

(Also fixed a missing undef in the sample MP cave map)

Use variables for village density label

2b98b08

(Who knows, maybe some language has its own standard way of displaying ratios!)

Implement a settings dialog for the sample cave map generator

054d918

Make it optional for the map generator user_config to return the new …

78efe7a

…settings

Make the cave map user settings code look a bit cleaner

574f132

Fix roads preferring to burrow through walls

bc8f6c9

This should be translatable apparently

184b8a0

CelticMinstrel force-pushed the lua_mapgen_stuff branch from d803a55 to 5d8c72c Compare July 21, 2022 17:53

CelticMinstrel added 2 commits July 21, 2022 21:32

Update schema

3bb1994

Fill in the error messages in the settings code

6400b40

CelticMinstrel force-pushed the lua_mapgen_stuff branch from 5d8c72c to 1c23498 Compare July 22, 2022 01:32

CelticMinstrel added 9 commits July 22, 2022 08:58

Expose some missing functions in the mapgen kernel

2a02fdc

Document and deprecate in mapgen_helper

1e5b573

Update cave generator to use the new map generation API

3d06353

(This is the same API that World Conquest uses for its map generation.)

Fix [items] not being added if the chamber had no chance= key

99dce39

Implement support for same_location_as_previous

812d72f

Document some missing map functions

760d1da

Scale central chamber size to map size

e24c35e

If tunnels happen to pass over the lake, replace with ford instead of…

92ba421

… ground

CelticMinstrel force-pushed the lua_mapgen_stuff branch from 1c23498 to 92ba421 Compare July 22, 2022 13:15

CelticMinstrel added 3 commits July 22, 2022 22:27

Schema: Some infinite loop avoidance

cc71f3b

- Detect obvious cases of inheritance loops - Don't try to keep track of tags with a super tag that exist within a conditional tag - When searching for a tag path, don't append the leaf to the full path

Fix incorrect schema reference

1a7406c

That just... doesn't even do anything...

6098c8a

gfgtdf mentioned this pull request Jul 31, 2023

wmllint should handle changes to MapGeneratorWML #5293

Open

cooljeanius assigned CelticMinstrel Aug 1, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvements to the Lua map generator #993

Improvements to the Lua map generator #993

CelticMinstrel commented Apr 21, 2017

CelticMinstrel commented Apr 22, 2017

gfgtdf commented Aug 7, 2017 •

edited

CelticMinstrel commented Aug 7, 2017 •

edited

CelticMinstrel commented Aug 14, 2017

sigurdfdragon commented Aug 15, 2017

sigurdfdragon commented Aug 18, 2017 •

edited

CelticMinstrel commented Aug 20, 2017

CelticMinstrel commented Aug 26, 2017

CelticMinstrel commented Aug 27, 2017

gfgtdf commented Aug 27, 2017

CelticMinstrel commented Aug 27, 2017

CelticMinstrel commented Aug 28, 2017

sigurdfdragon commented Aug 28, 2017

gfgtdf commented Aug 30, 2017

CelticMinstrel commented Aug 31, 2017

sigurdfdragon commented Aug 31, 2017

CelticMinstrel commented Aug 31, 2017

Vultraz commented Sep 6, 2017

sigurdfdragon commented Sep 6, 2017

CelticMinstrel commented Aug 1, 2023

Improvements to the Lua map generator #993

Are you sure you want to change the base?

Improvements to the Lua map generator #993

Conversation

CelticMinstrel commented Apr 21, 2017

CelticMinstrel commented Apr 22, 2017

gfgtdf commented Aug 7, 2017 • edited

CelticMinstrel commented Aug 7, 2017 • edited

CelticMinstrel commented Aug 14, 2017

sigurdfdragon commented Aug 15, 2017

sigurdfdragon commented Aug 18, 2017 • edited

CelticMinstrel commented Aug 20, 2017

CelticMinstrel commented Aug 26, 2017

CelticMinstrel commented Aug 27, 2017

gfgtdf commented Aug 27, 2017

CelticMinstrel commented Aug 27, 2017

CelticMinstrel commented Aug 28, 2017

sigurdfdragon commented Aug 28, 2017

gfgtdf commented Aug 30, 2017

CelticMinstrel commented Aug 31, 2017

sigurdfdragon commented Aug 31, 2017

CelticMinstrel commented Aug 31, 2017

Vultraz commented Sep 6, 2017

sigurdfdragon commented Sep 6, 2017

CelticMinstrel commented Aug 1, 2023

gfgtdf commented Aug 7, 2017 •

edited

CelticMinstrel commented Aug 7, 2017 •

edited

sigurdfdragon commented Aug 18, 2017 •

edited