Consolidate scan_time and pillage into one argument

py/Arguments.py

@@ -17,12 +17,6 @@ class Arguments(object):
 
         # Global variables
         glob = parser.add_argument_group('SETTINGS')
-        glob.add_argument('-s',
-            action='store',
-            dest='scan_time',
-            metavar='[scantime]',
-            type=int,
-            help=Color.s('Seconds to scan before attacking (default: {G}ask{W})'))
         glob.add_argument('-i',
             action='store',
             dest='interface',
@@ -79,9 +73,13 @@ class Arguments(object):
             help=Color.s('Number of deauth packets to send (default: {G}%d{W})' % Configuration.num_deauths))
         glob.add_argument('-p',
             action='store',
-            dest='pillage',
-            type=bool,
-            help=Color.s('Pillage "All" mode to attack everything (default: {G}ask{W})'))
+            dest='scan_time',
+            nargs='?',
+            const=10,
+            metavar='scantime',
+            type=int,
+            help=Color.s('{G}Pillage{W}: Attack all targets after {C}scantime{W} seconds'))
+        glob.add_argument('--pillage', help=argparse.SUPPRESS, action='store', dest='scan_time', nargs='?', const=10, type=int)
 
         # WEP
         wep = parser.add_argument_group('WEP-RELATED')