Merge branch 'master' of https://git.crystalyx.net/camelia-studio/Moisson-Rouge
This commit is contained in:
commit
f6c12651bb
@ -14,3 +14,6 @@ steps:
|
|||||||
from_secret: shelter-host
|
from_secret: shelter-host
|
||||||
commands:
|
commands:
|
||||||
- lftp -c "set cmd:fail-exit yes; set ftp:ssl-allow no;set dns:order \"inet inet6\"; open -u $USERNAME,$PASSWORD $HOST; cd cila.camelia-studio.org/moisson-rouge; mirror -Rpnevvv --parallel=10 --exclude .git/"
|
- lftp -c "set cmd:fail-exit yes; set ftp:ssl-allow no;set dns:order \"inet inet6\"; open -u $USERNAME,$PASSWORD $HOST; cd cila.camelia-studio.org/moisson-rouge; mirror -Rpnevvv --parallel=10 --exclude .git/"
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- master
|
2
app.js
2
app.js
@ -196,7 +196,7 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$http.get('https://raw.githubusercontent.com/Mopolo/Eternelle-Moisson/gh-pages/monsters.json').then(function(res) {
|
$http.get('monsters.json').then(function(res) {
|
||||||
vm.monsters = res.data;
|
vm.monsters = res.data;
|
||||||
vm.monsters.forEach(monster => {
|
vm.monsters.forEach(monster => {
|
||||||
monster.owned = vm.saveData?.find(el => el[0] === monster.id) ? vm.saveData.find(el => el[0] === monster.id)[1] : 0
|
monster.owned = vm.saveData?.find(el => el[0] === monster.id) ? vm.saveData.find(el => el[0] === monster.id)[1] : 0
|
||||||
|
6317
monsters.json
Normal file
6317
monsters.json
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user