Nuclues in Editor, Starting cell 1 hex of cytho #693

Dak2896 · 2018-12-27T14:17:36Z

Nucleus is organelle that can be addes in editor
Starting cell is empy one with 1 hex of cytho only
Is possible only to create one nucleus
Organelle that need nucleus are locked until you get one

Know issues:

From GUI locked organelle are enable, you just cannot add them, make a feedback why you can't or
disable them
There is no icon in editor for Nucleus
1 hex of cyto it's bigger than other IA bacteria (don't know why)

- Nucleus is organelle that can be addes in editor - Starting cell is empy one with 1 hex of cytho only - Nucleus is 9 hex instead of 10 - Is possible only to create one nucleus Know issues: - If you are creating nucleus and you make undo after you have select it, you can't add it forever, this happens because it's now made by flag variable system when you select nucleus, should be replace by cycling acutal organelle and find if nucleus is present. - There is no icon in editor for Nucleus - 1 hex of cyto it's bigger than other IA bacteria (don't know why)

hhyyrylainen

The file permissions changed on the scripts and they no longer work. So the linux compile is broken and also the formatting checker (and I'm seeing at least a few formatting problems).

Dak2896 · 2018-12-27T14:32:27Z

File permissions? for formatting shouldn't be runFormattingCode automatically change indentation ecc?

hhyyrylainen · 2018-12-27T14:33:17Z

The scripts don't work anymore because of that.

Dak2896 · 2018-12-27T14:35:01Z

Mhh and what is that? doens't it change nothing?

hhyyrylainen · 2018-12-27T14:36:03Z

File permissions define on Linux what files can be ran and with wrong permissions everything is ruined.

Dak2896 · 2018-12-27T14:37:36Z

Ok, so i have to make fork again and understand why in first commit i had that makeRelease changment

hhyyrylainen · 2018-12-27T14:38:28Z

If you are good with Git you could cherry pick the other commits and force push over this PR.

Dak2896 · 2018-12-27T14:40:50Z

Is not possible to revert first test commit that make changes on that files?

hhyyrylainen · 2018-12-27T14:41:42Z

I guess reverting it might work

This reverts commit b3f7f0f.

hhyyrylainen · 2018-12-27T14:47:20Z

scripts/gui/thrive_gui.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>


What is the change on this line? Could you check that there isn't the wrong type of line change here.

i didn't change nothing at that line, wrong type of line means that changes are in another line?

The only reason I can think of that this line is marked as changed (as there is no visible change) is that the line end character has changed.

hhyyrylainen · 2018-12-27T14:47:43Z

scripts/microbe_stage/microbe_editor/microbe_editor.as

-        EditorAction@ action = EditorAction(organelle.organelle.mpCost,
+		if((organelle.organelle.name == "nucleus" && !nucleusIsPresent) || organelle.organelle.name != "nucleus")
+		{
+			if(organelle.organelle.name == "nucleus")


There are tabs here. Run the formatting script.

actyally in my code there are 4 space.. i don't know why when i make push and then pull they change

FAILED to format file: ./ThirdParty/Leviathan/build/ThirdParty/include/bullet/VHACD/test/inc/oclHelper.h

Now when i lunch formatting code i get this, feels bad

hhyyrylainen · 2018-12-27T16:48:09Z

scripts/microbe_stage/organelle_table.as

@@ -277,8 +277,7 @@ void setupOrganelles(){
        Int2(-1, 1),
        Int2(-1, 0),
        Int2(1, 1),
-        Int2(0, 2),
-        Int2(-1, 2)
+        Int2(0, 2)


Why was the size of the nucleus changed? It's been the same size in hexes forever.

like now starting cell was 10 hexes with nucleus, if you add organelle nucleus of 10 hexes size it's 11 hexes, i just remove one to make the situation as was before

But you changed the configuration of the nucleus? That affects everything starting from the generated collision of the cell and how the membrane wraps around things.

no i just modify the table, if that is the only one configuration for nucleus so yes i change it.

I suppose that collision would be automatically changing based on hex structure of organelle, if not i revert that modification.

My point is that there should be a lot of discussion going into why the hexes of the nucleus need to be changed. And until then I'm not going to accept a change here.

hhyyrylainen · 2018-12-27T16:48:53Z

scripts/microbe_stage/microbe_editor/microbe_editor.as

@@ -1034,7 +1042,7 @@ class MicrobeEditor{
    private int symmetry = 0;

    private bool microbeHasBeenInEditor = false;
-
+    private bool nucleusIsPresent = false;


As far as I can tell this doesn't work if the nucleus is added before entering the editor.

Well yes, but can nucleus be adedd before entering in editor?

You can add the nucleus, exit the editor (as you have to as you are out of MP) and then the next time everything will be locked again.

Why everything should be locked? you mean i can't add more organelles?

Ok so to summarize, if i haven't nucleus i can add only non membrane organelles, when i have nucleus i can add them.

Ok i change how check work, is setted outside in a function that is called when you go outside of editor, so undo bug is solved.

I lock organelles, but i have no idea how to block from GUI point of view, like now you can pick an organelle but you cannot attach it, form me that i know why it's great, for player could sound like a bug

hhyyrylainen · 2018-12-27T19:28:47Z

scripts/microbe_stage/microbe_editor/microbe_editor.as

@@ -119,7 +118,6 @@ class MicrobeEditor{
        // Get the species organelles to be edited
        auto@ templateOrganelles = cast<array<SpeciesStoredOrganelleType@>>(
            playerSpecies.organelles);
-


Please don't remove completely reasonable whitespace, I can tolerate a little bit of such edits from @Untrustedlife as he has done so much.

hhyyrylainen · 2018-12-27T19:29:21Z

scripts/microbe_stage/microbe_editor/microbe_editor.as

@@ -227,7 +224,11 @@ class MicrobeEditor{

    private void _addOrganelle(PlacedOrganelle@ organelle)
    {
-        EditorAction@ action = EditorAction(organelle.organelle.mpCost,
+
+        if((organelle.organelle.name == "nucleus" && !nucleusIsPresent) || (nucleusIsPresent && (organelle.organelle.name == "mitochondrion" || organelle.organelle.name == "chloroplast" || organelle.organelle.name == "nitrogenfixingplastid" || organelle.organelle.name == "chemoplast")) || (organelle.organelle.name == "cytoplasm" || organelle.organelle.name == "flagellum" || organelle.organelle.name == "chromatophors" || organelle.organelle.name == "metabolosome" || organelle.organelle.name == "oxytoxy" || organelle.organelle.name == "vacuole" ))


This line is too long

you mean as text formatting or you mean it's bad idea solve problem in that way?

Now that I read the whole line, it obviously should be a configuration property on the organelles if they need a nucleus, instead of this monstrous line here.

hhyyrylainen · 2018-12-27T19:30:21Z

scripts/microbe_stage/microbe_editor/microbe_editor.as

@@ -945,7 +962,7 @@ class MicrobeEditor{

        } else if(type == "MicrobeEditorExited"){
            LOG_INFO("MicrobeEditor: applying changes to player Species");
-
+            getNucleus();


I'm still not convinced that this is bullet proof. The check should happen when entering the editor. And placing a nucleus should also update it.

And to avoid confusion the buttons for organelles that can't be placed should be disabled.

So the check should be made when we enter in Editor, and enabling or not some GUI buttons.
And once you have put a nucleus this functions shouldn't be call again in next edits.

Do you agree?

The function should be called: when entering, when placing a nucleus, when redoing a nucleus action, and when undoing a nucleus action. It might be cleaner to run it when entering and then check if something changed when each action is applied or undone.

Ah ok, but if nucleus cost 100 points if i run it when i enter in editor and when i go out should be enough i think.

I'm considering all possible scenarios, one of which is that you are playing around with a freebuild editor, where you have unlimited MP.

Ok, in that case it won't work, the problem is that in function undo e redu scope is different, i dont't think class function can be run.

- Possible to create nucleus - Organelle that need nucleus are locked

Dak2896 · 2018-12-30T21:06:28Z

I introduce parameters to each organelles to lock/unlock nucleus, the check is made before add organelle is called, the bad things that by make the check before i should make it for all symmetry parameters.

Maybe i should make the check one time inside the function.

- from boolean check to integer check, this handle better the checking for nucleus

Dak2896 added 4 commits December 27, 2018 13:22

test

b3f7f0f

Flagella and first setup

a5d633a

Nucleus reduction size

f505633

hhyyrylainen requested changes Dec 27, 2018

View reviewed changes

Dak2896 added 3 commits December 27, 2018 15:42

Update microbe_editor.mjs

85a23f1

Revert "test"

a69d853

This reverts commit b3f7f0f.

Merge branch 'master' of https://github.com/Dak2896/Thrive

00b92ff

hhyyrylainen requested changes Dec 27, 2018

View reviewed changes

Dak2896 added 6 commits December 27, 2018 15:54

indentation

9d88f7e

trying solve indentation

df1dfee

Update microbe_editor.as

05e7e3f

clang formatting

d58dfb0

editor

49b3d71

Merge branch 'master' of https://github.com/Dak2896/Thrive

c1449f6

hhyyrylainen requested changes Dec 27, 2018

View reviewed changes

Editor fixing, organelle Nucleus and other locked unlocked organelles

30254a8

hhyyrylainen requested changes Dec 27, 2018

View reviewed changes

Dak2896 added 3 commits December 27, 2018 20:40

restore 10 hex for nucleus, revert white space

2de2c7f

nucleus undo redu fuctions edited

eeb2549

fix editor nucleus check

46dd9a8

Dak2896 changed the title ~~Nuclues in Editor, Starting cell 1 hex of cytho, nucleus size 9 hex, flagella test 0.6 force~~ Nuclues in Editor, Starting cell 1 hex of cytho Dec 28, 2018

Nucleus and locked organelles

e90faac

- Possible to create nucleus - Organelle that need nucleus are locked

new verson of checking nucleus

0f46405

- from boolean check to integer check, this handle better the checking for nucleus

Dak2896 closed this Dec 31, 2018

Nuclues in Editor, Starting cell 1 hex of cytho #693

Nuclues in Editor, Starting cell 1 hex of cytho #693

Conversation

Dak2896 commented Dec 27, 2018 • edited

hhyyrylainen left a comment

Choose a reason for hiding this comment

Dak2896 commented Dec 27, 2018

hhyyrylainen commented Dec 27, 2018

Dak2896 commented Dec 27, 2018

hhyyrylainen commented Dec 27, 2018

Dak2896 commented Dec 27, 2018

hhyyrylainen commented Dec 27, 2018

Dak2896 commented Dec 27, 2018

hhyyrylainen commented Dec 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dak2896 Dec 27, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dak2896 Dec 27, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dak2896 commented Dec 30, 2018 • edited

Dak2896 commented Dec 27, 2018 •

edited

Dak2896 Dec 27, 2018 •

edited

Dak2896 Dec 27, 2018 •

edited

Dak2896 commented Dec 30, 2018 •

edited