Skip to content

Commit

Permalink
Milestone 1
Browse files Browse the repository at this point in the history
  • Loading branch information
KelvinShadewing committed Apr 9, 2022
1 parent f23ff07 commit 73acd83
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 7 deletions.
4 changes: 3 additions & 1 deletion docs/CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ Lukas Nystrand - Chippdisko

[migfus20](https://opengameart.org/users/migfus20) - Boss Theme

[CleytonKauffman](https://soundcloud.com/cleytonkauffman) - Trailer Theme

## Level Contributors

[FrostC](https://www.youtube.com/channel/UCy9RpAf9M8icNBRXf3S6rmw) - Slip and Slide, Tux 'N Trouble, Frost's Sense of Snow, The Ocean Bridge, Arctic Wind, Gaurded steps, part of Branching path
Expand All @@ -124,7 +126,7 @@ Lukas Nystrand - Chippdisko

[Martin P. Hellwig]() - GNU puns 4-7

[Misc Tux racer devs](http://tuxracer.sourceforge.net/) - herring sounds, some assets used in Frostlands
[Misc Tux racer devs](http://tuxracer.sourceforge.net/) - herring sounds, some assets used in Frostlands

[Busybody64](https://github.com/Busybody64) - Help with FAQ

Expand Down
1 change: 1 addition & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
},

"pause-menu" : {
"pause" : "PAUSE",
"continue" : "Continue",
"character" : "Change Character",
"restart" : "Restart Level",
Expand Down
4 changes: 2 additions & 2 deletions lang/ex.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
"controls" :
"No forgotten to set yours restraints the on choices menu the in main screen! conditionally to you are a exceedingly disaster upon setting them upon, delete yours config. json book.",
"secrets" :
"Secret passages are everywhere! Feel against the wall to reveal them, or watch for enemy movements.",
"coyotetime" :
"Secret passages am the world! felt the against wall to reveal them, or watched of enemy movements.",
"coyotetime" :
"You are a take that brief moment after the leaving ground what time you are a with able to still ascend. Practiced running the off edges and jumping only after yours feet the left ground.",
"tntex" :
"Tnt block burst that below anytime after coming on touching taking individual.",
"chainex" :
Expand Down
1 change: 1 addition & 0 deletions res/credits.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
{"type":"header","trText":"musicians"},
{"type":"normal","text":"Alex McCulloch"},
{"type":"normal","text":"Automusic"},
{"type":"normal","text":"Cleyton Kauffman"},
{"type":"normal","text":"Eric Matyas"},
{"type":"normal","text":"genaralskar"},
{"type":"normal","text":"Joth"},
Expand Down
Binary file modified res/gfx/duke.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/blocks.nut
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
game.chy = y
playSoundChannel(sndBell, 0, 4)
if(game.difficulty < 3) {
if(game.health < game.maxHealth) game.health += 2
if(game.health < game.maxHealth) game.health += 4
else if(game.subitem == 0) game.subitem = 5
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/enemies.nut
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,7 @@
drawLightEx(sprLightIce, 0, x - camx, y - camy, 0, 0, 0.125, 0.125)
//drawText(font, x - camx + 16, y - camy, dir.tostring())
shape.setPos(x, y)
if(gvPlayer) if(hitTest(shape, gvPlayer.shape)) gvPlayer.hurt = 3
if(gvPlayer) if(hitTest(shape, gvPlayer.shape)) gvPlayer.hurt = 2
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/global.nut
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| GLOBAL VARIABLES |
\*================*/

::gvVersion <- "0.0.19"
::gvVersion <- "0.1.0"
::gvMap <- 0
::gvGameMode <- 0
::gvQuit <- false
Expand Down
2 changes: 1 addition & 1 deletion src/gmpause.nut
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
::gmPause <- function() {
setDrawTarget(gvScreen)
drawImage(bgPause, 0, 0)
drawText(font2, (screenW() / 2) - 20, screenH() / 2, "PAUSE")
drawText(font2, (screenW() / 2) - 20, screenH() / 2 - 64, gvLangObj["pause-menu"]["pause"])
textMenu()
resetDrawTarget()
drawImage(gvScreen, 0, 0)
Expand Down

0 comments on commit 73acd83

Please sign in to comment.