From bd9ff8f563b6b20b4605151fae1c01ca372e2f72 Mon Sep 17 00:00:00 2001
From: popguy12 <53667854+popguy12@users.noreply.github.com>
Date: Thu, 16 May 2024 19:40:18 -0700
Subject: [PATCH] versioning time

implemented versioning on the PB Setting menu
currently 1.0.0

redid difficulty names back to vanilla until better names are thought of
and minor tweaks to nightmare

updated Credits file, still needs to be refactored, but the newer stuff over the past couple years is now in
---
 DetailedCredits.txt | 155 +++++++++++++++++++++++++++++++++++++++++++-
 MENUDEF.txt         |   6 +-
 zmapinfo.txt        |  47 +++++++-------
 3 files changed, 182 insertions(+), 26 deletions(-)

diff --git a/DetailedCredits.txt b/DetailedCredits.txt
index 947173bce4..bf709a988c 100644
--- a/DetailedCredits.txt
+++ b/DetailedCredits.txt
@@ -390,4 +390,157 @@ mrPron - Kudos to him for finding a fix on the Icon of Sin premature death bug
 
 BLOODWOLF - Voodoo Doll performance fix
 
-[RETRO] Wanderer - Providing temporary fixes for the Demon Tech Rifle crashing on Caustic mode on some monsters.
\ No newline at end of file
+[RETRO] Wanderer - Providing temporary fixes for the Demon Tech Rifle crashing on Caustic mode on some monsters.
+
+PICKUP SPRITES BY METALMAN UNLESS LISTED OTHERWISE 
+
+axe
+anim - ?
+sprites - ?
+code - ?
+
+chainsaw
+anim - ? koff?
+sprites - ?
+code - ?
+
+Pistol
+anim - carrot/galdoc
+sprites - trailblazer, carrot, (? angled sprites)
+code - Pain / Galdoc
+
+revolver
+anims - galdoc
+sprites - updated by galdoc, base by DoomNukem, Edited by Solid Steak?
+Code - ???
+
+deagle
+sprites - carrot, doomnukem, Moa Dixon
+anim - ?
+code - ?
+
+SMG
+sprites - koff
+anim - moa, 
+code - popguy12
+
+MP40 
+Anim - ? ikdfa?
+Sprites - Metalman
+Pickup - Edward marlus
+Code - ?
+
+Shotgun
+Sprites - DoomNukem, edits by skeep, carrot
+
+ASG
+Anim - moa?
+Sprites - eriance, carrot
+Code - ?
+
+SSG 
+Animation - ikdfa/carrot
+Sprites - carrot/metalman
+Code - Carrot, ?
+
+QSG
+Sprite - carrot/metalman
+Animation -  ikdfa/carrot
+Code -
+
+DMR
+Sprite - Metalman/Carrot
+Anim - Galdoc
+Code - PA1N?
+
+HDMR
+Sprite - metalman/carrot
+Anim - - galdoc/carrot
+Code - ?
+
+Carbine
+Sprite - metalman/carrot
+Anim - ikdfa/carrot
+Code - Carrot, ?
+
+
+LMG
+Sprites - metalman/carrot
+Anim - ikdfa
+Code - ?
+
+MG42
+Sprite - Metalman
+Anim - ikdfa
+Pickup - Edward Marlus
+Code - ?
+
+Minigun
+Sprite - DoomNukem?, Carrot
+Anim - Carrot, Galdoc
+Code - ?, Carrot
+
+Death Dealer
+Sprite - DoomNukem?, Carrot, Metalman
+Anim - Carrot, Galdoc
+Code - ?, Carrot
+
+Nailgun
+Sprite - Galdoc, Carrot (nails)
+Anim - Galdoc
+Code - Pa1n
+
+Rocket Launcher 
+Sprite - Metalman, Carrot, Typical
+Anim - Galdoc, Carrot 
+Code - Pa1n
+
+Super Grenade Launcher
+Sprite - Metalman, Carrot, Galdoc
+Anim - Galdoc
+Code - Pa1n
+
+M1 Plasma Rifle
+Sprite - Metalman, Carrot, Eriance
+Anim - Moa Dixon, Carrot, Galdoc, JMartinez
+Sprite - ?
+
+M2 Plasma Rifle
+Sprite - ?
+Anim - Moa Dixon
+Code - ?
+
+Freezer Gun
+Sprite - Carrot,Galdoc
+Anim - Galdoc
+Code - ?
+
+Flamethrower
+Sprite - Metalman, Carrot
+Anim - ikdfa, warry
+Code - ?
+
+BFG
+Sprite - Metalman,Carrot
+Anim - Galdoc
+Code - ?
+
+Railgun 
+Sprite - Galdoc, Metalman
+Anim - Galdoc
+Code - ?
+
+DTech Rifle
+Sprite - Carrot, Galdoc, Metalman
+Anim - Galdoc
+Code - ?
+
+Unmaker
+Sprite - Metalman,Carrot 
+Anim - Carrot
+Code - Carrot, ?
+
+Chex Rifle
+Sprite - Metalman
+Anim - Typical
+Code - popguy12, ikdfa
\ No newline at end of file
diff --git a/MENUDEF.txt b/MENUDEF.txt
index d29631925f..d3879cc812 100644
--- a/MENUDEF.txt
+++ b/MENUDEF.txt
@@ -108,16 +108,20 @@ OptionMenu "PBSettings"
 {
 	Title "Project Brutality Settings"
 	StaticText " "
+	StaticText " "
 	Submenu "Spawn Settings",		"GlobalSettings"
 	StaticText " "
-	//StaticText " "
 	Submenu "Gameplay Settings",		"GameplaySettings"
 	StaticText " "
 	Submenu "Visual Settings",		"RenderingSettings"
 	StaticText " "
 	Submenu "HUD Settings",			"PB_HUDOptions"
 	StaticText " "
+	StaticText " "
+	StaticText " "
 	Command "Go to Test Map", "map PBTEST"
+	StaticText " "
+	StaticText "PB Version: 1.0.0"
 }
 
 OptionMenu "GlobalSettings"
