Skip to content

Commit

Permalink
Merge pull request #3666 from BEEmod/dev
Browse files Browse the repository at this point in the history 
Version 4.39.1
  • Loading branch information
@TeamSpen210
TeamSpen210 committed Feb 28, 2021
2 parents 528546d + cd2ab3b commit 30fe416
Show file tree
Hide file tree
Showing 165 changed files with 244 additions and 12,185 deletions.
223 changes: 171 additions & 52 deletions packages/Lautaro/standing_reclined_fizzlers/info.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,109 @@
"Styles"
{
"BEE2_CLEAN" "standing_fizzler"
"BEE2_OVERGROWN"
{
"Folder" "standing_fizzler"
"Palette"
{
"0"
{
"Icon" "palette/lautaro/standing_fizzler/over.png"
"BEE2" "standing_fizzler/over.png"
}
// Model just swaps textures via VPK.
}
}
"BEE2_PORTAL_1"
{
"Folder" "standing_fizzler"
"Palette"
{
"0"
{
"Icon" "palette/lautaro/standing_fizzler/p1.png"
"BEE2" "standing_fizzler/p1.png"

//"Model" "bee2/p1/lautaro/standing_fizzler_x1.3ds"
}
//"1"
// {
// "Model" "bee2/p1/lautaro/standing_fizzler_x2.3ds"
// }
//"2"
// {
// "Model" "bee2/p1/lautaro/standing_fizzler_x3.3ds"
// }
//"3"
// {
// "Model" "bee2/p1/lautaro/standing_fizzler_x4.3ds"
// }
//"4"
// {
// "Model" "bee2/p1/lautaro/standing_fizzler_x5.3ds"
// }
}
}
"BEE2_1950s"
{
"Folder" "standing_fizzler"
"Palette"
{
"0"
{
"Icon" "palette/lautaro/standing_fizzler/retro.png"
"BEE2" "standing_fizzler/retro.png"

//"Model" "bee2/retro/lautaro/standing_fizzler_x1.3ds"
}
//"1"
// {
// "Model" "bee2/retro/lautaro/standing_fizzler_x2.3ds"
// }
//"2"
// {
// "Model" "bee2/retro/lautaro/standing_fizzler_x3.3ds"
// }
//"3"
// {
// "Model" "bee2/retro/lautaro/standing_fizzler_x4.3ds"
// }
//"4"
// {
// "Model" "bee2/retro/lautaro/standing_fizzler_x5.3ds"
// }
}
}
"BEE2_BTS"
{
"Folder" "standing_fizzler"
"Palette"
{
"0"
{
"Icon" "palette/lautaro/standing_fizzler/bts.png"
"BEE2" "standing_fizzler/bts.png"

//"Model" "bee2/bts/lautaro/standing_fizzler_x1.3ds"
}
//"1"
// {
// "Model" "bee2/bts/lautaro/standing_fizzler_x2.3ds"
// }
//"2"
// {
// "Model" "bee2/bts/lautaro/standing_fizzler_x3.3ds"
// }
//"3"
// {
// "Model" "bee2/bts/lautaro/standing_fizzler_x4.3ds"
// }
//"4"
// {
// "Model" "bee2/bts/lautaro/standing_fizzler_x5.3ds"
// }
}
}
}
}
}
Expand All @@ -29,88 +132,104 @@
"Folder" "reclined_fizzler"
"Palette"
{
"all"
{
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler.png"
"BEE2" "reclined_fizzler/over/reclined_fizzler.png"
}
"0"
{
"Model" "bee2/over/lautaro/reclined_fizzler_x1.3ds"
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler_x1.png"
"BEE2" "reclined_fizzler/over/reclined_fizzler_x1.png"
"Icon" "palette/lautaro/reclined_fizzler/over.png"
"BEE2" "reclined_fizzler/over.png"
}
"1"
{
"Model" "bee2/over/lautaro/reclined_fizzler_x2.3ds"
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler_x2.png"
"BEE2" "reclined_fizzler/over/reclined_fizzler_x2.png"
}
"2"
{
"Model" "bee2/over/lautaro/reclined_fizzler_x3.3ds"
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler_x3.png"
"BEE2" "reclined_fizzler/over/reclined_fizzler_x3.png"
}
"3"
{
"Model" "bee2/over/lautaro/reclined_fizzler_x4.3ds"
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler_x4.png"
"BEE2" "reclined_fizzler/over/reclined_fizzler_x4.png"
}
"4"
// Model just swaps textures via VPK.
}
}
"BEE2_PORTAL_1"
{
"Folder" "reclined_fizzler"
"Palette"
{
"0"
{
"Model" "bee2/over/lautaro/reclined_fizzler_x5.3ds"
"Icon" "palette/lautaro/reclined_fizzler/over/reclined_fizzler_x5.png"
"BEE2" "reclined_fizzler/over/standing_fizzler_x5.png"
"Icon" "palette/lautaro/reclined_fizzler/p1.png"
"BEE2" "reclined_fizzler/p1.png"

// "Model" "bee2/p1/lautaro/reclined_fizzler_x1.3ds"
}
// "1"
// {
// "Model" "bee2/p1/lautaro/reclined_fizzler_x2.3ds"
// }
// "2"
// {
// "Model" "bee2/p1/lautaro/reclined_fizzler_x3.3ds"
// }
//"3"
// {
// "Model" "bee2/p1/lautaro/reclined_fizzler_x4.3ds"
// }
//"4"
// {
// "Model" "bee2/p1/lautaro/reclined_fizzler_x5.3ds"
// }
}
}
"BEE2_PORTAL_1" "reclined_fizzler_p1"
}
"BEE2_1950s"
{
"Folder" "reclined_fizzler"
"Palette"
{
"all"
"0"
{
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler.png"
"Icon" "palette/lautaro/reclined_fizzler/retro.png"
"BEE2" "reclined_fizzler/retro.png"

// "Model" "bee2/retro/lautaro/reclined_fizzler_x1.3ds"
}
//"1"
// {
// "Model" "bee2/retro/lautaro/reclined_fizzler_x2.3ds"
// }
//"2"
// {
// "Model" "bee2/retro/lautaro/reclined_fizzler_x3.3ds"
// }
//"3"
// {
// "Model" "bee2/retro/lautaro/reclined_fizzler_x4.3ds"
// }
//"4"
// {
// "Model" "bee2/retro/lautaro/reclined_fizzler_x5.3ds"
// }
}
}
"BEE2_BTS"
{
"Folder" "reclined_fizzler"
"Palette"
{
"0"
{
"Model" "bee2/retro/lautaro/reclined_fizzler_x1.3ds"
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler_x1.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler_x1.png"
"Icon" "palette/lautaro/reclined_fizzler/bts.png"
"BEE2" "reclined_fizzler/bts.png"

"Model" "bee2/bts/lautaro/reclined_fizzler_x1.3ds"
}
"1"
{
"Model" "bee2/retro/lautaro/reclined_fizzler_x2.3ds"
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler_x2.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler_x2.png"
"Model" "bee2/bts/lautaro/reclined_fizzler_x2.3ds"
}
"2"
{
"Model" "bee2/retro/lautaro/reclined_fizzler_x3.3ds"
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler_x3.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler_x3.png"
"Model" "bee2/bts/lautaro/reclined_fizzler_x3.3ds"
}
"3"
{
"Model" "bee2/retro/lautaro/reclined_fizzler_x4.3ds"
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler_x4.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler_x4.png"
"Model" "bee2/bts/lautaro/reclined_fizzler_x4.3ds"
}
"4"
{
"Model" "bee2/retro/lautaro/reclined_fizzler_x5.3ds"
"Icon" "palette/lautaro/reclined_fizzler/retro/reclined_fizzler_x5.png"
"BEE2" "reclined_fizzler/retro/reclined_fizzler_x5.png"
"Model" "bee2/bts/lautaro/reclined_fizzler_x5.3ds"
}
}
}
"BEE2_1980s" "reclined_fizzler_80s"
"BEE2_BTS" "reclined_fizzler_bts"
}
}
}
Expand Down
34 changes: 7 additions & 27 deletions packages/Lautaro/standing_reclined_fizzlers/items/reclined_fizzler/editoritems.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"SubTypeProperty" "CubeType"
"SubType"
{
"Name" "Reclined Fizzler x1"
"Name" "Reclined Fizzler"
"Model"
{
"ModelName" "bee2/clean/reclined_fizzler_x1.3ds"
}
"Palette"
{
"Tooltip" "RECLINED FIZZLER X1"
"Image" "palette/lautaro/reclined_fizzler/clean/reclined_fizzler_x1.png"
"Tooltip" "RECLINED FIZZLER"
"Image" "palette/lautaro/reclined_fizzler/clean.vtf"
}
"Sounds"
{
Expand All @@ -26,16 +26,11 @@
}
"SubType"
{
"Name" "Reclined Fizzler x2"
"Name" "Reclined Fizzler"
"Model"
{
"ModelName" "bee2/clean/reclined_fizzler_x2.3ds"
}
"Palette"
{
"Tooltip" "RECLINED FIZZLER X2"
"Image" "palette/lautaro/Reclined_fizzler/clean/reclined_fizzler_x2.png"
}
"Sounds"
{
"SOUND_CREATED" "P2Editor.PlaceOther"
Expand All @@ -46,16 +41,11 @@
}
"SubType"
{
"Name" "Reclined Fizzler x3"
"Name" "Reclined Fizzler"
"Model"
{
"ModelName" "bee2/clean/reclined_fizzler_x3.3ds"
}
"Palette"
{
"Tooltip" "RECLINED FIZZLER X3"
"Image" "palette/lautaro/Reclined_fizzler/clean/reclined_fizzler_x3.png"
}
"Sounds"
{
"SOUND_CREATED" "P2Editor.PlaceOther"
Expand All @@ -66,16 +56,11 @@
}
"SubType"
{
"Name" "Reclined Fizzler x4"
"Name" "Reclined Fizzler"
"Model"
{
"ModelName" "bee2/clean/reclined_fizzler_x4.3ds"
}
"Palette"
{
"Tooltip" "RECLINED FIZZLER X4"
"Image" "palette/lautaro/Reclined_fizzler/clean/reclined_fizzler_x4.png"
}
"Sounds"
{
"SOUND_CREATED" "P2Editor.PlaceOther"
Expand All @@ -86,16 +71,11 @@
}
"SubType"
{
"Name" "Reclined Fizzler x5"
"Name" "Reclined Fizzler"
"Model"
{
"ModelName" "bee2/clean/reclined_fizzler_x5.3ds"
}
"Palette"
{
"Tooltip" "RECLINED FIZZLER X5"
"Image" "palette/lautaro/Reclined_fizzler/clean/reclined_fizzler_x5.png"
}
"Sounds"
{
"SOUND_CREATED" "P2Editor.PlaceOther"
Expand Down
11 changes: 2 additions & 9 deletions packages/Lautaro/standing_reclined_fizzlers/items/reclined_fizzler/properties.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,15 @@
{
"" "A fizzler that is placed flat on top of the surface you placed it on. This allows fizzlers to be used in placed without needing regular walls."
"" ""
"" "* To produce other types of fizzlers, connect this item to another fizzler"
"" "* To produce other types of fizzlers, connect this to a copy of the relevant fizzler."
"" "* It can be resized to cover up to 5 tiles by using the Cube Type property."
"" "* If any of the pillars are inside of a block, that part of the pillar will not be generated."
"" "* For more knowledge and tips for this item, click on __More Info>>__ at the lower right corner of this window."
}
"infoURL" "https://github.com/BEEmod/BEE2-items/wiki/Reclined-Fizzler"
"Ent_Count" "See original fizzler"
"all_icon" "palette/lautaro/reclined_fizzler/clean/reclined_fizzler.png"
"all_name" "RECLINED FIZZLER"
"Icon"
{
"all" "reclined_fizzler/clean/reclined_fizzler.png"
"0" "reclined_fizzler/clean/reclined_fizzler_x1.png"
"1" "reclined_fizzler/clean/reclined_fizzler_x2.png"
"2" "reclined_fizzler/clean/reclined_fizzler_x3.png"
"3" "reclined_fizzler/clean/reclined_fizzler_x4.png"
"4" "reclined_fizzler/clean/reclined_fizzler_x5.png"
"0" "reclined_fizzler/clean.png"
}
}
Loading

0 comments on commit 30fe416

Please sign in to comment.