Ipochto/highground fixes #581

ipochto · 2023-11-24T17:01:28Z

Some fixes to make highgrounds-related wargus's scripts works

… is requested.

…le of map-related lua_registered methods from 'script_ui' to 'script_map'

… file generator.

…t's indexes

src/editor/editloop.cpp

src/guichan/include/guichan/listmodel.h

src/include/map.h

src/include/script.h

src/map/mapfield.cpp

src/map/script_map.cpp

Co-authored-by: Joris Dauphin <[email protected]>

…s into ipochto/highground-fixes

ipochto · 2023-11-25T22:07:42Z

@Jarod42, Sorry I'm not so familiar with github's routine, so it turn out that I'm fixed your suggestions twise - via github and locally.

Jarod42 · 2023-11-28T14:16:10Z

src/include/script.h

+inline int LuaGetArgsNum(lua_State *l)
+{
+	return lua_gettop(l);
+}


For next times, don't hesitate to split your PR.
That change might be a dedicated PR, is unrelated to HighgroundsEnabled feature.

Jarod42 · 2023-11-28T14:19:36Z

src/map/script_map.cpp

+static int CclMapEnableHighgrounds(lua_State *l)
+{
+	Map.Info.EnableHighgrounds(LuaGetArgsNum(l) >= 1 ? LuaToBoolean(l, 1) : true);
+
+	return 0;
+}
+
+static int CclIsHighgroundsEnabled(lua_State *l)
+{
+	lua_pushboolean(l, Map.Info.IsHighgroundsEnabled());
+	return 1;
+}


Might probably go in map.pkg (tolua++) instead.

What's the difference in principle?

I just did it by analogy, depending on how existing functions with similar functionality were translated into lua. If, for example, what concerns gui was translated through 'tolua++', then almost everything I've encountered concerning engine settings or parameters of the current game was done through lua_register() .

To change the method is not a problem. I just want to understand for the future on what principle to choose the translation method.

Not sure neither ;-)

to_lua has been added after.

BTW, the flag seems unused in the Engine :-/ ...
Is there incoming PRs next?
How does it work?

It used here: Wargus/wargus#446

According to this flag we choose to load base tileset or run extended tileset generator to make tiles for highgrounds/ramps/cliffs etc.

Currently

Map.Info.Postamble = "" MapEnableHighgrounds(highgroundsCheckBox:isMarked())

With Tolua, it would be more consistent:

Map.Info.Postamble = "" Map.Info.HighgroundsEnabled = highgroundsCheckBox:isMarked()

but it seems that Highgrounds is more related to tileset than map.
wonder if it is then the right flag/place.
Shouldn't we choose between summer/summer_highgrounds/swamp/swamp_highgrounds...?

Map.Info.HighgroundsEnabled = highgroundsCheckBox:isMarked()

This is a private member and I don't want to open it in case if we will need to do something else with enabling it in the future. At least the network synchronization may be required.

I could use Tolua to open MapEnableHighgrounds()/IsHighgroundsEnabled(), but definitely don't want to make Map.Info.HighgroundsEnabled variable as public.

Shouldn't we choose between summer/summer_highgrounds/swamp/swamp_highgrounds...?

Don't breed entities. )

The player simply selects the basic tileset as before, and wargus chooses whether to load the extended version or not. Moreover, if wargus "sees" that the map contains highgrounds, it will simply hide the possibility to select (in dropDownList) the base tileset, for which there is no possibility to generate the extended version (I am talking about swamp specifically - there are certain difficulties with generation).

For the editor, there is a checkbox to enable highgrounds or not.

So the Map.Info.HighgroundsEnabled is map's property, on the basis of which the choice of which tileset to load is made

I've posted a visual explanation: https://discord.com/channels/780082494447288340/987001693474541570/1179091461820666008

Also the map presentation is loaded before tileset. Tileset loads with game start, but map presentation is uploaded to the stage of choosing the game parameters by the player (in the create a new game menu).

Jarod42 · 2023-11-28T14:20:42Z

src/ui/widgets.cpp

 ----------------------------------------------------------------------------*/

+int StringListModel::getIdxOfElement(std::string_view element)


Suggested change

int StringListModel::getIdxOfElement(std::string_view element)

int StringListModel::getIdxOfElement(std::string_view element) const

Jarod42 · 2023-11-28T14:21:05Z

src/ui/widgets.cpp

@@ -1735,6 +1750,16 @@ void LuaListModel::setList(lua_State *lua, lua_Object *lo)
 	}
 }

+int LuaListModel::getIdxOfElement(std::string_view element)


Suggested change

int LuaListModel::getIdxOfElement(std::string_view element)

int LuaListModel::getIdxOfElement(std::string_view element) const

