rudism
/
slangin
1
0
Fork 0
Code Issues Pull Requests Projects Releases 5 Wiki Activity

implemented buying and selling

This commit is contained in:
Rudis Muiznieks 2022-06-18 18:17:18 -05:00
parent b9f2beec6a
commit 6a66f47488
Signed by: rudism
GPG Key ID: CABF2F86EF7884F9
2 changed files with 99 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
slangin.ino
View File

@ -79,15 +79,17 @@ int sCurrentDay;
int sDrugPrices[6]; int sDrugPrices[6];
int sRandomEvent; int sRandomEvent;
int sCurrentDrug; int sCurrentDrug;
long sCurrentQty; unsigned long sCurrentQty;
long sQtyMax; unsigned long sQtyMax;
unsigned long sLastDebounce = 0;
short sDebounceCount = 0;
/****************/ /****************/
/* player state */ /* player state */
/****************/ /****************/
long pMoney; unsigned long pMoney;
long pLoanAmount; unsigned long pLoanAmount;
long pSavingsAmount; unsigned long pSavingsAmount;
GameLocation pLocation; GameLocation pLocation;
int pGuns; int pGuns;
int pCapacity; int pCapacity;
@ -121,7 +123,10 @@ void loop() {
arduboy.pollButtons(); arduboy.pollButtons();
// draw screen if needed /******************/
/* SCREEN DRAWING */
/******************/
if (!screenInitialized) { if (!screenInitialized) {
arduboy.clear(); arduboy.clear();
menuSelected = 0; menuSelected = 0;
@ -132,7 +137,7 @@ void loop() {
menu[0] = F("New Game"); menu[0] = F("New Game");
menuLength = 1; menuLength = 1;
menuSmall = false; menuSmall = false;
menuCols = true; menuCols = false;
drawMenu(menuSmall, menuCols, menuLength, menu); drawMenu(menuSmall, menuCols, menuLength, menu);
drawMenuIndicator(menuSelected, menuSmall, menuCols, menuLength, menu, false); drawMenuIndicator(menuSelected, menuSmall, menuCols, menuLength, menu, false);
break; break;
@ -225,21 +230,28 @@ void loop() {
dialog[0] += lookupDrug(sCurrentDrug); dialog[0] += lookupDrug(sCurrentDrug);
dialog[1] = F(""); dialog[1] = F("");
dialog[2] = F(""); dialog[2] = F("");
dialog[3] = F("Cost"); dialog[3] = sGameState == STATE_BUY_QTY_INPUT ? F("Costs") : F("Price");
dialog[4] = F("You have"); dialog[4] = F("You have");
dialogLength = 5; dialogLength = 5;
dialogSmall = true; dialogSmall = true;
drawDialog(); drawDialog();
drawMoney(dialog[0].length() * 5 + 15, 10, sDrugPrices[sCurrentDrug]); drawMoney(dialog[0].length() * 5 + 15, 10, sDrugPrices[sCurrentDrug]);
drawMoney(35, 37, sCurrentQty * sDrugPrices[sCurrentDrug]); if (sGameState == STATE_BUY_QTY_INPUT) drawMoney(55, 46, pMoney);
drawMoney(55, 46, pMoney); else {
font4x6.setCursor(55, 46);
font4x6.print(pInventory[sCurrentDrug]);
}
drawQtyInputTotal();
drawQtySelector(F("Qty")); drawQtySelector(F("Qty"));
break; break;
} }
screenInitialized = true; screenInitialized = true;
} }
// handle user input /******************/
/* INPUT HANDLING */
/******************/
// menu screens // menu screens
switch (sGameState) { switch (sGameState) {
case STATE_TITLE: case STATE_TITLE:
@ -312,26 +324,50 @@ void loop() {
} }
case STATE_INVENTORY: case STATE_INVENTORY:
case STATE_INFO_DIALOG: case STATE_INFO_DIALOG:
checkBackedOut(); checkBackedOut(true);
break; break;
case STATE_SELL_QTY_INPUT: case STATE_SELL_QTY_INPUT:
case STATE_BUY_QTY_INPUT: case STATE_BUY_QTY_INPUT:
checkBackedOut(); if (!checkBackedOut(false)) {
if (arduboy.pressed(UP_BUTTON)) { if (arduboy.justPressed(A_BUTTON)) {
screenInitialized = false; if (sGameState == STATE_SELL_QTY_INPUT) {
sCurrentQty++; pInventory[sCurrentDrug] -= sCurrentQty;
} else if (arduboy.pressed(RIGHT_BUTTON)) { pMoney += sCurrentQty * sDrugPrices[sCurrentDrug];
screenInitialized = false; } else {
sCurrentQty += 10; pInventory[sCurrentDrug] += sCurrentQty;
} else if (arduboy.pressed(DOWN_BUTTON)) { pMoney -= sCurrentQty * sDrugPrices[sCurrentDrug];
screenInitialized = false; }
sCurrentQty--; screenInitialized = false;
} else if (arduboy.pressed(LEFT_BUTTON)) { sGameState = sPreviousGameState;
screenInitialized = false; } else {
sCurrentQty -= 10; unsigned long currentMillis = millis();
if (currentMillis - sLastDebounce > (sDebounceCount < 2 ? 300 : 100)) {
if (sDebounceCount < 2) sDebounceCount++;
if (arduboy.pressed(UP_BUTTON)) {
sLastDebounce = currentMillis;
if (sCurrentQty <= sQtyMax - 1) sCurrentQty++;
drawQtyInputTotal();
} else if (arduboy.pressed(RIGHT_BUTTON)) {
sLastDebounce = currentMillis;
if (sCurrentQty <= sQtyMax - 10) sCurrentQty += 10;
else sCurrentQty = sQtyMax;
drawQtyInputTotal();
} else if (arduboy.pressed(DOWN_BUTTON)) {
sLastDebounce = currentMillis;
if (sCurrentQty > 0) sCurrentQty--;
drawQtyInputTotal();
} else if (arduboy.pressed(LEFT_BUTTON)) {
sLastDebounce = currentMillis;
if (sCurrentQty > 10) sCurrentQty -= 10;
else sCurrentQty = 0;
drawQtyInputTotal();
} else {
sLastDebounce = 0;
sDebounceCount = 0;
}
}
}
} }
if (sCurrentQty > sQtyMax) sCurrentQty = sQtyMax;
if (sCurrentQty < 0) sCurrentQty = 0;
break; break;
} }
@ -343,14 +379,15 @@ void loop() {
/***********************/ /***********************/
void drawStatusBar() { void drawStatusBar() {
if (sGameState == STATE_INVENTORY) { if (sGameState == STATE_INVENTORY) {
const int chars = numberChars(pCapacity); const int remaining = playerCapacityRemaining();
const int chars = numberChars(remaining);
const int x = 128 - ((chars + 9) * 4); const int x = 128 - ((chars + 9) * 4);
font3x5.setCursor(1, 0); font3x5.setCursor(1, 0);
font3x5.print("Guns "); font3x5.print("Guns ");
font3x5.print(pGuns); font3x5.print(pGuns);
font3x5.setCursor(x, 0); font3x5.setCursor(x, 0);
font3x5.print("Capacity "); font3x5.print("Capacity ");
font3x5.print(pCapacity); font3x5.print(remaining);
} else { } else {
const int chars = numberChars(pMoney); const int chars = numberChars(pMoney);
const int x = 128 - (chars * 4); const int x = 128 - (chars * 4);
@ -401,7 +438,7 @@ void buildDrugMenu(int extra[6]) {
menuSmall = col1Max + col2Max > 22; menuSmall = col1Max + col2Max > 22;
} }
int numberChars(long num) { int numberChars(unsigned long num) {
int length = 1; int length = 1;
while (num /= 10) length++; while (num /= 10) length++;
return length; return length;
@ -422,7 +459,7 @@ void drawDialog() {
} }
} }
void drawMoney(const int x, const int y, const long amount) { void drawMoney(const int x, const int y, const unsigned long amount) {
Sprites::drawOverwrite(x, y + 2, spriteDollar, 0); Sprites::drawOverwrite(x, y + 2, spriteDollar, 0);
font4x6.setCursor(x + 6, y); font4x6.setCursor(x + 6, y);
font4x6.print(amount); font4x6.print(amount);
@ -433,7 +470,19 @@ void drawQtySelector(String label) {
font4x6.print(label); font4x6.print(label);
const int labelLength = label.length() * 5; const int labelLength = label.length() * 5;
arduboy.drawRect(labelLength + 15, 22, 103 - labelLength, 12, WHITE); arduboy.drawRect(labelLength + 15, 22, 103 - labelLength, 12, WHITE);
font4x6.setCursor(labelLength + 19, 24); drawQtySelectorAmount(label);
font4x6.print(sCurrentQty);
Sprites::drawOverwrite(111, 24, spriteAdjust, 0); Sprites::drawOverwrite(111, 24, spriteAdjust, 0);
} }
void drawQtySelectorAmount(String label) {
const int labelLength = label.length() * 5;
arduboy.fillRect(labelLength + 16, 23, 95 - labelLength, 10, BLACK);
font4x6.setCursor(labelLength + 19, 24);
font4x6.print(sCurrentQty);
}
void drawQtyInputTotal() {
arduboy.fillRect(40, 37, 91, 7, BLACK);
drawMoney(40, 37, sCurrentQty * sDrugPrices[sCurrentDrug]);
drawQtySelectorAmount(F("Qty"));
}

22
states.ino
View File

@ -77,13 +77,14 @@ void handleMenuAction() {
case STATE_JET_MENU: case STATE_JET_MENU:
break; break;
case STATE_BUY_MENU: case STATE_BUY_MENU: {
int remaining = playerCapacityRemaining();
sPreviousGameState = STATE_BUY_MENU; sPreviousGameState = STATE_BUY_MENU;
sCurrentDrug = menuSelected; sCurrentDrug = menuSelected;
if (pCapacity <= 0) { if (remaining <= 0) {
dialog[0] = F("Oops!"); dialog[0] = F("Oops!");
dialog[1] = F(""); dialog[1] = F("");
dialog[2] = F("You can't carry any"); dialog[2] = F("You can't carry");
dialog[3] = F("more "); dialog[3] = F("more ");
dialog[3] += lookupDrug(sCurrentDrug); dialog[3] += lookupDrug(sCurrentDrug);
dialog[3] += F("!"); dialog[3] += F("!");
@ -104,8 +105,10 @@ void handleMenuAction() {
sGameState = STATE_BUY_QTY_INPUT; sGameState = STATE_BUY_QTY_INPUT;
sCurrentQty = 0; sCurrentQty = 0;
sQtyMax = floor(pMoney / (float)sDrugPrices[sCurrentDrug]); sQtyMax = floor(pMoney / (float)sDrugPrices[sCurrentDrug]);
if (remaining < sQtyMax) sQtyMax = remaining;
} }
break; break;
}
case STATE_SELL_MENU: case STATE_SELL_MENU:
sPreviousGameState = STATE_SELL_MENU; sPreviousGameState = STATE_SELL_MENU;
sCurrentDrug = menuSelected; sCurrentDrug = menuSelected;
@ -130,11 +133,20 @@ void handleMenuAction() {
} }
} }
bool checkBackedOut() { bool checkBackedOut(const bool eitherButton) {
if (arduboy.justPressed(B_BUTTON)) { if (arduboy.justPressed(B_BUTTON) ||
(eitherButton && arduboy.justPressed(A_BUTTON))) {
screenInitialized = false; screenInitialized = false;
sGameState = sPreviousGameState; sGameState = sPreviousGameState;
return true; return true;
} }
return false; return false;
} }
int playerCapacityRemaining() {
int qty = 0;
for (int i = 0; i < 6; i++) {
qty += pInventory[i];
}
return pCapacity - qty;
}