WW-Cola3 [v2.5 bugfix release, 5/31/2019]

[DoomRater]

When I look at the bars they tell me what I need to know. But boy are they fancy and nonstandard. I don't know how to improve the readability without ruining the aesthetics. Maybe that's the confusing part?

[wildweasel]

The further progress of this mod is in a bit of a brined gherkin at the moment because of one gigantic hiccup: the HUD. Basically, I need a volunteer that can port the HUD to ZScript. The HUD currently exists in this dev build of the mod (warning, it's not exactly playable) inside oldsbarinfo.txt, and there is a not-very-functional-at-all attempt at a facsimile of it in zscript.txt. I can't seem to make head or tail of ZScript, beyond what's in the thing already, so I don't have the slightest clue how to do bars or anything, so if anybody would like to volunteer to help me out here, I'd like to have the whole HUD ported, with comments if you could, so I could have something to work with.

Otherwise, well, the mod's not really going anywhere.

[AFADoomer]

Here's a 99% solution:

---

Code: Select all

version "2.5"

// Replacement for SBARINFO. Code may suck! I'm warning you! -ww
class ColaStatusBar : BaseStatusBar
{
    HUDFont colaLargeFont;
    HUDFont indexFont;

    Ammo ammo1, ammo2;
    int ammocount1, ammocount2, maxammo2;

    InventoryBarState diparms;

    DynamicValueInterpolator HealthInterpolator;
    DynamicValueInterpolator Ammo2Interpolator;
    DynamicValueInterpolator CokeLevelInterpolator;

    override void Init()
    {
        Super.Init();

        SetSize(0, 960, 720);

        colaLargeFont = HUDFont.Create("BULVAR", 1, false, 1, 1);
        indexFont = HUDFont.Create("AGA1", 1, false, 1, 1);

        diparms = InventoryBarState.Create();

        HealthInterpolator = DynamicValueInterpolator.Create(0, 0.25, 1, 8);
        Ammo2Interpolator = DynamicValueInterpolator.Create(0, 0.25, 1, 8);
        CokeLevelInterpolator = DynamicValueInterpolator.Create(0, 0.25, 1, 8);
    }
    
    override void NewGame ()
    {
        Super.NewGame();

        HealthInterpolator.Reset(0);
        Ammo2Interpolator.Reset(0);
        CokeLevelInterpolator.Reset(0);
    }

    // What needs to run every tick
    override void Tick()
    {
        Super.Tick();

        [ammo1, ammo2, ammocount1, ammocount2] = GetCurrentAmmo();

        HealthInterpolator.Update(CPlayer.health);
        Ammo2Interpolator.Update(ammocount2);
        if (CheckInventory("PowerCokeBottleFlashDown", 1)) { CokeLevelInterpolator.Update(CPlayer.mo.GetEffectTicsForItem("CokeBottleLevelDown")); }
    }

    override void Draw (int state, double TicFrac)
    {
        Super.Draw (state, TicFrac);
        
        if (!automapactive)
        {
            if (state == HUD_Fullscreen)
            {
                BeginHUD();

                DrawLeftCorner();
                DrawRightCorner();

                DrawKeyBar(9, -34, 0, 2);

                DrawTexture(GetMugShot(1, mugshot.DISABLEGRIN | mugshot.DISABLEOUCH | mugshot.DISABLERAMPAGE), (0, 0), DI_ITEM_CENTER | DI_SCREEN_CENTER, 0.7);

                DrawExpBars(-1, -57);
                DrawAmmoBars();
            }
        }
    }
    
    void DrawLeftCorner()
    {
        int current, max;

        DrawImage("COKEHLTH", (0, -57), DI_ITEM_OFFSETS); // "Health" label

        DrawImage("ITEMBOX", (150, -54), DI_ITEM_OFFSETS); // Item box
        DrawSelectedInventory(174, -16, DI_ITEM_CENTER_BOTTOM);

        DrawBarAlpha("BOTLFULL", "BOTLEMPT", HealthInterpolator.GetValue(), CPlayer.mo.GetMaxHealth(true), (0, -372), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);

        if (CheckInventory("PowerRegeneration", 1))
        {
            [current, max] = CPlayer.mo.GetEffectTicsForItem("ReGenCola");

            DrawBarAlpha("POWGLASS", "POWLGLAS2", current, max, (95, -220), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS, 0.7);
            DrawString(colaLargeFont, "ReGen", (95, -270), DI_TEXT_ALIGN_LEFT, Font.CR_UNTRANSLATED, 0.7);
        }

        if (CheckInventory("PowerHalfDamage", 1))
        {
            [current, max] = CPlayer.mo.GetEffectTicsForItem("HalfDamage");

            DrawBarAlpha("BOTLAUR1", "BOTLAUR0", current, max, (44, -383), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_TOP, 0.7);
            DrawString(colaLargeFont, "Armor", (0, -424), DI_TEXT_ALIGN_LEFT, Font.CR_UNTRANSLATED, 0.7);
        }

        if (CheckInventory("PowerDamage", 1))
        {
            [current, max] = CPlayer.mo.GetEffectTicsForItem("ZeroCafDamage");

            DrawBarAlpha("BOTLAUR2", "BOTLAUR0", current, max, (-44, -383), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_TOP, 0.7);
            DrawString(colaLargeFont, "2xDam", (0, -424), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED, 0.7);
        }

        if (CheckInventory("WaterFlask", 1))
        {
            int amt = CountInventory("WaterFlask");

            if (amt > 0)
            {
                DrawString(colaLargeFont, FormatNumber(amt, 3), (45, -255), DI_TEXT_ALIGN_CENTER, Font.CR_UNTRANSLATED);
            }
            DrawString(indexFont, "Porta", (45, -205), DI_TEXT_ALIGN_CENTER, Font.CR_UNTRANSLATED);
        }
    }

    void DrawRightCorner()
    {
        DrawImage("COKELEVL", (-154, -57), DI_ITEM_OFFSETS);

        if (CheckInventory("PowerCokeBottleFlash", 1))
        {
            DrawImage("BOTLWHIT", (-90, -372), DI_ITEM_OFFSETS);
        }

        if (CheckInventory("PowerCokeBottleFlashDown", 1))
        {
            int current, max;
            [current, max] = CPlayer.mo.GetEffectTicsForItem("CokeBottleLevelDown");
            DrawBarAlpha("BOTLLVDN", "BOTLEMPT", CokeLevelInterpolator.GetValue(), max, (-90, -372), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
        }

        if (ammo2) { maxammo2 = GetDefaultByType(ammo2.GetClass()).MaxAmount; }
        DrawBarAlpha("BOTLLEVL", "BOTLEMPT", Ammo2Interpolator.GetValue(), maxammo2, (-90, -372), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS, 0.7);

        if (CheckInventory("BasicArmor", 1))
        {
            int amt = CountInventory("BasicArmor");

            if (amt > 0)
            {
                DrawString(colaLargeFont, FormatNumber(amt, 3), (-45, -255), DI_TEXT_ALIGN_CENTER, Font.CR_UNTRANSLATED);
            }
            DrawString(indexFont, "Barrier", (-45, -205), DI_TEXT_ALIGN_CENTER, Font.CR_UNTRANSLATED);
        }

        int current, max;

        Inventory it = CPlayer.mo.FindInventory("SodaGrenade");

        if (it)
        {
            current = it.Amount;
            max = it.MaxAmount;
        
            DrawBarAlpha("GRENICON", "GRENNONE", current, max, (-208, -54), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
        }
    }

    void DrawExpBars(int x = 0, int y = 0)
    {
        if (CheckWeaponSelected("PumpShotgun") || CheckWeaponSelected("DualPumpShotgun"))
        {
            DrawString(colaLargeFont, FormatNumber(CountInventory("PumpShotgunLevel"), 1), (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
        else if (CheckWeaponSelected("PileDriver"))
        {
            DrawString(colaLargeFont, FormatNumber(CountInventory("PiledriverLevel"), 1), (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
        else if (CheckWeaponSelected("CardThrower"))
        {
            DrawString(colaLargeFont, FormatNumber(CountInventory("CardThrowerLevel"), 1), (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
        else if (CheckWeaponSelected("MissileLauncher"))
        {
            DrawString(colaLargeFont, FormatNumber(CountInventory("MissileLauncherLevel"), 1), (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
        else if (CheckWeaponSelected("ColaHandgun"))
        {
            DrawString(colaLargeFont, FormatNumber(CountInventory("ColaHandgunLevel"), 1), (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
        else
        {
            DrawString(colaLargeFont, "", (x, y), DI_TEXT_ALIGN_RIGHT, Font.CR_UNTRANSLATED);
        }
    }

    void DrawAmmoBars()
    {
        // Ammo bars per gun
        if (CheckWeaponSelected("PumpShotgun"))
        {
            DrawBarAlpha("SHELTUBE", "SHELNONE", ammocount1, GetDefaultByType(ammo1.GetClass()).MaxAmount, (-210, -188), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
        }
        else if (CheckWeaponSelected("DualPumpShotgun"))
        {
            int current, max;

            Inventory it = CPlayer.mo.FindInventory("PumpShotgunClip2");

            if (it)
            {
                current = it.Amount;
                max = it.MaxAmount;

                DrawBarAlpha("SHELTUBE", "SHELNONE", current, max, (-240, -208), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
            }

            it = CPlayer.mo.FindInventory("PumpShotgunClip");

            if (it)
            {
                current = it.Amount;
                max = it.MaxAmount;

                DrawBarAlpha("SHELTUBE", "SHELNONE", current, max, (-210, -188), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
            }
        }
        else if (CheckWeaponSelected("Piledriver"))
        {
            int current, max;

            Inventory it = CPlayer.mo.FindInventory("PiledriverPressure");

            if (it)
            {
                current = it.Amount;
                max = it.MaxAmount;

                DrawBarAlpha("PILECO2F", "PILECO2E", current, max, (-156, -268), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
            }

            if (ammo1)
            {
                DrawBarAlpha("PILECLIP", "PILENONE", ammocount1, GetDefaultByType(ammo1.GetClass()).MaxAmount, (-190, -261), 0, SHADER_VERT | SHADER_REVERSE, DI_ITEM_OFFSETS);
            }
        }
        else if (CheckWeaponSelected("CardThrower"))
        {
            DrawImage("WSOLICON", (-166, -168), DI_ITEM_OFFSETS);;
        }
        else if (CheckWeaponSelected("ColaHandgun"))
        {
            int amt = CountInventory("ColaHandgunClip");

            String im = "HUDREV" .. (amt < 10 ? "0" : "") .. amt;

            DrawImage(im, (-200, -160), DI_ITEM_OFFSETS);
        }
        else // Fallback in case I didn't make a bar yet
        {
            DrawString(colaLargeFont, FormatNumber(ammocount1, 3), (-90, -128), DI_TEXT_ALIGN_RIGHT, Font.CR_White);
        }
    }
    
    void DrawKeyBar(int rowsize, int x, int y, int rowspacing)
    {
        Vector2 keypos = (x, y);
        int rowc = 0;
        double roww = 0;

        for(let i = CPlayer.mo.Inv; i != null; i = i.Inv)
        {
            if (i is "Key" && i.Icon.IsValid())
            {
                DrawTexture(i.Icon, keypos, DI_ITEM_OFFSETS);
                Vector2 size = TexMan.GetScaledSize(i.Icon);
                keypos.Y += size.Y + rowspacing;
                roww = max(roww, size.X);
                if (++rowc == rowsize)
                {
                    keypos.Y = -34;
                    keypos.X -= roww + 2;
                    roww = 0;
                    rowc = 0;
                }
            }
        }
    }

    void DrawSelectedInventory(int x, int y, int flags = DI_ITEM_OFFSETS)
    {
        if (CPlayer.mo.InvSel != null && !level.NoInventoryBar)
        {
            DrawInventoryIcon(CPlayer.mo.InvSel, (x, y), flags);
            if (CPlayer.mo.InvSel.Amount > 1)
            {
                DrawString(IndexFont, FormatNumber(CPlayer.mo.InvSel.Amount), (x + 15, y - indexFont.mFont.GetHeight()), DI_TEXT_ALIGN_RIGHT, Font.CR_GOLD);
            }
        }
    }

    //Custom version of DrawBar that allows drawing with alpha - mostly copy/paste from original function, modified to allow alpha and scaling
    void DrawBarAlpha(String ongfx, String offgfx, double curval, double maxval, Vector2 position, int border, int vertical, int flags = 0, double alpha = 1., double scale = 1.)
    {
        let ontex = TexMan.CheckForTexture(ongfx, TexMan.TYPE_MiscPatch);
        if (!ontex.IsValid()) return;
        let offtex = TexMan.CheckForTexture(offgfx, TexMan.TYPE_MiscPatch);

        Vector2 texsize = TexMan.GetScaledSize(ontex);
        texsize.x *= scale;
        texsize.y *= scale;
        [position, flags] = AdjustPosition(position, flags, texsize.X, texsize.Y);

        double value = (maxval != 0) ? clamp(curval / maxval, 0, 1) : 0;
        if(border != 0) value = 1. - value; //invert since the new drawing method requires drawing the bg on the fg.

        // {cx, cb, cr, cy}
        double Clip[4];
        Clip[0] = Clip[1] = Clip[2] = Clip[3] = 0;

        bool horizontal = !(vertical & SHADER_VERT);
        bool reverse = !!(vertical & SHADER_REVERSE);
        double sizeOfImage = (horizontal ? texsize.X - border*2 : texsize.Y - border*2);
        Clip[(!horizontal) | ((!reverse)<<1)] = sizeOfImage - sizeOfImage * value;

        // preserve the active clipping rectangle
        int cx, cy, cw, ch;
        [cx, cy, cw, ch] = screen.GetClipRect();

        if(border != 0)
        {
            for(int i = 0; i < 4; i++) Clip[i] += border;

            //Draw the whole foreground
            DrawTexture(ontex, position, flags | DI_ITEM_LEFT_TOP, alpha, scale: (scale, scale));
            SetClipRect(position.X + Clip[0], position.Y + Clip[1], texsize.X - Clip[0] - Clip[2], texsize.Y - Clip[1] - Clip[3], flags);
        }

        if (offtex.IsValid()) { DrawTexture(offtex, position, flags | DI_ITEM_LEFT_TOP, alpha, scale: (scale, scale)); }

        if (border == 0)
        {
            SetClipRect(position.X + Clip[0], position.Y + Clip[1], texsize.X - Clip[0] - Clip[2], texsize.Y - Clip[1] - Clip[3], flags);
            DrawTexture(ontex, position, flags | DI_ITEM_LEFT_TOP, alpha, scale: (scale, scale));
        }
        // restore the previous clipping rectangle
        screen.SetClipRect(cx, cy, cw, ch);
    }

    int CountInventory(class<Inventory> item)
    {
        int amt;

        Inventory it = CPlayer.mo.FindInventory(item);

        if (it) { return it.Amount; }

        return 0;
    }
}

As far as I can tell, this replicates your old status bar... I tested as much as I could, but, not being completely familiar with the mod, there might be something I missed (or more likely, some coordinates that are off, or something like that). There are probably some things that could be optimized, too...

No comments in this version, but I'll go back through tomorrow and add them.

[wildweasel]

Man, you would not believe how insanely helpful this has been. This saves not only a lot of brute force code, but also enables me to do some things I wasn't able to do before. No need to rush on those comments; this is already a huge help, and thank you very much for it.

[wildweasel]

The day's work is coming to a close, and with it, a new early access build is available: https://drive.google.com/file/d/0B4AcTi ... sp=sharing

The changes this version:
- The handgun is now the starting weapon instead of the shotgun.
- The handgun's third level was significantly retooled; instead of just shooting two big bullets, it now shoots one big bullet that explodes into smaller fragments on impact. It is absolutely devastating (and pending a balancing pass, honestly).
- Because the player no longer starts with a shotgun, I created a new CustomInventory pickup for the shotgun that replaces both Shotgun and SuperShotgun so that the dual-wielding can still be accounted for.
- The Plasma Autorifle now occupies the PlasmaRifle slot; its pickup is invisible at the moment (I forget if I have a sprite for that yet) and it does not yet have new sounds, but its basic functionality is now more or less implemented. It does not currently check its level, but it acts as a rapid-fire weapon that shoots faster as it gains heat. Players of TimeSplitters games might notice a similarity.
- A few visual additions have been made, albeit unfinished ones. The main menu and difficulty selection now use a new font derived from the Pepsi logo (I haven't polished it, so it may look ugly and/or not space properly), and the missile launcher is sort of in the process of being rebranded as the Sidewinder. Er...you'll see why.
- Thanks to AFADoomer, the HUD's been ported to ZScript, which outwardly shouldn't make an insane amount of difference, but does save the amount of code significantly (and without it, the Plasma Autorifle's heat gauge would have taken approximately 15 times the amount of InInventory checks).
- And finally, some sound effect improvements have come for the handgun, so it now sounds noticeably cooler per level.

[Captain J]

Now finally this mod is updated, fixed with cool prejudice, huh? Excellent work, weasel!

[wildweasel]

A new version's been uploaded! https://drive.google.com/file/d/0B4AcTi ... sp=sharing

Changes this time around:
- The handgun's reload sounds have been swapped for more audible ones.
- I forget if I mentioned this: bullet tracers are now immune to the Blast effect, meaning the dual shotguns can no longer send each others' bullets careening off in the wrong direction if fired too close together.
- The "fallback effect" for weapons that don't currently have level indicators was fixed. They now display question marks.
- The Plasma Autorifle is (nearly) done. All four levels worth of functionality are implemented, along with appropriate graphical and sound effects, and animation. All that's missing is a pickup sprite. For the moment, leveling up the autorifle mostly just makes bullets deal more damage...except at level 3, overheating it results in it expelling a huge burst of flame for a few seconds, that deals serious damage to whatever's in the way...but it doesn't stop firing until the heat gauge is empty!

[Someone64]

Bug Report: It seems the pack of cards actually level backwards. They start at their strongest and get worse as they level.

[Captain J]

Oh, also extra feedback for the mod. I finally played for a minute and i've got some awkward things like...

- I always wondered why rocket launcher's projectile is kinda big and always launched from half-beneath; eventually crashes into the ground.

- While every weapon gets stronger after gaining level after level, Solitaire cards goes just opposite. Intentional?

[Deii]

Just butting in to say the cards work in the opposite way as they seem to draw inspiration from the this weapon from Cave Story. I think WW mentioned it before.

[Someone64]

It conflicts with the description in the first post which implies that it's weak at the start and eventually gets powerful.

[wildweasel]

I haven't updated the first post's descriptions at all since the mod's launch. I left the notice in a changelog somewhere in here, but yes, the deck of cards is now the "nemesis" of the mod.

[Captain J]

Man, too bad i couldn't look for the notice until now. I thought the first post was updated. Also too bad i'm pretty ignorant about Cave Story. I love the game... But i don't know the other game mechanics.

Anyway, is there any way to downgrade the Solitaire cards? In Cave Story wiki, you can. But is this possible in this mod? This card is pretty much useful to me.

[wildweasel]

The way to "downgrade" the cards is to take damage. I'll see about making it a little less painful in the future, possibly by making it ignore the Arms Barrier and increasing its "penalty" when damage is taken.

[Captain J]

Sounds reasonable. But i think that should be more reasonable if it decreases meter a lot when taking hit, no matter how intense the attack is.