diff --git a/zmapinfo.txt b/zmapinfo.txt
index b7580702fe..73bc065feb 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -23,15 +23,16 @@ Skill baby
 	PlayerRespawn
 	SpawnFilter = easy
 	Textcolor = Blue
-	Name = "Bring Your Child To Hell Day"
+	Name = "I'm Too Young To Die!"
 	MustConfirm = "Infant\
 	---\
+	50% Enemy Health Reduction\
+	75% Damage Resistance\
+	\
 	Keys are visible in Automap\
-	Respawning is enabled\
-	75% Damage reduction\
-	50% Enemy Health reduction\
+	Player respawning is enabled\
 	---\
-	The difficulty for letting your children play."
+	Tourist mode."
 }
 
 Skill easy
@@ -39,11 +40,11 @@ Skill easy
 	MonsterHealth = 0.75
 	DamageFactor = 0.75
 	SpawnFilter = normal
-	Textcolor = Cream
-	Name = "Is Your Fridge Running?"
+	Textcolor = Cyan
+	Name = "Hey, Not Too Rough."
 	MustConfirm = "Easy\
 	---\
-	25% Damage reduction\
+	25% Damage Resistance\
 	25% Enemy Health Reduction\
 	---\
 	The difficulty to learn the ropes."
@@ -54,25 +55,25 @@ Skill normal
 	DefaultSkill
 	SpawnFilter = Hard
 	Textcolor = Green
-	Name = "Earth's Finest"
+	Name = "Hurt Me Plenty."
 	MustConfirm = "Normal\
 	---\
-	Most Stock of Stock gameplay.\
+	Stock game balance\
 	---\
-	The Baseline intended difficulty."
+	The baseline intended difficulty."
 }
 
 Skill Hard
 {
 	DamageFactor = 1.2
-	Aggressiveness = 0.5
+	Aggressiveness = 0.25
 	SpawnFilter = Hard
 	Textcolor = Yellow
-	Name = "Ultra-Violence"
+	Name = "Ultra-Violence."
 	MustConfirm = "Hard\
 	---\
-	20% More damage\
-	50% More aggressive monsters\
+	20% More Damage\
+	25% More Aggressive Monsters\
 	---\
 	The true Project Brutality experience for skilled players."
 }
@@ -80,22 +81,20 @@ Skill Hard
 Skill HELL
 {
 	DamageFactor = 1.5
-	MonsterHealth = 1.50
-	FastMonsters
+	MonsterHealth = 1.50
 	InstantReaction
-	Aggressiveness = 1.0
+	Aggressiveness = 0.5
 	SpawnFilter = Nightmare
 	Textcolor = Red
-	name = "Im Too Old To Live"
+	name = "NIGHTMARE!"
 	mustconfirm = "Nightmare\
 	---\
+	50% More Aggressive Monsters\
+	50% More Enemy Health\
 	50% More Damage\
-	Fast Monsters\
-	Monsters react instantly\
-	100% More aggressive monsters\
-	50% More enemy health\
+	Monsters React Instantly\
 	\
-	No respawns (Thankfully)\
+	No Enemy Respawns\
 	---\
 	Fuck you."
 }