Subversion Repositories duke3d_hrp

Compare Revisions

Ignore whitespace Rev 713 → Rev 714

/highres/sprites/characters.def
20,7 → 20,7
frame { name "FRAME25" tile 603 }
}
 
// Geisha/STATUE (753)
// Geisha/STATUE (753/869)
model "highres/sprites/characters/0753_geisha.md3" {
scale 2.1 shade 2
skin { pal 0 file "highres/sprites/characters/0753_geisha.png" }
/highres/sprites/characters_polymost.def
16,7 → 16,7
frame { name "FRAME1" tile 603 }
}
 
// Geisha/STATUE (753)
// Geisha/STATUE (753/869)
model "highres/sprites/characters/0753_geisha.md3" {
scale 2.1 shade 2
skin { pal 0 file "highres/sprites/characters/0753_geisha.png" }
/highres/sprites/monsters.def
8,7 → 8,7
scale 7 shade 0 zadd -2
skin { pal 0 file "highres/sprites/monsters/0490_cycloidhead2013.png" }
anim { frame0 "frame2" frame1 "frame10" fps 9 flags 0 }
frame { name "frame2" tile0 0490 tile1 0497 }
frame { name "frame2" tile0 490 tile1 497 }
}
 
 
113,7 → 113,8
 
// Drone (1880)
model "highres/sprites/monsters/1880_drone.md3" {
scale 8 shade 1
//scale 8 shade 1 // HRP
scale 10 shade 1 zadd -4 // fit ART/Voxel
detail { file "highres/detail/metal.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/monsters/1880_drone.png" }
glow { file "highres/sprites/monsters/1880_drone_g.png" }
256,7 → 257,7
 
// Gun Turret (2350)
model "highres/sprites/monsters/2350_gunturret.md3" {
scale 12 shade 4
scale 14 shade 4
detail { file "highres/detail/metal.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/monsters/2350_gunturret.png" }
skin { pal 17 file "highres/sprites/monsters/2350_gunturret_17_20.png" }
/highres/sprites/monsters_polymost.def
8,7 → 8,7
scale 1.0 shade 3
skin { pal 0 file "highres/sprites/monsters_polymost/0490_cycloidhead.png" }
anim { frame0 "FRAME6" frame1 "FRAME25" fps 10 flags 0 }
frame { name "FRAME6" tile0 0490 tile1 0497 }
frame { name "FRAME6" tile0 490 tile1 497 }
}
 
 
119,7 → 119,8
 
// Drone (1880)
model "highres/sprites/monsters/1880_drone.md3" {
scale 8 shade 1
//scale 8 shade 1 // HRP
scale 10 shade 1 zadd -4 // fit ART/Voxel
detail { file "highres/detail/metal.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/monsters/1880_drone.png" }
glow { file "highres/sprites/monsters/1880_drone_g.png" }
262,7 → 263,7
 
// Gun Turret (2350)
model "highres/sprites/monsters/2350_gunturret.md3" {
scale 12 shade 4
scale 14 shade 4
detail { file "highres/detail/metal.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/monsters/2350_gunturret.png" }
skin { pal 17 file "highres/sprites/monsters/2350_gunturret_17_20.png" }
/highres/sprites/pickups.def
49,7 → 49,7
 
// Pipe Bomb (26)
model "highres/sprites/pickups/0026_pipebomb.md3" {
scale 20 shade 2
scale 16 shade 2
skin { pal 0 file "highres/sprites/pickups/0047_pipebombbox.png" }
detail { file "highres/detail/metal.png" detailscale 0.3 }
frame { name "frame00" tile 26 }
253,7 → 253,7
 
// Key Card (60)
model "highres/sprites/pickups/0060_keycard.md3" {
scale 2 shade 0
scale 2.4 shade 0
skin { pal 0 file "highres/sprites/pickups/0060_keycard.png" nocompress }
skin { pal 10 file "highres/sprites/pickups/0060_keycard_10.png" nocompress }
skin { pal 11 file "highres/sprites/pickups/0060_keycard_11_22.png" nocompress }
/highres/sprites/pickups_polymost.def
49,7 → 49,7
 
// Pipe Bomb (26)
model "highres/sprites/pickups/0026_pipebomb.md3" {
scale 20 shade 2
scale 16 shade 2
skin { pal 0 file "highres/sprites/pickups/0047_pipebombbox.png" }
detail { file "highres/detail/metal.png" detailscale 0.3 }
frame { name "frame00" tile 26 }
253,7 → 253,7
 
// Key Card (60)
model "highres/sprites/pickups/0060_keycard.md3" {
scale 2 shade 0
scale 2.4 shade 0
skin { pal 0 file "highres/sprites/pickups/0060_keycard.png" nocompress }
skin { pal 10 file "highres/sprites/pickups/0060_keycard_10.png" nocompress }
skin { pal 11 file "highres/sprites/pickups/0060_keycard_11_22.png" nocompress }
/highres/sprites/projectiles.def
45,7 → 45,7
 
// Battlelord Grenade (1650)
model "highres/sprites/projectiles/1650_morter.md3" {
scale 2 shade 6
scale 2.75 shade 6
skin { pal 0 file "highres/sprites/projectiles/1650_blgrenade.png" }
glow { file "highres/sprites/projectiles/1650_blgrenade_g.png" }
anim { frame0 "Frame0" frame1 "Frame0" fps 1 flags 0 }
/highres/sprites/projectiles_polymost.def
45,7 → 45,7
 
// Battlelord Grenade (1650)
model "highres/sprites/projectiles/1650_morter.md3" {
scale 2 shade 6
scale 2.75 shade 6
skin { pal 0 file "highres/sprites/projectiles/1650_blgrenade.png" }
glow { file "highres/sprites/projectiles/1650_blgrenade_g.png" }
anim { frame0 "Frame0" frame1 "Frame0" fps 1 flags 0 }
/highres/sprites/props/0697_pot1.md3
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
/highres/sprites/props/0697_pot1.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
/highres/sprites/props/0697_pot3.md3
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
/highres/sprites/props/0697_pot3.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
/highres/sprites/props/bottles/1014_bottle9.md3
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
/highres/sprites/props/bottles/0956_bottle2.md3
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
/highres/sprites/props/bottles/0955_bottle1.md3
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
/highres/sprites/props/bottles/1014_bottle9.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
/highres/sprites/props/bottles/0956_bottle2.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
/highres/sprites/props/bottles/0955_bottle1.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
/highres/sprites/props/bottles/0955_bottle2.md3
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
/highres/sprites/props/bottles/0955_bottle2.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
/highres/sprites/props/bottles/0956_bottle3.md3
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
/highres/sprites/props/bottles/0956_bottle3.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
/highres/sprites/props/bottles/1014_bottle8.md3
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
/highres/sprites/props/bottles/1014_bottle8.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
/highres/sprites/props.def
143,7 → 143,7
skin { pal 0 file "highres/sprites/props/0551_domelight.png" }
glow { file "highres/sprites/props/0551_domelight_g.png" }
anim { frame0 "FRAME4" frame1 "FRAME11" fps 15 flags 0 }
frame { name "FRAME4" tile0 0551 tile1 0554 }
frame { name "FRAME4" tile0 551 tile1 554 }
}
 
// Pipe handle (555)
153,9 → 153,9
frame { name "frame1" tile 555 }
}
 
// Chair 1 (556)
// Chair 1 (556) = Chair 2 (557)
model "highres/sprites/props/0556_chair1.md3" {
scale 2 shade 2
scale 2.1 shade 2
// detail { file "highres/detail/fabric.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props/0556_chair1_d.png" }
normal { file "highres/sprites/props/0556_chair1_n.png" }
165,7 → 165,7
 
// Broken Chair (559)
model "highres/sprites/props/0559_brokenchair.md3" {
scale 2 shade 2
scale 2.1 shade 2
// detail { file "highres/detail/fabric.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props/0556_chair1_d.png" }
normal { file "highres/sprites/props/0556_chair1_n.png" }
446,7 → 446,7
skin { pal 21 file "highres/sprites/props/0680_21.png" }
skin { pal 22 file "highres/sprites/props/0680_11_22.png" }
skin { pal 23 file "highres/sprites/props/0680_23.png" }
frame { name "FRAME1" tile0 0680 tile1 0684 }
frame { name "FRAME1" tile0 680 tile1 684 }
}
 
// Reflektor (685)
453,7 → 453,7
model "highres/sprites/props/0685_reflektor.md3" {
scale 9 shade 0
skin { pal 0 file "highres/sprites/props/0685_reflektor.jpg" }
frame { name "FRAME1" tile 0685 }
frame { name "FRAME1" tile 685 }
}
 
// Movie camera (686)
502,7 → 502,7
frame { name "FRAME1" tile 693 }
}
 
// Souce pan (694)
// Pot 1 (Souce pan) (694)
model "highres/sprites/props/0694_saucepan.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0694_saucepan.jpg" }
509,7 → 509,7
frame { name "idle" tile0 694 tile1 694 }
}
 
// Frying pan (695)
// Pot 2 (Frying pan) (695)
model "highres/sprites/props/0695_fryingpan.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0694_saucepan.jpg" }
516,10 → 516,10
frame { name "idle" tile0 695 tile1 695 }
}
 
// Pot 1 (697)
model "highres/sprites/props/0697_pot1.md3" {
// Pot 3 (697)
model "highres/sprites/props/0697_pot3.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0697_pot1.png" }
skin { pal 0 file "highres/sprites/props/0697_pot3.png" }
frame { name "frame00" tile 697 }
}
 
600,7 → 600,7
frame { name "frame00" tile 901 }
}
 
// Que Ball (902)
// Queue Ball (902)
model "highres/sprites/props/poolballs/0901_stripeball.md3" {
scale 1 shade 8
skin { pal 0 file "highres/sprites/props/poolballs/0902_queball.png" }
676,7 → 676,7
scale 1 shade 0
detail { file "highres/detail/wood_h3.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/0914_woodfence.png" }
frame { name "FRAME1" tile 0914 }
frame { name "FRAME1" tile 914 }
}
 
// Fire Ext (916)
769,17 → 769,17
frame { name "Frame0" tile 954 }
}
 
