From 211c0f3efb51c928dcaee78902894ec64dc5ce9f Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Wed, 1 Mar 2023 18:43:35 -0300
Subject: [PATCH 01/10] personalizando readme
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d43759a5..17fea368 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-# robotron-2000
\ No newline at end of file
+# robotron-2000
+ínicio do projeto robotron 2000
\ No newline at end of file
From 07342aee634ffddc5388ca9cb0a81a0190d1788e Mon Sep 17 00:00:00 2001
From: Ciro Monteiro <84918342+Cirovsky@users.noreply.github.com>
Date: Wed, 1 Mar 2023 18:52:28 -0300
Subject: [PATCH 02/10] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 17fea368..ae4e7aa0 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
# robotron-2000
-ínicio do projeto robotron 2000
\ No newline at end of file
+ínicio do projeto robotron 2000.
+Testando pull
From 6b09ad3e14323e01f90ef1aad4db4202202a05e7 Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Wed, 1 Mar 2023 19:47:33 -0300
Subject: [PATCH 03/10] =?UTF-8?q?cria=C3=A7=C3=A3o=20de=20fun=C3=A7=C3=B5e?=
=?UTF-8?q?s=20incrementar=20e=20decrementar=20pe=C3=A7as?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 1 +
main.js | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 main.js
diff --git a/index.html b/index.html
index 0deb0928..5b0ec145 100644
--- a/index.html
+++ b/index.html
@@ -98,5 +98,6 @@
</form>
</section>
</main>
+ <script src="main.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/main.js b/main.js
new file mode 100644
index 00000000..735ec60a
--- /dev/null
+++ b/main.js
@@ -0,0 +1,11 @@
+const controle = document.querySelectorAll('.controle-ajuste');
+
+for( let i in controle){
+
+ if(i % 2 == 0 || i == 0){
+ let valor= parseInt(controle[i].nextElementSibling.value);
+ controle[i].onclick = () => controle[i].nextElementSibling.value = `${parseInt(controle[i].nextElementSibling.value) -1}`;
+ }else{
+ controle[i].onclick = () => controle[i].previousElementSibling.value = `${parseInt(controle[i].previousElementSibling.value) + 1}`;
+ }
+}
\ No newline at end of file
From e10b014bf83815297fc20818b21f866f8c5c969a Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Wed, 1 Mar 2023 22:15:19 -0300
Subject: [PATCH 04/10] =?UTF-8?q?refatorando=20fun=C3=A7=C3=B5es=20para=20?=
=?UTF-8?q?manipula=C3=A7=C3=A3o=20de=20dados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/main.js b/main.js
index 735ec60a..07822f08 100644
--- a/main.js
+++ b/main.js
@@ -1,11 +1,11 @@
const controle = document.querySelectorAll('.controle-ajuste');
-for( let i in controle){
-
- if(i % 2 == 0 || i == 0){
- let valor= parseInt(controle[i].nextElementSibling.value);
- controle[i].onclick = () => controle[i].nextElementSibling.value = `${parseInt(controle[i].nextElementSibling.value) -1}`;
+controle.forEach((ctr) =>{
+ console.log(ctr.innerHTML);
+ if(ctr.innerHTML == '-'){
+ console.log(ctr.nextElementSibling.value)
+ ctr.onclick = () => ctr.nextElementSibling.value = `${parseInt(ctr.nextElementSibling.value) -1}`;
}else{
- controle[i].onclick = () => controle[i].previousElementSibling.value = `${parseInt(controle[i].previousElementSibling.value) + 1}`;
+ ctr.onclick = () => ctr.previousElementSibling.value = `${parseInt(ctr.previousElementSibling.value) + 1}`;
}
-}
\ No newline at end of file
+})
\ No newline at end of file
From 4804b5b60c7e26fff1d685aafe877b648399bfa9 Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Thu, 2 Mar 2023 08:32:52 -0300
Subject: [PATCH 05/10] =?UTF-8?q?aperfei=C3=A7oando=20l=C3=B3gica=20do=20c?=
=?UTF-8?q?ontador?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/main.js b/main.js
index 07822f08..1598cbca 100644
--- a/main.js
+++ b/main.js
@@ -1,11 +1,10 @@
const controle = document.querySelectorAll('.controle-ajuste');
controle.forEach((ctr) =>{
- console.log(ctr.innerHTML);
+ const contador = ctr.parentNode.querySelector(".controle-contador")
if(ctr.innerHTML == '-'){
- console.log(ctr.nextElementSibling.value)
- ctr.onclick = () => ctr.nextElementSibling.value = `${parseInt(ctr.nextElementSibling.value) -1}`;
+ ctr.onclick = () => contador.value = `${parseInt(contador.value) -1}`;
}else{
- ctr.onclick = () => ctr.previousElementSibling.value = `${parseInt(ctr.previousElementSibling.value) + 1}`;
+ ctr.onclick = () => contador.value = `${parseInt(contador.value) + 1}`;
}
})
\ No newline at end of file
From be296bc62fe6d4232d35e6e97515ba2026a1e2cf Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Thu, 2 Mar 2023 08:52:42 -0300
Subject: [PATCH 06/10] =?UTF-8?q?refatorando=20para=20otimizar=20atribui?=
=?UTF-8?q?=C3=A7=C3=B5es=20de=20fun=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 18 +++++++++---------
main.js | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/index.html b/index.html
index 5b0ec145..40e2f217 100644
--- a/index.html
+++ b/index.html
@@ -52,43 +52,43 @@
<div class="peca">
<label for="" class="peca-titulo">Braços</label>
<div class="controle">
- <buttom class="controle-ajuste">-</buttom>
+ <buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
- <buttom class="controle-ajuste">+</buttom>
+ <buttom class="controle-ajuste" data-controle="+">+</buttom>
</div>
</div>
<hr class="linha">
<div class="peca">
<label for="" class="peca-titulo">Blindagem</label>
<div class="controle">
- <buttom class="controle-ajuste">-</buttom>
+ <buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
- <buttom class="controle-ajuste">+</buttom>
+ <buttom class="controle-ajuste" data-controle="+">+</buttom>
</div>
</div>
<hr class="linha">
<div class="peca">
<label for="" class="peca-titulo">Núcleos</label>
<div class="controle">
- <buttom class="controle-ajuste">-</buttom>
+ <buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
- <buttom class="controle-ajuste">+</buttom>
+ <buttom class="controle-ajuste" data-controle="+">+</buttom>
</div>
</div>
<hr class="linha">
<div class="peca">
<label for="" class="peca-titulo">Pernas</label>
<div class="controle">
- <buttom class="controle-ajuste">-</buttom>
+ <buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
- <buttom class="controle-ajuste">+</buttom>
+ <buttom class="controle-ajuste" data-controle="+">+</buttom>
</div>
</div>
<hr class="linha">
<div class="peca">
<label for="" class="peca-titulo">Foguetes</label>
<div class="controle">
- <buttom class="controle-ajuste">-</buttom>
+ <buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
<buttom class="controle-ajuste">+</buttom>
</div>
diff --git a/main.js b/main.js
index 1598cbca..39a81e73 100644
--- a/main.js
+++ b/main.js
@@ -1,10 +1,10 @@
const controle = document.querySelectorAll('.controle-ajuste');
+const operacao = (operador, contador) =>{
+ return operador == '-'? contador -= 1 : contador +=1;
+}
controle.forEach((ctr) =>{
+ const operador = ctr.dataset.controle;
const contador = ctr.parentNode.querySelector(".controle-contador")
- if(ctr.innerHTML == '-'){
- ctr.onclick = () => contador.value = `${parseInt(contador.value) -1}`;
- }else{
- ctr.onclick = () => contador.value = `${parseInt(contador.value) + 1}`;
- }
-})
\ No newline at end of file
+ ctr.onclick = () => contador.value = `${operacao(operador, parseInt(contador.value))}`
+})
From ad2d857a4d3e668036b3de7d4bb05ce0bd8be1ef Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Thu, 2 Mar 2023 11:58:44 -0300
Subject: [PATCH 07/10] =?UTF-8?q?refatorando=20e=20interligando=20l=C3=B3g?=
=?UTF-8?q?ica=20de=20estat=C3=ADsticas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 18 ++++++++--------
main.js | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/index.html b/index.html
index 40e2f217..de8b0fdf 100644
--- a/index.html
+++ b/index.html
@@ -23,25 +23,25 @@
<div class="estatistica">
<p class="estatistica-titulo">Força</p>
<div class="estatistica-valor">
- <p class="estatistica-numero">768</p>
+ <p class="estatistica-numero" data-estatistica="forca">768</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Poder</p>
<div class="estatistica-valor">
- <p class="estatistica-numero">630</p>
+ <p class="estatistica-numero" data-estatistica="poder">630</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Energia</p>
<div class="estatistica-valor">
- <p class="estatistica-numero">289</p>
+ <p class="estatistica-numero" data-estatistica="energia">289</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Velocidade</p>
<div class="estatistica-valor">
- <p class="estatistica-numero">597</p>
+ <p class="estatistica-numero" data-estatistica="velocidade">597</p>
</div>
</div>
</section>
@@ -50,7 +50,7 @@
<form action="" class="montador">
<div class="box montador-conteudo">
<div class="peca">
- <label for="" class="peca-titulo">Braços</label>
+ <label for="" class="peca-titulo" data-peca="bracos">Braços</label>
<div class="controle">
<buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
@@ -59,7 +59,7 @@
</div>
<hr class="linha">
<div class="peca">
- <label for="" class="peca-titulo">Blindagem</label>
+ <label for="" class="peca-titulo" data-peca="blindagem">Blindagem</label>
<div class="controle">
<buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
@@ -68,7 +68,7 @@
</div>
<hr class="linha">
<div class="peca">
- <label for="" class="peca-titulo">Núcleos</label>
+ <label for="" class="peca-titulo" data-peca="nucleos">Núcleos</label>
<div class="controle">
<buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
@@ -77,7 +77,7 @@
</div>
<hr class="linha">
<div class="peca">
- <label for="" class="peca-titulo">Pernas</label>
+ <label for="" class="peca-titulo" data-peca="pernas">Pernas</label>
<div class="controle">
<buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
@@ -86,7 +86,7 @@
</div>
<hr class="linha">
<div class="peca">
- <label for="" class="peca-titulo">Foguetes</label>
+ <label for="" class="peca-titulo" data-peca="foguetes">Foguetes</label>
<div class="controle">
<buttom class="controle-ajuste" data-controle="-">-</buttom>
<input type="text" class="controle-contador" value="00">
diff --git a/main.js b/main.js
index 39a81e73..530ea7e9 100644
--- a/main.js
+++ b/main.js
@@ -1,10 +1,62 @@
const controle = document.querySelectorAll('.controle-ajuste');
-const operacao = (operador, contador) =>{
- return operador == '-'? contador -= 1 : contador +=1;
+const pecas = {
+ "bracos": {
+ "forca": 29,
+ "poder": 35,
+ "energia": -21,
+ "velocidade": -5
+ },
+
+ "blindagem": {
+ "forca": 41,
+ "poder": 20,
+ "energia": 0,
+ "velocidade": -20
+ },
+ "nucleos": {
+ "forca": 0,
+ "poder": 7,
+ "energia": 48,
+ "velocidade": -24
+ },
+ "pernas": {
+ "forca": 27,
+ "poder": 21,
+ "energia": -32,
+ "velocidade": 42
+ },
+ "foguetes": {
+ "forca": 0,
+ "poder": 28,
+ "energia": 0,
+ "velocidade": -2
+ }
}
-controle.forEach((ctr) =>{
+
+const estatisticas = document.querySelectorAll("[data-estatistica]");
+console.log(estatisticas)
+
+const calcular = (ctr, contador) => {
+ const tipoPeca = ctr.parentNode.parentNode.querySelector(".peca-titulo").dataset.peca;
const operador = ctr.dataset.controle;
- const contador = ctr.parentNode.querySelector(".controle-contador")
- ctr.onclick = () => contador.value = `${operacao(operador, parseInt(contador.value))}`
+ atualizaEstatisticas(tipoPeca, operador)
+ return operacao(operador, contador);
+}
+
+const operacao = (operador, valor, add = 1) => {
+ return operador == '-'? valor -= add: valor += add;
+}
+
+
+const atualizaEstatisticas = (tipoPeca, operador) => {
+ estatisticas.forEach(estatistica => {
+ const caracterista = estatistica.dataset.estatistica;
+ estatistica.textContent = operacao(operador, parseInt(estatistica.textContent), pecas[tipoPeca][caracterista]);
+ })
+}
+
+controle.forEach((ctr) => {
+ const contador = ctr.parentNode.querySelector(".controle-contador");
+ ctr.onclick = () => contador.value = `${calcular(ctr, parseInt(contador.value))}`;
})
From 0f5d4aa7a910728b981788ca8ce054d729bd27b5 Mon Sep 17 00:00:00 2001
From: Ciro Monteiro <84918342+Cirovsky@users.noreply.github.com>
Date: Thu, 2 Mar 2023 11:59:44 -0300
Subject: [PATCH 08/10] Update README.md
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index ae4e7aa0..e1e61ef5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,2 @@
# robotron-2000
ínicio do projeto robotron 2000.
-Testando pull
From cde0acda3f05b9d41e74094839aaa696f7403aae Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Thu, 2 Mar 2023 12:02:59 -0300
Subject: [PATCH 09/10] aprimoramento na escrita dos seletores
---
main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.js b/main.js
index 530ea7e9..3e2e1992 100644
--- a/main.js
+++ b/main.js
@@ -38,7 +38,7 @@ const estatisticas = document.querySelectorAll("[data-estatistica]");
console.log(estatisticas)
const calcular = (ctr, contador) => {
- const tipoPeca = ctr.parentNode.parentNode.querySelector(".peca-titulo").dataset.peca;
+ const tipoPeca = document.querySelector("[data-peca]").dataset.peca;
const operador = ctr.dataset.controle;
atualizaEstatisticas(tipoPeca, operador)
return operacao(operador, contador);
From f197d20b7f6f3147aac635c024962477693bf7f9 Mon Sep 17 00:00:00 2001
From: Cirovsky <cirovisqui@gmail.com>
Date: Thu, 2 Mar 2023 12:17:17 -0300
Subject: [PATCH 10/10] =?UTF-8?q?corre=C3=A7=C3=A3o=20do=20c=C3=B3digo=20-?=
=?UTF-8?q?=20sele=C3=A7=C3=A3o=20do=20tipo=20de=20pe=C3=A7a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 8 ++++----
main.js | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/index.html b/index.html
index de8b0fdf..013ff6ce 100644
--- a/index.html
+++ b/index.html
@@ -23,25 +23,25 @@
<div class="estatistica">
<p class="estatistica-titulo">Força</p>
<div class="estatistica-valor">
- <p class="estatistica-numero" data-estatistica="forca">768</p>
+ <p class="estatistica-numero" data-estatistica="forca">0</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Poder</p>
<div class="estatistica-valor">
- <p class="estatistica-numero" data-estatistica="poder">630</p>
+ <p class="estatistica-numero" data-estatistica="poder">0</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Energia</p>
<div class="estatistica-valor">
- <p class="estatistica-numero" data-estatistica="energia">289</p>
+ <p class="estatistica-numero" data-estatistica="energia">0</p>
</div>
</div>
<div class="estatistica">
<p class="estatistica-titulo">Velocidade</p>
<div class="estatistica-valor">
- <p class="estatistica-numero" data-estatistica="velocidade">597</p>
+ <p class="estatistica-numero" data-estatistica="velocidade">0</p>
</div>
</div>
</section>
diff --git a/main.js b/main.js
index 3e2e1992..521e06af 100644
--- a/main.js
+++ b/main.js
@@ -38,7 +38,7 @@ const estatisticas = document.querySelectorAll("[data-estatistica]");
console.log(estatisticas)
const calcular = (ctr, contador) => {
- const tipoPeca = document.querySelector("[data-peca]").dataset.peca;
+ const tipoPeca = ctr.parentNode.parentNode.querySelector("[data-peca]").dataset.peca;
const operador = ctr.dataset.controle;
atualizaEstatisticas(tipoPeca, operador)
return operacao(operador, contador);
@@ -52,6 +52,7 @@ const operacao = (operador, valor, add = 1) => {
const atualizaEstatisticas = (tipoPeca, operador) => {
estatisticas.forEach(estatistica => {
const caracterista = estatistica.dataset.estatistica;
+ console.log(pecas[tipoPeca][caracterista])
estatistica.textContent = operacao(operador, parseInt(estatistica.textContent), pecas[tipoPeca][caracterista]);
})
}