Changeset 589


Ignore:
Timestamp:
May 7, 2011, 4:06:03 PM (7 years ago)
Author:
Sam Hocevar
Message:

data: remove exact duplicate Lisp files, merge all main space Lisp files,
and move most frabs addons to the main data directory.

Location:
abuse/trunk
Files:
13 added
63 deleted
17 edited
180 moved

Legend:

Unmodified
Added
Removed
  • abuse/trunk/data/addon/aliens/powerold.lsp

    r588 r589  
    1111        (progn
    1212           (with_object (bg) (make_view_solid (find_rgb 255 255 255)))
    13            (with_object (bg) (setq special_power SHLAMP))
     13           (with_object (bg) (setq special_power SHLAMP_POWER))
    1414           (with_object (add_object_after SHLMP2 (x) (y)) (link_object (bg)))
    1515           (with_object (add_object_after WTW (x) (y)) (link_object (bg)))
     
    3232        (set_light_y (get_light 0) (y)))
    3333    nil)
    34   (if (not (eq (with_object (get_object 0) special_power) SHLAMP))
     34  (if (not (eq (with_object (get_object 0) special_power) SHLAMP_POWER))
    3535        (progn
    3636        (if (eq (total_lights) 1)
     
    6565      'SNEAKY_POWER
    6666      'HEALTH_POWER
    67         'SHLAMP)
     67      'SHLAMP_POWER)
    6868
    6969(defun give_player_health (amount)
     
    154154                        (put_image (- (view_x2) 20) (+ (view_y1) 5) sneaky_image))
    155155                                 (sneaky_draw used_special_power (player_number)))
    156                    (SHLAMP (player_draw (player_number))
     156                   (SHLAMP_POWER (player_draw (player_number))
    157157                                 (if (local_player)
    158158                                     (put_image (- (view_x2) 20) (+ (view_y1) 5) shlamp_image)))
  • abuse/trunk/data/addon/aliens/powerups.lsp

    r588 r589  
    1111        (progn
    1212           (with_object (bg) (make_view_solid (find_rgb 255 255 255)))
    13            (with_object (bg) (setq special_power SHLAMP))
     13           (with_object (bg) (setq special_power SHLAMP_POWER))
    1414           (with_object (add_object_after SHLMP2 (x) (y)) (link_object (bg)))
    1515           (with_object (add_object_after WTW (x) (y)) (link_object (bg)))
     
    3232        (set_light_y (get_light 0) (y)))
    3333    nil)
    34   (if (not (eq (with_object (get_object 0) special_power) SHLAMP))
     34  (if (not (eq (with_object (get_object 0) special_power) SHLAMP_POWER))
    3535        (progn
    3636        (if (eq (total_lights) 1)
  • abuse/trunk/data/lisp/ant.lsp

    r588 r589  
    22;; See licensing information for more details on usage rights
    33
    4 (setq ant_tints (make-array 11 :initial-contents (list
     4(setq ant_tints (make-array 13 :initial-contents (list
    55                                                (def_tint "art/tints/ant/green.spe")
    66                                                (def_tint "art/tints/ant/blue.spe")
     
    1111                                                (def_tint "art/tints/ant/orange.spe")
    1212                                                (def_tint "art/tints/ant/gray.spe")
     13                                                (def_tint "art/tints/guns/green.spe")
     14                                                (def_tint "art/tints/ant/darkblue.spe")
    1315                                                normal_tint
    1416                                                normal_tint
     
    443445
    444446
     447;; XXX: Mac Abuse reimplements this in C++
    445448(defun ant_draw ()
    446449  (if (eq 0 (aitype))
     
    590593   (list ANT_ROOF AD_1 AD_2 AD_3 AD_4 AD_5 AD_6 AD_7 AD_8 AD_9 AD_10 AD_11 AD_12)
    591594   (list (aref ant_tints 0) (aref ant_tints 1) (aref ant_tints 2) (aref ant_tints 3)
    592          (aref ant_tints 4) (aref ant_tints 5) (aref ant_tints 6) (aref ant_tints 7))))
     595         (aref ant_tints 4) (aref ant_tints 5) (aref ant_tints 6) (aref ant_tints 7)
     596         (aref ant_tints 8) (aref ant_tints 9) (aref ant_tints 10))))
    593597
    594598
  • abuse/trunk/data/lisp/common.lsp

    r588 r589  
    66; (defun dev_draw () (if (edit_mode) (draw) nil))       -- compiled C function --
    77
     8;; XXX: Mac Abuse reimplements this in C++
    89(defun middle_draw ()
    910  (let ((y (y)))
     
    1112    (draw)
    1213    (set_y y)))
    13 
    14 
    1514
    1615(defun push_char (xamount yamount)
  • abuse/trunk/data/lisp/duong.lsp

    r588 r589  
    228228
    229229
     230;; XXX: Mac Abuse reimplements this in C++
    230231(defun tp2_ai ()
    231232  (if (> (total_objects) 0)
  • abuse/trunk/data/lisp/english.lsp

    r588 r589  
    77(select section
    88        ('game_section
     9
     10         ;; XXX: Mac Abuse implements these
     11         ;(setq double_pix         "Double Pixel Mode")
     12         ;(setq scanlined_pix      "Scan skip Mode")
     13         ;(setq single_pix         "Single Pixel Mode")
     14         ;(setq smooth_pix         "Smoothed Pixel Mode")
     15         ;(setq round_pix          "Rounded Pixel Mode")
    916
    1017         /********** New for Version E (1.51)   **************/
     
    214221         (setq loading "loading %s")  ; V-A added
    215222
    216          (setq gamma_msg "Click on the darkest grey visible \n on your monitor then click OK")
     223         (setq gamma_msg "Select the darkest grey visible on your\nmonitor then click the check mark")
    217224         (setq telep_msg "Press down to teleport")
    218225
     
    223230                   ; Please keep all strings below shorter than the above line.               ; V-A
    224231                   (0 "Aim gun with mouse, fire with left mouse button")
     232                   ;(0 "Aim gun with mouse, fire with left mouse button") XXX: Mac Abuse
    225233                   (1 "Collect ammo to increase firing speed")
    226                    (2 "Press the down arrow to activate objects. This is a switch.")
     234                   (2 "Press the down key to activate objects. This is a switch.")
    227235                   (3 "This console saves the state of the game, press down")
    228236                   (4 "Press down to activate platform")
    229237                   (5 "Hold down the right mouse button to use special powers")
    230238                   (6 "Use the CTRL & INS keys to select weapons")
    231                    (7 "Press the up arrow to climb ladders")
    232                    (8 "Press the down arrow to start!")
     239                   ;(5 "You can now use the special key to use your special powers") XXX: Mac Abuse
     240                   ;(6 "You can now select weapons with the selection keys") XXX: Mac Abuse
     241                   (7 "Press the up key to climb ladders")
     242                   (8 "Press the down key to start!")
     243
    233244                   (9 "Shoot hidden walls to destroy them")
    234245                   (10 "Shoot switch ball to activate")
     
    258269         (setq min_wait        "Waiting for %d more player(s) to join!")
    259270         (setq lev_complete    "Level Completed!")
     271         ;(setq lev_complete    "Level %d Completed!") XXX: Mac Abuse
    260272         (setq no_low_mem      "Not enough low memory")
    261273         (setq no_mem          "Not enough memory")
     
    285297         (setq ic_start        "Start New Game")        ;  |
    286298         (setq ic_sell         "Credits")               ;  |
     299         ;; XXX: Mac Abuse
     300         ;(setq ic_mackeys      "Setup Keys")
     301         ;(setq ic_macconf      "Screen Options")
    287302         (setq ic_networking   "Networking")            ; ----
    288303
    289304
    290305         (setq no_file         "Could not find file '%s'")
    291          (setq SFXv            "SFX")    ; this needs to be <=6 characters!!
     306         (setq SFXv            "Sound")  ; this needs to be <=6 characters!!
    292307         (setq MUSICv          "Music")  ; this needs to be <=6 characters!!
    293308
     
    388403                            "You've survived impossible odds and made it to the Control Room.  "
    389404                            "By pulling the switch, you have diverted the water supply and stopped the spread of Abuse!\\n "
    390                             "CONGRATULATIONS!  YOU'RE HOWLING!!!")))
     405                            "CONGRATULATIONS!  YOU'RE HOWLING!!!"))
     406;; XXX: Mac Abuse uses this
     407;        (setq thanks_text
     408;               (concatenate 'string
     409;                            "Bungie Crew\\n"
     410;                            "- Production Manager "
     411;                            "- Tuncer Deniz\\n"
     412;                            "- Development Manager "
     413;                            "- Eric Klein\\n"
     414;                            "- Packaging "
     415;                            "- Randy Nelsen\\n"
     416;                            "- Damage & Spin\\n"
     417;                            "- Alexander Seropian\\n"
     418;                            "- Jay Barry\\n"
     419;                            "- Alex Rosenberg\\n"
     420;                            "- Doug Zartman\\n"
     421;                            "- Jonas Enroth\\n"
     422;                            "Special Thanks to:\\n"
     423;                            "- Gnu Foundation\\n"
     424;                            "- Steven Donaldson\\n"
     425;                            "- Carly Staehlin for voices\\n"
     426;                            "Apple Game Evangelists/Engineers\\n"
     427;                            "- James Osborne for networking\\n"
     428;                            "- Mark Gavini\\n"
     429;                            "- Steve Bollinger\\n"
     430;                            "- Chris DeSalvo\\n"
     431;                            "- Michael Evans\\n"
     432;                            "- Cary Farrier\\n"
     433;                            "- and others...\\n"
     434;                            "Beta Testers\\n"
     435;                            "Chris Yeh, "
     436;                            "Matt Lee, "
     437;                            "Kaoru Ueda, "
     438;                            "Cameron Logie, "
     439;                            "Zachary Zeliff, "
     440;                            "Francis W. Sweigart, "
     441;                            "Dan Merchant, "
     442;                            "Tim Seufert, "
     443;                            "Donald Lawton, "
     444;                            "Ryan Mack, "
     445;                            "Kenneth R Brownfield, "
     446;                            "Caleb Corey, "
     447;                            "Michael Saji, "
     448;                            "Jesse Shrieve, "
     449;                            "Jedd Horvath, "
     450;                            "Mark Woodward, "
     451;                            "Michael Hale, "
     452;                            "Wesley Arnett, "
     453;                            "Brian Carter, "
     454;                            "Will Starck, "
     455;                            "Krzysztof Murawski, "
     456;                            "John Whitney, "
     457;                            "Ian Harford, "
     458;                            "Robert Steel, "
     459;                            "Joseph T. Hegeman, "
     460;                            "Dave Harkness, "
     461;                            "Marc Jordan, "
     462;                            "Kenyon Kopp, "
     463;                            "Peter Worley, "
     464;                            "Peter Johnson, "
     465;                            "Michael Roca Jr., "
     466;                            "Preston Leingang Jr., "
     467;                            "Jonathan Biebesheimer, "
     468;                            "Chad G Poland, "
     469;                            "James R Graham, "
     470;                            "Karl L Jayne, "
     471;                            "Patrick Hearon, "
     472;                            "Joe Trussell, "
     473;                            "Matthew Fleming, "
     474;                            "Dave Lovell, "
     475;                            "Ben Eloy, "
     476;                            "Anthony Yvanovich, "
     477;                            "Andre Snyder, "
     478;                            "David Tessler, "
     479;                            "Brian Johansen, "
     480;                            "Scott Mullen, "
     481;                            "Jason Budravage, "
     482;                            "and Jonah Kowall\\n"
     483;                            "\\nIcepops!\n"))
     484        )
    391485)
  • abuse/trunk/data/lisp/explo.lsp

    r588 r589  
    5757          (stopped           "lhold")))
    5858
    59 
     59;; XXX: Mac Abuse reimplements this in C++
    6060(defun exp_ai ()
    6161  (if (eq (aitype) 0) (next_picture)
     
    6363           T)))
    6464
    65 
     65;; XXX: Mac Abuse reimplements this in C++
    6666(defun exp_draw ()
    6767  (if (eq (aitype) 0)
  • abuse/trunk/data/lisp/flyer.lsp

    r588 r589  
    2626          (add_object EXPLODE1 (- (x) (random 10)) (+ (- (y) (random 10)) -20)     2)
    2727          (add_object EXPLODE1 (x) (+ (- (y) (random 20)) -20)                     4)
     28          (with_object (bg) (set_kills (+ (kills) 1)))
    2829          nil)
    2930      (progn
  • abuse/trunk/data/lisp/general.lsp

    r588 r589  
    6767  (if (eq (aistate) 0)
    6868      (if (activated)
    69           (progn
     69          (let ((my_type (aitype)))
    7070            (with_object (bg)
    71                          (progn
    72                            (if (local_player)
    73                                (show_help (get_train_msg (aitype))))
    74                            (freeze_player 100)))
     71                         (if (local_player)
     72                             (progn
     73                               ;; XXX: Mac Abuse plays voice hint SFXs
     74                               ;(play_sound (aref voice_hints my_type))
     75                               ;(expire_cache_item (aref voice_hints my_type))
     76                               (show_help (get_train_msg my_type)))))
    7577            (set_aistate 1)
    7678            T)
  • abuse/trunk/data/lisp/guns.lsp

    r588 r589  
    306306          ))
    307307
     308;; XXX: Mac Abuse reimplements this in C++
    308309(defun gun_draw ()
    309310  (draw_tint (aref gun_tints (aitype))))
  • abuse/trunk/data/lisp/input.lsp

    r588 r589  
    4646(defun get_local_input ()
    4747  (let ((mstat (mouse_stat)))
    48     (list (if (local_key_pressed left-key) -1 (if (local_key_pressed right-key) 1 0))  ;; xv
    49           (if (local_key_pressed up-key) -1   (if (local_key_pressed down-key)  1 0))  ;; yv
    50           (eq (fourth mstat) 1)                                            ;; special button
    51           (eq (third mstat) 1)                                             ;; fire button
     48    (list (if (local_key_pressed left-key)
     49              -1
     50              (if (local_key_pressed right-key) 1 0))  ;; xv
     51          (if (local_key_pressed up-key)
     52              -1
     53              (if (local_key_pressed down-key) 1 0))  ;; yv
     54          (eq (fourth mstat) 1) ;; special button
     55          (eq (third mstat) 1) ;; fire button
    5256
    5357          (if (or (eq (fifth mstat) 1)
    54                   (local_key_pressed weapon-left-key)) -1                             ;; weapon toggle
     58                  (local_key_pressed weapon-left-key)) -1 ;; weapon toggle
    5559              (if (local_key_pressed weapon-right-key)  1 0))
    56           (first mstat)                                                    ;; mx
    57           (second mstat)                                                   ;; my
     60          (first mstat) ;; mx
     61          (second mstat) ;; my
    5862          )))
    5963
     64;; XXX: Mac Abuse uses these hardcoded values
     65;(setq up_key 256)
     66;(setq left_key 258)
     67;(setq right_key 259)
     68;(setq down_key 257)
     69;(setq special_key 32)
     70;(setq weapon_left_key 49)
     71;(setq weapon_right_key 50)
    6072
    61 
    62 
    63 
    64 
    65 
    66 
  • abuse/trunk/data/lisp/jugger.lsp

    r588 r589  
    55  (if (<= (hp) 0)
    66      (if (eq (state) dieing)
    7           (next_picture)
     7          (if (not (next_picture))
     8              (progn
     9                (with_object (bg) (set_kills (+ (kills) 1)))
     10                nil)
     11              T)
    812        (set_state dieing))
    913    (if (activated)
  • abuse/trunk/data/lisp/ladder.lsp

    r588 r589  
    22;; See licensing information for more details on usage rights
    33
     4;; XXX: Mac Abuse reimplements this in C++
    45(defun latter_check_area (first)
    56  (if first
     
    1617        (latter_check_area (next_focus first)))))
    1718
     19;; XXX: Mac Abuse reimplements this in C++
    1820(defun latter_ai ()
    1921  (if (> (total_objects) 0)
     
    4143          (running "step_gone")))
    4244
    43 
  • abuse/trunk/data/lisp/people.lsp

    r588 r589  
    4747(setf sneaky_image (def_image "art/misc.spe" "sneaky_image"))
    4848(setf health_image (def_image "art/misc.spe" "b_check_image"))
    49 
     49(setf shlamp_image (def_image "addon/aliens/aliens.spe" "slmp_img"))
    5050
    5151
     
    9494      'FLY_POWER
    9595      'SNEAKY_POWER
    96       'HEALTH_POWER)
     96      'HEALTH_POWER
     97      'SHLAMP_POWER)
    9798
    9899; this is called by the engine when a level is loaded with no player_info in it
     
    488489                        (put_image (- (view_x2) 20) (+ (view_y1) 5) sneaky_image))
    489490                                 (sneaky_draw used_special_power (player_number)))
     491                   (SHLAMP_POWER (player_draw (bottom_draw (player_number)))
     492                    (if (local_player)
     493                        (put_image (- (view_x2) 20) (+ (view_y1) 5) shlamp_image)))
    490494          ))))*/
     495
     496(defun frabs_bottom_draw()
     497  (if (eq special_power SHLAMP_POWER)
     498      (progn
     499        (setq special_power NO_POWER)
     500        (bottom_draw)
     501        (setq special_power SHLAMP_POWER))
     502      (bottom_draw)))
    491503
    492504(defun restart_player ()
     
    585597  (funs (move_fun           cop_mover)
    586598        (damage_fun         bottom_damage)
    587         (draw_fun           bottom_draw)
     599        (draw_fun           frabs_bottom_draw)
    588600        (map_draw_fun       compass_draw)
    589601        (get_cache_list_fun cop_cache)
  • abuse/trunk/data/lisp/sfx.lsp

    r588 r589  
    204204                               SCARE_SND                            ;; 16
    205205                               )))
     206
     207;; XXX: Mac Abuse uses voice hint SFXs
     208;(setq voice_hints
     209;  (make-array 12 :initial-contents
     210;    (list
     211;      (def_sound "sfx/voice/aimsave.wav")
     212;      (def_sound "sfx/voice/ammosave.wav")
     213;      (def_sound "sfx/voice/switch_1.wav")
     214;      (def_sound "sfx/voice/savesave.wav")
     215;      (def_sound "sfx/voice/platfo_1.wav")
     216;      (def_sound "sfx/voice/poweru_1.wav")
     217;      (def_sound "sfx/voice/weapon_1.wav")
     218;      (def_sound "sfx/voice/ladder_1.wav")
     219;      (def_sound "sfx/voice/starts_1.wav")
     220;      (def_sound "sfx/voice/wallss_1.wav")
     221;      (def_sound "sfx/voice/switch_2.wav")
     222;      (def_sound "sfx/voice/telepo_1.wav"))))
     223
    206224
    207225(defun amb_sound_ct ()
  • abuse/trunk/data/lisp/startup.lsp

    r588 r589  
    5353
    5454(setf title_screen      '("art/title.spe" . "title_screen"))
     55;; XXX: Frabs uses a random title screen
     56;(select (random 6)
     57;  (0 (setf title_screen '("art/title.spe" . "frabs_screen1")))
     58;  (1 (setf title_screen '("art/title.spe" . "frabs_screen2")))
     59;  (2 (setf title_screen '("art/title.spe" . "frabs_screen3")))
     60;  (3 (setf title_screen '("art/title.spe" . "frabs_screen4")))
     61;  (4 (setf title_screen '("art/title.spe" . "frabs_screen5")))
     62;  (5 (setf title_screen '("art/title.spe" . "frabs_screen6"))))
    5563(setf logo              '("art/title.spe" . "cdc_logo"))
    5664
  • abuse/trunk/data/lisp/teleport.lsp

    r588 r589  
    6868  (states "art/door.spe" (stopped (seq "door" 1 5))))
    6969
     70;; Teleporting door AI
     71(defun tpdi_ai ()
     72  (let ((player (bg)))
     73       (if (has_object player)
     74           (if (not (with_object player (pressing_action_key)))
     75               (remove_object player))
     76           (if (and (< (distx) 15)
     77                    (< (disty) 20)
     78                    (with_object player (pressing_action_key))
     79                    (> (total_objects) 0))
     80               (let ((otherx (with_object (get_object 0) (x)))
     81                     (othery (with_object (get_object 0) (y))))
     82                    (with_object (get_object 0) (link_object player))
     83                    (with_object player
     84                      (progn (set_x otherx) (set_y othery)))))))
     85  T)
    7086
     87(def_char TP_DOOR_INVIS
     88  (range 0 0)
     89  (funs (ai_fun tpdi_ai)
     90        (draw_fun dev_draw))
     91  (fields ("xvel" tp_amb))
     92  (states "art/misc.spe" (stopped "clone_icon")))
     93
  • abuse/trunk/data/lisp/userfuns.lsp

    r588 r589  
    1616  (code-char (+ x (char-code "0"))))
    1717
    18 ;; this creates a list of dpaint numbered antimation from a base name
    19 ;; i.e. (seq "hi" 2 5)  -> '("hi0002.pcx" "hi0003.pcx" "hi0004.pcx" "hi0005.pcx")
     18;; this creates a list of dpaint numbered antimation from a base name, ie:
     19;;   (seq "hi" 2 5)  -> '("hi0002.pcx" "hi0003.pcx" "hi0004.pcx" "hi0005.pcx")
    2020;; will take into acount reverse sequences
     21;; XXX: Mac Abuse inlined calls to this function
    2122(defun seq (name first last)
    2223  (if (<= first last)
    2324      (forward-seq name first last)
    24     (reverse-seq name first last))
    25 )
     25    (reverse-seq name first last)))
     26
    2627(defun forward-seq (name first last)
    2728  (if (> first last)
  • abuse/trunk/data/lisp/weapons.lsp

    r588 r589  
    171171
    172172
     173;; XXX: Mac Abuse reimplements this in C++
    173174(defun weapon_icon_ai ()
    174175  (if (eq0 (aistate))
     
    236237      T)))
    237238
     239;; XXX: Mac Abuse reimplements this in C++
    238240(defun on_draw ()
    239241  (if (activated)
     
    241243    (dev_draw)))
    242244
    243 
     245;; XXX: Mac Abuse reimplements this in C++
    244246(defun ammo_cache (type)    ;; tells what other chars to load in with this character
    245247  (list
Note: See TracChangeset for help on using the changeset viewer.