archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tiles.rc: let zone population be controlled by tiles.rc

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@800 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-08-25 02:22:18 +00:00
parent 51973f75bd
commit 47963b0011
3 changed files with 65 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
graphics/tiles.rc
View file

@ -253,7 +253,7 @@
241 res_zones@16,0 (conducts)
242 res_zones@32,0 (conducts)
243 res_zones@0,16 (conducts)
244 res_zones@16,16 (zone)(conducts)
244 res_zones@16,16 (zone)(conducts)(population=0)
245 res_zones@32,16 (conducts)
246 res_zones@0,32 (conducts)
247 res_zones@16,32 (conducts)
@ -274,7 +274,7 @@
262 res_zones@16,48 (conducts)
263 res_zones@32,48 (conducts)
264 res_zones@0,64 (conducts)
265 res_zones@16,64 (zone)(conducts)
265 res_zones@16,64 (zone)(conducts)(population=16)
266 res_zones@32,64 (conducts)
267 res_zones@0,80 (conducts)
268 res_zones@16,80 (conducts)
@ -283,7 +283,7 @@
271 res_zones@16,96 (conducts)
272 res_zones@32,96 (conducts)
273 res_zones@0,112 (conducts)
274 res_zones@16,112 (zone)(conducts)
274 res_zones@16,112 (zone)(conducts)(population=24)
275 res_zones@32,112 (conducts)
276 res_zones@0,128 (conducts)
277 res_zones@16,128 (conducts)
@ -292,7 +292,7 @@
280 res_zones@16,144 (conducts)
281 res_zones@32,144 (conducts)
282 res_zones@0,160 (conducts)
283 res_zones@16,160 (zone)(conducts)
283 res_zones@16,160 (zone)(conducts)(population=32)
284 res_zones@32,160 (conducts)
285 res_zones@0,176 (conducts)
286 res_zones@16,176 (conducts)
@ -301,7 +301,7 @@
289 res_zones@16,192 (conducts)
290 res_zones@32,192 (conducts)
291 res_zones@0,208 (conducts)
292 res_zones@16,208 (zone)(conducts)
292 res_zones@16,208 (zone)(conducts)(population=40)
293 res_zones@32,208 (conducts)
294 res_zones@0,224 (conducts)
295 res_zones@16,224 (conducts)
@ -310,7 +310,7 @@
298 res_zones@16,240 (conducts)
299 res_zones@32,240 (conducts)
300 res_zones@0,256 (conducts)
301 res_zones@16,256 (zone)(conducts)
301 res_zones@16,256 (zone)(conducts)(population=16)
302 res_zones@32,256 (conducts)
303 res_zones@0,272 (conducts)
304 res_zones@16,272 (conducts)
@ -319,7 +319,7 @@
307 res_zones@16,288 (conducts)
308 res_zones@32,288 (conducts)
309 res_zones@0,304 (conducts)
310 res_zones@16,304 (zone)(conducts)
310 res_zones@16,304 (zone)(conducts)(population=24)
311 res_zones@32,304 (conducts)
312 res_zones@0,320 (conducts)
313 res_zones@16,320 (conducts)
@ -328,7 +328,7 @@
316 res_zones@16,336 (conducts)
317 res_zones@32,336 (conducts)
318 res_zones@0,352 (conducts)
319 res_zones@16,352 (zone)(conducts)
319 res_zones@16,352 (zone)(conducts)(population=32)
320 res_zones@32,352 (conducts)
321 res_zones@0,368 (conducts)
322 res_zones@16,368 (conducts)
@ -337,7 +337,7 @@
325 res_zones@16,384 (conducts)
326 res_zones@32,384 (conducts)
327 res_zones@0,400 (conducts)
328 res_zones@16,400 (zone)(conducts)
328 res_zones@16,400 (zone)(conducts)(population=40)
329 res_zones@32,400 (conducts)
330 res_zones@0,416 (conducts)
331 res_zones@16,416 (conducts)
@ -346,7 +346,7 @@
334 res_zones@16,432 (conducts)
335 res_zones@32,432 (conducts)
336 res_zones@0,448 (conducts)
337 res_zones@16,448 (zone)(conducts)
337 res_zones@16,448 (zone)(conducts)(population=16)
338 res_zones@32,448 (conducts)
339 res_zones@0,464 (conducts)
340 res_zones@16,464 (conducts)
@ -355,7 +355,7 @@
343 res_zones@16,480 (conducts)
344 res_zones@32,480 (conducts)
345 res_zones@0,496 (conducts)
346 res_zones@16,496 (zone)(conducts)
346 res_zones@16,496 (zone)(conducts)(population=24)
347 res_zones@32,496 (conducts)
348 res_zones@0,512 (conducts)
349 res_zones@16,512 (conducts)
@ -364,7 +364,7 @@
352 res_zones@16,528 (conducts)
353 res_zones@32,528 (conducts)
354 res_zones@0,544 (conducts)
355 res_zones@16,544 (zone)(conducts)
355 res_zones@16,544 (zone)(conducts)(population=32)
356 res_zones@32,544 (conducts)
357 res_zones@0,560 (conducts)
358 res_zones@16,560 (conducts)
@ -373,7 +373,7 @@
361 res_zones@16,576 (conducts)
362 res_zones@32,576 (conducts)
363 res_zones@0,592 (conducts)
364 res_zones@16,592 (zone)(conducts)
364 res_zones@16,592 (zone)(conducts)(population=40)
365 res_zones@32,592 (conducts)
366 res_zones@0,608 (conducts)
367 res_zones@16,608 (conducts)
@ -382,7 +382,7 @@
370 res_zones@16,624 (conducts)
371 res_zones@32,624 (conducts)
372 res_zones@0,640 (conducts)
373 res_zones@16,640 (zone)(conducts)
373 res_zones@16,640 (zone)(conducts)(population=16)
374 res_zones@32,640 (conducts)
375 res_zones@0,656 (conducts)
376 res_zones@16,656 (conducts)
@ -391,7 +391,7 @@
379 res_zones@16,672 (conducts)
380 res_zones@32,672 (conducts)
381 res_zones@0,688 (conducts)
382 res_zones@16,688 (zone)(conducts)
382 res_zones@16,688 (zone)(conducts)(population=24)
383 res_zones@32,688 (conducts)
384 res_zones@0,704 (conducts)
385 res_zones@16,704 (conducts)
@ -400,7 +400,7 @@
388 res_zones@16,720 (conducts)
389 res_zones@32,720 (conducts)
390 res_zones@0,736 (conducts)
391 res_zones@16,736 (zone)(conducts)
391 res_zones@16,736 (zone)(conducts)(population=32)
392 res_zones@32,736 (conducts)
393 res_zones@0,752 (conducts)
394 res_zones@16,752 (conducts)
@ -409,11 +409,12 @@
397 res_zones@16,768 (conducts)
398 res_zones@32,768 (conducts)
399 res_zones@0,784 (conducts)
400 res_zones@16,784 (zone)(conducts)
400 res_zones@16,784 (zone)(conducts)(population=40)
401 res_zones@32,784 (conducts)
402 res_zones@0,800 (conducts)
403 res_zones@16,800 (conducts)
404 res_zones@32,800 (conducts)
# BEGIN HOSPITAL/CHURCH #
405 res_zones@0,816 (conducts)
406 res_zones@16,816 (conducts)
407 res_zones@32,816 (conducts)
@ -437,7 +438,7 @@
424 com_zones@16,0 (conducts)
425 com_zones@32,0 (conducts)
426 com_zones@0,16 (conducts)
427 com_zones@16,16 (zone)(conducts)
427 com_zones@16,16 (zone)(conducts)(population=0)
428 com_zones@32,16 (conducts)
429 com_zones@0,32 (conducts)
430 com_zones@16,32 (conducts)
@ -446,7 +447,7 @@
433 com_zones@16,48 (conducts)
434 com_zones@32,48 (conducts)
435 com_zones@0,64 (conducts)
436 com_zones@16,64 (zone)(conducts)
436 com_zones@16,64 (zone)(conducts)(population=8)
437 com_zones@32,64 (conducts)
438 com_zones@0,80 (conducts)
439 com_zones@16,80 (conducts)
@ -455,7 +456,7 @@
442 com_zones@16,96 (conducts)
443 com_zones@32,96 (conducts)
444 com_zones@0,112 (conducts)
445 com_zones@16,112 (zone)(conducts)
445 com_zones@16,112 (zone)(conducts)(population=16)
446 com_zones@32,112 (conducts)
447 com_zones@0,128 (conducts)
448 com_zones@16,128 (conducts)
@ -464,7 +465,7 @@
451 com_zones@16,144 (conducts)
452 com_zones@32,144 (conducts)
453 com_zones@0,160 (conducts)
454 com_zones@16,160 (zone)(conducts)
454 com_zones@16,160 (zone)(conducts)(population=24)
455 com_zones@32,160 (conducts)
456 com_zones@0,176 (conducts)
457 com_zones@16,176 (conducts)
@ -473,7 +474,7 @@
460 com_zones@16,192 (conducts)
461 com_zones@32,192 (conducts)
462 com_zones@0,208 (conducts)
463 com_zones@16,208 (zone)(conducts)
463 com_zones@16,208 (zone)(conducts)(population=32)
464 com_zones@32,208 (conducts)
465 com_zones@0,224 (conducts)
466 com_zones@16,224 (conducts)
@ -482,7 +483,7 @@
469 com_zones@16,240 (conducts)
470 com_zones@32,240 (conducts)
471 com_zones@0,256 (conducts)
472 com_zones@16,256 (zone)(conducts)
472 com_zones@16,256 (zone)(conducts)(population=40)
473 com_zones@32,256 (conducts)
474 com_zones@0,272 (conducts)
475 com_zones@16,272 (conducts)
@ -491,7 +492,7 @@
478 com_zones@16,288 (conducts)
479 com_zones@32,288 (conducts)
480 com_zones@0,304 (conducts)
481 com_zones@16,304 (zone)(conducts)
481 com_zones@16,304 (zone)(conducts)(population=8)
482 com_zones@32,304 (conducts)
483 com_zones@0,320 (conducts)
484 com_zones@16,320 (conducts)
@ -500,7 +501,7 @@
487 com_zones@16,336 (conducts)
488 com_zones@32,336 (conducts)
489 com_zones@0,352 (conducts)
490 com_zones@16,352 (zone)(conducts)
490 com_zones@16,352 (zone)(conducts)(population=16)
491 com_zones@32,352 (conducts)
492 com_zones@0,368 (conducts)
493 com_zones@16,368 (conducts)
@ -509,7 +510,7 @@
496 com_zones@16,384 (conducts)
497 com_zones@32,384 (conducts)
498 com_zones@0,400 (conducts)
499 com_zones@16,400 (zone)(conducts)
499 com_zones@16,400 (zone)(conducts)(population=24)
500 com_zones@32,400 (conducts)
501 com_zones@0,416 (conducts)
502 com_zones@16,416 (conducts)
@ -518,7 +519,7 @@
505 com_zones@16,432 (conducts)
506 com_zones@32,432 (conducts)
507 com_zones@0,448 (conducts)
508 com_zones@16,448 (zone)(conducts)
508 com_zones@16,448 (zone)(conducts)(population=32)
509 com_zones@32,448 (conducts)
510 com_zones@0,464 (conducts)
511 com_zones@16,464 (conducts)
@ -527,7 +528,7 @@
514 com_zones@16,480 (conducts)
515 com_zones@32,480 (conducts)
516 com_zones@0,496 (conducts)
517 com_zones@16,496 (zone)(conducts)
517 com_zones@16,496 (zone)(conducts)(population=40)
518 com_zones@32,496 (conducts)
519 com_zones@0,512 (conducts)
520 com_zones@16,512 (conducts)
@ -536,7 +537,7 @@
523 com_zones@16,528 (conducts)
524 com_zones@32,528 (conducts)
525 com_zones@0,544 (conducts)
526 com_zones@16,544 (zone)(conducts)
526 com_zones@16,544 (zone)(conducts)(population=8)
527 com_zones@32,544 (conducts)
528 com_zones@0,560 (conducts)
529 com_zones@16,560 (conducts)
@ -545,7 +546,7 @@
532 com_zones@16,576 (conducts)
533 com_zones@32,576 (conducts)
534 com_zones@0,592 (conducts)
535 com_zones@16,592 (zone)(conducts)
535 com_zones@16,592 (zone)(conducts)(population=16)
536 com_zones@32,592 (conducts)
537 com_zones@0,608 (conducts)
538 com_zones@16,608 (conducts)
@ -554,7 +555,7 @@
541 com_zones@16,624 (conducts)
542 com_zones@32,624 (conducts)
543 com_zones@0,640 (conducts)
544 com_zones@16,640 (zone)(conducts)
544 com_zones@16,640 (zone)(conducts)(population=24)
545 com_zones@32,640 (conducts)
546 com_zones@0,656 (conducts)
547 com_zones@16,656 (conducts)
@ -563,7 +564,7 @@
550 com_zones@16,672 (conducts)
551 com_zones@32,672 (conducts)
552 com_zones@0,688 (conducts)
553 com_zones@16,688 (zone)(conducts)
553 com_zones@16,688 (zone)(conducts)(population=32)
554 com_zones@32,688 (conducts)
555 com_zones@0,704 (conducts)
556 com_zones@16,704 (conducts)
@ -572,7 +573,7 @@
559 com_zones@16,720 (conducts)
560 com_zones@32,720 (conducts)
561 com_zones@0,736 (conducts)
562 com_zones@16,736 (zone)(conducts)
562 com_zones@16,736 (zone)(conducts)(population=40)
563 com_zones@32,736 (conducts)
564 com_zones@0,752 (conducts)
565 com_zones@16,752 (conducts)
@ -581,7 +582,7 @@
568 com_zones@16,768 (conducts)
569 com_zones@32,768 (conducts)
570 com_zones@0,784 (conducts)
571 com_zones@16,784 (zone)(conducts)
571 com_zones@16,784 (zone)(conducts)(population=8)
572 com_zones@32,784 (conducts)
573 com_zones@0,800 (conducts)
574 com_zones@16,800 (conducts)
@ -590,7 +591,7 @@
577 com_zones@16,816 (conducts)
578 com_zones@32,816 (conducts)
579 com_zones@0,832 (conducts)
580 com_zones@16,832 (zone)(conducts)
580 com_zones@16,832 (zone)(conducts)(population=16)
581 com_zones@32,832 (conducts)
582 com_zones@0,848 (conducts)
583 com_zones@16,848 (conducts)
@ -599,7 +600,7 @@
586 com_zones@16,864 (conducts)
587 com_zones@32,864 (conducts)
588 com_zones@0,880 (conducts)
589 com_zones@16,880 (zone)(conducts)
589 com_zones@16,880 (zone)(conducts)(population=24)
590 com_zones@32,880 (conducts)
591 com_zones@0,896 (conducts)
592 com_zones@16,896 (conducts)
@ -608,7 +609,7 @@
595 com_zones@16,912 (conducts)
596 com_zones@32,912 (conducts)
597 com_zones@0,928 (conducts)
598 com_zones@16,928 (zone)(conducts)
598 com_zones@16,928 (zone)(conducts)(population=32)
599 com_zones@32,928 (conducts)
600 com_zones@0,944 (conducts)
601 com_zones@16,944 (conducts)
@ -617,7 +618,7 @@
604 com_zones@16,960 (conducts)
605 com_zones@32,960 (conducts)
606 com_zones@0,976 (conducts)
607 com_zones@16,976 (zone)(conducts)
607 com_zones@16,976 (zone)(conducts)(population=40)
608 com_zones@32,976 (conducts)
609 com_zones@0,992 (conducts)
610 com_zones@16,992 (conducts)
@ -627,7 +628,7 @@
613 ind_zones@16,0 (conducts)
614 ind_zones@32,0 (conducts)
615 ind_zones@0,16 (conducts)
616 ind_zones@16,16 (zone)(conducts)
616 ind_zones@16,16 (zone)(conducts)(population=0)
617 ind_zones@32,16 (conducts)
618 ind_zones@0,32 (conducts)
619 ind_zones@16,32 (conducts)
@ -636,7 +637,7 @@
622 ind_zones@16,48 (conducts)
623 ind_zones@32,48 (conducts)
624 ind_zones@0,64 (conducts)
625 ind_zones@16,64 (zone)(conducts)
625 ind_zones@16,64 (zone)(conducts)(population=8)
626 ind_zones@32,64 (conducts)
627 ind_zones@0,80 (conducts)
628 ind_zones@16,80 (conducts)
@ -645,7 +646,7 @@
631 ind_zones@16,96 (conducts)
632 ind_zones@32,96 (conducts)
633 ind_zones@0,112 (conducts)
634 ind_zones@16,112 (zone)(conducts)
634 ind_zones@16,112 (zone)(conducts)(population=16)
635 ind_zones@32,112 (conducts)
636 ind_zones@0,128 (conducts)
637 ind_zones@16,128 (conducts)
@ -654,7 +655,7 @@
640 ind_zones@16,144 (conducts)
641 ind_zones@32,144 (conducts)(onpower=884)
642 ind_zones@0,160 (conducts)
643 ind_zones@16,160 (zone)(conducts)
643 ind_zones@16,160 (zone)(conducts)(population=24)
644 ind_zones@32,160 (conducts)(onpower=888)
645 ind_zones@0,176 (conducts)
646 ind_zones@16,176 (conducts)
@ -663,7 +664,7 @@
649 ind_zones@16,192 (conducts)(onpower=892)
650 ind_zones@32,192 (conducts)(onpower=896)
651 ind_zones@0,208 (conducts)
652 ind_zones@16,208 (zone)(conducts)
652 ind_zones@16,208 (zone)(conducts)(population=32)
653 ind_zones@32,208 (conducts)
654 ind_zones@0,224 (conducts)
655 ind_zones@16,224 (conducts)
@ -672,7 +673,7 @@
658 ind_zones@16,240 (conducts)
659 ind_zones@32,240 (conducts)
660 ind_zones@0,256 (conducts)
661 ind_zones@16,256 (zone)(conducts)
661 ind_zones@16,256 (zone)(conducts)(population=8)
662 ind_zones@32,256 (conducts)
663 ind_zones@0,272 (conducts)
664 ind_zones@16,272 (conducts)
@ -681,7 +682,7 @@
667 ind_zones@16,288 (conducts)
668 ind_zones@32,288 (conducts)
669 ind_zones@0,304 (conducts)
670 ind_zones@16,304 (zone)(conducts)
670 ind_zones@16,304 (zone)(conducts)(population=16)
671 ind_zones@32,304 (conducts)
672 ind_zones@0,320 (conducts)
673 ind_zones@16,320 (conducts)
@ -690,7 +691,7 @@
676 ind_zones@16,336 (conducts)(onpower=900)
677 ind_zones@32,336 (conducts)(onpower=904)
678 ind_zones@0,352 (conducts)
679 ind_zones@16,352 (zone)(conducts)
679 ind_zones@16,352 (zone)(conducts)(population=24)
680 ind_zones@32,352 (conducts)
681 ind_zones@0,368 (conducts)
682 ind_zones@16,368 (conducts)
@ -699,7 +700,7 @@
685 ind_zones@16,384 (conducts)
686 ind_zones@32,384 (conducts)(onpower=908)
687 ind_zones@0,400 (conducts)
688 ind_zones@16,400 (zone)(conducts)
688 ind_zones@16,400 (zone)(conducts)(population=32)
689 ind_zones@32,400 (conducts)(onpower=912)
690 ind_zones@0,416 (conducts)
691 ind_zones@16,416 (conducts)

