From a5131cd091a7cadcd03f99e19b70752bf412e153 Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Fri, 12 Apr 2024 19:18:52 -0700 Subject: [PATCH] remove isGF --- assets/data/characters/bf-holding-gf-dead.xml | 2 +- assets/data/characters/bf-pixel-dead.xml | 2 +- assets/data/characters/gf-car.xml | 2 +- assets/data/characters/gf-christmas.xml | 2 +- assets/data/characters/gf-tankmen.xml | 2 +- assets/data/characters/gf.xml | 2 +- assets/data/characters/senpai-angry.xml | 2 +- assets/data/characters/tankman.xml | 2 +- source/funkin/editors/character/CharacterInfoScreen.hx | 8 +------- source/funkin/game/Character.hx | 5 +---- 10 files changed, 10 insertions(+), 19 deletions(-) diff --git a/assets/data/characters/bf-holding-gf-dead.xml b/assets/data/characters/bf-holding-gf-dead.xml index 52fa52eb..3a2981ac 100644 --- a/assets/data/characters/bf-holding-gf-dead.xml +++ b/assets/data/characters/bf-holding-gf-dead.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/bf-pixel-dead.xml b/assets/data/characters/bf-pixel-dead.xml index 52aedd58..8b205eb9 100644 --- a/assets/data/characters/bf-pixel-dead.xml +++ b/assets/data/characters/bf-pixel-dead.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/gf-car.xml b/assets/data/characters/gf-car.xml index 72ca5814..a5bc8d41 100644 --- a/assets/data/characters/gf-car.xml +++ b/assets/data/characters/gf-car.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/assets/data/characters/gf-christmas.xml b/assets/data/characters/gf-christmas.xml index 1a995a2a..2abd3409 100644 --- a/assets/data/characters/gf-christmas.xml +++ b/assets/data/characters/gf-christmas.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/gf-tankmen.xml b/assets/data/characters/gf-tankmen.xml index 7ba7df0a..9a9596d9 100644 --- a/assets/data/characters/gf-tankmen.xml +++ b/assets/data/characters/gf-tankmen.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/gf.xml b/assets/data/characters/gf.xml index 911d2073..d12f2a0d 100644 --- a/assets/data/characters/gf.xml +++ b/assets/data/characters/gf.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/senpai-angry.xml b/assets/data/characters/senpai-angry.xml index c1203449..c81dc67d 100644 --- a/assets/data/characters/senpai-angry.xml +++ b/assets/data/characters/senpai-angry.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/data/characters/tankman.xml b/assets/data/characters/tankman.xml index 092e0368..38f9abf9 100644 --- a/assets/data/characters/tankman.xml +++ b/assets/data/characters/tankman.xml @@ -1,5 +1,5 @@ - + diff --git a/source/funkin/editors/character/CharacterInfoScreen.hx b/source/funkin/editors/character/CharacterInfoScreen.hx index de3dac36..805bfeaa 100644 --- a/source/funkin/editors/character/CharacterInfoScreen.hx +++ b/source/funkin/editors/character/CharacterInfoScreen.hx @@ -23,7 +23,6 @@ class CharacterInfoScreen extends UISubstateWindow { public var singTimeStepper:UINumericStepper; public var customPropertiesButtonList:UIButtonList; public var isPlayerCheckbox:UICheckbox; - public var isGFCheckbox:UICheckbox; public var saveButton:UIButton; public var closeButton:UIButton; @@ -119,11 +118,7 @@ class CharacterInfoScreen extends UISubstateWindow { add(isPlayerCheckbox); addLabelOn(isPlayerCheckbox, "Is Player"); - isGFCheckbox = new UICheckbox(isPlayerCheckbox.x + 128, positionXStepper.y + 10 + 32 + 28, "isGF", character.isGF); - add(isGFCheckbox); - addLabelOn(isGFCheckbox, "Is GF"); - - for (checkbox in [isPlayerCheckbox, isGFCheckbox, antialiasingCheckbox, flipXCheckbox]) + for (checkbox in [isPlayerCheckbox, antialiasingCheckbox, flipXCheckbox]) {checkbox.y += 4; checkbox.x += 6;} saveButton = new UIButton(windowSpr.x + windowSpr.bWidth - 20, windowSpr.y + windowSpr.bHeight- 20, "Save & Close", function() { @@ -168,7 +163,6 @@ class CharacterInfoScreen extends UISubstateWindow { var xml = Xml.createElement("character"); xml.set("isPlayer", isPlayerCheckbox.checked ? "true" : "false"); - xml.set("isGF", isGFCheckbox.checked ? "true" : "false"); xml.set("x", Std.string(positionXStepper.value)); xml.set("y", Std.string(positionYStepper.value)); xml.set("gameOverChar", gameOverCharTextBox.label.text); diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index 40ddcd74..fee410de 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -34,7 +34,6 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset public var stunned(default, set):Bool = false; public var isPlayer:Bool = false; - public var isGF:Bool = false; public var curCharacter:String = 'bf'; public var sprite:String = 'bf'; @@ -386,7 +385,6 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset sprite = curCharacter; if (xml.x.exists("isPlayer")) playerOffsets = (xml.x.get("isPlayer") == "true"); - if (xml.x.exists("isGF")) isGF = (xml.x.get("isGF") == "true"); if (xml.x.exists("x")) globalOffset.x = Std.parseFloat(xml.x.get("x")); if (xml.x.exists("y")) globalOffset.y = Std.parseFloat(xml.x.get("y")); if (xml.x.exists("gameOverChar")) gameOverCharacter = xml.x.get("gameOverChar"); @@ -407,7 +405,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset var hasInterval:Bool = xml.x.exists("interval"); if (hasInterval) beatInterval = Std.parseInt(xml.x.get("interval")); - var tempList = ["isPlayer", "isGF", "x", "y", "gameOverChar", "camx", "camy", "holdTime", "flipX", "icon", "color", "scale", "antialiasing", "sprite", "interval"]; + var tempList = ["isPlayer", "x", "y", "gameOverChar", "camx", "camy", "holdTime", "flipX", "icon", "color", "scale", "antialiasing", "sprite", "interval"]; var atts = xml.x.attributes(); for (i in atts) if (!tempList.contains(i)) @@ -429,7 +427,6 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset public function buildXML(?animsOrder:Array):Xml { var xml = Xml.createElement("character"); xml.set("isPlayer", playerOffsets == true ? "true" : "false"); - xml.set("isGF", isGF == true ? "true" : "false"); xml.set("x", Std.string(globalOffset.x)); xml.set("y", Std.string(globalOffset.y)); xml.set("gameOverChar", gameOverCharacter);