Naval units starting out embarked.

[LoneGazebo]

@ilteroi,

Sometimes, when a city finishes a naval unit, it starts embarked, and there's no easy way to 'disembark' it. Might have something to do with hills, maybe? Seems related to new naval unit city/canal change.

[Iamblichos]

Only way to get them to "disembark" is to put them all out in the water and reload save.

[ilteroi]

will check tonight.

other news:

• i can't reproduce the "melee unit fails to capture 0 hp city" issue
• all in all in my current testgame AI seems pretty competent at tactically
• but i do see a lot of flip-flopping mixed with liberations and razing. and it's not always clear what happened. eg greece captures city from thai. morocco captures next turn. greece captures it back. next turn it's thai again, although no thai units in the vicinity? finally somebody razes the city then.

i've seen at least 30 captures in the last turns here:

[ilteroi]

which reminds me, in another game they even razed an original capital after some back and forth, don't think that's supposed to happen

sorry for the hijacking ... and notice sukhothai building a university in the middle of all this

[Iamblichos]

@LoneGazebo It doesn't seem to matter if the city that trained unit is a hill, flatland, next to a river or not, everyone I build comes out embarked.

[LoneGazebo]

@ilteroi, I fixed that flip flop issue in current release. Was a civilian issue.

[LoneGazebo]

Thankfully the embark thing seems cosmetic.

[Iamblichos]

...until your Polynesia or Denmark and your Destroyers look like Ancient Tech boats! :)~

[LoneGazebo]

Hehe. Yeah, it's not ideal, but it also doesn't seem to affect their efficacy, so gameplay is unaffected. What an odd bug!

[Iamblichos]

#if defined(MOD_BALANCE_EMBARKED_SHIPS)
    if (pNewPlot && getDomainType()==DOMAIN_SEA && IsCombatUnit())
    {
        if (pNewPlot->isFriendlyCityOrPassableImprovement(getOwner()))
            setEmbarked(true);
        else
            setEmbarked(false);
    }
#endif

in CvUnit::setXY

[LoneGazebo]

Does that fix it? I haven't looked at the code yet.

[Iamblichos]

No that just is the code that causes it I believe.

[LoneGazebo]

I think I've fixed it, @ilteroi. Since ships weren't made available for 'caneverembark,' they were never viable for toggling the embark/disembark flip. I've added that, and now it 'flips' from embarked to disembarked once you move it into a city or passable improvement.

[LoneGazebo]

@ilteroi, In response to:

• i can't reproduce the "melee unit fails to capture 0 hp city" issue
• all in all in my current testgame AI seems pretty competent at tactically

The first issue does seem better now. The second, though, is still a little iffy in some situations. Naval operations seem to have regressed somewhat, as the AI seems content to throw melee ships at cities until they die. It also seems to have a hard time organizing navies for sneak operations (and/or proper assaults on cities). I'm running archipelago maps to see if I can track it down. I feel like we had navies in a good spot a few months back, so I don't see where we messed up.

[Iamblichos]

did you edit this code:

bool CvUnit::CanEverEmbark() const
{
    VALIDATE_OBJECT

    return (getDomainType() == DOMAIN_LAND && IsHasEmbarkAbility() && !IsHoveringUnit() && !canMoveAllTerrain() && !isCargo() );
}

Did you just add an || for DOMAIN_SEA?

[LoneGazebo]

Yep. Though it didn't fix it all, sadly, as cargo ships still show as embarked, regardless of location.

[LoneGazebo]

I also edited:

bool CvPlot::needsEmbarkation(const CvUnit* pUnit) const
{
    if (pUnit==NULL)
        return isWater() && !isIce() && !IsAllowsWalkWater();
    else
    {
        //only land units need to embark
        if (pUnit->getDomainType()==DOMAIN_LAND)
        {
            return isWater() && !isIce() && !IsAllowsWalkWater() && !pUnit->canMoveAllTerrain() && !pUnit->canMoveImpassable() && !pUnit->canLoad(*this);
        }
#if defined(MOD_BALANCE_EMBARKED_SHIPS)
        else if(pUnit->getDomainType() == DOMAIN_SEA)
        {
            return isCityOrPassableImprovement(pUnit->getOwner(), false);
        }
#endif
        else
            return false;
    }
}

[Iamblichos]

Regarding cargo ships, strange as the above code in setXY checks for combat unit.

[LoneGazebo]

Can you reproduce that? They use the embarked icon on my end.

[Iamblichos]

Hmmm...I tried your code above and ships (combat units) are still coming out embarked

