juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 07:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from LoveEevee/gameplay-improvements

Browse Source 
Lots of gameplay improvements
This commit is contained in:
Bui 2018-09-05 17:57:45 +01:00 committed by GitHub
commit 999648dfd7
11 changed files with 738 additions and 637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/css/game.css
View File

@ -2,9 +2,12 @@
width:100%;
height:100%;
overflow: hidden;
background-size:cover;
}
#canvas{
position:relative;
z-index:1;
width:100%;
height:100%;
}

15
public/src/css/loader.css
View File

@ -16,13 +16,16 @@
}
#loader .percentage{
margin:auto;
width:100%;
position:absolute;
top:0;
right:0;
bottom:0;
left:0;
display:flex;
justify-content:center;
align-items:center;
text-align:center;
font-family: sans-serif;
font-size: 5vmin;
color: white;
position:fixed;
top:53%;
margin-left:-30px;
}

3
public/src/js/assets.js
View File

@ -98,6 +98,7 @@ var assets = {
'TnT'
),
sounds: {}
sounds: {},
image: {}
};

28
public/src/js/circle.js
View File

@ -1,4 +1,4 @@
function Circle(id, ms, type){
function Circle(id, ms, type, text, speed){
var _id=id;
var _ms = ms;
@ -43,15 +43,6 @@ function Circle(id, ms, type){
return _animating;
}
this.setInitPos = function(initPos){
_pos.x = initPos.x;
_pos.y = initPos.y
}
this.move = function(pxPerFrame){
_pos.x -= pxPerFrame;
}
this.getAnimT = function(){
return _animT;
}
@ -60,15 +51,6 @@ function Circle(id, ms, type){
_animT+=0.05;
}
this.moveTo = function(x, y){
_pos.x=x;
_pos.y=y;
}
this.getPos = function(){
return _pos;
}
this.updateStatus = function(status){
_status=status;
}
@ -101,4 +83,12 @@ function Circle(id, ms, type){
this.getID = function(){
return _id;
}
this.getText = function(){
return text;
}
this.getSpeed = function(){
return speed;
}
}

4
public/src/js/controller.js
View File

@ -208,6 +208,10 @@ function Controller(selectedSong, songData, autoPlayEnabled){
_keyboard.waitForKeyup(key, type);
}
this.getKeyTime = function(){
return _keyboard.getKeyTime();
}
this.updateCombo = function(score){
_game.updateCombo(score);
}

7
public/src/js/game.js
View File

@ -149,9 +149,12 @@ function Game(controller, selectedSong, songData){
this.checkScore = function(circle){
var keys = controller.getKeys()
var kbd = controller.getBindings()
if(
((controller.getKeys()[86] || controller.getKeys()[66]) && (circle.getType()=="don" || circle.getType()=="daiDon")) ||
((controller.getKeys()[67] || controller.getKeys()[78]) && (circle.getType()=="ka" || circle.getType()=="daiKa"))
((keys[kbd["don_l"]] || keys[kbd["don_r"]]) && (circle.getType()=="don" || circle.getType()=="daiDon")) ||
((keys[kbd["ka_l"]] || keys[kbd["ka_r"]]) && (circle.getType()=="ka" || circle.getType()=="daiKa"))
){
switch(circle.getStatus()){

19
public/src/js/keyboard.js
View File

@ -13,6 +13,10 @@ function Keyboard(controller){
var _waitKeyupScore = {};
var _waitKeyupSound = {};
var _waitKeyupMenu = {};
var _keyTime = {
"don": -Infinity,
"ka": -Infinity
}
this.getBindings = function(){
return _kbd
@ -54,10 +58,10 @@ function Keyboard(controller){
if(!controller.autoPlayEnabled){
_gamepad.play()
}
_this.checkKeySound(_kbd["don_l"], "note_don")
_this.checkKeySound(_kbd["don_r"], "note_don")
_this.checkKeySound(_kbd["ka_l"], "note_ka")
_this.checkKeySound(_kbd["ka_r"], "note_ka")
_this.checkKeySound(_kbd["don_l"], "don")
_this.checkKeySound(_kbd["don_r"], "don")
_this.checkKeySound(_kbd["ka_l"], "ka")
_this.checkKeySound(_kbd["ka_r"], "ka")
}
this.checkMenuKeys = function(){
@ -80,7 +84,8 @@ function Keyboard(controller){
this.checkKeySound = function(keyCode, sound){
_this.checkKey(keyCode, "sound", function(){
controller.playSound(sound);
controller.playSound("note_"+sound);
_keyTime[sound] = controller.getEllapsedTime().ms
})
}
@ -113,4 +118,8 @@ function Keyboard(controller){
else if(type == "menu") _waitKeyupMenu[key] = true;
}
this.getKeyTime = function(){
return _keyTime;
}
}

41
public/src/js/loader.js
View File

@ -4,22 +4,32 @@ function Loader(){
var _loadedAssets=0;
var _percentage=0;
var _nbAssets=assets.audio.length+assets.img.length+assets.fonts.length+1; //+1 for song structures
var _assetsDiv=document.getElementById("assets")
var _loaderPercentage
var _errorCount=0
this.run = function(){
_loaderPercentage = document.querySelector("#loader .percentage")
assets.fonts.forEach(function(name){
var font = $("<h1 style='font-family:"+name+"'>I am a font</h1>");
font.appendTo("#assets");
FontDetect.onFontLoaded (name, _this.assetLoaded, _this.fontFailed, {msTimeout: 90000});
var font = document.createElement("h1")
font.style.fontFamily = name
font.appendChild(document.createTextNode("I am a font"))
_assetsDiv.appendChild(font)
FontDetect.onFontLoaded (name, _this.assetLoaded, _this.errorMsg, {msTimeout: 90000});
});
assets.img.forEach(function(name){
var id = name.substr(0, name.length-4);
var image = $("<img id='"+id+"' src='/assets/img/"+name+"' />");
image.appendTo("#assets");
image.load(function(){
var image = document.createElement("img")
image.addEventListener("load", event=>{
_this.assetLoaded();
});
})
image.id = name
image.src = "/assets/img/" + name
_assetsDiv.appendChild(image)
assets.image[id] = image
});
assets.audio.forEach(function(name){
@ -42,29 +52,30 @@ function Loader(){
});
$.ajax({
async:true,
type:"GET",
url: "/api/songs",
mimeType: "application/json",
success: function(songs){
assets.songs = songs;
_this.assetLoaded();
},
error:function(){
alert("An error occured, please refresh");
}
error: _this.errorMsg
});
}
this.fontFailed = function(){
alert("An error occured, please refresh");
this.errorMsg = function(){
if(_errorCount == 0){
_loaderPercentage.appendChild(document.createElement("br"))
_loaderPercentage.appendChild(document.createTextNode("An error occured, please refresh"))
}
_errorCount++
}
this.assetLoaded = function(){
_loadedAssets++;
_percentage=parseInt((_loadedAssets*100)/_nbAssets);
$("#loader .progress").css("width", _percentage+"%");
$("#loader .percentage").html(_percentage+"%");
_loaderPercentage.firstChild.data=_percentage+"%"
_this.checkIfEverythingLoaded();
}

50
public/src/js/parsesong.js
View File

@ -50,6 +50,7 @@ function ParseSong(fileContent){
case 'SliderMultiplier':
_difficulty.sliderMultiplier = key;
_difficulty.originalMultiplier = key;
break;
case 'SliderTickRate':
_difficulty.sliderTickRate = key;
@ -71,30 +72,40 @@ function ParseSong(fileContent){
var values = _data[i].split(",");
var sliderMultiplier;
var start=parseInt(values[0])
var msOrPercent=parseFloat(values[1])
if(i==indexes.start){
_beatInfo.beatInterval=parseFloat(values[1]);
start=0
_beatInfo.beatInterval=msOrPercent;
_beatInfo.bpm=parseInt((1000/_beatInfo.beatInterval)*60);
sliderMultiplier=1;
}
else{
sliderMultiplier=Math.abs(parseFloat(values[1]))/100;
if(msOrPercent<0){
var sliderMultiplier=_difficulty.originalMultiplier*1/Math.abs(msOrPercent/100);
}else{
var sliderMultiplier=500/msOrPercent;
_difficulty.originalMultiplier=sliderMultiplier
}
_timingPoints.push({
start:parseInt(values[0]),
start:start,
sliderMultiplier:sliderMultiplier,
measure:parseInt(values[2]),
});
}
}
this.parseMeasures = function(){
var measureNumber=0;
for(var i=0; i<_timingPoints.length; i++){
var limit = (_timingPoints[i+1]) ? _timingPoints[i+1].start : _circles[_circles.length-1].getMS();
for(var j=_timingPoints[i].start; j<=limit; j+=_beatInfo.beatInterval){
_measures.push({ms:j, x:$(window).width(), nb:measureNumber});
_measures.push({
ms:j,
nb:measureNumber,
speed:_timingPoints[i].sliderMultiplier
});
measureNumber++;
if(measureNumber==_timingPoints[i].measure+1){
measureNumber=0;
@ -191,6 +202,16 @@ function ParseSong(fileContent){
var type;
var txt;
var emptyValue=false;
var start=parseInt(values[2])
var speed=_difficulty.originalMultiplier
for(var j=0; j<_timingPoints.length; j++){
if(_timingPoints[j].start<=start){
speed=_timingPoints[j].sliderMultiplier
}else{
break
}
}
switch(parseInt(values[4])){
case 0:
@ -203,11 +224,11 @@ function ParseSong(fileContent){
break;
case 4:
type="daiDon";
txt="ドン";
txt="ドン(大)";
break;
case 6:
type="daiKa";
txt="カッ";
txt="カッ(大)";
break;
case 8:
type="ka";
@ -219,11 +240,11 @@ function ParseSong(fileContent){
break;
case 12:
type="daiKa";
txt="カッ";
txt="カッ(大)";
break;
case 14:
type="daiKa";
txt="カッ";
txt="カッ(大)";
break;
default:
console.log('[WARNING] Unknown note type found on line ' + i+1 + ': ' + _data[i]);
@ -231,16 +252,17 @@ function ParseSong(fileContent){
break;
}
if(!emptyValue)
_circles.push(new Circle(_circleID, parseInt(values[2]),type,txt));
_circles.push(new Circle(_circleID,start,type,txt,speed));
}
}
_this.parseGeneralInfo();
_this.parseMetadata();
_this.parseCircles();
_this.parseEditor();
_this.parseTiming();
_this.parseDifficulty();
_this.parseTiming();
_this.parseCircles();
_this.parseMeasures();
this.getData = function(){
return {

24
public/src/js/songselect.js
View File

@ -6,6 +6,12 @@ function SongSelect(){
var _code="";
var _preview;
var _preview_to;
var _diffNames={
easy:"かんたん",
normal:"ふつう",
hard:"むずかしい",
oni:"おに"
}
this.startPreview = function(id, prvtime, first_open=true) {
var start = Date.now();
@ -182,7 +188,7 @@ function SongSelect(){
};
_code += "</div><ul class='difficulties'>";
for(var diff in songDifficulties){
for(var diff in _diffNames){
var diffName = diff;
var diffLevel = songDifficulties[diff];
if (!diffLevel) {
@ -194,21 +200,7 @@ function SongSelect(){
starsDisplay+="&#9733;<br>";
}
var diffTxt;
switch(diffName){
case 'easy':
diffTxt="かんたん";
break;
case 'normal':
diffTxt="ふつう";
break;
case 'hard':
diffTxt="むずかしい";
break;
case 'oni':
diffTxt="おに";
break;
}
var diffTxt=_diffNames[diffName]
_code += "<li class='difficulty "+diffName+"'>";
_code+= "<span class='diffname'>"+diffTxt+"</span>";

1039
public/src/js/view.js
View File

File diff suppressed because it is too large Load Diff