diff --git a/code/__defines/battle_monsters.dm b/code/__defines/battle_monsters.dm index b3737dae408..386459c40ba 100644 --- a/code/__defines/battle_monsters.dm +++ b/code/__defines/battle_monsters.dm @@ -64,7 +64,6 @@ //MISC #define BATTLE_MONSTERS_FORMAT_STAR "" - //Generation Helpers #define BATTLE_MONSTERS_GENERATION_NAME 0x1 #define BATTLE_MONSTERS_GENERATION_DESCRIPTION 0x2 @@ -72,3 +71,13 @@ #define BATTLE_MONSTERS_GENERATION_FORM 0x8 #define BATTLE_MONSTERS_GENERATION_STATS 0x10 #define BATTLE_MONSTERS_GENERATION_ALL 0xFFFF //Everything + + +//Power Limiters +#define BATTLE_MONSTERS_POWER_PETTY 600 +#define BATTLE_MONSTERS_POWER_LESSER 800 +#define BATTLE_MONSTERS_POWER_COMMON 1000 +#define BATTLE_MONSTERS_POWER_GREATER 1200 +#define BATTLE_MONSTERS_POWER_GRAND 1400 + +#define BATTLE_MONSTERS_POWER_UPGRADE 200 \ No newline at end of file diff --git a/code/controllers/subsystems/battle_monsters.dm b/code/controllers/subsystems/battle_monsters.dm index 7609f99f552..50510cc0f7d 100644 --- a/code/controllers/subsystems/battle_monsters.dm +++ b/code/controllers/subsystems/battle_monsters.dm @@ -27,7 +27,7 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters /datum/controller/subsystem/battle_monsters/New() - NEW_SS_GLOBAL(SSbattlemonsters) + NEW_SS_GLOBAL(SSbattlemonsters) /datum/controller/subsystem/battle_monsters/Initialize() GenerateDatum(BATTLE_MONSTERS_GEN_PREFIX) @@ -339,7 +339,30 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters return english_list(included_elements, nothing_text = "Neutral", and_text = and_text) /datum/controller/subsystem/battle_monsters/proc/GetStarLevel(var/power_rating) - return min(10,1 + round( (power_rating^1.25) * 0.00012)) + if(power_rating <= BATTLE_MONSTERS_POWER_PETTY) + return 1 + if(power_rating <= BATTLE_MONSTERS_POWER_LESSER) + return 2 + if(power_rating <= BATTLE_MONSTERS_POWER_COMMON) + return 3 + if(power_rating <= BATTLE_MONSTERS_POWER_GREATER) + return 4 + if(power_rating <= BATTLE_MONSTERS_POWER_GRAND) + return 5 + else + return 5 + (power_rating - BATTLE_MONSTERS_POWER_GRAND)/BATTLE_MONSTERS_POWER_UPGRADE + +/datum/controller/subsystem/battle_monsters/proc/GetSummonRequirements(var/starlevel) + if(starlevel <= 2) + return "None." + else if(starlevel <= 4) + return "Must sacrifice one monster on your side of the field to summon." + else if(starlevel <= 6) + return "Must sacrifice two monsters on your side of the field to summon." + else if(starlevel <= 8) + return "Must sacrifice three monsters on your side of the field to summon." + else + return "Must sacrifice four monsters on your side of the field to summon." /datum/controller/subsystem/battle_monsters/proc/FormatMonsterText(var/text,var/datum/battle_monsters/element/prefix_datum,var/datum/battle_monsters/monster/root_datum,var/datum/battle_monsters/title/suffix_datum) @@ -369,7 +392,9 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters "%ATTACK_POINTS" = generated_stats["attack_points"], "%DEFENSE_POINTS" = generated_stats["defense_points"], - "%STARLEVEL" = GetStarLevel(generated_stats["power"]) + "%STAR_LEVEL" = generated_stats["star_level"], + + "%SUMMON_REQUIREMENTS" = GetSummonRequirements(generated_stats["star_level"]) ) for(var/word in replacements) @@ -406,9 +431,10 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters return text /datum/controller/subsystem/battle_monsters/proc/GetMonsterFormatting() - return "%NAME | %ELEMENT_LIST %TYPE | %SPECIES_C
\ + return "%NAME | %STAR_LEVEL Star Monster | %ELEMENT_LIST %TYPE | %SPECIES_C
\ Keywords: %SPECIES_LIST
\ ATK: %ATTACK_POINTS | DEF: %DEFENSE_POINTS
\ + Summoning Requirements: %SUMMON_REQUIREMENTS
\ %SPECIAL_EFFECTS
\ The card depicts %DESCRIPTION" diff --git a/code/modules/battlemonsters/datum_elements.dm b/code/modules/battlemonsters/datum_elements.dm index db5496962f3..b281a78a8a5 100644 --- a/code/modules/battlemonsters/datum_elements.dm +++ b/code/modules/battlemonsters/datum_elements.dm @@ -36,7 +36,7 @@ description = "They're covered head to toe in a firey blaze. These types of %SPECIESs are born from magic %ELEMENT_AND of dark wizards and witches. They make excellent spellcasters." attack_type = BATTLE_MONSTERS_ATTACKTYPE_SPELLCASTER special_effects = "Element Spell Immune: %NAME is immune to all %ELEMENT_OR based spell and trap cards if another revealed fire element monster is on the same side of the field." - power_add = 100 + power_add = BATTLE_MONSTERS_POWER_UPGRADE rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/fire/molten @@ -46,7 +46,7 @@ description = "Liquid %ELEMENT_AND drips from their eyes and %WEAPON_AND. It is clear that %NAME came from the depths of below the earth." special_effects = "Element Monster Immune: %NAME is immune to all %ELEMENT_OR based monster attacks if another revealed fire element monster is on the same side of the field." tip = "%NAME can still be attacked, however the attacker's special effects will be nullified and the attack will be considered a draw if %NAME lost battle calculation." - power_add = 250 + power_add = BATTLE_MONSTERS_POWER_UPGRADE defense_add = 0.25 rarity = BATTLE_MONSTERS_RARITY_UNCOMMON @@ -57,7 +57,7 @@ elements = BATTLE_MONSTERS_ELEMENT_FIRE | BATTLE_MONSTERS_ELEMENT_DARK description = "They are covered entirely with dark burning wax, a telltale sign of the unholy Candle Wax Cult." special_effects = "Waxing Power: %NAME passively gains 100 attack points for every other revealed %ELEMENT_OR type monster on your side of the field." - power_add = 250 + power_add = BATTLE_MONSTERS_POWER_UPGRADE defense_add = 0.25 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -71,7 +71,7 @@ description = "Visible scorch marks and bandages appear all over their body from centuries of using %ELEMENT_AND. This %SPECIES is clearly a veteran of using the magical arts." special_effects = "Battle Reminder: If a %ELEMENT_OR type monster is sent to a graveyard, the card's owner can choose to reveal and send one fire element monster from the owner's hand to the graveyard in it's place." tip = "The chosen monster card sent in the other person's place will have it's special effects triggered as if it was revealed on the field." - power_add = 500 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -94,7 +94,7 @@ special_effects = "Godly Protection: %ELEMENT_OR monsters cannot attack or be attacked by %NAME." defense_type = BATTLE_MONSTERS_DEFENSETYPE_GOD tip = "%NAME can still be affected by traps or spells." - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 5 rarity = BATTLE_MONSTERS_RARITY_LEGENDARY rarity_score = 3 @@ -111,13 +111,12 @@ name = "Thunderchild" id = "thunder" icon_state = "thunder" - power_add = 500 - attack_add = 0.25 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 + attack_add = 1000 description = "A symbol on their forehead indicates that they are a %SPECIES thunderchild, born of the incredibly horny god Bleus after coitus with a %SPECIES. Children born of Bleus tend to show a god-like control over energy elements, such as lightning." - special_effects = "Charge: %NAME can attack as soon as it's revealed, regardless of other penalties." + special_effects = "Charge: %NAME can attack as soon as it's revealed, regardless of other penalties. If Charge is used, %NAME is sent to the graveyard." tip = "Remember that 'played' is not the same as 'revealed', a card is considered 'played' when it's put into the field from the owner's hand." defense_type = BATTLE_MONSTERS_DEFENSETYPE_GOD - power_mul = 0.75 rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/energy/powered @@ -126,6 +125,7 @@ icon_state = "powered" description = "Upon closer examination, it seems that they have advanced cybernetics. It is unknown where these cybernetics came from, or when, for that matter." special_effects = "Null Field: When %NAME is visible, all the opponent's special effects are nullified during the opponent's turn." + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE defense_type = BATTLE_MONSTERS_DEFENSETYPE_MACHINE rarity_score = 1 @@ -136,6 +136,7 @@ icon_state = "dragonslayer" description = "They're wearing a dragonscale cape, and dragon skull shoulderpads. Dragonslayers can commonly be seen in the mountains hunting dragons for their prized bones and scales." special_effects = "Dragonslayer: When %NAME is summoned, the card's owner can choose to send a dragon to the graveyard as long as the dragon's attack points does not exceed %NAME's attack points." + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -144,6 +145,7 @@ id = "dragoncult" icon_state = "dragoncult" description = "They're painted with various symbols belonging to the secretive Dragoncult, an ancient organization that serves the dragons." + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 special_effects = "Dragon Protection: As long as %NAME is visible, all allied Dragons are immune to spells." elements = BATTLE_MONSTERS_ELEMENT_ENERGY | BATTLE_MONSTERS_ELEMENT_FIRE rarity = BATTLE_MONSTERS_RARITY_RARE @@ -158,7 +160,7 @@ description = "Their %ELEMENT_AND wings are absolutely massive, and their massive snout exhales deadly %ELEMENT_AND. This being is a common god among dragons, and it is theorized that one of the many breeds of dragons came from %NAME." special_effects = "Godly Protection: %ELEMENT_OR monsters cannot attack or be attacked by %NAME.
Wingspan: When %NAME is summoned, all non-flying monsters on the field are sent to the graveyard." tip = "%NAME can still be affected by traps or spells.
%NAME can also send friendly units to the graveyard." - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 5 rarity = BATTLE_MONSTERS_RARITY_LEGENDARY rarity_score = 3 @@ -176,6 +178,7 @@ icon_state = "water2" description = "Upon closer examination, it appears that they can morph into various shapes using the magic of %ELEMENT_AND. Morphlings can common be seen near rivers, lakes, or streams harrassing travelers who dare to take a drink from the protected waters." special_effects = "Morph: %NAME is automatically switched to defense mode if they attack, and automatically switched to attack mode if they succesfully defend from an attack. %NAME cannot be switched to attack mode or defense mode manually." + power_add = BATTLE_MONSTERS_POWER_UPGRADE rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/water/raincloud @@ -186,6 +189,7 @@ special_effects = "Dark Rainclouds: %NAME is immune to all non %ELEMENT_OR based trap and spell cards as long as %NAME attacked on the owner's previous turn." power_mul = 0.75 attack_add = 0.5 + power_add = BATTLE_MONSTERS_POWER_UPGRADE rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/water/trench_pirate @@ -194,6 +198,7 @@ description = "They're covered entirely with seaweed and barnacles, with an eyepatch and a bandana complimenting their monsterous shape. Rumor has it that Trench beings were shipwrecked sailors whose bodies sunk into marine trenches into the hells below." special_effects = "Changing Tides: %NAME cannot be attack or be attacked by non %ELEMENT_OR based monster cards as long as %NAME attacked on the owner's previous turn." elements = BATTLE_MONSTERS_ELEMENT_WATER | BATTLE_MONSTERS_ELEMENT_DARK + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -203,6 +208,7 @@ description = "Their lower body resembles much of a fish, with massive tidal waves surging from under them. %NAME commonly sends typoons to villages near the waters that threaten the local sealife in the area." special_effects = "Tidal Wave: When %NAME is summoned, all non water element monsters, traps, and spells on the field are sent to the graveyard." elements = BATTLE_MONSTERS_ELEMENT_WATER + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 4 rarity = BATTLE_MONSTERS_RARITY_MYTHICAL rarity_score = 2 @@ -221,7 +227,7 @@ icon_state = "igloo" description = "They stand silently outside an igloo in a freezing blizzard with a sturdy grip on their %WEAPON_AND. They seem unbothered by the cold." attack_type = BATTLE_MONSTERS_ATTACKTYPE_SHIELD - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 special_effects = "Master Defender: As long as %NAME is visible, its owner cannot be attacked by monsters. " rarity = BATTLE_MONSTERS_RARITY_UNCOMMON @@ -233,7 +239,7 @@ special_effects = "Spell Absorbtion: As long as %NAME is visible, it's owner cannot be affected by traps or spells." defense_type = BATTLE_MONSTERS_DEFENSETYPE_CREATURE attack_type = BATTLE_MONSTERS_ATTACKTYPE_CLAWS - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -244,7 +250,7 @@ description = "They're wearing a large crown made entirely out of ice and diamonds, and a royal cape made out magical yeti fur. Frostlords gain their title by defeating a yeti in combat by wrestling it to death." special_effects = "Royal Decree: As long as there are 2 other frost element monsters on the same side of the field, %NAME cannot be sent to the graveyard.
Spell Immunity: %NAME cannot be affected by traps or spells." elements = BATTLE_MONSTERS_ELEMENT_ICE - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 rarity = BATTLE_MONSTERS_RARITY_RARE /datum/battle_monsters/element/ice/frost_guardian @@ -255,7 +261,7 @@ special_effects = "Best Defense: As long as %NAME is on the field, its owner cannot lose life points from monster battles." attack_mul = 0 elements = BATTLE_MONSTERS_ELEMENT_ICE - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 3 rarity = BATTLE_MONSTERS_RARITY_RARE /datum/battle_monsters/element/ice/blizzard_god @@ -265,7 +271,7 @@ description = "Their general %SPECIES-like figure is clouded in a massive %ELEMENT_AND storm. All that come close to seeing it's true form usually perish from frostbite." special_effects = "Godly Protection: As long as a frost element monster other than %NAME is on the field, %NAME cannot be attacked by monsters or spells." defense_type = BATTLE_MONSTERS_DEFENSETYPE_GOD - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 5 rarity = BATTLE_MONSTERS_RARITY_LEGENDARY rarity_score = 3 @@ -284,6 +290,7 @@ description = "They seem to be made out of living mystical wood." special_effects = "Exploit Water: If there is a water monster on the opposing side of the field, %NAME gains 500 defense points." defense_mul = 1.25 + power_add = BATTLE_MONSTERS_POWER_UPGRADE rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/earth/bonfire @@ -294,6 +301,7 @@ description = "They seem to be made out of burning driftwood." special_effects = "Exploit Fire: If there is a fire monster on the opposing side of the field, %NAME gains 500 attack points." defense_mul = 1.25 + power_add = BATTLE_MONSTERS_POWER_UPGRADE rarity = BATTLE_MONSTERS_RARITY_UNCOMMON /datum/battle_monsters/element/earth/fairy @@ -305,6 +313,7 @@ defense_type = BATTLE_MONSTERS_DEFENSETYPE_FLYING description = "They are quite tiny, and have little pixie wings growing out of their back and extra long claws." special_effects = "Exploit Dark: If there is a dark monster on the opposing side of the field, all %ELEMENT_AND monsters gain 500 defense points for as long as %NAME is visible." + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 power_mul = 0.5 defense_mul = 0.5 rarity = BATTLE_MONSTERS_RARITY_RARE @@ -318,7 +327,7 @@ defense_type = BATTLE_MONSTERS_DEFENSETYPE_GOD | BATTLE_MONSTERS_DEFENSETYPE_COLOSSUS description = "They have roots for feet and massive tree trunks for arms. Their overall size rivals those of the greatest manmade structures on earth, and as such, their %WEAPON_AND must match their size." special_effects = "Revenge of the Earth: When a %ELEMENT_OR element is sent to the graveyard, the card responsible will also be sent to the graveyard." - power_mul = 2000 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 5 defense_mul = 2 rarity = BATTLE_MONSTERS_RARITY_LEGENDARY rarity_score = 3 @@ -328,6 +337,7 @@ id = "stone" icon_state = "stone" description = "They're rock hard. Made out of rock, that is." + power_add = BATTLE_MONSTERS_POWER_UPGRADE elements = BATTLE_MONSTERS_ELEMENT_STONE rarity = BATTLE_MONSTERS_RARITY_COMMON @@ -336,6 +346,7 @@ id = "uranium" icon_state = "uranium" description = "They're made out of pure uranium." + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 special_effects = "EMP: If an Iron prefixed monster exists on the field when this card is played, send this card and all energy element monsters on the field to the graveyard." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 @@ -347,7 +358,7 @@ description = "They're made out of dense iron. A perfect protector of mankind." rarity = BATTLE_MONSTERS_RARITY_UNCOMMON defense_mul = 1.5 - power_add = 300 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/stone/steel name = "Steel" @@ -356,7 +367,7 @@ description = "They're made out of sturdy steel." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 - power_add = 600 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 3 /datum/battle_monsters/element/stone/aluminium name = "Aluminium" @@ -366,7 +377,7 @@ defense_mul = 0.25 rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 - power_add = 300 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/stone/potassium name = "Potassium" @@ -383,7 +394,7 @@ icon_state = "dark" description = "A strange evil, shadowy aura embraces them and all those around it." elements = BATTLE_MONSTERS_ELEMENT_DARK - power_add = 500 + power_add = BATTLE_MONSTERS_POWER_UPGRADE attack_mul = 1.25 rarity = BATTLE_MONSTERS_RARITY_UNCOMMON rarity_score = 1 @@ -396,6 +407,7 @@ special_effects = "Leech: If %NAME attacks the opponent, the owner of the card gains 1 lifepoint as long as the owner's lifepoints are less than 5." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/dark/cultist name = "Cultist" @@ -405,6 +417,7 @@ special_effects = "Summoning: If 6 monsters with a cultist prefix exist on your side of the field at once when %NAME is played or revealed, you win the game." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/dark/demon name = "Demon" @@ -416,6 +429,7 @@ special_effects = "Sacrifice: %NAME can sacrifice a non-light element type monster on the same side of the field to attack again." rarity = BATTLE_MONSTERS_RARITY_MYTHICAL rarity_score = 2 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/dark/devil //SPRITE NEEDED name = "Devil" @@ -427,6 +441,7 @@ special_effects = "Bargain: When %NAME is played, the card's owner can choose to sacrifice 2 of their lifepoints to remove 1 lifepoint from their opponent." rarity = BATTLE_MONSTERS_RARITY_MYTHICAL rarity_score = 2 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/dark/unholy //SPRITE NEEDED name = "Unholy" @@ -435,6 +450,7 @@ special_effects = "Unholy Barrier: As long as %NAME is in play, all monsters and players are immune to light element spells, traps, and special effects." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/light name = "Light" @@ -443,9 +459,9 @@ description = "A holy aura shapes around their beauty." elements = BATTLE_MONSTERS_ELEMENT_LIGHT defense_mul = 1.25 - power_add = 500 rarity = BATTLE_MONSTERS_RARITY_UNCOMMON rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/light/angel //SPRITE NEEDED name = "Guardian Angel" @@ -455,6 +471,7 @@ defense_type = BATTLE_MONSTERS_DEFENSETYPE_FLYING rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/light/undying //SPRITE NEEDED name = "Undying" @@ -463,6 +480,7 @@ special_effects = "Reborn: If %NAME is defeated in battle, go to the original owner's hand instead of the graveyard." rarity = BATTLE_MONSTERS_RARITY_RARE rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 /datum/battle_monsters/element/light/holy //SPRITE NEEDED name = "Holy" @@ -470,4 +488,5 @@ description = "Their body seems to have an angelic glow." special_effects = "Holy Barrier: As long as %NAME is in play, all monsters and players are immune to dark element spells, traps, and special effects." rarity = BATTLE_MONSTERS_RARITY_RARE - rarity_score = 1 \ No newline at end of file + rarity_score = 1 + power_add = BATTLE_MONSTERS_POWER_UPGRADE * 2 \ No newline at end of file diff --git a/code/modules/battlemonsters/datum_monsters.dm b/code/modules/battlemonsters/datum_monsters.dm index 073fc529afc..62320ae1ba2 100644 --- a/code/modules/battlemonsters/datum_monsters.dm +++ b/code/modules/battlemonsters/datum_monsters.dm @@ -19,7 +19,7 @@ name = "Human" id = "human_male" icon_state = "human" - power_add = 300 + power_add = BATTLE_MONSTERS_POWER_PETTY defense_add = 1 attack_add = 1 description = "a typical male %SPECIES inhabitant of Great Kingdom of Garoosh. While not a trained fighter, all %SPECIESs are quick thinkers and know how to fight when it matters with their %WEAPON_AND." @@ -33,7 +33,7 @@ name = "Human" id = "human_female" icon_state = "human" - power_add = 300 + power_add = BATTLE_MONSTERS_POWER_PETTY defense_add = 1 attack_add = 0.75 description = "a typical female %SPECIES inhabitant of Great Kingdom of Garoosh. While not a trained fighter, all %SPECIESs are quick thinkers and know how to fight when it matters with their %WEAPON_AND." @@ -46,7 +46,7 @@ name = "Apprentice Mage" id = "mage" icon_state = "staff" - power_add = 400 + power_add = BATTLE_MONSTERS_POWER_LESSER defense_add = 1 attack_add = 3 description = "a young and eager-looking male %SPECIES mage from the mysterious and secluded Gautem Islands. They appear to be reading from a book, while their %WEAPON_AND hovers around them." @@ -59,7 +59,7 @@ name = "Wise Sage" id = "sage" icon_state = "staff" - power_add = 800 + power_add = BATTLE_MONSTERS_POWER_LESSER defense_add = 1 attack_add = 2 description = "an mysterious looking male %SPECIES, dressed in %ELEMENT_AND robes. A %WEAPON_AND seems to be holstered on their back, with a magic crystal ball hovering above their hands." @@ -72,7 +72,7 @@ name = "Wizard" id = "wizard" icon_state = "staff" - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 1 attack_add = 2 description = "an elderly, long-bearded male %SPECIES, dressed in typical wizard garb. They hold a %WEAPON_AND proudly, and their beard humorously tangles around it." @@ -85,7 +85,7 @@ datum/battle_monsters/monster/human/warrior name = "Barbarian" id = "warrior" icon_state = "human" - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 2 attack_add = 1 description = "a seductively buff male %SPECIES barbarian wearing a simple fur loincloth and a chest full of hair. They seem to be in possession of a %WEAPON_AND." @@ -98,7 +98,7 @@ datum/battle_monsters/monster/human/warrior name = "Amazon Warrior" id = "amazon_warrior" icon_state = "human" - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 2 attack_add = 1 description = "a scantily clad male %SPECIES %NAME dressed in leopard skin. They proudly wield a giant %WEAPON_AND." @@ -110,7 +110,7 @@ datum/battle_monsters/monster/human/warrior name = "Amazon Prime" id = "amazon_prime" icon_state = "human" - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 2 attack_add = 1 description = "a scantily clad female %SPECIES %NAME dressed in leopard skin. They're one of the many queen guards of the Amazonian Kingdom." @@ -123,7 +123,7 @@ datum/battle_monsters/monster/human/warrior name = "Knight" id = "knight" icon_state = "human_knight" - power_add = 1000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 4 attack_add = 1 rarity = 0.25 @@ -137,7 +137,7 @@ datum/battle_monsters/monster/human/warrior name = "King" id = "king" icon_state = "king" - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_GREATER defense_add = 1 attack_add = 10 description = "a fat %SPECIES King sitting atop a %ELEMENT_AND throne, with a %WEAPON_AND spread out across a gold chessboard. Their equally golden crown is quite large for their small head." @@ -150,7 +150,7 @@ datum/battle_monsters/monster/human/warrior name = "Queen" id = "queen" icon_state = "king" - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_GREATER defense_add = 1 attack_add = 5 description = "an incredibly voluptuous %SPECIES female adorned in a %ELEMENT_AND robe. An equally tight-fitting crown sits atop her head." @@ -163,7 +163,7 @@ datum/battle_monsters/monster/human/warrior name = "Dragon" id = "dragon" icon_state = "dragon" - power_add = 1500 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 2 attack_add = 1 description = "an adult male %SPECIES wielding %WEAPON_AND in each hand. %NAME such as these commonly inhabit the snowy mountains of the North." @@ -176,7 +176,7 @@ datum/battle_monsters/monster/human/warrior name = "Giant Dragon" id = "dragon_giant" icon_state = "dragon" - power_add = 3000 + power_add = BATTLE_MONSTERS_POWER_GREATER defense_add = 4 attack_add = 1 description = "an incredibly rare female %SPECIES of the %ELEMENT_AND vairety. Female %NAME are exceptionally rare among %SPECIESs, as they usually only show themselves every 1000 years." @@ -190,7 +190,7 @@ datum/battle_monsters/monster/human/warrior name = "Dragoness" id = "dragon_hybrid" icon_state = "dragon" - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 2 attack_add = 1 description = "an unrealsticly busty feminine shaped %SPECIES. When not using their mammaries to confuse scientists, %NAME usually stalks careless human climbers for a quick and easy meal using their deadly %WEAPON_AND." @@ -204,7 +204,7 @@ datum/battle_monsters/monster/human/warrior name = "Drake" id = "drake" icon_state = "dragon" - power_add = 2000 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 4 attack_mul = 0.25 elements = BATTLE_MONSTERS_ELEMENT_FIRE @@ -218,7 +218,7 @@ datum/battle_monsters/monster/human/warrior name = "Giant" id = "giant" icon_state = "giant" - power_add = 1800 + power_add = BATTLE_MONSTERS_POWER_COMMON defense_add = 1 attack_add = 1 description = "a hulking, unintellgent bipedal %SPECIES that can commonly be seen roaming the hillside searching for horses to herd and eat. It is theorized that %NAME are failed biological experiments of wizards from an older age." @@ -232,7 +232,7 @@ datum/battle_monsters/monster/human/warrior name = "Lizardman" id = "lizardman" icon_state = "lizard" - power_add = 500 + power_add = BATTLE_MONSTERS_POWER_PETTY defense_add = 1 attack_add = 1.5 description = "a well-built muscled bipedal male %SPECIES citizen of the marshes of Ka'best. %NAME enjoy hunting for sport, and do so proudly with their %WEAPON_AND." @@ -251,9 +251,9 @@ datum/battle_monsters/monster/human/warrior name = "Catbeast" id = "catman" icon_state = "cat" - power_add = 400 + power_add = BATTLE_MONSTERS_POWER_PETTY defense_add = 1 - attack_add = 1.50 + attack_add = 1.5 description = "a furred bipedal male %SPECIES citizen of the plains of Old Jargo. %NAME ocassionally hunt small creatures with their %WEAPON_AND." defense_type = BATTLE_MONSTERS_DEFENSETYPE_CATMAN attack_type = BATTLE_MONSTERS_ATTACKTYPE_CLAWS | BATTLE_MONSTERS_ATTACKTYPE_TEETH @@ -269,7 +269,7 @@ datum/battle_monsters/monster/human/warrior name = "Ant Patron" id = "antman" icon_state = "ant" - power_add = 400 + power_add = BATTLE_MONSTERS_POWER_LESSER defense_add = 1 attack_add = 1.50 description = "a quadruped chitin male %SPECIES citizen of the hills of Kalakest. Despite being a peaceful race, %NAME can be seen wielding %WEAPON_AND to defend their nests from foolish raiders looking to steal from their valuable eggs." @@ -282,7 +282,7 @@ datum/battle_monsters/monster/human/warrior name = "Ant Matron" id = "antwoman" icon_state = "ant" - power_add = 800 + power_add = BATTLE_MONSTERS_POWER_LESSER defense_add = 1.50 attack_add = 1 description = "a quadruped chitin female %SPECIES citizen of the hills of Kalakest. Despite being a peaceful race, %NAME can be seen wielding %WEAPON_AND to defend their nests from foolish raiders looking to steal from their valuable eggs. The females make excellent defenders because of this." diff --git a/code/modules/battlemonsters/datum_titles.dm b/code/modules/battlemonsters/datum_titles.dm index 509d4f65eaf..ddd6544b107 100644 --- a/code/modules/battlemonsters/datum_titles.dm +++ b/code/modules/battlemonsters/datum_titles.dm @@ -18,7 +18,7 @@ /datum/battle_monsters/title/great name = "the Great" id = "great" - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE defense_mul = 1.1 power_mul = 1.1 description = "%NAME is known for their extensive adventuring exploits in the Great Kingdom of Al'Karbaro. Rumor has it that their trusty %WEAPON_AND was discovered in a secret underground cave that held the secrets to %ELEMENT_AND." @@ -29,7 +29,7 @@ name = "the Powerful" id = "powerful" attack_mul = 1.25 - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE power_mul = 1.25 description = "%NAME is feared upon by most lesser beings, and with good reason. A single stroke of their %WEAPON_AND is known to destroy the very souls of those unlucky enough to even witness it's power over %ELEMENT_AND." special_effects = "Absolute Power: %NAME cannot be attacked by monsters with a base attack rating less than 2000." @@ -39,7 +39,7 @@ /datum/battle_monsters/title/wise name = "the Wise" id = "wise" - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE power_mul = 1.1 description = "Kings and philopshers all around the Kingdom send their servants to seek out %NAME for their sagely advice on %ELEMENT_AND. Their knowledge of such magic rivals even the greatest of the Old Wizards." special_effects = "Elemental Defense: %NAME temporarily gains 800 bonus defense points when defending against another %ELEMENT_OR type monster." @@ -49,7 +49,7 @@ /datum/battle_monsters/title/elemental name = "Master of Elements" id = "master" - power_add = 200 + power_add = BATTLE_MONSTERS_POWER_UPGRADE power_mul = 1.1 attack_mul = 0.25 description = "To master one element takes decades of work, to master all 8 takes several lifetimes of constant dedication. It is no doubt that %NAME is old enough to have the time to study all elements, or is powerful enough to manipulate time itself." diff --git a/html/changelogs/burgerbb-battlemonster tweaks v2.yml b/html/changelogs/burgerbb-battlemonster tweaks v2.yml new file mode 100644 index 00000000000..904808c39a2 --- /dev/null +++ b/html/changelogs/burgerbb-battlemonster tweaks v2.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - balance: "Balanced Battlemonster stats."