Skip to content
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

Defeat merge #141

Open
wants to merge 17 commits into
base: Defeat_Rework
Choose a base branch
from
Open

Defeat merge #141

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4dd36a3
Lustia Rework
ErinaSugino Jun 25, 2024
e04f668
Putting unchanged sexbound defeat into the project
notlexander Sep 29, 2024
abed246
SBR Defeat Integration updated + stabilized
notlexander Sep 30, 2024
768bfa4
Merge branch 'ErinaSugino:main' into main
notlexander Sep 30, 2024
ca8202a
minor change to defeat config
notlexander Sep 30, 2024
c9303e6
Merge branch 'main' of https://github.com/notlexander/Starbound-SBR-Mod
notlexander Sep 30, 2024
c168306
Hotfix configurable kid stage
ErinaSugino Oct 4, 2024
a214769
Merge pull request #136 from ErinaSugino/main
ErinaSugino Oct 5, 2024
2a83113
Updated Lustia
ErinaSugino Oct 5, 2024
8785544
Merge pull request #137 from ErinaSugino/Lustia_Rework
ErinaSugino Oct 5, 2024
c068f5b
Local sync
ErinaSugino Oct 5, 2024
60b0017
Pill Update I
ErinaSugino Oct 5, 2024
90d7603
Bug Fixes, Transform code update, and monster
notlexander Oct 6, 2024
aef98f3
Implemented hostile entity tracking system
notlexander Oct 12, 2024
3b1aa1a
Numerous updates: customizer, invincibility, fixes
notlexander Oct 22, 2024
796cb63
Merge branch 'main' of https://github.com/notlexander/Starbound-SBR-Mod
notlexander Oct 22, 2024
1690bbc
Misc changes, floating bug fix
notlexander Oct 26, 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
92 changes: 92 additions & 0 deletions behaviors/monsters/modular/targeting.behavior.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
[
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/0/child/children/1/child/children/2",
"value": {

"title": "listPush",
"type": "action",
"name": "listPush",
"parameters": {
"entity": {"key": "self"},
"list": {"key": "entitySelf"}
},
"output": {
"list": "entitySelf"
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/0/child/children/1/child/children/3",
"value": {
"title": "sendEntityMessage",
"type": "action",
"name": "sendEntityMessage",
"parameters": {
"entity": {"key": "filterItem"},
"message": {"value": "SexboundDefeat:TargetedBy"},
"arguments": {"key": "entitySelf"}
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/0/child/children/1/child/children/4",
"value": {
"title": "listPop",
"type": "action",
"name": "listPop",
"parameters": {
"list": {"key": "entitySelf"}
},
"output": {
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/1/child/children/1",
"value": {

"title": "listPush",
"type": "action",
"name": "listPush",
"parameters": {
"entity": {"key": "self"},
"list": {"key": "entitySelf"}
},
"output": {
"list": "entitySelf"
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/1/child/children/2",
"value": {
"title": "sendEntityMessage",
"type": "action",
"name": "sendEntityMessage",
"parameters": {
"entity": {"key": "damageSource"},
"message": {"value": "SexboundDefeat:TargetedBy"},
"arguments": {"key": "entitySelf"}
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/1/child/children/1/child/children/3",
"value": {
"title": "listPop",
"type": "action",
"name": "listPop",
"parameters": {
"list": {"key": "entitySelf"}
},
"output": {
}
}
}
]
103 changes: 103 additions & 0 deletions behaviors/npc/hostiletracking.behavior.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
[
{
"op": "add",
"path": "/root/children/1/children/0/children/0/children/0/children/7",
"value": {

"title": "listPush",
"type": "action",
"name": "listPush",
"parameters": {
"entity": {"key": "self"},
"list": {"key": "entitySelf"}
},
"output": {
"list": "entitySelf"
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/0/children/0/children/8",
"value": {
"title": "sendEntityMessage",
"type": "action",
"name": "sendEntityMessage",
"parameters": {
"entity": {"key": "target"},
"message": {"value": "SexboundDefeat:TargetedBy"},
"arguments": {"key": "entitySelf"}
}
}
},
{
"op": "add",
"path": "/root/children/1/children/0/children/0/children/0/children/9",
"value": {
"title": "listPop",
"type": "action",
"name": "listPop",
"parameters": {
"list": {"key": "entitySelf"}
},
"output": {
}
}
},
{
"op": "replace",
"path": "/root/children/1/children/1/children/2/child/child",
"value": {
"title": "sequence",
"type": "composite",
"name": "sequence",
"parameters": {},
"children": [
{
"title": "broadcastNotification",
"type": "action",
"name": "broadcastNotification",
"parameters": {
"entityTypes": {"value": ["npc"]},
"position": {"key": "self"},
"range": {"value": 40},
"target": {"key": "target"},
"type": {"value": "attack"}
}
},
{
"title": "listPush",
"type": "action",
"name": "listPush",
"parameters": {
"entity": {"key": "self"},
"list": {"key": "entitySelf"}
},
"output": {
"list": "entitySelf"
}
},
{
"title": "sendEntityMessage",
"type": "action",
"name": "sendEntityMessage",
"parameters": {
"entity": {"key": "target"},
"message": {"value": "SexboundDefeat:TargetedBy"},
"arguments": {"key": "entitySelf"}
}
},
{
"title": "listPop",
"type": "action",
"name": "listPop",
"parameters": {
"list": {"key": "entitySelf"}
},
"output": {
}
}
]
}
}
]
21 changes: 21 additions & 0 deletions dialog/lustiaarcadehintconverse.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"greeting": {
"human": {
"default": [
"Sorry hun~ Arcade is closed."
]
}
},
"converse": {
"human" : {
"default" : [
"Been closed for a while. Real shame.",
"People loved their trading card addiction.",
"They were even selling phones!",
"Me and my pals haven't had much work out of town since then...",
"Something about \"Omnibrowser\" going out of business?",
"Omnibrowser... I wonder what that is..."
]
}
}
}
1,741 changes: 1,641 additions & 100 deletions dungeons/sexscape/sexscape.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions interface/sexbound/common/custombutton.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,8 @@ function CustomButton:setNewImage(image, imageOffset)
else
self.config.image = nil
end
end

function CustomButton:setEnabled(enabled)
self.config.enabled = not not enabled
end
78 changes: 77 additions & 1 deletion interface/sexbound/customizer/customizer.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,80 @@
"hAnchor" : "left",
"width" : 50,
"value" : "^shadow;2000",
"color" : [255, 255, 255]
},
"canBeDefeatedLabel" : {
"fontSize": 10,
"type": "label",
"position": [20, 132],
"hAnchor": "left",
"vAnchor": "top",
"width": 210,
"value": "^shadow;You currently ^orange;will not^reset;^shadow; be fuckable after being defeated.",
"wrapWidth": 210,
"color": [255, 255, 255]
},
"canBeDefeatedConfirm": {
"type": "button",
"base": "/interface/sexbound/customizer/smallbutton.png",
"hover": "/interface/sexbound/customizer/smallbutton-hover.png",
"pressed": "/interface/sexbound/customizer/smallbutton-hover.png",
"disabledImage": "/interface/sexbound/customizer/smallbutton-disabled.png",
"pressedOffset": [1,-1],
"caption": "Change",
"fontColor": [255, 255, 255],
"textAlign": "center",
"position": [240, 121]
},
"canBeDefeatedPriceIcon": {
"type" : "image",
"file" : "/interface/sexbound/customizer/icons/sexbux.png",
"position" : [300, 123]
},
"canBeDefeatedPrice": {
"type" : "label",
"fontSize" : 8,
"position" : [310, 123],
"hAnchor" : "left",
"width" : 50,
"value" : "^shadow;0",
"color" : [255, 255, 255]
},
"canDefeatOthersLabel" : {
"fontSize": 10,
"type": "label",
"position": [20, 104],
"hAnchor": "left",
"vAnchor": "top",
"width": 210,
"value": "^shadow;Supported enemies currently ^orange;will not^reset;^shadow; be fuckable after defeating them.",
"wrapWidth": 210,
"color": [255, 255, 255]
},
"canDefeatOthersConfirm": {
"type": "button",
"base": "/interface/sexbound/customizer/smallbutton.png",
"hover": "/interface/sexbound/customizer/smallbutton-hover.png",
"pressed": "/interface/sexbound/customizer/smallbutton-hover.png",
"disabledImage": "/interface/sexbound/customizer/smallbutton-disabled.png",
"pressedOffset": [1,-1],
"caption": "Change",
"fontColor": [255, 255, 255],
"textAlign": "center",
"position": [240, 93]
},
"canDefeatOthersPriceIcon": {
"type" : "image",
"file" : "/interface/sexbound/customizer/icons/sexbux.png",
"position" : [300, 95]
},
"canDefeatOthersPrice": {
"type" : "label",
"fontSize" : 8,
"position" : [310, 95],
"hAnchor" : "left",
"width" : 50,
"value" : "^shadow;0",
"color" : [255, 255, 255]
}
}
Expand Down Expand Up @@ -395,7 +469,9 @@
"subGenderSelector.down",
"subGenderConfirm",
"sterilizeConfirm",
"infertileConfirm"
"infertileConfirm",
"canBeDefeatedConfirm",
"canDefeatOthersConfirm"
],

"scripts" : [
Expand Down
36 changes: 35 additions & 1 deletion interface/sexbound/customizer/customizergeneral.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ function Customizer.General:new(parent)
currentSubGenderIndex = 1,
subGenderList = {},
sterilized = false,
infertile = false
infertile = false,
canBeDefeated = false,
canDefeatOthers = false
}, Customizer.General_mt)
end

Expand All @@ -38,6 +40,16 @@ function Customizer.General:init()
if self.infertile == nil then self.infertile = false end
if self.infertile then widget.setText("generalTab.infertileLabel", "^shadow;You currently ^orange;are^reset;^shadow; infertile.")
else widget.setButtonEnabled("generalTab.infertileConfirm", false) end

self.canBeDefeated = self._parent.config.canBeDefeated
if self.canBeDefeated == nil then self.canBeDefeated = false end
if self.canBeDefeated then widget.setText("generalTab.canBeDefeatedLabel", "^shadow;You currently ^orange;will^reset;^shadow; be fuckable after being defeated.")
else widget.setButtonEnabled("generalTab.canBeDefeatedLabel", false) end

self.canDefeatOthers = self._parent.config.canDefeatOthers
if self.canDefeatOthers == nil then self.canDefeatOthers = false end
if self.canDefeatOthers then widget.setText("generalTab.canDefeatOthersLabel", "^shadow;Supported enemies currently ^orange;will^reset;^shadow; be fuckable after defeating them.")
else widget.setButtonEnabled("generalTab.canDefeatOthersLabel", false) end
end

function Customizer.General:handleMessage(message)
Expand Down Expand Up @@ -162,4 +174,26 @@ function Customizer.General:makeFertile()
world.sendEntityMessage(player.id(), "Sexbound:Status:RemoveStatus", "infertile")

self.infertile = false
end

function Customizer.General:toggleCanBeDefeated()
if self.canBeDefeated then
widget.setText("generalTab.canBeDefeatedLabel", "^shadow;You currently ^orange;will not^reset;^shadow; be fuckable after being defeated.")
world.sendEntityMessage(player.id(), "Sexbound:Status:RemoveStatus", "canBeDefeated")
else
widget.setText("generalTab.canBeDefeatedLabel", "^shadow;You currently ^orange;will^reset;^shadow; be fuckable after being defeated.")
world.sendEntityMessage(player.id(), "Sexbound:Status:AddStatus", "canBeDefeated")
end
self.canBeDefeated = not self.canBeDefeated
end

function Customizer.General:toggleCanDefeatOthers()
if self.canDefeatOthers then
widget.setText("generalTab.canDefeatOthersLabel", "^shadow;Supported enemies currently ^orange;will not^reset;^shadow; be fuckable after defeating them.")
world.sendEntityMessage(player.id(), "Sexbound:Status:RemoveStatus", "canDefeatOthers")
else
widget.setText("generalTab.canDefeatOthersLabel", "^shadow;Supported enemies currently ^orange;will^reset;^shadow; be fuckable after defeating them.")
world.sendEntityMessage(player.id(), "Sexbound:Status:AddStatus", "canDefeatOthers")
end
self.canDefeatOthers = not self.canDefeatOthers
end
15 changes: 15 additions & 0 deletions interface/sexbound/customizer/customizerui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,19 @@ end
function sterilizeConfirm()
if not self.customizer._inited then return end
self.customizer.tabs["General"]:sterilize()
end

function infertileConfirm()
if not self.customizer._inited then return end
self.customizer.tabs["General"]:makeFertile()
end

function canBeDefeatedConfirm()
if not self.customizer._inited then return end
self.customizer.tabs["General"]:toggleCanBeDefeated()
end

function canDefeatOthersConfirm()
if not self.customizer._inited then return end
self.customizer.tabs["General"]:toggleCanDefeatOthers()
end
Binary file modified interface/sexbound/customizer/icons/addon_mod_ahego.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading