diff --git a/code/controllers/subsystems/battle_monsters.dm b/code/controllers/subsystems/battle_monsters.dm index 50510cc0f7d..e9aebeebb40 100644 --- a/code/controllers/subsystems/battle_monsters.dm +++ b/code/controllers/subsystems/battle_monsters.dm @@ -240,6 +240,8 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters return "colossus" if(BATTLE_MONSTERS_DEFENSETYPE_FLYING) return "winged monster" + else + return GetSpecies(card_defense_type," mixed with ") return "unknown" @@ -338,19 +340,22 @@ 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) - if(power_rating <= BATTLE_MONSTERS_POWER_PETTY) +/datum/controller/subsystem/battle_monsters/proc/GetStarLevel(var/power_rating,var/attack_points,var/defense_points) + + var/power_mod = (power_rating / 2) + (max(attack_points,defense_points)/2) + + if(power_mod <= BATTLE_MONSTERS_POWER_PETTY) return 1 - if(power_rating <= BATTLE_MONSTERS_POWER_LESSER) + if(power_mod <= BATTLE_MONSTERS_POWER_LESSER) return 2 - if(power_rating <= BATTLE_MONSTERS_POWER_COMMON) + if(power_mod <= BATTLE_MONSTERS_POWER_COMMON) return 3 - if(power_rating <= BATTLE_MONSTERS_POWER_GREATER) + if(power_mod <= BATTLE_MONSTERS_POWER_GREATER) return 4 - if(power_rating <= BATTLE_MONSTERS_POWER_GRAND) + if(power_mod <= BATTLE_MONSTERS_POWER_GRAND) return 5 else - return 5 + (power_rating - BATTLE_MONSTERS_POWER_GRAND)/BATTLE_MONSTERS_POWER_UPGRADE + return 5 + round((power_mod - BATTLE_MONSTERS_POWER_GRAND)/BATTLE_MONSTERS_POWER_UPGRADE) /datum/controller/subsystem/battle_monsters/proc/GetSummonRequirements(var/starlevel) if(starlevel <= 2) @@ -498,7 +503,7 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters returning_list["attack_points"] = round(returning_list["power"] * returning_list["attack_points"],100) returning_list["defense_points"] = round(returning_list["power"] * returning_list["defense_points"],100) - returning_list["star_level"] = GetStarLevel(returning_list["power"]) + returning_list["star_level"] = GetStarLevel(returning_list["power"],returning_list["attack_points"],returning_list["defense_points"]) return returning_list diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 7aca17a8e6c..53b8e6a5356 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -855,16 +855,16 @@ ) prices = list( /obj/item/weapon/book/manual/battlemonsters = 12, - /obj/item/battle_monsters/wrapped = 150, - /obj/item/battle_monsters/wrapped/pro = 100, - /obj/item/battle_monsters/wrapped/species = 150, - /obj/item/battle_monsters/wrapped/species/lizard = 150, - /obj/item/battle_monsters/wrapped/species/cat = 150, - /obj/item/battle_monsters/wrapped/species/ant = 150, + /obj/item/battle_monsters/wrapped = 100, + /obj/item/battle_monsters/wrapped/pro = 75, + /obj/item/battle_monsters/wrapped/species = 100, + /obj/item/battle_monsters/wrapped/species/lizard = 125, + /obj/item/battle_monsters/wrapped/species/cat = 125, + /obj/item/battle_monsters/wrapped/species/ant = 125, /obj/item/battle_monsters/wrapped/rare = 200 ) contraband = list( - /obj/item/battle_monsters/wrapped/legendary = 2 + /obj/item/battle_monsters/wrapped/legendary = 4 ) premium = list( /obj/item/weapon/coin/battlemonsters = 10 diff --git a/code/modules/battlemonsters/datum_titles.dm b/code/modules/battlemonsters/datum_titles.dm index ddd6544b107..7e5cab4b319 100644 --- a/code/modules/battlemonsters/datum_titles.dm +++ b/code/modules/battlemonsters/datum_titles.dm @@ -32,7 +32,7 @@ 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." + special_effects = "Absolute Power: %NAME cannot be attacked by monsters with 4 or lower stars." rarity = 0.5 rarity_score = 1 diff --git a/code/modules/battlemonsters/items/deck.dm b/code/modules/battlemonsters/items/deck.dm index 4c3731cce29..d3b3430baa5 100644 --- a/code/modules/battlemonsters/items/deck.dm +++ b/code/modules/battlemonsters/items/deck.dm @@ -150,12 +150,12 @@ if(icon_state != "hand") user.visible_message(\ span("notice","\The [usr] begins searching through \the [src]..."),\ - span("notice","You begin searching through your deck..")\ + span("notice","You begin searching through your deck...")\ ) - if(!do_after(user, 40, act_target = src)) + if(!do_after(user, 5 + stored_card_names.len, act_target = src)) user.visible_message(\ span("notice","\The [usr] stops and thinks better of it."),\ - span("notice","You top and think better of it.")\ + span("notice","You stop and think better of it.")\ ) return diff --git a/html/changelogs/burgerbb-battlemonster_fixes.yml b/html/changelogs/burgerbb-battlemonster_fixes.yml new file mode 100644 index 00000000000..1813b83d773 --- /dev/null +++ b/html/changelogs/burgerbb-battlemonster_fixes.yml @@ -0,0 +1,38 @@ +################################ +# 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: + - bugfix: "Fixed offline Battlemonster vending machine sprite having a white background. Fixes card searching typo." + - tweak: "Adjusted battlemonster star calculation. Slightly lowered the cost of battlemonster cards. Deck searching speed is now based on the number of cards in the deck." diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 69b0a2148bd..42d845419d5 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