Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug reentry of space plane #321

Merged
merged 13 commits into from
Jul 5, 2020
Merged

Conversation

LynxAbraxas
Copy link
Contributor

PR to solve #229.

@LynxAbraxas LynxAbraxas changed the title WIP: debug reentry of space plane Debug reentry of space plane Jun 20, 2020
@LynxAbraxas
Copy link
Contributor Author

LynxAbraxas commented Jun 20, 2020

Reentries of space planes now work even if the game is saved and loaded while a space plane is in space, also for water cities:
ss_2020-06-18_23:55:14
ss_2020-06-19_00:09:46

@LynxAbraxas
Copy link
Contributor Author

A space lift only takes 3 turns with the current implementation:


if(NewTurnCount::GetCurrentRound() >= m_reentryTurn) {

which is more appropriate than 4 turns as stated in the GL, so c1e0e1e changes the GL files accordingly. However for awk to work properly for all language files, also TXT files need to be normalized to use LF as EOL (855e070 and 83be17a), which needs to be tested if that has any negative effect on windows. @MartinGuehmann could you do that?

@LynxAbraxas
Copy link
Contributor Author

I wonder if we should reduce the move points of a space plane. Currently it can move so far in one turn that it often makes little sense to use a space launch unless one wants to pass over enemy terrain. For non-gigantic maps the use of a space launch reduces further. Considering that it seem comparable to the NASA Space Shuttle, its ability to fly from one city to another on its own is not very realistic any way and in case of saying that it gets transported by a carrier, it would be realistic to say that this can be done only with very few move points per turn, while possibly keeping or adjusting the fuel points.

@LynxAbraxas
Copy link
Contributor Author

Halfed move points to better fit the concept also described in the GL:
Although not well suited to transporting short distances, the Space Plane is ideal if you need to quickly get units the other side of the map.

[UNIT_SPACE_PLANE_GAMEPLAY]
The Space Plane is a long-range suborbital <L:DATABASE_ORDERS,ORDER_BOARD_TRANSPORT>Transport<e> vehicle. When launched from a city, it can <L:DATABASE_ORDERS,ORDER_BOARD_TRANSPORT>Transport<e> up to five units to any other city on the map. The <L:DATABASE_ORDERS,ORDER_BOARD_TRANSPORT>Transport<e> takes 3 turns to complete. Although not well suited to transporting short distances, the Space Plane is ideal if you need to quickly get units the other side of the map.
[END]

@LynxAbraxas
Copy link
Contributor Author

Tested this for some time now and seems to work as expected now. @MartinGuehmann ready for merge?

@MartinGuehmann
Copy link
Collaborator

which is more appropriate than 4 turns as stated in the GL, so c1e0e1e changes the GL files accordingly.

Why do you hard encode the value and don't use {UnitDB(UnitRecord[0]).SpaceLaunch}?

@LynxAbraxas
Copy link
Contributor Author

Why do you hard encode the value and don't use {UnitDB(UnitRecord[0]).SpaceLaunch}?

Because it was hard encoded before;-) but I like the idea and changed the commit accordingly.

@LynxAbraxas
Copy link
Contributor Author

Works as expected.

@MartinGuehmann
Copy link
Collaborator

Then we can merge.

@MartinGuehmann MartinGuehmann merged commit eb43d4d into civctp2:master Jul 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants