Skip to content

Commit

Permalink
Add: Sakura tree (#1294)
Browse files Browse the repository at this point in the history 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Добавлена Сакура, она умеет цвести, и у неё есть собственные тайлы земли

## Почему это хорошо для игры
Баунти

## Изображения изменений

![image](https://github.com/ss220club/Paradise-SS220/assets/20109643/0bc91831-922a-4adb-8725-89fbd6cae2a8)

И видео

https://cdn.discordapp.com/attachments/1198154076739862588/1248276075088187423/Desktop_2024.06.06_-_19.00.30.01.mp4?ex=66631330&is=6661c1b0&hm=c1f0cb46da971ef3f9a49c2d034c3e3863e8ff6d61fb1136cbed2af3b5a16bb6&

## Тестирование
Проверял в игре

## Changelog

:cl:
add: Добавлена Сакура, она умеет цвести, и у неё есть собственные тайлы
земли
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
@dj-34
dj-34 committed Jun 11, 2024
1 parent 4b4b3d9 commit 37a201d
Show file tree
Hide file tree
Showing 4 changed files with 216 additions and 0 deletions.
3 changes: 3 additions & 0 deletions modular_ss220/objects/_objects.dme
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "_objects.dm"

// Flora
#include "code/flora/sakura.dm"

// ID Skins
#include "code/id_skins/_id_skins_base.dm"
#include "code/id_skins/id_skins.dm"
Expand Down
213 changes: 213 additions & 0 deletions modular_ss220/objects/code/flora/sakura.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
/// Time before blossom starts
#define BLOSSOM_START_TIME (30 MINUTES)
/// Time before blossom ends
#define BLOSSOM_END_TIME (10 MINUTES)
/// Time before blossom leaves a pile
#define LEAVES_PILE_SPAWN_TIME (2 MINUTES)
/// Time before blossom transforms grass tile to Sakura's grass
#define TRANSFORM_TURF_TIME (10 MINUTES)

/* Sakura Tree */
/obj/structure/flora/tree/sakura
name = "Sakura"
desc = "It's a cherry blossom. Beautiful!"
icon = 'modular_ss220/objects/icons/flora/sakura.dmi'
icon_state = "cherry_blossom"
pixel_y = 10
var/obj/effect/blossom/blossom_effect
var/timer_handle_start
var/timer_handle_end

/obj/structure/flora/tree/sakura/Initialize(mapload)
. = ..()
RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(on_round_start))

/obj/structure/flora/tree/sakura/New()
. = ..()
if(SSticker.IsRoundInProgress())
initiate_blossom_cycle()

/obj/structure/flora/tree/sakura/Destroy()
if(timer_handle_start && timer_handle_end)
deltimer(timer_handle_start)
deltimer(timer_handle_end)
if(blossom_effect)
QDEL_NULL(blossom_effect)
timer_handle_start = null
timer_handle_end = null
return ..()

/obj/structure/flora/tree/sakura/proc/on_round_start()
initiate_blossom_cycle()
SIGNAL_HANDLER
UnregisterSignal(src, COMSIG_TICKER_ROUND_STARTING)
return

/// Initiates the blooming cycle, in which the countdown begins
/obj/structure/flora/tree/sakura/proc/initiate_blossom_cycle()
// Start the bloom cycle 30 minutes after the start of the round or creating new tree
timer_handle_start = addtimer(CALLBACK(src, PROC_REF(start_blossom)), BLOSSOM_START_TIME, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)

/// Starts blooming itself as part of the cycle
/obj/structure/flora/tree/sakura/proc/start_blossom()
var/turf/T = get_turf(src)
if(!blossom_effect)
// Spawns blossom effect
blossom_effect = new(T)
blossom_effect.parent_tree = src
// Start the timer to remove the blossom effect after 10 minutes
timer_handle_end = addtimer(CALLBACK(src, PROC_REF(end_blossom)), BLOSSOM_END_TIME, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)

/// Ends blooming, starts timer for a new one
/obj/structure/flora/tree/sakura/proc/end_blossom()
if(blossom_effect)
// Deletes blossom effect
QDEL_NULL(blossom_effect)
// Restart cycle
initiate_blossom_cycle()

/* Effects */
/obj/effect/blossom
name = "blossom"
desc = "It's sakura fubuki."
icon = 'modular_ss220/objects/icons/flora/sakura.dmi'
icon_state = "blossom_less"
layer = 12
pixel_x = -16
pixel_y = 10
var/obj/structure/flora/tree/sakura/parent_tree

/obj/effect/blossom/Initialize(mapload)
. = ..()
// Start the timer to spawn a pile of Sakura leaves after 2 minutes
addtimer(CALLBACK(src, PROC_REF(make_sakura_leaves)), LEAVES_PILE_SPAWN_TIME, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)

/obj/effect/blossom/New(turf, obj/structure/flora/tree/sakura/Sakura)
..()
if(Sakura && istype(Sakura))
parent_tree = Sakura

/obj/effect/blossom/Destroy()
if(isnull(parent_tree))
qdel(src)
return ..()

/// Spawns pile of sakura leaves under sakura tree
/obj/effect/blossom/proc/make_sakura_leaves()
var/turf/T = get_turf(src)
if(locate(/obj/effect/decal/sakura_leaves, T))
return
if(istype(T, /turf/simulated/floor/grass/sakura))
return
if(!parent_tree)
return
new /obj/effect/decal/sakura_leaves(T, src)
// Start the timer to replace grass tile with sakura's one after 10 minutes
addtimer(CALLBACK(src, PROC_REF(transform_turf)), TRANSFORM_TURF_TIME, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)

/// Transforms grass tile to sakura grass under blossom effect
/obj/effect/blossom/proc/transform_turf()
var/turf/T = get_turf(src)
if(istype(T, /turf/simulated/floor/grass/sakura))
return
if(!istype(T, /turf/simulated/floor/grass))
return
T.ChangeTurf(/turf/simulated/floor/grass/sakura)
// Deletes pile of Sakura leaves
for(var/obj/effect/decal/sakura_leaves/D in T)
qdel(D)

/// Sakura Leaves
/obj/effect/decal/sakura_leaves
name = "pile of sakura leaves"
desc = "It's fallen sakura leaves."
icon = 'modular_ss220/objects/icons/flora/sakura.dmi'
icon_state = "leaves"
pixel_y = 5
max_integrity = 50
resistance_flags = FLAMMABLE
layer = 11
plane = -1
no_scoop = TRUE
no_clear = TRUE
// Is leaves on fire?
var/on_fire = FALSE

/obj/effect/decal/sakura_leaves/New()
. = ..()
update_icon_state()

/obj/effect/decal/sakura_leaves/examine(mob/user)
. = ..()
if(on_fire)
. += span_danger("[src] is on fire!")

/obj/effect/decal/sakura_leaves/update_icon_state()
. = ..()
var/turf/T = get_turf(src)
for(var/obj/structure/flora/tree/sakura/sakura in T)
if(sakura.icon_state == "cherry_blossom")
pixel_x = -2
dir = WEST
if(sakura.icon_state == "cherry_blossom2")
pixel_x = 5
dir = EAST
if(sakura.icon_state == "cherry_blossom3")
pixel_x = -7

/obj/effect/decal/sakura_leaves/attackby(obj/item/I, mob/user)
if(I.get_heat() && !on_fire)
visible_message(span_danger("[src] bursts into flames!"))
fire_act()
if(istype(I, /obj/item/cultivator))
var/obj/item/cultivator/C = I
user.visible_message(
span_notice("[user] is clearing [src] from the ground..."),
span_notice("You begin clearing [src] from the ground..."),
span_warning("You hear a sound of leaves rustling."))
playsound(loc, 'sound/effects/shovel_dig.ogg', 50, 1)
if(!do_after(user, 50 * C.toolspeed, target = src))
return
user.visible_message(
span_notice("[user] clears [src] from the ground!"),
span_notice("You clear [src] from the ground!"))
qdel(src)
else
return ..()

// This is fake fire actually
/obj/effect/decal/sakura_leaves/fire_act()
if(resistance_flags & FLAMMABLE)
on_fire = TRUE
add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
addtimer(CALLBACK(src, PROC_REF(delete_decal)), 5 SECONDS)

/obj/effect/decal/sakura_leaves/proc/delete_decal()
cut_overlays()
qdel(src)

/* Sakura Floor */
/// Sakura grass
/turf/simulated/floor/grass/sakura
name = "sakura grass"
icon = 'modular_ss220/objects/icons/flora/sakura_grass.dmi'
icon_state = "grass"
base_icon_state = "grass"
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS)

/turf/simulated/floor/grass/sakura/no_creep
smoothing_flags = null
smoothing_groups = null
canSmoothWith = null
layer = GRASS_UNDER_LAYER
transform = null

/turf/simulated/floor/grass/sakura/update_icon_state()
. = ..()
if(broken || burnt)
icon_state = "damaged"

#undef BLOSSOM_START_TIME
#undef BLOSSOM_END_TIME
#undef LEAVES_PILE_SPAWN_TIME
#undef TRANSFORM_TURF_TIME
Binary file added modular_ss220/objects/icons/flora/sakura.dmi
View file
Binary file not shown.
Binary file added modular_ss220/objects/icons/flora/sakura_grass.dmi
View file
Binary file not shown.

0 comments on commit 37a201d

Please sign in to comment.