Skip to content

Update texture changing on holidays #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update texture changing on holidays #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
82ef7d4
prepare changes for future update
TerminalHash Dec 11, 2024
cddd0d2
remove mugg91's code from this files
TerminalHash Dec 11, 2024
7e1fec4
update files to last changes
TerminalHash Dec 12, 2024
3cae53d
fix typo
TerminalHash Dec 12, 2024
928795c
opsie
TerminalHash Dec 12, 2024
657aaf1
pick another changes
TerminalHash Dec 12, 2024
b05af11
update again
TerminalHash Dec 12, 2024
ddfeb08
fix holiday code + reload map
TerminalHash Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Base/Entities/Characters/Archer/ArcherAnim.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ void LoadSprites(CSprite@ this)
anim.AddFrame(9); //water
anim.AddFrame(8); //fire

if (getRules().get_string(holiday_prop) == "Halloween") {
if ((getHoliday() == Holidays::Christmas) == "Halloween") {
anim.AddFrame(18); //bomb halloween
} else if (getRules().get_string(holiday_prop) == "Christmas") {
} else if ((getHoliday() == Holidays::Christmas) == "Christmas") {
anim.AddFrame(20); //bomb christmas
} else {
anim.AddFrame(14); //bomb
Expand Down
9 changes: 1 addition & 8 deletions Base/Entities/Characters/Archer/ArcherHUD.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
#include "ActorHUDStartPos.as";
#include "ArcherResupplyHUD.as";
#include "MaterialIndicatorHUD.as";
#include "HolidaySprites.as";
#include "pathway.as";

const string iconsFilename = "Entities/Characters/Archer/ArcherIcons.png";
string icons_file_name;

const int slotsSize = 6;

Expand Down Expand Up @@ -97,12 +95,7 @@ void onRender(CSprite@ this)
DrawPersonalMats();

// class weapon icon
if (isAnyHoliday()) {
icons_file_name = getHolidayVersionFileName("ArcherIcons");
GUI::DrawIcon(icons_file_name, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
} else {
GUI::DrawIcon(iconsFilename, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
}
GUI::DrawIcon(iconsFilename, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());

//GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
}
13 changes: 3 additions & 10 deletions Base/Entities/Characters/Archer/ArcherLogic.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "BombCommon.as";
#include "RedBarrierCommon.as";
#include "StandardControlsCommon.as";
#include "HolidaySprites.as";
#include "BindingsCommon.as"

const int FLETCH_COOLDOWN = 45;
Expand Down Expand Up @@ -1632,23 +1631,17 @@ void Callback_PickArrow(CBitStream@ params)
blob.SendCommand(blob.getCommandID("pick " + matname));
}

string icons_file_name;
string arrow_icons_file_name;

// arrow pick menu
void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
{
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";
arrow_icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("ArcherIcons") : "ArcherIcons.png";

AddIconToken("$Arrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 1, this.getTeamNum());
AddIconToken("$FireArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$BombArrow$", arrow_icons_file_name, Vec2f(16, 32), 3, this.getTeamNum());
AddIconToken("$BombArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 3, this.getTeamNum());
AddIconToken("$BlockArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 4, this.getTeamNum());
AddIconToken("$StoneBlockArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$Bomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
AddIconToken("$Booster$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 8, this.getTeamNum());
Expand Down
9 changes: 2 additions & 7 deletions Base/Entities/Characters/Builder/BuilderLogic.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "ParticleSparks.as";
#include "MaterialCommon.as";
#include "StandardControlsCommon.as";
#include "HolidaySprites.as";
#include "BindingsCommon.as";

const f32 hit_damage = 0.5f;
Expand Down Expand Up @@ -346,14 +345,10 @@ void TakeItem(CBlob@ this, const string &in name)
}
}

string icons_file_name;

void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
{
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";

AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$Bomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
AddIconToken("$Booster$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 8, this.getTeamNum());
Expand Down
9 changes: 1 addition & 8 deletions Base/Entities/Characters/Knight/KnightHUD.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
//knight HUD
#include "/Entities/Common/GUI/ActorHUDStartPos.as";
#include "MaterialIndicatorHUD.as";
#include "HolidaySprites.as";
#include "pathway.as";

const string iconsFilename = "Entities/Characters/Knight/KnightIcons.png";
string icons_file_name;

const int slotsSize = 6;

Expand Down Expand Up @@ -107,12 +105,7 @@ void onRender(CSprite@ this)
DrawPersonalMats();

// draw class icon
if (isAnyHoliday()) {
icons_file_name = getHolidayVersionFileName("KnightIcons");
GUI::DrawIcon(icons_file_name, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
} else {
GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
}
GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());

//GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
}
9 changes: 2 additions & 7 deletions Base/Entities/Characters/Knight/KnightLogic.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "Help.as";
#include "Requirements.as"
#include "StandardControlsCommon.as";
#include "HolidaySprites.as";
#include "BindingsCommon.as"

//attacks limited to the one time per-actor before reset.
Expand Down Expand Up @@ -1980,15 +1979,11 @@ void Callback_PickBomb(CBitStream@ params)
blob.SendCommand(blob.getCommandID("pick " + matname));
}

string icons_file_name;

// bomb pick menu
void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
{
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";

AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$Bomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 0, this.getTeamNum());
AddIconToken("$WaterBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 2, this.getTeamNum());
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
AddIconToken("$Booster$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 8, this.getTeamNum());
Expand Down
9 changes: 1 addition & 8 deletions Base/Entities/Common/Attacks/PlantHitEffects.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
#include "Hitters.as"
#include "HolidaySprites.as";

string gibs_file_name;

void onInit(CBlob@ this) {
gibs_file_name = isAnyHoliday() ? getHolidayVersionFileName("GenericGibs") : "GenericGibs.png";
}

f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitterBlob, u8 customData)
{
Expand All @@ -25,7 +18,7 @@ f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitt

for (int i = 0; i < (damage + 1); ++i)
{
makeGibParticle(gibs_file_name,
makeGibParticle("GenericGibs.png",
this.getPosition(), getRandomVelocity(-90, (Maths::Min(Maths::Max(0.5f, damage), 2.0f) * 4.0f) , 270),
7, 3 + XORRandom(4), Vec2f(8, 8),
1.0f, 0, "", 0);
Expand Down
11 changes: 1 addition & 10 deletions Base/Entities/Common/Decaying/DecayStuckArrows.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
#include "HolidaySprites.as";

string gibs_file_name;

void onInit(CBlob@ this)
{
gibs_file_name = isAnyHoliday() ? getHolidayVersionFileName("GenericGibs") : "GenericGibs.png";
}

Random rand(Time());

void onTick(CBlob@ this)
Expand Down Expand Up @@ -34,7 +25,7 @@ void onTick(CBlob@ this)
Vec2f pos = arrow.getWorldTranslation();
Vec2f vel = this.getVelocity();
makeGibParticle(
gibs_file_name, pos, vel,
"GenericGibs.png", pos, vel,
1, rand.NextRanged(4) + 4,
Vec2f(8, 8), 2.0f, 20, "/thud",
this.getTeamNum()
Expand Down
7 changes: 1 addition & 6 deletions Base/Entities/Common/Fabric/Stone.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
#include "Hitters.as"
#include "HolidaySprites.as";

string gibs_file_name;

void onInit(CBlob@ this)
{
this.Tag("stone");

gibs_file_name = isAnyHoliday() ? getHolidayVersionFileName("GenericGibs") : "GenericGibs.png";
}

f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitterBlob, u8 customData)
Expand All @@ -21,7 +16,7 @@ f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitt

if (getRules().get_string("clusterfuck") != "off")
{
makeGibParticle(gibs_file_name, worldPoint, getRandomVelocity((this.getPosition() - worldPoint).getAngle(), 1.0f + damage, 90.0f) + Vec2f(0.0f, -2.0f),
makeGibParticle("GenericGibs.png", worldPoint, getRandomVelocity((this.getPosition() - worldPoint).getAngle(), 1.0f + damage, 90.0f) + Vec2f(0.0f, -2.0f),
2, 4 + XORRandom(4), Vec2f(8, 8), 2.0f, 0, "", 0);
}
}
Expand Down
7 changes: 1 addition & 6 deletions Base/Entities/Common/Fabric/Wooden.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
#include "Hitters.as"
#include "HolidaySprites.as";

string gibs_file_name;

void onInit(CBlob@ this)
{
this.Tag("wooden");

gibs_file_name = isAnyHoliday() ? getHolidayVersionFileName("GenericGibs") : "GenericGibs.png";
}

f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitterBlob, u8 customData)
Expand All @@ -26,7 +21,7 @@ f32 onHit(CBlob@ this, Vec2f worldPoint, Vec2f velocity, f32 damage, CBlob@ hitt

if (getRules().get_string("clusterfuck") != "off")
{
makeGibParticle(gibs_file_name, worldPoint, getRandomVelocity(angle, 1.0f + damage, 90.0f) + Vec2f(0.0f, -2.0f),
makeGibParticle("GenericGibs.png", worldPoint, getRandomVelocity(angle, 1.0f + damage, 90.0f) + Vec2f(0.0f, -2.0f),
1, 4 + XORRandom(4), Vec2f(8, 8), 2.0f, 0, "", 0);
}
}
Expand Down
7 changes: 1 addition & 6 deletions Base/Entities/Industry/CTFShops/Storage/Storage.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
// Storage.as

#include "GenericButtonCommon.as"
#include "HolidaySprites.as"

string lantern_file_name;

void onInit(CSprite@ this)
{
lantern_file_name = isAnyHoliday() ? getHolidayVersionFileName("Lantern") : "Lantern.png";

// Building
this.SetZ(-60); //-60 instead of -50 so sprite layers are behind ladders
Expand Down Expand Up @@ -82,7 +77,7 @@ void onInit(CSprite@ this)
}

// Lantern
CSpriteLayer@ lantern = this.addSpriteLayer("lantern", lantern_file_name, 8, 8);
CSpriteLayer@ lantern = this.addSpriteLayer("lantern", "Lantern.png", 8, 8);
if (lantern !is null)
{
{
Expand Down
19 changes: 0 additions & 19 deletions Base/Entities/Items/Explosives/Bomb/Bomb.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
#include "Hitters.as";
#include "BombCommon.as";
#include "ShieldCommon.as";
#include "HolidaySprites.as";

string bomb_file_name;
string waterbomb_file_name;

const s32 bomb_fuse = 120;

Expand Down Expand Up @@ -34,22 +30,7 @@ void onInit(CBlob@ this)
this.SetMapEdgeFlags(CBlob::map_collide_left | CBlob::map_collide_right);
}

void onInit(CSprite@ this)
{
if (isAnyHoliday() && this.getBlob().getConfig() == "waterbomb") {
waterbomb_file_name = getHolidayVersionFileName("WaterBomb");
this.ReloadSprite(waterbomb_file_name);
}

if (isAnyHoliday() && this.getBlob().getConfig() == "bomb")
{
bomb_file_name = getHolidayVersionFileName("Bomb");
this.ReloadSprite(bomb_file_name);
}
}

//start ugly bomb logic :)

void set_delay(CBlob@ this, string field, s32 delay)
{
this.set_s32(field, getGameTime() + delay);
Expand Down
9 changes: 7 additions & 2 deletions Base/Entities/Items/Explosives/Bomb/BombCommon.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "Hitters.as"
#include "MakeDustParticle.as"
#include "KnockedCommon.as"
#include "HolidaySprites.as";
#include "HolidayCommon.as"

void SetupBomb(CBlob@ this, const int fuseTicks, const f32 explRadius, const f32 explosive_damage, const f32 map_damage_radius, const f32 map_damage_ratio, const bool map_damage_raycast)
{
Expand Down Expand Up @@ -50,7 +50,12 @@ bool UpdateBomb(CBlob@ this)
}

if (this.getConfig() == "waterbomb") {
lightColor = isHalloween() ? SColor(255, 100, 113, 96) : SColor(255, 44, 175, 222);
#ifdef STAGING
if (getHoliday() == Holidays::Halloween)
lightColor = SColor(255, 100, 113, 96);
else
#endif
lightColor = SColor(255, 44, 175, 222);
} else if (this.getConfig() == "booster") {
this.SetLight(false);
} else {
Expand Down
17 changes: 1 addition & 16 deletions Base/Entities/Items/Explosives/Keg/Keg.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
#include "Hitters.as";
#include "ActivationThrowCommon.as"
#include "HolidayCommon.as";
#include "HolidaySprites.as";

string keg_sprite_file;

void onInit(CBlob@ this)
{
Expand All @@ -23,9 +20,7 @@ void onInit(CBlob@ this)

this.set_u16("_keg_carrier_id", 0xffff);

keg_sprite_file = isAnyHoliday() ? getHolidayVersionFileName("Keg") : "Keg.png";

CSpriteLayer@ fuse = this.getSprite().addSpriteLayer("fuse", keg_sprite_file, 16, 16, 0, 0);
CSpriteLayer@ fuse = this.getSprite().addSpriteLayer("fuse", "Keg.png", 16, 16, 0, 0);

if (fuse !is null)
{
Expand All @@ -39,17 +34,7 @@ void onInit(CBlob@ this)
this.set_f32("important-pickup", 30.0f);
}

void onInit(CSprite@ this)
{
if (isAnyHoliday())
{
keg_sprite_file = getHolidayVersionFileName("Keg");
this.ReloadSprite(keg_sprite_file);
}
}

//sprite update

void onTick(CSprite@ this)
{
CBlob@ blob = this.getBlob();
Expand Down
Binary file removed Base/Entities/Items/Explosives/WaterBomb/WaterBombHalloween.png
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions Base/Entities/Items/Heart/Heart.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include "HolidayCommon.as";

void onInit(CBlob@ this)
{
this.set_string("eat sound", "/Heart.ogg");
Expand All @@ -8,12 +6,3 @@ void onInit(CBlob@ this)
this.Tag("ignore_arrow");
this.Tag("ignore_saw");
}

void onInit(CSprite@ this) {
if (getRules().get_string(holiday_prop) == "Halloween") {
this.SetAnimation("default_halloween");
} else {
this.SetAnimation("default");
}
}

Binary file removed Base/Entities/Items/Heart/Heart.png
View file
Open in desktop
Binary file not shown.
Loading