mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 08:36:00 +01:00
Ghom
0b0c5ea91e
## About The Pull Request Extends the part of the crafting unit test that ensures consistency between the total mats of the components of a recipe (or rather, the result of said recipe) and a generic instance of the same type as its result, previously only implemented on food recipes. ## Why It's Good For The Game This ensures a degree of consistency with the material composition of various objects in the game. I couldn't do it in the original PR as that one was too big already and it took months to get it merged, and have the relative bugs fixed. Currently a WIP as I slowly deal with the unit test reports. ## Changelog 🆑 refactor: Follow-up to the crafting/material refactor from months ago. All objects crafted with stacks now inherit their mat composition (not necessarily the effects and color) by default, while previously only a few things like chair, sinks and toilets did. Report any object looking or behaving weirdly as a result. fix: The material composition of ammo boxes is no longer a 1/10 of what it's supposed to be. It was a shitty hack to make it harder to recycle empty ammo boxes. Instead, they lose materials as they're emptied now. /🆑
159 lines
5.7 KiB
Plaintext
159 lines
5.7 KiB
Plaintext
///how much projectile damage is lost when using a bad fuel
|
|
#define BAD_FUEL_DAMAGE_TAX 20
|
|
///extra chance it explodes upon firing
|
|
#define BAD_FUEL_EXPLODE_PROBABILTY 10
|
|
|
|
/obj/structure/cannon
|
|
name = "cannon"
|
|
desc = "Holemaker Deluxe: A sporty model with a good stop power. Any cannon enthusiast should be expected to start here."
|
|
density = TRUE
|
|
anchored = TRUE
|
|
icon = 'icons/obj/weapons/cannons.dmi'
|
|
icon_state = "falconet_patina"
|
|
max_integrity = 300
|
|
///whether the cannon can be unwrenched from the ground.
|
|
var/anchorable_cannon = TRUE
|
|
var/obj/item/stack/cannonball/loaded_cannonball = null
|
|
var/charge_ignited = FALSE
|
|
var/fire_delay = 1.5 SECONDS
|
|
var/charge_size = 15
|
|
var/fire_sound = 'sound/items/weapons/gun/general/cannon.ogg'
|
|
|
|
/obj/structure/cannon/Initialize(mapload)
|
|
. = ..()
|
|
create_reagents(charge_size)
|
|
AddComponent(/datum/component/simple_rotation)
|
|
|
|
/obj/structure/cannon/examine(mob/user)
|
|
. = ..()
|
|
. += span_notice("[src] accepts gunpowder or welding fuel.")
|
|
. += span_warning("Using welding fuel will weaken the force of the projectile fired.")
|
|
|
|
/obj/structure/cannon/proc/fire()
|
|
for(var/mob/shaken_mob in urange(10, src))
|
|
if(shaken_mob.stat == CONSCIOUS)
|
|
shake_camera(shaken_mob, 3, 1)
|
|
|
|
playsound(src, fire_sound, 50, TRUE)
|
|
flick(icon_state+"_fire", src)
|
|
if(loaded_cannonball)
|
|
var/obj/projectile/fired_projectile = new loaded_cannonball.projectile_type(get_turf(src))
|
|
if(reagents.has_reagent(/datum/reagent/fuel, charge_size))
|
|
fired_projectile.damage = max(2, fired_projectile.damage - BAD_FUEL_DAMAGE_TAX)
|
|
QDEL_NULL(loaded_cannonball)
|
|
fired_projectile.firer = src
|
|
fired_projectile.fired_from = src
|
|
fired_projectile.fire(dir2angle(dir))
|
|
reagents.remove_all()
|
|
charge_ignited = FALSE
|
|
|
|
/obj/structure/cannon/wrench_act(mob/living/user, obj/item/tool)
|
|
. = ..()
|
|
if(!anchorable_cannon)
|
|
return FALSE
|
|
default_unfasten_wrench(user, tool)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
/obj/structure/cannon/attackby(obj/item/used_item, mob/user, list/modifiers, list/attack_modifiers)
|
|
if(charge_ignited)
|
|
balloon_alert(user, "it's gonna fire!")
|
|
return
|
|
var/ignition_message = used_item.ignition_effect(src, user)
|
|
|
|
if(istype(used_item, /obj/item/stack/cannonball))
|
|
if(loaded_cannonball)
|
|
balloon_alert(user, "already loaded!")
|
|
else
|
|
var/obj/item/stack/cannonball/cannoneers_balls = used_item
|
|
loaded_cannonball = new cannoneers_balls.type(src, 1)
|
|
loaded_cannonball.copy_evidences(cannoneers_balls)
|
|
balloon_alert(user, "loaded a [cannoneers_balls.singular_name]")
|
|
cannoneers_balls.use(1, transfer = TRUE)
|
|
return
|
|
|
|
else if(ignition_message)
|
|
if(!reagents.has_reagent(/datum/reagent/gunpowder,charge_size) && !reagents.has_reagent(/datum/reagent/fuel,charge_size))
|
|
balloon_alert(user, "needs [reagents.maximum_volume]u of charge!")
|
|
return
|
|
visible_message(ignition_message)
|
|
user.log_message("fired a cannon", LOG_ATTACK)
|
|
log_game("[key_name(user)] fired a cannon in [AREACOORD(src)]")
|
|
addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay)
|
|
charge_ignited = TRUE
|
|
return
|
|
|
|
else if(is_reagent_container(used_item))
|
|
var/obj/item/reagent_containers/powder_keg = used_item
|
|
if(!powder_keg.is_open_container())
|
|
return ..()
|
|
if(istype(powder_keg, /obj/item/rag))
|
|
return ..()
|
|
|
|
if(!powder_keg.reagents.total_volume)
|
|
balloon_alert(user, "[powder_keg] is empty!")
|
|
return
|
|
if(reagents.total_volume == reagents.maximum_volume)
|
|
balloon_alert(user, "[src] is full!")
|
|
return
|
|
var/has_enough_gunpowder = powder_keg.reagents.has_reagent(/datum/reagent/gunpowder, charge_size)
|
|
var/has_enough_alt_fuel = powder_keg.reagents.has_reagent(/datum/reagent/fuel, charge_size)
|
|
if(!has_enough_gunpowder && !has_enough_alt_fuel)
|
|
balloon_alert(user, "[powder_keg] needs 15u of charge to load!")
|
|
to_chat(user, span_warning("[powder_keg] doesn't have at least 15u of gunpowder to fill [src]!"))
|
|
return
|
|
if(has_enough_gunpowder)
|
|
powder_keg.reagents.trans_to(src, charge_size, target_id = /datum/reagent/gunpowder)
|
|
balloon_alert(user, "[src] loaded with gunpowder")
|
|
return
|
|
if(has_enough_alt_fuel)
|
|
powder_keg.reagents.trans_to(src, charge_size, target_id = /datum/reagent/fuel)
|
|
balloon_alert(user, "[src] loaded with welding fuel")
|
|
return
|
|
..()
|
|
|
|
/obj/structure/cannon/trash
|
|
name = "trash cannon"
|
|
desc = "Okay, sure, you could call it a toolbox welded to an opened oxygen tank cabled to a skateboard, but it's a TRASH CANNON to us."
|
|
icon_state = "garbagegun"
|
|
anchored = FALSE
|
|
anchorable_cannon = FALSE
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 11.15, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
|
|
var/fires_before_deconstruction = 5
|
|
|
|
/obj/structure/cannon/trash/fire()
|
|
var/explode_chance = 10
|
|
var/used_alt_fuel = reagents.has_reagent(/datum/reagent/fuel, charge_size)
|
|
if(used_alt_fuel)
|
|
explode_chance += BAD_FUEL_EXPLODE_PROBABILTY
|
|
. = ..()
|
|
fires_before_deconstruction--
|
|
if(used_alt_fuel)
|
|
fires_before_deconstruction--
|
|
if(prob(explode_chance))
|
|
visible_message(span_userdanger("[src] explodes!"))
|
|
explosion(src, heavy_impact_range = 1, light_impact_range = 5, flame_range = 5)
|
|
return
|
|
if(fires_before_deconstruction <= 0)
|
|
visible_message(span_warning("[src] falls apart from operation!"))
|
|
qdel(src)
|
|
|
|
/obj/structure/cannon/trash/Destroy()
|
|
new /obj/item/stack/sheet/iron/five(src.loc)
|
|
new /obj/item/stack/rods(src.loc)
|
|
. = ..()
|
|
|
|
///A cannon found from the fishing mystery box.
|
|
/obj/structure/cannon/mystery_box
|
|
icon_state = "mystery_box_cannon" //east facing sprite for the presented item, it'll be changed back to normal on init
|
|
dir = EAST
|
|
anchored = FALSE
|
|
|
|
/obj/structure/cannon/mystery_box/Initialize(mapload)
|
|
. = ..()
|
|
icon_state = "falconet_patina"
|
|
reagents.add_reagent(/datum/reagent/gunpowder, charge_size)
|
|
loaded_cannonball = new(src)
|
|
|
|
#undef BAD_FUEL_DAMAGE_TAX
|
|
#undef BAD_FUEL_EXPLODE_PROBABILTY
|