diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h index afac2cb7a..dd503d620 100644 --- a/source/games/duke/src/namelist_r.h +++ b/source/games/duke/src/namelist_r.h @@ -659,7 +659,7 @@ y(RRTILE1985, 1985) y(RRTILE1986, 1986) y(RRTILE1987, 1987) y(RRTILE1988, 1988) -y(RRTILE1990, 1990) +y(TIKILAMP, 1990) y(RRTILE1995, 1995) y(RRTILE1996, 1996) y(RRTILE2004, 2004) @@ -684,7 +684,7 @@ y(RRTILE2074, 2074) y(RRTILE2075, 2075) y(RRTILE2083, 2083) x(VIXENSHOT, 2095) -y(RRTILE2097, 2097) +y(TESLA, 2097) y(TOILETSEAT, 2121) y(TOILET2, 2122) y(RRTILE2123, 2123) @@ -1518,6 +1518,7 @@ x(BIKEJIBB, 5877) x(BIKEJIBC, 5882) x(BIKERB, 5890) x(BIKERBV2, 5891) +x(GATOR, 5980) // route 66 x(BIKER, 5995) x(BIKERJIBA, 6112) x(BIKERJIBB, 6117) diff --git a/wadsrc/static/filter/redneck.route66/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck.route66/rmapinfo.spawnclasses new file mode 100644 index 000000000..e9c62a57b --- /dev/null +++ b/wadsrc/static/filter/redneck.route66/rmapinfo.spawnclasses @@ -0,0 +1,5 @@ +spawnclasses +{ + 5015 = RedneckShitBoss + 5980 = RedneckGator +} diff --git a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses index 563efcce6..9e6ae8011 100644 --- a/wadsrc/static/filter/redneck/rmapinfo.spawnclasses +++ b/wadsrc/static/filter/redneck/rmapinfo.spawnclasses @@ -152,6 +152,7 @@ spawnclasses 25 = RedneckRipsaw 24 = RedneckTitgun 29 = RedneckBlaster + 32 = RedneckTitAmmo 49 = RedneckShotgunammo 47 = RedneckDynamiteAmmo 42 = RedneckBlasterammo @@ -278,13 +279,11 @@ spawnclasses 1878 = DukeActor, "*RRTILE1878" 1952 = DukeActor, "*RRTILE1952" 1953 = DukeActor, "*RRTILE1953" - 1990 = DukeActor, "*RRTILE1990" 2050 = DukeActor, "*RRTILE2050" 2056 = DukeActor, "*RRTILE2056" 2072 = DukeActor, "*RRTILE2072" 2075 = DukeActor, "*RRTILE2075" 2083 = DukeActor, "*RRTILE2083" - 2097 = DukeActor, "*RRTILE2097" 2357 = DukeActor, "*RRTILE2357" 2564 = DukeActor, "*RRTILE2564" 2573 = DukeActor, "*RRTILE2573" @@ -363,10 +362,13 @@ spawnclasses 5635 = RedneckVixen 1764 = DukeShotSpark -} 2094 = RedneckTeslaBall - 3395 = RedneckBuzSaw + 3395 = RedneckBuzzSaw //3845 = RedneckPlayerPawn 4983 = RedneckPigEat 2898 = RedneckBustaWin4a 2878 = RedneckBustaWin5a + 2097 = RedneckTesla + 1990 = RedneckTikilamp + +} diff --git a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs index 7fc9dca03..3a778c60b 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckenemies.zs @@ -447,3 +447,14 @@ class RedneckVixen : DukeActor +LOOKALLAROUND; } } + +// only new thing in Route 66. +class RedneckGator : DukeActor +{ + default + { + pic "GATOR"; + +INTERNAL_BADGUY; + +KILLCOUNT; + } +} \ No newline at end of file diff --git a/wadsrc/static/zscript/games/duke/actors/redneckmisc.zs b/wadsrc/static/zscript/games/duke/actors/redneckmisc.zs index e55c575a4..d26a8a80d 100644 --- a/wadsrc/static/zscript/games/duke/actors/redneckmisc.zs +++ b/wadsrc/static/zscript/games/duke/actors/redneckmisc.zs @@ -164,3 +164,20 @@ class RedneckBustaWin4a : DukeItemBase } } +class RedneckTesla : DukeItemBase +{ + default + { + pic "TESLA"; + +FULLBRIGHT + } +} + +class RedneckTikiLamp : DukeItemBase +{ + default + { + pic "TIKILAMP"; + +FULLBRIGHT + } +}