First 1.1 branch for Electric

Now ignoring electricconfig.cfg because it needs to be unique for everyone
Moved config to its own folder
Moved fonts to thier own folder
More similar changes are to come.

1.1 is intended to be built with QB64 1.1.

Signed-off-by: Daniel Marsee <rdmarsee@gmail.com>
This commit is contained in:
Daniel Marsee 2016-11-02 11:26:22 -04:00
parent 8ef3d67e12
commit 2ac90a8bd2
4 changed files with 30 additions and 25 deletions

5
.gitignore vendored
View file

@ -21,6 +21,11 @@
*.tar *.tar
*.zip *.zip
# Configurations #
##################
# ignore the autogenerated electric config files
*.cfg
# Logs and databases # # Logs and databases #
###################### ######################
*.log *.log

View file

@ -1,8 +1,8 @@
'Electric v1.0:0015 CONST versionvrsn = "v1.1:0002-indev" 'Update this each build!
_TITLE "Electric" _TITLE "Electric"
DIM SHARED ignore`, ignorethrot`, swidth, sheight, xoffset%, yoffset%, graphsetting, gamepad, screenanchorx%, screenanchory% DIM SHARED ignore`, ignorethrot`, swidth, sheight, xoffset%, yoffset%, graphsetting, gamepad, screenanchorx%, screenanchory%
OPEN "electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth) OPEN "cfg\electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth)
GET #1, 1, swidth GET #1, 1, swidth
GET #1, 2, sheight GET #1, 2, sheight
GET #1, 3, fs GET #1, 3, fs
@ -59,8 +59,8 @@ IF electricicon& THEN
_FREEIMAGE electricicon& _FREEIMAGE electricicon&
END IF END IF
IF fs = 1 THEN _FULLSCREEN IF fs = 1 THEN _FULLSCREEN
quartz& = _LOADFONT("segment14.otf", sheight / 24, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
_PRINTMODE _KEEPBACKGROUND _PRINTMODE _KEEPBACKGROUND
RANDOMIZE TIMER RANDOMIZE TIMER
TYPE control TYPE control
@ -151,7 +151,7 @@ TYPE debris
rotation AS SINGLE rotation AS SINGLE
END TYPE END TYPE
menumusic& = _SNDOPEN("not-from-this-world_z1Fsz8Su.ogg", "sync,vol") menumusic& = _SNDOPEN("menu_music.ogg", "sync,vol")
_SNDVOL menumusic&, vol _SNDVOL menumusic&, vol
IF menumusic& THEN _SNDPLAY menumusic& IF menumusic& THEN _SNDPLAY menumusic&
DO DO
@ -171,7 +171,7 @@ DO
center "Tell me a fun fact!", 8 center "Tell me a fun fact!", 8
wot funfact$, 0, 9 * _FONTHEIGHT, swidth wot funfact$, 0, 9 * _FONTHEIGHT, swidth
END IF END IF
_PRINTSTRING (0, sheight - _FONTHEIGHT), "v.1.0:0015" _PRINTSTRING (0, sheight - _FONTHEIGHT), versionvrsn
IF menu(4) THEN IF menu(4) THEN
IF _SNDPLAYING(menumusic&) THEN _SNDSTOP menumusic& IF _SNDPLAYING(menumusic&) THEN _SNDSTOP menumusic&
env env
@ -179,7 +179,7 @@ DO
END IF END IF
IF menu(5) THEN IF menu(5) THEN
options options
OPEN "electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth) OPEN "cfg\electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth)
GET #1, 19, vol GET #1, 19, vol
CLOSE #1 CLOSE #1
IF menumusic& THEN _SNDVOL menumusic&, vol IF menumusic& THEN _SNDVOL menumusic&, vol
@ -188,8 +188,8 @@ DO
_PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal&
_FREEIMAGE premetal& _FREEIMAGE premetal&
_FONT 16 _FONT 16
quartz& = _LOADFONT("segment14.otf", sheight / 24, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
END IF END IF
IF menu(6) THEN credit IF menu(6) THEN credit
IF menu(7) THEN IF menu(7) THEN
@ -222,8 +222,8 @@ _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal&
_FREEIMAGE premetal& _FREEIMAGE premetal&
_PUTIMAGE (0, 0), brushedmetal& _PUTIMAGE (0, 0), brushedmetal&
_FONT 16 _FONT 16
quartz& = _LOADFONT("segment14.otf", sheight / 24, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
_FONT quartz& _FONT quartz&
center "CREDITS", 1 center "CREDITS", 1
_FONT cyberbit& _FONT cyberbit&
@ -232,7 +232,7 @@ center "Patrick 'Cheese-Water' Marsee", 5
center "In-Game Music:", 7 center "In-Game Music:", 7
center "N/A", 8 center "N/A", 8
center "Title Music:", 10 center "Title Music:", 10
center "Neil Cross", 11 center "N/A", 11
center "Other Stuff:", 13 center "Other Stuff:", 13
center "QB64 - IDE", 14 center "QB64 - IDE", 14
center "GIMP - Graphics", 15 center "GIMP - Graphics", 15
@ -1277,7 +1277,7 @@ tooltips&(1) = _LOADIMAGE("aimer_tooltip.png")
tooltips&(2) = _LOADIMAGE("energy_armor_tooltip.png") tooltips&(2) = _LOADIMAGE("energy_armor_tooltip.png")
tooltips&(3) = _LOADIMAGE("srb_tooltip.png") tooltips&(3) = _LOADIMAGE("srb_tooltip.png")
tooltips&(4) = _LOADIMAGE("flare_tooltip.png") tooltips&(4) = _LOADIMAGE("flare_tooltip.png")
OPEN "electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth) OPEN "cfg\electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth)
GET #1, 5, red GET #1, 5, red
GET #1, 6, green GET #1, 6, green
GET #1, 7, blue GET #1, 7, blue
@ -1317,9 +1317,9 @@ _DEST 0
IF team < 1 THEN team = 1 IF team < 1 THEN team = 1
IF team > 4 THEN team = 4 IF team > 4 THEN team = 4
planeshadow& = shadow&(plane&) planeshadow& = shadow&(plane&)
quartz& = _LOADFONT("segment14.otf", 16) quartz& = _LOADFONT("fonts\segment14.otf", 16)
bigquartz& = _LOADFONT("segment14.otf", 32) bigquartz& = _LOADFONT("fonts\segment14.otf", 32)
cyberbit& = _LOADFONT("cyberbit.ttf", 24, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", 24, "")
numplanes% = team * 4 - 1 numplanes% = team * 4 - 1
DIM points(3) AS score DIM points(3) AS score
DIM planes(15) AS airplane DIM planes(15) AS airplane
@ -1712,7 +1712,7 @@ END SUB
SUB options 'The options menu SUB options 'The options menu
DIM steering AS control, throttle AS control, primary AS control, secondary AS control, scrdown AS control, scrup AS control, pick AS control DIM steering AS control, throttle AS control, primary AS control, secondary AS control, scrdown AS control, scrup AS control, pick AS control
OPEN "electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth) OPEN "cfg\electricsettings.cfg" FOR RANDOM AS #1 LEN = LEN(swidth)
GET #1, 1, swidth GET #1, 1, swidth
GET #1, 2, sheight GET #1, 2, sheight
GET #1, 3, fs GET #1, 3, fs
@ -1739,8 +1739,8 @@ GET #1, 23, secondary.axis
GET #1, 24, scrdown.axis GET #1, 24, scrdown.axis
GET #1, 25, scrup.axis GET #1, 25, scrup.axis
GET #1, 26, pick.axis GET #1, 26, pick.axis
quartz& = _LOADFONT("segment14.otf", sheight / 24, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
premetal& = _LOADIMAGE("electricplane2.png") premetal& = _LOADIMAGE("electricplane2.png")
brushedmetal& = _NEWIMAGE(swidth, sheight, 32) brushedmetal& = _NEWIMAGE(swidth, sheight, 32)
_PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal&
@ -1776,8 +1776,8 @@ DO
PUT #1, 2, sheight PUT #1, 2, sheight
_PRINTMODE _KEEPBACKGROUND _PRINTMODE _KEEPBACKGROUND
_FONT 16 _FONT 16
quartz& = _LOADFONT("segment14.otf", sheight / 24, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 24, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
END IF END IF
IF menu(5) THEN IF menu(5) THEN
IF fs = 0 THEN fs = 1 ELSE fs = 0 IF fs = 0 THEN fs = 1 ELSE fs = 0
@ -1895,8 +1895,8 @@ _FREEIMAGE brushedmetal&
END SUB END SUB
SUB pickres 'screen resolution picking dialogue SUB pickres 'screen resolution picking dialogue
quartz& = _LOADFONT("segment14.otf", sheight / 16, "") quartz& = _LOADFONT("fonsts\segment14.otf", sheight / 16, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
premetal& = _LOADIMAGE("brushedmetal.png") premetal& = _LOADIMAGE("brushedmetal.png")
brushedmetal& = _NEWIMAGE(swidth, sheight, 32) brushedmetal& = _NEWIMAGE(swidth, sheight, 32)
_PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal&
@ -1930,8 +1930,8 @@ DO
_PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal& _PUTIMAGE (0, 0)-(swidth - 1, sheight - 1), premetal&, brushedmetal&
_FREEIMAGE premetal& _FREEIMAGE premetal&
_FONT 16 _FONT 16
quartz& = _LOADFONT("segment14.otf", sheight / 16, "") quartz& = _LOADFONT("fonts\segment14.otf", sheight / 16, "")
cyberbit& = _LOADFONT("cyberbit.ttf", sheight / 32, "") cyberbit& = _LOADFONT("fonts\cyberbit.ttf", sheight / 32, "")
END IF END IF
NEXT NEXT
IF menu(21) THEN IF menu(21) THEN