Changeset 892 for trunk

Timestamp:

02/20/08 12:58:35 (11 months ago)

Author:

james

Message:

hands/friendship stuff

Location:

trunk

Files:

• modules/output.tcl (modified) (3 diffs)
• plugins/en/action_complex_hands.tcl (modified) (3 diffs)
• plugins/en/action_complex_smacks.tcl (modified) (1 diff)

trunk/modules/output.tcl

@@ -746 +746 @@
                 }
 
-
                 #get their handle
                 set handle [nick2hand $user $channel]
@@ -830 +829 @@
                         }
                         "friend" {
-                                if {[getFriendshipHandle $user] >= 50} {
+                                if {[getFriendshipHandle $handle] >= 50} {
                                         bMotion_putloglev 4 * "ruser:  accept: friend"
                                         lappend acceptable $handle
@@ -837 +836 @@
                         }
                         "enemy" {
-                                if {[getFriendshipHandle $user] < 50} {
+                                if {[getFriendshipHandle $handle] < 50} {
                                         bMotion_putloglev 4 * "ruser:  accept: enemy"
                                         lappend acceptable $handle

trunk/plugins/en/action_complex_hands.tcl

@@ -73 +73 @@
 
                 #catch everything else
+
+                #check to see if it's a nick
+                # we won't check handles as people will probably just tab-complete nicks
+                if [onchan $item $channel] {
+                        if [bMotionIsFriend $item] {
+                                if [bMotionLike $item] {
+                                        # we REALLY like them
+                                        bMotionDoAction $channel $nick "%VAR{hand_sex_person}"
+                                        driftFriendship $nick 5
+                                        return 1
+                                }
+                                bMotionDoAction $channel $nick "%VAR{hand_like_person}"
+                                driftFriendship $nick 3
+                                return 1
+                        } else {
+                                bMotionDoAction $channel $nick "%VAR{hand_dislike_person}"
+                                driftFriendship $nick -3
+                                return 1
+                        }
+                }
+
+                # not a nick, let's carry on with the generic stuff
                 bMotion_abstract_add "sillyThings" $item
 
@@ -257 +279 @@
 
 bMotion_abstract_register "hand_like" {
-  "mmm %%"
+  "%REPEAT{3:10:m} %%"
   "/plays with %hisher %%"
   "%VAR{smiles}%|/shares with %2"
   "%VAR{smiles}%|/shares with %ruser{friend}"
   "i like these"
+        "ooh! %VAR{smiles}"
+        "my favourite!"
+        "%2++"
+        "%VAR{thanks}"
+        "just what i've always wanted %VAR{smiles}"
 }
 
@@ -269 +296 @@
   "/throws it at %ruser{enemy}"
   "/jams it up %hisher arse%|that's what i think of that."
-}
-
+        "/jams it up %2%|do not want"
+        "do not want"
+        "/wipes %hisher %VAR{bodypart} with it"
+        "erk not %%"
+        "thanks very much%|except I hate these"
+        "do i want this?"
+}
+
+bMotion_abstract_register "hand_sex_person" {
+        "oof"
+        "%REPEAT{3:8:m}"
+        "%VAR{hand_like_person}"
+}
+
+bMotion_abstract_register "hand_like_person" {
+        "%VAR{smiles}"
+        "i like %%%|they are my friend %VAR{smiles}"
+}
+
+bMotion_abstract_register "hand_dislike_person" {
+        "ugh"
+        "meh"
+        "do not want"
+        "do not like"
+        "i don't like %%"
+        "get it off me %VAR{unsmiles}"
+        "%VAR{unsmiles}"
+        "%% is not my friend %VAR{unsmiles}"
+        "but %% is nasty to me %VAR{unsmiles}"
+}

trunk/plugins/en/action_complex_smacks.tcl

@@ -24 +24 @@
     bMotionGetSad
     bMotionGetUnLonely
-    driftFriendship $nick -2
+    driftFriendship $nick -5
     bMotionDoAction $channel $nick "%VAR{slapped}"
     return 1