From 1e8c022806c6154d9882342ac11a407ed28265b7 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 17 Nov 2020 23:42:08 +0100
Subject: [PATCH] Fix bad cached numbers in technology unlocking

---
 onyx2/include/Class/Donnees/batiments.php | 14 +++++------
 onyx2/include/Class/Donnees/interface.php |  4 +--
 onyx2/include/Class/Donnees/spatial.php   | 30 +++++++++++------------
 onyx2/include/Class/Donnees/terrestre.php | 16 ++++++------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/onyx2/include/Class/Donnees/batiments.php b/onyx2/include/Class/Donnees/batiments.php
index e965627..66c6130 100644
--- a/onyx2/include/Class/Donnees/batiments.php
+++ b/onyx2/include/Class/Donnees/batiments.php
@@ -482,28 +482,28 @@ class dBatiments implements Donnees
 				0,
 				0,
 				array(
-					array("technologies", 2,3, 9)
+					array("technologies", 2,3)
 				),
 				array(
-					array("technologies", 2,4, 17)
+					array("technologies", 2,4)
 				),
 				0,
 				0,
 				array(
-					array("technologies", 1,12, 4096)
+					array("technologies", 1,12)
 				),
 				0,
 				array(
-					array("technologies", 3,8, 256)
+					array("technologies", 3,8)
 				),
 				array(
-					array("technologies", 7,12, 4096)
+					array("technologies", 7,12)
 				),
 				array(
-					array("technologies", 3,6, 64)
+					array("technologies", 3,6)
 				),
 				array(
-					array("technologies", 3,7, 128)
+					array("technologies", 3,7)
 				),
 				0
 			);
diff --git a/onyx2/include/Class/Donnees/interface.php b/onyx2/include/Class/Donnees/interface.php
index 81275db..fc6e1f9 100644
--- a/onyx2/include/Class/Donnees/interface.php
+++ b/onyx2/include/Class/Donnees/interface.php
@@ -52,7 +52,7 @@ class dDonnees{
 							return false;
 						break;
 					case 'technologies':
-						if (((int)$planete->technologies[$need[1]]& $need[3]) != $need[3])
+                        if (((int)$planete->technologies[$need[1]]& dTechnologies::idToBit($need[2])) == 0)
 							return false;
 						break;
 					case 'casernes':
@@ -100,7 +100,7 @@ class dDonnees{
 							$return .= ucfirst($LANG[$race]["batiments"]["noms_sing"][$need[1]]).' < niveau '.($need[2]+1).' (batiment)<br />';
 						break;
 					case 'technologies':
-						if (((int)$planete->technologies[$need[1]]& $need[3]) != $need[3])
+                        if (((int)$planete->technologies[$need[1]]& dTechnologies::idToBit($need[2])) == 0)
 							$return .= '<span class="lack">'.$LANG[$race]["technologies"]["noms_sing"][$need[1]][$need[2]].' (technologie)</span><br />';
 						else
 							$return .= $LANG[$race]["technologies"]["noms_sing"][$need[1]][$need[2]].' (technologie)<br />';
diff --git a/onyx2/include/Class/Donnees/spatial.php b/onyx2/include/Class/Donnees/spatial.php
index 4dff5ef..274f636 100644
--- a/onyx2/include/Class/Donnees/spatial.php
+++ b/onyx2/include/Class/Donnees/spatial.php
@@ -347,60 +347,60 @@ class dSpatial implements Donnees
 			array(
 				array(
 					array('batiments', 8, 1),
-					array('technologies', 0,3, 8)
+					array('technologies', 0,3)
 				),
 				array(
 					array('batiments', 8, 5),
-					array('technologies', 0,3, 8),
-					array('technologies', 1,6, 64)
+					array('technologies', 0,3),
+					array('technologies', 1,6)
 				),
 				array(
 					array('batiments', 8, 5),
-					array('technologies', 8,0, 1)
+					array('technologies', 8,0)
 				),
 				array(
 					array('batiments', 8, 5),
-					array('technologies', 7,4, 16)
+					array('technologies', 7,4)
 				),
 				array(
 					array('batiments', 8, 5),
-					array('technologies', 7,0, 1)
+					array('technologies', 7,0)
 				),
 				array(
 					array('batiments', 8, 3),
-					array('technologies', 7,1, 2)
+					array('technologies', 7,1)
 				),
 				array(
 					array('batiments', 8, 5),
-					array('technologies', 7,2, 4)
+					array('technologies', 7,2)
 				),
 				array(
 					array('batiments', 8, 1),
-					array('technologies', 7,3, 8)
+					array('technologies', 7,3)
 				),
 				array(
 					array('batiments', 8, 3),
-					array('technologies', 7,5, 32)
+					array('technologies', 7,5)
 				),
 				array(
 					array('batiments', 8, 6),
-					array('technologies', 7,6, 64)
+					array('technologies', 7,6)
 				),
 				array(
 					array('batiments', 8, 6),
-					array('technologies', 7,1, 128)
+					array('technologies', 7,1)
 				),
 				array(
 					array('batiments', 8, 8),
-					array('technologies', 7,8, 256)
+					array('technologies', 7,8)
 				),
 				array(
 					array('batiments', 8, 10),
-					array('technologies', 7,9, 512)
+					array('technologies', 7,9)
 				),
 				array(
 					array('batiments', 8, 10),
-					array('technologies', 7,10, 1024)
+					array('technologies', 7,10)
 				)
 			);
 
diff --git a/onyx2/include/Class/Donnees/terrestre.php b/onyx2/include/Class/Donnees/terrestre.php
index bdd82d5..9b7fd43 100644
--- a/onyx2/include/Class/Donnees/terrestre.php
+++ b/onyx2/include/Class/Donnees/terrestre.php
@@ -436,35 +436,35 @@ class dTerrestre implements Donnees
 			//Défenses
 			array(
 				array('batiments', 7, 1),
-				array('technologies', 6, 0, 1)
+				array('technologies', 6, 0)
 			),
 			array(
 				array('batiments', 7, 3),
-				array('technologies', 6, 3, 8)
+				array('technologies', 6, 3)
 			),
 			array(
 				array('batiments', 7, 4),
-				array('technologies', 6, 1, 2)
+				array('technologies', 6, 1)
 			),
 			array(
 				array('batiments', 7, 4),
-				array('technologies', 6, 4, 16)
+				array('technologies', 6, 4)
 			),
 			array(
 				array('batiments', 7, 8),
-				array('technologies', 6, 2, 4)
+				array('technologies', 6, 2)
 			),
 			array(
 				array('batiments', 7, 8),
-				array('technologies', 6, 5, 32)
+				array('technologies', 6, 5)
 			),
 			array(
 				array('batiments', 7, 8),
-				array('technologies', 6, 6, 64)
+				array('technologies', 6, 6)
 			),
 			array(
 				array('batiments', 7, 10),
-				array('technologies', 7, 11, 2048)
+				array('technologies', 7, 11)
 			)
 		);