Merge pull request #8 from dpteam/zd32funcs

zd32funcs into master

.gitignore

@@ -11,4 +11,5 @@ $RECYCLE.BIN/
 *.pk3
 *.pk7
 *.dbs
-*.log
+*.log
+logfile

README.md

@@ -2,9 +2,9 @@
 
 ## Core component
 
-Funny cooperative+deathmatch entertaining modification for DOOM II. Created for Zandronum 3.0 port.
+Funny cooperative+deathmatch entertaining modification for DOOM II. Created for ZDoom32 port.
 
-Also have GZDoom/Delta-Touch compatibility
+Also have Delta-Touch compatibility
 
 ## How to compile (Windows)
 
@@ -14,12 +14,18 @@ Also have GZDoom/Delta-Touch compatibility
 4. Drag & Drop pk7 to zandronum.exe
 5. Play
 
-## Current important info
+## How to compile (Linux)
 
-CREDITS Currently Work in Progress, if im forgot some, please say it in issues.
+1. sudo apt-get install git
+2. git clone -b zd32funcs [email protected]:dpteam/dpt-hq-core.git dpt-hq-core
+3. sh build.sh
+4. Wait
+5. "./zdoom32 dpt-hq-core-current.pk7"
+6. Play
 
-Issue #7
+## Current important info
 
