diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index cfcf37e90..705f29798 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -1,270 +1,272 @@ version "3.8" -#include "zscript/base.txt" -#include "zscript/sounddata.txt" -#include "zscript/mapdata.txt" -#include "zscript/dynarrays.txt" -#include "zscript/constants.txt" -#include "zscript/actor.txt" -#include "zscript/actor_attacks.txt" -#include "zscript/actor_checks.txt" -#include "zscript/actor_interaction.txt" -#include "zscript/actor_inventory.txt" -#include "zscript/actor_actions.txt" -#include "zscript/events.txt" -#include "zscript/destructible.txt" -#include "zscript/level_compatibility.txt" +#include "zscript/base.zs" +#include "zscript/sounddata.zs" +#include "zscript/mapdata.zs" +#include "zscript/dynarrays.zs" +#include "zscript/constants.zs" +#include "zscript/events.zs" +#include "zscript/destructible.zs" +#include "zscript/level_compatibility.zs" -#include "zscript/menu/menuitembase.txt" -#include "zscript/menu/menu.txt" -#include "zscript/menu/messagebox.txt" -#include "zscript/menu/listmenu.txt" -#include "zscript/menu/listmenuitems.txt" -#include "zscript/menu/optionmenu.txt" -#include "zscript/menu/optionmenuitems.txt" -#include "zscript/menu/colorpickermenu.txt" -#include "zscript/menu/joystickmenu.txt" -#include "zscript/menu/loadsavemenu.txt" -#include "zscript/menu/playermenu.txt" -#include "zscript/menu/playerdisplay.txt" -#include "zscript/menu/playercontrols.txt" -#include "zscript/menu/textentermenu.txt" -#include "zscript/menu/readthis.txt" -#include "zscript/menu/conversationmenu.txt" -#include "zscript/menu/reverbedit.txt" +#include "zscript/actors/actor.zs" +#include "zscript/actors/checks.zs" +#include "zscript/actors/interaction.zs" +#include "zscript/actors/inventory_util.zs" +#include "zscript/actors/actions.zs" +#include "zscript/actors/attacks.zs" +#include "zscript/actors/morph.zs" -#include "zscript/statscreen/types.txt" -#include "zscript/statscreen/statscreen.txt" -#include "zscript/statscreen/statscreen_sp.txt" -#include "zscript/statscreen/statscreen_dm.txt" -#include "zscript/statscreen/statscreen_coop.txt" +#include "zscript/actors/inventory/inventory.zs" +#include "zscript/actors/inventory/inv_misc.zs" +#include "zscript/actors/inventory/stateprovider.zs" +#include "zscript/actors/inventory/weapons.zs" +#include "zscript/actors/inventory/weaponpiece.zs" +#include "zscript/actors/inventory/armor.zs" +#include "zscript/actors/inventory/ammo.zs" +#include "zscript/actors/inventory/health.zs" +#include "zscript/actors/inventory/powerups.zs" -#include "zscript/statusbar/statusbar.txt" -#include "zscript/statusbar/doom_sbar.txt" -#include "zscript/statusbar/heretic_sbar.txt" -#include "zscript/statusbar/hexen_sbar.txt" -#include "zscript/statusbar/strife_sbar.txt" -#include "zscript/statusbar/harm_sbar.txt" -#include "zscript/statusbar/sbarinfowrapper.txt" -#include "zscript/statusbar/alt_hud.txt" +#include "zscript/actors/player/player.zs" +#include "zscript/actors/player/player_cheat.zs" +#include "zscript/actors/player/player_inventory.zs" +#include "zscript/actors/player/player_morph.zs" -#include "zscript/inventory/inventory.txt" -#include "zscript/inventory/inv_misc.txt" -#include "zscript/inventory/stateprovider.txt" -#include "zscript/inventory/weapons.txt" -#include "zscript/inventory/weaponpiece.txt" -#include "zscript/inventory/armor.txt" -#include "zscript/inventory/ammo.txt" -#include "zscript/inventory/health.txt" -#include "zscript/inventory/powerups.txt" +#include "zscript/actors/shared/botstuff.zs" +#include "zscript/actors/shared/sharedmisc.zs" +#include "zscript/actors/shared/blood.zs" +#include "zscript/actors/shared/debris.zs" +#include "zscript/actors/shared/decal.zs" +#include "zscript/actors/shared/splashes.zs" +#include "zscript/actors/shared/itemeffects.zs" +#include "zscript/actors/shared/fountain.zs" +#include "zscript/actors/shared/spark.zs" +#include "zscript/actors/shared/soundsequence.zs" +#include "zscript/actors/shared/soundenvironment.zs" +#include "zscript/actors/shared/bridge.zs" +#include "zscript/actors/shared/specialspot.zs" +#include "zscript/actors/shared/teleport.zs" +#include "zscript/actors/shared/camera.zs" +#include "zscript/actors/shared/movingcamera.zs" +#include "zscript/actors/shared/mapmarker.zs" +#include "zscript/actors/shared/waterzone.zs" +#include "zscript/actors/shared/skies.zs" +#include "zscript/actors/shared/hatetarget.zs" +#include "zscript/actors/shared/secrettrigger.zs" +#include "zscript/actors/shared/setcolor.zs" +#include "zscript/actors/shared/sectoraction.zs" +#include "zscript/actors/shared/ice.zs" +#include "zscript/actors/shared/dog.zs" +#include "zscript/actors/shared/fastprojectile.zs" +#include "zscript/actors/shared/randomspawner.zs" +#include "zscript/actors/shared/dynlights.zs" -#include "zscript/shared/player.txt" -#include "zscript/shared/player_cheat.txt" -#include "zscript/shared/player_inventory.txt" -#include "zscript/shared/morph.txt" -#include "zscript/shared/botstuff.txt" -#include "zscript/shared/sharedmisc.txt" -#include "zscript/shared/blood.txt" -#include "zscript/shared/debris.txt" -#include "zscript/shared/decal.txt" -#include "zscript/shared/splashes.txt" -#include "zscript/shared/itemeffects.txt" -#include "zscript/shared/fountain.txt" -#include "zscript/shared/spark.txt" -#include "zscript/shared/soundsequence.txt" -#include "zscript/shared/soundenvironment.txt" -#include "zscript/shared/bridge.txt" -#include "zscript/shared/specialspot.txt" -#include "zscript/shared/teleport.txt" -#include "zscript/shared/camera.txt" -#include "zscript/shared/movingcamera.txt" -#include "zscript/shared/mapmarker.txt" -#include "zscript/shared/waterzone.txt" -#include "zscript/shared/skies.txt" -#include "zscript/shared/hatetarget.txt" -#include "zscript/shared/secrettrigger.txt" -#include "zscript/shared/setcolor.txt" -#include "zscript/shared/sectoraction.txt" -#include "zscript/shared/ice.txt" -#include "zscript/shared/dog.txt" -#include "zscript/shared/fastprojectile.txt" -#include "zscript/shared/randomspawner.txt" -#include "zscript/shared/dynlights.txt" +#include "zscript/actors/doom/doomplayer.zs" +#include "zscript/actors/doom/possessed.zs" +#include "zscript/actors/doom/doomimp.zs" +#include "zscript/actors/doom/demon.zs" +#include "zscript/actors/doom/lostsoul.zs" +#include "zscript/actors/doom/cacodemon.zs" +#include "zscript/actors/doom/bruiser.zs" +#include "zscript/actors/doom/revenant.zs" +#include "zscript/actors/doom/arachnotron.zs" +#include "zscript/actors/doom/fatso.zs" +#include "zscript/actors/doom/painelemental.zs" +#include "zscript/actors/doom/archvile.zs" +#include "zscript/actors/doom/cyberdemon.zs" +#include "zscript/actors/doom/spidermaster.zs" +#include "zscript/actors/doom/keen.zs" +#include "zscript/actors/doom/bossbrain.zs" +#include "zscript/actors/doom/weaponfist.zs" +#include "zscript/actors/doom/weaponpistol.zs" +#include "zscript/actors/doom/weaponshotgun.zs" +#include "zscript/actors/doom/weaponssg.zs" +#include "zscript/actors/doom/weaponchaingun.zs" +#include "zscript/actors/doom/weaponchainsaw.zs" +#include "zscript/actors/doom/weaponrlaunch.zs" +#include "zscript/actors/doom/weaponplasma.zs" +#include "zscript/actors/doom/weaponbfg.zs" -#include "zscript/compatibility.txt" +#include "zscript/actors/doom/deadthings.zs" +#include "zscript/actors/doom/doomammo.zs" +#include "zscript/actors/doom/doomarmor.zs" +#include "zscript/actors/doom/doomartifacts.zs" +#include "zscript/actors/doom/doomhealth.zs" +#include "zscript/actors/doom/doomkeys.zs" +#include "zscript/actors/doom/doommisc.zs" +#include "zscript/actors/doom/doomdecorations.zs" +#include "zscript/actors/doom/doomweapons.zs" +#include "zscript/actors/doom/stealthmonsters.zs" +#include "zscript/actors/doom/scriptedmarine.zs" -#include "zscript/doom/doomplayer.txt" -#include "zscript/doom/possessed.txt" -#include "zscript/doom/doomimp.txt" -#include "zscript/doom/demon.txt" -#include "zscript/doom/lostsoul.txt" -#include "zscript/doom/cacodemon.txt" -#include "zscript/doom/bruiser.txt" -#include "zscript/doom/revenant.txt" -#include "zscript/doom/arachnotron.txt" -#include "zscript/doom/fatso.txt" -#include "zscript/doom/painelemental.txt" -#include "zscript/doom/archvile.txt" -#include "zscript/doom/cyberdemon.txt" -#include "zscript/doom/spidermaster.txt" -#include "zscript/doom/keen.txt" -#include "zscript/doom/bossbrain.txt" -#include "zscript/doom/weaponfist.txt" -#include "zscript/doom/weaponpistol.txt" -#include "zscript/doom/weaponshotgun.txt" -#include "zscript/doom/weaponssg.txt" -#include "zscript/doom/weaponchaingun.txt" -#include "zscript/doom/weaponchainsaw.txt" -#include "zscript/doom/weaponrlaunch.txt" -#include "zscript/doom/weaponplasma.txt" -#include "zscript/doom/weaponbfg.txt" +#include "zscript/actors/raven/artiegg.zs" +#include "zscript/actors/raven/artitele.zs" +#include "zscript/actors/raven/ravenartifacts.zs" +#include "zscript/actors/raven/ravenhealth.zs" +#include "zscript/actors/raven/ravenambient.zs" +#include "zscript/actors/raven/minotaur.zs" -#include "zscript/doom/deadthings.txt" -#include "zscript/doom/doomammo.txt" -#include "zscript/doom/doomarmor.txt" -#include "zscript/doom/doomartifacts.txt" -#include "zscript/doom/doomhealth.txt" -#include "zscript/doom/doomkeys.txt" -#include "zscript/doom/doommisc.txt" -#include "zscript/doom/doomdecorations.txt" -#include "zscript/doom/doomweapons.txt" -#include "zscript/doom/stealthmonsters.txt" -#include "zscript/doom/scriptedmarine.txt" +#include "zscript/actors/heretic/hereticplayer.zs" +#include "zscript/actors/heretic/hereticammo.zs" +#include "zscript/actors/heretic/hereticarmor.zs" +#include "zscript/actors/heretic/hereticartifacts.zs" +#include "zscript/actors/heretic/heretickeys.zs" +#include "zscript/actors/heretic/hereticdecorations.zs" +#include "zscript/actors/heretic/hereticmisc.zs" +#include "zscript/actors/heretic/mummy.zs" +#include "zscript/actors/heretic/clink.zs" +#include "zscript/actors/heretic/beast.zs" +#include "zscript/actors/heretic/snake.zs" +#include "zscript/actors/heretic/hereticimp.zs" +#include "zscript/actors/heretic/knight.zs" +#include "zscript/actors/heretic/wizard.zs" +#include "zscript/actors/heretic/ironlich.zs" +#include "zscript/actors/heretic/dsparil.zs" +#include "zscript/actors/heretic/chicken.zs" +#include "zscript/actors/heretic/weaponstaff.zs" +#include "zscript/actors/heretic/weaponwand.zs" +#include "zscript/actors/heretic/weaponcrossbow.zs" +#include "zscript/actors/heretic/weapongauntlets.zs" +#include "zscript/actors/heretic/weaponmace.zs" +#include "zscript/actors/heretic/weaponblaster.zs" +#include "zscript/actors/heretic/weaponskullrod.zs" +#include "zscript/actors/heretic/weaponphoenix.zs" -#include "zscript/raven/artiegg.txt" -#include "zscript/raven/artitele.txt" -#include "zscript/raven/ravenartifacts.txt" -#include "zscript/raven/ravenhealth.txt" -#include "zscript/raven/ravenambient.txt" -#include "zscript/raven/minotaur.txt" +#include "zscript/actors/hexen/baseweapons.zs" +#include "zscript/actors/hexen/korax.zs" +#include "zscript/actors/hexen/fighterplayer.zs" +#include "zscript/actors/hexen/clericplayer.zs" +#include "zscript/actors/hexen/mageplayer.zs" +#include "zscript/actors/hexen/pig.zs" +#include "zscript/actors/hexen/flame.zs" +#include "zscript/actors/hexen/flies.zs" +#include "zscript/actors/hexen/hexenarmor.zs" +#include "zscript/actors/hexen/hexendecorations.zs" +#include "zscript/actors/hexen/hexenkeys.zs" +#include "zscript/actors/hexen/hexenspecialdecs.zs" +#include "zscript/actors/hexen/mana.zs" +#include "zscript/actors/hexen/puzzleitems.zs" +#include "zscript/actors/hexen/scriptprojectiles.zs" +#include "zscript/actors/hexen/speedboots.zs" +#include "zscript/actors/hexen/ettin.zs" +#include "zscript/actors/hexen/centaur.zs" +#include "zscript/actors/hexen/demons.zs" +#include "zscript/actors/hexen/firedemon.zs" +#include "zscript/actors/hexen/fog.zs" +#include "zscript/actors/hexen/summon.zs" +#include "zscript/actors/hexen/flechette.zs" +#include "zscript/actors/hexen/clericboss.zs" +#include "zscript/actors/hexen/fighterboss.zs" +#include "zscript/actors/hexen/mageboss.zs" +#include "zscript/actors/hexen/bats.zs" +#include "zscript/actors/hexen/bishop.zs" +#include "zscript/actors/hexen/blastradius.zs" +#include "zscript/actors/hexen/boostarmor.zs" +#include "zscript/actors/hexen/clericmace.zs" +#include "zscript/actors/hexen/clericflame.zs" +#include "zscript/actors/hexen/clericholy.zs" +#include "zscript/actors/hexen/clericstaff.zs" +#include "zscript/actors/hexen/magewand.zs" +#include "zscript/actors/hexen/magecone.zs" +#include "zscript/actors/hexen/magelightning.zs" +#include "zscript/actors/hexen/magestaff.zs" +#include "zscript/actors/hexen/fighterfist.zs" +#include "zscript/actors/hexen/fighteraxe.zs" +#include "zscript/actors/hexen/fighterhammer.zs" +#include "zscript/actors/hexen/fighterquietus.zs" +#include "zscript/actors/hexen/dragon.zs" +#include "zscript/actors/hexen/healingradius.zs" +#include "zscript/actors/hexen/teleportother.zs" +#include "zscript/actors/hexen/iceguy.zs" +#include "zscript/actors/hexen/serpent.zs" +#include "zscript/actors/hexen/spike.zs" +#include "zscript/actors/hexen/wraith.zs" +#include "zscript/actors/hexen/heresiarch.zs" -#include "zscript/heretic/hereticplayer.txt" -#include "zscript/heretic/hereticammo.txt" -#include "zscript/heretic/hereticarmor.txt" -#include "zscript/heretic/hereticartifacts.txt" -#include "zscript/heretic/heretickeys.txt" -#include "zscript/heretic/hereticdecorations.txt" -#include "zscript/heretic/hereticmisc.txt" -#include "zscript/heretic/mummy.txt" -#include "zscript/heretic/clink.txt" -#include "zscript/heretic/beast.txt" -#include "zscript/heretic/snake.txt" -#include "zscript/heretic/hereticimp.txt" -#include "zscript/heretic/knight.txt" -#include "zscript/heretic/wizard.txt" -#include "zscript/heretic/ironlich.txt" -#include "zscript/heretic/dsparil.txt" -#include "zscript/heretic/chicken.txt" -#include "zscript/heretic/weaponstaff.txt" -#include "zscript/heretic/weaponwand.txt" -#include "zscript/heretic/weaponcrossbow.txt" -#include "zscript/heretic/weapongauntlets.txt" -#include "zscript/heretic/weaponmace.txt" -#include "zscript/heretic/weaponblaster.txt" -#include "zscript/heretic/weaponskullrod.txt" -#include "zscript/heretic/weaponphoenix.txt" +#include "zscript/actors/strife/strifehumanoid.zs" +#include "zscript/actors/strife/strifeplayer.zs" +#include "zscript/actors/strife/strifeweapons.zs" +#include "zscript/actors/strife/spectral.zs" +#include "zscript/actors/strife/acolyte.zs" +#include "zscript/actors/strife/alienspectres.zs" +#include "zscript/actors/strife/beggars.zs" +#include "zscript/actors/strife/coin.zs" +#include "zscript/actors/strife/crusader.zs" +#include "zscript/actors/strife/entityboss.zs" +#include "zscript/actors/strife/inquisitor.zs" +#include "zscript/actors/strife/klaxon.zs" +#include "zscript/actors/strife/loremaster.zs" +#include "zscript/actors/strife/macil.zs" +#include "zscript/actors/strife/merchants.zs" +#include "zscript/actors/strife/peasants.zs" +#include "zscript/actors/strife/strifebishop.zs" +#include "zscript/actors/strife/oracle.zs" +#include "zscript/actors/strife/programmer.zs" +#include "zscript/actors/strife/questitems.zs" +#include "zscript/actors/strife/ratbuddy.zs" +#include "zscript/actors/strife/rebels.zs" +#include "zscript/actors/strife/reaver.zs" +#include "zscript/actors/strife/sentinel.zs" +#include "zscript/actors/strife/stalker.zs" +#include "zscript/actors/strife/strifeammo.zs" +#include "zscript/actors/strife/strifearmor.zs" +#include "zscript/actors/strife/strifefunctions.zs" +#include "zscript/actors/strife/strifeitems.zs" +#include "zscript/actors/strife/strifekeys.zs" +#include "zscript/actors/strife/strifestuff.zs" +#include "zscript/actors/strife/thingstoblowup.zs" +#include "zscript/actors/strife/templar.zs" +#include "zscript/actors/strife/zombie.zs" +#include "zscript/actors/strife/weapondagger.zs" +#include "zscript/actors/strife/weaponcrossbow.zs" +#include "zscript/actors/strife/weaponassault.zs" +#include "zscript/actors/strife/weaponmissile.zs" +#include "zscript/actors/strife/weaponflamer.zs" +#include "zscript/actors/strife/weapongrenade.zs" +#include "zscript/actors/strife/weaponmauler.zs" +#include "zscript/actors/strife/sigil.zs" +#include "zscript/actors/strife/svestuff.zs" +#include "zscript/actors/strife/svelights.zs" -#include "zscript/hexen/baseweapons.txt" -#include "zscript/hexen/korax.txt" -#include "zscript/hexen/fighterplayer.txt" -#include "zscript/hexen/clericplayer.txt" -#include "zscript/hexen/mageplayer.txt" -#include "zscript/hexen/pig.txt" -#include "zscript/hexen/flame.txt" -#include "zscript/hexen/flies.txt" -#include "zscript/hexen/hexenarmor.txt" -#include "zscript/hexen/hexendecorations.txt" -#include "zscript/hexen/hexenkeys.txt" -#include "zscript/hexen/hexenspecialdecs.txt" -#include "zscript/hexen/mana.txt" -#include "zscript/hexen/puzzleitems.txt" -#include "zscript/hexen/scriptprojectiles.txt" -#include "zscript/hexen/speedboots.txt" -#include "zscript/hexen/ettin.txt" -#include "zscript/hexen/centaur.txt" -#include "zscript/hexen/demons.txt" -#include "zscript/hexen/firedemon.txt" -#include "zscript/hexen/fog.txt" -#include "zscript/hexen/summon.txt" -#include "zscript/hexen/flechette.txt" -#include "zscript/hexen/clericboss.txt" -#include "zscript/hexen/fighterboss.txt" -#include "zscript/hexen/mageboss.txt" -#include "zscript/hexen/bats.txt" -#include "zscript/hexen/bishop.txt" -#include "zscript/hexen/blastradius.txt" -#include "zscript/hexen/boostarmor.txt" -#include "zscript/hexen/clericmace.txt" -#include "zscript/hexen/clericflame.txt" -#include "zscript/hexen/clericholy.txt" -#include "zscript/hexen/clericstaff.txt" -#include "zscript/hexen/magewand.txt" -#include "zscript/hexen/magecone.txt" -#include "zscript/hexen/magelightning.txt" -#include "zscript/hexen/magestaff.txt" -#include "zscript/hexen/fighterfist.txt" -#include "zscript/hexen/fighteraxe.txt" -#include "zscript/hexen/fighterhammer.txt" -#include "zscript/hexen/fighterquietus.txt" -#include "zscript/hexen/dragon.txt" -#include "zscript/hexen/healingradius.txt" -#include "zscript/hexen/teleportother.txt" -#include "zscript/hexen/iceguy.txt" -#include "zscript/hexen/serpent.txt" -#include "zscript/hexen/spike.txt" -#include "zscript/hexen/wraith.txt" -#include "zscript/hexen/heresiarch.txt" +#include "zscript/actors/chex/chexmonsters.zs" +#include "zscript/actors/chex/chexkeys.zs" +#include "zscript/actors/chex/chexammo.zs" +#include "zscript/actors/chex/chexweapons.zs" +#include "zscript/actors/chex/chexitems.zs" +#include "zscript/actors/chex/chexdecorations.zs" +#include "zscript/actors/chex/chexplayer.zs" -#include "zscript/strife/strifehumanoid.txt" -#include "zscript/strife/strifeplayer.txt" -#include "zscript/strife/strifeweapons.txt" -#include "zscript/strife/spectral.txt" -#include "zscript/strife/acolyte.txt" -#include "zscript/strife/alienspectres.txt" -#include "zscript/strife/beggars.txt" -#include "zscript/strife/coin.txt" -#include "zscript/strife/crusader.txt" -#include "zscript/strife/entityboss.txt" -#include "zscript/strife/inquisitor.txt" -#include "zscript/strife/klaxon.txt" -#include "zscript/strife/loremaster.txt" -#include "zscript/strife/macil.txt" -#include "zscript/strife/merchants.txt" -#include "zscript/strife/peasants.txt" -#include "zscript/strife/strifebishop.txt" -#include "zscript/strife/oracle.txt" -#include "zscript/strife/programmer.txt" -#include "zscript/strife/questitems.txt" -#include "zscript/strife/ratbuddy.txt" -#include "zscript/strife/rebels.txt" -#include "zscript/strife/reaver.txt" -#include "zscript/strife/sentinel.txt" -#include "zscript/strife/stalker.txt" -#include "zscript/strife/strifeammo.txt" -#include "zscript/strife/strifearmor.txt" -#include "zscript/strife/strifefunctions.txt" -#include "zscript/strife/strifeitems.txt" -#include "zscript/strife/strifekeys.txt" -#include "zscript/strife/strifestuff.txt" -#include "zscript/strife/thingstoblowup.txt" -#include "zscript/strife/templar.txt" -#include "zscript/strife/zombie.txt" -#include "zscript/strife/weapondagger.txt" -#include "zscript/strife/weaponcrossbow.txt" -#include "zscript/strife/weaponassault.txt" -#include "zscript/strife/weaponmissile.txt" -#include "zscript/strife/weaponflamer.txt" -#include "zscript/strife/weapongrenade.txt" -#include "zscript/strife/weaponmauler.txt" -#include "zscript/strife/sigil.txt" -#include "zscript/strife/svestuff.txt" -#include "zscript/strife/svelights.txt" +#include "zscript/ui/menu/colorpickermenu.zs" +#include "zscript/ui/menu/conversationmenu.zs" +#include "zscript/ui/menu/joystickmenu.zs" +#include "zscript/ui/menu/listmenu.zs" +#include "zscript/ui/menu/listmenuitems.zs" +#include "zscript/ui/menu/loadsavemenu.zs" +#include "zscript/ui/menu/menu.zs" +#include "zscript/ui/menu/menuitembase.zs" +#include "zscript/ui/menu/messagebox.zs" +#include "zscript/ui/menu/optionmenu.zs" +#include "zscript/ui/menu/optionmenuitems.zs" +#include "zscript/ui/menu/playercontrols.zs" +#include "zscript/ui/menu/playerdisplay.zs" +#include "zscript/ui/menu/playermenu.zs" +#include "zscript/ui/menu/readthis.zs" +#include "zscript/ui/menu/reverbedit.zs" +#include "zscript/ui/menu/textentermenu.zs" -#include "zscript/chex/chexmonsters.txt" -#include "zscript/chex/chexkeys.txt" -#include "zscript/chex/chexammo.txt" -#include "zscript/chex/chexweapons.txt" -#include "zscript/chex/chexitems.txt" -#include "zscript/chex/chexdecorations.txt" -#include "zscript/chex/chexplayer.txt" +#include "zscript/ui/statscreen/statscreen.zs" +#include "zscript/ui/statscreen/statscreen_coop.zs" +#include "zscript/ui/statscreen/statscreen_dm.zs" +#include "zscript/ui/statscreen/statscreen_sp.zs" +#include "zscript/ui/statscreen/types.zs" -#include "zscript/scriptutil/scriptutil.txt" +#include "zscript/ui/statusbar/alt_hud.zs" +#include "zscript/ui/statusbar/doom_sbar.zs" +#include "zscript/ui/statusbar/harm_sbar.zs" +#include "zscript/ui/statusbar/heretic_sbar.zs" +#include "zscript/ui/statusbar/hexen_sbar.zs" +#include "zscript/ui/statusbar/sbarinfowrapper.zs" +#include "zscript/ui/statusbar/statusbar.zs" +#include "zscript/ui/statusbar/strife_sbar.zs" + +#include "zscript/compatibility.zs" +#include "zscript/scriptutil/scriptutil.zs" diff --git a/wadsrc/static/zscript/actor_actions.txt b/wadsrc/static/zscript/actors/actions.zs similarity index 100% rename from wadsrc/static/zscript/actor_actions.txt rename to wadsrc/static/zscript/actors/actions.zs diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actors/actor.zs similarity index 100% rename from wadsrc/static/zscript/actor.txt rename to wadsrc/static/zscript/actors/actor.zs diff --git a/wadsrc/static/zscript/actor_attacks.txt b/wadsrc/static/zscript/actors/attacks.zs similarity index 100% rename from wadsrc/static/zscript/actor_attacks.txt rename to wadsrc/static/zscript/actors/attacks.zs diff --git a/wadsrc/static/zscript/actor_checks.txt b/wadsrc/static/zscript/actors/checks.zs similarity index 100% rename from wadsrc/static/zscript/actor_checks.txt rename to wadsrc/static/zscript/actors/checks.zs diff --git a/wadsrc/static/zscript/chex/chexammo.txt b/wadsrc/static/zscript/actors/chex/chexammo.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexammo.txt rename to wadsrc/static/zscript/actors/chex/chexammo.zs diff --git a/wadsrc/static/zscript/chex/chexdecorations.txt b/wadsrc/static/zscript/actors/chex/chexdecorations.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexdecorations.txt rename to wadsrc/static/zscript/actors/chex/chexdecorations.zs diff --git a/wadsrc/static/zscript/chex/chexitems.txt b/wadsrc/static/zscript/actors/chex/chexitems.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexitems.txt rename to wadsrc/static/zscript/actors/chex/chexitems.zs diff --git a/wadsrc/static/zscript/chex/chexkeys.txt b/wadsrc/static/zscript/actors/chex/chexkeys.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexkeys.txt rename to wadsrc/static/zscript/actors/chex/chexkeys.zs diff --git a/wadsrc/static/zscript/chex/chexmonsters.txt b/wadsrc/static/zscript/actors/chex/chexmonsters.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexmonsters.txt rename to wadsrc/static/zscript/actors/chex/chexmonsters.zs diff --git a/wadsrc/static/zscript/chex/chexplayer.txt b/wadsrc/static/zscript/actors/chex/chexplayer.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexplayer.txt rename to wadsrc/static/zscript/actors/chex/chexplayer.zs diff --git a/wadsrc/static/zscript/chex/chexweapons.txt b/wadsrc/static/zscript/actors/chex/chexweapons.zs similarity index 100% rename from wadsrc/static/zscript/chex/chexweapons.txt rename to wadsrc/static/zscript/actors/chex/chexweapons.zs diff --git a/wadsrc/static/zscript/doom/arachnotron.txt b/wadsrc/static/zscript/actors/doom/arachnotron.zs similarity index 100% rename from wadsrc/static/zscript/doom/arachnotron.txt rename to wadsrc/static/zscript/actors/doom/arachnotron.zs diff --git a/wadsrc/static/zscript/doom/archvile.txt b/wadsrc/static/zscript/actors/doom/archvile.zs similarity index 100% rename from wadsrc/static/zscript/doom/archvile.txt rename to wadsrc/static/zscript/actors/doom/archvile.zs diff --git a/wadsrc/static/zscript/doom/bossbrain.txt b/wadsrc/static/zscript/actors/doom/bossbrain.zs similarity index 100% rename from wadsrc/static/zscript/doom/bossbrain.txt rename to wadsrc/static/zscript/actors/doom/bossbrain.zs diff --git a/wadsrc/static/zscript/doom/bruiser.txt b/wadsrc/static/zscript/actors/doom/bruiser.zs similarity index 100% rename from wadsrc/static/zscript/doom/bruiser.txt rename to wadsrc/static/zscript/actors/doom/bruiser.zs diff --git a/wadsrc/static/zscript/doom/cacodemon.txt b/wadsrc/static/zscript/actors/doom/cacodemon.zs similarity index 100% rename from wadsrc/static/zscript/doom/cacodemon.txt rename to wadsrc/static/zscript/actors/doom/cacodemon.zs diff --git a/wadsrc/static/zscript/doom/cyberdemon.txt b/wadsrc/static/zscript/actors/doom/cyberdemon.zs similarity index 100% rename from wadsrc/static/zscript/doom/cyberdemon.txt rename to wadsrc/static/zscript/actors/doom/cyberdemon.zs diff --git a/wadsrc/static/zscript/doom/deadthings.txt b/wadsrc/static/zscript/actors/doom/deadthings.zs similarity index 100% rename from wadsrc/static/zscript/doom/deadthings.txt rename to wadsrc/static/zscript/actors/doom/deadthings.zs diff --git a/wadsrc/static/zscript/doom/demon.txt b/wadsrc/static/zscript/actors/doom/demon.zs similarity index 100% rename from wadsrc/static/zscript/doom/demon.txt rename to wadsrc/static/zscript/actors/doom/demon.zs diff --git a/wadsrc/static/zscript/doom/doomammo.txt b/wadsrc/static/zscript/actors/doom/doomammo.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomammo.txt rename to wadsrc/static/zscript/actors/doom/doomammo.zs diff --git a/wadsrc/static/zscript/doom/doomarmor.txt b/wadsrc/static/zscript/actors/doom/doomarmor.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomarmor.txt rename to wadsrc/static/zscript/actors/doom/doomarmor.zs diff --git a/wadsrc/static/zscript/doom/doomartifacts.txt b/wadsrc/static/zscript/actors/doom/doomartifacts.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomartifacts.txt rename to wadsrc/static/zscript/actors/doom/doomartifacts.zs diff --git a/wadsrc/static/zscript/doom/doomdecorations.txt b/wadsrc/static/zscript/actors/doom/doomdecorations.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomdecorations.txt rename to wadsrc/static/zscript/actors/doom/doomdecorations.zs diff --git a/wadsrc/static/zscript/doom/doomhealth.txt b/wadsrc/static/zscript/actors/doom/doomhealth.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomhealth.txt rename to wadsrc/static/zscript/actors/doom/doomhealth.zs diff --git a/wadsrc/static/zscript/doom/doomimp.txt b/wadsrc/static/zscript/actors/doom/doomimp.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomimp.txt rename to wadsrc/static/zscript/actors/doom/doomimp.zs diff --git a/wadsrc/static/zscript/doom/doomkeys.txt b/wadsrc/static/zscript/actors/doom/doomkeys.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomkeys.txt rename to wadsrc/static/zscript/actors/doom/doomkeys.zs diff --git a/wadsrc/static/zscript/doom/doommisc.txt b/wadsrc/static/zscript/actors/doom/doommisc.zs similarity index 100% rename from wadsrc/static/zscript/doom/doommisc.txt rename to wadsrc/static/zscript/actors/doom/doommisc.zs diff --git a/wadsrc/static/zscript/doom/doomplayer.txt b/wadsrc/static/zscript/actors/doom/doomplayer.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomplayer.txt rename to wadsrc/static/zscript/actors/doom/doomplayer.zs diff --git a/wadsrc/static/zscript/doom/doomweapons.txt b/wadsrc/static/zscript/actors/doom/doomweapons.zs similarity index 100% rename from wadsrc/static/zscript/doom/doomweapons.txt rename to wadsrc/static/zscript/actors/doom/doomweapons.zs diff --git a/wadsrc/static/zscript/doom/fatso.txt b/wadsrc/static/zscript/actors/doom/fatso.zs similarity index 100% rename from wadsrc/static/zscript/doom/fatso.txt rename to wadsrc/static/zscript/actors/doom/fatso.zs diff --git a/wadsrc/static/zscript/doom/keen.txt b/wadsrc/static/zscript/actors/doom/keen.zs similarity index 100% rename from wadsrc/static/zscript/doom/keen.txt rename to wadsrc/static/zscript/actors/doom/keen.zs diff --git a/wadsrc/static/zscript/doom/lostsoul.txt b/wadsrc/static/zscript/actors/doom/lostsoul.zs similarity index 100% rename from wadsrc/static/zscript/doom/lostsoul.txt rename to wadsrc/static/zscript/actors/doom/lostsoul.zs diff --git a/wadsrc/static/zscript/doom/painelemental.txt b/wadsrc/static/zscript/actors/doom/painelemental.zs similarity index 100% rename from wadsrc/static/zscript/doom/painelemental.txt rename to wadsrc/static/zscript/actors/doom/painelemental.zs diff --git a/wadsrc/static/zscript/doom/possessed.txt b/wadsrc/static/zscript/actors/doom/possessed.zs similarity index 100% rename from wadsrc/static/zscript/doom/possessed.txt rename to wadsrc/static/zscript/actors/doom/possessed.zs diff --git a/wadsrc/static/zscript/doom/revenant.txt b/wadsrc/static/zscript/actors/doom/revenant.zs similarity index 100% rename from wadsrc/static/zscript/doom/revenant.txt rename to wadsrc/static/zscript/actors/doom/revenant.zs diff --git a/wadsrc/static/zscript/doom/scriptedmarine.txt b/wadsrc/static/zscript/actors/doom/scriptedmarine.zs similarity index 100% rename from wadsrc/static/zscript/doom/scriptedmarine.txt rename to wadsrc/static/zscript/actors/doom/scriptedmarine.zs diff --git a/wadsrc/static/zscript/doom/spidermaster.txt b/wadsrc/static/zscript/actors/doom/spidermaster.zs similarity index 100% rename from wadsrc/static/zscript/doom/spidermaster.txt rename to wadsrc/static/zscript/actors/doom/spidermaster.zs diff --git a/wadsrc/static/zscript/doom/stealthmonsters.txt b/wadsrc/static/zscript/actors/doom/stealthmonsters.zs similarity index 100% rename from wadsrc/static/zscript/doom/stealthmonsters.txt rename to wadsrc/static/zscript/actors/doom/stealthmonsters.zs diff --git a/wadsrc/static/zscript/doom/weaponbfg.txt b/wadsrc/static/zscript/actors/doom/weaponbfg.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponbfg.txt rename to wadsrc/static/zscript/actors/doom/weaponbfg.zs diff --git a/wadsrc/static/zscript/doom/weaponchaingun.txt b/wadsrc/static/zscript/actors/doom/weaponchaingun.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponchaingun.txt rename to wadsrc/static/zscript/actors/doom/weaponchaingun.zs diff --git a/wadsrc/static/zscript/doom/weaponchainsaw.txt b/wadsrc/static/zscript/actors/doom/weaponchainsaw.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponchainsaw.txt rename to wadsrc/static/zscript/actors/doom/weaponchainsaw.zs diff --git a/wadsrc/static/zscript/doom/weaponfist.txt b/wadsrc/static/zscript/actors/doom/weaponfist.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponfist.txt rename to wadsrc/static/zscript/actors/doom/weaponfist.zs diff --git a/wadsrc/static/zscript/doom/weaponpistol.txt b/wadsrc/static/zscript/actors/doom/weaponpistol.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponpistol.txt rename to wadsrc/static/zscript/actors/doom/weaponpistol.zs diff --git a/wadsrc/static/zscript/doom/weaponplasma.txt b/wadsrc/static/zscript/actors/doom/weaponplasma.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponplasma.txt rename to wadsrc/static/zscript/actors/doom/weaponplasma.zs diff --git a/wadsrc/static/zscript/doom/weaponrlaunch.txt b/wadsrc/static/zscript/actors/doom/weaponrlaunch.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponrlaunch.txt rename to wadsrc/static/zscript/actors/doom/weaponrlaunch.zs diff --git a/wadsrc/static/zscript/doom/weaponshotgun.txt b/wadsrc/static/zscript/actors/doom/weaponshotgun.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponshotgun.txt rename to wadsrc/static/zscript/actors/doom/weaponshotgun.zs diff --git a/wadsrc/static/zscript/doom/weaponssg.txt b/wadsrc/static/zscript/actors/doom/weaponssg.zs similarity index 100% rename from wadsrc/static/zscript/doom/weaponssg.txt rename to wadsrc/static/zscript/actors/doom/weaponssg.zs diff --git a/wadsrc/static/zscript/heretic/beast.txt b/wadsrc/static/zscript/actors/heretic/beast.zs similarity index 100% rename from wadsrc/static/zscript/heretic/beast.txt rename to wadsrc/static/zscript/actors/heretic/beast.zs diff --git a/wadsrc/static/zscript/heretic/chicken.txt b/wadsrc/static/zscript/actors/heretic/chicken.zs similarity index 100% rename from wadsrc/static/zscript/heretic/chicken.txt rename to wadsrc/static/zscript/actors/heretic/chicken.zs diff --git a/wadsrc/static/zscript/heretic/clink.txt b/wadsrc/static/zscript/actors/heretic/clink.zs similarity index 100% rename from wadsrc/static/zscript/heretic/clink.txt rename to wadsrc/static/zscript/actors/heretic/clink.zs diff --git a/wadsrc/static/zscript/heretic/dsparil.txt b/wadsrc/static/zscript/actors/heretic/dsparil.zs similarity index 100% rename from wadsrc/static/zscript/heretic/dsparil.txt rename to wadsrc/static/zscript/actors/heretic/dsparil.zs diff --git a/wadsrc/static/zscript/heretic/hereticammo.txt b/wadsrc/static/zscript/actors/heretic/hereticammo.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticammo.txt rename to wadsrc/static/zscript/actors/heretic/hereticammo.zs diff --git a/wadsrc/static/zscript/heretic/hereticarmor.txt b/wadsrc/static/zscript/actors/heretic/hereticarmor.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticarmor.txt rename to wadsrc/static/zscript/actors/heretic/hereticarmor.zs diff --git a/wadsrc/static/zscript/heretic/hereticartifacts.txt b/wadsrc/static/zscript/actors/heretic/hereticartifacts.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticartifacts.txt rename to wadsrc/static/zscript/actors/heretic/hereticartifacts.zs diff --git a/wadsrc/static/zscript/heretic/hereticdecorations.txt b/wadsrc/static/zscript/actors/heretic/hereticdecorations.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticdecorations.txt rename to wadsrc/static/zscript/actors/heretic/hereticdecorations.zs diff --git a/wadsrc/static/zscript/heretic/hereticimp.txt b/wadsrc/static/zscript/actors/heretic/hereticimp.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticimp.txt rename to wadsrc/static/zscript/actors/heretic/hereticimp.zs diff --git a/wadsrc/static/zscript/heretic/heretickeys.txt b/wadsrc/static/zscript/actors/heretic/heretickeys.zs similarity index 100% rename from wadsrc/static/zscript/heretic/heretickeys.txt rename to wadsrc/static/zscript/actors/heretic/heretickeys.zs diff --git a/wadsrc/static/zscript/heretic/hereticmisc.txt b/wadsrc/static/zscript/actors/heretic/hereticmisc.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticmisc.txt rename to wadsrc/static/zscript/actors/heretic/hereticmisc.zs diff --git a/wadsrc/static/zscript/heretic/hereticplayer.txt b/wadsrc/static/zscript/actors/heretic/hereticplayer.zs similarity index 100% rename from wadsrc/static/zscript/heretic/hereticplayer.txt rename to wadsrc/static/zscript/actors/heretic/hereticplayer.zs diff --git a/wadsrc/static/zscript/heretic/ironlich.txt b/wadsrc/static/zscript/actors/heretic/ironlich.zs similarity index 100% rename from wadsrc/static/zscript/heretic/ironlich.txt rename to wadsrc/static/zscript/actors/heretic/ironlich.zs diff --git a/wadsrc/static/zscript/heretic/knight.txt b/wadsrc/static/zscript/actors/heretic/knight.zs similarity index 100% rename from wadsrc/static/zscript/heretic/knight.txt rename to wadsrc/static/zscript/actors/heretic/knight.zs diff --git a/wadsrc/static/zscript/heretic/mummy.txt b/wadsrc/static/zscript/actors/heretic/mummy.zs similarity index 100% rename from wadsrc/static/zscript/heretic/mummy.txt rename to wadsrc/static/zscript/actors/heretic/mummy.zs diff --git a/wadsrc/static/zscript/heretic/snake.txt b/wadsrc/static/zscript/actors/heretic/snake.zs similarity index 100% rename from wadsrc/static/zscript/heretic/snake.txt rename to wadsrc/static/zscript/actors/heretic/snake.zs diff --git a/wadsrc/static/zscript/heretic/weaponblaster.txt b/wadsrc/static/zscript/actors/heretic/weaponblaster.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponblaster.txt rename to wadsrc/static/zscript/actors/heretic/weaponblaster.zs diff --git a/wadsrc/static/zscript/heretic/weaponcrossbow.txt b/wadsrc/static/zscript/actors/heretic/weaponcrossbow.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponcrossbow.txt rename to wadsrc/static/zscript/actors/heretic/weaponcrossbow.zs diff --git a/wadsrc/static/zscript/heretic/weapongauntlets.txt b/wadsrc/static/zscript/actors/heretic/weapongauntlets.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weapongauntlets.txt rename to wadsrc/static/zscript/actors/heretic/weapongauntlets.zs diff --git a/wadsrc/static/zscript/heretic/weaponmace.txt b/wadsrc/static/zscript/actors/heretic/weaponmace.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponmace.txt rename to wadsrc/static/zscript/actors/heretic/weaponmace.zs diff --git a/wadsrc/static/zscript/heretic/weaponphoenix.txt b/wadsrc/static/zscript/actors/heretic/weaponphoenix.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponphoenix.txt rename to wadsrc/static/zscript/actors/heretic/weaponphoenix.zs diff --git a/wadsrc/static/zscript/heretic/weaponskullrod.txt b/wadsrc/static/zscript/actors/heretic/weaponskullrod.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponskullrod.txt rename to wadsrc/static/zscript/actors/heretic/weaponskullrod.zs diff --git a/wadsrc/static/zscript/heretic/weaponstaff.txt b/wadsrc/static/zscript/actors/heretic/weaponstaff.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponstaff.txt rename to wadsrc/static/zscript/actors/heretic/weaponstaff.zs diff --git a/wadsrc/static/zscript/heretic/weaponwand.txt b/wadsrc/static/zscript/actors/heretic/weaponwand.zs similarity index 100% rename from wadsrc/static/zscript/heretic/weaponwand.txt rename to wadsrc/static/zscript/actors/heretic/weaponwand.zs diff --git a/wadsrc/static/zscript/heretic/wizard.txt b/wadsrc/static/zscript/actors/heretic/wizard.zs similarity index 100% rename from wadsrc/static/zscript/heretic/wizard.txt rename to wadsrc/static/zscript/actors/heretic/wizard.zs diff --git a/wadsrc/static/zscript/hexen/baseweapons.txt b/wadsrc/static/zscript/actors/hexen/baseweapons.zs similarity index 100% rename from wadsrc/static/zscript/hexen/baseweapons.txt rename to wadsrc/static/zscript/actors/hexen/baseweapons.zs diff --git a/wadsrc/static/zscript/hexen/bats.txt b/wadsrc/static/zscript/actors/hexen/bats.zs similarity index 100% rename from wadsrc/static/zscript/hexen/bats.txt rename to wadsrc/static/zscript/actors/hexen/bats.zs diff --git a/wadsrc/static/zscript/hexen/bishop.txt b/wadsrc/static/zscript/actors/hexen/bishop.zs similarity index 100% rename from wadsrc/static/zscript/hexen/bishop.txt rename to wadsrc/static/zscript/actors/hexen/bishop.zs diff --git a/wadsrc/static/zscript/hexen/blastradius.txt b/wadsrc/static/zscript/actors/hexen/blastradius.zs similarity index 100% rename from wadsrc/static/zscript/hexen/blastradius.txt rename to wadsrc/static/zscript/actors/hexen/blastradius.zs diff --git a/wadsrc/static/zscript/hexen/boostarmor.txt b/wadsrc/static/zscript/actors/hexen/boostarmor.zs similarity index 100% rename from wadsrc/static/zscript/hexen/boostarmor.txt rename to wadsrc/static/zscript/actors/hexen/boostarmor.zs diff --git a/wadsrc/static/zscript/hexen/centaur.txt b/wadsrc/static/zscript/actors/hexen/centaur.zs similarity index 100% rename from wadsrc/static/zscript/hexen/centaur.txt rename to wadsrc/static/zscript/actors/hexen/centaur.zs diff --git a/wadsrc/static/zscript/hexen/clericboss.txt b/wadsrc/static/zscript/actors/hexen/clericboss.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericboss.txt rename to wadsrc/static/zscript/actors/hexen/clericboss.zs diff --git a/wadsrc/static/zscript/hexen/clericflame.txt b/wadsrc/static/zscript/actors/hexen/clericflame.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericflame.txt rename to wadsrc/static/zscript/actors/hexen/clericflame.zs diff --git a/wadsrc/static/zscript/hexen/clericholy.txt b/wadsrc/static/zscript/actors/hexen/clericholy.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericholy.txt rename to wadsrc/static/zscript/actors/hexen/clericholy.zs diff --git a/wadsrc/static/zscript/hexen/clericmace.txt b/wadsrc/static/zscript/actors/hexen/clericmace.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericmace.txt rename to wadsrc/static/zscript/actors/hexen/clericmace.zs diff --git a/wadsrc/static/zscript/hexen/clericplayer.txt b/wadsrc/static/zscript/actors/hexen/clericplayer.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericplayer.txt rename to wadsrc/static/zscript/actors/hexen/clericplayer.zs diff --git a/wadsrc/static/zscript/hexen/clericstaff.txt b/wadsrc/static/zscript/actors/hexen/clericstaff.zs similarity index 100% rename from wadsrc/static/zscript/hexen/clericstaff.txt rename to wadsrc/static/zscript/actors/hexen/clericstaff.zs diff --git a/wadsrc/static/zscript/hexen/demons.txt b/wadsrc/static/zscript/actors/hexen/demons.zs similarity index 100% rename from wadsrc/static/zscript/hexen/demons.txt rename to wadsrc/static/zscript/actors/hexen/demons.zs diff --git a/wadsrc/static/zscript/hexen/dragon.txt b/wadsrc/static/zscript/actors/hexen/dragon.zs similarity index 100% rename from wadsrc/static/zscript/hexen/dragon.txt rename to wadsrc/static/zscript/actors/hexen/dragon.zs diff --git a/wadsrc/static/zscript/hexen/ettin.txt b/wadsrc/static/zscript/actors/hexen/ettin.zs similarity index 100% rename from wadsrc/static/zscript/hexen/ettin.txt rename to wadsrc/static/zscript/actors/hexen/ettin.zs diff --git a/wadsrc/static/zscript/hexen/fighteraxe.txt b/wadsrc/static/zscript/actors/hexen/fighteraxe.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighteraxe.txt rename to wadsrc/static/zscript/actors/hexen/fighteraxe.zs diff --git a/wadsrc/static/zscript/hexen/fighterboss.txt b/wadsrc/static/zscript/actors/hexen/fighterboss.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighterboss.txt rename to wadsrc/static/zscript/actors/hexen/fighterboss.zs diff --git a/wadsrc/static/zscript/hexen/fighterfist.txt b/wadsrc/static/zscript/actors/hexen/fighterfist.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighterfist.txt rename to wadsrc/static/zscript/actors/hexen/fighterfist.zs diff --git a/wadsrc/static/zscript/hexen/fighterhammer.txt b/wadsrc/static/zscript/actors/hexen/fighterhammer.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighterhammer.txt rename to wadsrc/static/zscript/actors/hexen/fighterhammer.zs diff --git a/wadsrc/static/zscript/hexen/fighterplayer.txt b/wadsrc/static/zscript/actors/hexen/fighterplayer.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighterplayer.txt rename to wadsrc/static/zscript/actors/hexen/fighterplayer.zs diff --git a/wadsrc/static/zscript/hexen/fighterquietus.txt b/wadsrc/static/zscript/actors/hexen/fighterquietus.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fighterquietus.txt rename to wadsrc/static/zscript/actors/hexen/fighterquietus.zs diff --git a/wadsrc/static/zscript/hexen/firedemon.txt b/wadsrc/static/zscript/actors/hexen/firedemon.zs similarity index 100% rename from wadsrc/static/zscript/hexen/firedemon.txt rename to wadsrc/static/zscript/actors/hexen/firedemon.zs diff --git a/wadsrc/static/zscript/hexen/flame.txt b/wadsrc/static/zscript/actors/hexen/flame.zs similarity index 100% rename from wadsrc/static/zscript/hexen/flame.txt rename to wadsrc/static/zscript/actors/hexen/flame.zs diff --git a/wadsrc/static/zscript/hexen/flechette.txt b/wadsrc/static/zscript/actors/hexen/flechette.zs similarity index 100% rename from wadsrc/static/zscript/hexen/flechette.txt rename to wadsrc/static/zscript/actors/hexen/flechette.zs diff --git a/wadsrc/static/zscript/hexen/flies.txt b/wadsrc/static/zscript/actors/hexen/flies.zs similarity index 100% rename from wadsrc/static/zscript/hexen/flies.txt rename to wadsrc/static/zscript/actors/hexen/flies.zs diff --git a/wadsrc/static/zscript/hexen/fog.txt b/wadsrc/static/zscript/actors/hexen/fog.zs similarity index 100% rename from wadsrc/static/zscript/hexen/fog.txt rename to wadsrc/static/zscript/actors/hexen/fog.zs diff --git a/wadsrc/static/zscript/hexen/healingradius.txt b/wadsrc/static/zscript/actors/hexen/healingradius.zs similarity index 100% rename from wadsrc/static/zscript/hexen/healingradius.txt rename to wadsrc/static/zscript/actors/hexen/healingradius.zs diff --git a/wadsrc/static/zscript/hexen/heresiarch.txt b/wadsrc/static/zscript/actors/hexen/heresiarch.zs similarity index 100% rename from wadsrc/static/zscript/hexen/heresiarch.txt rename to wadsrc/static/zscript/actors/hexen/heresiarch.zs diff --git a/wadsrc/static/zscript/hexen/hexenarmor.txt b/wadsrc/static/zscript/actors/hexen/hexenarmor.zs similarity index 100% rename from wadsrc/static/zscript/hexen/hexenarmor.txt rename to wadsrc/static/zscript/actors/hexen/hexenarmor.zs diff --git a/wadsrc/static/zscript/hexen/hexendecorations.txt b/wadsrc/static/zscript/actors/hexen/hexendecorations.zs similarity index 100% rename from wadsrc/static/zscript/hexen/hexendecorations.txt rename to wadsrc/static/zscript/actors/hexen/hexendecorations.zs diff --git a/wadsrc/static/zscript/hexen/hexenkeys.txt b/wadsrc/static/zscript/actors/hexen/hexenkeys.zs similarity index 100% rename from wadsrc/static/zscript/hexen/hexenkeys.txt rename to wadsrc/static/zscript/actors/hexen/hexenkeys.zs diff --git a/wadsrc/static/zscript/hexen/hexenspecialdecs.txt b/wadsrc/static/zscript/actors/hexen/hexenspecialdecs.zs similarity index 100% rename from wadsrc/static/zscript/hexen/hexenspecialdecs.txt rename to wadsrc/static/zscript/actors/hexen/hexenspecialdecs.zs diff --git a/wadsrc/static/zscript/hexen/iceguy.txt b/wadsrc/static/zscript/actors/hexen/iceguy.zs similarity index 100% rename from wadsrc/static/zscript/hexen/iceguy.txt rename to wadsrc/static/zscript/actors/hexen/iceguy.zs diff --git a/wadsrc/static/zscript/hexen/korax.txt b/wadsrc/static/zscript/actors/hexen/korax.zs similarity index 100% rename from wadsrc/static/zscript/hexen/korax.txt rename to wadsrc/static/zscript/actors/hexen/korax.zs diff --git a/wadsrc/static/zscript/hexen/mageboss.txt b/wadsrc/static/zscript/actors/hexen/mageboss.zs similarity index 100% rename from wadsrc/static/zscript/hexen/mageboss.txt rename to wadsrc/static/zscript/actors/hexen/mageboss.zs diff --git a/wadsrc/static/zscript/hexen/magecone.txt b/wadsrc/static/zscript/actors/hexen/magecone.zs similarity index 100% rename from wadsrc/static/zscript/hexen/magecone.txt rename to wadsrc/static/zscript/actors/hexen/magecone.zs diff --git a/wadsrc/static/zscript/hexen/magelightning.txt b/wadsrc/static/zscript/actors/hexen/magelightning.zs similarity index 100% rename from wadsrc/static/zscript/hexen/magelightning.txt rename to wadsrc/static/zscript/actors/hexen/magelightning.zs diff --git a/wadsrc/static/zscript/hexen/mageplayer.txt b/wadsrc/static/zscript/actors/hexen/mageplayer.zs similarity index 100% rename from wadsrc/static/zscript/hexen/mageplayer.txt rename to wadsrc/static/zscript/actors/hexen/mageplayer.zs diff --git a/wadsrc/static/zscript/hexen/magestaff.txt b/wadsrc/static/zscript/actors/hexen/magestaff.zs similarity index 100% rename from wadsrc/static/zscript/hexen/magestaff.txt rename to wadsrc/static/zscript/actors/hexen/magestaff.zs diff --git a/wadsrc/static/zscript/hexen/magewand.txt b/wadsrc/static/zscript/actors/hexen/magewand.zs similarity index 100% rename from wadsrc/static/zscript/hexen/magewand.txt rename to wadsrc/static/zscript/actors/hexen/magewand.zs diff --git a/wadsrc/static/zscript/hexen/mana.txt b/wadsrc/static/zscript/actors/hexen/mana.zs similarity index 100% rename from wadsrc/static/zscript/hexen/mana.txt rename to wadsrc/static/zscript/actors/hexen/mana.zs diff --git a/wadsrc/static/zscript/hexen/pig.txt b/wadsrc/static/zscript/actors/hexen/pig.zs similarity index 100% rename from wadsrc/static/zscript/hexen/pig.txt rename to wadsrc/static/zscript/actors/hexen/pig.zs diff --git a/wadsrc/static/zscript/hexen/puzzleitems.txt b/wadsrc/static/zscript/actors/hexen/puzzleitems.zs similarity index 100% rename from wadsrc/static/zscript/hexen/puzzleitems.txt rename to wadsrc/static/zscript/actors/hexen/puzzleitems.zs diff --git a/wadsrc/static/zscript/hexen/scriptprojectiles.txt b/wadsrc/static/zscript/actors/hexen/scriptprojectiles.zs similarity index 100% rename from wadsrc/static/zscript/hexen/scriptprojectiles.txt rename to wadsrc/static/zscript/actors/hexen/scriptprojectiles.zs diff --git a/wadsrc/static/zscript/hexen/serpent.txt b/wadsrc/static/zscript/actors/hexen/serpent.zs similarity index 100% rename from wadsrc/static/zscript/hexen/serpent.txt rename to wadsrc/static/zscript/actors/hexen/serpent.zs diff --git a/wadsrc/static/zscript/hexen/speedboots.txt b/wadsrc/static/zscript/actors/hexen/speedboots.zs similarity index 100% rename from wadsrc/static/zscript/hexen/speedboots.txt rename to wadsrc/static/zscript/actors/hexen/speedboots.zs diff --git a/wadsrc/static/zscript/hexen/spike.txt b/wadsrc/static/zscript/actors/hexen/spike.zs similarity index 100% rename from wadsrc/static/zscript/hexen/spike.txt rename to wadsrc/static/zscript/actors/hexen/spike.zs diff --git a/wadsrc/static/zscript/hexen/summon.txt b/wadsrc/static/zscript/actors/hexen/summon.zs similarity index 100% rename from wadsrc/static/zscript/hexen/summon.txt rename to wadsrc/static/zscript/actors/hexen/summon.zs diff --git a/wadsrc/static/zscript/hexen/teleportother.txt b/wadsrc/static/zscript/actors/hexen/teleportother.zs similarity index 100% rename from wadsrc/static/zscript/hexen/teleportother.txt rename to wadsrc/static/zscript/actors/hexen/teleportother.zs diff --git a/wadsrc/static/zscript/hexen/wraith.txt b/wadsrc/static/zscript/actors/hexen/wraith.zs similarity index 100% rename from wadsrc/static/zscript/hexen/wraith.txt rename to wadsrc/static/zscript/actors/hexen/wraith.zs diff --git a/wadsrc/static/zscript/actor_interaction.txt b/wadsrc/static/zscript/actors/interaction.zs similarity index 100% rename from wadsrc/static/zscript/actor_interaction.txt rename to wadsrc/static/zscript/actors/interaction.zs diff --git a/wadsrc/static/zscript/inventory/ammo.txt b/wadsrc/static/zscript/actors/inventory/ammo.zs similarity index 100% rename from wadsrc/static/zscript/inventory/ammo.txt rename to wadsrc/static/zscript/actors/inventory/ammo.zs diff --git a/wadsrc/static/zscript/inventory/armor.txt b/wadsrc/static/zscript/actors/inventory/armor.zs similarity index 100% rename from wadsrc/static/zscript/inventory/armor.txt rename to wadsrc/static/zscript/actors/inventory/armor.zs diff --git a/wadsrc/static/zscript/inventory/health.txt b/wadsrc/static/zscript/actors/inventory/health.zs similarity index 100% rename from wadsrc/static/zscript/inventory/health.txt rename to wadsrc/static/zscript/actors/inventory/health.zs diff --git a/wadsrc/static/zscript/inventory/inv_misc.txt b/wadsrc/static/zscript/actors/inventory/inv_misc.zs similarity index 100% rename from wadsrc/static/zscript/inventory/inv_misc.txt rename to wadsrc/static/zscript/actors/inventory/inv_misc.zs diff --git a/wadsrc/static/zscript/inventory/inventory.txt b/wadsrc/static/zscript/actors/inventory/inventory.zs similarity index 100% rename from wadsrc/static/zscript/inventory/inventory.txt rename to wadsrc/static/zscript/actors/inventory/inventory.zs diff --git a/wadsrc/static/zscript/inventory/powerups.txt b/wadsrc/static/zscript/actors/inventory/powerups.zs similarity index 100% rename from wadsrc/static/zscript/inventory/powerups.txt rename to wadsrc/static/zscript/actors/inventory/powerups.zs diff --git a/wadsrc/static/zscript/inventory/stateprovider.txt b/wadsrc/static/zscript/actors/inventory/stateprovider.zs similarity index 100% rename from wadsrc/static/zscript/inventory/stateprovider.txt rename to wadsrc/static/zscript/actors/inventory/stateprovider.zs diff --git a/wadsrc/static/zscript/inventory/weaponpiece.txt b/wadsrc/static/zscript/actors/inventory/weaponpiece.zs similarity index 100% rename from wadsrc/static/zscript/inventory/weaponpiece.txt rename to wadsrc/static/zscript/actors/inventory/weaponpiece.zs diff --git a/wadsrc/static/zscript/inventory/weapons.txt b/wadsrc/static/zscript/actors/inventory/weapons.zs similarity index 100% rename from wadsrc/static/zscript/inventory/weapons.txt rename to wadsrc/static/zscript/actors/inventory/weapons.zs diff --git a/wadsrc/static/zscript/actor_inventory.txt b/wadsrc/static/zscript/actors/inventory_util.zs similarity index 100% rename from wadsrc/static/zscript/actor_inventory.txt rename to wadsrc/static/zscript/actors/inventory_util.zs diff --git a/wadsrc/static/zscript/actors/morph.zs b/wadsrc/static/zscript/actors/morph.zs new file mode 100644 index 000000000..b48bb98d4 --- /dev/null +++ b/wadsrc/static/zscript/actors/morph.zs @@ -0,0 +1,146 @@ +//----------------------------------------------------------------------------- +// +// Copyright 1994-1996 Raven Software +// Copyright 1999-2016 Randy Heit +// Copyright 2002-2018 Christoph Oelckers +// Copyright 2005-2008 Martin Howe +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/ +// +//----------------------------------------------------------------------------- +// + +extend class Actor +{ + virtual Actor, int, int MorphedDeath() + { + return null, 0, 0; + } + + + //=========================================================================== + // + // Main entry point + // + //=========================================================================== + + virtual bool Morph(Actor activator, class playerclass, class monsterclass, int duration = 0, int style = 0, class morphflash = null, classunmorphflash = null) + { + if (player != null && player.mo != null && playerclass != null) + { + return player.mo.MorphPlayer(activator? activator.player : null, playerclass, duration, style, morphflash, unmorphflash); + } + else + { + return MorphMonster(monsterclass, duration, style, morphflash, unmorphflash); + } + } + + //=========================================================================== + // + // Action function variant whose arguments differ from the generic one. + // + //=========================================================================== + + bool A_Morph(class type, int duration = 0, int style = 0, class morphflash = null, classunmorphflash = null) + { + if (self.player != null) + { + let playerclass = (class)(type); + if (playerclass && self.player.mo != null) return player.mo.MorphPlayer(self.player, playerclass, duration, style, morphflash, unmorphflash); + } + else + { + return MorphMonster(type, duration, style, morphflash, unmorphflash); + } + return false; + } + + //=========================================================================== + // + // Main entry point + // + //=========================================================================== + + virtual bool UnMorph(Actor activator, int flags, bool force) + { + if (player) + { + return player.mo.UndoPlayerMorph(activator? activator.player : null, flags, force); + } + else + { + let morphed = MorphedMonster(self); + if (morphed) + return morphed.UndoMonsterMorph(force); + } + return false; + } + + + //--------------------------------------------------------------------------- + // + // FUNC P_MorphMonster + // + // Returns true if the monster gets turned into a chicken/pig. + // + //--------------------------------------------------------------------------- + + virtual bool MorphMonster (Class spawntype, int duration, int style, Class enter_flash, Class exit_flash) + { + if (player || spawntype == NULL || bDontMorph || !bIsMonster || !(spawntype is 'MorphedMonster')) + { + return false; + } + + let morphed = MorphedMonster(Spawn (spawntype, Pos, NO_REPLACE)); + Substitute (morphed); + if ((style & MRF_TRANSFERTRANSLATION) && !morphed.bDontTranslate) + { + morphed.Translation = Translation; + } + morphed.ChangeTid(tid); + ChangeTid(0); + morphed.Angle = Angle; + morphed.UnmorphedMe = self; + morphed.Alpha = Alpha; + morphed.RenderStyle = RenderStyle; + morphed.Score = Score; + + morphed.UnmorphTime = level.time + ((duration) ? duration : DEFMORPHTICS) + random[morphmonst](); + morphed.MorphStyle = style; + morphed.MorphExitFlash = (exit_flash) ? exit_flash : (class)("TeleportFog"); + morphed.FlagsSave = bSolid * 2 + bShootable * 4 + bInvisible * 0x40; // The factors are for savegame compatibility + + morphed.special = special; + morphed.args[0] = args[0]; + morphed.args[1] = args[1]; + morphed.args[2] = args[2]; + morphed.args[3] = args[3]; + morphed.args[4] = args[4]; + morphed.CopyFriendliness (self, true); + morphed.bShadow |= bShadow; + morphed.bGhost |= bGhost; + special = 0; + bSolid = false; + bShootable = false; + bUnmorphed = true; + bInvisible = true; + let eflash = Spawn(enter_flash ? enter_flash : (class)("TeleportFog"), Pos + (0, 0, gameinfo.TELEFOGHEIGHT), ALLOW_REPLACE); + if (eflash) + eflash.target = morphed; + return true; + } +} + diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/actors/player/player.zs similarity index 100% rename from wadsrc/static/zscript/shared/player.txt rename to wadsrc/static/zscript/actors/player/player.zs diff --git a/wadsrc/static/zscript/shared/player_cheat.txt b/wadsrc/static/zscript/actors/player/player_cheat.zs similarity index 100% rename from wadsrc/static/zscript/shared/player_cheat.txt rename to wadsrc/static/zscript/actors/player/player_cheat.zs diff --git a/wadsrc/static/zscript/shared/player_inventory.txt b/wadsrc/static/zscript/actors/player/player_inventory.zs similarity index 100% rename from wadsrc/static/zscript/shared/player_inventory.txt rename to wadsrc/static/zscript/actors/player/player_inventory.zs diff --git a/wadsrc/static/zscript/shared/morph.txt b/wadsrc/static/zscript/actors/player/player_morph.zs similarity index 76% rename from wadsrc/static/zscript/shared/morph.txt rename to wadsrc/static/zscript/actors/player/player_morph.zs index 8aa33926e..7921d1dce 100644 --- a/wadsrc/static/zscript/shared/morph.txt +++ b/wadsrc/static/zscript/actors/player/player_morph.zs @@ -1,149 +1,3 @@ -//----------------------------------------------------------------------------- -// -// Copyright 1994-1996 Raven Software -// Copyright 1999-2016 Randy Heit -// Copyright 2002-2018 Christoph Oelckers -// Copyright 2005-2008 Martin Howe -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see http://www.gnu.org/licenses/ -// -//----------------------------------------------------------------------------- -// - -extend class Actor -{ - virtual Actor, int, int MorphedDeath() - { - return null, 0, 0; - } - - - //=========================================================================== - // - // Main entry point - // - //=========================================================================== - - virtual bool Morph(Actor activator, class playerclass, class monsterclass, int duration = 0, int style = 0, class morphflash = null, classunmorphflash = null) - { - if (player != null && player.mo != null && playerclass != null) - { - return player.mo.MorphPlayer(activator? activator.player : null, playerclass, duration, style, morphflash, unmorphflash); - } - else - { - return MorphMonster(monsterclass, duration, style, morphflash, unmorphflash); - } - } - - //=========================================================================== - // - // Action function variant whose arguments differ from the generic one. - // - //=========================================================================== - - bool A_Morph(class type, int duration = 0, int style = 0, class morphflash = null, classunmorphflash = null) - { - if (self.player != null) - { - let playerclass = (class)(type); - if (playerclass && self.player.mo != null) return player.mo.MorphPlayer(self.player, playerclass, duration, style, morphflash, unmorphflash); - } - else - { - return MorphMonster(type, duration, style, morphflash, unmorphflash); - } - return false; - } - - //=========================================================================== - // - // Main entry point - // - //=========================================================================== - - virtual bool UnMorph(Actor activator, int flags, bool force) - { - if (player) - { - return player.mo.UndoPlayerMorph(activator? activator.player : null, flags, force); - } - else - { - let morphed = MorphedMonster(self); - if (morphed) - return morphed.UndoMonsterMorph(force); - } - return false; - } - - - //--------------------------------------------------------------------------- - // - // FUNC P_MorphMonster - // - // Returns true if the monster gets turned into a chicken/pig. - // - //--------------------------------------------------------------------------- - - virtual bool MorphMonster (Class spawntype, int duration, int style, Class enter_flash, Class exit_flash) - { - if (player || spawntype == NULL || bDontMorph || !bIsMonster || !(spawntype is 'MorphedMonster')) - { - return false; - } - - let morphed = MorphedMonster(Spawn (spawntype, Pos, NO_REPLACE)); - Substitute (morphed); - if ((style & MRF_TRANSFERTRANSLATION) && !morphed.bDontTranslate) - { - morphed.Translation = Translation; - } - morphed.ChangeTid(tid); - ChangeTid(0); - morphed.Angle = Angle; - morphed.UnmorphedMe = self; - morphed.Alpha = Alpha; - morphed.RenderStyle = RenderStyle; - morphed.Score = Score; - - morphed.UnmorphTime = level.time + ((duration) ? duration : DEFMORPHTICS) + random[morphmonst](); - morphed.MorphStyle = style; - morphed.MorphExitFlash = (exit_flash) ? exit_flash : (class)("TeleportFog"); - morphed.FlagsSave = bSolid * 2 + bShootable * 4 + bInvisible * 0x40; // The factors are for savegame compatibility - - morphed.special = special; - morphed.args[0] = args[0]; - morphed.args[1] = args[1]; - morphed.args[2] = args[2]; - morphed.args[3] = args[3]; - morphed.args[4] = args[4]; - morphed.CopyFriendliness (self, true); - morphed.bShadow |= bShadow; - morphed.bGhost |= bGhost; - special = 0; - bSolid = false; - bShootable = false; - bUnmorphed = true; - bInvisible = true; - let eflash = Spawn(enter_flash ? enter_flash : (class)("TeleportFog"), Pos + (0, 0, gameinfo.TELEFOGHEIGHT), ALLOW_REPLACE); - if (eflash) - eflash.target = morphed; - return true; - } -} - extend class PlayerPawn { //=========================================================================== diff --git a/wadsrc/static/zscript/raven/artiegg.txt b/wadsrc/static/zscript/actors/raven/artiegg.zs similarity index 100% rename from wadsrc/static/zscript/raven/artiegg.txt rename to wadsrc/static/zscript/actors/raven/artiegg.zs diff --git a/wadsrc/static/zscript/raven/artitele.txt b/wadsrc/static/zscript/actors/raven/artitele.zs similarity index 100% rename from wadsrc/static/zscript/raven/artitele.txt rename to wadsrc/static/zscript/actors/raven/artitele.zs diff --git a/wadsrc/static/zscript/raven/minotaur.txt b/wadsrc/static/zscript/actors/raven/minotaur.zs similarity index 100% rename from wadsrc/static/zscript/raven/minotaur.txt rename to wadsrc/static/zscript/actors/raven/minotaur.zs diff --git a/wadsrc/static/zscript/raven/ravenambient.txt b/wadsrc/static/zscript/actors/raven/ravenambient.zs similarity index 100% rename from wadsrc/static/zscript/raven/ravenambient.txt rename to wadsrc/static/zscript/actors/raven/ravenambient.zs diff --git a/wadsrc/static/zscript/raven/ravenartifacts.txt b/wadsrc/static/zscript/actors/raven/ravenartifacts.zs similarity index 100% rename from wadsrc/static/zscript/raven/ravenartifacts.txt rename to wadsrc/static/zscript/actors/raven/ravenartifacts.zs diff --git a/wadsrc/static/zscript/raven/ravenhealth.txt b/wadsrc/static/zscript/actors/raven/ravenhealth.zs similarity index 100% rename from wadsrc/static/zscript/raven/ravenhealth.txt rename to wadsrc/static/zscript/actors/raven/ravenhealth.zs diff --git a/wadsrc/static/zscript/shared/blood.txt b/wadsrc/static/zscript/actors/shared/blood.zs similarity index 100% rename from wadsrc/static/zscript/shared/blood.txt rename to wadsrc/static/zscript/actors/shared/blood.zs diff --git a/wadsrc/static/zscript/shared/botstuff.txt b/wadsrc/static/zscript/actors/shared/botstuff.zs similarity index 100% rename from wadsrc/static/zscript/shared/botstuff.txt rename to wadsrc/static/zscript/actors/shared/botstuff.zs diff --git a/wadsrc/static/zscript/shared/bridge.txt b/wadsrc/static/zscript/actors/shared/bridge.zs similarity index 100% rename from wadsrc/static/zscript/shared/bridge.txt rename to wadsrc/static/zscript/actors/shared/bridge.zs diff --git a/wadsrc/static/zscript/shared/camera.txt b/wadsrc/static/zscript/actors/shared/camera.zs similarity index 100% rename from wadsrc/static/zscript/shared/camera.txt rename to wadsrc/static/zscript/actors/shared/camera.zs diff --git a/wadsrc/static/zscript/shared/debris.txt b/wadsrc/static/zscript/actors/shared/debris.zs similarity index 100% rename from wadsrc/static/zscript/shared/debris.txt rename to wadsrc/static/zscript/actors/shared/debris.zs diff --git a/wadsrc/static/zscript/shared/decal.txt b/wadsrc/static/zscript/actors/shared/decal.zs similarity index 100% rename from wadsrc/static/zscript/shared/decal.txt rename to wadsrc/static/zscript/actors/shared/decal.zs diff --git a/wadsrc/static/zscript/shared/dog.txt b/wadsrc/static/zscript/actors/shared/dog.zs similarity index 100% rename from wadsrc/static/zscript/shared/dog.txt rename to wadsrc/static/zscript/actors/shared/dog.zs diff --git a/wadsrc/static/zscript/shared/dynlights.txt b/wadsrc/static/zscript/actors/shared/dynlights.zs similarity index 100% rename from wadsrc/static/zscript/shared/dynlights.txt rename to wadsrc/static/zscript/actors/shared/dynlights.zs diff --git a/wadsrc/static/zscript/shared/fastprojectile.txt b/wadsrc/static/zscript/actors/shared/fastprojectile.zs similarity index 100% rename from wadsrc/static/zscript/shared/fastprojectile.txt rename to wadsrc/static/zscript/actors/shared/fastprojectile.zs diff --git a/wadsrc/static/zscript/shared/fountain.txt b/wadsrc/static/zscript/actors/shared/fountain.zs similarity index 100% rename from wadsrc/static/zscript/shared/fountain.txt rename to wadsrc/static/zscript/actors/shared/fountain.zs diff --git a/wadsrc/static/zscript/shared/hatetarget.txt b/wadsrc/static/zscript/actors/shared/hatetarget.zs similarity index 100% rename from wadsrc/static/zscript/shared/hatetarget.txt rename to wadsrc/static/zscript/actors/shared/hatetarget.zs diff --git a/wadsrc/static/zscript/shared/ice.txt b/wadsrc/static/zscript/actors/shared/ice.zs similarity index 100% rename from wadsrc/static/zscript/shared/ice.txt rename to wadsrc/static/zscript/actors/shared/ice.zs diff --git a/wadsrc/static/zscript/shared/itemeffects.txt b/wadsrc/static/zscript/actors/shared/itemeffects.zs similarity index 100% rename from wadsrc/static/zscript/shared/itemeffects.txt rename to wadsrc/static/zscript/actors/shared/itemeffects.zs diff --git a/wadsrc/static/zscript/shared/mapmarker.txt b/wadsrc/static/zscript/actors/shared/mapmarker.zs similarity index 100% rename from wadsrc/static/zscript/shared/mapmarker.txt rename to wadsrc/static/zscript/actors/shared/mapmarker.zs diff --git a/wadsrc/static/zscript/shared/movingcamera.txt b/wadsrc/static/zscript/actors/shared/movingcamera.zs similarity index 100% rename from wadsrc/static/zscript/shared/movingcamera.txt rename to wadsrc/static/zscript/actors/shared/movingcamera.zs diff --git a/wadsrc/static/zscript/shared/randomspawner.txt b/wadsrc/static/zscript/actors/shared/randomspawner.zs similarity index 100% rename from wadsrc/static/zscript/shared/randomspawner.txt rename to wadsrc/static/zscript/actors/shared/randomspawner.zs diff --git a/wadsrc/static/zscript/shared/secrettrigger.txt b/wadsrc/static/zscript/actors/shared/secrettrigger.zs similarity index 100% rename from wadsrc/static/zscript/shared/secrettrigger.txt rename to wadsrc/static/zscript/actors/shared/secrettrigger.zs diff --git a/wadsrc/static/zscript/shared/sectoraction.txt b/wadsrc/static/zscript/actors/shared/sectoraction.zs similarity index 100% rename from wadsrc/static/zscript/shared/sectoraction.txt rename to wadsrc/static/zscript/actors/shared/sectoraction.zs diff --git a/wadsrc/static/zscript/shared/setcolor.txt b/wadsrc/static/zscript/actors/shared/setcolor.zs similarity index 100% rename from wadsrc/static/zscript/shared/setcolor.txt rename to wadsrc/static/zscript/actors/shared/setcolor.zs diff --git a/wadsrc/static/zscript/shared/sharedmisc.txt b/wadsrc/static/zscript/actors/shared/sharedmisc.zs similarity index 100% rename from wadsrc/static/zscript/shared/sharedmisc.txt rename to wadsrc/static/zscript/actors/shared/sharedmisc.zs diff --git a/wadsrc/static/zscript/shared/skies.txt b/wadsrc/static/zscript/actors/shared/skies.zs similarity index 100% rename from wadsrc/static/zscript/shared/skies.txt rename to wadsrc/static/zscript/actors/shared/skies.zs diff --git a/wadsrc/static/zscript/shared/soundenvironment.txt b/wadsrc/static/zscript/actors/shared/soundenvironment.zs similarity index 100% rename from wadsrc/static/zscript/shared/soundenvironment.txt rename to wadsrc/static/zscript/actors/shared/soundenvironment.zs diff --git a/wadsrc/static/zscript/shared/soundsequence.txt b/wadsrc/static/zscript/actors/shared/soundsequence.zs similarity index 100% rename from wadsrc/static/zscript/shared/soundsequence.txt rename to wadsrc/static/zscript/actors/shared/soundsequence.zs diff --git a/wadsrc/static/zscript/shared/spark.txt b/wadsrc/static/zscript/actors/shared/spark.zs similarity index 100% rename from wadsrc/static/zscript/shared/spark.txt rename to wadsrc/static/zscript/actors/shared/spark.zs diff --git a/wadsrc/static/zscript/shared/specialspot.txt b/wadsrc/static/zscript/actors/shared/specialspot.zs similarity index 100% rename from wadsrc/static/zscript/shared/specialspot.txt rename to wadsrc/static/zscript/actors/shared/specialspot.zs diff --git a/wadsrc/static/zscript/shared/splashes.txt b/wadsrc/static/zscript/actors/shared/splashes.zs similarity index 100% rename from wadsrc/static/zscript/shared/splashes.txt rename to wadsrc/static/zscript/actors/shared/splashes.zs diff --git a/wadsrc/static/zscript/shared/teleport.txt b/wadsrc/static/zscript/actors/shared/teleport.zs similarity index 100% rename from wadsrc/static/zscript/shared/teleport.txt rename to wadsrc/static/zscript/actors/shared/teleport.zs diff --git a/wadsrc/static/zscript/shared/waterzone.txt b/wadsrc/static/zscript/actors/shared/waterzone.zs similarity index 100% rename from wadsrc/static/zscript/shared/waterzone.txt rename to wadsrc/static/zscript/actors/shared/waterzone.zs diff --git a/wadsrc/static/zscript/strife/acolyte.txt b/wadsrc/static/zscript/actors/strife/acolyte.zs similarity index 100% rename from wadsrc/static/zscript/strife/acolyte.txt rename to wadsrc/static/zscript/actors/strife/acolyte.zs diff --git a/wadsrc/static/zscript/strife/alienspectres.txt b/wadsrc/static/zscript/actors/strife/alienspectres.zs similarity index 100% rename from wadsrc/static/zscript/strife/alienspectres.txt rename to wadsrc/static/zscript/actors/strife/alienspectres.zs diff --git a/wadsrc/static/zscript/strife/beggars.txt b/wadsrc/static/zscript/actors/strife/beggars.zs similarity index 100% rename from wadsrc/static/zscript/strife/beggars.txt rename to wadsrc/static/zscript/actors/strife/beggars.zs diff --git a/wadsrc/static/zscript/strife/coin.txt b/wadsrc/static/zscript/actors/strife/coin.zs similarity index 100% rename from wadsrc/static/zscript/strife/coin.txt rename to wadsrc/static/zscript/actors/strife/coin.zs diff --git a/wadsrc/static/zscript/strife/crusader.txt b/wadsrc/static/zscript/actors/strife/crusader.zs similarity index 100% rename from wadsrc/static/zscript/strife/crusader.txt rename to wadsrc/static/zscript/actors/strife/crusader.zs diff --git a/wadsrc/static/zscript/strife/entityboss.txt b/wadsrc/static/zscript/actors/strife/entityboss.zs similarity index 100% rename from wadsrc/static/zscript/strife/entityboss.txt rename to wadsrc/static/zscript/actors/strife/entityboss.zs diff --git a/wadsrc/static/zscript/strife/inquisitor.txt b/wadsrc/static/zscript/actors/strife/inquisitor.zs similarity index 100% rename from wadsrc/static/zscript/strife/inquisitor.txt rename to wadsrc/static/zscript/actors/strife/inquisitor.zs diff --git a/wadsrc/static/zscript/strife/klaxon.txt b/wadsrc/static/zscript/actors/strife/klaxon.zs similarity index 100% rename from wadsrc/static/zscript/strife/klaxon.txt rename to wadsrc/static/zscript/actors/strife/klaxon.zs diff --git a/wadsrc/static/zscript/strife/loremaster.txt b/wadsrc/static/zscript/actors/strife/loremaster.zs similarity index 100% rename from wadsrc/static/zscript/strife/loremaster.txt rename to wadsrc/static/zscript/actors/strife/loremaster.zs diff --git a/wadsrc/static/zscript/strife/macil.txt b/wadsrc/static/zscript/actors/strife/macil.zs similarity index 100% rename from wadsrc/static/zscript/strife/macil.txt rename to wadsrc/static/zscript/actors/strife/macil.zs diff --git a/wadsrc/static/zscript/strife/merchants.txt b/wadsrc/static/zscript/actors/strife/merchants.zs similarity index 100% rename from wadsrc/static/zscript/strife/merchants.txt rename to wadsrc/static/zscript/actors/strife/merchants.zs diff --git a/wadsrc/static/zscript/strife/oracle.txt b/wadsrc/static/zscript/actors/strife/oracle.zs similarity index 100% rename from wadsrc/static/zscript/strife/oracle.txt rename to wadsrc/static/zscript/actors/strife/oracle.zs diff --git a/wadsrc/static/zscript/strife/peasants.txt b/wadsrc/static/zscript/actors/strife/peasants.zs similarity index 100% rename from wadsrc/static/zscript/strife/peasants.txt rename to wadsrc/static/zscript/actors/strife/peasants.zs diff --git a/wadsrc/static/zscript/strife/programmer.txt b/wadsrc/static/zscript/actors/strife/programmer.zs similarity index 100% rename from wadsrc/static/zscript/strife/programmer.txt rename to wadsrc/static/zscript/actors/strife/programmer.zs diff --git a/wadsrc/static/zscript/strife/questitems.txt b/wadsrc/static/zscript/actors/strife/questitems.zs similarity index 100% rename from wadsrc/static/zscript/strife/questitems.txt rename to wadsrc/static/zscript/actors/strife/questitems.zs diff --git a/wadsrc/static/zscript/strife/ratbuddy.txt b/wadsrc/static/zscript/actors/strife/ratbuddy.zs similarity index 100% rename from wadsrc/static/zscript/strife/ratbuddy.txt rename to wadsrc/static/zscript/actors/strife/ratbuddy.zs diff --git a/wadsrc/static/zscript/strife/reaver.txt b/wadsrc/static/zscript/actors/strife/reaver.zs similarity index 100% rename from wadsrc/static/zscript/strife/reaver.txt rename to wadsrc/static/zscript/actors/strife/reaver.zs diff --git a/wadsrc/static/zscript/strife/rebels.txt b/wadsrc/static/zscript/actors/strife/rebels.zs similarity index 100% rename from wadsrc/static/zscript/strife/rebels.txt rename to wadsrc/static/zscript/actors/strife/rebels.zs diff --git a/wadsrc/static/zscript/strife/sentinel.txt b/wadsrc/static/zscript/actors/strife/sentinel.zs similarity index 100% rename from wadsrc/static/zscript/strife/sentinel.txt rename to wadsrc/static/zscript/actors/strife/sentinel.zs diff --git a/wadsrc/static/zscript/strife/sigil.txt b/wadsrc/static/zscript/actors/strife/sigil.zs similarity index 100% rename from wadsrc/static/zscript/strife/sigil.txt rename to wadsrc/static/zscript/actors/strife/sigil.zs diff --git a/wadsrc/static/zscript/strife/spectral.txt b/wadsrc/static/zscript/actors/strife/spectral.zs similarity index 100% rename from wadsrc/static/zscript/strife/spectral.txt rename to wadsrc/static/zscript/actors/strife/spectral.zs diff --git a/wadsrc/static/zscript/strife/stalker.txt b/wadsrc/static/zscript/actors/strife/stalker.zs similarity index 100% rename from wadsrc/static/zscript/strife/stalker.txt rename to wadsrc/static/zscript/actors/strife/stalker.zs diff --git a/wadsrc/static/zscript/strife/strifeammo.txt b/wadsrc/static/zscript/actors/strife/strifeammo.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifeammo.txt rename to wadsrc/static/zscript/actors/strife/strifeammo.zs diff --git a/wadsrc/static/zscript/strife/strifearmor.txt b/wadsrc/static/zscript/actors/strife/strifearmor.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifearmor.txt rename to wadsrc/static/zscript/actors/strife/strifearmor.zs diff --git a/wadsrc/static/zscript/strife/strifebishop.txt b/wadsrc/static/zscript/actors/strife/strifebishop.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifebishop.txt rename to wadsrc/static/zscript/actors/strife/strifebishop.zs diff --git a/wadsrc/static/zscript/strife/strifefunctions.txt b/wadsrc/static/zscript/actors/strife/strifefunctions.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifefunctions.txt rename to wadsrc/static/zscript/actors/strife/strifefunctions.zs diff --git a/wadsrc/static/zscript/strife/strifehumanoid.txt b/wadsrc/static/zscript/actors/strife/strifehumanoid.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifehumanoid.txt rename to wadsrc/static/zscript/actors/strife/strifehumanoid.zs diff --git a/wadsrc/static/zscript/strife/strifeitems.txt b/wadsrc/static/zscript/actors/strife/strifeitems.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifeitems.txt rename to wadsrc/static/zscript/actors/strife/strifeitems.zs diff --git a/wadsrc/static/zscript/strife/strifekeys.txt b/wadsrc/static/zscript/actors/strife/strifekeys.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifekeys.txt rename to wadsrc/static/zscript/actors/strife/strifekeys.zs diff --git a/wadsrc/static/zscript/strife/strifeplayer.txt b/wadsrc/static/zscript/actors/strife/strifeplayer.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifeplayer.txt rename to wadsrc/static/zscript/actors/strife/strifeplayer.zs diff --git a/wadsrc/static/zscript/strife/strifestuff.txt b/wadsrc/static/zscript/actors/strife/strifestuff.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifestuff.txt rename to wadsrc/static/zscript/actors/strife/strifestuff.zs diff --git a/wadsrc/static/zscript/strife/strifeweapons.txt b/wadsrc/static/zscript/actors/strife/strifeweapons.zs similarity index 100% rename from wadsrc/static/zscript/strife/strifeweapons.txt rename to wadsrc/static/zscript/actors/strife/strifeweapons.zs diff --git a/wadsrc/static/zscript/strife/svelights.txt b/wadsrc/static/zscript/actors/strife/svelights.zs similarity index 100% rename from wadsrc/static/zscript/strife/svelights.txt rename to wadsrc/static/zscript/actors/strife/svelights.zs diff --git a/wadsrc/static/zscript/strife/svestuff.txt b/wadsrc/static/zscript/actors/strife/svestuff.zs similarity index 100% rename from wadsrc/static/zscript/strife/svestuff.txt rename to wadsrc/static/zscript/actors/strife/svestuff.zs diff --git a/wadsrc/static/zscript/strife/templar.txt b/wadsrc/static/zscript/actors/strife/templar.zs similarity index 100% rename from wadsrc/static/zscript/strife/templar.txt rename to wadsrc/static/zscript/actors/strife/templar.zs diff --git a/wadsrc/static/zscript/strife/thingstoblowup.txt b/wadsrc/static/zscript/actors/strife/thingstoblowup.zs similarity index 100% rename from wadsrc/static/zscript/strife/thingstoblowup.txt rename to wadsrc/static/zscript/actors/strife/thingstoblowup.zs diff --git a/wadsrc/static/zscript/strife/weaponassault.txt b/wadsrc/static/zscript/actors/strife/weaponassault.zs similarity index 100% rename from wadsrc/static/zscript/strife/weaponassault.txt rename to wadsrc/static/zscript/actors/strife/weaponassault.zs diff --git a/wadsrc/static/zscript/strife/weaponcrossbow.txt b/wadsrc/static/zscript/actors/strife/weaponcrossbow.zs similarity index 100% rename from wadsrc/static/zscript/strife/weaponcrossbow.txt rename to wadsrc/static/zscript/actors/strife/weaponcrossbow.zs diff --git a/wadsrc/static/zscript/strife/weapondagger.txt b/wadsrc/static/zscript/actors/strife/weapondagger.zs similarity index 100% rename from wadsrc/static/zscript/strife/weapondagger.txt rename to wadsrc/static/zscript/actors/strife/weapondagger.zs diff --git a/wadsrc/static/zscript/strife/weaponflamer.txt b/wadsrc/static/zscript/actors/strife/weaponflamer.zs similarity index 100% rename from wadsrc/static/zscript/strife/weaponflamer.txt rename to wadsrc/static/zscript/actors/strife/weaponflamer.zs diff --git a/wadsrc/static/zscript/strife/weapongrenade.txt b/wadsrc/static/zscript/actors/strife/weapongrenade.zs similarity index 100% rename from wadsrc/static/zscript/strife/weapongrenade.txt rename to wadsrc/static/zscript/actors/strife/weapongrenade.zs diff --git a/wadsrc/static/zscript/strife/weaponmauler.txt b/wadsrc/static/zscript/actors/strife/weaponmauler.zs similarity index 100% rename from wadsrc/static/zscript/strife/weaponmauler.txt rename to wadsrc/static/zscript/actors/strife/weaponmauler.zs diff --git a/wadsrc/static/zscript/strife/weaponmissile.txt b/wadsrc/static/zscript/actors/strife/weaponmissile.zs similarity index 100% rename from wadsrc/static/zscript/strife/weaponmissile.txt rename to wadsrc/static/zscript/actors/strife/weaponmissile.zs diff --git a/wadsrc/static/zscript/strife/zombie.txt b/wadsrc/static/zscript/actors/strife/zombie.zs similarity index 100% rename from wadsrc/static/zscript/strife/zombie.txt rename to wadsrc/static/zscript/actors/strife/zombie.zs diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.zs similarity index 100% rename from wadsrc/static/zscript/base.txt rename to wadsrc/static/zscript/base.zs diff --git a/wadsrc/static/zscript/compatibility.txt b/wadsrc/static/zscript/compatibility.zs similarity index 100% rename from wadsrc/static/zscript/compatibility.txt rename to wadsrc/static/zscript/compatibility.zs diff --git a/wadsrc/static/zscript/constants.txt b/wadsrc/static/zscript/constants.zs similarity index 100% rename from wadsrc/static/zscript/constants.txt rename to wadsrc/static/zscript/constants.zs diff --git a/wadsrc/static/zscript/destructible.txt b/wadsrc/static/zscript/destructible.zs old mode 100755 new mode 100644 similarity index 100% rename from wadsrc/static/zscript/destructible.txt rename to wadsrc/static/zscript/destructible.zs diff --git a/wadsrc/static/zscript/dynarrays.txt b/wadsrc/static/zscript/dynarrays.zs similarity index 100% rename from wadsrc/static/zscript/dynarrays.txt rename to wadsrc/static/zscript/dynarrays.zs diff --git a/wadsrc/static/zscript/events.txt b/wadsrc/static/zscript/events.zs old mode 100755 new mode 100644 similarity index 100% rename from wadsrc/static/zscript/events.txt rename to wadsrc/static/zscript/events.zs diff --git a/wadsrc/static/zscript/level_compatibility.txt b/wadsrc/static/zscript/level_compatibility.zs similarity index 100% rename from wadsrc/static/zscript/level_compatibility.txt rename to wadsrc/static/zscript/level_compatibility.zs diff --git a/wadsrc/static/zscript/mapdata.txt b/wadsrc/static/zscript/mapdata.zs similarity index 100% rename from wadsrc/static/zscript/mapdata.txt rename to wadsrc/static/zscript/mapdata.zs diff --git a/wadsrc/static/zscript/scriptutil/scriptutil.txt b/wadsrc/static/zscript/scriptutil/scriptutil.zs similarity index 100% rename from wadsrc/static/zscript/scriptutil/scriptutil.txt rename to wadsrc/static/zscript/scriptutil/scriptutil.zs diff --git a/wadsrc/static/zscript/sounddata.txt b/wadsrc/static/zscript/sounddata.zs similarity index 100% rename from wadsrc/static/zscript/sounddata.txt rename to wadsrc/static/zscript/sounddata.zs diff --git a/wadsrc/static/zscript/menu/colorpickermenu.txt b/wadsrc/static/zscript/ui/menu/colorpickermenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/colorpickermenu.txt rename to wadsrc/static/zscript/ui/menu/colorpickermenu.zs diff --git a/wadsrc/static/zscript/menu/conversationmenu.txt b/wadsrc/static/zscript/ui/menu/conversationmenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/conversationmenu.txt rename to wadsrc/static/zscript/ui/menu/conversationmenu.zs diff --git a/wadsrc/static/zscript/menu/joystickmenu.txt b/wadsrc/static/zscript/ui/menu/joystickmenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/joystickmenu.txt rename to wadsrc/static/zscript/ui/menu/joystickmenu.zs diff --git a/wadsrc/static/zscript/menu/listmenu.txt b/wadsrc/static/zscript/ui/menu/listmenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/listmenu.txt rename to wadsrc/static/zscript/ui/menu/listmenu.zs diff --git a/wadsrc/static/zscript/menu/listmenuitems.txt b/wadsrc/static/zscript/ui/menu/listmenuitems.zs similarity index 100% rename from wadsrc/static/zscript/menu/listmenuitems.txt rename to wadsrc/static/zscript/ui/menu/listmenuitems.zs diff --git a/wadsrc/static/zscript/menu/loadsavemenu.txt b/wadsrc/static/zscript/ui/menu/loadsavemenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/loadsavemenu.txt rename to wadsrc/static/zscript/ui/menu/loadsavemenu.zs diff --git a/wadsrc/static/zscript/menu/menu.txt b/wadsrc/static/zscript/ui/menu/menu.zs similarity index 100% rename from wadsrc/static/zscript/menu/menu.txt rename to wadsrc/static/zscript/ui/menu/menu.zs diff --git a/wadsrc/static/zscript/menu/menuitembase.txt b/wadsrc/static/zscript/ui/menu/menuitembase.zs similarity index 100% rename from wadsrc/static/zscript/menu/menuitembase.txt rename to wadsrc/static/zscript/ui/menu/menuitembase.zs diff --git a/wadsrc/static/zscript/menu/messagebox.txt b/wadsrc/static/zscript/ui/menu/messagebox.zs similarity index 100% rename from wadsrc/static/zscript/menu/messagebox.txt rename to wadsrc/static/zscript/ui/menu/messagebox.zs diff --git a/wadsrc/static/zscript/menu/optionmenu.txt b/wadsrc/static/zscript/ui/menu/optionmenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/optionmenu.txt rename to wadsrc/static/zscript/ui/menu/optionmenu.zs diff --git a/wadsrc/static/zscript/menu/optionmenuitems.txt b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs similarity index 100% rename from wadsrc/static/zscript/menu/optionmenuitems.txt rename to wadsrc/static/zscript/ui/menu/optionmenuitems.zs diff --git a/wadsrc/static/zscript/menu/playercontrols.txt b/wadsrc/static/zscript/ui/menu/playercontrols.zs similarity index 100% rename from wadsrc/static/zscript/menu/playercontrols.txt rename to wadsrc/static/zscript/ui/menu/playercontrols.zs diff --git a/wadsrc/static/zscript/menu/playerdisplay.txt b/wadsrc/static/zscript/ui/menu/playerdisplay.zs similarity index 100% rename from wadsrc/static/zscript/menu/playerdisplay.txt rename to wadsrc/static/zscript/ui/menu/playerdisplay.zs diff --git a/wadsrc/static/zscript/menu/playermenu.txt b/wadsrc/static/zscript/ui/menu/playermenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/playermenu.txt rename to wadsrc/static/zscript/ui/menu/playermenu.zs diff --git a/wadsrc/static/zscript/menu/readthis.txt b/wadsrc/static/zscript/ui/menu/readthis.zs similarity index 100% rename from wadsrc/static/zscript/menu/readthis.txt rename to wadsrc/static/zscript/ui/menu/readthis.zs diff --git a/wadsrc/static/zscript/menu/reverbedit.txt b/wadsrc/static/zscript/ui/menu/reverbedit.zs similarity index 100% rename from wadsrc/static/zscript/menu/reverbedit.txt rename to wadsrc/static/zscript/ui/menu/reverbedit.zs diff --git a/wadsrc/static/zscript/menu/textentermenu.txt b/wadsrc/static/zscript/ui/menu/textentermenu.zs similarity index 100% rename from wadsrc/static/zscript/menu/textentermenu.txt rename to wadsrc/static/zscript/ui/menu/textentermenu.zs diff --git a/wadsrc/static/zscript/statscreen/statscreen.txt b/wadsrc/static/zscript/ui/statscreen/statscreen.zs similarity index 100% rename from wadsrc/static/zscript/statscreen/statscreen.txt rename to wadsrc/static/zscript/ui/statscreen/statscreen.zs diff --git a/wadsrc/static/zscript/statscreen/statscreen_coop.txt b/wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs similarity index 100% rename from wadsrc/static/zscript/statscreen/statscreen_coop.txt rename to wadsrc/static/zscript/ui/statscreen/statscreen_coop.zs diff --git a/wadsrc/static/zscript/statscreen/statscreen_dm.txt b/wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs similarity index 100% rename from wadsrc/static/zscript/statscreen/statscreen_dm.txt rename to wadsrc/static/zscript/ui/statscreen/statscreen_dm.zs diff --git a/wadsrc/static/zscript/statscreen/statscreen_sp.txt b/wadsrc/static/zscript/ui/statscreen/statscreen_sp.zs similarity index 100% rename from wadsrc/static/zscript/statscreen/statscreen_sp.txt rename to wadsrc/static/zscript/ui/statscreen/statscreen_sp.zs diff --git a/wadsrc/static/zscript/statscreen/types.txt b/wadsrc/static/zscript/ui/statscreen/types.zs similarity index 100% rename from wadsrc/static/zscript/statscreen/types.txt rename to wadsrc/static/zscript/ui/statscreen/types.zs diff --git a/wadsrc/static/zscript/statusbar/alt_hud.txt b/wadsrc/static/zscript/ui/statusbar/alt_hud.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/alt_hud.txt rename to wadsrc/static/zscript/ui/statusbar/alt_hud.zs diff --git a/wadsrc/static/zscript/statusbar/doom_sbar.txt b/wadsrc/static/zscript/ui/statusbar/doom_sbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/doom_sbar.txt rename to wadsrc/static/zscript/ui/statusbar/doom_sbar.zs diff --git a/wadsrc/static/zscript/statusbar/harm_sbar.txt b/wadsrc/static/zscript/ui/statusbar/harm_sbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/harm_sbar.txt rename to wadsrc/static/zscript/ui/statusbar/harm_sbar.zs diff --git a/wadsrc/static/zscript/statusbar/heretic_sbar.txt b/wadsrc/static/zscript/ui/statusbar/heretic_sbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/heretic_sbar.txt rename to wadsrc/static/zscript/ui/statusbar/heretic_sbar.zs diff --git a/wadsrc/static/zscript/statusbar/hexen_sbar.txt b/wadsrc/static/zscript/ui/statusbar/hexen_sbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/hexen_sbar.txt rename to wadsrc/static/zscript/ui/statusbar/hexen_sbar.zs diff --git a/wadsrc/static/zscript/statusbar/sbarinfowrapper.txt b/wadsrc/static/zscript/ui/statusbar/sbarinfowrapper.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/sbarinfowrapper.txt rename to wadsrc/static/zscript/ui/statusbar/sbarinfowrapper.zs diff --git a/wadsrc/static/zscript/statusbar/statusbar.txt b/wadsrc/static/zscript/ui/statusbar/statusbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/statusbar.txt rename to wadsrc/static/zscript/ui/statusbar/statusbar.zs diff --git a/wadsrc/static/zscript/statusbar/strife_sbar.txt b/wadsrc/static/zscript/ui/statusbar/strife_sbar.zs similarity index 100% rename from wadsrc/static/zscript/statusbar/strife_sbar.txt rename to wadsrc/static/zscript/ui/statusbar/strife_sbar.zs diff --git a/wadsrc/static/zscript/zscript_license.txt b/wadsrc/static/zscript/zscript_license.txt index 50a89061c..4ab1812d3 100644 --- a/wadsrc/static/zscript/zscript_license.txt +++ b/wadsrc/static/zscript/zscript_license.txt @@ -2,7 +2,7 @@ Unless noted differently in the file, the following license applies to all ZScri //----------------------------------------------------------------------------- // -// Copyright 1993-2017 id Software, Randy Heit, Christoph Oelckers et.al. +// Copyright 1993-2019 id Software, Randy Heit, Christoph Oelckers et.al. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by