(I also edited caneverembark)

[LoneGazebo]

Out of cities?

[Iamblichos]

yes. Did you also edit IsHasEmbarkAbility?

[LoneGazebo]

Oh, duh, forgot one more thing for you to change (see below):

//  --------------------------------------------------------------------------------
void CvUnit::move(CvPlot& targetPlot, bool bShow)
{
    VALIDATE_OBJECT
    CvAssert(canMoveOrAttackInto(targetPlot) || isOutOfAttacks());

    CvPlot* pOldPlot = plot();
    CvAssertMsg(pOldPlot, "pOldPlot needs to have a value");

    bool bShouldDeductCost = true;
    int iMoveCost = targetPlot.movementCost(this, plot());

    // we need to get our dis/embarking on
    bool bChangeEmbarkedState = CanEverEmbark() && (targetPlot.needsEmbarkation(this) != pOldPlot->needsEmbarkation(this));
    if (bChangeEmbarkedState)
    {
#if defined(MOD_BALANCE_EMBARKED_SHIPS)
        if(isEmbarked() && getDomainType() != DOMAIN_SEA && !targetPlot.needsEmbarkation(this)) // moving from water to the land
#else
        if(isEmbarked() && !targetPlot.needsEmbarkation(this)) // moving from water to the land
#endif
        {
            if (m_unitMoveLocs.size())  // If we have some queued moves, execute them now, so that the disembark is done at the proper location visually
                PublishQueuedVisualizationMoves();

            disembark(pOldPlot);

#if defined(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST)
            TeamTypes eUnitTeam = getTeam();
            CvTeam& kUnitTeam = GET_TEAM(eUnitTeam);
            UnitHandle pUnit = GET_PLAYER(getOwner()).getUnit(GetID());
            //If city, and player has disembark to city at reduced cost...
            if(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST && targetPlot.isCity() && (targetPlot.getOwner() == getOwner()) && kUnitTeam.isCityNoEmbarkCost())
            {
                if(movesLeft() > (baseMoves(DOMAIN_LAND) * GC.getMOVE_DENOMINATOR()))
                {
                    setMoves(baseMoves(DOMAIN_LAND) * GC.getMOVE_DENOMINATOR());
                }
            }
            else if(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST && targetPlot.isCity() && (targetPlot.getOwner() == getOwner()) && kUnitTeam.isCityLessEmbarkCost())
            {
                changeMoves(-iMoveCost);
            }
            else if(!GET_PLAYER(getOwner()).GetPlayerTraits()->IsEmbarkedToLandFlatCost())
            {
                finishMoves();
            }
#else
            finishMoves();
#endif
        }
        else if(!isEmbarked() && targetPlot.needsEmbarkation(this))  // moving from land to the water
        {
            if (m_unitMoveLocs.size())  // If we have some queued moves, execute them now, so that the embark is done at the proper location visually
                PublishQueuedVisualizationMoves();

            embark(pOldPlot);
#if defined(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST)
            TeamTypes eUnitTeam = getTeam();
            CvTeam& kUnitTeam = GET_TEAM(eUnitTeam);
            UnitHandle pUnit = GET_PLAYER(getOwner()).getUnit(GetID());
            //If city, and player has disembark to city at reduced cost...
            if(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST && pOldPlot->isCity() && (pOldPlot->getOwner() == getOwner()) && kUnitTeam.isCityNoEmbarkCost())
            {
                if(movesLeft() > (baseMoves(DOMAIN_SEA) * GC.getMOVE_DENOMINATOR()))
                {
                    setMoves(baseMoves(DOMAIN_SEA) * GC.getMOVE_DENOMINATOR());
                }
            }
            else if(MOD_BALANCE_CORE_EMBARK_CITY_NO_COST && pOldPlot->isCity() && (pOldPlot->getOwner() == getOwner()) && kUnitTeam.isCityLessEmbarkCost())
            {
                changeMoves(-iMoveCost);
            }
            else
            {
                finishMoves();
            }
#else
            finishMoves();
#endif
            bShouldDeductCost = false;
        }
#if defined(MOD_BALANCE_EMBARKED_SHIPS)
        else if(isEmbarked() && getDomainType() == DOMAIN_SEA && targetPlot.isWater())
        {
            if (m_unitMoveLocs.size())  // If we have some queued moves, execute them now, so that the disembark is done at the proper location visually
                PublishQueuedVisualizationMoves();

            disembark(pOldPlot);
        }
#endif
    }

    if(bShouldDeductCost)
        changeMoves(-iMoveCost);
    setXY(targetPlot.getX(), targetPlot.getY(), true, true, bShow && targetPlot.isVisibleToWatchingHuman(), bShow);
}