+CREDITS Currently Work in Progress, if im forgot some, please say it in issues. [Issue #7]
 
 Also info for paranoics:
 
@@ -50,8 +56,8 @@ https://qiwi.me/dartpower
 
 Development status:  
 [![Github All Releases](https://img.shields.io/github/downloads/dpteam/dpt-hq-core/total.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/releases)
-[![GitHub commit activity the past week, 4 weeks, year](https://img.shields.io/github/commit-activity/y/dpteam/dpt-hq-core.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/commits/master)
-[![GitHub last commit](https://img.shields.io/github/last-commit/dpteam/dpt-hq-core.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/commits/master)
+[![GitHub commit activity the past week, 4 weeks, year](https://img.shields.io/github/commit-activity/y/dpteam/dpt-hq-core.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/commits/zd32funcs)
+[![GitHub last commit](https://img.shields.io/github/last-commit/dpteam/dpt-hq-core.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/commits/zd32funcs)
 [![GitHub repo size in bytes](https://img.shields.io/github/repo-size/dpteam/dpt-hq-core.svg?style=for-the-badge)](https://github.com/dpteam/dpt-hq-core)
 
 Social status:  
@@ -62,4 +68,4 @@ Social status:
 [![GitHub forks](https://img.shields.io/github/forks/dpteam/dpt-hq-cor.svg?style=social&label=Fork&style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/network/members)
 [![GitHub stars](https://img.shields.io/github/stars/dpteam/dpt-hq-core.svg?style=social&label=Stars&style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/stargazers)
 [![GitHub watchers](https://img.shields.io/github/watchers/dpteam/dpt-hq-core.svg?style=social&label=Watch&style=for-the-badge)](https://github.com/dpteam/dpt-hq-core/watchers) 
-[![GitHub followers](https://img.shields.io/github/followers/dpteam.svg?style=social&label=Follow&style=for-the-badge)](https://github.com/dpteam)
+[![GitHub followers](https://img.shields.io/github/followers/dpteam.svg?style=social&label=Follow&style=for-the-badge)](https://github.com/dpteam)

build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set +v
+echo "Compressing. Please wait... [Approximately 2-5 mins]"
+cd pk3_data
+..\7z a -t7z -m0=lzma2 -mx=9 -aoa "..\dpt-hq-core-current.pk7" *
+clear
+echo "Compression complete."
+sleep

docs/CREDITS.en_US

@@ -5,8 +5,9 @@ Commonly ideas:
 DartPower, Ronikari, Fredy, Ghosts (Ghosts from "CrossTalk EVP")
 
 Maps:
-HQ1 by DartPower (And many DPT members)
+HQ1 by DartPower, Leutenant Xandro (And many another DPT members)
 TITLEMAP from Project Brutality, modifed by DartPower
+CREDMAP from Skulltag, modifed by DartPower
 
 ACS:
 Backstab system from WDI

pk3_data/ACTORS/BRUTAL/1_COMMON/2_GHOUL.dec

@@ -1208,7 +1208,7 @@ SPAWN:
 }
 ACTOR RAVAGER
 {
-	SPAWNID 5
+	//SpawnID 5
 	OBITUARY "THE RAVAGER PLACED A CURSE UPON %o."
 	HITOBITUARY "%o SOUL WAS SUCKED OUT BY THE RAVAGER."
 	HEALTH 3000
@@ -1297,7 +1297,7 @@ DEATH:
 }
 ACTOR JUGULUM
 {
-	SPAWNID 5
+	//SpawnID 5
 	OBITUARY "%o WAS BURNED ALIVE BY THE JUGULUM."
 	HITOBITUARY "%o WAS SWALLOWED WHOLE BY THE JUGULUM."
 	HEALTH 4000
@@ -2973,7 +2973,7 @@ SPAWN:
 }
 ACTOR SHOTGUNAMMO : AMMO 17006
 {
-	SPAWNID 11
+	//SpawnID 11
 	INVENTORY.PICKUPMESSAGE "SHOTGUN SHELLS"
 	INVENTORY.AMOUNT 12
 	INVENTORY.MAXAMOUNT 50
@@ -3041,7 +3041,7 @@ ALTFIRE:
 }  
 ACTOR SHOTGUNCLIP : AMMO
 {
-	SPAWNID 11
+	//SpawnID 11
 	INVENTORY.PICKUPMESSAGE "FAGGOT"
 	INVENTORY.AMOUNT 2
 	INVENTORY.MAXAMOUNT 2
@@ -3051,7 +3051,7 @@ ACTOR SHOTGUNCLIP : AMMO
 }
 ACTOR SHOTGUNCLIP2 : AMMO
 {
-	SPAWNID 11
+	//SpawnID 11
 	INVENTORY.PICKUPMESSAGE "FAGGOT"
 	INVENTORY.AMOUNT 4
 	INVENTORY.MAXAMOUNT 4
@@ -3187,7 +3187,7 @@ SPAWN:
 }
 ACTOR ARCHVILEFIRE_2 //REPLACES ARCHVILEFIRE
 {
-	SPAWNID 98
+	//SpawnID 98
 	RENDERSTYLE ADD
 	ALPHA 1
 	+NOBLOCKMAP

pk3_data/ACTORS/BRUTAL/2_DECORATIONS/4_FIREWORKS.dec

@@ -8,7 +8,7 @@ ACTOR EXPLOSIVEBARREL1 //REPLACES EXPLOSIVEBARREL
 	DAMAGEFACTOR "EXPLOSIVEIMPACT", 0.4
 	DAMAGEFACTOR "FIRE", 3.5
 	DAMAGEFACTOR "BLOOD", 0.0    DAMAGEFACTOR "GREENBLOOD", 0.0    DAMAGEFACTOR "BLUEBLOOD", 0.0    DAMAGEFACTOR "TAUNT", 0.0    DAMAGEFACTOR "KILLME", 0.0  DAMAGEFACTOR "AVOID", 0.0  DAMAGEFACTOR "TAUNT", 0.0 DAMAGEFACTOR "HEAD", 0.0 DAMAGEFACTOR "MINORHEAD", 0.0
-	SPAWNID 125
+	//SpawnID 125
 	HEALTH 20
 	RADIUS 10
 	HEIGHT 34

pk3_data/ACTORS/BRUTAL/2_DECORATIONS/6_DEAD.dec

@@ -808,7 +808,7 @@ XDEATH:
 }
 ACTOR COLONGIBS2 REPLACES COLONGIBS
 {
-	SPAWNID 147
+	//SpawnID 147
 	RADIUS 20
 	HEIGHT 4
 	+NOBLOCKMAP
@@ -824,7 +824,7 @@ SPAWN:
 }
 ACTOR SMALLBLOODPOOL2 REPLACES SMALLBLOODPOOL
 {
-	SPAWNID 148
+	//SpawnID 148
 	RADIUS 20
 	HEIGHT 1
 	+NOBLOCKMAP
@@ -840,7 +840,7 @@ SPAWN:
 }
 ACTOR BRAINSTEM2 REPLACES BRAINSTEM
 {
-	SPAWNID 150
+	//SpawnID 150
 	RADIUS 20
 	HEIGHT 4
 	+NOBLOCKMAP
@@ -871,7 +871,7 @@ SPAWN:
 }
 ACTOR GIBS2 : REALGIBS2 REPLACES GIBS
 {
-	SPAWNID 146
+	//SpawnID 146
 	CLEARFLAGS
 }
 ACTOR VERYFUCKEDUPREVENANT: CURBSTOMPEDMARINE

pk3_data/ACTORS/BRUTAL/4_MISC/12_PUFF.dec

@@ -179,7 +179,7 @@ SPAWN4:
 }
 ACTOR SILENTHITPUFF: BULLETPUFF
 {
-	SPAWNID 131
+	//SpawnID 131
 	RENDERSTYLE TRANSLUCENT
 	ALPHA 0.5
 	+NOBLOCKMAP

pk3_data/ACTORS/BRUTAL/4_MISC/13_AMMO.dec

@@ -1,6 +1,6 @@
 ACTOR AMMOSUPLY : BACKPACKITEM REPLACES BACKPACK
 {
-	SPAWNID 144
+	//SpawnID 144
 	HEIGHT 26
 	INVENTORY.PICKUPMESSAGE "$GOTBACKPACK"
 	STATES

pk3_data/ACTORS/BRUTAL/4_MISC/8_ARTIFACT.dec

@@ -1,6 +1,6 @@
 ACTOR INVULNERABILITYSPHERE_  : POWERUPGIVER REPLACES INVULNERABILITYSPHERE
 {
-	SPAWNID 133
+	//SpawnID 133
 	+COUNTITEM
 	+INVENTORY.AUTOACTIVATE
 	+INVENTORY.ALWAYSPICKUP
@@ -59,7 +59,7 @@ PICKUP:
 }	
 ACTOR NIGHTVISION : POWERUPGIVER REPLACES INFRARED
 {
-	SPAWNID 138
+	//SpawnID 138
 	+COUNTITEM
 	+INVENTORY.AUTOACTIVATE
 	+INVENTORY.ALWAYSPICKUP
@@ -77,7 +77,7 @@ SPAWN:
 ACTOR BERSERL1 : CUSTOMINVENTORY //REPLACES BERSERK
 {
 	SCALE 1.2
-	SPAWNID 134
+	//SpawnID 134
 	+COUNTITEM
 	+INVENTORY.ALWAYSPICKUP
 	INVENTORY.PICKUPMESSAGE "$GOTBERSERK"
@@ -100,7 +100,7 @@ PICKUP:
 ACTOR DEMONSTRENGTHRUNE : BERSERL1
 {
 	SCALE 0.2
-	SPAWNID 134
+	//SpawnID 134
 	+COUNTITEM
 	+INVENTORY.ALWAYSPICKUP
 	INVENTORY.PICKUPMESSAGE "YOU GOT THE DEMON STRENGTH RUNE. RIP AND TEAR!"

pk3_data/ACTORS/BRUTAL/4_MISC/9_HEALTH2.dec

@@ -1,6 +1,6 @@
 ACTOR HEALTHPLUS : HEALTH REPLACES HEALTHBONUS
 {
-	SPAWNID 152
+	//SpawnID 152
 	+COUNTITEM
 	+INVENTORY.ALWAYSPICKUP
 	INVENTORY.AMOUNT 2
@@ -19,7 +19,7 @@ SPAWN2:
 }
 ACTOR ARMORSHARD : BASICARMORBONUS REPLACES ARMORBONUS
 {
-	SPAWNID 22
+	//SpawnID 22
 	RADIUS 20
 	HEIGHT 16
 	INVENTORY.PICKUPMESSAGE "$GOTARMBONUS"
@@ -42,7 +42,7 @@ SPAWN2:
 }
 ACTOR STIMPACK2 : HEALTH REPLACES STIMPACK
 {
-	SPAWNID 23
+	//SpawnID 23
 	INVENTORY.AMOUNT 10
 	INVENTORY.PICKUPMESSAGE "$GOTSTIM"
 	STATES
@@ -54,7 +54,7 @@ SPAWN:
 }
 ACTOR MEDIKIT2 : HEALTH REPLACES MEDIKIT
 {
-	SPAWNID 24
+	//SpawnID 24
 	INVENTORY.AMOUNT 25
 	INVENTORY.PICKUPMESSAGE "$GOTMEDIKIT"
 	HEALTH.LOWMESSAGE 25, "$GOTMEDINEED"
@@ -68,7 +68,7 @@ SPAWN:
 ACTOR LIGHTARMOR : BASICARMORPICKUP REPLACES GREENARMOR
 {
 	SCALE 0.8
-	SPAWNID 68
+	//SpawnID 68
 	RADIUS 20
 	HEIGHT 16
 	INVENTORY.PICKUPMESSAGE "PICKED UP THE LIGHT ARMOR"
@@ -87,7 +87,7 @@ SPAWN:
 ACTOR HEAVYARMOR : BASICARMORPICKUP REPLACES BLUEARMOR
 {
 	SCALE 0.8
-	SPAWNID 69
+	//SpawnID 69
 	RADIUS 20
 	HEIGHT 16
 	INVENTORY.PICKUPMESSAGE "PICKED UP THE HEAVY ARMOR"
@@ -105,7 +105,7 @@ SPAWN:
 }
 ACTOR GIVEHEALTH : HEALTH
 {
-	SPAWNID 152
+	//SpawnID 152
 	+COUNTITEM
 	+INVENTORY.ALWAYSPICKUP
 	INVENTORY.AMOUNT 1
@@ -120,7 +120,7 @@ SPAWN:
 }
 ACTOR GIVEARMOR : BASICARMORBONUS
 {
-	SPAWNID 22
+	//SpawnID 22
 	RADIUS 20
 	HEIGHT 16
 	INVENTORY.PICKUPMESSAGE "$GOTARMBONUS"
@@ -139,7 +139,7 @@ SPAWN:
 }
 ACTOR CRUELTYBONUS5HEALTH : HEALTH
 {
-	SPAWNID 152
+	//SpawnID 152
 	-COUNTITEM
 	RADIUS 220
 	+INVENTORY.ALWAYSPICKUP
@@ -155,7 +155,7 @@ SPAWN:
 }
 ACTOR CRUELTYBONUS5ARMOR : BASICARMORBONUS
 {
-	SPAWNID 152
+	//SpawnID 152
 	-COUNTITEM
 	RADIUS 220
 	+INVENTORY.ALWAYSPICKUP

pk3_data/ACTORS/FOOTBALL.dec

@@ -1,7 +1,7 @@
 ACTOR BALL 26238
 {
 	DamageType Ball
-	SPAWNID 255
+	//SpawnID 255
 	HEALTH 0x2fffffff
 	PAINCHANCE 255
 	MASS 70

pk3_data/ACTORS/MAP-OBJECTS.dec

@@ -104,7 +104,7 @@ ACTOR DPTHQ_ExplosiveBarrel : ExplosiveBarrel replaces ExplosiveBarrel
 	DAMAGEFACTOR "TAUNT", 0.0
 	DAMAGEFACTOR "HEAD", 0.0
 	DAMAGEFACTOR "MINORHEAD", 0.0
-	//SPAWNID 125
+	//SpawnID 125
 	HEALTH 20
 	RADIUS 10
 	HEIGHT 34
@@ -2163,7 +2163,7 @@ D:
 ACTOR Toilet1 290
 {
 	//$Category Objects
-	SpawnID 125
+	//SpawnID 125
 	Tag "Toilet"
 	Health 10
 	Radius 10

pk3_data/ACTORS/NPC/ENEMIES/BOSSES.dec

@@ -4,6 +4,7 @@ ACTOR GluttonyApostleFlakToken : Inventory {inventory.maxamount 10}
 ACTOR GluttonyApostleVomitToken : Inventory {inventory.maxamount 20}
 ACTOR GluttonyApostle 26358
 {
+	//$Category "BOSSES - Storymode"
 	health 16500
 	radius 108
 	height 282
@@ -836,6 +837,7 @@ Spawn4:
 
 ACTOR PatriarchFaithful
 {
+	//$Category "BOSSES - Storymode"
 	health 7500
 	Radius 33
 	Height 97