10 роки тому · 503d4c06ef
--- a/lib/EcranEditionObjet.py
+++ b/lib/EcranEditionObjet.py
@@ -51,7 +51,7 @@ class EcranEditionObjet(QDialog):
 
				         objet = Objet()
			
 
				         objet.nom = self.ui.eo_nom.texte()
			
 
				         objet.quantite = self.ui.eo_quantite.value()
			
 
				-        objet.type = self.ui.eo_type.currentIndex()
			
 
				+        objet.typeObjet = self.ui.eo_type.currentIndex()
			
 
				         objet.estConsommable = self.ui.eo_consommable.isChecked()
			
 
				         objet.poids = self.ui.eo_poids.value()
			
 
				         objet.valeur = self.ui.eo_valeur.value()
			
--- a/lib/img/Nouvelle
+++ b/lib/img/Nouvelle
--- a/lib/img/agrandir.png
+++ b/lib/img/agrandir.png
--- a/lib/img/agrandissement.png
+++ b/lib/img/agrandissement.png
--- a/lib/img/aide.png
+++ b/lib/img/aide.png
--- a/lib/img/arc.png
+++ b/lib/img/arc.png
--- a/lib/img/attaque.png
+++ b/lib/img/attaque.png
--- a/lib/img/baguette.png
+++ b/lib/img/baguette.png
--- a/lib/img/boite_outils.png
+++ b/lib/img/boite_outils.png
--- a/lib/img/bombe.png
+++ b/lib/img/bombe.png
--- a/lib/img/bouclier.png
+++ b/lib/img/bouclier.png
--- a/lib/img/btnCopie.png
+++ b/lib/img/btnCopie.png
--- a/lib/img/btnCouleurs.png
+++ b/lib/img/btnCouleurs.png
--- a/lib/img/btnCreation.png
+++ b/lib/img/btnCreation.png
--- a/lib/img/btnDeplacer.png
+++ b/lib/img/btnDeplacer.png
--- a/lib/img/btnEnregistrer.png
+++ b/lib/img/btnEnregistrer.png
--- a/lib/img/btnEntree.png
+++ b/lib/img/btnEntree.png
--- a/lib/img/btnFermer.png
+++ b/lib/img/btnFermer.png
--- a/lib/img/btnSortie.png
+++ b/lib/img/btnSortie.png
--- a/lib/img/btnZonePlacement.png
+++ b/lib/img/btnZonePlacement.png
--- a/lib/img/btn_ModeCombat.png
+++ b/lib/img/btn_ModeCombat.png
--- a/lib/img/carte.png
+++ b/lib/img/carte.png
--- a/lib/img/chevalier.png
+++ b/lib/img/chevalier.png
--- a/lib/img/chimie.png
+++ b/lib/img/chimie.png
--- a/lib/img/chimie2.png
+++ b/lib/img/chimie2.png
--- a/lib/img/cmdVue_cbt.png
+++ b/lib/img/cmdVue_cbt.png
--- a/lib/img/cmdVue_ouvrir.png
+++ b/lib/img/cmdVue_ouvrir.png
--- a/lib/img/cmdVue_plus.png
+++ b/lib/img/cmdVue_plus.png
--- a/lib/img/colonne.png
+++ b/lib/img/colonne.png
--- a/lib/img/combat3.jpg
+++ b/lib/img/combat3.jpg
--- a/lib/img/combat4.png
+++ b/lib/img/combat4.png
--- a/lib/img/cone.png
+++ b/lib/img/cone.png
--- a/lib/img/corbeille.png
+++ b/lib/img/corbeille.png
--- a/lib/img/creature.png
+++ b/lib/img/creature.png
--- a/lib/img/cur/cur_dep.png
+++ b/lib/img/cur/cur_dep.png
--- a/lib/img/cur/cur_doigt.png
+++ b/lib/img/cur/cur_doigt.png
--- a/lib/img/cur/cur_plus.png
+++ b/lib/img/cur/cur_plus.png
--- a/lib/img/cur/cur_style.png
+++ b/lib/img/cur/cur_style.png
--- a/lib/img/curseur.png
+++ b/lib/img/curseur.png
--- a/lib/img/curseurEpee.png
+++ b/lib/img/curseurEpee.png
--- a/lib/img/curseurPinceau.png
+++ b/lib/img/curseurPinceau.png
--- a/lib/img/curseurSeringue.png
+++ b/lib/img/curseurSeringue.png
--- a/lib/img/de.png
+++ b/lib/img/de.png
--- a/lib/img/decor.png
+++ b/lib/img/decor.png
--- a/lib/img/dep_pied.png
+++ b/lib/img/dep_pied.png
--- a/lib/img/deplacement.png
+++ b/lib/img/deplacement.png
--- a/lib/img/deplacement2.png
+++ b/lib/img/deplacement2.png
--- a/lib/img/diamant.png
+++ b/lib/img/diamant.png
--- a/lib/img/dragon.png
+++ b/lib/img/dragon.png
--- a/lib/img/dragon4.png
+++ b/lib/img/dragon4.png
--- a/lib/img/eau1.jpg
+++ b/lib/img/eau1.jpg
--- a/lib/img/editer.png
+++ b/lib/img/editer.png
--- a/lib/img/effFeu.jpg
+++ b/lib/img/effFeu.jpg
--- a/lib/img/effGlace.jpg
+++ b/lib/img/effGlace.jpg
--- a/lib/img/effPoison.png
+++ b/lib/img/effPoison.png
--- a/lib/img/escalade.png
+++ b/lib/img/escalade.png
--- a/lib/img/escalade_24.png
+++ b/lib/img/escalade_24.png
--- a/lib/img/etatEau.png
+++ b/lib/img/etatEau.png
--- a/lib/img/etatEndormi.png
+++ b/lib/img/etatEndormi.png
--- a/lib/img/etatEntrave.png
+++ b/lib/img/etatEntrave.png
--- a/lib/img/etatEtourdi.png
+++ b/lib/img/etatEtourdi.png
--- a/lib/img/etatFeu.png
+++ b/lib/img/etatFeu.png
--- a/lib/img/etatMort.png
+++ b/lib/img/etatMort.png
--- a/lib/img/etatParalyse.png
+++ b/lib/img/etatParalyse.png
--- a/lib/img/etatVol.png
+++ b/lib/img/etatVol.png
--- a/lib/img/flecheBas.png
+++ b/lib/img/flecheBas.png
--- a/lib/img/flecheDroite.png
+++ b/lib/img/flecheDroite.png
--- a/lib/img/flecheDroite2.png
+++ b/lib/img/flecheDroite2.png
--- a/lib/img/flecheGauche.png
+++ b/lib/img/flecheGauche.png
--- a/lib/img/flecheHaut.png
+++ b/lib/img/flecheHaut.png
--- a/lib/img/foret.jpg
+++ b/lib/img/foret.jpg
--- a/lib/img/formeEllipsePlein.png
+++ b/lib/img/formeEllipsePlein.png
--- a/lib/img/formeEllipseVide.png
+++ b/lib/img/formeEllipseVide.png
--- a/lib/img/formeLigne.png
+++ b/lib/img/formeLigne.png
--- a/lib/img/formeLigneOrientee.png
+++ b/lib/img/formeLigneOrientee.png
--- a/lib/img/formeRectPlein.png
+++ b/lib/img/formeRectPlein.png
--- a/lib/img/formeRectVide.png
+++ b/lib/img/formeRectVide.png
--- a/lib/img/gomme.png
+++ b/lib/img/gomme.png
--- a/lib/img/herbe.jpg
+++ b/lib/img/herbe.jpg
--- a/lib/img/herbe2.jpg
+++ b/lib/img/herbe2.jpg
--- a/lib/img/interdit.png
+++ b/lib/img/interdit.png
--- a/lib/img/ligneBrisee.png
+++ b/lib/img/ligneBrisee.png
--- a/lib/img/loupe.png
+++ b/lib/img/loupe.png
--- a/lib/img/main_cache.png
+++ b/lib/img/main_cache.png
--- a/lib/img/montagne.png
+++ b/lib/img/montagne.png
--- a/lib/img/nage.png
+++ b/lib/img/nage.png
--- a/lib/img/nage_24.png
+++ b/lib/img/nage_24.png
--- a/lib/img/neige.png
+++ b/lib/img/neige.png
--- a/lib/img/note.png
+++ b/lib/img/note.png
--- a/lib/img/oeil.png
+++ b/lib/img/oeil.png
--- a/lib/img/oeil_barre.png
+++ b/lib/img/oeil_barre.png
--- a/lib/img/oeil_barre2.png
+++ b/lib/img/oeil_barre2.png
--- a/lib/img/oiseau.png
+++ b/lib/img/oiseau.png
--- a/lib/img/orc.png
+++ b/lib/img/orc.png
--- a/lib/img/param.png
+++ b/lib/img/param.png
--- a/lib/img/parchemin.jpg
+++ b/lib/img/parchemin.jpg
--- a/lib/img/paysage.png
+++ b/lib/img/paysage.png
--- a/lib/img/pieces.png
+++ b/lib/img/pieces.png
--- a/lib/img/pieces2.png
+++ b/lib/img/pieces2.png
--- a/lib/img/plume.png
+++ b/lib/img/plume.png