Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,661 changes: 1,477 additions & 184 deletions assets/data/sponsors.json

Large diffs are not rendered by default.

200 changes: 200 additions & 0 deletions assets/data/sponsors_original.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
[
{
"id": 1,
"name": "Europe",
"colour": {
"b": 1.0,
"a": 1.0,
"b8": 255,
"a8": 255,
"h": 0.6666666666666666,
"s": 1.0,
"v": 1.0
},
"introText": "[b]Welcome to Europe![/b]",
"startingResources": {
"GOLD": 100,
"INFLUENCE": 10,
"CONSTRUCTION_MATERIALS": 250
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 2,
"name": "North America",
"colour": {
"r": 1.0,
"a": 1.0,
"r8": 255,
"a8": 255,
"s": 1.0,
"v": 1.0
},
"introText": "[b]Welcome to North America![/b]\nAlthough the space launch centre was destroyed by the asteroid, you have the technology and political will to rebuild the NASA space programme..",
"startingResources": {
"GOLD": 150,
"INFLUENCE": 15,
"CONSTRUCTION_MATERIALS": 200
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 3,
"name": "South America",
"colour": {
"r": 1.0,
"g": 1.0,
"a": 1.0,
"r8": 255,
"g8": 255,
"a8": 255,
"h": 0.16666666666666666,
"s": 1.0,
"v": 1.0
},
"introText": "[b]Welcome to South America![/b]",
"startingResources": {
"GOLD": 120,
"INFLUENCE": 12,
"CONSTRUCTION_MATERIALS": 150
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 4,
"name": "Asia",
"colour": {
"r": 0.823529,
"g": 0.705882,
"b": 0.54902,
"a": 1.0,
"r8": 210,
"g8": 180,
"b8": 140,
"a8": 255,
"h": 0.0952379217681995,
"s": 0.3333325238091191,
"v": 0.823529
},
"introText": "[b]Welcome to Asia![/b]",
"startingResources": {
"GOLD": 200,
"INFLUENCE": 12,
"CONSTRUCTION_MATERIALS": 350
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 5,
"name": "Africa",
"colour": {
"g": 1.0,
"a": 1.0,
"g8": 255,
"a8": 255,
"h": 0.3333333333333333,
"s": 1.0,
"v": 1.0
},
"introText": "[b]Welcome to Africa![/b]",
"startingResources": {
"GOLD": 80,
"INFLUENCE": 8,
"CONSTRUCTION_MATERIALS": 250
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 6,
"name": "Oceania",
"colour": {
"g": 1.0,
"b": 1.0,
"a": 1.0,
"g8": 255,
"b8": 255,
"a8": 255,
"h": 0.5,
"s": 1.0,
"v": 1.0
},
"introText": "[b]Welcome to Oceania![/b]",
"startingResources": {
"GOLD": 90,
"INFLUENCE": 9,
"CONSTRUCTION_MATERIALS": 150
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
},
{
"id": 7,
"name": "Antarctica",
"colour": {
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0,
"r8": 255,
"g8": 255,
"b8": 255,
"a8": 255,
"v": 1.0
},
"introText": "[b]Welcome to Antarctica![/b]\nThis will be your hardest challenge.",
"startingResources": {
"GOLD": 50,
"INFLUENCE": 5,
"CONSTRUCTION_MATERIALS": 50
},
"baseScienceRate": {
"ASTRONOMY": 10.0,
"PHYSICS": 10.0,
"BIOCHEMISTRY": 10.0,
"ENGINEERING": 10.0,
"MATHEMATICS": 10.0,
"PSYCHOLOGY": 10.0
}
}
]
5 changes: 3 additions & 2 deletions gdj/SignalBus.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ signals = [
on_screen_resized,
dragging_card,
dropped_card,
recalc_pulldown_panel_signal,
card_on_hex,
card_off_hex,
show_action_confirmation,
Expand All @@ -31,7 +30,9 @@ signals = [
update_ongoing_action,
action_completed,
editor_tech_saved,
editor_delete_tech
editor_delete_tech,
editor_place_hex,
editor_clear_hex
]
properties = [

Expand Down
8 changes: 6 additions & 2 deletions gdj/hexgrid/Hex.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ signals = [
properties = [
id,
hex_unlocked,
new_radius
new_radius,
hex_mode
]
functions = [
_ready,
_process,
_draw,
highlight,
unhighlight
unhighlight,
on_mouse_entered,
on_mouse_exited,
on_input_event
]
35 changes: 35 additions & 0 deletions gdj/hexgrid/map/editor/HexMapGridEditor.gdj
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.

registeredName = HexMapGridEditor
fqName = hexgrid.map.editor.HexMapGridEditor
relativeSourcePath = src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
baseType = GridContainer
supertypes = [
godot.api.GridContainer,
LogInterface,
godot.api.Container,
godot.api.Control,
godot.api.CanvasItem,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
kotlin.Any
]
signals = [

]
properties = [
dimension
]
functions = [
_ready,
on_confirm_location,
on_cancel_location,
on_p_h_unlocked_at_start_toggled,
on_save_sponsor_button_pressed,
on_sponsor_chosen,
delete_sponsor
]
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.

registeredName = PullDownPanel
fqName = screens.kuiper.pullDownPanel.PullDownPanel
relativeSourcePath = src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
baseType = Control
registeredName = SponsorEditor
fqName = hexgrid.map.editor.SponsorEditor
relativeSourcePath = src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt
baseType = Node
supertypes = [
godot.api.Control,
godot.api.CanvasItem,
godot.api.Node,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
Expand All @@ -19,14 +17,9 @@ signals = [

]
properties = [
panel_i_d,
contents,
key

]
functions = [
_ready,
_recalculate_pulldown_dimensions,
_input,
_on_handle_gui_input,
_process
]
2 changes: 1 addition & 1 deletion gdj/screens/Kuiper/escMenu/EscMenu.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ properties = [
functions = [
_on_resume,
_on_quit,
_on_return_to_main_menu,
on_return_to_main_menu,
_on_save
]
1 change: 1 addition & 0 deletions gdj/screens/MainMenu/MainMenu.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ functions = [
_on_load_button_pressed,
_on_load_file_selected,
on_tech_tree_editor_pressed,
on_sponsor_editor_pressed,
load_game
]
10 changes: 6 additions & 4 deletions src/main/kuiper/SignalBus.kt
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ class SignalBus : Node() {
@RegisterSignal("card")
val droppedCard by signal1<ActionCard>()

// signals relating to pulldown panels
@RegisterSignal("panel_name")
val recalcPulldownPanelSignal by signal1<Control>()

// Signals relating to hexes
@RegisterSignal("hex")
val cardOnHex by signal1<Hex>()
Expand Down Expand Up @@ -86,6 +82,12 @@ class SignalBus : Node() {
@RegisterSignal("delete_tech")
val editor_deleteTech by signal1<TechWrapper>()

@RegisterSignal("place_row", "place_col")
val editor_placeHex by signal2<Int, Int>()

@RegisterSignal("clear_row", "clear_col")
val editor_clearHex by signal2<Int, Int>()

@RegisterFunction
override fun _ready() {
// Connect to the screen resized signal and propagate it
Expand Down
Loading