Skip to content

Commit de54e50

Browse files
allexlimaallexlima
committed
Versão 1.3
1 parent dc5c1c4 commit de54e50

File tree

6 files changed

+154
-24
lines changed

6 files changed

+154
-24
lines changed

‎others/period_table.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎scenes/principal.jpg‎

-307 KB
Binary file not shown.

‎scenes/special.jpg‎

-209 KB
Binary file not shown.

‎scripts/engine.js‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SoundIntro.volume-=0.8
1414
SoundBackground.volume-=0.8
1515

1616
//Variáveis do jogo
17-
var canvas, context, LARGURA, ALTURA, img, GameStatus = 0, record, GRAVITY = 2, life = 3, score = 0, sound = false, frames = 0,
17+
var canvas, context, LARGURA, ALTURA, img, GameStatus = 0, record, GRAVITY = 2, life = 3, score = 0, aux=0, sound = false, frames = 0,
1818

1919
quiz = {
2020
name: " ",
@@ -33,26 +33,40 @@ elemento = {
3333
baseLevel: 100,
3434

3535
insere: function(){
36-
this._obs.push({
37-
width: 150,
38-
height: 150,
39-
gravity: GRAVITY,
40-
velocity: 0,
41-
x: 300 + Math.floor(571 * Math.random()),
42-
y: 0,
43-
name: PeriodTable[Math.floor(PeriodTable.length * Math.random())].name,
44-
simbol: PeriodTable[Math.floor(PeriodTable.length * Math.random())].id
45-
});
36+
if(aux == 0 && (this._obs.length > Math.floor(3 * Math.random()))){
37+
this._obs.push({
38+
width: 150,
39+
height: 150,
40+
gravity: GRAVITY,
41+
velocity: 0,
42+
x: 300 + Math.floor(571 * Math.random()),
43+
y: Math.floor(50 * Math.random()),
44+
name: quiz.name,
45+
simbol: quiz.simbol
46+
});
47+
aux = 1;
48+
}else{
49+
this._obs.push({
50+
width: 150,
51+
height: 150,
52+
gravity: GRAVITY,
53+
velocity: 0,
54+
x: 300 + Math.floor(571 * Math.random()),
55+
y: 0,
56+
name: PeriodTable[Math.floor(PeriodTable.length * Math.random())].name,
57+
simbol: PeriodTable[Math.floor(PeriodTable.length * Math.random())].id
58+
});
59+
}
4660
this.elementDelay = this.baseLevel + Math.floor(51 * Math.random());
4761
},
4862

4963
update: function(){
50-
if(this.elementDelay == 0) {
64+
if(this.elementDelay == 0) {
5165
this.insere();
5266
if(this.baseLevel >= 30)
5367
this.baseLevel--;
5468
}else
55-
this.elementDelay--;
69+
this.elementDelay--;
5670

5771
for(var i = 0, tam = this._obs.length; i < tam; i++) {
5872
var obs = this._obs[i];
@@ -68,6 +82,7 @@ elemento = {
6882
elementSort();
6983
life--;
7084
SoundExplosion.play();
85+
aux = 0;
7186
}
7287
if(life == 0)
7388
SoundLose.play();
@@ -104,6 +119,7 @@ elemento = {
104119
GRAVITY += 0.1;
105120
elementSort();
106121
SoundUp.play();
122+
aux = 0;
107123
}else{
108124
if(life > 0)
109125
life--;
@@ -208,4 +224,4 @@ function main(){
208224
}
209225

210226
//Inicia o jogo
211-
main();
227+
main();

‎scripts/periodic_table.js‎

Lines changed: 118 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,119 @@
11
var PeriodTable = [
2-
{name: "Carbono", id: "C"},
3-
{name: "Hélio", id: "He"},
4-
{name: "Ferro", id: "Fe"},
5-
{name: "Fluor", id: "F"},
6-
];
2+
{name: "Actínio", id: "Ac"},
3+
{name: "Prata", id: "Ag"},
4+
{name: "Alumínio", id: "Al"},
5+
{name: "Amerício", id: "Am"},
6+
{name: "Argônio", id: "Ar"},
7+
{name: "Arsénio", id: "As"},
8+
{name: "Ástato", id: "At"},
9+
{name: "Ouro", id: "Au"},
10+
{name: "Boro", id: "B"},
11+
{name: "Bário", id: "Ba"},
12+
{name: "Berílio", id: "Be"},
13+
{name: "Bóhrio", id: "Bh"},
14+
{name: "Bismuto", id: "Bi"},
15+
{name: "Berquélio", id: "Bk"},
16+
{name: "Bromo", id: "Br"},
17+
{name: "Carbono", id: "C"},
18+
{name: "Cálcio", id: "Ca"},
19+
{name: "Cádmio", id: "Cd"},
20+
{name: "Cério", id: "Ce"},
21+
{name: "Califórnio", id: "Cf"},
22+
{name: "Cloro", id: "Cl"},
23+
{name: "Cúrio", id: "Cm"},
24+
{name: "Copernício", id: "Cn"},
25+
{name: "Cobalto", id: "Co"},
26+
{name: "Cromo", id: "Cr"},
27+
{name: "Césio", id: "Cs"},
28+
{name: "Cobre", id: "Cu"},
29+
{name: "Dúbnio", id: "Db"},
30+
{name: "Darmstácio", id: "Ds"},
31+
{name: "Diprósio", id: "Dy"},
32+
{name: "Érbio", id: "Er"},
33+
{name: "Einstênio", id: "Es"},
34+
{name: "Európio", id: "Eu"},
35+
{name: "Fluor", id: "F"},
36+
{name: "Ferro", id: "Fe"},
37+
{name: "Flevório", id: "Fl"},
38+
{name: "Férmio", id: "Fm"},
39+
{name: "Frâncio", id: "Fr"},
40+
{name: "Gálio", id: "Ga"},
41+
{name: "Gadolínio", id: "Gd"},
42+
{name: "Germânio", id: "Ge"},
43+
{name: "Hidrogênio", id: "H"},
44+
{name: "Hélio", id: "He"},
45+
{name: "Háfnio", id: "Hf"},
46+
{name: "Hólmio", id: "Ho"},
47+
{name: "Hácio", id: "Hs"},
48+
{name: "Iodo", id: "I"},
49+
{name: "Índio", id: "In"},
50+
{name: "Irídio", id: "Ir"},
51+
{name: "Potássio", id: "K"},
52+
{name: "Criptônio", id: "Kr"},
53+
{name: "Lantânio", id: "La"},
54+
{name: "Lítio", id: "Li"},
55+
{name: "Laurêncio", id: "Lr"},
56+
{name: "Lutécio", id: "Lu"},
57+
{name: "Livermório", id: "Lv"},
58+
{name: "Mendelévio", id: "Md"},
59+
{name: "Magnésio", id: "Mg"},
60+
{name: "Manganês", id: "Mn"},
61+
{name: "Molibdénio", id: "Mo"},
62+
{name: "Meitnério", id: "Mt"},
63+
{name: "Nitrogêio", id: "N"},
64+
{name: "Sódio", id: "Na"},
65+
{name: "Nióbio", id: "Nb"},
66+
{name: "Neodímio", id: "Nd"},
67+
{name: "Neônio", id: "Ne"},
68+
{name: "Níquel", id: "Ni"},
69+
{name: "Nobélio", id: "No"},
70+
{name: "Netúnio", id: "Np"},
71+
{name: "Oxigênio", id: "O"},
72+
{name: "Ósmio", id: "Os"},
73+
{name: "Fósforo", id: "P"},
74+
{name: "Protactínio", id: "Pa"},
75+
{name: "Chumbo", id: "Pb"},
76+
{name: "Paládio", id: "Pd"},
77+
{name: "Promécio", id: "Pm"},
78+
{name: "Polônio", id: "Po"},
79+
{name: "Praseodímio", id: "Pr"},
80+
{name: "Platina", id: "Pt"},
81+
{name: "Plutônio", id: "Pu"},
82+
{name: "Rádio", id: "Ra"},
83+
{name: "Rubídio", id: "Rb"},
84+
{name: "Rênio", id: "Re"},
85+
{name: "Rutherfórdio", id: "Rf"},
86+
{name: "Roentgênio", id: "Rg"},
87+
{name: "Ródio", id: "Rh"},
88+
{name: "Radônio", id: "Rn"},
89+
{name: "Rutênio", id: "Ru"},
90+
{name: "Enxofre", id: "S"},
91+
{name: "Antimônio", id: "Sb"},
92+
{name: "Escândio", id: "Sc"},
93+
{name: "Selênio", id: "Se"},
94+
{name: "Seabórgio", id: "Sg"},
95+
{name: "Silício", id: "Si"},
96+
{name: "Samário", id: "Sm"},
97+
{name: "Estanho", id: "Sn"},
98+
{name: "Estrôncio", id: "Sr"},
99+
{name: "Tântalo", id: "Ta"},
100+
{name: "Térbio", id: "Tb"},
101+
{name: "Tecnécio", id: "Tc"},
102+
{name: "Telúrio", id: "Te"},
103+
{name: "Tório", id: "Th"},
104+
{name: "Titânio", id: "Ti"},
105+
{name: "Tálio", id: "Tl"},
106+
{name: "Túlio", id: "Tm"},
107+
{name: "Urânio", id: "U"},
108+
{name: "Ununóctio", id: "Uuo"},
109+
{name: "Ununpêntio", id: "Uup"},
110+
{name: "Ununséptio", id: "Uus"},
111+
{name: "Unúntrio", id: "Uut"},
112+
{name: "Vanádio", id: "V"},
113+
{name: "Tungstênio", id: "W"},
114+
{name: "Xenônio", id: "Xe"},
115+
{name: "Ítrio", id: "Y"},
116+
{name: "Itérbio", id: "Yb"},
117+
{name: "Zinco", id: "Zn"},
118+
{name: "Zircônio", id: "Zr"}
119+
];

‎scripts/periodic_table.js.old‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
var PeriodTable = [
2+
{name: "Carbono", id: "C"},
3+
{name: "Hélio", id: "He"},
4+
{name: "Ferro", id: "Fe"},
5+
{name: "Fluor", id: "F"},
6+
];

0 commit comments

Comments
 (0)