Changeset 889 for trunk

Show
Ignore:
Timestamp:
02/17/08 13:59:45 (11 months ago)
Author:
james
Message:

tidy up

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/modules/friendship.tcl

    r419 r889  
    2323############################################################################### 
    2424 
     25# get a nick's friendship rating, or 50 if we couldn't find them (or if they don't 
     26# have a friendship yet 
    2527proc getFriendship { nick } { 
    26   if {![validuser $nick]} { 
    27     set handle [nick2hand $nick] 
    28     if {($handle == "*") || ($handle == "")} { 
    29       bMotion_putloglev 1 * "bMotion: couldn't find a handle for $nick to get friendship." 
    30       return 50 
    31     } 
    32   } else { 
    33     set handle $nick 
    34   } 
     28        if {![validuser $nick]} { 
     29                set handle [nick2hand $nick] 
     30                if {($handle == "*") || ($handle == "")} { 
     31                        bMotion_putloglev 1 * "friendship: couldn't find a handle for $nick to get friendship." 
     32                        return 50 
     33                } 
     34        } else { 
     35                set handle $nick 
     36        } 
    3537 
    36   set friendship 50 
     38        set friendship 50 
    3739 
    38   if {$handle != "*"} { 
    39     set friendship [getuser $handle XTRA friend] 
    40     if {$friendship == ""} { 
    41       setFriendship $nick 50   
    42       set friendship 50 
    43     } 
    44   } 
    45   return $friendship 
     40        if {$handle != "*"} { 
     41                set friendship [getuser $handle XTRA friend] 
     42                if {$friendship == ""} { 
     43                        setFriendship $nick 50   
     44                        set friendship 50 
     45                } 
     46        } 
     47        return $friendship 
    4648} 
    4749 
     50# get a handle's friendship, or 50 if unknown 
    4851proc getFriendshipHandle { handle } { 
    49   set friendship 50 
     52        set friendship 50 
    5053 
    51   set friendship [getuser $handle XTRA friend] 
    52   if {$friendship == ""} { 
    53     setFriendship $handle 50   
    54     set friendship 50 
    55   } 
    56   return $friendship 
     54        set friendship [getuser $handle XTRA friend] 
     55        if {$friendship == ""} { 
     56                setFriendship $handle 50         
     57                set friendship 50 
     58        } 
     59        return $friendship 
    5760} 
    5861 
     62# set friendship on a handle 
    5963proc setFriendshipHandle { handle friendship } { 
    60   if {$friendship > 100} { 
    61     bMotion_putloglev 2 * "bMotion: friendship for $nick went over 100, capping back to 90" 
    62     set friendship 90 
    63   } 
     64        if {$friendship > 100} { 
     65                bMotion_putloglev 2 * "friendship: friendship for $nick went over 100, capping back to 90" 
     66                set friendship 90 
     67        } 
    6468 
    65   if {$friendship < 1} { 
    66     bMotion_putloglev 2 * "bMotion: friendship for $nick went under 1, capping back to 10" 
    67     set friendship 10 
    68   } 
     69        if {$friendship < 1} { 
     70                bMotion_putloglev 2 * "friendship: friendship for $nick went under 1, capping back to 10" 
     71                set friendship 10 
     72        } 
    6973 
    70   setuser $handle XTRA friend $friendship 
     74        setuser $handle XTRA friend $friendship 
    7175} 
    7276 
     77# set friendship on a nick, if we can find a matching handle for them 
     78proc setFriendship { nick friendship } { 
     79        bMotion_putloglev 4 * "friendship: setFriendship: nick = $nick, friendship = $friendship" 
    7380 
    74 proc setFriendship { nick friendship } { 
    75   bMotion_putloglev 4 * "setFriendship: nick = $nick, friendship = $friendship" 
     81        set handle [nick2hand $nick] 
    7682 
    77   set handle [nick2hand $nick] 
    78  
    79   if {($handle == "*") || ($handle == "")} { 
    80     #perhaps it was already a handle 
    81     if {![validuser $nick]} { 
    82       bMotion_putloglev 1 * "bMotion: couldn't find a handle for $nick to set friendship." 
    83       return 50 
    84     } 
    85     set handle $nick 
    86   } 
     83        if {($handle == "*") || ($handle == "")} { 
     84                #perhaps it was already a handle 
     85                if {![validuser $nick]} { 
     86                        bMotion_putloglev 1 * "friendship: couldn't find a handle for $nick to set friendship." 
     87                        return 50 
     88                } 
     89                set handle $nick 
     90        } 
    8791 
    8892 
    89   if {$friendship > 100} { 
    90     bMotion_putloglev 2 * "bMotion: friendship for $nick went over 100, capping back to 9" 
    91     set friendship 99 
    92   } 
     93        if {$friendship > 100} { 
     94                bMotion_putloglev 2 * "friendship: friendship for $nick went over 100, capping back to 9" 
     95                set friendship 99 
     96        } 
    9397 
    94   if {$friendship < 0} { 
    95     bMotion_putloglev 2 * "bMotion: friendship for $nick went under 0, capping back to 1" 
    96     set friendship 1 
    97   } 
     98        if {$friendship < 0} { 
     99                bMotion_putloglev 2 * "friendship: friendship for $nick went under 0, capping back to 1" 
     100                set friendship 1 
     101        } 
    98102 
    99103 
    100  catch { 
    101     setuser $handle XTRA friend $friendship 
    102   } 
     104        catch { 
     105                setuser $handle XTRA friend $friendship 
     106        } 
    103107} 
    104108 
     109# drift someone's friendship by a given amount 
    105110proc driftFriendship { nick drift } { 
    106   bMotion_putloglev 4 * "driftFriendship: nick = $nick, drift = $drift" 
    107   set handle [nick2hand $nick] 
    108   if {($handle == "*") || ($handle == "")} { 
    109     bMotion_putloglev 1 * "bMotion: couldn't find a handle for $nick to drift friendship." 
    110     return 50 
    111   } 
     111        bMotion_putloglev 4 * "friendship: driftFriendship: nick = $nick, drift = $drift" 
     112        set handle [nick2hand $nick] 
     113        if {($handle == "*") || ($handle == "")} { 
     114                bMotion_putloglev 1 * "friendship: couldn't find a handle for $nick to drift friendship." 
     115                return 50 
     116        } 
    112117 
    113   set friendship [getFriendship $handle] 
    114   incr friendship $drift 
    115   setFriendship $nick $friendship 
    116   bMotion_putloglev 2 * "bMotion: drifting friendship for $nick by $drift, now $friendship" 
    117   return $friendship 
     118        set friendship [getFriendship $handle] 
     119        incr friendship $drift 
     120        setFriendship $nick $friendship 
     121        bMotion_putloglev 2 * "friendship: drifting friendship for $nick by $drift, now $friendship" 
     122        return $friendship 
    118123} 
    119124 
     125# get all users with friendship values 
    120126proc getFriendsList { } { 
    121   set users [userlist] 
    122   set r "" 
    123   set best(name) "" 
    124   set best(val) 0 
    125   set worst(name) "" 
    126   set worst(val) 100 
    127   foreach user $users { 
    128     set f [getuser $user XTRA friend] 
    129     if {$f != ""} { 
    130       append r "$user:$f " 
    131     } 
    132     if {$f > $best(val)} { 
    133       set best(val) $f 
    134       set best(name) $user 
    135     } 
    136     if {($f < $worst(val)) && ($f > 0)} { 
    137       set worst(val) $f 
    138       set worst(name) $user 
    139     } 
    140   } 
    141   set r "Best friend: $best(name), worst friend: $worst(name). $r" 
    142   return $r 
     127        set users [userlist] 
     128        set r "" 
     129        set best(name) "" 
     130        set best(val) 0 
     131        set worst(name) "" 
     132        set worst(val) 100 
     133        foreach user $users { 
     134                set f [getuser $user XTRA friend] 
     135                if {$f != ""} { 
     136                        append r "$user:$f " 
     137                } 
     138                if {$f > $best(val)} { 
     139                        set best(val) $f 
     140                        set best(name) $user 
     141                } 
     142                if {($f < $worst(val)) && ($f > 0)} { 
     143                        set worst(val) $f 
     144                        set worst(name) $user 
     145                } 
     146        } 
     147        set r "Best friend: $best(name), worst friend: $worst(name). $r" 
     148        return $r 
    143149} 
    144150 
     151# check if someone is liked enough to be a friend 
    145152proc bMotionIsFriend { nick } { 
    146   set friendship [getFriendship $nick] 
    147   bMotion_putloglev 2 * "bMotion: friendship for $nick is $friendship" 
    148   if {$friendship < 35} { 
    149     return 0 
    150   } 
    151   return 1 
    152 }     
     153        set friendship [getFriendship $nick] 
     154        bMotion_putloglev 2 * "friendship: friendship for $nick is $friendship" 
     155        if {$friendship < 35} { 
     156                return 0 
     157        } 
     158        return 1 
     159}                 
    153160 
     161# tick everyone's friendship back a bit 
    154162proc bMotion_friendship_tick { min hr a b c } { 
    155   bMotion_putloglev 3 * "bMotion_friendship_tick" 
     163        bMotion_putloglev 3 * "friendship: bMotion_friendship_tick" 
    156164 
    157   bMotion_putloglev d * "friendship tick" 
     165        bMotion_putloglev d * "friendship tick" 
    158166 
    159   set users [userlist] 
    160   foreach user $users { 
    161     set f [getuser $user XTRA friend] 
    162     if {$f != ""} { 
    163       bMotion_putloglev 4 * "$user is $f" 
    164       if {$f > 60} { 
    165         setuser $user XTRA friend [expr $f - 1] 
    166       } 
     167        set users [userlist] 
     168        foreach user $users { 
     169                set f [getuser $user XTRA friend] 
     170                if {$f != ""} { 
     171                        bMotion_putloglev 4 * "friendship: $user is $f" 
     172                        if {$f > 60} { 
     173                                setuser $user XTRA friend [expr $f - 1] 
     174                        } 
    167175 
    168       if {$f < 40} { 
    169         setuser $user XTRA friend [expr $f + 1] 
    170       } 
    171     } 
    172   } 
     176                        if {$f < 40} { 
     177                                setuser $user XTRA friend [expr $f + 1] 
     178                        } 
     179                } 
     180        } 
    173181} 
    174182 
    175183bind time - "00 * * * *" bMotion_friendship_tick 
    176184 
    177 bMotion_putloglev d * "bMotion: friendship module loaded" 
     185bMotion_putloglev d * "friendship: friendship module loaded"