WebSVN – vaca_plus – Path Comparison – /

Regard whitespace Rev 24 → Rev 25

 /vacation/textures.def
 ,25 → 9,6
 texture 96 { pal 0 { file "vacation/textures/0096.jpg" } }
-texture 336 {
-   pal 0 { file "vacation/textures/0336.jpg" }
-  // pal 2 { file "highres/textures/0336_2.jpg" }
-  // pal 21 { file "highres/textures/0336_2.jpg" }
-   normal { file "highres/textures/0336_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
-texture 337 {
-   pal 0 { file "vacation/textures/0337.jpg" }
-  // pal 2 { file "highres/textures/0337_2.jpg" }
-  // pal 21 { file "highres/textures/0337_2.jpg" }
-   normal { file "highres/textures/0337_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
-texture 338 {
-   pal 0 { file "vacation/textures/0338.jpg" }
-  // pal 2 { file "highres/textures/0338_2.jpg" }
-  // pal 21 { file "highres/textures/0338_2.jpg" }
-   normal { file "highres/textures/0338_n.png" parallaxbias 0.3 parallaxscale 0.1 }
-}
 texture 889 {
    pal 0 { file "vacation/textures/0889.png" }
    pal 2 { file "highres/textures/0889_2.jpg" }
 ,12 → 164,12
    pal 17 { file "highres/textures/0545.jpg" }
    pal 21 { file "vacation/textures/3794.png" }
    pal 22 { file "highres/textures/0545.jpg" }
-   normal { file "highres/textures/0545_n.png" parallaxbias 0 parallaxscale 0.1 }
+   normal { file "highres/textures/0545_n.png" parallaxbias 0.0 parallaxscale 0.05 }
    detail { file "highres/detail/fabric.png" xscale 0.3 yscale 0.15 }
 }
 texture 3794 {
    pal 0 { file "vacation/textures/3794.png" }
-   normal { file "highres/textures/0545_n.png" parallaxbias 0 parallaxscale 0.1 }
+   normal { file "highres/textures/0545_n.png" parallaxbias 0.0 parallaxscale 0.05 }
    detail { file "highres/detail/fabric.png" xscale 0.3 yscale 0.15 }
 }

/vacation/textures/0336.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/textures/0337.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/textures/0338.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /vacation/xxx.def
 ,6 → 5,9
 --------------------------------------------------------------------------------
 */
+tilefromtexture 1321 { file "vacation/8bit/xxx/1321.png" }
+tilefromtexture 1322 { file "vacation/8bit/xxx/1322.png" }
 // XXX Beach Babe (3670-3684)
 model "vacation/sprites/characters/3670_beachbabe.md3" {
    scale 1.5 shade 0

/vacation/sprites/props.def
48,10 → 48,12
scale 1.3 shade 0

skin { pal 0 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
/*
skin { pal 1 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 2 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 7 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
skin { pal 8 surface 0 file "vacation/sprites/props/3700_tikigod.png" }
*/

skin { pal 0 surface 1 file "vacation/sprites/props/3700_tikigod.png" }
detail { surface 1 file "highres/detail/rock.png" xscale 0.15 yscale 0.15 } // This is so that the jewel is not covered with the rocky detail texture.

/vacation/sprites/pickups.def
65,6 → 65,7
scale 3.0 shade 0
skin { pal 0 file "vacation/sprites/pickups/0045_crystal.png" }
// glow { pal 0 file "vacation/sprites/pickups/0045_crystal.png" }
normal { file "highres/sprites/pickups/0046_crystal_n.png" parallaxbias 0.1 parallaxscale 0.1 }
frame { name "Frame0" tile 45 }
}
texture 45 { pal 0 { file "vacation/sprites/pickups/0045.png" } }

 /vacation/sprites/firstperson.def
 ,34 → 30,26
 // Key Card Hand (2568)
 model "highres/sprites/firstperson/2568_keycardhand.md3" {
    scale 1.9 shade 0
-   skin { pal 0  surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand.png" }
-   skin { pal 0  surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand.png" }
-   skin { pal 10 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_10.png" }
-   skin { pal 10 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_10.png" }
-   skin { pal 11 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 11 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 12 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 12 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 13 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_13.png" }
-   skin { pal 13 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_13.png" }
-   skin { pal 14 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_14.png" }
-   skin { pal 14 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_14.png" }
-   skin { pal 15 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_15.png" }
-   skin { pal 15 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_15.png" }
-   skin { pal 16 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_16.png" }
-   skin { pal 16 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_16.png" }
-   skin { pal 18 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 18 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_12_18.png" }
-   skin { pal 21 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_21.png" }
-   skin { pal 21 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_21.png" }
-   skin { pal 22 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 22 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_11_22.png" }
-   skin { pal 23 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_23.png" }
-   skin { pal 23 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_23.png" }
-   skin { pal 24 surface 0 file "vacation/sprites/firstperson/2563_tripkeyhand_24.png" }
-   skin { pal 24 surface 1 file "vacation/sprites/firstperson/2563_tripkeyhand_24.png" }
-   frame { name "key" tile 2568 }
+   skin { pal 0  surface 0 file "vacation/sprites/firstperson/2568_keycardhand.png" }
+   skin { pal 10 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_10.png" }
+   skin { pal 11 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_11_22.png" }
+   skin { pal 12 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_12_18.png" }
+   skin { pal 13 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_13.png" }
+   skin { pal 14 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_14.png" }
+   skin { pal 15 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_15.png" }
+   skin { pal 16 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_16.png" }
+   skin { pal 18 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_12_18.png" }
+   skin { pal 21 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_21.png" }
+   skin { pal 22 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_11_22.png" }
+   skin { pal 23 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_23.png" }
+   skin { pal 24 surface 0 file "vacation/sprites/firstperson/2568_keycardhand_24.png" }
+   skin { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_d.png" }
+   normal { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_n.png" }
+   specular { pal 0 surface 1 file "highres/sprites/firstperson/duke_hand_s.png" }
+   frame { name "Frame0" tile 2568 }
   // hud { tile 2568 xadd -0.25 yadd 0.24 zadd -0.1 angadd 0 }
-   hud { tile 2568 xadd 0.25 yadd 0.24 zadd -0.1 angadd 0 flipped }
+   hud { tile 2568 xadd 0.25 yadd 0.24 zadd -0.1 angadd 512 flipped }
 }

/vacation/sprites/firstperson/2563_tripkeyhand_10.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_21.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_13.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_23.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_14.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_15.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_24.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_11_22.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2563_tripkeyhand_12_18.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_10.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_21.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_13.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_14.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_11_22.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_23.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_15.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_24.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/sprites/firstperson/2568_keycardhand_12_18.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /vacation/skyboxes.def
 ,6 → 16,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 89 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 90 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 34,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 90 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 91 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 52,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 91 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 92 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 70,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 92 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 93 pal 0
    front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
    right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
 ,6 → 88,15
    bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
 }
 skybox {
+   tile 93 pal 1
+   front  "vacation/skyboxes/89_sky_sea/sky_seaFT.png"
+   right  "vacation/skyboxes/89_sky_sea/sky_seaRT.png"
+   back   "vacation/skyboxes/89_sky_sea/sky_seaBK.png"
+   left   "vacation/skyboxes/89_sky_sea/sky_seaLT.png"
+   top    "vacation/skyboxes/89_sky_sea/sky_seaUP.png"
+   bottom "vacation/skyboxes/89_sky_sea/sky_seaDN.png"
+}
+skybox {
    tile 94 pal 0
    front  "vacation/skyboxes/94_dawn_dusk/dawn_duskFT.png"
    right  "vacation/skyboxes/94_dawn_dusk/dawn_duskRT.png"

/vacation/8bit/xxx/1321.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/vacation/8bit/xxx/1322.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /vaca_plus/Vacation.con
 ,7 → 39,7
 gamevar y2 0 2
 gamevar pose 0 0
-// The following gamevars disable the Polymer dynamic muzzle flashes for certain Caribbean weapons.
+// disable Polymer dynamic muzzle flashes
 gamevar WEAPON1_FLASHCOLOR 0 1
 gamevar WEAPON2_FLASHCOLOR 0 1
 gamevar WEAPON3_FLASHCOLOR 0 1
 ,10 → 47,19
 gamevar WEAPON7_FLASHCOLOR 0 1
 gamevar WEAPON9_FLASHCOLOR 0 1
-// disable voodoo ring glowing flag, just in case
+// disable voodoo ring glowing flag
+// even though only the crystals are supposed to glow, bugs in EDuke32 have caused the frames to glow too
 gamevar WEAPON6_FLAGS 0 1
 gamevar WEAPON11_FLAGS 0 1
+// disable visibility clearing
+gamevar WEAPON1_FLAGS 33024 1
+gamevar WEAPON2_FLAGS 1280 1
+gamevar WEAPON3_FLAGS 74068 1
+gamevar WEAPON4_FLAGS 256 1
+gamevar WEAPON7_FLAGS 328 1
+gamevar WEAPON9_FLAGS 65792 1
 onevent EVENT_GETMENUTILE
  setvar RETURN 3281
 endevent
 ,6 → 192,10
      ifspritepal 1 setactor[THISACTOR].htflags 256 // replace with blue light placement code when available
    break
+   case GROWAMMO
+     setactor[THISACTOR].mdflags 16
+     break
   endswitch
 endevent
 ,7 → 205,7
    case FREEZEAMMO
      spritepal 1
-     spawn BLOODPOOL
+     spawn BLOODPOOL // spawn a water puddle as an added "cool" effect
      getlastpal
    break
 ,10 → 213,6
      ifspawnedby SEAGULLSHIT spritepal 19
    break
-   case GROWAMMO
-     setactor[THISACTOR].mdflags 16
-   break
   endswitch
 endevent
 ,8 → 433,9
 onevent EVENT_ANIMATESPRITES
- ifactor GROWAMMO
-   {
+  switch picnum
+    case GROWAMMO
    // t->shade = (sintable[(totalclock<<4)&2047]>>10);
      setvarvar temp totalclock
      shiftvarl temp 4
 ,7 → 443,15
      sin temp temp
      shiftvarr temp 10
      settspr[THISACTOR].tsprshade temp
-   }
+      break
+    case DRAGON
+    case DRAGONDEATH
+      ifvarn temp3 -1
+        settspr[THISACTOR].tsprang temp3
+      break
+  endswitch
 endevent
 define title_x1 54

 /vaca_plus/VBeachBather.con
 ,11 → 143,8
         {
           ifp pfacing
             ifpdistl FROZENQUICKKICKDIST
-              {
                 pkick
-                break
               }
-        }
       ifcount THAWTIME
         {
           getlastpal

 /vaca_plus/Caribbean.bat
 ,26 → 106,23
 :arguments
 set args=
-if exist polymer_hrp\ set args=%args% -jpolymer_hrp
-if exist duke3d_voxel.zip set args=%args% -gduke3d_voxel.zip
-if exist duke3d_hrp.zip set args=%args% -gduke3d_hrp.zip
-if exist hrp_update.zip set args=%args% -ghrp_update.zip
-if exist maphacks.zip set args=%args% -gmaphacks.zip
-if exist eduke32_mus.zip set args=%args% -geduke32_mus.zip
+if exist "%exedir%\polymer_hrp\" set args=%args% -jpolymer_hrp
+if exist "%exedir%\duke3d_voxel.zip" set args=%args% -gduke3d_voxel.zip
+if exist "%exedir%\duke3d_hrp.zip" set args=%args% -gduke3d_hrp.zip
+if exist "%exedir%\hrp_update.zip" set args=%args% -ghrp_update.zip
+if exist "%exedir%\maphacks.zip" set args=%args% -gmaphacks.zip
+if exist "%exedir%\eduke32_mus.zip" set args=%args% -geduke32_mus.zip
 if exist "%addondir%" set args=%args% -j"%addondir:\=/%"
 if exist "%addonhrpdir%" set args=%args% -j"%addonhrpdir:\=/%"
 set args=%args% -gvacation.grp -hvacation.def -xVacaEDuke.con
 if "%editor%"=="1" set args=%args% -namesfile VacaNames.h
-if "%dp%"=="1" (
-set args=%args% -hvaca_dp.def -xVacaDP.con
-)
-if "%xxx%"=="1" (
-if exist xxx_lite.zip set args=%args% -gxxx_lite.zip
-if exist xxx_pack.zip set args=%args% -gxxx_pack.zip
-set args=%args% -hvaca_xxx.def
-if "%dp%"=="1" (
-set args=%args% -hvaca_dp_xxx.def -xVacaDPXXX.con
-) )
+if "%dp%"=="1" set args=%args% -hvaca_dp.def -xVacaDP.con
+if "%xxx%"=="1" if exist "%exedir%\xxx_lite.zip" set args=%args% -gxxx_lite.zip
+if "%xxx%"=="1" if exist "%exedir%\xxx_lite\" set args=%args% -jxxx_lite
+if "%xxx%"=="1" if exist "%exedir%\xxx_pack.zip" set args=%args% -gxxx_pack.zip
+if "%xxx%"=="1" if exist "%exedir%\xxx_pack\" set args=%args% -jxxx_pack
+if "%xxx%"=="1" set args=%args% -hvaca_xxx.def
+if "%xxx%"=="1" if "%dp%"=="1" set args=%args% -hvaca_dp_xxx.def -xVacaDPXXX.con
 set args=%args% %*
 if "%dp%"=="1" set args=%args% -jDukePlus
 ,10 → 141,7
 echo.
 echo Error: You don't have VACATION.GRP in your directory.
 echo.
-if exist VACA15.SSI goto ssi1
-if exist VACAPP.SSI goto ssi2
-if exist VACA13.SSI goto ssi3
-echo You don't have the SSI files in your directory either.
+goto ssicheck
 :retry
 echo.
 set cddrive=
 ,7 → 155,9
 copy %cddrive%:\VACATION\*.SSI .\
 echo.
 type DVINTRO.TXT
-goto novacagrp_done
+echo.
+pause
+goto ssicheck
 :cdno
 echo '%cddrive%' is not valid.  Please try again.
 ,6 → 167,13
 echo '%cddrive%' is not the correct disc.  Please try again.
 goto retry
+:ssicheck
+if exist VACA15.SSI goto ssi1
+if exist VACAPP.SSI goto ssi2
+if exist VACA13.SSI goto ssi3
+echo You don't have the SSI files in your directory.
+goto retry
 :ssi1
 echo You do have the Caribbean SSI file in this directory, but it has not been
 echo extracted.  It will now be unpacked.

 /vaca_plus/VBeachBabe.con
 ,18 → 188,12
           ifrnd 84 spawn BLOODPOOL
           killit
         }
-    }
-/*
   else
     {
       ifp pfacing
       ifpdistl FROZENQUICKKICKDIST
-        {
-        pkick // Why the hell would you want to kick the babe???
-        break
+              pkick
         }
-    }
-*/
   ifcount THAWTIME
     {
       getlastpal
 ,7 → 201,6
     }
   else
       ifcount FROZENDRIPTIME
-        {
           ifactioncount 26
            {
              spawn WATERDRIP

 /vaca_plus/vaca1.mhk
 ,4 → 25,11
 // sprite 416 angleoff -256
 // dragon figurine
-sprite 295 nomdanim
+sprite 295 nomdanim
+// fix spritepole hiding camera
+sprite 240 notmd
+// babes in hot tub
+sprite 78 nomdanim
+sprite 852 nomdanim

 /vaca_plus/VDragon.con
 ,7 → 37,7
 move DRAGONSPEED 60 0
 move DRAGONFLEE  300 0
 move DRAGONSTOPPED
-move DRAGONBACK  -250 0
+move DRAGONBACK  -500 0
 move DRAGONSHRUNKSPEED 50 0
 ai AIDRAGONFLEE     DRAGONBOUNCE DRAGONFLEE fleeenemy randomangle
 ,22 → 97,20
   }
 ends
 state dragondeathanglecode
-      ifvare temp3 0
+      ifvare temp3 -1
         {
-          getplayer[THISACTOR].i temp // gets the player's ID
-          getactor[temp].x x2
-          getactor[temp].y y2
-          getactor[THISACTOR].x x
-          getactor[THISACTOR].y y // gets the coordinates of the player and dragon
-          subvarvar x2 x
-          subvarvar y2 y
-          getangle temp2 x2 y2 // calculates the angle to face the player
-          setvar temp 0
-          randvar temp 256 // randomizes the angle within a certain logical range, since the bullet holes are facing the player
-          ifrnd 128 addvarvar temp2 temp else subvarvar temp2 temp
-          setactor[THISACTOR].ang temp2 // sets the angle, just in time for movement
-          setvar temp3 1
+          getactor[THISACTOR].htang temp // get the angle of the projectile that hit the dragon
+          ifvarg temp 1024 subvar temp 1024 else addvar temp 1024 // turn the angle around to face the projectile
+          setvar temp2 0
+          randvar temp2 128 // randomizes the angle within a certain logical range, since the bullet holes are facing the player
+          ifrnd 128 addvarvar temp temp2 else subvarvar temp temp2
+          getactor[THISACTOR].ang temp3 // pass this along to EVENT_ANIMATESPRITES
+          setactor[THISACTOR].ang temp // sets the angle, just in time for movement
         }
 ends
 ,6 → 173,7
    {
      ifrnd 100
        {
+         ifcansee nullop else ai AIDRAGONBOUNCESEE // This line should make the dragon smarter.
          resetcount
          resetactioncount
        }
 ,8 → 223,8
         }
       else
         {
+          state dragondeathanglecode
           ai AIDRAGONDYING
-          state dragondeathanglecode
         }
       sound BALLEXPLODE
 ,7 → 289,14
 useractor enemy DRAGON DRAGONSTRENGTH DRAGONBOUNCE
    fall
    cstator 257
+  setactor[THISACTOR].mdflags 16
+  ifai 0
+  {
+    setvar temp3 -1
+    ai AIDRAGONBOUNCE
+  }
    state checksquished
       ifaction DRAGONDEAD
 ,6 → 308,7
                 spawn TRANSPORTERSTAR
                 cstat 257
                 strength DRAGONSTRENGTH
+                setvar temp3 -1
                 ai AIDRAGONBOUNCE
               }
             else
 ,10 → 360,9
          break
        }
-  ifhitweapon state DRAGONHITSTATE
+  ifhitweapon
+    state DRAGONHITSTATE
-  ifai 0 ai AIDRAGONBOUNCE
       ifai AIDRAGONGROW state dragongrowstate
  else ifai AIDRAGONSHRUNK state DRAGONSHRINKSTATE
  else
 ,7 → 379,26
 enda
 useractor notenemy DRAGONDEATH 0
+  setvar temp3 -1
+  setactor[THISACTOR].mdflags 16
   addvar temp 1
+  ifvare temp 1
+  {
+    getplayer[THISACTOR].i temp2 // get the player's ID
+    // get the coordinates of the player and dragon
+    getactor[temp2].x x2
+    getactor[temp2].y y2
+    getactor[THISACTOR].x x
+    getactor[THISACTOR].y y
+    subvarvar x2 x
+    subvarvar y2 y
+    getangle y x2 y2 // calculates the angle to face the player
+    setactor[THISACTOR].htang y
+  }
   ifvare temp 26
     {
       setvar temp 0

Subversion Repositories vaca_plus

Compare Revisions

Regard whitespace Rev 24 → Rev 25