Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed some more shit, not ready yet

Browse source
This commit is contained in:
ElijahZAwesome 2018-02-06 18:13:56 -06:00
parent edecea1055
commit d55122b707
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Menu.c
View file

@ -5,7 +5,7 @@
char options[][12] = {"Start Game", "Host Game", "Join Game", "How To Play", "Settings", "About", "Exit"};
char keybOptions[][24] = {"Exit and Save", "Exit and Don't save","Reset to default"};
char setOptions[][24] = {"Rebind Buttons", "Texture packs", "Test Features: ", "N3DS Speedup: ", "Return to title"};
char setOptions[][24] = {"Rebind Buttons", "Texture packs", "Debug Text: ", "N3DS Speedup: ", "Return to title"};
// Rebind buttons menu (Settings)
int keys[] = {

19
source/Player.c
View file

@ -67,6 +67,7 @@ void playerInitInventory(PlayerData *pd) {
if(TESTGODMODE) {
addItemToInventory(newItem(ITEM_GOLD_APPLE,1), &(pd->inventory));
addItemToInventory(newItem(ITEM_STRENGTH_POTION,1), &(pd->inventory));
addItemToInventory(newItem(ITEM_POTION_MAKER,0), &(pd->inventory));
addItemToInventory(newItem(TOOL_SHOVEL,1), &(pd->inventory));
addItemToInventory(newItem(TOOL_HOE,4), &(pd->inventory));
addItemToInventory(newItem(TOOL_SWORD,4), &(pd->inventory));
@ -233,34 +234,34 @@ bool playerUseItem(PlayerData *pd) {
}
break;
case ITEM_STRENGTH_POTION:
if(pd->entity.p.health < 20 && playerUseEnergy(pd, 2) && pd->entity.p.strengthTimer == 0){
if(pd->entity.p.health < 20 && pd->entity.p.strengthTimer == 0){
potionEffect(1);
--item->countLevel;
--(pd->activeItem->countLevel);
}
return 0;
case ITEM_SPEED_POTION:
if(pd->entity.p.health < 20 && playerUseEnergy(pd, 2) && pd->entity.p.speedTimer == 0){
if(pd->entity.p.health < 20 && pd->entity.p.speedTimer == 0){
potionEffect(2);
--item->countLevel;
--(pd->activeItem->countLevel);
}
return 0;
case ITEM_REGEN_POTION:
if(pd->entity.p.health < 20 && playerUseEnergy(pd, 2) && pd->entity.p.regenTimer == 0){
if(pd->entity.p.health < 20 && pd->entity.p.regenTimer == 0){
potionEffect(3);
--item->countLevel;
--(pd->activeItem->countLevel);
}
return 0;
case ITEM_SWIM_BREATH_POTION:
if(pd->entity.p.health < 20 && playerUseEnergy(pd, 2) && pd->entity.p.swimBreathTimer == 0){
if(pd->entity.p.health < 20 && pd->entity.p.swimBreathTimer == 0){
potionEffect(4);
--item->countLevel;
--(pd->activeItem->countLevel);
}
return 0;
case ITEM_GOLD_APPLE:
if(pd->entity.p.health < 10 && playerUseEnergy(pd, 1)){
playerHeal(pd, 8);
playerUseEnergy(pd, -10);
--item->countLevel;
--(pd->activeItem->countLevel);
}
return 0;
case ITEM_FLESH:

26
source/Sound.c
View file

@ -70,20 +70,20 @@ void updateMusic(int lvl, int time) {
}
void loadSounds() {
loadSound(&snd_playerHurt, "romfs:/resources/playerhurt.raw");
loadSound(&snd_playerDeath, "romfs:/resources/playerdeath.raw");
loadSound(&snd_monsterHurt, "romsfs:/resources/monsterhurt.raw");
loadSound(&snd_test, "romfs:/resources/test.raw");
loadSound(&snd_pickup, "romfs:/resources/pickup.raw");
loadSound(&snd_bossdeath, "romfs:/resources/bossdeath.raw");
loadSound(&snd_craft, "romfs:/resources/craft.raw");
loadSound(&snd_playerHurt, "resources/playerhurt.raw");
loadSound(&snd_playerDeath, "resources/playerdeath.raw");
loadSound(&snd_monsterHurt, "resources/monsterhurt.raw");
loadSound(&snd_test, "resources/test.raw");
loadSound(&snd_pickup, "resources/pickup.raw");
loadSound(&snd_bossdeath, "resources/bossdeath.raw");
loadSound(&snd_craft, "resources/craft.raw");
loadSound(&music_menu, "romfs:/resources/music/menu.raw");
loadSound(&music_floor0, "romfs:/resources/music/floor0.raw");
loadSound(&music_floor1, "romfs:/resources/music/floor1.raw");
loadSound(&music_floor1_night, "romfs:/resources/music/floor1_night.raw");
loadSound(&music_floor23, "romfs:/resources/music/floor2_3.raw");
loadSound(&music_floor4, "romfs:/resources/music/floor4.raw");
loadSound(&music_menu, "resources/music/menu.raw");
loadSound(&music_floor0, "resources/music/floor0.raw");
loadSound(&music_floor1, "resources/music/floor1.raw");
loadSound(&music_floor1_night, "resources/music/floor1_night.raw");
loadSound(&music_floor23, "resources/music/floor2_3.raw");
loadSound(&music_floor4, "resources/music/floor4.raw");
}
void freeSounds(){