2
0
Эх сурвалжийг харах

Fixed duplicated Redwood Observatory on snow and possibly other objects.

DjWarmonger 11 жил өмнө
parent
commit
713912574a

+ 6 - 1
config/objects/generic.json

@@ -106,11 +106,16 @@
 	},
 
 	"redwoodObservatory" : {
-		"index" :58, 
+		"index" :58,	
 		"handler" : "observatory",
 		"types" : {
 			"object" : {
 				"index" : 0,
+				"templates" :
+				{
+					"base" : { "animation" : "avxredw.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["grass", "swamp", "dirt", "sand", "lava", "rough"] },
+					"snow" : { "animation" : "avxreds0.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["snow"] }
+				},	
 				"rmg" : {
 					"zoneLimit"	: 1,
 					"value"		: 750,

+ 2 - 0
lib/rmg/CRmgTemplateZone.cpp

@@ -712,6 +712,8 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
 			auto oiptr = std::find(possibleObjects.begin(), possibleObjects.end(), oi);
 			assert (oiptr != possibleObjects.end());
 			oiptr->maxPerZone--;
+			if (!oiptr->maxPerZone)
+				possibleObjects.erase(oiptr);
 			//TODO
 
 			//update treasure pile area