Changeset 594Tweet

Timestamp:

May 8, 2011, 12:13:08 PM (12 years ago)

Author:

Sam Hocevar

Message:

data: merge abuse.lsp from all Abuse versions.

Location:

abuse/trunk

Files:

• data-frabs/abuse.lsp (deleted)
• data-mac/abuse.lsp (deleted)
• data/abuse.lsp (modified) (4 diffs)
• data/addon/twist/lisp/dray.lsp (modified) (1 diff)
• data/addon/twist/lisp/input.lsp (deleted)
• data/addon/twist/twist.lsp (modified) (1 diff)
• data/lisp/input.lsp (modified) (2 diffs)

abuse/trunk/data/abuse.lsp

@@ -9 +9 @@
 (if (not (load "lisp/english.lsp"))             ;; load language specific stuff
     (progn
-      (print "Please make sure you unzipped the game with the -d option")
-      (print "so that all directories get created properly.")
-      (print "example : pkunzip -d abusXXXX.zip")
+      (print "Abuse data files not found. Maybe try the -datadir flag?")
       (quit)))
 (setq load_warn T)
-
 
 (load "lisp/common.lsp")
@@ -20 +17 @@
 (load "lisp/options.lsp")
 (load "lisp/startup.lsp")
-(if (not (local_load "lisp/input.lsp"))   ; get local copy first
-    (load "lisp/input.lsp"))
+(load "lisp/input.lsp")
 
 (load "lisp/sfx.lsp")
@@ -42 +38 @@
 (load "lisp/switch.lsp")
 
