Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
PieterVdc committed Dec 31, 2023
1 parent b268da6 commit e0fe736
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 11 deletions.
1 change: 1 addition & 0 deletions Autoload/Constants.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
extends Node
const TILE_SIZE = 96
const SUBTILE_SIZE = 32
const PLAYERS_COUNT = 9
# red blue green yellow white neutral Purple Black Orange
const ownerFloorCol = [Color8(132,44,0,255), Color8(136,112,148,255), Color8(52, 92, 4,255), Color8(188,156,0,255), Color8(207,207,207,255), Color8(52,36,4,255), Color8(171, 80,120,255), Color8(92,80,32,255), Color8(188,108,53,255)] #Color8(180,160,124,255)
const ownerRoomCol = [Color8(156,48,0,255), Color8(160,136,180,255), Color8(56,112,12,255), Color8(228,212,0,255), Color8(242,242,242,255), Color8(0,0,0,0), Color8(200,104,164,255), Color8(77,60,20,255), Color8(211,132,72,255)] #Color8(188,168,132,255)
Expand Down
8 changes: 4 additions & 4 deletions Autoload/Cube.gd
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ enum {
}
const ownedCube = {
"FloorMarker" : [192,193,194,195,199,198,455,462,469],
"WallMarker" : [67, 68, 69, 70, 71, 448,454,463,470],
"PortalMarker" : [382,422,423,424,426,425,452,461,468],
"HeartMarker" : [382,422,423,424,426,425,452,461,468],
"BarracksFlag" : [393,427,428,429,431,430,453,462,469],
"WallMarker" : [67, 68, 69, 70, 71, 448,454,461,468],
"PortalMarker" : [382,422,423,424,426,425,452,459,466],
"HeartMarker" : [382,422,423,424,426,425,452,459,466],
"BarracksFlag" : [393,427,428,429,431,430,453,460,467],
"BannerLeft" : [160,410,413,416,419,445,449,456,463],
"BannerMiddle" : [161,411,414,417,420,446,450,457,464],
"BannerRight" : [162,412,415,418,421,447,451,458,465],
Expand Down
4 changes: 2 additions & 2 deletions Scenes/InstanceOwnership.gd
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ var materialInstanceOwnership = [

func _ready():
#print(materialInstanceOwnership)
for i in 6:
for i in Constants.PLAYERS_COUNT:
materialInstanceOwnership[i].set_shader_param("ownerCol", Constants.ownerRoomCol[i])
materialInstanceOwnership[i].set_shader_param("alphaFilled", 0.5)

func _process(delta):
for i in 6: # 0 to 5
for i in Constants.PLAYERS_COUNT: # 0 to 8
materialInstanceOwnership[i].set_shader_param("fadeAlpha", 1.0-oOverheadOwnership.alphaFadeColor[i])
if i == 5:
materialInstanceOwnership[i].set_shader_param("ownerCol", Constants.ownerRoomCol[Random.choose([0,1,2,3])])
2 changes: 1 addition & 1 deletion Scenes/OnlyOwnership.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ onready var oSelectedRect = get_node("../../../Clippy/SelectedRect")
func initialize_grid_items():
var oGridContainer = current_grid_container()
# # Add children
for i in 6: # +1 is for "Default"
for i in Constants.PLAYERS_COUNT: # +1 is for "Default"
var id = scnOwnerButton.instance()
id.connect("pressed", self, "_on_OwnerButtonPressed", [id])

Expand Down
11 changes: 7 additions & 4 deletions Scenes/OverheadOwnership.gd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ onready var TILE_SIZE = Constants.TILE_SIZE
onready var SUBTILE_SIZE = Constants.SUBTILE_SIZE
#Bright

var alphaFadeColor = [1.00,1.00,1.00,1.00,1.00,1.00]
var alphaFadeColor = [1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00]
const fadeSpeed = 4
var slabOwnershipImage = Image.new()
var slabOwnershipTexture = ImageTexture.new()
Expand All @@ -26,6 +26,9 @@ func _ready():
mat.set_shader_param("color3", Constants.ownerRoomCol[3])
mat.set_shader_param("color4", Constants.ownerRoomCol[4])
mat.set_shader_param("color5", Constants.ownerRoomCol[5])
mat.set_shader_param("color6", Constants.ownerRoomCol[6])
mat.set_shader_param("color7", Constants.ownerRoomCol[7])
mat.set_shader_param("color8", Constants.ownerRoomCol[8])

set_ownership_alpha_graphics(OWNERSHIP_ALPHA)

Expand All @@ -34,7 +37,7 @@ func set_ownership_alpha_graphics(value):
mat.set_shader_param("outlineThickness", 5.0)
mat.set_shader_param("alphaOutline", clamp(OWNERSHIP_ALPHA*2.0, 0.0, 1.0))
mat.set_shader_param("alphaFilled", OWNERSHIP_ALPHA)
for i in 6:
for i in Constants.PLAYERS_COUNT:
oInstanceOwnership.materialInstanceOwnership[i].set_shader_param("alphaFilled", value)

func clear():
Expand All @@ -49,7 +52,7 @@ func start():
for ySlab in M.ySize:
for xSlab in M.xSize:
var getOwner = oDataOwnership.get_cell(xSlab,ySlab)
if getOwner <= 5:
if getOwner < Constants.PLAYERS_COUNT:
slabOwnershipImage.set_pixel(xSlab, ySlab, Constants.ownerRoomCol[getOwner])
slabOwnershipImage.unlock()

Expand Down Expand Up @@ -119,7 +122,7 @@ func _process(delta):
slabOwnershipImage.unlock()
mat.set_shader_param("cursorOnColor", cursorOnColor)

for i in 6:
for i in Constants.PLAYERS_COUNT:
if cursorOnColor == Constants.ownerRoomCol[i]:
alphaFadeColor[i] = lerp(alphaFadeColor[i], 1.00, fadeSpeed*delta)
else:
Expand Down
3 changes: 3 additions & 0 deletions Scenes/TwoColumnData.gd
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ func add_item(leftString, rightString):
nodeRightColumn.add_item("Yellow")
nodeRightColumn.add_item("White")
nodeRightColumn.add_item("None")
nodeRightColumn.add_item("Purple")
nodeRightColumn.add_item("Black")
nodeRightColumn.add_item("Orange")

# print(nodeRightColumn.get_popup().mouse_filter)

Expand Down
9 changes: 9 additions & 0 deletions Shaders/slab_ownership.shader
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,18 @@ uniform float alphaFadeColor2 = 1.00;
uniform float alphaFadeColor3 = 1.00;
uniform float alphaFadeColor4 = 1.00;
uniform float alphaFadeColor5 = 1.00;
uniform float alphaFadeColor6 = 1.00;
uniform float alphaFadeColor7 = 1.00;
uniform float alphaFadeColor8 = 1.00;
uniform vec4 color0;
uniform vec4 color1;
uniform vec4 color2;
uniform vec4 color3;
uniform vec4 color4;
uniform vec4 color5;
uniform vec4 color6;
uniform vec4 color7;
uniform vec4 color8;

void fragment() {
vec4 baseCol = texture(territoryTexture,UV);
Expand Down Expand Up @@ -47,6 +53,9 @@ void fragment() {
if (baseCol == color3) {fadeAlpha = alphaFadeColor3;}
if (baseCol == color4) {fadeAlpha = alphaFadeColor4;}
if (baseCol == color5) {fadeAlpha = alphaFadeColor5;}
if (baseCol == color6) {fadeAlpha = alphaFadeColor6;}
if (baseCol == color7) {fadeAlpha = alphaFadeColor7;}
if (baseCol == color8) {fadeAlpha = alphaFadeColor8;}

modifiedCol.a = alphaFilled;

Expand Down

0 comments on commit e0fe736

Please sign in to comment.