Mod Merg help

[keeper216]

Mod Merg help

I keep getting this after merging w3ee and autoloot configurable all-in-one. When merging there was a confict but I set it to give it to autoloot.

Error [mod0000_mergedfiles]game\gameplay\containers\container.ws(1092): Found unexpected '}'

 

[arz0]

I just looked at the scripts, and you'll need to merge them manually.

KDiff3 is not merging correctly.

KDiff3 is producing this:

public final function ShowLoot()
    {
        var lootData : W3LootPopupData;

        // AeroHD -- AutoLootMenu++
        if( GetWitcherPlayer().GetAutoLootConfig().GetActions().ProcessContainer(this) )
        // W3EE - Begin
        if( (W3Herb)this )
        {
            Alchemy().PerformLootingAnimation(this);
            return;
        }
        // W3EE - End

            lootData = new W3LootPopupData in this;

            lootData.targetContainer = this;

            if(!mergeNotification)
                theGame.RequestPopup('LootPopup', lootData);
        }
        // AeroHD -- AutoLootMenu--
    }

Whereas it should be this:

public final function ShowLoot()
    {
        var lootData : W3LootPopupData;

        // W3EE - Begin
        if( (W3Herb)this )
        {
            Alchemy().PerformLootingAnimation(this);
            return;
        }
        // W3EE - End

        // AeroHD -- AutoLootMenu++
        if( GetWitcherPlayer().GetAutoLootConfig().GetActions().ProcessContainer(this) )


            lootData = new W3LootPopupData in this;

            lootData.targetContainer = this;

            if(!mergeNotification)
                theGame.RequestPopup('LootPopup', lootData);
        }
        // AeroHD -- AutoLootMenu--
    }

Hope this helps

 

[keeper216]

Now it says Error [mod0000_mergedfiles]game\gameplay\containers\container.ws(1096): Found unexpected '}'

It says 1096 instead of 1092.

I copied your code exactly.

 

[arz0]

ah, whoops, you also need to also add an open curly bracket for the if statement.

if( GetWitcherPlayer().GetAutoLootConfig().GetActions().ProcessContainer(this) )
{

 

[keeper216]

That did it. Thank you so much! You were extremely helpful.