diff --git a/C++ProjectTemplate b/C++ProjectTemplate index b54a3e6..a55ab2b 100755 Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ diff --git a/battle.h b/battle.h index dfb37eb..3a3a544 100644 --- a/battle.h +++ b/battle.h @@ -47,6 +47,7 @@ enum class BattleMoveName{ PKFIRE_B, PKFIRE_G, PKFIRE_O, + FREEZE_PACKET, }; enum class Resistance{ diff --git a/item.h b/item.h index 0e42071..cfc669c 100644 --- a/item.h +++ b/item.h @@ -17,6 +17,7 @@ enum class ItemName{ COPPER_BRACELET, KEY_TO_THE_PALACE, BOMB, + FREEZE_PACKET, }; namespace EquipSlot{ diff --git a/main.cpp b/main.cpp index ce8a1e4..5f85a58 100644 --- a/main.cpp +++ b/main.cpp @@ -252,6 +252,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), AddItemToPlayerInventory(ItemName::PIZZA); } AddItemToPlayerInventory(ItemName::TEE_BALL_BAT); + AddItemToPlayerInventory(ItemName::FREEZE_PACKET); return true; } @@ -965,6 +966,9 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), SetupTargetSelect(); } else if (PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.consumable!=Consumable::NOT_A_CONSUMABLE) { + if (PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->battlemove!=nullptr) { + PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove=PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->battlemove; + } else if (PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.consumable==Consumable::FRIENDLY||PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.consumable==Consumable::FRIENDLY_PERMANENT) { PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove=MOVELIST[BattleMoveName::CONSUMABLE]; } else { @@ -1950,6 +1954,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), MOVELIST[BattleMoveName::PKFIRE_B]=new Battle::Move("PK Fire","Causes extreme heat to burn foes and scorch trees",BETA,120,40,ㅍ 12,4,0,false,{0,0,20,0}); MOVELIST[BattleMoveName::PKFIRE_G]=new Battle::Move("PK Fire","Causes extreme heat to burn foes and scorch trees",GAMMA,190,50,ㅍ 20,5,0,false,{0,0,20,0}); MOVELIST[BattleMoveName::PKFIRE_O]=new Battle::Move("PK Fire","Causes extreme heat to burn foes and scorch trees",OMEGA,360,100,ㅍ 32,7,0,false,{0,0,20,0},L"$USER uses $POWER",FIREFOUNTAIN_EFFECT); + MOVELIST[BattleMoveName::FREEZE_PACKET]=new Battle::Move("Freeze Packet","",120,20,ㅍ 0,1,0,false,{0,0,0,0},L"$USER uses the $POWER"); } void SetupItemList() { //hpRecovery,ppRecovery,attack,dmgReduction,equip,important,consumable @@ -1964,6 +1969,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), ITEMLIST[ItemName::HEAVY_JACKET]=new Item("Heavy Jacket","Are you sure this is good for your shoulders?",256,{defense:25,equip:EquipSlot::ARMOR}); ITEMLIST[ItemName::COPPER_BRACELET]=new Item("Copper Bracelet","It's not quite as shiny as a diamond, but it still makes you look good.",256,{defense:5,equip:EquipSlot::ACCESSORY}); ITEMLIST[ItemName::KEY_TO_THE_PALACE]=new Item("Key to the Palace","Lets you access a Palace.",256,{important:true}); + ITEMLIST[ItemName::FREEZE_PACKET]=new Item("Freeze Packet","Lets out some blistering cold weather.",256,{consumable:Consumable::ENEMY},MOVELIST[BattleMoveName::FREEZE_PACKET]); } void SetupAnimations() {