Changeset 769


Ignore:
Timestamp:
06/07/2012 05:03:43 PM (3 years ago)
Author:
jhoffswell
Message:

Fixed the delete bug

Files:
21 added
37 edited

Legend:

Unmodified
Added
Removed
  • resources/data/analysis/state/environmental.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'environmental'
    3332p14
    34 S'environmental'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'tree'
    43 p19
     40p18
    4441I4
    4542I00
    46 tp20
     43tp19
    4744asS'event'
    48 p21
     45p20
    4946(ievent
    5047Event
    51 p22
    52 (dp23
     48p21
     49(dp22
    5350S'sceneName'
     51p23
     52g14
     53sS'buildingsToDelete'
    5454p24
    55 g15
    56 sS'buildingsToDelete'
    57 p25
    58 (lp26
     55(lp25
    5956sS'speChange'
    60 p27
     57p26
    6158(ispec
    6259Spec
    63 p28
    64 (dp29
     60p27
     61(dp28
    6562g6
     63I50
     64sg7
    6665I0
    67 sg7
    68 I50
    6966sg8
    7067I0
    7168sg9
    72 I0
    73 sg10
    7469I-20
    7570sbsS'specChange'
    76 p30
     71p29
    7772(ispec
    7873Spec
    79 p31
    80 (dp32
     74p30
     75(dp31
    8176g6
    8277I0
     
    8782sg9
    8883I0
    89 sg10
    90 I0
    9184sbsbsS'priority'
    92 p33
     85p32
    9386I00
    9487sS'upperTrig'
    95 p34
     88p33
    9689(ispec
    9790Spec
    98 p35
    99 (dp36
     91p34
     92(dp35
    10093g6
    10194I2147483647
     
    10699sg9
    107100I2147483647
    108 sg10
    109 I2147483647
    110101sbsS'prob'
    111 p37
     102p36
    112103F1
    113104sb.
  • resources/data/analysis/state/factory.heur

    r721 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'factory'
    3332p14
    34 S'factory'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0.050000000000000003
    3936sS'buildingTrig'
    40 p17
    41 (lp18
    42 (g15
     37p16
     38(lp17
     39(g14
    4340I1
    4441I00
    45 tp19
     42tp18
    4643asS'event'
    47 p20
     44p19
    4845(ievent
    4946Event
    50 p21
    51 (dp22
     47p20
     48(dp21
    5249S'sceneName'
     50p22
     51g14
     52sS'buildingsToDelete'
    5353p23
    54 g15
    55 sS'buildingsToDelete'
    56 p24
    57 (lp25
     54(lp24
    5855sS'speChange'
    59 p26
     56p25
    6057(ispec
    6158Spec
    62 p27
    63 (dp28
     59p26
     60(dp27
    6461g6
     62I-30
     63sg7
    6564I0
    66 sg7
    67 I-30
    6865sg8
    6966I0
    7067sg9
    7168I0
    72 sg10
    73 I0
    7469sbsS'specChange'
    75 p29
     70p28
    7671(ispec
    7772Spec
    78 p30
    79 (dp31
     73p29
     74(dp30
    8075g6
    8176I0
     
    8681sg9
    8782I0
    88 sg10
    89 I0
    9083sbsbsS'priority'
    91 p32
     84p31
    9285I00
    9386sS'upperTrig'
    94 p33
     87p32
    9588(ispec
    9689Spec
    97 p34
    98 (dp35
     90p33
     91(dp34
    9992g6
    10093I2147483647
     
    10598sg9
    10699I2147483647
    107 sg10
    108 I2147483647
    109100sbsS'prob'
    110 p36
     101p35
    111102F0.20000000000000001
    112103sb.
  • resources/data/analysis/state/fire.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I01
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229(S'fire truck'
    33 p14
     30p13
    3431I1
    35 tp15
     32tp14
    3633asS'name'
     34p15
     35S'fire'
    3736p16
    38 S'fire'
     37sS'deltaProb'
    3938p17
    40 sS'deltaProb'
    41 p18
    4239F0.02
    4340sS'buildingTrig'
    44 p19
    45 (lp20
    46 sS'event'
    47 p21
     41p18
     42(lp19
     43(S'tree'
     44p20
     45I1
     46I00
     47tp21
     48asS'event'
     49p22
    4850(ievent
    4951Event
    50 p22
    51 (dp23
     52p23
     53(dp24
    5254S'sceneName'
    53 p24
    54 g17
     55p25
     56g16
    5557sS'buildingsToDelete'
    56 p25
    57 (lp26
    58 sS'speChange'
    59 p27
     58p26
     59(lp27
     60g20
     61asS'speChange'
     62p28
    6063(ispec
    6164Spec
    62 p28
    63 (dp29
     65p29
     66(dp30
    6467g6
    65 I-20
     68I0
    6669sg7
    67 I-10
     70I-50
    6871sg8
    6972I0
    7073sg9
    71 I0
    72 sg10
    7374I20
    7475sbsS'specChange'
    75 p30
     76p31
    7677(ispec
    7778Spec
    78 p31
    79 (dp32
     79p32
     80(dp33
    8081g6
    8182I0
     
    8687sg9
    8788I0
    88 sg10
    89 I0
    9089sbsbsS'priority'
    91 p33
     90p34
    9291I00
    9392sS'upperTrig'
    94 p34
     93p35
    9594(ispec
    9695Spec
    97 p35
    98 (dp36
     96p36
     97(dp37
    9998g6
    10099I2147483647
     
    105104sg9
    106105I2147483647
    107 sg10
    108 I2147483647
    109106sbsS'prob'
    110 p37
     107p38
    111108F0.10000000000000001
    112109sb.
  • resources/data/analysis/state/interlude.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'interlude'
    3332p14
    34 S'interlude'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0.050000000000000003
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'solar panel'
    43 p19
     40p18
    4441I1
    4542I01
    46 tp20
     43tp19
    4744asS'event'
    48 p21
     45p20
    4946(ievent
    5047Event
    51 p22
    52 (dp23
     48p21
     49(dp22
    5350S'sceneName'
     51p23
     52g14
     53sS'buildingsToDelete'
    5454p24
    55 g15
    56 sS'buildingsToDelete'
    57 p25
    58 (lp26
     55(lp25
    5956sS'speChange'
    60 p27
     57p26
    6158(ispec
    6259Spec
    63 p28
    64 (dp29
     60p27
     61(dp28
    6562g6
    6663I30
     
    7067I30
    7168sg9
    72 I30
    73 sg10
    7469I-20
    7570sbsS'specChange'
    76 p30
     71p29
    7772(ispec
    7873Spec
    79 p31
    80 (dp32
     74p30
     75(dp31
    8176g6
    8277I0
     
    8782sg9
    8883I0
    89 sg10
    90 I0
    9184sbsbsS'priority'
    92 p33
     85p32
    9386I00
    9487sS'upperTrig'
    95 p34
     88p33
    9689(ispec
    9790Spec
    98 p35
    99 (dp36
     91p34
     92(dp35
    10093g6
    10194I2147483647
     
    10699sg9
    107100I2147483647
    108 sg10
    109 I2147483647
    110101sbsS'prob'
    111 p37
     102p36
    112103F0.5
    113104sb.
  • resources/data/analysis/state/invasive.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I01
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'invasive'
    3332p14
    34 S'invasive'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0.070000000000000007
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'train'
    43 p19
     40p18
    4441I2
    4542I00
    46 tp20
     43tp19
    4744a(S'plane'
    48 p21
     45p20
    4946I1
    5047I00
    51 tp22
     48tp21
    5249a(S'car'
    53 p23
     50p22
    5451I3
    5552I00
    56 tp24
     53tp23
    5754asS'event'
    58 p25
     55p24
    5956(ievent
    6057Event
    61 p26
    62 (dp27
     58p25
     59(dp26
    6360S'sceneName'
     61p27
     62g14
     63sS'buildingsToDelete'
    6464p28
    65 g15
    66 sS'buildingsToDelete'
    67 p29
    68 (lp30
     65(lp29
    6966sS'speChange'
    70 p31
     67p30
    7168(ispec
    7269Spec
    73 p32
    74 (dp33
     70p31
     71(dp32
    7572g6
    76 I-30
     73I0
    7774sg7
    78 I0
     75I-50
    7976sg8
    8077I0
    8178sg9
    8279I0
    83 sg10
    84 I0
    8580sbsS'specChange'
    86 p34
     81p33
    8782(ispec
    8883Spec
    89 p35
    90 (dp36
     84p34
     85(dp35
    9186g6
    9287I0
     
    9792sg9
    9893I0
    99 sg10
    100 I0
    10194sbsbsS'priority'
    102 p37
     95p36
    10396I00
    10497sS'upperTrig'
    105 p38
     98p37
    10699(ispec
    107100Spec
    108 p39
    109 (dp40
     101p38
     102(dp39
    110103g6
    111104I2147483647
     
    116109sg9
    117110I2147483647
    118 sg10
    119 I2147483647
    120111sbsS'prob'
    121 p41
     112p40
    122113F0.20000000000000001
    123114sb.
  • resources/data/analysis/state/lose_pollution.heur

    r748 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'lose_pollution'
    3332p14
    34 S'lose_pollution'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239sS'event'
    43 p19
     40p18
    4441(ievent
    4542Event
    46 p20
    47 (dp21
     43p19
     44(dp20
    4845S'sceneName'
     46p21
     47g14
     48sS'buildingsToDelete'
    4949p22
    50 g15
    51 sS'buildingsToDelete'
    52 p23
    53 (lp24
     50(lp23
    5451sS'specChange'
    55 p25
     52p24
    5653(ispec
    5754Spec
    58 p26
    59 (dp27
     55p25
     56(dp26
    6057g6
    6158I0
     
    6663sg9
    6764I0
    68 sg10
    69 I0
    7065sbsbsS'priority'
    71 p28
     66p27
    7267I01
    7368sS'upperTrig'
    74 p29
     69p28
    7570(ispec
    7671Spec
    77 p30
    78 (dp31
     72p29
     73(dp30
    7974g6
    8075I2147483647
     
    8479I2147483647
    8580sg9
    86 I2147483647
    87 sg10
    8881I600
    8982sbsS'prob'
    90 p32
     83p31
    9184F1
    9285sb.
  • resources/data/analysis/state/lose_resource.heur

    r748 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    13 I1
    14 sS'money'
     13I-1
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    22 I1
    23 sS'pollution'
     22I2147483647
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'lose_resource'
    3332p14
    34 S'lose_resource'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239sS'event'
    43 p19
     40p18
    4441(ievent
    4542Event
    46 p20
    47 (dp21
     43p19
     44(dp20
    4845S'sceneName'
     46p21
     47g14
     48sS'buildingsToDelete'
    4949p22
    50 g15
    51 sS'buildingsToDelete'
    52 p23
    53 (lp24
     50(lp23
    5451sS'specChange'
    55 p25
     52p24
    5653(ispec
    5754Spec
    58 p26
    59 (dp27
     55p25
     56(dp26
    6057g6
    6158I0
     
    6663sg9
    6764I0
    68 sg10
    69 I0
    7065sbsbsS'priority'
    71 p28
     66p27
    7267I01
    7368sS'upperTrig'
    74 p29
     69p28
    7570(ispec
    7671Spec
    77 p30
    78 (dp31
     72p29
     73(dp30
    7974g6
    8075I2147483647
     
    8580sg9
    8681I2147483647
    87 sg10
    88 I2147483647
    8982sbsS'prob'
    90 p32
     83p31
    9184F1
    9285sb.
  • resources/data/analysis/state/meltdown.heur

    r721 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I01
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'meltdown'
    3332p14
    34 S'meltdown'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0.029999999999999999
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'nuclear plant'
    43 p19
     40p18
    4441I1
    4542I00
    46 tp20
     43tp19
    4744asS'event'
    48 p21
     45p20
    4946(ievent
    5047Event
    51 p22
    52 (dp23
     48p21
     49(dp22
    5350S'sceneName'
     51p23
     52g14
     53sS'buildingsToDelete'
    5454p24
    55 g15
    56 sS'buildingsToDelete'
    57 p25
    58 (lp26
    59 g19
     55(lp25
     56g18
    6057asS'speChange'
    61 p27
     58p26
    6259(ispec
    6360Spec
    64 p28
    65 (dp29
     61p27
     62(dp28
     63g6
     64I0
     65sg7
     66I0
     67sg8
     68I0
     69sg9
     70I80
     71sbsS'specChange'
     72p29
     73(ispec
     74Spec
     75p30
     76(dp31
    6677g6
    6778I0
     
    7283sg9
    7384I0
    74 sg10
    75 I80
    76 sbsS'specChange'
    77 p30
     85sbsbsS'priority'
     86p32
     87I00
     88sS'upperTrig'
     89p33
    7890(ispec
    7991Spec
    80 p31
    81 (dp32
    82 g6
    83 I0
    84 sg7
    85 I0
    86 sg8
    87 I0
    88 sg9
    89 I0
    90 sg10
    91 I0
    92 sbsbsS'priority'
    93 p33
    94 I00
    95 sS'upperTrig'
    9692p34
    97 (ispec
    98 Spec
    99 p35
    100 (dp36
     93(dp35
    10194g6
    10295I2147483647
     
    107100sg9
    108101I2147483647
    109 sg10
    110 I2147483647
    111102sbsS'prob'
    112 p37
     103p36
    113104F0.20000000000000001
    114105sb.
  • resources/data/analysis/state/mine_collapse.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I01
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'mine_collapse'
    3332p14
    34 S'mine_collapse'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0.029999999999999999
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'mine'
    43 p19
     40p18
    4441I1
    4542I00
    46 tp20
     43tp19
    4744asS'event'
    48 p21
     45p20
    4946(ievent
    5047Event
    51 p22
    52 (dp23
     48p21
     49(dp22
    5350S'sceneName'
     51p23
     52g14
     53sS'buildingsToDelete'
    5454p24
    55 g15
    56 sS'buildingsToDelete'
    57 p25
    58 (lp26
    59 g19
     55(lp25
     56g18
    6057asS'specChange'
    61 p27
     58p26
    6259(ispec
    6360Spec
    64 p28
    65 (dp29
     61p27
     62(dp28
    6663g6
    6764I0
     
    7269sg9
    7370I0
    74 sg10
    75 I0
    7671sbsbsS'priority'
    77 p30
     72p29
    7873I00
    7974sS'upperTrig'
    80 p31
     75p30
    8176(ispec
    8277Spec
    83 p32
    84 (dp33
     78p31
     79(dp32
    8580g6
    8681I2147483647
     
    9186sg9
    9287I2147483647
    93 sg10
    94 I2147483647
    9588sbsS'prob'
    96 p34
     89p33
    9790F0.14999999999999999
    9891sb.
  • resources/data/analysis/state/warn_pollution.heur

    r720 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'warn_pollution'
    3332p14
    34 S'warn_pollution'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239sS'event'
    43 p19
     40p18
    4441(ievent
    4542Event
    46 p20
    47 (dp21
     43p19
     44(dp20
    4845S'sceneName'
     46p21
     47g14
     48sS'buildingsToDelete'
    4949p22
    50 g15
    51 sS'buildingsToDelete'
    52 p23
    53 (lp24
     50(lp23
    5451sS'specChange'
    55 p25
     52p24
    5653(ispec
    5754Spec
    58 p26
    59 (dp27
     55p25
     56(dp26
    6057g6
    6158I0
     
    6663sg9
    6764I0
    68 sg10
    69 I0
    7065sbsbsS'priority'
    71 p28
     66p27
    7267I00
    7368sS'upperTrig'
    74 p29
     69p28
    7570(ispec
    7671Spec
    77 p30
    78 (dp31
     72p29
     73(dp30
    7974g6
    8075I2147483647
     
    8479I2147483647
    8580sg9
    86 I2147483647
    87 sg10
    8881I500
    8982sbsS'prob'
    90 p32
     83p31
    9184F1
    9285sb.
  • resources/data/analysis/state/warn_resource.heur

    r720 r769  
    5858p26
    5959(dp27
    60 g6
    61 I0
    62 sg7
     60g7
    6361I0
    6462sg8
     
    7775p30
    7876(dp31
    79 g6
    80 I2147483647
    81 sg7
     77g7
    8278I2147483647
    8379sg8
  • resources/data/analysis/state/win.heur

    r630 r769  
    99p4
    1010(dp5
    11 S'food'
     11S'money'
    1212p6
    1313I-1
    14 sS'money'
     14sS'material'
    1515p7
    1616I-1
    17 sS'material'
     17sS'power'
    1818p8
    1919I-1
    20 sS'power'
     20sS'pollution'
    2121p9
    2222I-1
    23 sS'pollution'
     23sbsS'repeat'
    2424p10
    25 I-1
    26 sbsS'repeat'
    27 p11
    2825I00
    2926sS'absentBuildingTrig'
    30 p12
    31 (lp13
     27p11
     28(lp12
    3229sS'name'
     30p13
     31S'win'
    3332p14
    34 S'win'
     33sS'deltaProb'
    3534p15
    36 sS'deltaProb'
    37 p16
    3835F0
    3936sS'buildingTrig'
    40 p17
    41 (lp18
     37p16
     38(lp17
    4239(S'spaceship'
    43 p19
     40p18
    4441I1
    4542I01
    46 tp20
     43tp19
    4744asS'event'
    48 p21
     45p20
    4946(ievent
    5047Event
    51 p22
    52 (dp23
     48p21
     49(dp22
    5350S'sceneName'
     51p23
     52g14
     53sS'buildingsToDelete'
    5454p24
    55 g15
    56 sS'buildingsToDelete'
    57 p25
    58 (lp26
     55(lp25
    5956sS'specChange'
    60 p27
     57p26
    6158(ispec
    6259Spec
    63 p28
    64 (dp29
     60p27
     61(dp28
    6562g6
    6663I0
     
    7168sg9
    7269I0
    73 sg10
    74 I0
    7570sbsbsS'priority'
    76 p30
     71p29
    7772I01
    7873sS'upperTrig'
    79 p31
     74p30
    8075(ispec
    8176Spec
    82 p32
    83 (dp33
     77p31
     78(dp32
    8479g6
    8580I2147483647
     
    9085sg9
    9186I2147483647
    92 sg10
    93 I2147483647
    9487sbsS'prob'
    95 p34
     88p33
    9689F1
    9790sb.
  • resources/data/buildings/bus.bld

    r765 r769  
    55S'menuDescrip'
    66p3
    7 S'Buses can transport many aliens.'
     7S'A bus is a form of transportation.'
    88p4
    99sS'stats'
     
    6363asS'detailedDescrip'
    6464p26
    65 S'A bus is a large vehicle used to transport aliens.  There are different types of buses, like school buses or double-decker buses.'
     65S'A bus is a large vehicle used to transport aliens.  There are different types of buses, like a school bus or a double-decker.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/car.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'Cars come in many shapes and sizes.'
     7S'A car is a form of transportation.'
    88p4
    99sS'stats'
     
    6161sS'detailedDescrip'
    6262p25
    63 S'A car is a vehicle that uses gas to get from place to place.  Some newer cars cause less pollution by using electricity instead of gas.'
     63S'A car can be used to get to places quicker.  Some cars are used for racing and go really fast.'
    6464p26
    6565sS'threshold'
  • resources/data/buildings/factory.bld

    r765 r769  
    55S'menuDescrip'
    66p3
    7 S'Factories produce a lot of material.'
     7S'Factories are used to get lots of material.'
    88p4
    99sS'stats'
     
    6363asS'detailedDescrip'
    6464p26
    65 S'Factories use machines to make a lot of material very quickly, but they cause much pollution.'
     65S'Factories use machines to make a lot of material very quickly.  They pollute though.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/farm.bld

    r764 r769  
    6363asS'detailedDescrip'
    6464p26
    65 S'Farms have lots of animals like cows, chickens, and pigs.  They also make materials.'
     65S'Farms have lots of animals like cows, chickens, and pigs.  It also makes materials.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/fire_truck.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'A fire truck is a form of transportation used to put out fires.'
     7S'A fire truck is a form of transportation'
    88p4
    99sS'stats'
     
    5454sS'alien'
    5555p21
    56 S"I'm glad we have this fire truck. Now, we can put out fires."
     56S"I'm glad we have this fire truck. Now, we can put our fires."
    5757p22
    5858sS'requiredBuildings'
     
    6363asS'detailedDescrip'
    6464p26
    65 S'A fire truck is a special kind of vehicle. It is used to put out fires in an emergency.'
     65S'A fire truck is a special kind of vehicle. It is used to put our fire in an emergency.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/helicopter.bld

    r765 r769  
    6363asS'detailedDescrip'
    6464p26
    65 S'Helicopters are used to fly goods across the planet. They can hover above the ground.'
     65S'Helicopters are used to fly good across the planet. It can hover above the ground in one place.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/mine.bld

    r764 r769  
    6161sS'detailedDescrip'
    6262p25
    63 S'Mines are used to get material from under the ground.  The more mines there are, the more material you can get. Be careful, though - mines may collapse.'
     63S'Mines are used to get material from under the ground.  The more mines there are, the more material you can get.'
    6464p26
    6565sS'threshold'
  • resources/data/buildings/motorcycle.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'A motorcycle is a gas-powered bicycle.'
     7S'A motorcycle is a form of transportation.'
    88p4
    99sS'stats'
     
    6161sS'detailedDescrip'
    6262p25
    63 S'A motorcycle is a vehicle that has two wheels. Motorcycles carry fewer aliens than cars do.'
     63S'A motorcycle is a vehicle that has two wheels. Motorcycles usually can carry only one person, or alien.'
    6464p26
    6565sS'threshold'
  • resources/data/buildings/nuclear_plant.bld

    r764 r769  
    5454sS'alien'
    5555p21
    56 S'This nuclear plant gives us a lot of power but it produces toxic waste pollution.'
     56S'This nuclear plant gives us a lot of power but it pollutes an awful lot.'
    5757p22
    5858sS'requiredBuildings'
     
    6161sS'detailedDescrip'
    6262p25
    63 S'A nuclear plant uses chemical elements to make heat and steam.  This heat and steam is used like wind in a windmill to create power.'
     63S'A nuclear plant uses chemical elements to make heat and steam.  This heat and steam is used like wind in a windmill to create power'
    6464p26
    6565sS'threshold'
  • resources/data/buildings/plane.bld

    r765 r769  
    55S'menuDescrip'
    66p3
    7 S'A plane can fly really far.'
     7S'A plane can go really far.'
    88p4
    99sS'stats'
     
    6363asS'detailedDescrip'
    6464p26
    65 S'Airplanes are used to quickly move goods across the planet.  They have two wings and an engine that allows them to fly across the sky at over 500 miles per hour.'
     65S'Airplanes are used to move goods across the planet very fast.  They have two wings and an engine that allow them to fly across the sky at over 500 miles per hour.'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/solar_panel.bld

    r764 r769  
    6363asS'detailedDescrip'
    6464p26
    65 S"A solar panel is a device that uses the sun to make power.  Many solar panels can be used at once to generate a lot of power."
     65S"A solar panel is a device that uses the sun to make power.  You need to use many solar panels at one time because one doesn't produce enough power"
    6666p27
    6767sS'threshold'
  • resources/data/buildings/train.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'A train is a form of transportation that runs on tracks.'
     7S'A train is a form of transportation.'
    88p4
    99sS'stats'
     
    6363asS'detailedDescrip'
    6464p26
    65 S'A train is a series of cars that is pulled by a locomotive along a track.  It can carry large amounts of fuel, material, and even aliens.'
     65S'A train is a series of cars which are pulled by a locomotive along a track.  It can carry large amounts of fuel, material, and even the aliens .'
    6666p27
    6767sS'threshold'
  • resources/data/buildings/tree.bld

    r764 r769  
    6161sS'detailedDescrip'
    6262p25
    63 S'Trees are used for material and they also decrease pollution. \n '
     63S'Trees are used for material, but they also decrease pollution. \n '
    6464p26
    6565sS'threshold'
  • resources/data/buildings/truck.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'A truck is a large form of transportation.'
     7S'A truck is a form of transportation.'
    88p4
    99sS'stats'
  • resources/data/buildings/water_wheel.bld

    r764 r769  
    5454sS'alien'
    5555p21
    56 S"This water wheel gives us more power and doesn't pollute! \n"
     56S"This water wheel gives us more power and doesn't pollute. \n"
    5757p22
    5858sS'requiredBuildings'
  • resources/data/buildings/windmill.bld

    r764 r769  
    55S'menuDescrip'
    66p3
    7 S'A windmill uses the wind to create power.'
     7S'Windmill uses wind to create power.'
    88p4
    99sS'stats'
     
    6161sS'detailedDescrip'
    6262p25
    63 S"A windmill is a machine that uses wind energy to make power.  It is a renewable resource that is good for the environment because it doesn't create much pollution."
     63S"A windmill is a machine that uses wind energy to make power.  It is a renewable resource and good for the environment because it doesn't create much pollution."
    6464p26
    6565sS'threshold'
  • src/block.py

    r767 r769  
    2424from fileio import loadText
    2525from globals import *
     26from constants import *
    2627
    2728
     
    4243        self.loadLandscapeData()
    4344       
    44         self.buildings = []
     45        # Inititializes empty lists for the buildings
    4546        self.buildingNames = []
    4647        self.buildingPos = []
    4748        self.buildingImages = []
     49        for i in range(MAX_BUILDINGS):
     50            self.buildingNames.append(NO_BUILDING[0])
     51            self.buildingPos.append(NO_BUILDING[1])
     52            self.buildingImages.append(NO_BUILDING[2])
    4853        self.deletedIndices = []
    4954
     
    7378        buildingImages = state.getBlockBuildings(self.ID)
    7479       
     80        # removes all the buildings from the block which should be deleted
    7581        if deletedBuildingIndices == []:
    7682            for i in reversed(sorted(self.deletedIndices)):
    77                 self.buildingNames.pop(i)
    78                 self.buildingPos.pop(i)
     83                self.buildingNames[i] = NO_BUILDING[0]
     84                self.buildingPos[i] = NO_BUILDING[1]
     85                self.buildingImages[i] = NO_BUILDING[2]
    7986            self.deletedIndices = []
    80 
     87             
    8188        # something has changed visually
    8289        if self.buildingImages != buildingImages:
     
    8592            self.removeAllElements(MapBuilding)
    8693
    87             # reorder buildings and pos, remove deleted buildings
    88             newOrder = []
     94            # initialize new, empty building lists
     95            newNames = []
    8996            newPos = []
     97            tempBuildings = []
     98            for i in range(MAX_BUILDINGS):
     99                newNames.append(NO_BUILDING[0])
     100                newPos.append(NO_BUILDING[1])
    90101            tempBuildings = buildings[:]
     102               
     103            # create new lists by filling in existing buildings and by
     104            # adding deleted buildings to the list to be removed
    91105            for i, name in enumerate(buildings):
    92                 if name in self.buildingNames:
    93                     j = self.buildingNames.index(name)
    94                     if not i in deletedBuildingIndices:
    95                         newOrder.append(self.buildingNames.pop(j))
    96                         newPos.append(self.buildingPos.pop(j))
    97                     else:
    98                         pos = self.buildingPos.pop(j)
    99                         if i not in self.deletedIndices:
    100                             self.deletedIndices.append(i)
    101                             self.buildingLoc.append(pos)
    102                         newOrder.append(self.buildingNames.pop(j))
    103                         newPos.append(pos)
    104 
    105                     tempBuildings.remove(name)
    106 
     106                if not i in deletedBuildingIndices:
     107                    newNames[i] = self.buildingNames[i]
     108                    newPos[i] = self.buildingPos[i]
     109                else:
     110                    pos = self.buildingPos[i]
     111                    if i not in self.deletedIndices:
     112                        self.deletedIndices.append(i)
     113                        self.buildingLoc[i] = pos
     114                    newNames[i] = self.buildingNames[i]
     115                    newPos[i] = pos
     116                    tempBuildings[i] = NO_BUILDING[0]
     117           
    107118            # add back any deleted buildings (from events)
    108             for pos in self.buildingPos:
    109                 self.buildingLoc.append(pos)
     119            for i in range(len(self.buildingPos)):
     120                if self.buildingPos[i] != NO_BUILDING[1]:
     121                    self.buildingLoc[i] = self.buildingPos[i]
    110122
    111123            # now add new buildings   
    112             for name in tempBuildings:
    113                 newOrder.append(name)
    114                 newPos.append(self.buildingLoc.pop(0))
    115 
    116             self.buildings = []
    117             for i in range(len(newOrder)):
    118                 buildingSpecs = [newOrder[i], newPos[i], buildingImages[i]]
    119                 self.buildings.append(buildingSpecs)
    120             self.buildingNames = newOrder
     124            for i in range(len(tempBuildings)):
     125                if tempBuildings[i] != NO_BUILDING[0]:
     126                    newNames[i] = tempBuildings[i]
     127                    newPos[i] = self.buildingLoc[i]
     128                   
     129            self.buildingNames = newNames
    121130            self.buildingPos = newPos
    122131            self.buildingImages = buildingImages
     
    124133            usedList = []
    125134            buildingsVisible = state.getBlockBuildingNames(self.ID, True)
    126             for i, name in enumerate(self.buildingNames):
    127                 if i not in self.deletedIndices:
     135            for i in range(MAX_BUILDINGS):
     136                if self.buildingNames[i] != NO_BUILDING[0]:
    128137                    temp = buildingsVisible[:]
    129138                    offset = 0
    130                     buildingIndex = temp.index(name)
    131                     while buildingIndex in usedList:
    132                         offset += 1
    133                         temp.remove(name)
    134                         buildingIndex = temp.index(name) + offset
     139                    buildingIndex = i
     140                    #while buildingIndex in usedList:
     141                     #   offset += 1
     142                      #  temp.remove(name)
     143                       # buildingIndex = temp.index(name) + offset
    135144                    usedList.append(buildingIndex)
    136145                   
     
    148157            if len(buildingsToTalkAbout) > 0:
    149158                buildingNum = choice(range(len(buildingsToTalkAbout)))
    150                 building = buildingLUT[buildingsToTalkAbout[buildingNum]]
    151                 buildingsToTalkAbout.pop(buildingNum)
    152                 alienOpinion = building.getAlienOpinion()
     159                if buildingsToTalkAbout[buildingNum] != NO_BUILDING[0]:
     160                    building = buildingLUT[buildingsToTalkAbout[buildingNum]]
     161                    buildingsToTalkAbout.pop(buildingNum)
     162                    alienOpinion = building.getAlienOpinion()
     163                else: alienOpinion = None
    153164            else:
    154165                alienOpinion = None
  • src/blockData.py

    r659 r769  
    99from globals import MAX_BUILDINGS
    1010from fileio import iconDir
     11from constants import *
    1112
    1213
     
    1718        self.newBuildingIndices = []
    1819        self.deletedBuildingIndices = []
     20       
     21        for i in range(MAX_BUILDINGS):
     22            self.buildingNames.append(NO_BUILDING[0])
    1923
    2024    def hasSpace(self):
    21         return len(self.buildingNames) - len(self.deletedBuildingIndices) \
     25        count = 0
     26        for i in range(MAX_BUILDINGS):
     27            if self.buildingNames[i] != NO_BUILDING[0]:
     28                count += 1
     29       
     30        return count - len(self.deletedBuildingIndices) \
    2231                < MAX_BUILDINGS
    2332
     
    3140        self.deletedBuildingIndices.sort()
    3241        for i in reversed(self.deletedBuildingIndices):
    33             self.buildingNames.pop(i)
     42            self.buildingNames[i] = NO_BUILDING[0]
    3443        self.deletedBuildingIndices = []
    3544
    3645    def revert(self):
    3746        self.newBuildingIndices.sort()
    38         for index in reversed(self.newBuildingIndices):
    39             self.buildingNames.pop(index)
     47        for i in reversed(self.newBuildingIndices):
     48            self.buildingNames[i] = NO_BUILDING[0]
    4049        self.newBuildingIndices = []
    4150        self.deletedBuildingIndices = []
     
    4554        # current length is equal to the next index
    4655        # thus we keep track of this index
    47         self.newBuildingIndices.append(len(self.buildingNames))
    48         self.buildingNames.append(buildingName)
     56        for i in range(MAX_BUILDINGS):
     57            if self.buildingNames[i] == NO_BUILDING[0]:
     58                self.newBuildingIndices.append(i)
     59                self.buildingNames[i] = buildingName
     60                break
    4961
    5062    def hasBuilding(self, buildingName, checkNew=True, checkDeleted=False):
     
    5971    def getBuildings(self, includeNew=False, includeDeleted=False):
    6072        output = []
    61         for i, name in enumerate(self.buildingNames):
     73        for i in range(MAX_BUILDINGS):
    6274            if (not i in self.newBuildingIndices or includeNew) and \
    6375                (not i  in self.deletedBuildingIndices or includeDeleted):
    64                 output.append(name)
     76                output.append(self.buildingNames[i])
     77            else:
     78                output.append(NO_BUILDING[0])
    6579        return output
    6680
     
    7084            if not i in self.deletedBuildingIndices or includeDeleted:
    7185                output.append(self.buildingNames[i])
     86            else:
     87                output.append(NO_BUILDING[0])
    7288        return output
    7389
     
    8298                    output.append(iconDir + "outline_%s" \
    8399                                  % name.replace(" ", "_"))
     100            else:
     101                output.append(iconDir + "delete_%s" \
     102                                % name.replace(" ", "_"))
    84103        return output
    85104
  • src/constants.py

    r756 r769  
    2626NUM_ALIENS = 3
    2727
     28# block properties
     29NO_BUILDING = ['None', (440,440), 'None']
     30
    2831# threshold keys
    2932CAN_BUILD = 0
  • src/globals.py

    r659 r769  
    1515
    1616NO_HOVER = -1
     17
  • src/researchDescription.py

    r763 r769  
    1919        DetailedDescription.__init__(self, visible, True, info)
    2020        if unlock[0] == "NO" or unlock[0] == "":
    21             print "no research button"
    2221            yesButtonIndex = self.getElementByAttr(SimpleButton, "affirmative")
    2322            self.subwindows.pop(yesButtonIndex)
  • src/scripts/generateBuildings.py

    r762 r769  
    305305        print "Error saving building"
    306306   
     307    ################################# None ###################################
     308    noneStats = BuildingStats()
     309    noneStats.setOneTime(Spec(0, 0, 0, 0))
     310    noneStats.setCont(Spec(0, 0, 0, 0))
     311    none = Building('None', TRANS, noneStats, (0, 0, 0), [])
     312    none.setMenuDescrip("")
     313    none.setDetailedDescrip("")
     314    none.setAlienOpinion("")
     315    none.setCatRank(rank)
     316    rank += 1
     317
     318    success = saveBuilding(none)
     319    if not success:
     320        print "Error saving building"
  • src/scripts/generateHeuristics.py

    r766 r769  
    2626    saveHeuristic(win)
    2727
     28    ################################# lose resource ###########################
     29    loseResource = Heuristic("lose_resource")
     30    loseResource.setPriority()
     31    losingLowerSpec = Spec(-1, -1, -1, sys.maxint)
     32    loseResource.setLowerTrig(losingLowerSpec)
     33    saveHeuristic(loseResource)   
     34   
    2835    ################################# lose pollution ##########################
    2936    losePollution = Heuristic("lose_pollution")
     
    3239    losePollution.setUpperTrig(losingUpperSpec)
    3340    saveHeuristic(losePollution)
    34 
    35     ################################# lose resource ###########################
    36     loseResource = Heuristic("lose_resource")
    37     loseResource.setPriority()
    38     losingLowerSpec = Spec(-1, -1, -1, sys.maxint)
    39     loseResource.setLowerTrig(losingLowerSpec)
    40     saveHeuristic(loseResource)
    4141
    4242    ############################ mine collapse  ###############################
  • src/state.py

    r763 r769  
    2929        self.specDelta = Spec()
    3030
     31        self.newSpace = 0
     32       
    3133        self.researchValues = [0] * len(CAT_LUT)
    3234        self.researchDelta = [0] * len(CAT_LUT)
     
    4850
    4951        if building.buildingCat == TRANS:
    50             self.addSpace()
     52            self.newSpace += 1
    5153
    5254    def research(self, researchCat, amount):
     
    7476            # for in specDelta
    7577            self.researchValues[i] += self.researchDelta[i]
     78           
     79        for i in range(self.newSpace):
     80            self.addSpace()
     81        self.newSpace = 0
    7682
    7783        self.clearDeltas()
    7884
    7985    def undoTurn(self):
    80         for block in reversed(self.blocks):
    81             if block.isNew:
    82                 self.blocks.pop(self.blocks.index(block))
    83             else:
    84                 block.revert()
     86        for block in self.blocks:
     87            block.revert()
     88        self.newSpace = 0
    8589        self.clearDeltas()
    8690
  • src/top.py

    r768 r769  
    213213
    214214        menuButton.setHover(STR.MAIN_MENU_HOVER)
    215 
    216         ###########################################################################
    217 
    218         #newMap = map_.Map(True, top.deleteBuilding,(top.mainScreen,))
    219215
    220216        ###########################################################################
Note: See TracChangeset for help on using the changeset viewer.