// Bottle1 fallen (955)
model "highres/sprites/props/bottles/0955_bottle1.md3" {
// Bottle2 (955)
model "highres/sprites/props/bottles/0955_bottle2.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/0955_bottle1.png" }
skin { pal 0 file "highres/sprites/props/bottles/0955_bottle2.png" }
frame { name "1" tile 955 }
}
 
// Bottle2 (956)
model "highres/sprites/props/bottles/0956_bottle2.md3" {
// Bottle3 (956)
model "highres/sprites/props/bottles/0956_bottle3.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/0956_bottle2.png" }
skin { pal 0 file "highres/sprites/props/bottles/0956_bottle3.png" }
frame { name "1" tile 956 }
}
 
900,7 → 900,7
scale 17 shade 0
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/0994_pipe5.jpg" }
frame { name "FRAME1" tile 0994 }
frame { name "FRAME1" tile 994 }
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/1005_pipe5b.jpg" }
frame { name "FRAME1" tile 1005 }
958,10 → 958,10
frame { name "Frame0" tile 1013 }
}
 
// Bottle9 fallen (1014)
model "highres/sprites/props/bottles/1014_bottle9.md3" {
// Bottle8 (1014)
model "highres/sprites/props/bottles/1014_bottle8.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/1014_bottle9.png" }
skin { pal 0 file "highres/sprites/props/bottles/1014_bottle8.png" }
frame { name "1" tile 1014 }
}
 
