Skip to content

Commit

Permalink
needs more lua
Browse files Browse the repository at this point in the history
  • Loading branch information
RokonShimo committed Oct 4, 2018
1 parent 4c2225b commit 615828d
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 7 deletions.
33 changes: 32 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,32 @@
# Mari0-FE
# Mari0 FE - Frustrated with a feature's absence? Add it.

git.io/fA7Af


Initial Commit:

region triggers can now detect a specific enemy category - just type a number into the input box. "true" and "false" emulate the vanilla behaviour of enemy detection. this may break other usages of "checkrect".

added givesacoin, givesdecacoin, and givestime for custom enemies. these override givesalife.

also added givestimeamount.

changed folder to mari0_fe so that things don't crash in unmodded SE.


smb Mappack will no longer disappear if you load anything else.

kooparedflying is fixed - shoutouts to Alesan for this.

scaffolds are no longer invisible in the editor.


deleted the map previews of /smb/ so it fit.
---------------

Commit 2:

Changed Files: game

merged givesdecacoin into givesacoin, and added givescoinamount for consistency and flexibility

3 changes: 3 additions & 0 deletions game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ function game_load(suspended)
--LINK STUFF
mariocoincount = 0
marioscore = 0
globools = {}
globints = {}


--get mariolives
mariolivecount = 3
Expand Down
Binary file modified graphics/font.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/fontback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ function love.load(arg)

fontimage = love.graphics.newImage("graphics/font.png")
fontimageback = love.graphics.newImage("graphics/fontback.png")
fontglyphs = "0123456789abcdefghijklmnopqrstuvwxyz.:/,\"C-_A* !{}?'()+=><#%"
fontglyphs = "0123456789abcdefghijklmnopqrstuvwxyz.:/,\"C-_A* !{}?'()+=><#%OU"
fontquads = {}
for i = 1, string.len(fontglyphs) do
fontquads[string.sub(fontglyphs, i, i)] = love.graphics.newQuad((i-1)*8, 0, 7, 8, fontimage:getWidth(), fontimage:getHeight())
Expand All @@ -396,13 +396,13 @@ function love.load(arg)

love.graphics.clear()
love.graphics.setColor(100, 100, 100)
loadingtexts = {"reticulating splines", "rendering important stuff", "01110000011011110110111001111001", "sometimes, i dream about cheese",
"baking cake", "happy explosion day", "raising coolness by a fifth", "yay facepunch", "stabbing myself", "sharpening knives",
loadingtexts = {"reticulating splines", "rendering important stuff", "70 6f 6e 79", "sometimes, i dream about cheese",
"baking caaaake...", "happy explosion day", "raising coolness by a fifth", "drawing pink umlaUts", "stabbing myself", "sharpening knives",
"tanaka, thai kick", "slime will find you", "becoming self-aware", "it's a secret to everybody", "there is no minus world",
"oh my god, jc, a bomb", "silly loading message here", "motivational art by jorichi", "love.graphics.print(\"loading..\", 200, 120)",
"oh my god, jc, a bomb", "silly loading message here", "motivational art by jorichi", "lOve.graphics.print(\"loading...\", 200, 120)",
"you're my favorite deputy", "licensed under wtfpl", "banned in argentina", "loading anti-piracy module", "watch out there's a sni",
"attack while its tail's up!", "what a horrible night to have a curse", "han shot first", "establishing connection to nsa servers..",
"how do i programm", "making palette inaccurate..", "y cant mario crawl?"}
"attack while its tail's up!", "what a horrible night to have a curse", "is this loss?", "establishing connection to nsa servers..",
"mari0 over, i blame maurice", "making palette inaccurate...", "y cant mario crawl?", "pink is best cOlor", "fixing loading texts"}

loadingtext = loadingtexts[math.random(#loadingtexts)]

Expand Down

0 comments on commit 615828d

Please sign in to comment.