21
src/micropolisj/engine/TileConstants.java
View file

@ -730,9 +730,8 @@ public class TileConstants
*/
public static int residentialZonePop(int tile)
{
tile &= LOMASK;
int czDen = ((tile - RZB) / 9) % 4;
return czDen * 8 + 16;
TileSpec ts = Tiles.get(tile & LOMASK);
return ts.getPopulation();
}
/**
@ -743,12 +742,8 @@ public class TileConstants
*/
public static int commercialZonePop(int tile)
{
tile &= LOMASK;
if (tile == COMCLR)
return 0;
int czDen = ((tile - CZB) / 9) % 5 + 1;
return czDen;
TileSpec ts = Tiles.get(tile & LOMASK);
return ts.getPopulation() / 8;
}
/**
@ -758,11 +753,7 @@ public class TileConstants
*/
public static int industrialZonePop(int tile)
{
tile &= LOMASK;
if (tile == INDCLR)
return 0;
int czDen = ((tile - IZB) / 9) % 4 + 1;
return czDen;
TileSpec ts = Tiles.get(tile & LOMASK);
return ts.getPopulation() / 8;
}
}

11
src/micropolisj/engine/TileSpec.java
View file

@ -45,6 +45,17 @@ public class TileSpec
return images.toArray(new String[0]);
}
public int getPopulation()
{
String v = getAttribute("population");
if (v != null) {
return Integer.parseInt(v);
}
else {
return 0;
}
}
protected void load(String inStr, Properties tilesRc)
{
Scanner in = new Scanner(inStr);