992,7 → 992,7
 
// Round Table (1037)
model "highres/sprites/props/1037_rtable.md3" {
scale 1.4 shade 2
scale 1.47 shade 2
skin { pal 0 file "highres/sprites/props/1037_rtable.png" }
frame { name "frame00" tile0 1037 tile1 1037 }
}
1056,6 → 1056,7
// Toilet paper (1053)
model "highres/sprites/props/1053_toiletpaper.md3" {
scale 3 shade 4
//scale 4.2 shade 4 zadd 5.5 // *.mhk file patch pending...
skin { pal 0 file "highres/sprites/props/1053_toiletpaper.png" }
anim { frame0 "frame00" frame1 "frame13" fps 6 flags 0 }
frame { name "frame00" tile 1053 }
1106,8 → 1107,7
 
// Socket (1069)
model "highres/sprites/props/1069_socket.md3" {
zadd 0
scale 15 shade 0
scale 13.8 shade 0
detail { file "highres/detail/metal_fine.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/1069_socket.png" }
frame { name "FRAME1" tile 1069 }
1125,7 → 1125,8
 
// Ooz Filter (1079)
model "highres/sprites/props/1079_oozfilter.md3" {
scale 1 shade 0
scale 1 shade 0 // HRP
//scale 1.25 shade 0 // fit ART/Voxel width
detail { file "highres/detail/metal_fine.png" detailscale 0.3 }
skin { pal 0 surface 0 file "highres/sprites/props/1079_oozfilter.jpg" }
skin { pal 0 surface 1 file "highres/sprites/props/1079_oozfilter.png" }
1270,7 → 1271,8
// Barrels
 
model "highres/sprites/props/1227_nukebarrel.md3" {
scale 1.8 shade 8
scale 1.8 shade 8 // HRP
//scale 2.5 shade 8 // fit ART/Voxel width
 
// NukeBarrel (1227)
detail { file "highres/detail/rust.png" detailscale 0.5 }
1293,12 → 1295,12
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4580_oilbarrel.jpg" }
frame { name "frame00" tile 4580 }
 
// WhiteBarrel (4581)
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4581_whitebarrel.jpg" }
frame { name "frame00" tile 4581 }
 
// ToxicBarrel (4582)
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4582_toxicbarrel.jpg" }
1335,7 → 1337,8
 
// FireBarrel (1240)
model "highres/sprites/props/1240_firebarrel.md3" {
scale 1.6 0
//scale 1.6 0 // fit ART/Voxel height
scale 1.4 0 // fit ART/Voxel width
detail { file "highres/detail/metal.png" detailscale 0.5 }
skin { pal 0 file "highres/sprites/props/1240_firebarrel.png" }
anim { frame0 "Frame 0" frame1 "Frame 5" fps 15 flags 0 }
1544,7 → 1547,7
 
// Gunpowder barrel (4360)
model "highres/sprites/props/4360_barrel.md3" {
scale 2.2 shade 0
scale 2.1 shade 0
detail { file "highres/detail/wood_v3.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props/4360_barrel.jpg" }
frame { name "idle" tile0 4360 tile1 4360 }
/highres/sprites/props_polymost.def
143,7 → 143,7
skin { pal 0 file "highres/sprites/props/0551_domelight.png" }
glow { file "highres/sprites/props/0551_domelight_g.png" }
anim { frame0 "FRAME4" frame1 "FRAME11" fps 15 flags 0 }
frame { name "FRAME4" tile0 0551 tile1 0554 }
frame { name "FRAME4" tile0 551 tile1 554 }
}
 
// Pipe handle (555)
153,9 → 153,9
frame { name "frame1" tile 555 }
}
 
// Chair 1 (556)
// Chair 1 (556) = Chair 2 (557)
model "highres/sprites/props_polymost/0556_chair1.md3" {
scale 2 shade 2
scale 2.1 shade 2
detail { file "highres/detail/fabric.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props_polymost/0556_chair1.png" }
 
165,7 → 165,7
 
// Broken Chair (559)
model "highres/sprites/props_polymost/0559_brokenchair.md3" {
scale 2 shade 2
scale 2.1 shade 2
detail { file "highres/detail/fabric.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props_polymost/0556_chair1.png" }
 
250,7 → 250,7
frame { name "1" tile 573 }
}
 
// Sensor (584)
// Sensor (584) // needs to be moved backwards
model "highres/sprites/props_polymost/0584_sensor.md3" {
scale 0.9 shade 0
skin { pal 0 surface 0 file "highres/sprites/props_polymost/0584_sensor_body.png" }
446,7 → 446,7
skin { pal 21 file "highres/sprites/props/0680_21.png" }
skin { pal 22 file "highres/sprites/props/0680_11_22.png" }
skin { pal 23 file "highres/sprites/props/0680_23.png" }
frame { name "FRAME1" tile0 0680 tile1 0684 }
frame { name "FRAME1" tile0 680 tile1 684 }
}
 
// Reflektor (685)
453,7 → 453,7
model "highres/sprites/props/0685_reflektor.md3" {
scale 9 shade 0
skin { pal 0 file "highres/sprites/props/0685_reflektor.jpg" }
frame { name "FRAME1" tile 0685 }
frame { name "FRAME1" tile 685 }
}
 
// Movie camera (686)
502,7 → 502,7
frame { name "FRAME1" tile 693 }
}
 
// Souce pan (694)
// Pot 1 (Souce pan) (694)
model "highres/sprites/props/0694_saucepan.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0694_saucepan.jpg" }
509,7 → 509,7
frame { name "idle" tile0 694 tile1 694 }
}
 
// Frying pan (695)
// Pot 2 (Frying pan) (695)
model "highres/sprites/props/0695_fryingpan.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0694_saucepan.jpg" }
516,10 → 516,10
frame { name "idle" tile0 695 tile1 695 }
}
 