[Iamblichos]

looks like we need to edit canheal too eh?

[ilteroi]

so is this a reproducable problem or not?

and it's only about the unit icon, right?

[LoneGazebo]

@ilteroi , no, it's not just cosmetic as I thought, as they can't heal either.

[Iamblichos]

No it's the ship graphics. Since they are built on a plot that is city, and since that passes the isFriendlyCityOrPassableImprovement check, they come out embarked. There's also a heal problem.

[ilteroi]

ah yeah sorry i meant the model, not the icon.

anyway quite the thread you have going here ... let me take a look too

[Iamblichos]

@LoneGazebo , edited CvUnit::move as above, still coming out embarked.

[ilteroi]

maybe it was a bad idea to re-use the embarked state here.

i could just as well make up a new flag for "docked", which inhibits canRangeStrike() and that's it

come to think of it, don't even need a flag for that. simply "if domain==sea and plot!=water: return false" should do it

[Iamblichos]

@ilteroi that's a much easier fix.

Gonna test out right now.

[Iamblichos]

Good to go just needs this somewhere in canRangeStrike().

#if defined(MOD_BALANCE_EMBARKED_SHIPS)
    if(getDomainType() == DOMAIN_SEA && !plot()->isWater())
    {
        return false;
    }
#endif

...and erase the other two (or if you edited anywhere else) instances of #if defined(MOD_BALANCE_EMBARKED_SHIPS).

[LoneGazebo]

Okay, so we'll cut out all the new embarked code except for what @Iamblichos just posted?

[LoneGazebo]

Still leaves the issue of melee boats being able to attack out of cities...

[ilteroi]

yeah just tried it myself. seems to work fine.

regarding melee, that's handled in IsCanAttackWithMove()

[LoneGazebo]

@ilteroi , and that's already handled by the existing code?

[Iamblichos]

Not it's a different function...just needs to be added in there:

let me try this and will report back:

bool CvUnit::IsCanAttackWithMove() const
{
    VALIDATE_OBJECT
    if(!IsCombatUnit())
    {
        return false;
    }
#if defined(MOD_BALANCE_EMBARKED_SHIPS)
    else if(getDomainType() == DOMAIN_SEA && !plot()->isWater())
    {
        return false;
    }
#endif
    else
    {
        return !isOnlyDefensive();
    }
}

[Iamblichos]

Okay that works. One thing to note with the above code. Melee Boats can still attack into forts and cities, but melee boats in forts or cities cannot attack back. Which may be what we want, but just something to be aware of.

[LoneGazebo]

Why would that be a problem?

[ilteroi]

in fact, i just remembered there's a convenient function for this:

bool CvUnit::isNativeDomain(CvPlot*)

but we're heading for a merge conflict here, so i won't touch this for now.

anyway, i thought about whether melee ships make sense at all. so i'd be all for disabling attacks on cities. which would stop them from capturing cities as well.

forts shouldn't be problem because they must be friendly for you to enter them.

[Iamblichos]

@LoneGazebo , it's not just something for users to be aware of.

@ilteroi I'd really really hate to nerf melee boats, Ranged units used to be king, and they are still tough, but I'd hate to see coastal cities not capturable by melee boats.

[LoneGazebo]

Yeah, melee ships have to be able to capture cities, otherwise their utility drops dramatically. I wonder if we could assign damage to naval vessels in a city (like we do with garrisoned units) if melee v. melee occurs?

[LoneGazebo]

We'd be back at pre-G&K utility for naval units if we dropped melee damage.

[Iamblichos]

One of these days we need to play a multiplayer game small map, 3 civs. mano y mano

[LoneGazebo]

haha

[LoneGazebo]

secret: I barely even play Civ these days! Too busy modding. :)

[Iamblichos]

That doesn't mean you aren't good. The more I code, the better I am, I'm about to hit 8000 hours of civ play though some of that is testing, leaving the game on overnight, falling asleep at the game, etc. But I think I got a lot better at the game when I started coding the game and understanding the nuts and bolts of it, which has been about a year and a half now.

[LoneGazebo]

Maybe! I do okay when I do play. :dancer:

[Iamblichos]

a quick question if you set this as not native domain plot will that affect embarked land units attacking cities from water?

[LoneGazebo]

Shouldn't, because land cities are land, and embarked units are native land.

G