Changeset 590
- Timestamp:
- May 7, 2011, 5:12:10 PM (12 years ago)
- Location:
- abuse/trunk
- Files:
-
- 10 deleted
- 17 edited
- 8 moved
-
TODO (modified) (1 diff)
-
data-frabs/addon/deathmat/dstartup.lsp (deleted)
-
data-frabs/docs/pages/editor2.html (modified) (2 diffs)
-
data-mac/addon/deathmat/dstartup.lsp (deleted)
-
data/addon/deathmat/dstartup.lsp (modified) (2 diffs)
-
data/addon/newart/tiledoc.txt (modified) (2 diffs)
-
data/addon/twist/lisp/startup.lsp (modified) (2 diffs)
-
data/addon/twist/lisp/title.lsp (modified) (1 diff)
-
data/art/back/alienb.spe (moved) (moved from abuse/trunk/data/register/alienb.spe)
-
data/art/back/galien.spe (moved) (moved from abuse/trunk/data/register/galien.spe)
-
data/art/back/green2.spe (moved) (moved from abuse/trunk/data/register/green2.spe)
-
data/art/boss.spe (moved) (moved from abuse/trunk/data/register/boss.spe)
-
data/art/fore/alien.spe (moved) (moved from abuse/trunk/data/register/alien.spe)
-
data/art/fore/endgame.spe (moved) (moved from abuse/trunk/data/art/endgame.spe)
-
data/art/fore/trees.spe (moved) (moved from abuse/trunk/data/register/trees.spe)
-
data/art/fore/trees2.spe (moved) (moved from abuse/trunk/data/register/trees2.spe)
-
data/lisp/ant.lsp (modified) (1 diff)
-
data/lisp/english.lsp (modified) (1 diff)
-
data/lisp/flyer.lsp (modified) (1 diff)
-
data/lisp/french.lsp (modified) (1 diff)
-
data/lisp/german.lsp (modified) (1 diff)
-
data/lisp/people.lsp (modified) (1 diff)
-
data/lisp/powerup.lsp (modified) (4 diffs)
-
data/lisp/startup.lsp (modified) (2 diffs)
-
data/lisp/weapons.lsp (modified) (1 diff)
-
data/register/ant.lsp (deleted)
-
data/register/english.lsp (deleted)
-
data/register/flyer.lsp (deleted)
-
data/register/micron.vcd (deleted)
-
data/register/people.lsp (deleted)
-
data/register/powerup.lsp (deleted)
-
data/register/tiles.lsp (deleted)
-
data/register/weapons.lsp (deleted)
-
src/endgame.cpp (modified) (3 diffs)
-
src/menu.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
abuse/trunk/TODO
r584 r590 32 32 - server check in src/net/netdrv.cp 33 33 - server check in src/innet.cpp 34 - Lisp symbol server_not_reg 35 - micron.vcd file 34 - Lisp symbols server_not_reg and net_not_reg 36 35 -
abuse/trunk/data-frabs/docs/pages/editor2.html
r44 r590 183 183 <br><tt>/art/fore/cave.spe 184 184 500-634</tt> 185 <br><tt>/ register/alien.spe 185 <br><tt>/art/fore/alien.spe 186 186 700-774</tt> 187 <br><tt>/ register/trees.spe 187 <br><tt>/art/fore/trees.spe 188 188 800-931</tt> 189 <br><tt>/art/ endgame.spe 189 <br><tt>/art/fore/endgame.spe 190 190 950-1014</tt> 191 <br><tt>/ register/trees2.spe 191 <br><tt>/art/fore/trees2.spe 192 192 1100-1134</tt> 193 193 <p><tt>NEW FOREGROUND TILES</tt> … … 213 213 <br><tt>/art/back/tech.spe 214 214 110-139</tt> 215 <br><tt>/ register/alienb.spe 215 <br><tt>/art/back/alienb.spe 216 216 150-179</tt> 217 <br><tt>/ register/green2.spe 217 <br><tt>/art/back/green2.spe 218 218 200-268</tt> 219 <br><tt>/ register/galien.spe 219 <br><tt>/art/back/galien.spe 220 220 300-320</tt> 221 221 <p><tt>NEW BACKGROUND TILES</tt> -
abuse/trunk/data/addon/deathmat/dstartup.lsp
r588 r590 126 126 "art/fore/techno4.spe" 127 127 "art/fore/cave.spe" 128 "art/fore/alien.spe" 129 "art/fore/trees.spe" 130 "art/fore/endgame.spe" 131 "art/fore/trees2.spe" 128 132 129 133 "art/back/intro.spe" … … 131 135 "art/back/tech.spe" 132 136 "art/back/cave.spe" 133 "art/back/backgrnd.spe") 137 "art/back/backgrnd.spe" 138 "art/back/alienb.spe" 139 "art/back/green2.spe" 140 "art/back/galien.spe") 134 141 135 (setq load_warn nil) 136 (load "register/tiles.lsp") ;; load up registered artwork if it's there 137 (setq load_warn T) 142 (defun end_game_ai () 143 (if (activated) 144 (if (eq (aistate) 8) 145 (if (not (next_picture)) 146 (request_end_game)) 147 (set_aistate (+ (aistate) 1)))) 148 T) 149 150 (def_char END_GAME 151 (funs (ai_fun end_game_ai)) 152 (range 0 0) 153 (states "art/fore/endgame.spe" 154 (stopped (app (seq "pipe" 1 9) 155 (seq "pipe" 1 9) 156 (seq "pipe" 1 9) 157 (seq "pipe" 1 9) 158 (seq "pipe" 1 9) 159 (seq "pipe" 1 9) 160 (seq "pipe" 1 9) 161 (seq "pipe" 1 9) 162 (seq "pipe" 1 9))))) 163 138 164 139 165 (setf title_screen '("art/title.spe" . "title_screen")) -
abuse/trunk/data/addon/newart/tiledoc.txt
r589 r590 7 7 /art/fore/techno4.spe 300- 460 8 8 /art/fore/cave.spe 500- 634 9 / register/alien.spe 700- 77410 / register/trees.spe 800- 93111 /art/ endgame.spe950-101412 / register/trees2.spe1100-11349 /art/fore/alien.spe 700- 774 10 /art/fore/trees.spe 800- 931 11 /art/fore/endgame.spe 950-1014 12 /art/fore/trees2.spe 1100-1134 13 13 14 14 NEW FOREGROUND TILES … … 32 32 /art/back/cave.spe 84-103 33 33 /art/back/tech.spe 110-139 34 / register/alienb.spe 150-17935 / register/green2.spe 200-26836 / register/galien.spe 300-32034 /art/back/alienb.spe 150-179 35 /art/back/green2.spe 200-268 36 /art/back/galien.spe 300-320 37 37 38 38 NEW BACKGROUND TILES -
abuse/trunk/data/addon/twist/lisp/startup.lsp
r589 r590 41 41 "art/fore/techno4.spe" ;; 300-460 42 42 "art/fore/cave.spe" ;; 500-634 43 "art/fore/alien.spe" ;; 700-774 44 "art/fore/trees.spe" ;; 800-931 45 "art/fore/endgame.spe" ;; 950-1014 46 "art/fore/trees2.spe" ;; 1100-1134 43 47 44 48 "art/back/backgrnd.spe" ;; 0 … … 47 51 "art/back/cave.spe" ;; 84-103 48 52 "art/back/tech.spe" ;; 110-139 53 "art/back/alienb.spe" ;; 150-179 54 "art/back/green2.spe" ;; 200-268 55 "art/back/galien.spe" ;; 300-320 49 56 ) 50 57 51 (setq load_warn nil) 52 (load "register/tiles.lsp") ;; load up registered artwork if it's there 53 (setq load_warn T) 58 (defun end_game_ai () 59 (if (activated) 60 (if (eq (aistate) 8) 61 (if (not (next_picture)) 62 (request_end_game)) 63 (set_aistate (+ (aistate) 1)))) 64 T) 65 66 67 (def_char END_GAME 68 (funs (ai_fun end_game_ai)) 69 (range 0 0) 70 (states "art/fore/endgame.spe" 71 (stopped (app (seq "pipe" 1 9) 72 (seq "pipe" 1 9) 73 (seq "pipe" 1 9) 74 (seq "pipe" 1 9) 75 (seq "pipe" 1 9) 76 (seq "pipe" 1 9) 77 (seq "pipe" 1 9) 78 (seq "pipe" 1 9) 79 (seq "pipe" 1 9))))) 80 54 81 55 82 (setf demos '("levels/demo1.dat" "levels/demo3.dat" "levels/demo4.dat" "levels/demo5.dat")) -
abuse/trunk/data/addon/twist/lisp/title.lsp
r589 r590 6 6 (setf logo '("addon/twist/art/title.spe" . "profound")) 7 7 (setq help_screens '("addon/twist/art/title.spe" "pro1" "pro2" "pro3" "pro4" "pro5")) 8 (setq sell_screens '(("addon/twist/art/title.spe" . "pro1")("addon/twist/art/title.spe" . "pro2")("addon/twist/art/title.spe" . "pro3")("addon/twist/art/title.spe" . "pro4")("addon/twist/art/title.spe" . "pro5")("art/ endgame.spe" . "credit")))8 (setq sell_screens '(("addon/twist/art/title.spe" . "pro1")("addon/twist/art/title.spe" . "pro2")("addon/twist/art/title.spe" . "pro3")("addon/twist/art/title.spe" . "pro4")("addon/twist/art/title.spe" . "pro5")("art/fore/endgame.spe" . "credit"))) 9 9 -
abuse/trunk/data/lisp/ant.lsp
r589 r590 616 616 617 617 618 (setq load_warn nil) 619 (if (not (load "register/ant.lsp")) 620 (setq BOSS_ANT ANT_ROOF)) 621 (setq load_warn T) 622 623 624 618 619 (defun boss_damage (amount from hitx hity push_xvel push_yvel) 620 (if (and (eq (fade_count) 0) (not (eq (aistate) 0)) (< (aitype) 6)) 621 (progn 622 (damage_fun amount from hitx hity push_xvel push_yvel) 623 (if (eq (hp) 0) 624 (progn 625 (set_hp 1) 626 (set_aitype (+ (aitype) 1)) 627 (if (eq (aitype) 6) ;; go to next alien type 628 (set_aistate 10) ;; end game 629 (set_aistate 5))))))) ;; fade out 630 631 (defun boss_cons () 632 (set_hp 1) 633 (setq taunt_time 20)) 634 635 (defun boss_fire () 636 (let ((firex (+ (x) (* (direction) 17)) ) 637 (firey (- (y) 25)) 638 (playerx (+ (with_object (bg) (x)) (with_object (bg) (* (xvel) 8)))) 639 (playery (+ (- (with_object (bg) (y)) 15) (with_object (bg) (* (yvel) 2))))) 640 641 (if (and (can_see (x) (y) firex firey nil) (can_see firex firey playerx playery nil)) 642 (progn 643 (let ((angle (atan2 (- firey playery) 644 (- playerx firex)))) 645 (fire_object (me) (aitype) firex firey angle (bg)) 646 (set_state weapon_fire)) 647 648 )))) 649 650 651 (defun boss_ai () 652 (if (total_objects) 653 654 (if (eq (aistate) 11) 655 nil 656 (progn 657 (select (aistate) 658 (0;; wait for turn on 659 (set_state hiding);; can't see us 660 (set_targetable nil) 661 (if (activated) 662 (set_aistate 1))) 663 (1;; taunt for a while 664 (set_targetable nil) 665 (if (eq taunt_time 0) 666 (progn 667 (set_fade_count 14) 668 (set_state stopped) 669 (play_sound APPEAR_SND 127 (x) (y)) 670 (set_aistate 2)));; fade in 671 (progn 672 (setq taunt_time (- taunt_time 1)) 673 (if (eq (mod taunt_time 25) 0) 674 (play_sound TAUNT_SND 127 (x) (y))))) 675 676 (2;; fade in 677 (set_direction (toward)) 678 (if (eq (fade_count) 0) 679 (progn 680 (set_state weapon_fire) 681 (go_state 3)) 682 (set_fade_count (- (fade_count) 2)))) 683 684 (3;; wait to fire 685 (set_targetable T) 686 (if (next_picture) T 687 (go_state 4))) 688 689 (4;; fire1 690 (boss_fire) 691 (set_aistate 5) 692 (set_state weapon_fire)) 693 694 (5;; wait to fire 695 (set_targetable T) 696 (if (next_picture) T 697 (go_state 6))) 698 699 (6;; fire1 700 (boss_fire) 701 (set_aistate 7) 702 (set_state stopped)) 703 704 (7;; fade out 705 (set_targetable nil) 706 (set_fade_count (+ (fade_count) 2)) 707 (if (eq (fade_count) 14) 708 (progn 709 (set_state hiding) 710 (let ((to_object (get_object (random (total_objects))))) 711 (set_x (with_object to_object (x))) 712 (set_y (with_object to_object (y)))) 713 (setq taunt_time (- 30 (* (aitype) 2))) 714 (go_state 0)))) 715 716 (10;; game over 717 (set_state hiding) 718 (set_targetable nil) 719 (if (eq (state_time) 60) 720 (go_state 11)) 721 (if (not (eq (state_time) 0)) 722 (progn 723 (if (eq (mod (state_time) 8) 0) 724 (play_sound GRENADE_SND 127 (x) (y))) 725 (add_object EXPLODE1 (+ (x) (random (* (state_time) 2))) (+ (random (state_time)) (y))) 726 (add_object EXPLODE1 (- (x) (random (* (state_time) 2))) (- (y) (random (state_time))))))) 727 ) 728 729 T)))) 730 731 732 733 (def_char BOSS_ANT 734 (funs (ai_fun boss_ai) 735 (draw_fun ant_draw) 736 (damage_fun boss_damage)) 737 (vars taunt_time) 738 (flags (hurtable T) 739 (unlistable T)) 740 (fields ("taunt_time" "taunt_tint") 741 ("aistate" "aistate")) 742 (states "art/boss.spe" 743 (stopped "awlk0001.pcx") 744 (hiding "hidden") 745 (weapon_fire (seq "asht" 2 5)))) 746 -
abuse/trunk/data/lisp/english.lsp
r589 r590 368 368 369 369 (setq load_warn nil) 370 (if (not (load "register/english.lsp")) 371 (setq end_msg "Visit us at http://abuse.zoy.org/.\n")) 370 (setq end_msg thank_you) 372 371 373 372 (setq load_warn T) -
abuse/trunk/data/lisp/flyer.lsp
r589 r590 123 123 124 124 125 (setq load_warn nil) 126 (if (not (load "register/flyer.lsp")) 127 (progn 128 (setq FLYER WHO) 129 (setq GREEN_FLYER WHO))) 130 (setq load_warn T) 125 126 (def_char FLYER 127 (funs (ai_fun flyer_ai) 128 (damage_fun flyer_damage) 129 (constructor flyer_cons)) 130 131 (flags (hurtable T)) 132 (abilities (start_hp 20)) 133 (vars fire_delay burst_delay burst_total burst_wait burst_left 134 max_xvel max_yvel smoke_time fire_time) 135 (fields ("fire_delay" who_fdelay) 136 ("burst_delay" who_bdelay) 137 ("burst_total" who_btotal) 138 ("max_xvel" who_mxv) 139 ("max_yvel" who_myv) 140 ("hp" ai_health) 141 ("aitype" ai_type) 142 ("aistate" ai_state)) 143 144 (range 200 200) 145 (states "art/flyer.spe" 146 (running (seq "ffly" 1 12)) 147 (stopped (seq "unhurtable" 1 7)) 148 (flinch_up '("flinch" "flinch" "flinch")) 149 (turn_around (seq "ftrn" 1 6)))) 131 150 132 151 133 152 134 153 154 (def_char GREEN_FLYER 155 (funs (ai_fun flyer_ai) 156 (damage_fun flyer_damage) 157 (constructor flyer_cons)) 135 158 159 (flags (hurtable T)) 160 (abilities (start_hp 20)) 161 (vars fire_delay burst_delay burst_total burst_wait burst_left 162 max_xvel max_yvel smoke_time fire_time) 163 (fields ("fire_delay" who_fdelay) 164 ("burst_delay" who_bdelay) 165 ("burst_total" who_btotal) 166 ("max_xvel" who_mxv) 167 ("max_yvel" who_myv) 168 ("hp" ai_health) 169 ("aitype" ai_type) 170 ("aistate" ai_state)) 136 171 172 (range 200 200) 173 (states "art/flyer.spe" 174 (running (seq "gspe" 1 7)) 175 (stopped (seq "gdrp" 1 12)) 176 (flinch_up '("ghurt" "ghurt" "ghurt")) 177 (turn_around (seq "gspn" 1 7)))) 137 178 138 139 -
abuse/trunk/data/lisp/french.lsp
r588 r590 374 374 375 375 (setq load_warn nil) 376 (if (not (load "register/english.lsp")) 377 (setq end_msg 378 (concatenate 'string 379 "* Editer LISP/OPTIONS.LSP pour configurer quelques options pour ABUSE.\n\n" 380 "* Procurez-vous la version commerciale d'ABUSE qui sera en vente fin mars 96, et\n" 381 " sera jouable sur rseau IPX supportant huit joueurs. Elle comportera un diteur\n" 382 " de niveau intgr, 17 niveaux un seul joueur (plus 12 niveaux sur le\n" 383 " rseau), des armes plus mortelles, \n" 384 " des ennemis nfastes, de meilleurs effets sonores, et une abondance d'effets artistiques.\n\n" 385 "* Pour commander la version complte d'ABUSE chez Electronic Arts, appelez :\n" 386 " USA 1-800-245-4525\n" 387 " CANADA 604-451-3600\n" 388 " ANGLETERRE 0753-549442\n" 389 " FRANCE 72 17 07 83\n" 390 " ALLEMAGNE 05241 / 24307\n" 391 " AUSTRALIE +61(75)911 388\n" 392 " JAPON 03-5410-3100\n\n"))) 376 (setq end_msg thank_you) 393 377 394 378 (setq load_warn T) -
abuse/trunk/data/lisp/german.lsp
r588 r590 364 364 (setq thank_you "Danke, daá Sie Abuse spielten!\n\n") ; V-A 365 365 (setq load_warn nil) 366 (if (not (load "register/english.lsp")) 367 (setq end_msg 368 (concatenate 'string 369 "* ndern Sie LISP/OPTIONS.LSP, um einige Optionen fr ABUSE zu\n" 370 " konfigurieren.\n\n" 371 "* Halten Sie beim Einkaufsbummel die Augen auf, denn Ende Mrz '96 erscheint die " 372 " kommerzielle Version von ABUSE fr acht Spieler, IPX-Netzwerk untersttzt, \n" 373 " mit einem eingebauten Level-Editor, 17 Einzelspieler-Level plus 12 Exklusiv-\n" 374 " Netzwerk- \n Level, todbringenderen Waffen, extra Powerups, \n" 375 " strkeren Feinden, besseren Soundeffekten und noch mehr knstlerischen\n" 376 " Effekten.\n\n" 377 378 379 "* Um eine volle ABUSE-Version von Electronic Arts zu bestellen, rufen Sie bitte an:\n" 380 " USA 1-800-245-4525\n" 381 " CANADA 604-451-3600\n" 382 " ENGLAND 0753-549442\n" 383 " FRANKREICH 72 17 07 83\n" 384 " DEUTSCHLAND 05241 / 24307\n" 385 " AUSTRALIEN +61(75)911 388\n" 386 " JAPAN 03-5410-3100\n\n"))) 366 (setq end_msg thank_you) 387 367 388 368 (setq load_warn T) -
abuse/trunk/data/lisp/people.lsp
r589 r590 970 970 (states "art/misc.spe" (stopped "eos"))) 971 971 972 (setq load_warn nil) 973 (if (load "register/people.lsp") 974 (setq end_level 22) 975 (setq end_level 4)) 976 (setq load_warn T) 977 978 979 980 981 972 973 (make_top_char 'PGUN_TOP "4gza" 'plaser_ufun 'top_draw) 974 (make_top_char 'LIGHT_SABER "4gch" 'lsaber_ufun 'top_draw) 975 (make_top_char 'DFRIS_TOP "4gbo" 'top_ufun 'top_draw) 976 (setq sell_screens '(("art/fore/endgame.spe" . "credit"))) 977 978 979 (setq end_level 22) 980 -
abuse/trunk/data/lisp/powerup.lsp
r588 r590 15 15 nil) 16 16 T)) 17 18 17 19 18 (def_char HEALTH … … 37 36 (states "art/compass.spe" (stopped "compass" ))) 38 37 38 39 39 (defun fast_ai () 40 40 (next_picture) … … 46 46 (make_view_solid (find_rgb 255 255 255)))) 47 47 nil) T)) 48 49 48 50 49 (defun fast_cache (type) (list nil (list fast_image))) … … 58 57 59 58 59 (defun sneaky_power_ai () 60 (next_picture) 61 (if (touching_bg) 62 (progn 63 (with_object (bg) (setq special_power SNEAKY_POWER)) 64 nil) 65 T)) 60 66 61 (setq load_warn nil) 62 (load "register/powerup.lsp") 63 (setq load_warn T) 67 (def_char POWER_SNEAKY 68 (funs (ai_fun sneaky_power_ai)) 69 (flags (add_front T)) 70 (range 20 20) 71 (states "art/misc.spe" (stopped "sneaky"))) 72 73 74 (defun fly_power_ai () 75 (next_picture) 76 (if (touching_bg) 77 (progn 78 (with_object (bg) (setq special_power FLY_POWER)) 79 nil) 80 T)) 81 82 (defun power_fly_cache (type) 83 (list (list CLOUD) (list fly_image))) 84 85 (def_char POWER_FLY 86 (funs (ai_fun fly_power_ai) 87 (get_cache_list_fun power_fly_cache)) 88 (flags (add_front T)) 89 (range 20 20) 90 (states "art/misc.spe" (stopped "fly"))) 91 92 93 (defun health_power_ai () 94 (next_picture) 95 (if (touching_bg) 96 (progn 97 (with_object (bg) 98 (progn 99 (setq special_power HEALTH_POWER) 100 (give_player_health 100))) 101 nil) 102 T)) 103 104 (def_char POWER_HEALTH 105 (funs (ai_fun health_power_ai)) 106 (flags (add_front T)) 107 (range 20 20) 108 (states "art/misc.spe" (stopped "b_check"))) 109 -
abuse/trunk/data/lisp/startup.lsp
r589 r590 40 40 "art/fore/techno4.spe" ;; 300-460 41 41 "art/fore/cave.spe" ;; 500-634 42 "art/fore/alien.spe" ;; 700-774 43 "art/fore/trees.spe" ;; 800-931 44 "art/fore/endgame.spe" ;; 950-1014 45 "art/fore/trees2.spe" ;; 1100-1134 42 46 43 47 "art/back/backgrnd.spe" ;; 0 … … 46 50 "art/back/cave.spe" ;; 84-103 47 51 "art/back/tech.spe" ;; 110-139 52 "art/back/alienb.spe" ;; 150-179 53 "art/back/green2.spe" ;; 200-268 54 "art/back/galien.spe" ;; 300-320 48 55 ) 49 56 50 (setq load_warn nil) 51 (load "register/tiles.lsp") ;; load up registered artwork if it's there 52 (setq load_warn T) 57 (defun end_game_ai () 58 (if (activated) 59 (if (eq (aistate) 8) 60 (if (not (next_picture)) 61 (request_end_game)) 62 (set_aistate (+ (aistate) 1)))) 63 T) 64 65 66 (def_char END_GAME 67 (funs (ai_fun end_game_ai)) 68 (range 0 0) 69 (states "art/fore/endgame.spe" 70 (stopped (app (seq "pipe" 1 9) 71 (seq "pipe" 1 9) 72 (seq "pipe" 1 9) 73 (seq "pipe" 1 9) 74 (seq "pipe" 1 9) 75 (seq "pipe" 1 9) 76 (seq "pipe" 1 9) 77 (seq "pipe" 1 9) 78 (seq "pipe" 1 9))))) 79 53 80 54 81 (setf title_screen '("art/title.spe" . "title_screen")) -
abuse/trunk/data/lisp/weapons.lsp
r589 r590 493 493 494 494 495 (setq load_warn nil) 496 (if (not (load "register/weapons.lsp")) 497 (load "lisp/share.lsp")) 498 (setq load_warn T) 499 500 501 502 503 504 505 506 507 508 495 496 (make_ammo_icon 'PLASMA_ICON20 "plasma_small" 20) 497 (make_ammo_icon 'PLASMA_ICON50 "plasma_large" 50) 498 499 (make_ammo_icon 'LSABER_ICON50 "lsaber_small" 50) 500 (make_ammo_icon 'LSABER_ICON100 "lsaber_large" 100) 501 502 (make_ammo_icon 'DFRIS_ICON4 "dfris_small" 4) 503 (make_ammo_icon 'DFRIS_ICON10 "dfris_large" 10) 504 505 506 (defun pgun_draw () 507 (let ((c (- 255 (* (state_time) 40)))) 508 (scatter_line sgb_lastx sgb_lasty (x) (y) (find_rgb c (/ c 2) c) (state_time)) 509 (scatter_line sgb_lastx sgb_lasty (x) (y) (find_rgb c (/ c 2) c) 0) 510 )) 511 512 513 514 (defun pgun_ai () 515 (select (state_time) 516 (0 T) 517 (1 T) 518 (2 T) 519 (3 T) 520 (4 T) 521 (5 nil))) 522 523 (def_char PLASMAGUN_BULLET 524 (vars sgb_angle sgb_lastx sgb_lasty) 525 (funs (ai_fun pgun_ai) 526 (draw_fun pgun_draw)) 527 (range 10000 10000) 528 (flags (unlistable T) 529 (add_front T)) 530 (states "art/misc.spe" (stopped "sgun_bullet"))) 531 532 533 (defun lsaber_ai () 534 (shift_rand_table (random 80)) 535 nil) 536 537 538 (defun lsaber_draw () 539 (let ((c1 (find_rgb 255 255 255)) 540 (c2 (find_rgb 70 59 67)) 541 (c3 (find_rgb 147 155 195))) 542 543 544 (scatter_line sgb_lastx sgb_lasty (x) (y) c1 0) 545 (scatter_line sgb_lastx sgb_lasty (x) (y) c3 2) 546 (ascatter_line sgb_lastx sgb_lasty (x) (y) c1 c2 1) 547 )) 548 549 550 551 (def_char LSABER_BULLET 552 (vars sgb_angle sgb_lastx sgb_lasty) 553 (funs (ai_fun lsaber_ai) 554 (draw_fun lsaber_draw)) 555 (range 10000 10000) 556 (flags (unlistable T) 557 (add_front T)) 558 (states "art/misc.spe" (stopped "sgun_bullet"))) 559 560 561 (defun angle_diff (a1 a2) 562 (if (< (abs (- a2 a1)) 180) 563 (- a2 a1) 564 (if (< a1 a2) 565 (+ (- a1 a2) 180) 566 (- (- a1 a2) 180)))) 567 568 569 (defun get_fris_angle () 570 (let ((px (with_object (get_object 0) (player_pointer_x))) 571 (py (with_object (get_object 0) (player_pointer_y)))) 572 (atan2 (- (y) py 4) 573 (- px (x))))) 574 575 (defun dfris_ai () 576 (if (and (eq 0 (mod (game_tick) 2)) (not (frame_panic))) 577 (let ((rand (rand_on))) 578 (with_object (add_object SMALL_LIGHT_CLOUD (+ (x) (random 3)) 579 (- (y) (random 3) (/ (picture_height) 2))) 580 (set_fade_count 11)) 581 (set_rand_on rand))) 582 (set_course (aistate) 12) 583 (if (or (not (eq (bmove (if (> (total_objects) 0) (get_object 0) nil)) T)) 584 (< (total_objects) 1) 585 (let ((mex (x)) 586 (mey (y))) 587 (with_object (get_object 0) (find_object_in_area (- mex 7) 588 (- mey 7) 589 (+ mex 7) 590 (+ mey 7) bad_guy_list)))) 591 (progn 592 (do_white_explo 40 45) 593 nil) 594 (progn 595 (next_picture) 596 (if (> (with_object (get_object 0) (total_objects)) 0) 597 (let ((player_angle (get_fris_angle))) 598 (let ((angle_change (angle_diff (aistate) player_angle))) 599 (if (< (abs angle_change) 35) 600 (set_aistate (mod (+ (aistate) angle_change 360) 360)) 601 (if (>= angle_change 0) 602 (set_aistate (mod (+ (aistate) 35) 360)) 603 (set_aistate (mod (+ (aistate) 325 ) 360))))))) 604 T)) 605 ) 606 607 608 609 (defun dfris_cache (type) 610 (list (list EXPLODE8 EXP_LIGHT) 611 (list GRENADE_SND))) 612 613 (def_char DFRIS_BULLET 614 (funs (ai_fun dfris_ai) 615 (get_cache_list_fun dfris_cache)) 616 (range 10000 10000) 617 (flags (unlistable T) 618 (add_front T)) 619 (states "art/misc.spe" (stopped "dfris_bullet"))) 620 -
abuse/trunk/src/endgame.cpp
r579 r590 150 150 { 151 151 int i; 152 int planet=cache.reg("art/ endgame.spe","planet",SPEC_IMAGE,1);153 int planet2=cache.reg("art/ endgame.spe","dead_planet",SPEC_IMAGE,1);154 int mask=cache.reg("art/ endgame.spe","mask",SPEC_IMAGE,1);155 int ship=cache.reg("art/ endgame.spe","ship",SPEC_IMAGE,1);152 int planet=cache.reg("art/fore/endgame.spe","planet",SPEC_IMAGE,1); 153 int planet2=cache.reg("art/fore/endgame.spe","dead_planet",SPEC_IMAGE,1); 154 int mask=cache.reg("art/fore/endgame.spe","mask",SPEC_IMAGE,1); 155 int ship=cache.reg("art/fore/endgame.spe","ship",SPEC_IMAGE,1); 156 156 157 157 … … 428 428 screen->clear(); 429 429 430 image *im=cache.img(cache.reg("art/ endgame.spe","tbc",SPEC_IMAGE,1));430 image *im=cache.img(cache.reg("art/fore/endgame.spe","tbc",SPEC_IMAGE,1)); 431 431 432 432 void *to_be = LSymbol::FindOrCreate("to_be_continued")->GetValue(); … … 484 484 screen->clear(); 485 485 486 image *im=cache.img(cache.reg("art/ endgame.spe","end.pcx",SPEC_IMAGE,1));486 image *im=cache.img(cache.reg("art/fore/endgame.spe","end.pcx",SPEC_IMAGE,1)); 487 487 488 488 int dx=(xres+1)/2-320/2,dy=(yres+1)/2-200/2; -
abuse/trunk/src/menu.cpp
r579 r590 391 391 int sp=current_space; 392 392 current_space=PERM_SPACE; 393 // char *prog="((\"art/help.spe\" . \"sell2\")(\"art/help.spe\" . \"sell4\")(\"art/help.spe\" . \"sell3\")(\"art/ endgame.spe\" . \"credit\"))";394 // char *prog="((\"art/ endgame.spe\" . \"credit\") (\"art/help.spe\" . \"sell6\"))";395 char const *prog = "((\"art/ endgame.spe\" . \"credit\"))";393 // char *prog="((\"art/help.spe\" . \"sell2\")(\"art/help.spe\" . \"sell4\")(\"art/help.spe\" . \"sell3\")(\"art/fore/endgame.spe\" . \"credit\"))"; 394 // char *prog="((\"art/fore/endgame.spe\" . \"credit\") (\"art/help.spe\" . \"sell6\"))"; 395 char const *prog = "((\"art/fore/endgame.spe\" . \"credit\"))"; 396 396 ss->SetValue(LObject::Compile(prog)); 397 397 current_space=sp;
Note: See TracChangeset
for help on using the changeset viewer.