Jarod42 · 2023-11-28T14:21:23Z

src/ui/widgets.cpp

@@ -2610,6 +2635,13 @@ int ImageDropDownWidget::getSelected()
 	return mListBox.getSelected();
 }

+std::string ImageDropDownWidget::getSelectedItem()


Suggested change

std::string ImageDropDownWidget::getSelectedItem()

std::string ImageDropDownWidget::getSelectedItem() const

ipochto added 12 commits November 24, 2023 15:51

forced reduction of the tile index when an index beyond the slot size…

bcc96b0

… is requested.

Replace lua check args macros with functions

4892681

Lua_register'ed get method for Map.Info.Highgrouns. Also moved a coup…

fcf60e1

…le of map-related lua_registered methods from 'script_ui' to 'script_map'

Register enable highground func, some fixes

92c6d8c

Fix typo

25ef33a

Added information about enabled highgrounds into the map presentation…

b60d1d2

… file generator.

"Layers" -> "Overlays"

27c3f66

PresentMap args changed to some more human readable format.

1161285

Added drop down list's methods to set/get selected Items instead of i…

425fa26

…t's indexes

Fix accidentally damaged character

1cd638b

Removed few debug lines of code

e4c0afb

check for call without arguments

889aa3c

Jarod42 reviewed Nov 25, 2023

View reviewed changes

ipochto and others added 13 commits November 26, 2023 00:07

Update src/include/map.h

b830561

Co-authored-by: Joris Dauphin <[email protected]>

removed unnecessary const, optimized variable name

f6231bf

change from static to inline for functions in a header file

5baf643

Highgrounds->HighgroundsEnabled

aaf7b0b

Update src/map/script_map.cpp

473fae6

Co-authored-by: Joris Dauphin <[email protected]>

Update src/map/mapfield.cpp

63dae4e

Co-authored-by: Joris Dauphin <[email protected]>

typo

5601b3f

Update src/map/script_map.cpp

166fefd

Co-authored-by: Joris Dauphin <[email protected]>

Update src/map/script_map.cpp

2d5ff4e

Co-authored-by: Joris Dauphin <[email protected]>

Update src/map/script_map.cpp

5e49b8d

Co-authored-by: Joris Dauphin <[email protected]>

Update src/include/script.h

d2d6b13

Co-authored-by: Joris Dauphin <[email protected]>

change return to 0, because t Nothing is returned in Lua

5ab2804

Merge branch 'ipochto/highground-fixes' of github.com:Wargus/stratagu…

979a786

…s into ipochto/highground-fixes

Revert changes of guichan.

b9f41e6

ipochto force-pushed the ipochto/highground-fixes branch 2 times, most recently from c27a702 to c936051 Compare November 27, 2023 14:04

ipochto added 2 commits November 27, 2023 17:06

Revert accidental changes in editloop.cpp

3e08359

Revert accidental changes in the lismodel.h

c936051

ipochto requested a review from Jarod42 November 27, 2023 15:38

ipochto added 2 commits November 28, 2023 10:57

fixed variable name in case we will add more optional args

7aa38e1

Remove 'FIXME' comment

dc9cc18

Jarod42 reviewed Nov 28, 2023

View reviewed changes

Jarod42 merged commit e44db04 into master Nov 28, 2023
4 checks passed

Jarod42 deleted the ipochto/highground-fixes branch November 28, 2023 16:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ipochto/highground fixes #581

Ipochto/highground fixes #581

ipochto commented Nov 24, 2023

ipochto commented Nov 25, 2023

Jarod42 Nov 28, 2023

Jarod42 Nov 28, 2023

ipochto Nov 28, 2023 •

edited

Loading

Jarod42 Nov 28, 2023

ipochto Nov 28, 2023

ipochto Nov 28, 2023 •

edited

Loading

Jarod42 Nov 28, 2023

ipochto Nov 28, 2023

ipochto Nov 28, 2023

ipochto Nov 28, 2023

ipochto Nov 28, 2023

Jarod42 Nov 28, 2023

Jarod42 Nov 28, 2023

Jarod42 Nov 28, 2023

		----------------------------------------------------------------------------*/

		int StringListModel::getIdxOfElement(std::string_view element)

	int LuaListModel::getIdxOfElement(std::string_view element)
	int LuaListModel::getIdxOfElement(std::string_view element) const

	std::string ImageDropDownWidget::getSelectedItem()
	std::string ImageDropDownWidget::getSelectedItem() const

Ipochto/highground fixes #581

Ipochto/highground fixes #581

Conversation

ipochto commented Nov 24, 2023

ipochto commented Nov 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ipochto Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ipochto Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ipochto Nov 28, 2023 •

edited

Loading

ipochto Nov 28, 2023 •

edited

Loading