usando a nova disponível sintaxe, pra deixar os if's mais claros

eventMacrosBR · Oct 1, 2018 · a396c3b · a396c3b
1 parent 61cbccd
commit a396c3b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/classes/arcebispo/quest-skill.pm b/classes/arcebispo/quest-skill.pm
@@ -96,7 +96,7 @@ automacro questLuzDivina_pegarItens {
             ]
             stop
         } else {
-            if (a&config(BetterShopper_0) != a) do conf BetterShopper_0 none #desabilitar
+            if (&config(BetterShopper_0)) do conf BetterShopper_0 none #desabilitar
             if (&config(BetterShopper_0_disabled) != 1) do conf BetterShopper_0_disabled 1
             log Já tenho Opala, checando se tenho Cristal Azul
             $tenhoOpala = sim
@@ -134,7 +134,7 @@ automacro questLuzDivina_pegarItens {
             ]
             stop
         } else {
-            if (a&config(BetterShopper_1) != a) do conf BetterShopper_1 none #desabilitar
+            if (&config(BetterShopper_1)) do conf BetterShopper_1 none #desabilitar
             if (&config(BetterShopper_1_disabled) != 1) do conf BetterShopper_1_disabled 1
             $tenhoCristal = sim
             log Já tenho Cristal Azul, portanto
@@ -147,10 +147,10 @@ automacro questLuzDivina_pegarItens {
             log = TENHO TODOS OS ITENS, VOU FALAR COM NPC
             log ===================================
             ]
-            if (a&config(BetterShopper_0) != a) do conf BetterShopper_0 none #desabilitar
+            if (&config(BetterShopper_0)) do conf BetterShopper_0 none #desabilitar
             if (&config(BetterShopper_0_disabled) != 1) do conf BetterShopper_0_disabled 1
 
-            if (a&config(BetterShopper_1) != a) do conf BetterShopper_1 none #desabilitar
+            if (&config(BetterShopper_1)) do conf BetterShopper_1 none #desabilitar
             if (&config(BetterShopper_1_disabled) != 1) do conf BetterShopper_1_disabled 1
 
             do conf -f quest_luz_divina falar_com_npc
@@ -177,9 +177,9 @@ automacro questLuzDivina_jaTenhosOsItens {
     InInventory "Rosário" > 0
     exclusive 1
     call {
-        if (a&config(BetterShopper_0) != a) do conf BetterShopper_0 none #desabilitar
+        if (&config(BetterShopper_0)) do conf BetterShopper_0 none #desabilitar
         if (&config(BetterShopper_0_disabled) != 1) do conf BetterShopper_0_disabled 1
-        if (a&config(BetterShopper_1) != a) do conf BetterShopper_1 none #desabilitar
+        if (config(BetterShopper_1)) do conf BetterShopper_1 none #desabilitar
         if (&config(BetterShopper_1_disabled) != 1) do conf BetterShopper_1_disabled 1
         do conf -f quest_luz_divina falar_com_npc
         do conf -f BetterShopper_on 0
@@ -272,10 +272,10 @@ automacro betterShopper_bugged {
     ConfigKey quest_skill true
     ConfigKey quest_luz_divina falar_com_npc
     call {
-        if (a&config(BetterShopper_0) != a) do conf BetterShopper_0 none #desabilitar
+        if (&config(BetterShopper_0)) do conf BetterShopper_0 none #desabilitar
         if (&config(BetterShopper_0_disabled) != 1) do conf BetterShopper_0_disabled 1
-        if (a&config(BetterShopper_1) != a) do conf BetterShopper_1 none #desabilitar
+        if (&config(BetterShopper_1)) do conf BetterShopper_1 none #desabilitar
         if (&config(BetterShopper_1_disabled) != 1) do conf BetterShopper_1_disabled 1
         do conf -f BetterShopper_on 0
     }
-}
+}
diff --git a/comum/inicializar.pm b/comum/inicializar.pm
@@ -275,7 +275,7 @@ macro atualizarMapasDeUp {
     }
     #futuramente: adicionar uma elsif para caso seja classe 3
 
-    if (&exists($mapa{lockMap}) = 0 && $.lvl < 99) {
+    if (!&exists($mapa{lockMap}) && $.lvl < 99) {
         [
         do eval Log::error "===================================\n"
         do eval Log::error "= ERRO:\n"

diff --git a/comum/quest-eden.pm b/comum/quest-eden.pm
@@ -236,9 +236,9 @@ macro iniciandoQuestEden {
     log ===================================
     ]
     do talk $.NpcNearLastBinId
-    if (&defined($.param[0]) = 1) do talk resp $.param[0]
-    if (&defined($.param[1]) = 1) do talk resp $.param[1]
-    if (&defined($.param[2]) = 1) do talk resp $.param[2]
+    if ( &defined($.param[0]) ) do talk resp $.param[0]
+    if ( &defined($.param[1]) ) do talk resp $.param[1]
+    if ( &defined($.param[2]) ) do talk resp $.param[2]
 
     switch ($.lvl) {
         case (<= 18) $lvlDaQuestEden = 12
@@ -417,7 +417,7 @@ macro irNoMapa {
     do move $.param[0] $.param[1] &rand(1,5)
     do talk &npc($.param[1])
     if ($.param[0] = moc_fild11) do talk resp 1  #significa que ta na quest eden 12
-    if (&defined($.param[2]) = 1) { #evita de mostrar linhas vermelhas a toa de "variavel não existe"
+    if ( &defined($.param[2]) ) { #evita de mostrar linhas vermelhas a toa de "variavel não existe"
         do mconf $.param[2] 0 0 0
         do mconf $.param[3] 0 0 0
         do mconf $.param[4] 0 0 0

diff --git a/comum/usar-aeroplano.pm b/comum/usar-aeroplano.pm
@@ -371,7 +371,7 @@ automacro dentroDoAeroplanoInternacional_checagem {
     CheckOnAI manual
     timeout 50
     call {
-        if (&defined($varAeroplano1) = 0) {
+        if (! &defined($varAeroplano1) ) {
             $varAeroplano1 = &config(aeroplano1)
         }
         [

diff --git a/comum/utilidades.pm b/comum/utilidades.pm
@@ -77,7 +77,7 @@ macro pegarItemDoArmazenSeTiver {
         $localDaKafra = &config(storageAuto_npc)
         do move $localDaKafra &rand(3,8)
         do talknpc &arg("$localDaKafra", 2) &arg("$localDaKafra", 3) r1
-        if ($.storageopen = 1) {
+        if ($.storageopen) {
             do storage get &storage($item) $quantidade
             do storage close
         } else {
@@ -101,7 +101,7 @@ macro pegarDoStorageEVender {
     do move $localKafra &rand(4,7)
     do talknpc &arg("$localKafra", 2) &arg("$localKafra", 3) r1
     pause 2
-    if ($.storageopen = 1) {
+    if ($.storageopen) {
 
         criarListaDeItens("sell") #cria a array listaDeItems        
         $cont = 0