From e134cbf8c0ad48b663974a29ea5a354d38661af8 Mon Sep 17 00:00:00 2001 From: Daniel Marsee Date: Wed, 2 Nov 2016 16:35:29 -0400 Subject: [PATCH] Moved all assets to their respective subdirectories. Much cleaner now. Signed-off-by: Daniel Marsee --- .../blendgrasswoods02.png | Bin .../blendgrasswoodsbackslash.png | Bin .../blendgrasswoodsbottom.png | Bin .../blendgrasswoodsbottomleft.png | Bin .../blendgrasswoodsbottomleft2.png | Bin .../blendgrasswoodsbottomleftcurve.png | Bin .../blendgrasswoodsbottomright.png | Bin .../blendgrasswoodsbottomright2.png | Bin .../blendgrasswoodsbottomrightcurve.png | Bin .../blendgrasswoodsbottomtopleft.png | Bin .../blendgrasswoodsbottomtopright.png | Bin .../blendgrasswoodsbottomwithcorners.png | Bin .../blendgrasswoodsclearing.png | Bin .../blendgrasswoodscornersbottom.png | Bin .../blendgrasswoodscornersleft.png | Bin .../blendgrasswoodscornersright.png | Bin .../blendgrasswoodscornerstop.png | Bin .../blendgrasswoodsforwardslash.png | Bin .../blendgrasswoodshoriz.png | Bin .../blendgrasswoodsleft.png | Bin .../blendgrasswoodsleftbottomright.png | Bin .../blendgrasswoodslefttopright.png | Bin .../blendgrasswoodsleftwithcorners.png | Bin .../blendgrasswoodsright.png | Bin .../blendgrasswoodsrightbottomleft.png | Bin .../blendgrasswoodsrighttopleft.png | Bin .../blendgrasswoodsrightwithcorners.png | Bin .../blendgrasswoodstop.png | Bin .../blendgrasswoodstopbottomleft.png | Bin .../blendgrasswoodstopbottomright.png | Bin .../blendgrasswoodstopleft.png | Bin .../blendgrasswoodstopleft2.png | Bin .../blendgrasswoodstopleftcurve.png | Bin .../blendgrasswoodstopright.png | Bin .../blendgrasswoodstopright2.png | Bin .../blendgrasswoodstoprightcurve.png | Bin .../blendgrasswoodstopwithcorners.png | Bin .../blendgrasswoodsubottom.png | Bin .../blendgrasswoodsuleft.png | Bin .../blendgrasswoodsuright.png | Bin .../blendgrasswoodsutop.png | Bin .../blendgrasswoodsvert.png | Bin brushedmetal.png => bg/brushedmetal.png | Bin electricplane2.png => bg/electricplane2.png | Bin grass03.png => bg/grass03.png | Bin woods02.png => bg/woods02.png | Bin death.wav | Bin 3369 -> 0 bytes electric.bas | 160 +++++++++--------- bolt.wav => sfx/bolt.wav | Bin .../factory_destroyed.wav | Bin gauss.wav => sfx/gauss.wav | Bin hit.wav => sfx/hit.wav | Bin laser.wav => sfx/laser.wav | Bin missile.wav => sfx/missile.wav | Bin missilehit.wav => sfx/missilehit.wav | Bin plane.wav => sfx/plane.wav | Bin plasma.wav => sfx/plasma.wav | Bin shoot.wav => sfx/shoot.wav | Bin electricicon.png => ui/electricicon.png | Bin electricmods.png => ui/electricmods.png | Bin electricstats.png => ui/electricstats.png | Bin electricweapons.png => ui/electricweapons.png | Bin missile.png => ui/missile.png | Bin plane.png => ui/plane.png | Bin player.png => ui/player.png | Bin .../tooltips/aimer_tooltip.png | Bin .../tooltips/energy_armor_tooltip.png | Bin .../tooltips/flare_tooltip.png | Bin .../tooltips/srb_tooltip.png | Bin 69 files changed, 80 insertions(+), 80 deletions(-) rename blendgrasswoods02.png => bg/blendgrasswoods02.png (100%) rename blendgrasswoodsbackslash.png => bg/blendgrasswoodsbackslash.png (100%) rename blendgrasswoodsbottom.png => bg/blendgrasswoodsbottom.png (100%) rename blendgrasswoodsbottomleft.png => bg/blendgrasswoodsbottomleft.png (100%) rename blendgrasswoodsbottomleft2.png => bg/blendgrasswoodsbottomleft2.png (100%) rename blendgrasswoodsbottomleftcurve.png => bg/blendgrasswoodsbottomleftcurve.png (100%) rename blendgrasswoodsbottomright.png => bg/blendgrasswoodsbottomright.png (100%) rename blendgrasswoodsbottomright2.png => bg/blendgrasswoodsbottomright2.png (100%) rename blendgrasswoodsbottomrightcurve.png => bg/blendgrasswoodsbottomrightcurve.png (100%) rename blendgrasswoodsbottomtopleft.png => bg/blendgrasswoodsbottomtopleft.png (100%) rename blendgrasswoodsbottomtopright.png => bg/blendgrasswoodsbottomtopright.png (100%) rename blendgrasswoodsbottomwithcorners.png => bg/blendgrasswoodsbottomwithcorners.png (100%) rename blendgrasswoodsclearing.png => bg/blendgrasswoodsclearing.png (100%) rename blendgrasswoodscornersbottom.png => bg/blendgrasswoodscornersbottom.png (100%) rename blendgrasswoodscornersleft.png => bg/blendgrasswoodscornersleft.png (100%) rename blendgrasswoodscornersright.png => bg/blendgrasswoodscornersright.png (100%) rename blendgrasswoodscornerstop.png => bg/blendgrasswoodscornerstop.png (100%) rename blendgrasswoodsforwardslash.png => bg/blendgrasswoodsforwardslash.png (100%) rename blendgrasswoodshoriz.png => bg/blendgrasswoodshoriz.png (100%) rename blendgrasswoodsleft.png => bg/blendgrasswoodsleft.png (100%) rename blendgrasswoodsleftbottomright.png => bg/blendgrasswoodsleftbottomright.png (100%) rename blendgrasswoodslefttopright.png => bg/blendgrasswoodslefttopright.png (100%) rename blendgrasswoodsleftwithcorners.png => bg/blendgrasswoodsleftwithcorners.png (100%) rename blendgrasswoodsright.png => bg/blendgrasswoodsright.png (100%) rename blendgrasswoodsrightbottomleft.png => bg/blendgrasswoodsrightbottomleft.png (100%) rename blendgrasswoodsrighttopleft.png => bg/blendgrasswoodsrighttopleft.png (100%) rename blendgrasswoodsrightwithcorners.png => bg/blendgrasswoodsrightwithcorners.png (100%) rename blendgrasswoodstop.png => bg/blendgrasswoodstop.png (100%) rename blendgrasswoodstopbottomleft.png => bg/blendgrasswoodstopbottomleft.png (100%) rename blendgrasswoodstopbottomright.png => bg/blendgrasswoodstopbottomright.png (100%) rename blendgrasswoodstopleft.png => bg/blendgrasswoodstopleft.png (100%) rename blendgrasswoodstopleft2.png => bg/blendgrasswoodstopleft2.png (100%) rename blendgrasswoodstopleftcurve.png => bg/blendgrasswoodstopleftcurve.png (100%) rename blendgrasswoodstopright.png => bg/blendgrasswoodstopright.png (100%) rename blendgrasswoodstopright2.png => bg/blendgrasswoodstopright2.png (100%) rename blendgrasswoodstoprightcurve.png => bg/blendgrasswoodstoprightcurve.png (100%) rename blendgrasswoodstopwithcorners.png => bg/blendgrasswoodstopwithcorners.png (100%) rename blendgrasswoodsubottom.png => bg/blendgrasswoodsubottom.png (100%) rename blendgrasswoodsuleft.png => bg/blendgrasswoodsuleft.png (100%) rename blendgrasswoodsuright.png => bg/blendgrasswoodsuright.png (100%) rename blendgrasswoodsutop.png => bg/blendgrasswoodsutop.png (100%) rename blendgrasswoodsvert.png => bg/blendgrasswoodsvert.png (100%) rename brushedmetal.png => bg/brushedmetal.png (100%) rename electricplane2.png => bg/electricplane2.png (100%) rename grass03.png => bg/grass03.png (100%) rename woods02.png => bg/woods02.png (100%) delete mode 100644 death.wav rename bolt.wav => sfx/bolt.wav (100%) rename factory_destroyed.wav => sfx/factory_destroyed.wav (100%) rename gauss.wav => sfx/gauss.wav (100%) rename hit.wav => sfx/hit.wav (100%) rename laser.wav => sfx/laser.wav (100%) rename missile.wav => sfx/missile.wav (100%) rename missilehit.wav => sfx/missilehit.wav (100%) rename plane.wav => sfx/plane.wav (100%) rename plasma.wav => sfx/plasma.wav (100%) rename shoot.wav => sfx/shoot.wav (100%) rename electricicon.png => ui/electricicon.png (100%) rename electricmods.png => ui/electricmods.png (100%) rename electricstats.png => ui/electricstats.png (100%) rename electricweapons.png => ui/electricweapons.png (100%) rename missile.png => ui/missile.png (100%) rename plane.png => ui/plane.png (100%) rename player.png => ui/player.png (100%) rename aimer_tooltip.png => ui/tooltips/aimer_tooltip.png (100%) rename energy_armor_tooltip.png => ui/tooltips/energy_armor_tooltip.png (100%) rename flare_tooltip.png => ui/tooltips/flare_tooltip.png (100%) rename srb_tooltip.png => ui/tooltips/srb_tooltip.png (100%) diff --git a/blendgrasswoods02.png b/bg/blendgrasswoods02.png similarity index 100% rename from blendgrasswoods02.png rename to bg/blendgrasswoods02.png diff --git a/blendgrasswoodsbackslash.png b/bg/blendgrasswoodsbackslash.png similarity index 100% rename from blendgrasswoodsbackslash.png rename to bg/blendgrasswoodsbackslash.png diff --git a/blendgrasswoodsbottom.png b/bg/blendgrasswoodsbottom.png similarity index 100% rename from blendgrasswoodsbottom.png rename to bg/blendgrasswoodsbottom.png diff --git a/blendgrasswoodsbottomleft.png b/bg/blendgrasswoodsbottomleft.png similarity index 100% rename from blendgrasswoodsbottomleft.png rename to bg/blendgrasswoodsbottomleft.png diff --git a/blendgrasswoodsbottomleft2.png b/bg/blendgrasswoodsbottomleft2.png similarity index 100% rename from blendgrasswoodsbottomleft2.png rename to bg/blendgrasswoodsbottomleft2.png diff --git a/blendgrasswoodsbottomleftcurve.png b/bg/blendgrasswoodsbottomleftcurve.png similarity index 100% rename from blendgrasswoodsbottomleftcurve.png rename to bg/blendgrasswoodsbottomleftcurve.png diff --git a/blendgrasswoodsbottomright.png b/bg/blendgrasswoodsbottomright.png similarity index 100% rename from blendgrasswoodsbottomright.png rename to bg/blendgrasswoodsbottomright.png diff --git a/blendgrasswoodsbottomright2.png b/bg/blendgrasswoodsbottomright2.png similarity index 100% rename from blendgrasswoodsbottomright2.png rename to bg/blendgrasswoodsbottomright2.png diff --git a/blendgrasswoodsbottomrightcurve.png b/bg/blendgrasswoodsbottomrightcurve.png similarity index 100% rename from blendgrasswoodsbottomrightcurve.png rename to bg/blendgrasswoodsbottomrightcurve.png diff --git a/blendgrasswoodsbottomtopleft.png b/bg/blendgrasswoodsbottomtopleft.png similarity index 100% rename from blendgrasswoodsbottomtopleft.png rename to bg/blendgrasswoodsbottomtopleft.png diff --git a/blendgrasswoodsbottomtopright.png b/bg/blendgrasswoodsbottomtopright.png similarity index 100% rename from blendgrasswoodsbottomtopright.png rename to bg/blendgrasswoodsbottomtopright.png diff --git a/blendgrasswoodsbottomwithcorners.png b/bg/blendgrasswoodsbottomwithcorners.png similarity index 100% rename from blendgrasswoodsbottomwithcorners.png rename to bg/blendgrasswoodsbottomwithcorners.png diff --git a/blendgrasswoodsclearing.png b/bg/blendgrasswoodsclearing.png similarity index 100% rename from blendgrasswoodsclearing.png rename to bg/blendgrasswoodsclearing.png diff --git a/blendgrasswoodscornersbottom.png b/bg/blendgrasswoodscornersbottom.png similarity index 100% rename from blendgrasswoodscornersbottom.png rename to bg/blendgrasswoodscornersbottom.png diff --git a/blendgrasswoodscornersleft.png b/bg/blendgrasswoodscornersleft.png similarity index 100% rename from blendgrasswoodscornersleft.png rename to bg/blendgrasswoodscornersleft.png diff --git a/blendgrasswoodscornersright.png b/bg/blendgrasswoodscornersright.png similarity index 100% rename from blendgrasswoodscornersright.png rename to bg/blendgrasswoodscornersright.png diff --git a/blendgrasswoodscornerstop.png b/bg/blendgrasswoodscornerstop.png similarity index 100% rename from blendgrasswoodscornerstop.png rename to bg/blendgrasswoodscornerstop.png diff --git a/blendgrasswoodsforwardslash.png b/bg/blendgrasswoodsforwardslash.png similarity index 100% rename from blendgrasswoodsforwardslash.png rename to bg/blendgrasswoodsforwardslash.png diff --git a/blendgrasswoodshoriz.png b/bg/blendgrasswoodshoriz.png similarity index 100% rename from blendgrasswoodshoriz.png rename to bg/blendgrasswoodshoriz.png diff --git a/blendgrasswoodsleft.png b/bg/blendgrasswoodsleft.png similarity index 100% rename from blendgrasswoodsleft.png rename to bg/blendgrasswoodsleft.png diff --git a/blendgrasswoodsleftbottomright.png b/bg/blendgrasswoodsleftbottomright.png similarity index 100% rename from blendgrasswoodsleftbottomright.png rename to bg/blendgrasswoodsleftbottomright.png diff --git a/blendgrasswoodslefttopright.png b/bg/blendgrasswoodslefttopright.png similarity index 100% rename from blendgrasswoodslefttopright.png rename to bg/blendgrasswoodslefttopright.png diff --git a/blendgrasswoodsleftwithcorners.png b/bg/blendgrasswoodsleftwithcorners.png similarity index 100% rename from blendgrasswoodsleftwithcorners.png rename to bg/blendgrasswoodsleftwithcorners.png diff --git a/blendgrasswoodsright.png b/bg/blendgrasswoodsright.png similarity index 100% rename from blendgrasswoodsright.png rename to bg/blendgrasswoodsright.png diff --git a/blendgrasswoodsrightbottomleft.png b/bg/blendgrasswoodsrightbottomleft.png similarity index 100% rename from blendgrasswoodsrightbottomleft.png rename to bg/blendgrasswoodsrightbottomleft.png diff --git a/blendgrasswoodsrighttopleft.png b/bg/blendgrasswoodsrighttopleft.png similarity index 100% rename from blendgrasswoodsrighttopleft.png rename to bg/blendgrasswoodsrighttopleft.png diff --git a/blendgrasswoodsrightwithcorners.png b/bg/blendgrasswoodsrightwithcorners.png similarity index 100% rename from blendgrasswoodsrightwithcorners.png rename to bg/blendgrasswoodsrightwithcorners.png diff --git a/blendgrasswoodstop.png b/bg/blendgrasswoodstop.png similarity index 100% rename from blendgrasswoodstop.png rename to bg/blendgrasswoodstop.png diff --git a/blendgrasswoodstopbottomleft.png b/bg/blendgrasswoodstopbottomleft.png similarity index 100% rename from blendgrasswoodstopbottomleft.png rename to bg/blendgrasswoodstopbottomleft.png diff --git a/blendgrasswoodstopbottomright.png b/bg/blendgrasswoodstopbottomright.png similarity index 100% rename from blendgrasswoodstopbottomright.png rename to bg/blendgrasswoodstopbottomright.png diff --git a/blendgrasswoodstopleft.png b/bg/blendgrasswoodstopleft.png similarity index 100% rename from blendgrasswoodstopleft.png rename to bg/blendgrasswoodstopleft.png diff --git a/blendgrasswoodstopleft2.png b/bg/blendgrasswoodstopleft2.png similarity index 100% rename from blendgrasswoodstopleft2.png rename to bg/blendgrasswoodstopleft2.png diff --git a/blendgrasswoodstopleftcurve.png b/bg/blendgrasswoodstopleftcurve.png similarity index 100% rename from blendgrasswoodstopleftcurve.png rename to bg/blendgrasswoodstopleftcurve.png diff --git a/blendgrasswoodstopright.png b/bg/blendgrasswoodstopright.png similarity index 100% rename from blendgrasswoodstopright.png rename to bg/blendgrasswoodstopright.png diff --git a/blendgrasswoodstopright2.png b/bg/blendgrasswoodstopright2.png similarity index 100% rename from blendgrasswoodstopright2.png rename to bg/blendgrasswoodstopright2.png diff --git a/blendgrasswoodstoprightcurve.png b/bg/blendgrasswoodstoprightcurve.png similarity index 100% rename from blendgrasswoodstoprightcurve.png rename to bg/blendgrasswoodstoprightcurve.png diff --git a/blendgrasswoodstopwithcorners.png b/bg/blendgrasswoodstopwithcorners.png similarity index 100% rename from blendgrasswoodstopwithcorners.png rename to bg/blendgrasswoodstopwithcorners.png diff --git a/blendgrasswoodsubottom.png b/bg/blendgrasswoodsubottom.png similarity index 100% rename from blendgrasswoodsubottom.png rename to bg/blendgrasswoodsubottom.png diff --git a/blendgrasswoodsuleft.png b/bg/blendgrasswoodsuleft.png similarity index 100% rename from blendgrasswoodsuleft.png rename to bg/blendgrasswoodsuleft.png diff --git a/blendgrasswoodsuright.png b/bg/blendgrasswoodsuright.png similarity index 100% rename from blendgrasswoodsuright.png rename to bg/blendgrasswoodsuright.png diff --git a/blendgrasswoodsutop.png b/bg/blendgrasswoodsutop.png similarity index 100% rename from blendgrasswoodsutop.png rename to bg/blendgrasswoodsutop.png diff --git a/blendgrasswoodsvert.png b/bg/blendgrasswoodsvert.png similarity index 100% rename from blendgrasswoodsvert.png rename to bg/blendgrasswoodsvert.png diff --git a/brushedmetal.png b/bg/brushedmetal.png similarity index 100% rename from brushedmetal.png rename to bg/brushedmetal.png diff --git a/electricplane2.png b/bg/electricplane2.png similarity index 100% rename from electricplane2.png rename to bg/electricplane2.png diff --git a/grass03.png b/bg/grass03.png similarity index 100% rename from grass03.png rename to bg/grass03.png diff --git a/woods02.png b/bg/woods02.png similarity index 100% rename from woods02.png rename to bg/woods02.png diff --git a/death.wav b/death.wav deleted file mode 100644 index 35cd46b1253c5694477005da8495c51361c77a99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3369 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 BZzTW# diff --git a/electric.bas b/electric.bas index 137544b..c2e0723 100644 --- a/electric.bas +++ b/electric.bas @@ -1,4 +1,4 @@ -CONST versionvrsn = "v1.1:0003-indev" 'Update this each build! +CONST versionvrsn = "v1.1:0004-indev" 'Update this each build! _TITLE "Electric" DIM SHARED ignore`, ignorethrot`, swidth, sheight, xoffset%, yoffset%, graphsetting, gamepad, screenanchorx%, screenanchory% @@ -48,8 +48,8 @@ ELSE PUT #1, 19, vol END IF CLOSE #1 -electricicon& = _LOADIMAGE("electricicon.png") -premetal& = _LOADIMAGE("electricplane2.png") +electricicon& = _LOADIMAGE("ui\electricicon.png") +premetal& = _LOADIMAGE("bg\electricplane2.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -183,7 +183,7 @@ DO GET #1, 19, vol CLOSE #1 IF menumusic& THEN _SNDVOL menumusic&, vol - premetal& = _LOADIMAGE("electricplane2.png") + premetal& = _LOADIMAGE("bg\electricplane2.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -216,7 +216,7 @@ LOOP _FREEFONT quartz& SUB credit -premetal& = _LOADIMAGE("electricplane2.png") +premetal& = _LOADIMAGE("bg\electricplane2.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -559,7 +559,7 @@ IF numlazer% < 4999 THEN SELECT CASE shot% CASE 1 IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 THEN - zap& = _SNDOPEN("laser.wav", "sync") + zap& = _SNDOPEN("sfx\laser.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF @@ -571,7 +571,7 @@ IF numlazer% < 4999 THEN lazers(numlazer%).dir = lazers(numlazer%).dir + rad(RND * 4 - 2) vulcansound% = vulcansound% + 1 IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 AND vulcansound% >= 5 THEN - zap& = _SNDOPEN("shoot.wav", "sync") + zap& = _SNDOPEN("sfx\shoot.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& vulcansound% = vulcansound% - 5 @@ -598,7 +598,7 @@ IF numlazer% < 4999 THEN lazers(numlazer%).color = _RGB(0, 100, 200) NEXT IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 THEN - zap& = _SNDOPEN("laser.wav", "sync") + zap& = _SNDOPEN("sfx\laser.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF @@ -608,14 +608,14 @@ IF numlazer% < 4999 THEN lazers(numlazer%).shape = 3 lazers(numlazer%).color = _RGB(0, 255, 0) IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 THEN - zap& = _SNDOPEN("plasma.wav", "sync") + zap& = _SNDOPEN("sfx\plasma.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF CASE 5 lazers(numlazer%).dir = lazers(numlazer%).dir + rad(RND * 4 - 2) IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 THEN - zap& = _SNDOPEN("gauss.wav", "sync") + zap& = _SNDOPEN("sfx\gauss.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF @@ -639,7 +639,7 @@ IF numlazer% < 4999 THEN lazers(numlazer%).dir = lazers(numlazer%).dir + rad(RND * 4 - 2) vulcansound% = vulcansound% + 1 IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight AND inmarket = 0 AND vulcansound% >= 5 THEN - zap& = _SNDOPEN("shoot.wav", "sync") + zap& = _SNDOPEN("sfx\shoot.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& vulcansound% = vulcansound% - 5 @@ -688,7 +688,7 @@ IF numlazer% < 4999 THEN lazers(numlazer%).color = _RGB(0, 255, 0) lazers(numlazer%).target = -1 IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight THEN - zap& = _SNDOPEN("bolt.wav", "sync") + zap& = _SNDOPEN("sfx\bolt.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF @@ -713,7 +713,7 @@ IF numlazer% < 4999 THEN lazers(numlazer%).shape = 4 lazers(numlazer%).color = _RGB(127, 0, 255) IF x + xoffset% > 0 AND x + xoffset% < swidth - 200 AND y + yoffset% > 0 AND y + yoffset% < sheight THEN - zap& = _SNDOPEN("bolt.wav", "sync") + zap& = _SNDOPEN("sfx\bolt.wav", "sync") IF zap& THEN _SNDPLAY zap& _SNDCLOSE zap& END IF @@ -727,7 +727,7 @@ IF nummissile% < 49 THEN missiles(nummissile%).x = planes(plane%).x missiles(nummissile%).y = planes(plane%).y IF missiles(nummissile%).x + xoffset% > 0 AND missiles(nummissile%).x + xoffset% < swidth - 200 AND missiles(nummissile%).y + yoffset% > 0 AND missiles(nummissile%).y + yoffset% < sheight THEN - whoosh& = _SNDOPEN("missile.wav", "sync") + whoosh& = _SNDOPEN("sfx\missile.wav", "sync") IF whoosh& THEN _SNDPLAY whoosh& _SNDCLOSE whoosh& END IF @@ -773,7 +773,7 @@ IF numlazer% > 0 THEN FOR p% = 0 TO numplanes% IF trigger(planes(p%).x - 16, planes(p%).y - 16, planes(p%).x + 15, planes(p%).y + 15, lazers(k%).x, lazers(k%).y) AND planes(p%).armor > 0 AND p% <> lazers(k%).fired THEN IF lazers(k%).x + xoffset% > 0 AND lazers(k%).x + xoffset% < swidth - 200 AND lazers(k%).y + yoffset% > 0 AND lazers(k%).y + yoffset% < sheight THEN - hit& = _SNDOPEN("hit.wav", "sync") + hit& = _SNDOPEN("sfx\hit.wav", "sync") IF hit& <> 0 THEN _SNDPLAY hit& _SNDCLOSE hit& END IF @@ -873,7 +873,7 @@ IF nummissile% > 0 THEN FOR p% = 0 TO numplanes% IF trigger(planes(p%).x - 16, planes(p%).y - 16, planes(p%).x + 15, planes(p%).y + 15, missiles(k%).x, missiles(k%).y) AND planes(p%).armor > 0 AND p% <> missiles(k%).fired THEN IF missiles(k%).x + xoffset% > 0 AND missiles(k%).x + xoffset% < swidth - 200 AND missiles(k%).y + yoffset% > 0 AND missiles(k%).y + yoffset% < sheight THEN - hit& = _SNDOPEN("missilehit.wav", "sync") + hit& = _SNDOPEN("sfx\missilehit.wav", "sync") IF hit& <> 0 THEN _SNDPLAY hit& _SNDCLOSE hit& END IF @@ -1110,50 +1110,50 @@ center "Loading...", 4 _DISPLAY DIM topo%(15, 15) DIM ground&(43) -ground&(0) = _LOADIMAGE("grass03.png") -ground&(1) = _LOADIMAGE("woods02.png") -'ground&(2) = _LOADIMAGE("water.png") -ground&(3) = _LOADIMAGE("blendgrasswoodsbottomright.png") -ground&(4) = _LOADIMAGE("blendgrasswoodsbottomleft.png") -ground&(5) = _LOADIMAGE("blendgrasswoodstopright.png") -ground&(6) = _LOADIMAGE("blendgrasswoodstopleft.png") -ground&(7) = _LOADIMAGE("blendgrasswoodsbottom.png") -ground&(8) = _LOADIMAGE("blendgrasswoodsleft.png") -ground&(9) = _LOADIMAGE("blendgrasswoodstop.png") -ground&(10) = _LOADIMAGE("blendgrasswoodsright.png") -ground&(11) = _LOADIMAGE("blendgrasswoodstopright2.png") -ground&(12) = _LOADIMAGE("blendgrasswoodsbottomright2.png") -ground&(13) = _LOADIMAGE("blendgrasswoodsbottomleft2.png") -ground&(14) = _LOADIMAGE("blendgrasswoodstopleft2.png") -ground&(15) = _LOADIMAGE("blendgrasswoodsubottom.png") -ground&(16) = _LOADIMAGE("blendgrasswoodsuleft.png") -ground&(17) = _LOADIMAGE("blendgrasswoodsutop.png") -ground&(18) = _LOADIMAGE("blendgrasswoodsuright.png") -ground&(19) = _LOADIMAGE("blendgrasswoodscornerstop.png") -ground&(20) = _LOADIMAGE("blendgrasswoodscornersright.png") -ground&(21) = _LOADIMAGE("blendgrasswoodscornersbottom.png") -ground&(22) = _LOADIMAGE("blendgrasswoodscornersleft.png") -ground&(23) = _LOADIMAGE("blendgrasswoodsclearing.png") -ground&(24) = _LOADIMAGE("blendgrasswoodstopbottomright.png") -ground&(25) = _LOADIMAGE("blendgrasswoodstopbottomleft.png") -ground&(26) = _LOADIMAGE("blendgrasswoodsbottomtopright.png") -ground&(27) = _LOADIMAGE("blendgrasswoodsbottomtopleft.png") -ground&(28) = _LOADIMAGE("blendgrasswoodsrightbottomleft.png") -ground&(29) = _LOADIMAGE("blendgrasswoodsrighttopleft.png") -ground&(30) = _LOADIMAGE("blendgrasswoodsleftbottomright.png") -ground&(31) = _LOADIMAGE("blendgrasswoodslefttopright.png") -ground&(32) = _LOADIMAGE("blendgrasswoodshoriz.png") -ground&(33) = _LOADIMAGE("blendgrasswoodsvert.png") -ground&(34) = _LOADIMAGE("blendgrasswoodstopwithcorners.png") -ground&(35) = _LOADIMAGE("blendgrasswoodsrightwithcorners.png") -ground&(36) = _LOADIMAGE("blendgrasswoodsbottomwithcorners.png") -ground&(37) = _LOADIMAGE("blendgrasswoodsleftwithcorners.png") -ground&(38) = _LOADIMAGE("blendgrasswoodstoprightcurve.png") -ground&(39) = _LOADIMAGE("blendgrasswoodsbottomrightcurve.png") -ground&(40) = _LOADIMAGE("blendgrasswoodsbottomleftcurve.png") -ground&(41) = _LOADIMAGE("blendgrasswoodstopleftcurve.png") -ground&(42) = _LOADIMAGE("blendgrasswoodsforwardslash.png") -ground&(43) = _LOADIMAGE("blendgrasswoodsbackslash.png") +ground&(0) = _LOADIMAGE("bg\grass03.png") +ground&(1) = _LOADIMAGE("bg\woods02.png") +'ground&(2) = _LOADIMAGE("bg\water.png") +ground&(3) = _LOADIMAGE("bg\blendgrasswoodsbottomright.png") +ground&(4) = _LOADIMAGE("bg\blendgrasswoodsbottomleft.png") +ground&(5) = _LOADIMAGE("bg\blendgrasswoodstopright.png") +ground&(6) = _LOADIMAGE("bg\blendgrasswoodstopleft.png") +ground&(7) = _LOADIMAGE("bg\blendgrasswoodsbottom.png") +ground&(8) = _LOADIMAGE("bg\blendgrasswoodsleft.png") +ground&(9) = _LOADIMAGE("bg\blendgrasswoodstop.png") +ground&(10) = _LOADIMAGE("bg\blendgrasswoodsright.png") +ground&(11) = _LOADIMAGE("bg\blendgrasswoodstopright2.png") +ground&(12) = _LOADIMAGE("bg\blendgrasswoodsbottomright2.png") +ground&(13) = _LOADIMAGE("bg\blendgrasswoodsbottomleft2.png") +ground&(14) = _LOADIMAGE("bg\blendgrasswoodstopleft2.png") +ground&(15) = _LOADIMAGE("bg\blendgrasswoodsubottom.png") +ground&(16) = _LOADIMAGE("bg\blendgrasswoodsuleft.png") +ground&(17) = _LOADIMAGE("bg\blendgrasswoodsutop.png") +ground&(18) = _LOADIMAGE("bg\blendgrasswoodsuright.png") +ground&(19) = _LOADIMAGE("bg\blendgrasswoodscornerstop.png") +ground&(20) = _LOADIMAGE("bg\blendgrasswoodscornersright.png") +ground&(21) = _LOADIMAGE("bg\blendgrasswoodscornersbottom.png") +ground&(22) = _LOADIMAGE("bg\blendgrasswoodscornersleft.png") +ground&(23) = _LOADIMAGE("bg\blendgrasswoodsclearing.png") +ground&(24) = _LOADIMAGE("bg\blendgrasswoodstopbottomright.png") +ground&(25) = _LOADIMAGE("bg\blendgrasswoodstopbottomleft.png") +ground&(26) = _LOADIMAGE("bg\blendgrasswoodsbottomtopright.png") +ground&(27) = _LOADIMAGE("bg\blendgrasswoodsbottomtopleft.png") +ground&(28) = _LOADIMAGE("bg\blendgrasswoodsrightbottomleft.png") +ground&(29) = _LOADIMAGE("bg\blendgrasswoodsrighttopleft.png") +ground&(30) = _LOADIMAGE("bg\blendgrasswoodsleftbottomright.png") +ground&(31) = _LOADIMAGE("bg\blendgrasswoodslefttopright.png") +ground&(32) = _LOADIMAGE("bg\blendgrasswoodshoriz.png") +ground&(33) = _LOADIMAGE("bg\blendgrasswoodsvert.png") +ground&(34) = _LOADIMAGE("bg\blendgrasswoodstopwithcorners.png") +ground&(35) = _LOADIMAGE("bg\blendgrasswoodsrightwithcorners.png") +ground&(36) = _LOADIMAGE("bg\blendgrasswoodsbottomwithcorners.png") +ground&(37) = _LOADIMAGE("bg\blendgrasswoodsleftwithcorners.png") +ground&(38) = _LOADIMAGE("bg\blendgrasswoodstoprightcurve.png") +ground&(39) = _LOADIMAGE("bg\blendgrasswoodsbottomrightcurve.png") +ground&(40) = _LOADIMAGE("bg\blendgrasswoodsbottomleftcurve.png") +ground&(41) = _LOADIMAGE("bg\blendgrasswoodstopleftcurve.png") +ground&(42) = _LOADIMAGE("bg\blendgrasswoodsforwardslash.png") +ground&(43) = _LOADIMAGE("bg\blendgrasswoodsbackslash.png") pointx% = INT(RND * 16) pointy% = INT(RND * 16) topo%(pointx%, pointy%) = 1 @@ -1197,13 +1197,13 @@ _FREEIMAGE ground&(1) FOR freeground% = 3 TO 43 IF ground&(freeground%) THEN _FREEIMAGE ground&(freeground%) NEXT -player& = _LOADIMAGE("player.png") -plane& = _LOADIMAGE("plane.png") -missileimage& = _LOADIMAGE("missile.png") -weapon& = _LOADIMAGE("electricweapons.png") -aug& = _LOADIMAGE("electricmods.png") -stat& = _LOADIMAGE("electricstats.png") -premetal& = _LOADIMAGE("brushedmetal.png") +player& = _LOADIMAGE("ui\player.png") +plane& = _LOADIMAGE("ui\plane.png") +missileimage& = _LOADIMAGE("ui\missile.png") +weapon& = _LOADIMAGE("ui\electricweapons.png") +aug& = _LOADIMAGE("ui\electricmods.png") +stat& = _LOADIMAGE("ui\electricstats.png") +premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) explosioneffect& = _COPYIMAGE(blob(128, 128, _RGB(255, 0, 0), _RGB(255, 255, 0))) contraileffect& = _COPYIMAGE(blob(16, 16, _RGB(127, 127, 127), _RGB(127, 127, 127))) @@ -1273,10 +1273,10 @@ wepimage&(0) = _NEWIMAGE(32, 32, 32) modimage&(0) = _NEWIMAGE(32, 32, 32) _CLEARCOLOR _RGB(0, 0, 0), wepimage&(0) _CLEARCOLOR _RGB(0, 0, 0), modimage&(0) -tooltips&(1) = _LOADIMAGE("aimer_tooltip.png") -tooltips&(2) = _LOADIMAGE("energy_armor_tooltip.png") -tooltips&(3) = _LOADIMAGE("srb_tooltip.png") -tooltips&(4) = _LOADIMAGE("flare_tooltip.png") +tooltips&(1) = _LOADIMAGE("ui\tooltips\aimer_tooltip.png") +tooltips&(2) = _LOADIMAGE("ui\tooltips\energy_armor_tooltip.png") +tooltips&(3) = _LOADIMAGE("ui\tooltips\srb_tooltip.png") +tooltips&(4) = _LOADIMAGE("ui\tooltips\flare_tooltip.png") OPEN "electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth) GET #1, 5, red GET #1, 6, green @@ -1651,7 +1651,7 @@ IF cyberbit& <> 0 THEN _FREEFONT (cyberbit&) END SUB SUB crash (planes() AS airplane, explosions%(), points() AS score, numexplosions%, numplanes%, difficulty, mods() AS aug, debriss() AS debris, numdebris%) 'Resets planes after they crash, and makes the crash sound -boom& = _SNDOPEN("factory_destroyed.wav", "sync") +boom& = _SNDOPEN("sfx\factory_destroyed.wav", "sync") FOR a% = 0 TO numplanes% IF planes(a%).armor <= 0 AND planes(a%).respawntime <= 0 THEN IF boom& THEN _SNDPLAY boom& @@ -1741,7 +1741,7 @@ GET #1, 25, scrup.axis GET #1, 26, pick.axis quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "") -premetal& = _LOADIMAGE("electricplane2.png") +premetal& = _LOADIMAGE("bg\electricplane2.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -1768,7 +1768,7 @@ DO center "Back", 14 IF menu(4) THEN pickres - premetal& = _LOADIMAGE("electricplane2.png") + premetal& = _LOADIMAGE("bg\electricplane2.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -1897,7 +1897,7 @@ END SUB SUB pickres 'screen resolution picking dialogue quartz& = _LOADFONT("fonsts\segment14.otf", sheight / 16, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "") -premetal& = _LOADIMAGE("brushedmetal.png") +premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -1925,7 +1925,7 @@ DO sheight = resarray(a%).y SCREEN _NEWIMAGE(swidth, sheight, 32) _PRINTMODE _KEEPBACKGROUND - premetal& = _LOADIMAGE("brushedmetal.png") + premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -2064,7 +2064,7 @@ LOOP UNTIL done% = 1 END SUB SUB keybind (gamepad, steering AS control, throttle AS control, primary AS control, secondary AS control, scrdown AS control, scrup AS control, pick AS control) -premetal& = _LOADIMAGE("brushedmetal.png") +premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -2109,9 +2109,9 @@ END SUB SUB colorslider (red, green, blue, livery) 'The RGB color sliders to choose plane colors DIM colory(2) -plane& = _LOADIMAGE("plane.png") +plane& = _LOADIMAGE("ui\plane.png") _CLEARCOLOR _RGB(0, 0, 0), plane& -premetal& = _LOADIMAGE("brushedmetal.png") +premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& @@ -2161,7 +2161,7 @@ _FREEIMAGE brushedmetal& END SUB SUB volumeslider (vol) -premetal& = _LOADIMAGE("brushedmetal.png") +premetal& = _LOADIMAGE("bg\brushedmetal.png") brushedmetal& = _NEWIMAGE(swidth, sheight, 32) _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _FREEIMAGE premetal& diff --git a/bolt.wav b/sfx/bolt.wav similarity index 100% rename from bolt.wav rename to sfx/bolt.wav diff --git a/factory_destroyed.wav b/sfx/factory_destroyed.wav similarity index 100% rename from factory_destroyed.wav rename to sfx/factory_destroyed.wav diff --git a/gauss.wav b/sfx/gauss.wav similarity index 100% rename from gauss.wav rename to sfx/gauss.wav diff --git a/hit.wav b/sfx/hit.wav similarity index 100% rename from hit.wav rename to sfx/hit.wav diff --git a/laser.wav b/sfx/laser.wav similarity index 100% rename from laser.wav rename to sfx/laser.wav diff --git a/missile.wav b/sfx/missile.wav similarity index 100% rename from missile.wav rename to sfx/missile.wav diff --git a/missilehit.wav b/sfx/missilehit.wav similarity index 100% rename from missilehit.wav rename to sfx/missilehit.wav diff --git a/plane.wav b/sfx/plane.wav similarity index 100% rename from plane.wav rename to sfx/plane.wav diff --git a/plasma.wav b/sfx/plasma.wav similarity index 100% rename from plasma.wav rename to sfx/plasma.wav diff --git a/shoot.wav b/sfx/shoot.wav similarity index 100% rename from shoot.wav rename to sfx/shoot.wav diff --git a/electricicon.png b/ui/electricicon.png similarity index 100% rename from electricicon.png rename to ui/electricicon.png diff --git a/electricmods.png b/ui/electricmods.png similarity index 100% rename from electricmods.png rename to ui/electricmods.png diff --git a/electricstats.png b/ui/electricstats.png similarity index 100% rename from electricstats.png rename to ui/electricstats.png diff --git a/electricweapons.png b/ui/electricweapons.png similarity index 100% rename from electricweapons.png rename to ui/electricweapons.png diff --git a/missile.png b/ui/missile.png similarity index 100% rename from missile.png rename to ui/missile.png diff --git a/plane.png b/ui/plane.png similarity index 100% rename from plane.png rename to ui/plane.png diff --git a/player.png b/ui/player.png similarity index 100% rename from player.png rename to ui/player.png diff --git a/aimer_tooltip.png b/ui/tooltips/aimer_tooltip.png similarity index 100% rename from aimer_tooltip.png rename to ui/tooltips/aimer_tooltip.png diff --git a/energy_armor_tooltip.png b/ui/tooltips/energy_armor_tooltip.png similarity index 100% rename from energy_armor_tooltip.png rename to ui/tooltips/energy_armor_tooltip.png diff --git a/flare_tooltip.png b/ui/tooltips/flare_tooltip.png similarity index 100% rename from flare_tooltip.png rename to ui/tooltips/flare_tooltip.png diff --git a/srb_tooltip.png b/ui/tooltips/srb_tooltip.png similarity index 100% rename from srb_tooltip.png rename to ui/tooltips/srb_tooltip.png