diff options
22 files changed, 118 insertions, 15 deletions
@@ -91,7 +91,9 @@ function loadAssets() shine = love.audio.newSource("assets/shine.ogg"), scorch = love.graphics.newImage("assets/virus_scorch.png"), scorchMask = love.graphics.newImage("assets/virus_scorch_mask.png"), - shineplay = false + shineplay = false, + corner = love.graphics.newImage("assets/chat_bubble_corner.png"), + cornerSpike = love.graphics.newImage("assets/chat_bubble_cornerspike.png") } v1.c = {} v1.c.idle = {} @@ -19,17 +19,17 @@ function drawChat() love.graphics.draw(chat.profile, 6, 30) love.graphics.setColor(colors.font.dark) love.graphics.print(chat.profilename, 50, 41) - love.graphics.setFont(pressstarts) + love.graphics.setFont(pixeloperators) for i=1,chatlimit() do if msg.msgs[i][1] == 1 then love.graphics.setColor(colors.font.friend) - love.graphics.print("Friend:", 12, 310 - (28*i)) + love.graphics.print("Friend:", 12, 300 - (28*i)) elseif msg.msgs[i][1] == 2 then love.graphics.setColor(colors.font.you) - love.graphics.print("You:", 12, 310 - (28*i)) + love.graphics.print("You:", 12, 300 - (28*i)) end love.graphics.setColor(colors.font.dark) - love.graphics.print("\n" .. msg.msgs[i][2], 12, 310 - (28*i)) + love.graphics.print("\n" .. msg.msgs[i][2], 12, 300 - (28*i)) end love.graphics.setFont(pressstart) end diff --git a/elements.lua b/elements.lua index 51ee023..976e1c1 100644 --- a/elements.lua +++ b/elements.lua @@ -4,7 +4,7 @@ function drawXBox(x, y) love.graphics.setColor(colors.font.dark) love.graphics.print("X", x+2.5, y+4.5) love.graphics.setColor(colors.win.light) - love.graphics.setLineWidth(1) + love.graphics.setLineWidth(1.5) love.graphics.line(x, y+16, x, y, x+16, y) love.graphics.setColor(colors.win.dark) love.graphics.line(x, y+16, x+16, y+16, x+16, y) @@ -13,10 +13,10 @@ function drawMinBox(x, y) love.graphics.setColor(colors.win.normal) love.graphics.rectangle("fill", x, y, 16, 16) love.graphics.setColor(colors.font.dark) - love.graphics.setLineWidth(3) + love.graphics.setLineWidth(3.5) love.graphics.line(x+3, y+8, x+13, y+8) love.graphics.setColor(colors.win.light) - love.graphics.setLineWidth(1) + love.graphics.setLineWidth(1.5) love.graphics.line(x, y+16, x, y, x+16, y) love.graphics.setColor(colors.win.dark) love.graphics.line(x, y+16, x+16, y+16, x+16, y) @@ -24,7 +24,7 @@ end function drawUpBox(x, y, w, h, t) love.graphics.setColor(colors.win.normal) love.graphics.rectangle("fill", x, y, w, h) - love.graphics.setLineWidth(t) + love.graphics.setLineWidth(t-0.5) love.graphics.setColor(colors.win.light) love.graphics.line(x, y+h, x, y, x+w, y) love.graphics.setColor(colors.win.dark) @@ -33,7 +33,7 @@ end function drawDownBox(x, y, w, h, t) love.graphics.setColor(colors.win.normal) love.graphics.rectangle("fill", x, y, w, h) - love.graphics.setLineWidth(t) + love.graphics.setLineWidth(t-0.5) love.graphics.setColor(colors.win.dark) love.graphics.line(x, y+h, x, y, x+w, y) love.graphics.setColor(colors.win.light) @@ -42,7 +42,7 @@ end function drawBlueBox(x, y, w, h, t) love.graphics.setColor(0, 0, 120) love.graphics.rectangle("fill", x, y, w, h) - love.graphics.setLineWidth(t) + love.graphics.setLineWidth(t-0.5) love.graphics.setColor(0,0,180) love.graphics.line(x, y+h, x, y, x+w, y) love.graphics.setColor(0, 0, 80) diff --git a/fonts/pixel_operator/License.txt b/fonts/pixel_operator/License.txt new file mode 100755 index 0000000..068edd0 --- /dev/null +++ b/fonts/pixel_operator/License.txt @@ -0,0 +1,95 @@ +Reserved font name: Pixel Operator (previously known as the 8-bit Operator) + +(C) 2009-2015 The Grandoplex Project. +Made in Al Khobar, Saudi Arabia. + +This font by Jayvee Enaguas (GrandChaos9000) +<grandchaos9000(at)openmailbox(dot)org> is licensed under +the SIL OFL 1.1 <http://scripts.sil.org/OFL>. + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/pixel_operator/PixelOperator-Bold.ttf b/fonts/pixel_operator/PixelOperator-Bold.ttf Binary files differnew file mode 100755 index 0000000..304c74d --- /dev/null +++ b/fonts/pixel_operator/PixelOperator-Bold.ttf diff --git a/fonts/pixel_operator/PixelOperator.ttf b/fonts/pixel_operator/PixelOperator.ttf Binary files differnew file mode 100755 index 0000000..5d2fbd2 --- /dev/null +++ b/fonts/pixel_operator/PixelOperator.ttf diff --git a/fonts/pixel_operator/PixelOperator8-Bold.ttf b/fonts/pixel_operator/PixelOperator8-Bold.ttf Binary files differnew file mode 100755 index 0000000..c735fd3 --- /dev/null +++ b/fonts/pixel_operator/PixelOperator8-Bold.ttf diff --git a/fonts/pixel_operator/PixelOperator8.ttf b/fonts/pixel_operator/PixelOperator8.ttf Binary files differnew file mode 100755 index 0000000..cebddde --- /dev/null +++ b/fonts/pixel_operator/PixelOperator8.ttf diff --git a/fonts/pixel_operator/PixelOperatorHB.ttf b/fonts/pixel_operator/PixelOperatorHB.ttf Binary files differnew file mode 100755 index 0000000..5b3eb54 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorHB.ttf diff --git a/fonts/pixel_operator/PixelOperatorHB8.ttf b/fonts/pixel_operator/PixelOperatorHB8.ttf Binary files differnew file mode 100755 index 0000000..f4f74c0 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorHB8.ttf diff --git a/fonts/pixel_operator/PixelOperatorHBSC.ttf b/fonts/pixel_operator/PixelOperatorHBSC.ttf Binary files differnew file mode 100755 index 0000000..e95e556 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorHBSC.ttf diff --git a/fonts/pixel_operator/PixelOperatorMono-Bold.ttf b/fonts/pixel_operator/PixelOperatorMono-Bold.ttf Binary files differnew file mode 100755 index 0000000..0c350a5 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMono-Bold.ttf diff --git a/fonts/pixel_operator/PixelOperatorMono.ttf b/fonts/pixel_operator/PixelOperatorMono.ttf Binary files differnew file mode 100755 index 0000000..8665fe7 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMono.ttf diff --git a/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf b/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf Binary files differnew file mode 100755 index 0000000..c04399d --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMono8-Bold.ttf diff --git a/fonts/pixel_operator/PixelOperatorMono8.ttf b/fonts/pixel_operator/PixelOperatorMono8.ttf Binary files differnew file mode 100755 index 0000000..d11035c --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMono8.ttf diff --git a/fonts/pixel_operator/PixelOperatorMonoHB.ttf b/fonts/pixel_operator/PixelOperatorMonoHB.ttf Binary files differnew file mode 100755 index 0000000..d74ee97 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMonoHB.ttf diff --git a/fonts/pixel_operator/PixelOperatorMonoHB8.ttf b/fonts/pixel_operator/PixelOperatorMonoHB8.ttf Binary files differnew file mode 100755 index 0000000..383d978 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorMonoHB8.ttf diff --git a/fonts/pixel_operator/PixelOperatorSC-Bold.ttf b/fonts/pixel_operator/PixelOperatorSC-Bold.ttf Binary files differnew file mode 100755 index 0000000..a4cd131 --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorSC-Bold.ttf diff --git a/fonts/pixel_operator/PixelOperatorSC.ttf b/fonts/pixel_operator/PixelOperatorSC.ttf Binary files differnew file mode 100755 index 0000000..f908eac --- /dev/null +++ b/fonts/pixel_operator/PixelOperatorSC.ttf @@ -21,8 +21,14 @@ function love.load() love.graphics.setNewFont() pressstart = love.graphics.newFont("fonts/pressstart.ttf", 12) pressstart:setFilter("nearest", "nearest") - pressstarts = love.graphics.newFont("fonts/pressstart.ttf", 10) - pressstarts:setFilter("nearest", "nearest") + --pressstarts = love.graphics.newFont("fonts/pressstart.ttf", 10) + --pressstarts:setFilter("nearest", "nearest") + pixeloperatorb = love.graphics.newFont("fonts/pixel_operator/PixelOperator8-Bold.ttf", 16) + pixeloperatorb:setFilter("nearest", "nearest") + pixeloperator = love.graphics.newFont("fonts/pixel_operator/PixelOperator8.ttf", 16) + pixeloperator:setFilter("nearest", "nearest") + pixeloperators = love.graphics.newFont("fonts/pixel_operator/PixelOperator-Bold.ttf", 16) + pixeloperators:setFilter("nearest", "nearest") love.graphics.setFont(pressstart) love.keyboard.setKeyRepeat(true) loadAssets() @@ -31,7 +31,7 @@ function drawStart() love.graphics.setColor(colors.win.normal) love.graphics.rectangle("fill", panel.x, panel.y, panel.width, panel.height) love.graphics.setColor(colors.win.light) - love.graphics.setLineWidth(2) + love.graphics.setLineWidth(1.5) love.graphics.line(panel.x, panel.y, panel.width, panel.y) love.graphics.setColor(colors.win.dark) if start.o == true then diff --git a/startmenu.lua b/startmenu.lua index abce95d..83598d0 100644 --- a/startmenu.lua +++ b/startmenu.lua @@ -28,7 +28,7 @@ function drawMenu() love.graphics.setColor(192, 192, 192) love.graphics.rectangle("fill", 0, 0, 250, 350) love.graphics.setColor(220, 220, 220) - love.graphics.setLineWidth(4) + love.graphics.setLineWidth(3.5) love.graphics.line(0, 0+350, 0, 0, 0+250, 0) --BoxLight love.graphics.setColor(150,150,150) love.graphics.line(0+250, 0+350, 0+250, 0) --BoxShadow |