// Pot 1 (697)
model "highres/sprites/props/0697_pot1.md3" {
// Pot 3 (697)
model "highres/sprites/props/0697_pot3.md3" {
scale 1 shade 0
skin { pal 0 file "highres/sprites/props/0697_pot1.png" }
skin { pal 0 file "highres/sprites/props/0697_pot3.png" }
frame { name "frame00" tile 697 }
}
 
600,7 → 600,7
frame { name "frame00" tile 901 }
}
 
// Que Ball (902)
// Queue Ball (902)
model "highres/sprites/props/poolballs/0901_stripeball.md3" {
scale 1 shade 8
skin { pal 0 file "highres/sprites/props/poolballs/0902_queball.png" }
676,7 → 676,7
scale 1 shade 0
detail { file "highres/detail/wood_h3.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/0914_woodfence.png" }
frame { name "FRAME1" tile 0914 }
frame { name "FRAME1" tile 914 }
}
 
// Fire Ext (916)
769,17 → 769,17
frame { name "Frame0" tile 954 }
}
 
// Bottle1 fallen (955)
model "highres/sprites/props/bottles/0955_bottle1.md3" {
// Bottle2 (955)
model "highres/sprites/props/bottles/0955_bottle2.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/0955_bottle1.png" }
skin { pal 0 file "highres/sprites/props/bottles/0955_bottle2.png" }
frame { name "1" tile 955 }
}
 