-(setq bad_guy_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT))
+;; From the fRaBs addons. This is required in case we load a save file
+;; from a fRaBs install, it will miss graphic tiles.
+(load "addon/twist/f2chars.lsp")
+(load "addon/twist/f2ai.lsp")
+(load "addon/aliens/astartup.lsp")
+(load "addon/claudio/claudio.lsp")
+(load "addon/twist/lisp/dray.lsp")
+(load "addon/twist/lisp/mario.lsp")
+(load "addon/leon/4frabs.lsp")
+(load "addon/newart/newart.lsp")
+
+(setq bad_guy_list
+  (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
+        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
+        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
+        ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
+(setq object_destroyable_list
+  (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
+        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
+        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
+        ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
 
 (gc)              ;; garbage collection perm space
@@ -48 +64 @@
 
 (create_players DARNEL)
+

abuse/trunk/data/addon/twist/lisp/dray.lsp

@@ -4 +4 @@
 
 ;; Note for /Messiah\
-;; in the main abuse.lsp, change
-;;
-;; (if (not (local_load "lisp/input.lsp"))   ; get local copy first
-;;    (load "lisp/input.lsp"))
-;; to: (if (not (local_load "addon/twist/lisp/input.lsp"))
-;;    (load "addon/twist/lisp/input.lsp"))
-;;
-;; also, append this to the final set of lines relating to the loading part:
+;; append this to the final set of lines relating to the loading part:
 ;; (load "addon/twist/lisp/dray.lsp")
 

abuse/trunk/data/addon/twist/twist.lsp

@@ -20 +20 @@
 (load "addon/twist/lisp/options.lsp")
 (load "addon/twist/lisp/startup.lsp")
-(if (not (local_load "addon/twist/lisp/input.lsp"))   ; get local copy first
-    (load "addon/twist/lisp/input.lsp"))
+(load "lisp/input.lsp")
 
 (load "lisp/sfx.lsp")

abuse/trunk/data/lisp/input.lsp

@@ -43 +43 @@
 (setq weapon-right-key  (get_key_code "insert"))
 
+(setq key-shiftr        (get_key_code "right_shift"))
+(setq key-end           (get_key_code "end"))
+
+(setq key-a  (get_key_code "a"))
+(setq key-b  (get_key_code "b"))
+(setq key-c  (get_key_code "c"))
+(setq key-d  (get_key_code "d"))
+(setq key-e  (get_key_code "e"))
+(setq key-f  (get_key_code "f"))
+(setq key-g  (get_key_code "g"))
+(setq key-h  (get_key_code "h"))
+(setq key-i  (get_key_code "i"))
+(setq key-j  (get_key_code "j"))
+(setq key-k  (get_key_code "k"))
+(setq key-l  (get_key_code "l"))
+(setq key-m  (get_key_code "m"))
+(setq key-n  (get_key_code "n"))
+(setq key-o  (get_key_code "o"))
+(setq key-p  (get_key_code "p"))
+(setq key-q  (get_key_code "q"))
+(setq key-r  (get_key_code "r"))
+(setq key-s  (get_key_code "s"))
+(setq key-t  (get_key_code "t"))
+(setq key-u  (get_key_code "u"))
+(setq key-v  (get_key_code "v"))
+(setq key-w  (get_key_code "w"))
+(setq key-x  (get_key_code "x"))
+(setq key-y  (get_key_code "y"))
+(setq key-z  (get_key_code "z"))
+
+(setq dray_has_fired 1)
+(setq godmode 0)
+(setq enemytarget 0)
+(setq noclip 0)
 
 (defun get_local_input ()
+  ;; fRaBs Twist extension input logic
+  (if (eq godmode 1)
+      (progn
+        (with_object (bg) (set_hp 100))
+        (if (or (eq (with_object (bg) (state)) flinch_up)
+                (eq (with_object (bg) (state)) flinch_down))
+            (with_object (bg) (set_state stopped)))))
+  (if (eq noclip 1)
+      (progn
+        (with_object (bg) (set_gravity 0))
+        (if (local_key_pressed up-key)
+            (with_object (bg) (set_y (- (y) run_top_speed))))
+        (if (local_key_pressed down-key)
+            (with_object (bg) (set_y (+ (y) run_top_speed))))
+        (if (local_key_pressed left-key)
+            (with_object (bg) (set_x (- (x) run_top_speed))))
+        (if (local_key_pressed right-key)
+            (with_object (bg) (set_x (+ (x) run_top_speed))))
+        (with_object (bg) (set_gravity 0))))
+  (if (and (eq (mod (game_tick) 15) 0)
+           (eq dray_has_fired 1))
+      (setq dray_has_fired 0))
+  (if (local_key_pressed key-shiftr)
+      (save_game (concatenate 'string "save"
+                              (digstr (get_save_slot) 4) ".spe")))
+  (if (and (eq (third (mouse_stat)) 1)
+           (with_object (bg) (eq (current_weapon_type) 7)))
+      (if (and (eq dray_has_fired 0)
+               (<= (ammo_total 7) 1)
+               (not (or (<= (with_object (bg) (hp)) 0)
+                        (eq (with_object (bg) (state)) dieing)
+                        (eq (with_object (bg) (state)) dead)
+                        (eq (with_object (bg) (state)) flinch_up)
+                        (eq (with_object (bg) (state)) flinch_down)
+                        (eq (with_object (bg) (state)) climbing)
+                        (eq (with_object (bg) (state)) climb_off)
+                        (eq (with_object (bg) (state)) climb_on))))
+          (progn
+            (setq dray_has_fired 1)
+            (play_sound DEATH_RAY_SND 127 (x) (y))
+            (with_object (bg) (add_object DEATH_RAY (x) (- (y)
+                                          (/ (picture_height) 2))))
+            (with_object (bg) (add_ammo 7 -1)))))
+  ;; Original Abuse logic
   (let ((mstat (mouse_stat)))
-    (list (if (local_key_pressed left-key)
-              -1
+    (list (if (local_key_pressed left-key) -1
               (if (local_key_pressed right-key) 1 0))  ;; xv
-          (if (local_key_pressed up-key)
-              -1
+          (if (local_key_pressed up-key) -1
               (if (local_key_pressed down-key) 1 0))  ;; yv
           (eq (fourth mstat) 1) ;; special button
@@ -57 +133 @@
           (if (or (eq (fifth mstat) 1)
                   (local_key_pressed weapon-left-key)) -1 ;; weapon toggle
-              (if (local_key_pressed weapon-right-key)  1 0))
+              (if (local_key_pressed weapon-right-key) 1 0))
           (first mstat) ;; mx
           (second mstat) ;; my