Skip to content

Commit 28215d0

Browse files
TerminalHashTerminalHash
authored
Merge pull request #22 from TerminalHash/holidays
Change textures on holidays
2 parents 5a352da + 64c5409 commit 28215d0

File tree

101 files changed

+3470
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3470
-45
lines changed

‎Base/Entities/Characters/Archer/ArcherAnim.as‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "PixelOffsets.as"
99
#include "RunnerTextures.as"
1010
#include "Accolades.as"
11-
11+
#include "HolidayCommon.as";
1212

1313
const f32 config_offset = -6.0f;
1414
const string shiny_layer = "shiny bit";
@@ -118,7 +118,16 @@ void LoadSprites(CSprite@ this)
118118
anim.AddFrame(1); //normal
119119
anim.AddFrame(9); //water
120120
anim.AddFrame(8); //fire
121-
anim.AddFrame(14); //bomb
121+
122+
if (getRules().get_string(holiday_prop) == "Halloween") {
123+
anim.AddFrame(18); //bomb halloween
124+
} else if (getRules().get_string(holiday_prop) == "Christmas") {
125+
anim.AddFrame(20); //bomb christmas
126+
} else {
127+
anim.AddFrame(14); //bomb
128+
}
129+
130+
//anim.AddFrame(14); //bomb
122131
anim.AddFrame(16); //wooden block
123132
anim.AddFrame(17); //stone block
124133
arrow.SetOffset(Vec2f(-1.0f, 5.0f + config_offset));

‎Base/Entities/Characters/Archer/ArcherHUD.as‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
#include "ActorHUDStartPos.as";
55
#include "ArcherResupplyHUD.as";
66
#include "MaterialIndicatorHUD.as";
7+
#include "HolidaySprites.as";
78
#include "pathway.as";
89

910
const string iconsFilename = "Entities/Characters/Archer/ArcherIcons.png";
11+
string icons_file_name;
12+
1013
const int slotsSize = 6;
1114

1215
void onInit(CSprite@ this)
@@ -94,5 +97,12 @@ void onRender(CSprite@ this)
9497
DrawPersonalMats();
9598

9699
// class weapon icon
97-
GUI::DrawIcon(iconsFilename, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
100+
if (isAnyHoliday()) {
101+
icons_file_name = getHolidayVersionFileName("ArcherIcons");
102+
GUI::DrawIcon(icons_file_name, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
103+
} else {
104+
GUI::DrawIcon(iconsFilename, arrow_frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
105+
}
106+
107+
//GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
98108
}

‎Base/Entities/Characters/Archer/ArcherIconsChristmas.png‎

1.91 KB
Loading

‎Base/Entities/Characters/Archer/ArcherIconsHalloween.png‎

1.86 KB
Loading

‎Base/Entities/Characters/Archer/ArcherLogic.as‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "BombCommon.as";
1212
#include "RedBarrierCommon.as";
1313
#include "StandardControlsCommon.as";
14+
#include "HolidaySprites.as";
1415
#include "BindingsCommon.as"
1516

1617
const int FLETCH_COOLDOWN = 45;
@@ -1561,15 +1562,23 @@ void Callback_PickArrow(CBitStream@ params)
15611562
blob.SendCommand(blob.getCommandID("pick " + matname));
15621563
}
15631564

1565+
string icons_file_name;
1566+
string arrow_icons_file_name;
1567+
15641568
// arrow pick menu
15651569
void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
15661570
{
1571+
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";
1572+
arrow_icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("ArcherIcons") : "ArcherIcons.png";
1573+
15671574
AddIconToken("$Arrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 0, this.getTeamNum());
15681575
AddIconToken("$WaterArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 1, this.getTeamNum());
15691576
AddIconToken("$FireArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 2, this.getTeamNum());
1570-
AddIconToken("$BombArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 3, this.getTeamNum());
1577+
AddIconToken("$BombArrow$", arrow_icons_file_name, Vec2f(16, 32), 3, this.getTeamNum());
15711578
AddIconToken("$BlockArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 4, this.getTeamNum());
15721579
AddIconToken("$StoneBlockArrow$", "Entities/Characters/Archer/ArcherIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
1580+
AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
1581+
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
15731582
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
15741583
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
15751584

‎Base/Entities/Characters/Builder/BuilderLogic.as‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "ParticleSparks.as";
1212
#include "MaterialCommon.as";
1313
#include "StandardControlsCommon.as";
14+
#include "HolidaySprites.as";
1415
#include "BindingsCommon.as";
1516

1617
const f32 hit_damage = 0.5f;
@@ -289,8 +290,14 @@ void TakeItem(CBlob@ this, const string &in name)
289290
}
290291
}
291292

293+
string icons_file_name;
294+
292295
void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
293296
{
297+
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";
298+
299+
AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
300+
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
294301
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
295302
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
296303

‎Base/Entities/Characters/Knight/KnightHUD.as‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
//knight HUD
22
#include "/Entities/Common/GUI/ActorHUDStartPos.as";
33
#include "MaterialIndicatorHUD.as";
4+
#include "HolidaySprites.as";
45
#include "pathway.as";
56

67
const string iconsFilename = "Entities/Characters/Knight/KnightIcons.png";
8+
string icons_file_name;
9+
710
const int slotsSize = 6;
811

912
void onInit(CSprite@ this)
@@ -102,6 +105,12 @@ void onRender(CSprite@ this)
102105
DrawPersonalMats();
103106

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

106-
GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
115+
//GUI::DrawIcon(iconsFilename, frame, Vec2f(16, 32), tl + Vec2f(8 + (slotsSize - 1) * 40, -16), 1.0f, blob.getTeamNum());
107116
}

‎Base/Entities/Characters/Knight/KnightIconsChristmas.png‎

2.63 KB
Loading

‎Base/Entities/Characters/Knight/KnightIconsHalloween.png‎

2.67 KB
Loading

‎Base/Entities/Characters/Knight/KnightLogic.as‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "Help.as";
1010
#include "Requirements.as"
1111
#include "StandardControlsCommon.as";
12+
#include "HolidaySprites.as";
1213

1314
//attacks limited to the one time per-actor before reset.
1415

@@ -1906,9 +1907,15 @@ void Callback_PickBomb(CBitStream@ params)
19061907
blob.SendCommand(blob.getCommandID("pick " + matname));
19071908
}
19081909

1910+
string icons_file_name;
1911+
19091912
// bomb pick menu
19101913
void onCreateInventoryMenu(CBlob@ this, CBlob@ forBlob, CGridMenu @gridmenu)
19111914
{
1915+
icons_file_name = isAnyHoliday() ? getHolidayVersionFileName("KnightIcons") : "KnightIcons.png";
1916+
1917+
AddIconToken("$Bomb$", icons_file_name, Vec2f(16, 32), 0, this.getTeamNum());
1918+
AddIconToken("$WaterBomb$", icons_file_name, Vec2f(16, 32), 2, this.getTeamNum());
19121919
AddIconToken("$StickyBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 5, this.getTeamNum());
19131920
AddIconToken("$IceBomb$", "Entities/Characters/Knight/KnightIcons.png", Vec2f(16, 32), 6, this.getTeamNum());
19141921

0 commit comments

Comments
 (0)