// Bottle2 (956)
model "highres/sprites/props/bottles/0956_bottle2.md3" {
// Bottle3 (956)
model "highres/sprites/props/bottles/0956_bottle3.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/0956_bottle2.png" }
skin { pal 0 file "highres/sprites/props/bottles/0956_bottle3.png" }
frame { name "1" tile 956 }
}
 
900,7 → 900,7
scale 17 shade 0
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/0994_pipe5.jpg" }
frame { name "FRAME1" tile 0994 }
frame { name "FRAME1" tile 994 }
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/1005_pipe5b.jpg" }
frame { name "FRAME1" tile 1005 }
958,10 → 958,10
frame { name "Frame0" tile 1013 }
}
 
// Bottle9 fallen (1014)
model "highres/sprites/props/bottles/1014_bottle9.md3" {
// Bottle8 (1014)
model "highres/sprites/props/bottles/1014_bottle8.md3" {
scale 2.5 shade 0
skin { pal 0 file "highres/sprites/props/bottles/1014_bottle9.png" }
skin { pal 0 file "highres/sprites/props/bottles/1014_bottle8.png" }
frame { name "1" tile 1014 }
}
 
992,7 → 992,7
 
// Round Table (1037)
model "highres/sprites/props/1037_rtable.md3" {
scale 1.4 shade 2
scale 1.47 shade 2
skin { pal 0 file "highres/sprites/props/1037_rtable.png" }
frame { name "frame00" tile0 1037 tile1 1037 }
}
1056,6 → 1056,7
// Toilet paper (1053)
model "highres/sprites/props/1053_toiletpaper.md3" {
scale 3 shade 4
//scale 4.2 shade 4 zadd 5.5 // *.mhk file patch pending...
skin { pal 0 file "highres/sprites/props/1053_toiletpaper.png" }
anim { frame0 "frame00" frame1 "frame13" fps 6 flags 0 }
frame { name "frame00" tile 1053 }
1106,8 → 1107,7
 
// Socket (1069)
model "highres/sprites/props/1069_socket.md3" {
zadd 0
scale 15 shade 0
scale 13.8 shade 0
detail { file "highres/detail/metal_fine.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/1069_socket.png" }
frame { name "FRAME1" tile 1069 }
1125,7 → 1125,8
 
// Ooz Filter (1079)
model "highres/sprites/props/1079_oozfilter.md3" {
scale 1 shade 0
scale 1 shade 0 // HRP
//scale 1.25 shade 0 // fit ART/Voxel width
detail { file "highres/detail/metal_fine.png" detailscale 0.3 }
skin { pal 0 surface 0 file "highres/sprites/props/1079_oozfilter.jpg" }
skin { pal 0 surface 1 file "highres/sprites/props/1079_oozfilter.png" }
1270,7 → 1271,8
// Barrels
 
model "highres/sprites/props_polymost/1227_nukebarrel.md3" {
scale 1.8 shade 8
scale 1.8 shade 8 // HRP
//scale 2.5 shade 8 // fit ART/Voxel width
 
// NukeBarrel (1227)
detail { file "highres/detail/rust.png" detailscale 0.5 }
1293,12 → 1295,12
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4580_oilbarrel.jpg" }
frame { name "frame00" tile 4580 }
 
// WhiteBarrel (4581)
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4581_whitebarrel.jpg" }
frame { name "frame00" tile 4581 }
 
// ToxicBarrel (4582)
detail { file "highres/detail/metal_worn.png" detailscale 0.3 }
skin { pal 0 file "highres/sprites/props/4582_toxicbarrel.jpg" }
1335,7 → 1337,8
 
// FireBarrel (1240)
model "highres/sprites/props/1240_firebarrel.md3" {
scale 1.6 0
//scale 1.6 0 // fit ART/Voxel height
scale 1.4 0 // fit ART/Voxel width
detail { file "highres/detail/metal.png" detailscale 0.5 }
skin { pal 0 file "highres/sprites/props/1240_firebarrel.png" }
anim { frame0 "Frame 0" frame1 "Frame 5" fps 15 flags 0 }
1544,7 → 1547,7
 
// Gunpowder barrel (4360)
model "highres/sprites/props/4360_barrel.md3" {
scale 2.2 shade 0
scale 2.1 shade 0
detail { file "highres/detail/wood_v3.png" detailscale 0.1 }
skin { pal 0 file "highres/sprites/props/4360_barrel.jpg" }
frame { name "idle" tile0 4360 tile1 4360 }
/highres/sprites/signs/4891_crap.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
/highres/sprites/signs/4891_storecrap.jpg
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
/highres/sprites/signs.def
128,7 → 128,8
 
// Please Wait To Be Seated (716)
model "highres/sprites/signs/0716_seatedsign.md3" {
scale 30 shade 0
//scale 35 shade 0 // matches ART/Voxel
scale 30 shade 0 // looks better
skin { pal 0 file "highres/sprites/signs/0716_seatedsign.png" }
frame { name "0716" tile 716 }
}
199,7 → 200,7
// Exit (961)
texture 961 { pal 0 { file "highres/sprites/signs/0961.png" } } // "notmd"
model "highres/sprites/signs/0961_exit.md3" {
scale 17 zadd 1 shade 0
scale 15 zadd 1 shade 0
skin { pal 0 file "highres/sprites/signs/0961_exit_d.png" }
skin { pal 14 file "highres/sprites/signs/0961_exit_14_d.png" }
normal { file "highres/sprites/signs/0961_exit_n.png" }
281,7 → 282,7
frame { name "frame00" tile 1210 }
skin { pal 0 file "highres/sprites/signs/1211_innocent.png" }
frame { name "frame00" tile 1211 }
skin { pal 0 file "highres/sprites/signs/4891_crap.jpg" }
skin { pal 0 file "highres/sprites/signs/4891_storecrap.jpg" }
frame { name "frame00" tile 4891 }
}
 
482,7 → 483,7
 
// Slippery When Wet (4495)
model "highres/sprites/signs/4495_slipsign.md3" {
scale 1.5 shade 0
scale 1.25 shade 0
skin { pal 0 file "highres/sprites/signs/4495_slipsign.png" }
frame { name "frame00" tile 4495 }
}
/highres/sprites/signs_polymost.def
124,7 → 124,8
 
// Please Wait To Be Seated (716)
model "highres/sprites/signs/0716_seatedsign.md3" {
scale 30 shade 0
//scale 35 shade 0 // matches ART/Voxel
scale 30 shade 0 // looks better
skin { pal 0 file "highres/sprites/signs/0716_seatedsign.png" }
frame { name "0716" tile 716 }
}
193,7 → 194,7
// Exit (961)
texture 961 { pal 0 { file "highres/sprites/signs/0961.png" } } // "notmd"
model "highres/sprites/signs_polymost/0961_exit.md3" {
scale 17 zadd 1 shade 0
scale 15 zadd 1 shade 0
skin { pal 0 file "highres/sprites/signs_polymost/0961_exit.png" }
skin { pal 14 file "highres/sprites/signs_polymost/0961_exit_14.png" }
frame { name "exit1" tile 961 }
271,7 → 272,7
frame { name "frame00" tile 1210 }
skin { pal 0 file "highres/sprites/signs/1211_innocent.png" }
frame { name "frame00" tile 1211 }
skin { pal 0 file "highres/sprites/signs/4891_crap.jpg" }
skin { pal 0 file "highres/sprites/signs/4891_storecrap.jpg" }
frame { name "frame00" tile 4891 }
}
 
472,7 → 473,7
 
// Slippery When Wet (4495)
model "highres/sprites/signs/4495_slipsign.md3" {
scale 1.5 shade 0
scale 1.25 shade 0
skin { pal 0 file "highres/sprites/signs/4495_slipsign.png" }
frame { name "frame00" tile 4495 }
}
/highres/sprites/switches.def
80,7 → 80,7
 
// Slot Door (132/133)
model "highres/sprites/switches/0132_slotdoor.md3" {
scale 1.5 shade 0
scale 1.55 shade 0
skin { pal 0 file "highres/sprites/switches/0132_slotdoor.png" }
detail { file "highres/detail/metal.png" xscale 0.6 yscale 1.2 }
glow { file "highres/sprites/switches/0132_slotdoor_g.png" }
88,7 → 88,7
}
 
model "highres/sprites/switches/0133_slotdoor.md3" {
scale 1.5 shade 0
scale 1.55 shade 0
skin { pal 0 file "highres/sprites/switches/0133_slotdoor.png" }
detail { file "highres/detail/metal.png" xscale 0.6 yscale 1.2 }
glow { file "highres/sprites/switches/0133_slotdoor_g.png" }
/highres/sprites/switches_polymost.def
80,7 → 80,7
 
// Slot Door (132/133)
model "highres/sprites/switches/0132_slotdoor.md3" {
scale 1.5 shade 0
scale 1.55 shade 0
skin { pal 0 file "highres/sprites/switches/0132_slotdoor.png" }
detail { file "highres/detail/metal.png" xscale 0.6 yscale 1.2 }
glow { file "highres/sprites/switches/0132_slotdoor_g.png" }
88,7 → 88,7
}
 
model "highres/sprites/switches/0133_slotdoor.md3" {
scale 1.5 shade 0
scale 1.55 shade 0
skin { pal 0 file "highres/sprites/switches/0133_slotdoor.png" }
detail { file "highres/detail/metal.png" xscale 0.6 yscale 1.2 }
glow { file "highres/sprites/switches/0133_slotdoor_g.png" }
/tools/hrp_extract.bash
1,6 → 1,6
#!/bin/bash
 
# Duke Nukem 3D CON/DEF/HRP File Extractor v0.9.1 2019-09-17
# Duke Nukem 3D CON/DEF/HRP File Extractor v0.9.2 2020-02-21
#
# Author: LeoD
# License: ISC License -> https://opensource.org/licenses/isc-license.txt
238,6 → 238,9
cp -pv duke3d_voxels.def "${EXTRACTDIR}"
cp -pv dukegdx.def "${EXTRACTDIR}"
cp -pv voxels/pickups_gdx.def "${EXTRACTDIR}/voxels/"
#cp -pv voxels/monsters.def "${EXTRACTDIR}/voxels/"
#cp -pv voxels/monsters/*.kvx "${EXTRACTDIR}/voxels/monsters/"
cp -pv voxels/hrp_undefines.def "${EXTRACTDIR}/voxels/"
cp -pv eduke.con "${EXTRACTDIR}"
if [ -d scripts/ ] ; then
cp -pv scripts/*.con "${EXTRACTDIR}/scripts/"
247,6 → 250,7
cp -pv EDUKE.CON "${EXTRACTDIR}"
fi
if [ -d voxels/scripts/ ] ; then
#cp -pv voxels/scripts/faucet2.con "${EXTRACTDIR}/voxels/scripts/"
#cp -pv voxels/scripts/freezeammo.con "${EXTRACTDIR}/voxels/scripts/"
#cp -pv voxels/scripts/holoduke.con "${EXTRACTDIR}/voxels/scripts/"
#cp -pv voxels/scripts/pigtank.con "${EXTRACTDIR}/voxels/scripts/"
552,6 → 556,7
 
if [ "${HRP_FILE}" ] ; then
extract_file "${HRP_FILE}"
HRP_FILE=""
fi
 
done
844,14 → 849,23
DEF_TOP="duke3d.def"
info "Auto mode found ${DEF_TOP}"
parse_defs "${DEF_TOP}"
elif [ -f "dukegdx.def" ] ; then
DEF_TOP="dukegdx.def"
info "Auto mode found ${DEF_TOP}"
parse_defs "${DEF_TOP}"
fi
elif [ -f "duke3d.def" ] ; then
DEF_TOP="duke3d.def"
info "Auto mode found ${DEF_TOP}"
parse_defs "${DEF_TOP}"
elif [ -f "dukegdx.def" ] ; then
DEF_TOP="dukegdx.def"
info "Auto mode found ${DEF_TOP}"
parse_defs "${DEF_TOP}"
else
exit_on_error "Please report to LeoD"
fi
 
fi
 
info "Copying 'known' files ..."
863,8 → 877,8
#date +%F" "%H:%M:%S
 
#echo "Command line example for creating a ZIP package:"
#echo "sh -c \"cd ${EXTRACTDIR}; zip -9rqn .jpg:.png:.zip ${EXTRACTDIR}.zip\
#highpal highres maphacks *.def *.txt\""
#echo "sh -c \"cd ${EXTRACTDIR}; zip -9rqn .jpg:.png:.svn:.zip \
# ${EXTRACTDIR}.zip highpal highres maphacks *.def *.txt\""
} # main()
 
 
937,10 → 951,10
auto)
SET_VERSION=NO
EXTRACT_COMMENTED_FILES=NO
if [ -f "EDUKE.CON" ] || [ -f "GAME.CON" ] || [ -f "duke3d.def" ] ; then
if [ -f "EDUKE.CON" ] || [ -f "GAME.CON" ] || [ -f "duke3d.def" ] || [ -f "dukegdx.def" ] ; then
main $HRPTYPE
else
exit_on_error "Auto mode found no suitable toplevel file (EDUKE.CON|GAME.CON|duke3d.def)."
exit_on_error "Auto mode found no suitable toplevel file (EDUKE.CON|GAME.CON|duke3d.def|dukegdx.def)."
fi
;;
unused)